git.iko.soy/haskell.nix
on iko/ghcjs-patch-master help sign in
Bump nixos-21.05 pin (bintools import fix) and use as default. (#1229)
ba9346dJean-Baptiste Giraudeau
default.nix+3−3
compare with iko/ghcjs-patch-master
unifiedsplit
@@ -1,10 +1,10 @@
1{...}@args:
1{...}@args:
2
2
3let
3let
4− nixpkgsSrc =
4+ nixpkgsSrc =
5 builtins.fetchTarball {
5 builtins.fetchTarball {
6− url = "https://github.com/NixOS/nixpkgs/archive/3c6f3f84af60a8ed5b8a79cf3026b7630fcdefb8.tar.gz";
6+ url = "https://github.com/NixOS/nixpkgs/archive/110a2c9ebbf5d4a94486854f18a37a938cfacbbb.tar.gz";
7− sha256 = "sha256:0jf9l6j60sa8cms7r4a02kr9j9884pwv1prf79b2ysnxmnhimnch";
7+ sha256 = "sha256-leWXLchbAbqOlLT6tju631G40SzQWPqaAXQG3zH1Imw=";
8 };
8 };
9 pkgs = args.pkgs or (import nixpkgsSrc {});
9 pkgs = args.pkgs or (import nixpkgsSrc {});
10 flake-compat =
10 flake-compat =
flake.lock+6−20
@@ -146,22 +146,6 @@
146 "type": "github"
146 "type": "github"
147 }
147 }
148 },
148 },
149− "nixpkgs": {
150− "locked": {
151− "lastModified": 1624291665,
152− "narHash": "sha256-kNkaoa3dai9WOi7fsPklCCWZ8hRAkXx0ZUhpYKShyUk=",
153− "owner": "NixOS",
154− "repo": "nixpkgs",
155− "rev": "3c6f3f84af60a8ed5b8a79cf3026b7630fcdefb8",
156− "type": "github"
157− },
158− "original": {
159− "owner": "NixOS",
160− "ref": "nixpkgs-20.09-darwin",
161− "repo": "nixpkgs",
162− "type": "github"
163− }
164− },
165 "nixpkgs-2003": {
149 "nixpkgs-2003": {
166 "locked": {
150 "locked": {
167 "lastModified": 1620055814,
151 "lastModified": 1620055814,
@@ -196,11 +180,11 @@
196 },
180 },
197 "nixpkgs-2105": {
181 "nixpkgs-2105": {
198 "locked": {
182 "locked": {
199− "lastModified": 1624291665,
183+ "lastModified": 1630481079,
200− "narHash": "sha256-kNkaoa3dai9WOi7fsPklCCWZ8hRAkXx0ZUhpYKShyUk=",
184+ "narHash": "sha256-leWXLchbAbqOlLT6tju631G40SzQWPqaAXQG3zH1Imw=",
201 "owner": "NixOS",
185 "owner": "NixOS",
202 "repo": "nixpkgs",
186 "repo": "nixpkgs",
203− "rev": "3c6f3f84af60a8ed5b8a79cf3026b7630fcdefb8",
187+ "rev": "110a2c9ebbf5d4a94486854f18a37a938cfacbbb",
204 "type": "github"
188 "type": "github"
205 },
189 },
206 "original": {
190 "original": {
@@ -254,7 +238,9 @@
254 "hackage": "hackage",
238 "hackage": "hackage",
255 "hpc-coveralls": "hpc-coveralls",
239 "hpc-coveralls": "hpc-coveralls",
256 "nix-tools": "nix-tools",
240 "nix-tools": "nix-tools",
257− "nixpkgs": "nixpkgs",
241+ "nixpkgs": [
242+ "nixpkgs-2105"
243+ ],
258 "nixpkgs-2003": "nixpkgs-2003",
244 "nixpkgs-2003": "nixpkgs-2003",
259 "nixpkgs-2009": "nixpkgs-2009",
245 "nixpkgs-2009": "nixpkgs-2009",
260 "nixpkgs-2105": "nixpkgs-2105",
246 "nixpkgs-2105": "nixpkgs-2105",
flake.nix+2−2
@@ -2,7 +2,7 @@
2 description = "Alternative Haskell Infrastructure for Nixpkgs";
2 description = "Alternative Haskell Infrastructure for Nixpkgs";
3
3
4 inputs = {
4 inputs = {
5− nixpkgs = { url = "github:NixOS/nixpkgs/nixpkgs-20.09-darwin"; };
5+ nixpkgs.follows = "nixpkgs-2105";
6 nixpkgs-2003 = { url = "github:NixOS/nixpkgs/nixpkgs-20.03-darwin"; };
6 nixpkgs-2003 = { url = "github:NixOS/nixpkgs/nixpkgs-20.03-darwin"; };
7 nixpkgs-2009 = { url = "github:NixOS/nixpkgs/nixpkgs-20.09-darwin"; };
7 nixpkgs-2009 = { url = "github:NixOS/nixpkgs/nixpkgs-20.09-darwin"; };
8 nixpkgs-2105 = { url = "github:NixOS/nixpkgs/nixpkgs-21.05-darwin"; };
8 nixpkgs-2105 = { url = "github:NixOS/nixpkgs/nixpkgs-21.05-darwin"; };
@@ -64,7 +64,7 @@
64 inherit config;
64 inherit config;
65 overlays = [ self.overlay ];
65 overlays = [ self.overlay ];
66 };
66 };
67−
67+
68 sources = inputs;
68 sources = inputs;
69
69
70 overlaysOverrideable = import ./overlays;
70 overlaysOverrideable = import ./overlays;