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

Merge branch 'staging-next'

Browse Source
This commit is contained in:
Vladimír Čunát
2019-01-13 00:39:38 +01:00
parent 6ca8443c3b 3131a8ea84
commit 570d84a01e
226 changed files with 2164 additions and 2740 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/compilers/fpc/lazarus.nix
View File

@@ -2,7 +2,7 @@
stdenv, fetchurl
, fpc
, gtk2, glib, pango, atk, gdk_pixbuf
, libXi, inputproto, libX11, xproto, libXext, xextproto
, libXi, xorgproto, libX11, libXext
, makeWrapper
}:
let
@@ -15,8 +15,8 @@ let
name = "lazarus-${version}";
};
buildInputs = [
fpc gtk2 glib libXi inputproto
libX11 xproto libXext xextproto pango atk
fpc gtk2 glib libXi xorgproto
libX11 libXext pango atk
stdenv.cc makeWrapper gdk_pixbuf
];
in

6
pkgs/development/compilers/gcc/4.8/default.nix
View File

@@ -16,8 +16,8 @@
, zip ? null, unzip ? null, pkgconfig ? null
, gtk2 ? null, libart_lgpl ? null
, libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null
, libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null
, libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null
, libXrender ? null, xorgproto ? null
, libXrandr ? null, libXi ? null
, x11Support ? langJava
, enableMultilib ? false
, enablePlugin ? stdenv.hostPlatform == stdenv.buildPlatform # Whether to support user-supplied plug-ins
@@ -89,7 +89,7 @@ let version = "4.8.5";
xlibs = [
libX11 libXt libSM libICE libXtst libXrender libXrandr libXi
xproto renderproto xextproto inputproto randrproto
xorgproto
];
javaAwtGtk = langJava && x11Support;

6
pkgs/development/compilers/gcc/4.9/default.nix
View File

@@ -16,8 +16,8 @@
, zip ? null, unzip ? null, pkgconfig ? null
, gtk2 ? null, libart_lgpl ? null
, libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null
, libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null
, libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null
, libXrender ? null, xorgproto ? null
, libXrandr ? null, libXi ? null
, x11Support ? langJava
, enableMultilib ? false
, enablePlugin ? stdenv.hostPlatform == stdenv.buildPlatform # Whether to support user-supplied plug-ins
@@ -94,7 +94,7 @@ let version = "4.9.4";
xlibs = [
libX11 libXt libSM libICE libXtst libXrender libXrandr libXi
xproto renderproto xextproto inputproto randrproto
xorgproto
];
javaAwtGtk = langJava && x11Support;

6
pkgs/development/compilers/gcc/5/default.nix
View File

@@ -16,8 +16,8 @@
, zip ? null, unzip ? null, pkgconfig ? null
, gtk2 ? null, libart_lgpl ? null
, libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null
, libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null
, libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null
, libXrender ? null, xorgproto ? null
, libXrandr ? null, libXi ? null
, x11Support ? langJava
, enableMultilib ? false
, enablePlugin ? stdenv.hostPlatform == stdenv.buildPlatform # Whether to support user-supplied plug-ins
@@ -81,7 +81,7 @@ let version = "5.5.0";
xlibs = [
libX11 libXt libSM libICE libXtst libXrender libXrandr libXi
xproto renderproto xextproto inputproto randrproto
xorgproto
];
javaAwtGtk = langJava && x11Support;

6
pkgs/development/compilers/gcc/6/default.nix
View File

@@ -16,8 +16,8 @@
, zip ? null, unzip ? null, pkgconfig ? null
, gtk2 ? null, libart_lgpl ? null
, libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null
, libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null
, libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null
, libXrender ? null, xorgproto ? null
, libXrandr ? null, libXi ? null
, x11Support ? langJava
, enableMultilib ? false
, enablePlugin ? stdenv.hostPlatform == stdenv.buildPlatform # Whether to support user-supplied plug-ins
@@ -78,7 +78,7 @@ let version = "6.5.0";
xlibs = [
libX11 libXt libSM libICE libXtst libXrender libXrandr libXi
xproto renderproto xextproto inputproto randrproto
xorgproto
];
javaAwtGtk = langJava && x11Support;

4
pkgs/development/compilers/gcc/7/default.nix
View File

@@ -37,7 +37,7 @@ assert langGo -> langCC;
with stdenv.lib;
with builtins;
let version = "7.3.0";
let version = "7.4.0";
inherit (stdenv) buildPlatform hostPlatform targetPlatform;
@@ -138,7 +138,7 @@ stdenv.mkDerivation ({
src = fetchurl {
url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz";
sha256 = "0p71bij6bfhzyrs8676a8jmpjsfz392s2rg862sdnsk30jpacb43";
sha256 = "0lgy170b0pp60j9cczqkmaqyjjb584vfamj4c30swd7k0j6y5pgd";
};
inherit patches;

8
pkgs/development/compilers/gcl/2.6.13-pre.nix
View File

@@ -1,6 +1,6 @@
{ stdenv, fetchgit, mpfr, m4, binutils, emacs, zlib, which
, texinfo, libX11, xproto, inputproto, libXi, gmp, readline, strace
, libXext, xextproto, libXt, libXaw, libXmu } :
, texinfo, libX11, xorgproto, libXi, gmp, readline, strace
, libXext, libXt, libXaw, libXmu } :
assert stdenv ? cc ;
assert stdenv.cc.isGNU ;
@@ -27,8 +27,8 @@ stdenv.mkDerivation rec {
buildInputs = [
mpfr m4 binutils emacs gmp
libX11 xproto inputproto libXi
libXext xextproto libXt libXaw libXmu
libX11 xorgproto libXi
libXext libXt libXaw libXmu
zlib which texinfo readline strace
];

8
pkgs/development/compilers/gcl/default.nix
View File

@@ -1,6 +1,6 @@
{ stdenv, fetchurl, mpfr, m4, binutils, emacs, zlib, which
, texinfo, libX11, xproto, inputproto, libXi, gmp
, libXext, xextproto, libXt, libXaw, libXmu } :
, texinfo, libX11, xorgproto, libXi, gmp
, libXext, libXt, libXaw, libXmu } :
assert stdenv ? cc ;
assert stdenv.cc.isGNU ;
@@ -23,8 +23,8 @@ stdenv.mkDerivation rec {
buildInputs = [
mpfr m4 binutils emacs gmp
libX11 xproto inputproto libXi
libXext xextproto libXt libXaw libXmu
libX11 xorgproto libXi
libXext libXt libXaw libXmu
zlib which texinfo
];

2
pkgs/development/compilers/llvm/7/clang/default.nix
View File

@@ -9,7 +9,7 @@ let
name = "clang-${version}";
unpackPhase = ''
unpackFile ${fetch "cfe" "0mdsbgj3p7mayhzm8hclzl3i46r2lwa8fr1cz399f9km3iqi40jm"}
unpackFile ${fetch "cfe" "067lwggnbg0w1dfrps790r5l6k8n5zwhlsw7zb6zvmfpwpfn4nx4"}
mv cfe-${version}* clang
sourceRoot=$PWD/clang
unpackFile ${clang-tools-extra_src}

2
pkgs/development/compilers/llvm/7/compiler-rt.nix
View File

@@ -3,7 +3,7 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "compiler-rt-${version}";
inherit version;
src = fetch "compiler-rt" "1mkhqvs8cxbfmprkzwyq7lmnzr1sv45znzf0arbgb19crzipzv5x";
src = fetch "compiler-rt" "065ybd8fsc4h2hikbdyricj6pyv4r7r7kpcikhb2y5zf370xybkq";
nativeBuildInputs = [ cmake python llvm ];
buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi;

4
pkgs/development/compilers/llvm/7/default.nix
View File

@@ -5,7 +5,7 @@
}:
let
release_version = "7.0.0";
release_version = "7.0.1";
version = release_version; # differentiating these is important for rc's
fetch = name: sha256: fetchurl {
@@ -13,7 +13,7 @@ let
inherit sha256;
};
clang-tools-extra_src = fetch "clang-tools-extra" "1glxl7bnr4k3j16s8xy8r9cl0llyg524f50591g1ig23ij65lz4k";
clang-tools-extra_src = fetch "clang-tools-extra" "1v9vc7id1761qm7mywlknsp810232iwyz8rd4y5km4h7pg9cg4sc";
tools = stdenv.lib.makeExtensible (tools: let
callPackage = newScope (tools // { inherit stdenv cmake libxml2 python isl release_version version fetch; });

2
pkgs/development/compilers/llvm/7/libc++/default.nix
View File

@@ -3,7 +3,7 @@
stdenv.mkDerivation rec {
name = "libc++-${version}";
src = fetch "libcxx" "1w1l472p03csgz76p70pn9yk7h0nw5hj1av44ysnakigp8jjcd4v";
src = fetch "libcxx" "1wdrxg365ig0kngx52pd0n820sncp24blb0zpalc579iidhh4002";
postUnpack = ''
unpackFile ${libcxxabi.src}

2
pkgs/development/compilers/llvm/7/libc++abi.nix
View File

@@ -3,7 +3,7 @@
stdenv.mkDerivation {
name = "libc++abi-${version}";
src = fetch "libcxxabi" "0pr4xfx61r5mwmvhg4j9pb6df6vvha1gyf6rwkm14x9rzxcwficv";
src = fetch "libcxxabi" "1n6yx0949l9bprh75dffchahn8wplkm79ffk4f2ap9vw2lx90s41";
nativeBuildInputs = [ cmake ];
buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind;

2
pkgs/development/compilers/llvm/7/lld.nix
View File

@@ -9,7 +9,7 @@
stdenv.mkDerivation {
name = "lld-${version}";
src = fetch "lld" "173z50vx5mlsaiqmbz7asxy2297z4xivrfxrdfncvx23wp2lgkzv";
src = fetch "lld" "0ca0qygrk87lhjk6cpv1wbmdfnficqqjsda3k7b013idvnralsc8";
nativeBuildInputs = [ cmake ];
buildInputs = [ llvm libxml2 ];

2
pkgs/development/compilers/llvm/7/lldb.nix
View File

@@ -17,7 +17,7 @@
stdenv.mkDerivation {
name = "lldb-${version}";
src = fetch "lldb" "0cmah36ybyfws0z2ikq9fqn5k4kvjci7vgk97ddx4xwrwkzdixkz";
src = fetch "lldb" "10k9lyk3i72j9hca523r9pz79qp7d8q7jqnjy0i3saj1bgknpd3n";
postPatch = ''
# Fix up various paths that assume llvm and clang are installed in the same place

2
pkgs/development/compilers/llvm/7/llvm.nix
View File

@@ -22,7 +22,7 @@
let
inherit (stdenv.lib) optional optionals optionalString;
src = fetch "llvm" "08p27wv1pr9ql2zc3f3qkkymci46q7myvh8r5ijippnbwr2gihcb";
src = fetch "llvm" "16s196wqzdw4pmri15hadzqgdi926zln3an2viwyq0kini6zr3d3";
# Used when creating a version-suffixed symlink of libLLVM.dylib
shortVersion = with stdenv.lib;

2
pkgs/development/compilers/llvm/7/openmp.nix
View File

@@ -9,7 +9,7 @@
stdenv.mkDerivation {
name = "openmp-${version}";
src = fetch "openmp" "1zrqlaxr954sp8lcr7g8m0z0pr8xyq4i6p11x6gcamjm5xijnrih";
src = fetch "openmp" "030dkg5cypd7j9hq0mcqb5gs31lxwmzfq52j81l7v9ldcy5bf5mz";
nativeBuildInputs = [ cmake perl ];
buildInputs = [ llvm ];

4
pkgs/development/compilers/nasm/default.nix
View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "nasm-${version}";
version = "2.14.01";
version = "2.14.02";
src = fetchurl {
url = "https://www.nasm.us/pub/nasm/releasebuilds/${version}/${name}.tar.bz2";
sha256 = "1v9fazd3in0rphnw5ck58wqnl8dis4dyqpsqgjsm4h9jjj0vylvz";
sha256 = "1g409sr1kj7v1089s9kv0i4azvddkcwcypnbakfryyi71b3jdz9l";
};
nativeBuildInputs = [ perl ];

4
pkgs/development/compilers/ocaml/ber-metaocaml.nix
View File

@@ -1,11 +1,11 @@
{ stdenv, fetchurl
, ncurses
, libX11, xproto, buildEnv
, libX11, xorgproto, buildEnv
}:
let
useX11 = stdenv.isi686 || stdenv.isx86_64;
x11deps = [ libX11 xproto ];
x11deps = [ libX11 xorgproto ];
inherit (stdenv.lib) optionals;
baseOcamlBranch = "4.07";

6
pkgs/development/compilers/ocaml/generic.nix
View File

@@ -11,7 +11,7 @@ let
in
{ stdenv, fetchurl, ncurses, buildEnv
, libX11, xproto, useX11 ? safeX11 stdenv
, libX11, xorgproto, useX11 ? safeX11 stdenv
, flambdaSupport ? false
}:
@@ -25,7 +25,7 @@ let
in
let
x11env = buildEnv { name = "x11env"; paths = [libX11 xproto]; };
x11env = buildEnv { name = "x11env"; paths = [libX11 xorgproto]; };
x11lib = x11env + "/lib";
x11inc = x11env + "/include";
in
@@ -48,7 +48,7 @@ stdenv.mkDerivation (args // rec {
buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt";
buildInputs = optional (!stdenv.lib.versionAtLeast version "4.07") ncurses
++ optionals useX11 [ libX11 xproto ];
++ optionals useX11 [ libX11 xorgproto ];
installTargets = "install" + optionalString useNativeCompilers " installopt";
preConfigure = optionalString (!stdenv.lib.versionAtLeast version "4.04") ''
CAT=$(type -tp cat)