Update clojure and csharp

2023-07-13 15:15:22 -07:00 · 2023-07-13 15:15:22 -07:00 · db0398d60d
parent a5887091c4
commit db0398d60d
35 changed files with 98 additions and 124 deletions
--- a/.envrc
+++ b/.envrc
@ -1 +1 @@
-use flake .
+use flake
--- a/clojure/.envrc
+++ b/clojure/.envrc
@ -1 +1 @@
-use flake .
+use flake
--- a/clojure/flake.lock
+++ b/clojure/flake.lock
@ -1,39 +1,23 @@
 {
  "nodes": {
-    "flake-utils": {
-      "locked": {
-        "lastModified": 1676283394,
-        "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1677655039,
-        "narHash": "sha256-IsU0SSBUOr/qYTkiwIgXQ91Io/2bfXI7PG4MoJritLA=",
+        "lastModified": 1689261696,
+        "narHash": "sha256-LzfUtFs9MQRvIoQ3MfgSuipBVMXslMPH/vZ+nM40LkA=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "96a40fa5e8dee644ba60c8a966adadd2d448104a",
+        "rev": "df1eee2aa65052a18121ed4971081576b25d6b5c",
        "type": "github"
      },
      "original": {
        "owner": "NixOS",
-        "ref": "release-22.11",
+        "ref": "nixpkgs-unstable",
        "repo": "nixpkgs",
        "type": "github"
      }
    },
    "root": {
      "inputs": {
-        "flake-utils": "flake-utils",
        "nixpkgs": "nixpkgs"
      }
    }
--- a/clojure/flake.nix
+++ b/clojure/flake.nix
@ -1,43 +1,32 @@
 {
  description = "A Nix-flake-based Clojure development environment";

-  inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/release-22.11";
-    flake-utils.url = "github:numtide/flake-utils";
-  };
+  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";

  outputs =
    { self
    , nixpkgs
-    , flake-utils
    }:

-    flake-utils.lib.eachDefaultSystem (system:
    let
      javaVersion = 17;
      overlays = [
-        (self: super: rec {
-          jdk = super."jdk${toString javaVersion}";
-          boot = super.boot.override {
-            inherit jdk;
-          };
-          clojure = super.clojure.override {
-            inherit jdk;
-          };
-          leiningen = super.leiningen.override {
-            inherit jdk;
-          };
+        (final: prev: rec {
+          jdk = prev."jdk${toString javaVersion}";
+          boot = prev.boot.override { inherit jdk; };
+          clojure = prev.clojure.override { inherit jdk; };
+          leiningen = prev.leiningen.override { inherit jdk; };
        })
      ];
-      pkgs = import nixpkgs { inherit overlays system; };
-    in
-    {
-      devShells.default = pkgs.mkShell {
-        packages = with pkgs; [ boot clojure leiningen ];
-
-        shellHook = ''
-          ${pkgs.clojure}/bin/clj --version
-        '';
-      };
-    });
+      supportedSystems = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
+      forEachSupportedSystem = f: nixpkgs.lib.genAttrs supportedSystems (system: f {
+        pkgs = import nixpkgs { inherit overlays system; };
+      });
+    in {
+      devShells = forEachSupportedSystem ({ pkgs }: {
+        default = pkgs.mkShell {
+          packages = with pkgs; [ boot clojure leiningen ];
+        };
+      });
+    };
 }
--- a/csharp/.envrc
+++ b/csharp/.envrc
@ -1 +1 @@
-use flake .
+use flake
--- a/csharp/flake.lock
+++ b/csharp/flake.lock
@ -1,39 +1,23 @@
 {
  "nodes": {
-    "flake-utils": {
-      "locked": {
-        "lastModified": 1678901627,
-        "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1679163677,
-        "narHash": "sha256-VC0tc3EjJZFPXgucFQAYMIHce5nJWYR0kVCk4TVg6gg=",
+        "lastModified": 1689261696,
+        "narHash": "sha256-LzfUtFs9MQRvIoQ3MfgSuipBVMXslMPH/vZ+nM40LkA=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "c3912035d00ef755ab19394488b41feab95d2e40",
+        "rev": "df1eee2aa65052a18121ed4971081576b25d6b5c",
        "type": "github"
      },
      "original": {
        "owner": "NixOS",
-        "ref": "release-22.11",
+        "ref": "nixpkgs-unstable",
        "repo": "nixpkgs",
        "type": "github"
      }
    },
    "root": {
      "inputs": {
-        "flake-utils": "flake-utils",
        "nixpkgs": "nixpkgs"
      }
    }
--- a/csharp/flake.nix
+++ b/csharp/flake.nix
@ -1,31 +1,30 @@
 {
  description = "A Nix-flake-based C# development environment";

-  inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/release-22.11";
-    flake-utils.url = "github:numtide/flake-utils";
-  };
+  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";

  outputs =
    { self
    , nixpkgs
-    , flake-utils
    }:

-    flake-utils.lib.eachDefaultSystem (system:
    let
-      pkgs = import nixpkgs { inherit system; };
-    in
-    {
-      devShells.default = pkgs.mkShell {
-        packages = with pkgs; [
-          #dotnet-sdk_6
-          dotnet-sdk_7
-          #dotnet-sdk_8
-          omnisharp-roslyn
-          mono
-          msbuild
-        ];
-      };
-    });
+      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 {
+          packages = with pkgs; [
+            #dotnet-sdk_6
+            dotnet-sdk_7
+            #dotnet-sdk_8
+            omnisharp-roslyn
+            mono
+            msbuild
+          ];
+        };
+      });
+    };
 }
--- a/cue/.envrc
+++ b/cue/.envrc
@ -1 +1 @@
-use flake .
+use flake
--- a/dhall/.envrc
+++ b/dhall/.envrc
@ -1 +1 @@
-use flake .
+use flake
--- a/elixir/.envrc
+++ b/elixir/.envrc
@ -1 +1 @@
-use flake .
+use flake
--- a/elm/.envrc
+++ b/elm/.envrc
@ -1 +1 @@
-use flake .
+use flake
--- a/flake.lock
+++ b/flake.lock
@ -1,12 +1,15 @@
 {
  "nodes": {
    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
      "locked": {
-        "lastModified": 1676283394,
-        "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
+        "lastModified": 1689068808,
+        "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
+        "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
        "type": "github"
      },
      "original": {
@ -17,11 +20,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1677995890,
-        "narHash": "sha256-eOnCn0o3I6LP48fAi8xWFcn49V2rL7oX5jCtJTeN1LI=",
+        "lastModified": 1689261696,
+        "narHash": "sha256-LzfUtFs9MQRvIoQ3MfgSuipBVMXslMPH/vZ+nM40LkA=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "a1240f6b4a0bcc84fc48008b396a140d9f3638f6",
+        "rev": "df1eee2aa65052a18121ed4971081576b25d6b5c",
        "type": "github"
      },
      "original": {
@ -36,6 +39,21 @@
        "flake-utils": "flake-utils",
        "nixpkgs": "nixpkgs"
      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
    }
  },
  "root": "root",
--- a/gleam/.envrc
+++ b/gleam/.envrc
@ -1 +1 @@
-use flake .
+use flake
--- a/go/.envrc
+++ b/go/.envrc
@ -1 +1 @@
-use flake .
+use flake
--- a/hashi/.envrc
+++ b/hashi/.envrc
@ -1 +1 @@
-use flake .
+use flake
--- a/haskell/.envrc
+++ b/haskell/.envrc
@ -1 +1 @@
-use flake .
+use flake
--- a/java/.envrc
+++ b/java/.envrc
@ -1 +1 @@
-use flake .
+use flake
--- a/kotlin/.envrc
+++ b/kotlin/.envrc
@ -1 +1 @@
-use flake .
+use flake
--- a/latex/.envrc
+++ b/latex/.envrc
@ -1 +1 @@
-use flake .
+use flake
--- a/nickel/.envrc
+++ b/nickel/.envrc
@ -1 +1 @@
-use flake .
+use flake
--- a/nim/.envrc
+++ b/nim/.envrc
@ -1 +1 @@
-use flake .
+use flake
--- a/nix/.envrc
+++ b/nix/.envrc
@ -1 +1 @@
-use flake .
+use flake
--- a/node/.envrc
+++ b/node/.envrc
@ -1 +1 @@
-use flake .
+use flake
--- a/ocaml/.envrc
+++ b/ocaml/.envrc
@ -1 +1 @@
-use flake .
+use flake
--- a/opa/.envrc
+++ b/opa/.envrc
@ -1 +1 @@
-use flake .
+use flake
--- a/php/.envrc
+++ b/php/.envrc
@ -1 +1 @@
-use flake .
+use flake
--- a/protobuf/.envrc
+++ b/protobuf/.envrc
@ -1 +1 @@
-use flake .
+use flake
--- a/purescript/.envrc
+++ b/purescript/.envrc
@ -1 +1 @@
-use flake .
+use flake
--- a/python/.envrc
+++ b/python/.envrc
@ -1 +1 @@
-use flake .
+use flake
--- a/ruby/.envrc
+++ b/ruby/.envrc
@ -1 +1 @@
-use flake .
+use flake
--- a/rust-toolchain/.envrc
+++ b/rust-toolchain/.envrc
@ -1 +1 @@
-use flake .
+use flake
--- a/rust/.envrc
+++ b/rust/.envrc
@ -1 +1 @@
-use flake .
+use flake
--- a/scala/.envrc
+++ b/scala/.envrc
@ -1 +1 @@
-use flake .
+use flake
--- a/shell/.envrc
+++ b/shell/.envrc
@ -1 +1 @@
-use flake .
+use flake
--- a/zig/.envrc
+++ b/zig/.envrc
@ -1 +1 @@
-use flake .
+use flake