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

Merge remote-tracking branch 'origin/master' into hardened-stdenv

Browse Source
This commit is contained in:
Franz Pletz
2016-05-18 17:10:02 +02:00
parent 9fbc20e2f8 3cd63ade16
commit f8d481754c
1470 changed files with 62103 additions and 28701 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/compilers/ghc/6.10.2-binary.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{stdenv, fetchurl, perl, libedit, ncurses, gmp}:
{stdenv, lib, fetchurl, perl, libedit, ncurses, gmp}:
stdenv.mkDerivation rec {
version = "6.10.2";
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
'' else "");
configurePhase = ''
./configure --prefix=$out --with-gmp-libraries=${gmp.out}/lib --with-gmp-includes=${gmp.dev or gmp}/include
./configure --prefix=$out --with-gmp-libraries=${lib.getLib gmp}/lib --with-gmp-includes=${lib.getDev gmp}/include
'';
# Stripping combined with patchelf breaks the executables (they die
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
# No building is necessary, but calling make without flags ironically
# calls install-strip ...
buildPhase = "true";
dontBuild = true;
# The binaries for Darwin use frameworks, so fake those frameworks,
# and create some wrapper scripts that set DYLD_FRAMEWORK_PATH so
pkgs/development/compilers/ghc/6.12.3.nix
+1 -1
View File
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = "http://haskell.org/ghc";
description = "The Glasgow Haskell Compiler";
maintainers = with stdenv.lib.maintainers; [ marcweber andres simons ];
maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
platforms = ["x86_64-linux" "i686-linux"]; # Darwin is unsupported.
inherit (ghc.meta) license;
broken = true; # broken by gcc 5.x: http://hydra.nixos.org/build/33627548
pkgs/development/compilers/ghc/7.0.4-binary.nix
+1 -1
View File
@@ -99,7 +99,7 @@ stdenv.mkDerivation rec {
# No building is necessary, but calling make without flags ironically
# calls install-strip ...
buildPhase = "true";
dontBuild = true;
postInstall =
''
pkgs/development/compilers/ghc/7.0.4.nix
+1 -1
View File
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
maintainers = [
stdenv.lib.maintainers.marcweber
stdenv.lib.maintainers.andres
stdenv.lib.maintainers.simons
stdenv.lib.maintainers.peti
];
platforms = ["x86_64-linux" "i686-linux"]; # Darwin is not supported.
inherit (ghc.meta) license;
pkgs/development/compilers/ghc/7.10.2.nix
+1 -1
View File
@@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = "http://haskell.org/ghc";
description = "The Glasgow Haskell Compiler";
maintainers = with stdenv.lib.maintainers; [ marcweber andres simons ];
maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
inherit (ghc.meta) license platforms;
};
pkgs/development/compilers/ghc/7.10.3.nix
+1 -1
View File
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = "http://haskell.org/ghc";
description = "The Glasgow Haskell Compiler";
maintainers = with stdenv.lib.maintainers; [ marcweber andres simons ];
maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
inherit (ghc.meta) license platforms;
};
pkgs/development/compilers/ghc/7.2.2.nix
+1 -1
View File
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
maintainers = [
stdenv.lib.maintainers.marcweber
stdenv.lib.maintainers.andres
stdenv.lib.maintainers.simons
stdenv.lib.maintainers.peti
];
platforms = ["x86_64-linux" "i686-linux"]; # Darwin is unsupported.
inherit (ghc.meta) license;
pkgs/development/compilers/ghc/7.4.2-binary.nix
+1 -1
View File
@@ -101,7 +101,7 @@ stdenv.mkDerivation rec {
# No building is necessary, but calling make without flags ironically
# calls install-strip ...
buildPhase = "true";
dontBuild = true;
preInstall = stdenv.lib.optionalString stdenv.isDarwin ''
mkdir -p $out/lib/ghc-7.4.2
pkgs/development/compilers/ghc/7.4.2.nix
+1 -1
View File
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
maintainers = [
stdenv.lib.maintainers.marcweber
stdenv.lib.maintainers.andres
stdenv.lib.maintainers.simons
stdenv.lib.maintainers.peti
];
inherit (ghc.meta) license platforms;
};
pkgs/development/compilers/ghc/7.6.3.nix
+1 -1
View File
@@ -75,7 +75,7 @@ in stdenv.mkDerivation rec {
maintainers = [
stdenv.lib.maintainers.marcweber
stdenv.lib.maintainers.andres
stdenv.lib.maintainers.simons
stdenv.lib.maintainers.peti
];
inherit (ghc.meta) license platforms;
};
pkgs/development/compilers/ghc/7.8.3.nix
+1 -1
View File
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = "http://haskell.org/ghc";
description = "The Glasgow Haskell Compiler";
maintainers = with stdenv.lib.maintainers; [ marcweber andres simons ];
maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
inherit (ghc.meta) license platforms;
};
pkgs/development/compilers/ghc/7.8.4.nix
+1 -1
View File
@@ -41,7 +41,7 @@ stdenv.mkDerivation (rec {
meta = {
homepage = "http://haskell.org/ghc";
description = "The Glasgow Haskell Compiler";
maintainers = with stdenv.lib.maintainers; [ marcweber andres simons ];
maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
inherit (ghc.meta) license platforms;
};
pkgs/development/compilers/ghc/8.0.1.nix
+4 -4
View File
@@ -7,12 +7,12 @@ let
in
stdenv.mkDerivation rec {
version = "8.0.0.20160421";
version = "8.0.1";
name = "ghc-${version}";
src = fetchurl {
url = "https://downloads.haskell.org/~ghc/8.0.1-rc4/${name}-src.tar.xz";
sha256 = "183p1ilk8rlndi1vmg2vmlx00s18q3j31kin85qpbvicsxb8j1j1";
url = "https://downloads.haskell.org/~ghc/8.0.1/${name}-src.tar.xz";
sha256 = "1lniqy29djhjkddnailpaqhlqh4ld2mqvb1fxgxw1qqjhz6j1ywh";
};
patches = [
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = "http://haskell.org/ghc";
description = "The Glasgow Haskell Compiler";
maintainers = with stdenv.lib.maintainers; [ marcweber andres simons ];
maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
inherit (ghc.meta) license platforms;
};
pkgs/development/compilers/ghc/head.nix
+1 -1
View File
@@ -72,7 +72,7 @@ in stdenv.mkDerivation rec {
meta = {
homepage = "http://haskell.org/ghc";
description = "The Glasgow Haskell Compiler";
maintainers = with stdenv.lib.maintainers; [ marcweber andres simons ];
maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
inherit (ghc.meta) license platforms;
};