Skip to content

Commit db0398d

Browse files
committed
Update clojure and csharp
1 parent a588709 commit db0398d

File tree

35 files changed

+98
-124
lines changed

35 files changed

+98
-124
lines changed

.envrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
use flake .
1+
use flake

clojure/.envrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
use flake .
1+
use flake

clojure/flake.lock

Lines changed: 4 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

clojure/flake.nix

Lines changed: 17 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,32 @@
11
{
22
description = "A Nix-flake-based Clojure development environment";
33

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

96
outputs =
107
{ self
118
, nixpkgs
12-
, flake-utils
139
}:
1410

15-
flake-utils.lib.eachDefaultSystem (system:
1611
let
1712
javaVersion = 17;
1813
overlays = [
19-
(self: super: rec {
20-
jdk = super."jdk${toString javaVersion}";
21-
boot = super.boot.override {
22-
inherit jdk;
23-
};
24-
clojure = super.clojure.override {
25-
inherit jdk;
26-
};
27-
leiningen = super.leiningen.override {
28-
inherit jdk;
29-
};
14+
(final: prev: rec {
15+
jdk = prev."jdk${toString javaVersion}";
16+
boot = prev.boot.override { inherit jdk; };
17+
clojure = prev.clojure.override { inherit jdk; };
18+
leiningen = prev.leiningen.override { inherit jdk; };
3019
})
3120
];
32-
pkgs = import nixpkgs { inherit overlays system; };
33-
in
34-
{
35-
devShells.default = pkgs.mkShell {
36-
packages = with pkgs; [ boot clojure leiningen ];
37-
38-
shellHook = ''
39-
${pkgs.clojure}/bin/clj --version
40-
'';
41-
};
42-
});
21+
supportedSystems = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
22+
forEachSupportedSystem = f: nixpkgs.lib.genAttrs supportedSystems (system: f {
23+
pkgs = import nixpkgs { inherit overlays system; };
24+
});
25+
in {
26+
devShells = forEachSupportedSystem ({ pkgs }: {
27+
default = pkgs.mkShell {
28+
packages = with pkgs; [ boot clojure leiningen ];
29+
};
30+
});
31+
};
4332
}

csharp/.envrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
use flake .
1+
use flake

csharp/flake.lock

Lines changed: 4 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

csharp/flake.nix

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,30 @@
11
{
22
description = "A Nix-flake-based C# development environment";
33

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

96
outputs =
107
{ self
118
, nixpkgs
12-
, flake-utils
139
}:
1410

15-
flake-utils.lib.eachDefaultSystem (system:
1611
let
17-
pkgs = import nixpkgs { inherit system; };
18-
in
19-
{
20-
devShells.default = pkgs.mkShell {
21-
packages = with pkgs; [
22-
#dotnet-sdk_6
23-
dotnet-sdk_7
24-
#dotnet-sdk_8
25-
omnisharp-roslyn
26-
mono
27-
msbuild
28-
];
29-
};
30-
});
12+
supportedSystems = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
13+
forEachSupportedSystem = f: nixpkgs.lib.genAttrs supportedSystems (system: f {
14+
pkgs = import nixpkgs { inherit system; };
15+
});
16+
in {
17+
devShells = forEachSupportedSystem ({ pkgs }: {
18+
default = pkgs.mkShell {
19+
packages = with pkgs; [
20+
#dotnet-sdk_6
21+
dotnet-sdk_7
22+
#dotnet-sdk_8
23+
omnisharp-roslyn
24+
mono
25+
msbuild
26+
];
27+
};
28+
});
29+
};
3130
}

cue/.envrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
use flake .
1+
use flake

dhall/.envrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
use flake .
1+
use flake

elixir/.envrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
use flake .
1+
use flake

0 commit comments

Comments
 (0)