diff --git a/builder/comp-builder.nix b/builder/comp-builder.nix index cce4ba8866..bcbc4be2bf 100644 --- a/builder/comp-builder.nix +++ b/builder/comp-builder.nix @@ -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) diff --git a/ci.nix b/ci.nix index 435aeb4eb7..a3d615b2d0 100644 --- a/ci.nix +++ b/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! diff --git a/default.nix b/default.nix index 93f79cbf3b..8573df4eeb 100644 --- a/default.nix +++ b/default.nix @@ -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; } diff --git a/nix/sources.json b/nix/sources.json index f973dac157..365f2698d3 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -116,5 +116,17 @@ "type": "tarball", "url": "https://github.com/NixOS/nixpkgs/archive/f02bf8ffb9a5ec5e8f6f66f1e5544fd2aa1a0693.tar.gz", "url_template": "https://github.com///archive/.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///archive/.tar.gz" } }