Merge a4a1c802c4 into d6bccb7908

feature: add python venv

README.md

@@ -29,6 +29,7 @@ Once your preferred template has been initialized, you can use the provided shel
 
 | Language/framework/tool  | Template                      |
 | :----------------------- | :---------------------------- |
+| [C]/[C++]                | [`c-cpp`](./c-cpp/)           |
 | [Clojure]                | [`clojure`](./clojure/)       |
 | [C#][csharp]             | [`csharp`](./csharp/)         |
 | [Cue]                    | [`cue`](./cue/)               |
@@ -64,6 +65,20 @@ Once your preferred template has been initialized, you can use the provided shel
 
 The sections below list what each template includes. In all cases, you're free to add and remove packages as you see fit; the templates are just boilerplate.
 
+### [`c-cpp`](./c-cpp/)
+
+- [clang-tools] 17.0.6
+- [cmake] 3.28.3
+- [codespell] 2.2.6
+- [conan] 2.0.17
+- [cppcheck] 2.13.4
+- [doxygen] 1.10.0
+- [gdb] 14.1
+- [gtest] 1.12.1
+- [lcov] 1.0
+- [vcpkg]
+- [vcpkg-tool]
+
 ### [`clojure`](./clojure/)
 
 - [Clojure] 1.11.1.1347
@@ -228,7 +243,6 @@ A dev template that's fully customizable.
 
 - [Python] 3.11.4
 - [pip] 23.0.1
-- [Virtualenv] 20.19.0
 
 ### [`ruby`](./ruby/)
 
@@ -269,15 +283,22 @@ All of the templates have only the root [flake](./flake.nix) as a flake input. T
 
 [boot]: https://www.boot-clj.com
 [buf]: https://github.com/bufbuild/buf
+[C]: https://www.open-std.org/jtc1/sc22/wg14
+[C++]: https://isocpp.org
 [cabal]: https://www.haskell.org/cabal
 [cachix]: https://www.cachix.org
 [cargo]: https://doc.rust-lang.org/cargo
 [cargo-audit]: https://crates.io/crates/cargo-audit
 [cargo-deny]: https://crates.io/crates/cargo-deny
+[clang-tools]: https://clang.llvm.org/
 [clippy]: https://github.com/rust-lang/rust-clippy
 [clojure]: https://clojure.org
+[cmake]: https://cmake.org/
+[codespell]: https://github.com/codespell-project/codespell
 [composer]: https://getcomposer.org/
+[conan]: https://conan.io/
 [conftest]: https://www.conftest.dev
+[cppcheck]: http://cppcheck.sourceforge.net/
 [csharp]: https://dotnet.microsoft.com/en-us/languages/csharp
 [cue]: https://cuelang.org
 [damon]: https://github.com/hashicorp/damon
@@ -293,11 +314,13 @@ All of the templates have only the root [flake](./flake.nix) as a flake input. T
 [dhall-toml]: https://github.com/dhall-lang/dhall-haskell/tree/master/dhall-toml
 [dhall-yaml]: https://github.com/dhall-lang/dhall-haskell/tree/master/dhall-yaml
 [dotnet]: https://dotnet.microsoft.com/en-us/
+[doxygen]: https://www.doxygen.nl/
 [dune]: https://dune.build
 [elixir]: https://elixir-lang.org
 [elm]: https://elm-lang.org
 [elm2nix]: https://github.com/cachix/elm2nix
 [flake-utils]: https://github.com/numtide/flake-utils
+[gdb]: https://www.gnu.org/software/gdb/
 [gigalixir]: https://www.gigalixir.com
 [gleam]: https://gleam.run
 [go]: https://go.dev
@@ -305,6 +328,7 @@ All of the templates have only the root [flake](./flake.nix) as a flake input. T
 [goimports]: https://pkg.go.dev/golang.org/x/tools/cmd/goimports
 [golangci-lint]: https://github.com/golangci/golangci-lint
 [gradle]: https://gradle.org
+[gtest]: https://github.com/google/googletest
 [hashicorp]: https://hashicorp.com
 [haskell]: https://haskell.org
 [haxe]: https://haxe.org/
@@ -314,6 +338,7 @@ All of the templates have only the root [flake](./flake.nix) as a flake input. T
 [jq]: https://jqlang.github.io/jq
 [kotlin]: https://kotlinlang.org
 [latex]: https://www.latex-project.org/
+[lcov]: https://ltp.sourceforge.net/coverage/lcov.php
 [leiningen]: https://leiningen.org
 [levant]: https://github.com/hashicorp/levant
 [lorri]: https://github.com/target/lorri
@@ -367,7 +392,8 @@ All of the templates have only the root [flake](./flake.nix) as a flake input. T
 [texlive]: https://www.tug.org/texlive/
 [tflint]: https://github.com/terraform-linters/tflint
 [vault]: https://www.vaultproject.io
-[virtualenv]: https://pypi.org/project/virtualenv
+[vcpkg]: https://vcpkg.io/
+[vcpkg-tool]: https://github.com/microsoft/vcpkg-tool
 [vulnix]: https://github.com/flyingcircusio/vulnix
 [yarn]: https://yarnpkg.com
 [vlang]: https://vlang.io/

c-cpp/.envrc

@@ -0,0 +1 @@
+use flake

c-cpp/flake.lock

@@ -0,0 +1,25 @@
+{
+  "nodes": {
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1711001935,
+        "narHash": "sha256-URtGpHue7HHZK0mrHnSf8wJ6OmMKYSsoLmJybrOLFSQ=",
+        "rev": "20f77aa09916374aa3141cbc605c955626762c9a",
+        "revCount": 600876,
+        "type": "tarball",
+        "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.600876%2Brev-20f77aa09916374aa3141cbc605c955626762c9a/018e65e3-9c1d-74a8-acde-67868b074670/source.tar.gz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://flakehub.com/f/NixOS/nixpkgs/0.1.%2A.tar.gz"
+      }
+    },
+    "root": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}

c-cpp/flake.nix

@@ -0,0 +1,36 @@
+{
+  description = "A Nix-flake-based C/C++ development environment";
+
+  inputs.nixpkgs.url = "https://flakehub.com/f/NixOS/nixpkgs/0.1.*.tar.gz";
+
+  outputs = { self, nixpkgs }:
+    let
+      supportedSystems = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
+      forEachSupportedSystem = f: nixpkgs.lib.genAttrs supportedSystems (system: f {
+        pkgs = import nixpkgs { inherit system; };
+      });
+    in
+    {
+      devShells = forEachSupportedSystem ({ pkgs }: {
+        default = pkgs.mkShell.override {
+          # Override stdenv in order to change compiler:
+          # stdenv = pkgs.clangStdenv;
+        }
+        {
+          packages = with pkgs; [
+            clang-tools
+            cmake
+            codespell
+            conan
+            cppcheck
+            doxygen
+            gtest
+            lcov
+            vcpkg
+            vcpkg-tool
+          ] ++ (if system == "aarch64-darwin" then [ ] else [ gdb ]);
+        };
+      });
+    };
+}
+

empty/.envrc

@@ -0,0 +1 @@
+use flake

flake.nix

@@ -8,55 +8,70 @@
       overlays = [
         (final: prev:
           let
-            exec = pkg: "${prev.${pkg}}/bin/${pkg}";
+            getSystem = "SYSTEM=$(nix eval --impure --raw --expr 'builtins.currentSystem')";
+            forEachDir = exec: ''
+              for dir in */; do
+                (
+                  cd "''${dir}"
+
+                  ${exec}
+                )
+              done
+            '';
           in
           {
-            format = prev.writeScriptBin "format" ''
+            format = final.writeShellApplication {
-              ${exec "nixpkgs-fmt"} **/*.nix
+              name = "format";
-            '';
+              runtimeInputs = with final; [ nixpkgs-fmt ];
+              text = "nixpkgs-fmt '**/*.nix'";
+            };
 
-            check = prev.writeScriptBin "check" ''
+            # only run this locally, as Actions will run out of disk space
-              for dir in `ls -d */`; do # Iterate through all the templates
+            build = final.writeShellApplication {
-                (
+              name = "build";
-                  cd $dir
+              text = ''
+                ${getSystem}
 
-                  nix flake check --all-systems --no-build
+                ${forEachDir ''
-                )
+                  echo "building ''${dir}"
-              done
+                  nix build ".#devShells.''${SYSTEM}.default"
-            '';
+                ''}
+              '';
+            };
 
-            dvt = prev.writeScriptBin "dvt" ''
+            check = final.writeShellApplication {
-              if [ -z $1 ]; then
+              name = "check";
-                echo "no template specified"
+              text = forEachDir ''
-                exit 1
+                echo "checking ''${dir}"
-              fi
+                nix flake check --all-systems --no-build
+              '';
+            };
 
-              TEMPLATE=$1
+            dvt = final.writeShellApplication {
+              name = "dvt";
+              text = ''
+                if [ -z $1 ]; then
+                  echo "no template specified"
+                  exit 1
+                fi
 
-              ${exec "nix"} \
+                TEMPLATE=$1
-                --experimental-features 'nix-command flakes' \
-                flake init \
-                --template \
-                "github:the-nix-way/dev-templates#''${TEMPLATE}"
-            '';
 
-            update = prev.writeScriptBin "update" ''
+                nix \
-              for dir in `ls -d */`; do # Iterate through all the templates
+                  --experimental-features 'nix-command flakes' \
-                (
+                  flake init \
-                  cd $dir
+                  --template \
+                  "github:the-nix-way/dev-templates#''${TEMPLATE}"
+              '';
+            };
 
-                  echo "updating ''${dir}"
+            update = final.writeShellApplication {
-
+              name = "update";
-                  # Update flake.lock
+              text = forEachDir ''
-                  nix flake update
+                echo "updating ''${dir}"
-
+                nix flake update
-                  echo "checking ''${dir}"
+              '';
-
+            };
-                  # Make sure things work after the update
-                  nix flake check --all-systems --no-build
-                )
-              done
-            '';
           })
       ];
       supportedSystems = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
@@ -67,7 +82,7 @@
     {
       devShells = forEachSupportedSystem ({ pkgs }: {
         default = pkgs.mkShell {
-          packages = with pkgs; [ check format update ];
+          packages = with pkgs; [ build check format update ];
         };
       });
 
@@ -81,6 +96,11 @@
 
     {
       templates = rec {
+        c-cpp = {
+          path = ./c-cpp;
+          description = "C/C++ development environment";
+        };
+
         clojure = {
           path = ./clojure;
           description = "Clojure development environment";
@@ -238,6 +258,8 @@
 
         # Aliases
         rt = rust-toolchain;
+        c = c-cpp;
+        cpp = c-cpp;
       };
     };
 }

python/flake.nix

@@ -13,8 +13,12 @@
     {
       devShells = forEachSupportedSystem ({ pkgs }: {
         default = pkgs.mkShell {
-          packages = with pkgs; [ python311 virtualenv ] ++
+          venvDir = "venv";
-            (with pkgs.python311Packages; [ pip ]);
+          packages = with pkgs; [ python311 ] ++
+            (with pkgs.python311Packages; [ 
+              pip
+              venvShellHook 
+            ]);
         };
       });
     };