diff options
author | Ryan Trinkle <ryan.trinkle@gmail.com> | 2016-07-27 14:28:31 -0400 |
---|---|---|
committer | Ryan Trinkle <ryan.trinkle@gmail.com> | 2016-07-27 14:28:31 -0400 |
commit | 5a622db103630962ca316e4ee6625ad68abf9905 (patch) | |
tree | 36b9546eccf7c3ed1d2cb6273f0e4cc4b4b3c9f7 /pkgs/development/haskell-modules/configuration-ghcjs.nix | |
parent | 676a7b698f72c3f426d71d6eed34589a40363b63 (diff) | |
download | nixpkgs-5a622db103630962ca316e4ee6625ad68abf9905.tar nixpkgs-5a622db103630962ca316e4ee6625ad68abf9905.tar.gz nixpkgs-5a622db103630962ca316e4ee6625ad68abf9905.tar.bz2 nixpkgs-5a622db103630962ca316e4ee6625ad68abf9905.tar.lz nixpkgs-5a622db103630962ca316e4ee6625ad68abf9905.tar.xz nixpkgs-5a622db103630962ca316e4ee6625ad68abf9905.tar.zst nixpkgs-5a622db103630962ca316e4ee6625ad68abf9905.zip |
ghcjs: move list of stage 1 packages into ghcjs derivation
This makes it easier to ensure that the list of stage 1 packages accurately matches the given version of ghcjs, and makes it possible for this list to be overridden
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-ghcjs.nix')
-rw-r--r-- | pkgs/development/haskell-modules/configuration-ghcjs.nix | 36 |
1 files changed, 8 insertions, 28 deletions
diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix index fffe29b1bc3..1feaa2a977b 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix @@ -8,10 +8,14 @@ in with import ./lib.nix { inherit pkgs; }; self: super: - # The stage 2 packages. Regenerate with ./ghcjs/gen-stage2.rb - let stage2 = super.ghc.mkStage2 { - inherit (self) callPackage; - }; in stage2 // { + + let # The stage 1 packages + stage1 = pkgs.lib.genAttrs super.ghc.stage1Packages (pkg: null); + # The stage 2 packages. Regenerate with ../compilers/ghcjs/gen-stage2.rb + stage2 = super.ghc.mkStage2 { + inherit (self) callPackage; + }; + in stage1 // stage2 // { old-time = overrideCabal stage2.old-time (drv: { postPatch = '' @@ -30,30 +34,6 @@ self: super: inherit (self.ghc.bootPkgs) jailbreak-cabal alex happy gtk2hs-buildtools rehoo hoogle; - # This is the list of the Stage 1 packages that are built into a booted ghcjs installation - # It can be generated with the command: - # nix-shell -p haskell.packages.ghcjs.ghc --command "ghcjs-pkg list | sed -n 's/^ \(.*\)-\([0-9.]*\)$/\1_\2/ p' | sed 's/\./_/g' | sed 's/-\(.\)/\U\1/' | sed 's/^\([^_]*\)\(.*\)$/\1 = null;/'" - array = null; - base = null; - binary = null; - rts = null; - bytestring = null; - containers = null; - deepseq = null; - directory = null; - filepath = null; - ghc-prim = null; - ghcjs-prim = null; - integer-gmp = null; - old-locale = null; - pretty = null; - primitive = null; - process = null; - template-haskell = null; - time = null; - transformers = null; - unix = null; - # Don't set integer-simple to null! # GHCJS uses integer-gmp, so any package expression that depends on # integer-simple is wrong. |