Skip to content

Commit 298d04d

Browse files
authored
chore: update nix deps (#111)
Signed-off-by: Sylvain Rabot <sylvain@formance.com>
1 parent b7a618e commit 298d04d

2 files changed

Lines changed: 55 additions & 33 deletions

File tree

flake.lock

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

flake.nix

Lines changed: 31 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
{
2-
description = "A Nix-flake-based Go 1.23 development environment";
2+
description = "A Nix-flake-based Go 1.25 development environment";
33

44
inputs = {
5-
nixpkgs.url = "https://flakehub.com/f/NixOS/nixpkgs/0.1.*.tar.gz";
5+
nixpkgs.url = "https://flakehub.com/f/NixOS/nixpkgs/0.2511";
6+
nixpkgs-unstable.url = "https://flakehub.com/f/NixOS/nixpkgs/0.1";
67

78
nur = {
89
url = "github:nix-community/NUR";
910
inputs.nixpkgs.follows = "nixpkgs";
1011
};
1112
};
1213

13-
outputs = { self, nixpkgs, nur }:
14+
outputs = { self, nixpkgs, nixpkgs-unstable, nur }:
1415
let
15-
goVersion = 23;
16-
1716
supportedSystems = [
1817
"x86_64-linux"
1918
"aarch64-linux"
@@ -26,33 +25,41 @@
2625
let
2726
pkgs = import nixpkgs {
2827
inherit system;
29-
overlays = [ self.overlays.default nur.overlays.default ];
30-
config = { allowUnfree = true; };
28+
overlays = [ nur.overlays.default ];
29+
config.allowUnfreePredicate = pkg: builtins.elem (nixpkgs.lib.getName pkg) [
30+
"goreleaser-pro"
31+
];
32+
};
33+
pkgs-unstable = import nixpkgs-unstable {
34+
inherit system;
3135
};
3236
in
33-
f { pkgs = pkgs; system = system; }
37+
f { pkgs = pkgs; pkgs-unstable = pkgs-unstable; system = system; }
3438
);
3539
in
3640
{
37-
overlays.default = final: prev: {
38-
go = final."go_1_${toString goVersion}";
39-
};
40-
41-
devShells = forEachSupportedSystem ({ pkgs, system }:
41+
devShells = forEachSupportedSystem ({ pkgs, pkgs-unstable, system }:
42+
let
43+
stablePackages = with pkgs; [
44+
antlr
45+
ginkgo
46+
go_1_25
47+
goperf
48+
gotools
49+
just
50+
];
51+
unstablePackages = with pkgs-unstable; [
52+
golangci-lint
53+
];
54+
otherPackages = [
55+
pkgs.nur.repos.goreleaser.goreleaser-pro
56+
];
57+
in
4258
{
4359
default = pkgs.mkShell {
44-
packages = with pkgs; [
45-
go
46-
gotools
47-
golangci-lint
48-
ginkgo
49-
pkgs.nur.repos.goreleaser.goreleaser-pro
50-
just
51-
goperf
52-
antlr
53-
];
60+
packages = stablePackages ++ unstablePackages ++ otherPackages;
5461
};
5562
}
5663
);
5764
};
58-
}
65+
}

0 commit comments

Comments
 (0)