ilyakooo0/haskell.nix
1
0
Fork 0
mirror of https://github.com/ilyakooo0/haskell.nix.git synced 2024-11-04 13:57:22 +03:00
Code Issues Projects Releases Wiki Activity

Bump nixos-21.05 pin (bintools import fix) and use as default. (#1229)

Browse Source
This commit is contained in:
Jean-Baptiste Giraudeau 2021-09-04 06:15:31 +02:00 committed by GitHub
parent 2e1162ac5c
commit ba9346d501
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
default.nix
View File

@ -1,10 +1,10 @@
{...}@args: {...}@args:
let let
nixpkgsSrc = nixpkgsSrc =
builtins.fetchTarball { builtins.fetchTarball {
url = "https://github.com/NixOS/nixpkgs/archive/3c6f3f84af60a8ed5b8a79cf3026b7630fcdefb8.tar.gz"; url = "https://github.com/NixOS/nixpkgs/archive/110a2c9ebbf5d4a94486854f18a37a938cfacbbb.tar.gz";
sha256 = "sha256:0jf9l6j60sa8cms7r4a02kr9j9884pwv1prf79b2ysnxmnhimnch"; sha256 = "sha256-leWXLchbAbqOlLT6tju631G40SzQWPqaAXQG3zH1Imw=";
}; };
pkgs = args.pkgs or (import nixpkgsSrc {}); pkgs = args.pkgs or (import nixpkgsSrc {});
flake-compat = flake-compat =

26
flake.lock
View File

@ -146,22 +146,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs": {
"locked": {
"lastModified": 1624291665,
"narHash": "sha256-kNkaoa3dai9WOi7fsPklCCWZ8hRAkXx0ZUhpYKShyUk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "3c6f3f84af60a8ed5b8a79cf3026b7630fcdefb8",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-20.09-darwin",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-2003": { "nixpkgs-2003": {
"locked": { "locked": {
"lastModified": 1620055814, "lastModified": 1620055814,
@ -196,11 +180,11 @@
}, },
"nixpkgs-2105": { "nixpkgs-2105": {
"locked": { "locked": {
"lastModified": 1624291665, "lastModified": 1630481079,
"narHash": "sha256-kNkaoa3dai9WOi7fsPklCCWZ8hRAkXx0ZUhpYKShyUk=", "narHash": "sha256-leWXLchbAbqOlLT6tju631G40SzQWPqaAXQG3zH1Imw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3c6f3f84af60a8ed5b8a79cf3026b7630fcdefb8", "rev": "110a2c9ebbf5d4a94486854f18a37a938cfacbbb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -254,7 +238,9 @@
"hackage": "hackage", "hackage": "hackage",
"hpc-coveralls": "hpc-coveralls", "hpc-coveralls": "hpc-coveralls",
"nix-tools": "nix-tools", "nix-tools": "nix-tools",
"nixpkgs": "nixpkgs", "nixpkgs": [
"nixpkgs-2105"
],
"nixpkgs-2003": "nixpkgs-2003", "nixpkgs-2003": "nixpkgs-2003",
"nixpkgs-2009": "nixpkgs-2009", "nixpkgs-2009": "nixpkgs-2009",
"nixpkgs-2105": "nixpkgs-2105", "nixpkgs-2105": "nixpkgs-2105",

4
flake.nix
View File

@ -2,7 +2,7 @@
description = "Alternative Haskell Infrastructure for Nixpkgs"; description = "Alternative Haskell Infrastructure for Nixpkgs";
inputs = { inputs = {
nixpkgs = { url = "github:NixOS/nixpkgs/nixpkgs-20.09-darwin"; }; nixpkgs.follows = "nixpkgs-2105";
nixpkgs-2003 = { url = "github:NixOS/nixpkgs/nixpkgs-20.03-darwin"; }; nixpkgs-2003 = { url = "github:NixOS/nixpkgs/nixpkgs-20.03-darwin"; };
nixpkgs-2009 = { url = "github:NixOS/nixpkgs/nixpkgs-20.09-darwin"; }; nixpkgs-2009 = { url = "github:NixOS/nixpkgs/nixpkgs-20.09-darwin"; };
nixpkgs-2105 = { url = "github:NixOS/nixpkgs/nixpkgs-21.05-darwin"; }; nixpkgs-2105 = { url = "github:NixOS/nixpkgs/nixpkgs-21.05-darwin"; };
@ -64,7 +64,7 @@
inherit config; inherit config;
overlays = [ self.overlay ]; overlays = [ self.overlay ];
}; };
sources = inputs; sources = inputs;
overlaysOverrideable = import ./overlays; overlaysOverrideable = import ./overlays;