Update clojure and csharp

This commit is contained in:
Luc Perkins 2023-07-13 15:15:22 -07:00
parent a5887091c4
commit db0398d60d
No known key found for this signature in database
GPG key ID: CED8419FB058467A
35 changed files with 98 additions and 124 deletions

2
.envrc
View file

@ -1 +1 @@
use flake . use flake

View file

@ -1 +1 @@
use flake . use flake

View file

@ -1,39 +1,23 @@
{ {
"nodes": { "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": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1677655039, "lastModified": 1689261696,
"narHash": "sha256-IsU0SSBUOr/qYTkiwIgXQ91Io/2bfXI7PG4MoJritLA=", "narHash": "sha256-LzfUtFs9MQRvIoQ3MfgSuipBVMXslMPH/vZ+nM40LkA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "96a40fa5e8dee644ba60c8a966adadd2d448104a", "rev": "df1eee2aa65052a18121ed4971081576b25d6b5c",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "release-22.11", "ref": "nixpkgs-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"root": { "root": {
"inputs": { "inputs": {
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
} }
} }

View file

@ -1,43 +1,32 @@
{ {
description = "A Nix-flake-based Clojure development environment"; description = "A Nix-flake-based Clojure development environment";
inputs = { inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
nixpkgs.url = "github:NixOS/nixpkgs/release-22.11";
flake-utils.url = "github:numtide/flake-utils";
};
outputs = outputs =
{ self { self
, nixpkgs , nixpkgs
, flake-utils
}: }:
flake-utils.lib.eachDefaultSystem (system:
let let
javaVersion = 17; javaVersion = 17;
overlays = [ overlays = [
(self: super: rec { (final: prev: rec {
jdk = super."jdk${toString javaVersion}"; jdk = prev."jdk${toString javaVersion}";
boot = super.boot.override { boot = prev.boot.override { inherit jdk; };
inherit jdk; clojure = prev.clojure.override { inherit jdk; };
}; leiningen = prev.leiningen.override { inherit jdk; };
clojure = super.clojure.override {
inherit jdk;
};
leiningen = super.leiningen.override {
inherit jdk;
};
}) })
]; ];
pkgs = import nixpkgs { inherit overlays system; }; supportedSystems = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
in forEachSupportedSystem = f: nixpkgs.lib.genAttrs supportedSystems (system: f {
{ pkgs = import nixpkgs { inherit overlays system; };
devShells.default = pkgs.mkShell { });
packages = with pkgs; [ boot clojure leiningen ]; in {
devShells = forEachSupportedSystem ({ pkgs }: {
shellHook = '' default = pkgs.mkShell {
${pkgs.clojure}/bin/clj --version packages = with pkgs; [ boot clojure leiningen ];
''; };
}; });
}); };
} }

View file

@ -1 +1 @@
use flake . use flake

View file

@ -1,39 +1,23 @@
{ {
"nodes": { "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": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1679163677, "lastModified": 1689261696,
"narHash": "sha256-VC0tc3EjJZFPXgucFQAYMIHce5nJWYR0kVCk4TVg6gg=", "narHash": "sha256-LzfUtFs9MQRvIoQ3MfgSuipBVMXslMPH/vZ+nM40LkA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c3912035d00ef755ab19394488b41feab95d2e40", "rev": "df1eee2aa65052a18121ed4971081576b25d6b5c",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "release-22.11", "ref": "nixpkgs-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"root": { "root": {
"inputs": { "inputs": {
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
} }
} }

View file

@ -1,31 +1,30 @@
{ {
description = "A Nix-flake-based C# development environment"; description = "A Nix-flake-based C# development environment";
inputs = { inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
nixpkgs.url = "github:NixOS/nixpkgs/release-22.11";
flake-utils.url = "github:numtide/flake-utils";
};
outputs = outputs =
{ self { self
, nixpkgs , nixpkgs
, flake-utils
}: }:
flake-utils.lib.eachDefaultSystem (system:
let let
pkgs = import nixpkgs { inherit system; }; supportedSystems = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
in forEachSupportedSystem = f: nixpkgs.lib.genAttrs supportedSystems (system: f {
{ pkgs = import nixpkgs { inherit system; };
devShells.default = pkgs.mkShell { });
packages = with pkgs; [ in {
#dotnet-sdk_6 devShells = forEachSupportedSystem ({ pkgs }: {
dotnet-sdk_7 default = pkgs.mkShell {
#dotnet-sdk_8 packages = with pkgs; [
omnisharp-roslyn #dotnet-sdk_6
mono dotnet-sdk_7
msbuild #dotnet-sdk_8
]; omnisharp-roslyn
}; mono
}); msbuild
];
};
});
};
} }

View file

@ -1 +1 @@
use flake . use flake

View file

@ -1 +1 @@
use flake . use flake

View file

@ -1 +1 @@
use flake . use flake

View file

@ -1 +1 @@
use flake . use flake

View file

@ -1,12 +1,15 @@
{ {
"nodes": { "nodes": {
"flake-utils": { "flake-utils": {
"inputs": {
"systems": "systems"
},
"locked": { "locked": {
"lastModified": 1676283394, "lastModified": 1689068808,
"narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -17,11 +20,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1677995890, "lastModified": 1689261696,
"narHash": "sha256-eOnCn0o3I6LP48fAi8xWFcn49V2rL7oX5jCtJTeN1LI=", "narHash": "sha256-LzfUtFs9MQRvIoQ3MfgSuipBVMXslMPH/vZ+nM40LkA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a1240f6b4a0bcc84fc48008b396a140d9f3638f6", "rev": "df1eee2aa65052a18121ed4971081576b25d6b5c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -36,6 +39,21 @@
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"nixpkgs": "nixpkgs" "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", "root": "root",

View file

@ -1 +1 @@
use flake . use flake

View file

@ -1 +1 @@
use flake . use flake

View file

@ -1 +1 @@
use flake . use flake

View file

@ -1 +1 @@
use flake . use flake

View file

@ -1 +1 @@
use flake . use flake

View file

@ -1 +1 @@
use flake . use flake

View file

@ -1 +1 @@
use flake . use flake

View file

@ -1 +1 @@
use flake . use flake

View file

@ -1 +1 @@
use flake . use flake

View file

@ -1 +1 @@
use flake . use flake

View file

@ -1 +1 @@
use flake . use flake

View file

@ -1 +1 @@
use flake . use flake

View file

@ -1 +1 @@
use flake . use flake

View file

@ -1 +1 @@
use flake . use flake

View file

@ -1 +1 @@
use flake . use flake

View file

@ -1 +1 @@
use flake . use flake

View file

@ -1 +1 @@
use flake . use flake

View file

@ -1 +1 @@
use flake . use flake

View file

@ -1 +1 @@
use flake . use flake

View file

@ -1 +1 @@
use flake . use flake

View file

@ -1 +1 @@
use flake . use flake

View file

@ -1 +1 @@
use flake . use flake

View file

@ -1 +1 @@
use flake . use flake