git.iko.soy/haskell.nix
on iko/ghcjs-patch-master help sign in
Add nixpkgs-unstable (#1025)
commit250509f23f30c967ada2e607ff3b0f30655ad0b2 authorHamish Mackenzie <Hamish.Mackenzie@iohk.io> dateWed 3 Feb 2021, 22:38 (6 years ago) parent9b7f24b
4 files changed+19−2
compare with iko/ghcjs-patch-master
unifiedsplit
builder/comp-builder.nix+2−2 ci.nix+4 default.nix+1 nix/sources.json+12
builder/comp-builder.nix+2−2
@@ -457,7 +457,7 @@ let
457457 preBuild postBuild
458458 preInstall postInstall;
459459 }
460− // lib.optionalAttrs (hardeningDisable != []) {
461− inherit hardeningDisable;
460+ // lib.optionalAttrs (hardeningDisable != [] || stdenv.hostPlatform.isMusl) {
461+ hardeningDisable = hardeningDisable ++ lib.optional stdenv.hostPlatform.isMusl "pie";
462462 });
463463in drv; in self)
ci.nix+4
@@ -11,6 +11,7 @@
1111 nixpkgsVersions = {
1212 "R2003" = "nixpkgs-2003";
1313 "R2009" = "nixpkgs-2009";
14+ "unstable" = "nixpkgs-unstable";
1415 };
1516 compilerNixNames = nixpkgsName: nixpkgs: builtins.mapAttrs (compiler-nix-name: runTests: {
1617 inherit (import ./default.nix { inherit checkMaterialization; }) nixpkgsArgs;
@@ -30,6 +31,9 @@
3031 ghc8102 = false;
3132 ghc8103 = true;
3233 ghc810220201118 = false;
34+ } // nixpkgs.lib.optionalAttrs (nixpkgsName == "unstable") {
35+ ghc884 = true;
36+ ghc8103 = true;
3337 });
3438 systems = nixpkgs: nixpkgs.lib.filterAttrs (_: v: builtins.elem v supportedSystems) {
3539 # I wanted to take these from 'lib.systems.examples', but apparently there isn't one for linux!
default.nix+1
@@ -25,4 +25,5 @@
2525 allOverlays = import ./overlays args;
2626 nixpkgsArgs = { inherit config overlays system; };
2727 pkgs = import sources.nixpkgs nixpkgsArgs;
28+ pkgs-unstable = import sources.nixpkgs-unstable nixpkgsArgs;
2829}
nix/sources.json+12
@@ -116,5 +116,17 @@
116116 "type": "tarball",
117117 "url": "https://github.com/NixOS/nixpkgs/archive/f02bf8ffb9a5ec5e8f6f66f1e5544fd2aa1a0693.tar.gz",
118118 "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
119+ },
120+ "nixpkgs-unstable": {
121+ "branch": "nixpkgs-unstable",
122+ "description": "Nix Packages collection",
123+ "homepage": "",
124+ "owner": "NixOS",
125+ "repo": "nixpkgs",
126+ "rev": "410bbd828cdc6156aecd5bc91772ad3a6b1099c7",
127+ "sha256": "0idvgvpgnzvk03yvd77lrca9qib936fq2x690jvk5gk3blsckz3r",
128+ "type": "tarball",
129+ "url": "https://github.com/NixOS/nixpkgs/archive/410bbd828cdc6156aecd5bc91772ad3a6b1099c7.tar.gz",
130+ "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
119131 }
120132}