summaryrefslogtreecommitdiff
path: root/Omni/Bild/Nixpkgs.nix
diff options
context:
space:
mode:
authorBen Sima <ben@bsima.me>2024-12-31 13:48:05 -0500
committerBen Sima <ben@bsima.me>2024-12-31 13:48:05 -0500
commit3790d334c994db7a0e1eac9c130c2b1316c78c35 (patch)
treedf8bb9ecc6f1273864f8fc88082906526e0ab324 /Omni/Bild/Nixpkgs.nix
parent27904066fd204a2b844c27132e86f83acf217eed (diff)
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.
Diffstat (limited to 'Omni/Bild/Nixpkgs.nix')
-rw-r--r--Omni/Bild/Nixpkgs.nix14
1 files changed, 5 insertions, 9 deletions
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;
}