250509f · haskell.nix · git.iko.soy

builder/comp-builder.nix+2−2

compare with iko/ghcjs-patch-master

unifiedsplit

@@ -457,7 +457,7 @@ let

457 preBuild postBuild

458 preInstall postInstall;

459 }

460− // lib.optionalAttrs (hardeningDisable != []) {

460+ // lib.optionalAttrs (hardeningDisable != [] || stdenv.hostPlatform.isMusl) {

461− inherit hardeningDisable;

461+ hardeningDisable = hardeningDisable ++ lib.optional stdenv.hostPlatform.isMusl "pie";

462 });

463in drv; in self)

ci.nix+4

@@ -11,6 +11,7 @@

11 nixpkgsVersions = {

12 "R2003" = "nixpkgs-2003";

13 "R2009" = "nixpkgs-2009";

14+ "unstable" = "nixpkgs-unstable";

14 };

15 };

15 compilerNixNames = nixpkgsName: nixpkgs: builtins.mapAttrs (compiler-nix-name: runTests: {

16 compilerNixNames = nixpkgsName: nixpkgs: builtins.mapAttrs (compiler-nix-name: runTests: {

16 inherit (import ./default.nix { inherit checkMaterialization; }) nixpkgsArgs;

17 inherit (import ./default.nix { inherit checkMaterialization; }) nixpkgsArgs;

@@ -30,6 +31,9 @@

30 ghc8102 = false;

31 ghc8102 = false;

31 ghc8103 = true;

32 ghc8103 = true;

32 ghc810220201118 = false;

33 ghc810220201118 = false;

34+ } // nixpkgs.lib.optionalAttrs (nixpkgsName == "unstable") {

35+ ghc884 = true;

36+ ghc8103 = true;

33 });

37 });

34 systems = nixpkgs: nixpkgs.lib.filterAttrs (_: v: builtins.elem v supportedSystems) {

38 systems = nixpkgs: nixpkgs.lib.filterAttrs (_: v: builtins.elem v supportedSystems) {

35 # I wanted to take these from 'lib.systems.examples', but apparently there isn't one for linux!

39 # I wanted to take these from 'lib.systems.examples', but apparently there isn't one for linux!

default.nix+1

@@ -25,4 +25,5 @@

25 allOverlays = import ./overlays args;

26 nixpkgsArgs = { inherit config overlays system; };

27 pkgs = import sources.nixpkgs nixpkgsArgs;

28+ pkgs-unstable = import sources.nixpkgs-unstable nixpkgsArgs;

28}

29}

nix/sources.json+12

@@ -116,5 +116,17 @@

116 "type": "tarball",

117 "url": "https://github.com/NixOS/nixpkgs/archive/f02bf8ffb9a5ec5e8f6f66f1e5544fd2aa1a0693.tar.gz",

118 "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"

119 }

131 }

120}

132}