mirror of
https://github.com/ilyakooo0/haskell.nix.git
synced 2024-09-11 06:55:40 +03:00
Add nixpkgs-unstable (#1025)
This commit is contained in:
parent
9b7f24b059
commit
250509f23f
@ -457,7 +457,7 @@ let
|
||||
preBuild postBuild
|
||||
preInstall postInstall;
|
||||
}
|
||||
// lib.optionalAttrs (hardeningDisable != []) {
|
||||
inherit hardeningDisable;
|
||||
// lib.optionalAttrs (hardeningDisable != [] || stdenv.hostPlatform.isMusl) {
|
||||
hardeningDisable = hardeningDisable ++ lib.optional stdenv.hostPlatform.isMusl "pie";
|
||||
});
|
||||
in drv; in self)
|
||||
|
4
ci.nix
4
ci.nix
@ -11,6 +11,7 @@
|
||||
nixpkgsVersions = {
|
||||
"R2003" = "nixpkgs-2003";
|
||||
"R2009" = "nixpkgs-2009";
|
||||
"unstable" = "nixpkgs-unstable";
|
||||
};
|
||||
compilerNixNames = nixpkgsName: nixpkgs: builtins.mapAttrs (compiler-nix-name: runTests: {
|
||||
inherit (import ./default.nix { inherit checkMaterialization; }) nixpkgsArgs;
|
||||
@ -30,6 +31,9 @@
|
||||
ghc8102 = false;
|
||||
ghc8103 = true;
|
||||
ghc810220201118 = false;
|
||||
} // nixpkgs.lib.optionalAttrs (nixpkgsName == "unstable") {
|
||||
ghc884 = true;
|
||||
ghc8103 = true;
|
||||
});
|
||||
systems = nixpkgs: nixpkgs.lib.filterAttrs (_: v: builtins.elem v supportedSystems) {
|
||||
# I wanted to take these from 'lib.systems.examples', but apparently there isn't one for linux!
|
||||
|
@ -25,4 +25,5 @@
|
||||
allOverlays = import ./overlays args;
|
||||
nixpkgsArgs = { inherit config overlays system; };
|
||||
pkgs = import sources.nixpkgs nixpkgsArgs;
|
||||
pkgs-unstable = import sources.nixpkgs-unstable nixpkgsArgs;
|
||||
}
|
||||
|
@ -116,5 +116,17 @@
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/NixOS/nixpkgs/archive/f02bf8ffb9a5ec5e8f6f66f1e5544fd2aa1a0693.tar.gz",
|
||||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
||||
},
|
||||
"nixpkgs-unstable": {
|
||||
"branch": "nixpkgs-unstable",
|
||||
"description": "Nix Packages collection",
|
||||
"homepage": "",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "410bbd828cdc6156aecd5bc91772ad3a6b1099c7",
|
||||
"sha256": "0idvgvpgnzvk03yvd77lrca9qib936fq2x690jvk5gk3blsckz3r",
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/NixOS/nixpkgs/archive/410bbd828cdc6156aecd5bc91772ad3a6b1099c7.tar.gz",
|
||||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user