public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into closure-size

Browse Source 
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
This commit is contained in:
Vladimír Čunát
2016-03-08 09:58:19 +01:00
parent f306e67e15 0ee75214f3
commit 09af15654f
1276 changed files with 78548 additions and 29166 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/compilers/ghc/7.10.2.nix
+6 -1
View File
@@ -1,8 +1,9 @@
{ stdenv, fetchurl, fetchpatch, ghc, perl, gmp, ncurses, libiconv, binutils, coreutils
{ stdenv, fetchurl, fetchpatch, bootPkgs, perl, gmp, ncurses, libiconv, binutils, coreutils
, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_45, docbook_xml_dtd_42, hscolour
}:
let
inherit (bootPkgs) ghc;
buildMK = ''
libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp.out}/lib"
@@ -60,6 +61,10 @@ stdenv.mkDerivation rec {
done
'';
passthru = {
inherit bootPkgs;
};
meta = {
homepage = "http://haskell.org/ghc";
description = "The Glasgow Haskell Compiler";
pkgs/development/compilers/ghc/7.10.3.nix
+6 -1
View File
@@ -1,8 +1,9 @@
{ stdenv, fetchurl, fetchpatch, ghc, perl, gmp, ncurses, libiconv, binutils, coreutils
{ stdenv, fetchurl, fetchpatch, bootPkgs, perl, gmp, ncurses, libiconv, binutils, coreutils
, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_45, docbook_xml_dtd_42, hscolour
}:
let
inherit (bootPkgs) ghc;
docFixes = fetchurl {
url = "https://downloads.haskell.org/~ghc/7.10.3/ghc-7.10.3a.patch";
@@ -61,6 +62,10 @@ stdenv.mkDerivation rec {
done
'';
passthru = {
inherit bootPkgs;
};
meta = {
homepage = "http://haskell.org/ghc";
description = "The Glasgow Haskell Compiler";
pkgs/development/compilers/ghc/8.0.1.nix
+9 -1
View File
@@ -1,7 +1,11 @@
{ stdenv, fetchurl, fetchpatch, ghc, perl, gmp, ncurses, libiconv, binutils, coreutils
{ stdenv, fetchurl, fetchpatch, bootPkgs, perl, gmp, ncurses, libiconv, binutils, coreutils
, hscolour
}:
let
inherit (bootPkgs) ghc;
in
stdenv.mkDerivation rec {
version = "8.0.0.20160204";
name = "ghc-${version}";
@@ -51,6 +55,10 @@ stdenv.mkDerivation rec {
done
'';
passthru = {
inherit bootPkgs;
};
meta = {
homepage = "http://haskell.org/ghc";
description = "The Glasgow Haskell Compiler";
pkgs/development/compilers/ghc/head.nix
+9 -2
View File
@@ -1,8 +1,11 @@
{ stdenv, fetchgit, ghc, perl, gmp, ncurses, libiconv, binutils, coreutils
{ stdenv, fetchgit, bootPkgs, perl, gmp, ncurses, libiconv, binutils, coreutils
, autoconf, automake, happy, alex
}:
stdenv.mkDerivation rec {
let
inherit (bootPkgs) ghc;
in stdenv.mkDerivation rec {
version = "7.11.20151216";
name = "ghc-${version}";
rev = "28638dfe79e915f33d75a1b22c5adce9e2b62b97";
@@ -62,6 +65,10 @@ stdenv.mkDerivation rec {
done
'';
passthru = {
inherit bootPkgs;
};
meta = {
homepage = "http://haskell.org/ghc";
description = "The Glasgow Haskell Compiler";
pkgs/development/compilers/ghc/nokinds.nix
+6 -1
View File
@@ -1,6 +1,7 @@
{ stdenv, fetchgit, ghc, perl, gmp, ncurses, libiconv, autoconf, automake, happy, alex }:
{ stdenv, fetchgit, bootPkgs, perl, gmp, ncurses, libiconv, autoconf, automake, happy, alex }:
let
inherit (bootPkgs) ghc;
buildMK = ''
libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp.out}/lib"
@@ -66,6 +67,10 @@ stdenv.mkDerivation rec {
# that in turn causes GHCi to abort
stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols";
passthru = {
inherit bootPkgs;
};
meta = {
homepage = "http://haskell.org/ghc";
description = "The dependently-typed 'nokinds' branch of the Glasgow Haskell Compiler by Richard Eisenberg";