alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

ghc, ghcjs: Get rid of extraneous alex, happy, and hscolour args

Browse source 
The compilers themselves can pull them from `bootPkgs`, where they
should always come from anyways. This enforces that, simplifies that
code, and allows use to avoid more `rec { ... }` too.
This commit is contained in:
John Ericson 2018-09-24 19:59:17 -04:00
parent 5779fdb3d0
commit e6a476c862
8 changed files with 26 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/compilers/ghc/7.10.3.nix
View file

@ -1,7 +1,7 @@
{ stdenv, targetPackages { stdenv, targetPackages
# build-tools # build-tools
, bootPkgs, hscolour , bootPkgs
, coreutils, fetchurl, perl , coreutils, fetchurl, perl
, docbook_xsl, docbook_xml_dtd_45, docbook_xml_dtd_42, libxml2, libxslt , docbook_xsl, docbook_xml_dtd_45, docbook_xml_dtd_42, libxml2, libxslt
@ -142,7 +142,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42 perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42
ghc hscolour ghc bootPkgs.hscolour
]; ];
# For building runtime libs # For building runtime libs

4
pkgs/development/compilers/ghc/8.0.2.nix
View file

@ -1,7 +1,7 @@
{ stdenv, targetPackages { stdenv, targetPackages
# build-tools # build-tools
, bootPkgs, hscolour , bootPkgs
, coreutils, fetchpatch, fetchurl, perl, sphinx , coreutils, fetchpatch, fetchurl, perl, sphinx
, libiconv ? null, ncurses , libiconv ? null, ncurses
@ -144,7 +144,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
perl sphinx perl sphinx
ghc hscolour ghc bootPkgs.hscolour
]; ];
# For building runtime libs # For building runtime libs

4
pkgs/development/compilers/ghc/8.2.2.nix
View file

@ -1,7 +1,7 @@
{ stdenv, targetPackages { stdenv, targetPackages
# build-tools # build-tools
, bootPkgs, alex, happy, hscolour , bootPkgs
, autoconf, autoreconfHook, automake, coreutils, fetchurl, fetchpatch, perl, python3, sphinx , autoconf, autoreconfHook, automake, coreutils, fetchurl, fetchpatch, perl, python3, sphinx
, runCommand , runCommand
@ -182,7 +182,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
autoconf autoreconfHook automake perl python3 sphinx autoconf autoreconfHook automake perl python3 sphinx
ghc alex happy hscolour ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour
]; ];
# For building runtime libs # For building runtime libs

4
pkgs/development/compilers/ghc/8.4.3.nix
View file

@ -1,7 +1,7 @@
{ stdenv, targetPackages { stdenv, targetPackages
# build-tools # build-tools
, bootPkgs, alex, happy, hscolour , bootPkgs
, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4 , autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4
, libiconv ? null, ncurses , libiconv ? null, ncurses
@ -180,7 +180,7 @@ stdenv.mkDerivation (rec {
nativeBuildInputs = [ nativeBuildInputs = [
perl autoconf automake m4 python3 perl autoconf automake m4 python3
ghc alex happy hscolour ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour
]; ];
# For building runtime libs # For building runtime libs

4
pkgs/development/compilers/ghc/8.6.1.nix
View file

@ -1,7 +1,7 @@
{ stdenv, targetPackages { stdenv, targetPackages
# build-tools # build-tools
, bootPkgs, alex, happy, hscolour , bootPkgs
, autoconf, automake, coreutils, fetchurl, perl, python3, m4 , autoconf, automake, coreutils, fetchurl, perl, python3, m4
, libiconv ? null, ncurses , libiconv ? null, ncurses
@ -163,7 +163,7 @@ stdenv.mkDerivation (rec {
nativeBuildInputs = [ nativeBuildInputs = [
perl autoconf automake m4 python3 perl autoconf automake m4 python3
ghc alex happy hscolour ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour
]; ];
# For building runtime libs # For building runtime libs

4
pkgs/development/compilers/ghc/head.nix
View file

@ -1,7 +1,7 @@
{ stdenv, targetPackages { stdenv, targetPackages
# build-tools # build-tools
, bootPkgs, alex, happy, hscolour , bootPkgs
, autoconf, automake, coreutils, fetchgit, perl, python3, m4 , autoconf, automake, coreutils, fetchgit, perl, python3, m4
, libiconv ? null, ncurses , libiconv ? null, ncurses
@ -150,7 +150,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
perl autoconf automake m4 python3 perl autoconf automake m4 python3
ghc alex happy hscolour ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour
]; ];
# For building runtime libs # For building runtime libs

11
pkgs/development/compilers/ghcjs-ng/default.nix
View file

@ -4,8 +4,6 @@
, ghcjsSrcJson ? null , ghcjsSrcJson ? null
, ghcjsSrc ? fetchgit (builtins.fromJSON (builtins.readFile ghcjsSrcJson)) , ghcjsSrc ? fetchgit (builtins.fromJSON (builtins.readFile ghcjsSrcJson))
, bootPkgs , bootPkgs
, alex
, happy
, stage0 , stage0
, haskellLib , haskellLib
, cabal-install , cabal-install
@ -24,8 +22,8 @@
let let
passthru = { passthru = {
configuredSrc = callPackage ./configured-ghcjs-src.nix { configuredSrc = callPackage ./configured-ghcjs-src.nix {
inherit ghcjsSrc alex happy; inherit ghcjsSrc;
inherit (bootPkgs) ghc; inherit (bootPkgs) ghc alex happy;
}; };
genStage0 = callPackage ./mk-stage0.nix { inherit (passthru) configuredSrc; }; genStage0 = callPackage ./mk-stage0.nix { inherit (passthru) configuredSrc; };
bootPkgs = bootPkgs.extend (lib.foldr lib.composeExtensions (_:_:{}) [ bootPkgs = bootPkgs.extend (lib.foldr lib.composeExtensions (_:_:{}) [
@ -34,7 +32,10 @@ let
inherit (self) callPackage; inherit (self) callPackage;
}) })
(callPackage ./common-overrides.nix { inherit haskellLib alex happy; }) (callPackage ./common-overrides.nix {
inherit haskellLib;
inherit (bootPkgs) alex happy;
})
ghcjsDepOverrides ghcjsDepOverrides
]); ]);

24
pkgs/top-level/haskell-packages.nix
View file

@ -47,41 +47,35 @@ in {
ghc7103Binary = callPackage ../development/compilers/ghc/7.10.3-binary.nix { }; ghc7103Binary = callPackage ../development/compilers/ghc/7.10.3-binary.nix { };
ghc821Binary = callPackage ../development/compilers/ghc/8.2.1-binary.nix { }; ghc821Binary = callPackage ../development/compilers/ghc/8.2.1-binary.nix { };
ghc7103 = callPackage ../development/compilers/ghc/7.10.3.nix rec { ghc7103 = callPackage ../development/compilers/ghc/7.10.3.nix {
bootPkgs = packages.ghc7103Binary; bootPkgs = packages.ghc7103Binary;
inherit (bootPkgs) hscolour;
buildLlvmPackages = buildPackages.llvmPackages_35; buildLlvmPackages = buildPackages.llvmPackages_35;
llvmPackages = pkgs.llvmPackages_35; llvmPackages = pkgs.llvmPackages_35;
}; };
ghc802 = callPackage ../development/compilers/ghc/8.0.2.nix rec { ghc802 = callPackage ../development/compilers/ghc/8.0.2.nix {
bootPkgs = packages.ghc7103Binary; bootPkgs = packages.ghc7103Binary;
inherit (bootPkgs) hscolour;
sphinx = pkgs.python27Packages.sphinx; sphinx = pkgs.python27Packages.sphinx;
buildLlvmPackages = buildPackages.llvmPackages_37; buildLlvmPackages = buildPackages.llvmPackages_37;
llvmPackages = pkgs.llvmPackages_37; llvmPackages = pkgs.llvmPackages_37;
}; };
ghc822 = callPackage ../development/compilers/ghc/8.2.2.nix rec { ghc822 = callPackage ../development/compilers/ghc/8.2.2.nix {
bootPkgs = packages.ghc821Binary; bootPkgs = packages.ghc821Binary;
inherit (bootPkgs) hscolour alex happy;
sphinx = pkgs.python3Packages.sphinx; sphinx = pkgs.python3Packages.sphinx;
buildLlvmPackages = buildPackages.llvmPackages_39; buildLlvmPackages = buildPackages.llvmPackages_39;
llvmPackages = pkgs.llvmPackages_39; llvmPackages = pkgs.llvmPackages_39;
}; };
ghc843 = callPackage ../development/compilers/ghc/8.4.3.nix rec { ghc843 = callPackage ../development/compilers/ghc/8.4.3.nix {
bootPkgs = packages.ghc821Binary; bootPkgs = packages.ghc821Binary;
inherit (bootPkgs) alex happy hscolour;
buildLlvmPackages = buildPackages.llvmPackages_5; buildLlvmPackages = buildPackages.llvmPackages_5;
llvmPackages = pkgs.llvmPackages_5; llvmPackages = pkgs.llvmPackages_5;
}; };
ghc861 = callPackage ../development/compilers/ghc/8.6.1.nix rec { ghc861 = callPackage ../development/compilers/ghc/8.6.1.nix {
bootPkgs = packages.ghc822; bootPkgs = packages.ghc822;
inherit (bootPkgs) alex happy hscolour;
buildLlvmPackages = buildPackages.llvmPackages_6; buildLlvmPackages = buildPackages.llvmPackages_6;
llvmPackages = pkgs.llvmPackages_6; llvmPackages = pkgs.llvmPackages_6;
}; };
ghcHEAD = callPackage ../development/compilers/ghc/head.nix rec { ghcHEAD = callPackage ../development/compilers/ghc/head.nix {
bootPkgs = packages.ghc821Binary; bootPkgs = packages.ghc821Binary;
inherit (bootPkgs) alex happy hscolour;
buildLlvmPackages = buildPackages.llvmPackages_5; buildLlvmPackages = buildPackages.llvmPackages_5;
llvmPackages = pkgs.llvmPackages_5; llvmPackages = pkgs.llvmPackages_5;
}; };
@ -94,15 +88,13 @@ in {
bootPkgs = packages.ghc802; bootPkgs = packages.ghc802;
inherit (pkgs) cabal-install; inherit (pkgs) cabal-install;
}; };
ghcjs82 = callPackage ../development/compilers/ghcjs-ng rec { ghcjs82 = callPackage ../development/compilers/ghcjs-ng {
bootPkgs = packages.ghc822; bootPkgs = packages.ghc822;
inherit (bootPkgs) alex happy;
ghcjsSrcJson = ../development/compilers/ghcjs-ng/8.2/git.json; ghcjsSrcJson = ../development/compilers/ghcjs-ng/8.2/git.json;
stage0 = ../development/compilers/ghcjs-ng/8.2/stage0.nix; stage0 = ../development/compilers/ghcjs-ng/8.2/stage0.nix;
}; };
ghcjs84 = callPackage ../development/compilers/ghcjs-ng rec { ghcjs84 = callPackage ../development/compilers/ghcjs-ng {
bootPkgs = packages.ghc843; bootPkgs = packages.ghc843;
inherit (bootPkgs) alex happy;
ghcjsSrcJson = ../development/compilers/ghcjs-ng/8.4/git.json; ghcjsSrcJson = ../development/compilers/ghcjs-ng/8.4/git.json;
stage0 = ../development/compilers/ghcjs-ng/8.4/stage0.nix; stage0 = ../development/compilers/ghcjs-ng/8.4/stage0.nix;
ghcjsDepOverrides = callPackage ../development/compilers/ghcjs-ng/8.4/dep-overrides.nix {}; ghcjsDepOverrides = callPackage ../development/compilers/ghcjs-ng/8.4/dep-overrides.nix {};