diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-11-29 09:18:35 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-11-29 09:18:35 +0100 |
commit | 9b81c7e455c278a45db0f6c21d7e16bb0ff9bf37 (patch) | |
tree | bee2f6299dadbd3d919059a461eedc67ab0a4e33 /pkgs/development/compilers | |
parent | 5987c5c694f3910e308beda967192cccf9a63610 (diff) | |
parent | 9db2421d1f65beb38911e8133349193db0042a1d (diff) | |
download | nixlib-9b81c7e455c278a45db0f6c21d7e16bb0ff9bf37.tar nixlib-9b81c7e455c278a45db0f6c21d7e16bb0ff9bf37.tar.gz nixlib-9b81c7e455c278a45db0f6c21d7e16bb0ff9bf37.tar.bz2 nixlib-9b81c7e455c278a45db0f6c21d7e16bb0ff9bf37.tar.lz nixlib-9b81c7e455c278a45db0f6c21d7e16bb0ff9bf37.tar.xz nixlib-9b81c7e455c278a45db0f6c21d7e16bb0ff9bf37.tar.zst nixlib-9b81c7e455c278a45db0f6c21d7e16bb0ff9bf37.zip |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/compilers')
-rw-r--r-- | pkgs/development/compilers/ghc/8.4.4.nix | 4 | ||||
-rw-r--r-- | pkgs/development/compilers/ghc/8.6.1.nix | 4 | ||||
-rw-r--r-- | pkgs/development/compilers/ghc/8.6.2.nix | 4 | ||||
-rw-r--r-- | pkgs/development/compilers/ghc/head.nix | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/development/compilers/ghc/8.4.4.nix b/pkgs/development/compilers/ghc/8.4.4.nix index 139457f43c8a..c84ea1d84d57 100644 --- a/pkgs/development/compilers/ghc/8.4.4.nix +++ b/pkgs/development/compilers/ghc/8.4.4.nix @@ -2,7 +2,7 @@ # build-tools , bootPkgs -, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4 +, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4, sphinx , libiconv ? null, ncurses @@ -183,7 +183,7 @@ stdenv.mkDerivation (rec { strictDeps = true; nativeBuildInputs = [ - perl autoconf automake m4 python3 + perl autoconf automake m4 python3 sphinx ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour ]; diff --git a/pkgs/development/compilers/ghc/8.6.1.nix b/pkgs/development/compilers/ghc/8.6.1.nix index 911a900f6d23..434570fe9889 100644 --- a/pkgs/development/compilers/ghc/8.6.1.nix +++ b/pkgs/development/compilers/ghc/8.6.1.nix @@ -2,7 +2,7 @@ # build-tools , bootPkgs -, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4 +, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4, sphinx , libiconv ? null, ncurses @@ -168,7 +168,7 @@ stdenv.mkDerivation (rec { strictDeps = true; nativeBuildInputs = [ - perl autoconf automake m4 python3 + perl autoconf automake m4 python3 sphinx ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour ]; diff --git a/pkgs/development/compilers/ghc/8.6.2.nix b/pkgs/development/compilers/ghc/8.6.2.nix index 5e263fd06b43..85853e158327 100644 --- a/pkgs/development/compilers/ghc/8.6.2.nix +++ b/pkgs/development/compilers/ghc/8.6.2.nix @@ -2,7 +2,7 @@ # build-tools , bootPkgs -, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4 +, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4, sphinx , libiconv ? null, ncurses @@ -168,7 +168,7 @@ stdenv.mkDerivation (rec { strictDeps = true; nativeBuildInputs = [ - perl autoconf automake m4 python3 + perl autoconf automake m4 python3 sphinx ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour ]; diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index bd02daf5e1cf..29de668767b8 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -2,7 +2,7 @@ # build-tools , bootPkgs -, autoconf, automake, coreutils, fetchgit, perl, python3, m4 +, autoconf, automake, coreutils, fetchgit, perl, python3, m4, sphinx , libiconv ? null, ncurses |