Skip to content

Commit 4835f2b

Browse files
authored
Add nixpkgs-2305 and update other pins (#1971)
* Add nixpkgs-2305 and update other pins * ifdLevel 1 * ifdLevel 2 * ifdLevel 3 * Add missing materialized files
1 parent d07c42c commit 4835f2b

File tree

16 files changed

+11443
-7
lines changed

16 files changed

+11443
-7
lines changed

ci.nix

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
nixpkgsVersions = {
1515
"R2205" = "nixpkgs-2205";
1616
"R2211" = "nixpkgs-2211";
17+
"R2305" = "nixpkgs-2305";
1718
"unstable" = "nixpkgs-unstable";
1819
};
1920
haskellNix = compat { inherit checkMaterialization system; };
@@ -52,6 +53,12 @@
5253
ghc902 = false;
5354
ghc928 = false;
5455
ghc945 = false;
56+
} // nixpkgs.lib.optionalAttrs (nixpkgsName == "R2305") {
57+
ghc8107 = false;
58+
ghc902 = false;
59+
ghc928 = false;
60+
ghc945 = false;
61+
ghc962 = false;
5562
} // nixpkgs.lib.optionalAttrs (nixpkgsName == "unstable") {
5663
ghc884 = false;
5764
ghc8107 = true;

flake.lock

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

flake.nix

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
nixpkgs-2111 = { url = "github:NixOS/nixpkgs/nixpkgs-21.11-darwin"; };
99
nixpkgs-2205 = { url = "github:NixOS/nixpkgs/nixpkgs-22.05-darwin"; };
1010
nixpkgs-2211 = { url = "github:NixOS/nixpkgs/nixpkgs-22.11-darwin"; };
11+
nixpkgs-2305 = { url = "github:NixOS/nixpkgs/nixpkgs-23.05-darwin"; };
1112
nixpkgs-unstable = { url = "github:NixOS/nixpkgs/nixpkgs-unstable"; };
1213
flake-compat = { url = "github:input-output-hk/flake-compat/hkm/gitlab-fix"; flake = false; };
1314
flake-utils = { url = "github:hamishmack/flake-utils/hkm/nested-hydraJobs"; };
@@ -64,7 +65,7 @@
6465
};
6566
};
6667

67-
outputs = { self, nixpkgs, nixpkgs-unstable, nixpkgs-2105, nixpkgs-2111, nixpkgs-2205, nixpkgs-2211, flake-utils, ... }@inputs:
68+
outputs = { self, nixpkgs, nixpkgs-unstable, nixpkgs-2105, nixpkgs-2111, nixpkgs-2205, nixpkgs-2211, nixpkgs-2305, flake-utils, ... }@inputs:
6869
let compiler = "ghc928";
6970
config = import ./config.nix;
7071

@@ -124,6 +125,8 @@
124125
(nixpkgsArgs // { localSystem = { inherit system; }; });
125126
pkgs-2211 = import nixpkgs-2211
126127
(nixpkgsArgs // { localSystem = { inherit system; }; });
128+
pkgs-2305 = import nixpkgs-2305
129+
(nixpkgsArgs // { localSystem = { inherit system; }; });
127130
pkgs-unstable = import nixpkgs-unstable
128131
(nixpkgsArgs // { localSystem = { inherit system; }; });
129132
hix = import ./hix/default.nix { inherit pkgs; };

0 commit comments

Comments
 (0)