diff options
author | Ryan Trinkle <ryan.trinkle@gmail.com> | 2016-07-27 12:26:45 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-07-27 12:26:45 -0400 |
commit | 0905aea14e6dc6462288de63858d27158831b7bc (patch) | |
tree | 6c37ec5a752a4a7e080ebc210c2f89c598761c9e | |
parent | 86393cfc205c4f8d474b928878b45b118f2c7b16 (diff) | |
parent | c564997ba0372147a2b0f376073fdfdd37306152 (diff) | |
download | nixpkgs-0905aea14e6dc6462288de63858d27158831b7bc.tar nixpkgs-0905aea14e6dc6462288de63858d27158831b7bc.tar.gz nixpkgs-0905aea14e6dc6462288de63858d27158831b7bc.tar.bz2 nixpkgs-0905aea14e6dc6462288de63858d27158831b7bc.tar.lz nixpkgs-0905aea14e6dc6462288de63858d27158831b7bc.tar.xz nixpkgs-0905aea14e6dc6462288de63858d27158831b7bc.tar.zst nixpkgs-0905aea14e6dc6462288de63858d27158831b7bc.zip |
Merge pull request #17276 from ryantrinkle/ghcjs-8.0-support
ghcjs: refactor stage2 handling
-rw-r--r-- | pkgs/development/compilers/ghcjs/default.nix | 3 | ||||
-rwxr-xr-x[-rw-r--r--] | pkgs/development/compilers/ghcjs/gen-stage2.rb (renamed from pkgs/development/haskell-modules/ghcjs/gen-stage2.rb) | 5 | ||||
-rw-r--r-- | pkgs/development/compilers/ghcjs/stage2.nix (renamed from pkgs/development/haskell-modules/ghcjs/stage2.nix) | 2 | ||||
-rw-r--r-- | pkgs/development/haskell-modules/configuration-ghcjs.nix | 6 |
4 files changed, 9 insertions, 7 deletions
diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix index fb8d789f533..f677cd77122 100644 --- a/pkgs/development/compilers/ghcjs/default.nix +++ b/pkgs/development/compilers/ghcjs/default.nix @@ -136,6 +136,9 @@ in mkDerivation (rec { isGhcjs = true; inherit nodejs ghcjsBoot; inherit (ghcjsNodePkgs) "socket.io"; + mkStage2 = import ./stage2.nix { + inherit ghcjsBoot; + }; }; homepage = "https://github.com/ghcjs/ghcjs"; diff --git a/pkgs/development/haskell-modules/ghcjs/gen-stage2.rb b/pkgs/development/compilers/ghcjs/gen-stage2.rb index c801dbe3e4b..709e635db55 100644..100755 --- a/pkgs/development/haskell-modules/ghcjs/gen-stage2.rb +++ b/pkgs/development/compilers/ghcjs/gen-stage2.rb @@ -26,10 +26,10 @@ stage2_packages = [ ] nixpkgs = File.expand_path("../../../../..", __FILE__) -boot = `nix-build #{nixpkgs} -A haskell.packages.ghcjs.ghc.ghcjsBoot`.chomp +boot = ARGV[0] || `nix-build #{nixpkgs} -A haskell.packages.ghcjs.ghc.ghcjsBoot`.chomp out = "".dup -out << "{ ghcjsBoot, callPackage }:\n" +out << "{ ghcjsBoot }: { callPackage }:\n" out << "\n" out << "{\n" @@ -37,6 +37,7 @@ stage2_packages.each do |package| name = Pathname.new(package).basename nix = `cabal2nix file://#{boot}/#{package} --jailbreak` nix.sub!(/src =.*?$/, "src = \"${ghcjsBoot}/#{package}\";") + nix.sub!(" doCheck = false;\n", "") nix.sub!("libraryHaskellDepends", "doCheck = false;\n libraryHaskellDepends") # cabal2nix somehow generates the deps for 'text' as if it had selected flag # 'integer-simple' (despite not passing the flag within the generated diff --git a/pkgs/development/haskell-modules/ghcjs/stage2.nix b/pkgs/development/compilers/ghcjs/stage2.nix index aca4c6c7828..8c68b6f15a6 100644 --- a/pkgs/development/haskell-modules/ghcjs/stage2.nix +++ b/pkgs/development/compilers/ghcjs/stage2.nix @@ -1,4 +1,4 @@ -{ ghcjsBoot, callPackage }: +{ ghcjsBoot }: { callPackage }: { async = callPackage diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix index d75a7f889aa..fffe29b1bc3 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix @@ -9,11 +9,9 @@ with import ./lib.nix { inherit pkgs; }; self: super: # The stage 2 packages. Regenerate with ./ghcjs/gen-stage2.rb - let stage2 = - (import ./ghcjs/stage2.nix { + let stage2 = super.ghc.mkStage2 { inherit (self) callPackage; - inherit (self.ghc) ghcjsBoot; - }); in stage2 // { + }; in stage2 // { old-time = overrideCabal stage2.old-time (drv: { postPatch = '' |