From 3790d334c994db7a0e1eac9c130c2b1316c78c35 Mon Sep 17 00:00:00 2001 From: Ben Sima Date: Tue, 31 Dec 2024 13:48:05 -0500 Subject: Upgrade nixos 24.05 -> 24.11, ghc 9.4.8 -> 9.6.6 It's good to update, I think nixos 24.05 was deprecated anyway. The iPython dontCheck is because there was a test timeout; I don't even know why iPython is being pulled in but whatever. --- Omni/Bild/Nixpkgs.nix | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'Omni/Bild/Nixpkgs.nix') diff --git a/Omni/Bild/Nixpkgs.nix b/Omni/Bild/Nixpkgs.nix index 212e3f1..828021c 100644 --- a/Omni/Bild/Nixpkgs.nix +++ b/Omni/Bild/Nixpkgs.nix @@ -23,21 +23,17 @@ let (import ./Deps.nix) (import ./Python.nix) (import ./Haskell.nix) + # backport newer packages from unstable + (_: _: { unstable = nixos-unstable-small.pkgs; }) ]; nixos-unstable-small = import sources.nixos-unstable-small { inherit system config overlays; }; in { - nixos-24_05 = import sources.nixos-24_05 { - inherit system config; - overlays = overlays ++ [ - (_: _: { - # backport newer packages from unstable - unstable = nixos-unstable-small.pkgs; - }) - ]; - }; + nixos-24_05 = import sources.nixos-24_05 { inherit system config overlays; }; + + nixos-24_11 = import sources.nixos-24_11 { inherit system config overlays; }; inherit nixos-unstable-small; } -- cgit v1.2.3