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

Merge branch 'master' into staging

Browse Source
This commit is contained in:
Vladimír Čunát
2017-12-09 21:00:07 +01:00
parent 87317bab0a 8f4f9b6223
commit 2309acf723
302 changed files with 4776 additions and 3576 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/compilers/arachne-pnr/default.nix
View File

@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "arachne-pnr-${version}";
version = "2017.11.05";
version = "2017.12.06";
src = fetchFromGitHub {
owner = "cseed";
repo = "arachne-pnr";
rev = "1e81432830c75c505c76e419619f605a6c4c7583";
sha256 = "0lzblmi1klbsmd32h8nh027npm1z1a199lng13lcrqwr17lhb7my";
rev = "a32dd2c137b2bb6ba6704b25109790ac76bc2f45";
sha256 = "16pfm8spcm3nsrdsjdj22v7dddnwzlhbj1y71wflvvb84xnbga2y";
};
enableParallelBuilding = true;

2
pkgs/development/compilers/dmd/default.nix
View File

@@ -278,10 +278,12 @@ stdenv.mkDerivation rec {
inherit phobosUnittests;
name = "dmd-${version}";
phases = "installPhase";
buildInputs = dmdBuild.buildInputs;
installPhase = ''
mkdir $out
cp -r --symbolic-link ${dmdBuild}/* $out/
'';
meta = dmdBuild.meta;
}

6
pkgs/development/compilers/ghc/head.nix
View File

@@ -5,7 +5,7 @@
# If enabled GHC will be build with the GPL-free but slower integer-simple
# library instead of the faster but GPLed integer-gmp library.
, enableIntegerSimple ? false, gmp
, version ? "8.3.20170808"
, version ? "8.5.20171209"
}:
let
@@ -13,7 +13,7 @@ let
commonBuildInputs = [ ghc perl autoconf automake happy alex python3 ];
rev = "14457cf6a50f708eecece8f286f08687791d51f7";
rev = "4335c07ca7e64624819b22644d7591853826bd75";
commonPreConfigure = ''
echo ${version} >VERSION
@@ -34,7 +34,7 @@ in stdenv.mkDerivation (rec {
src = fetchgit {
url = "git://git.haskell.org/ghc.git";
inherit rev;
sha256 = "08vj9ca7rq7rv8pjfl14fg2lg9d6zisrwlq6bi5vzr006816dy8y";
sha256 = "19csad94sk0bw2nj97ppmnwh4c193jg0jmg5w2sx9rqm9ih4yg85";
};
postPatch = "patchShebangs .";

2
pkgs/development/compilers/jetbrains-jdk/default.nix
View File

@@ -73,7 +73,7 @@ let drv = stdenv.mkDerivation rec {
your own risk.
'';
homepage = "https://bintray.com/jetbrains/intellij-jdk/";
licenses = licenses.gpl2;
license = licenses.gpl2;
maintainers = with maintainers; [ edwtjo ];
platforms = with platforms; [ "x86_64-linux" ];
};

3
pkgs/development/compilers/ldc/default.nix
View File

@@ -249,10 +249,13 @@ stdenv.mkDerivation rec {
inherit ldcUnittests;
name = "ldc-${version}";
phases = "installPhase";
buildInputs = ldcBuild.buildInputs;
installPhase = ''
mkdir $out
cp -r --symbolic-link ${ldcBuild}/* $out/
'';
meta = ldcBuild.meta;
}

1
pkgs/development/compilers/mono/4.4.nix
View File

@@ -4,4 +4,5 @@ callPackage ./generic.nix (rec {
inherit Foundation libobjc;
version = "4.4.2.11";
sha256 = "0cxnypw1j7s253wr5hy05k42ghgg2s9qibp10kndwnp5bv12q34h";
enableParallelBuilding = false; # #32386, https://hydra.nixos.org/build/65565737
})

1
pkgs/development/compilers/mono/4.6.nix
View File

@@ -4,4 +4,5 @@ callPackage ./generic.nix (rec {
inherit Foundation libobjc;
version = "4.6.2.16";
sha256 = "190f7kcrm1y5x61s1xwdmjnwc3czsg50s3mml4xmix7byh3x2rc9";
enableParallelBuilding = false; # #32386, https://hydra.nixos.org/build/65617511
})

1
pkgs/development/compilers/mono/4.8.nix
View File

@@ -4,4 +4,5 @@ callPackage ./generic-cmake.nix (rec {
inherit Foundation libobjc;
version = "4.8.1.0";
sha256 = "1vyvp2g28ihcgxgxr8nhzyzdmzicsh5djzk8dk1hj5p5f2k3ijqq";
enableParallelBuilding = false; # #32386, https://hydra.nixos.org/build/65600645
})

7
pkgs/development/compilers/mono/generic-cmake.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl, libgdiplus, libX11, callPackage, ncurses, zlib, withLLVM ? false, cacert, Foundation, libobjc, python, version, sha256, autoconf, libtool, automake, cmake, which }:
{ stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl, libgdiplus, libX11, callPackage, ncurses, zlib, withLLVM ? false, cacert, Foundation, libobjc, python, version, sha256, autoconf, libtool, automake, cmake, which, enableParallelBuilding ? true }:
let
llvm = callPackage ./llvm.nix { };
@@ -45,9 +45,6 @@ stdenv.mkDerivation rec {
# The file /nix/store/xxx-mono-2.4.2.1/lib/mscorlib.dll is an invalid CIL image
dontStrip = true;
# Parallel building doesn't work, as shows http://hydra.nixos.org/build/2983601
enableParallelBuilding = false;
# We want pkg-config to take priority over the dlls in the Mono framework and the GAC
# because we control pkg-config
patches = [ ./pkgconfig-before-gac.patch ];
@@ -83,6 +80,8 @@ stdenv.mkDerivation rec {
ln -s $out/bin/mcs $out/bin/gmcs
'';
inherit enableParallelBuilding;
meta = {
homepage = http://mono-project.com/;
description = "Cross platform, open source .NET development framework";

14
pkgs/development/compilers/mono/generic.nix
View File

@@ -1,4 +1,11 @@
{ stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl, libgdiplus, libX11, callPackage, ncurses, zlib, withLLVM ? false, cacert, Foundation, libobjc, python, version, sha256 }:
{ stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl, libgdiplus, libX11
, callPackage, ncurses, zlib
, cacert, Foundation, libobjc, python
, version, sha256
, withLLVM ? false
, enableParallelBuilding ? true
}:
let
llvm = callPackage ./llvm.nix { };
@@ -40,9 +47,6 @@ stdenv.mkDerivation rec {
# The file /nix/store/xxx-mono-2.4.2.1/lib/mscorlib.dll is an invalid CIL image
dontStrip = true;
# Parallel building doesn't work, as shows http://hydra.nixos.org/build/2983601
enableParallelBuilding = false;
# We want pkg-config to take priority over the dlls in the Mono framework and the GAC
# because we control pkg-config
patches = [ ./pkgconfig-before-gac.patch ];
@@ -79,6 +83,8 @@ stdenv.mkDerivation rec {
ln -s $out/bin/mcs $out/bin/gmcs
'';
inherit enableParallelBuilding;
meta = {
homepage = http://mono-project.com/;
description = "Cross platform, open source .NET development framework";

2
pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix
View File

@@ -4,7 +4,7 @@ import ./jdk-linux-base.nix {
downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
sha256_i686 = "0w1snn9hxwvdnk77frhdzbsm6v30v99dy5zmpy8ij7yxd57z6ql0";
sha256_x86_64 = "0zq2dxbxmshz080yskhc8y2wbqi0y0kl9girxjbb4rwk837010n7";
sha256_armv7l = "10r3nyssx8piyjaspravwgj2bnq4537041pn0lz4fk5b3473kgfb";
sha256_armv7l = "0fdkvg1al7g9lqbq10rlw400aqr0xxi2a802319sw5n0zipkrjic";
sha256_aarch64 = "1xva22cjjpwa95h7x3xzyymn1bgxp1q67j5j304kn6cqah4k31j1";
jceName = "jce_policy-8.zip";
jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;

2
pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix
View File

@@ -4,7 +4,7 @@ import ./jdk-linux-base.nix {
downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
sha256_i686 = "0gjc7kcfx40f43z1w1qsn1fqxdz8d46wml2g11qgm55ishhv2q7w";
sha256_x86_64 = "1gv1348hrgna9l3sssv3g9jzs37y1lkx05xq83chav9z1hs3p2r1";
sha256_armv7l = "10r3nyssx8piyjaspravwgj2bnq4537041pn0lz4fk5b3473kgfb";
sha256_armv7l = "1w0hwslsd3z0kvb3z7gmbh20xsyiz73vglmdqz2108y7alim7arm";
sha256_aarch64 = "13qpxa8nxsnikmm7h6ysnsdqg5vl8j7hzfa8kgh20z8a17fhj9kk";
jceName = "jce_policy-8.zip";
jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;

2
pkgs/development/compilers/owl-lisp/default.nix
View File

@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
doCheck = false;
meta = with stdenv.lib; {
descripton = "A functional lisp";
description = "A functional lisp";
homepage = https://github.com/aoh/owl-lisp;
license = licenses.mit;
maintainers = with maintainers; [ peterhoeg ];

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

@@ -3,13 +3,13 @@
buildOcaml rec {
name = "reason";
version = "3.0.3";
version = "3.0.4";
src = fetchFromGitHub {
owner = "facebook";
repo = "reason";
rev = version;
sha256 = "19kp1cnxi6dq89xh07c14q7kzkawbxdkwrvn1rl48l78d04agnxx";
sha256 = "15qhx85him5rr4j0ygj3jh3qv9ijrn82ibr9scbn0qrnn43kj047";
};
propagatedBuildInputs = [ menhir merlin_extend ppx_tools_versioned ];
@@ -34,7 +34,7 @@ buildOcaml rec {
'';
meta = with stdenv.lib; {
homepage = https://facebook.github.io/reason/;
homepage = https://reasonml.github.io/;
description = "Facebook's friendly syntax to OCaml";
license = licenses.bsd3;
maintainers = [ maintainers.volth ];

22
pkgs/development/compilers/yosys/default.nix
View File

@@ -4,22 +4,22 @@
stdenv.mkDerivation rec {
name = "yosys-${version}";
version = "2017.11.05";
version = "2017.12.06";
srcs = [
(fetchFromGitHub {
owner = "cliffordwolf";
repo = "yosys";
rev = "4f31cb6daddedcee467d85797d81b79360ce1826";
sha256 = "1a5n0g5kpjsy8f99f64w81gkrr450wvffp407r1pddl8pmb0c3r7";
name = "yosys";
owner = "cliffordwolf";
repo = "yosys";
rev = "8f2638ae2f12a48dcad14f24b0211c16ac724762";
sha256 = "0synbskclgn97hp28myvl0hp8pqp66awp37z4cv7zl154ipysfl1";
name = "yosys";
})
(fetchFromBitbucket {
owner = "alanmi";
repo = "abc";
rev = "f6838749f234";
sha256 = "0n7ywvih958h1c4n7a398a9w3qikhkv885fx5j3y2a0xwqc86m4y";
name = "yosys-abc";
owner = "alanmi";
repo = "abc";
rev = "31fc97b0aeed";
sha256 = "0ljmclr4hfh3iiyfw7ji0fm8j983la8021xfpnfd20dyc807hh65";
name = "yosys-abc";
})
];
sourceRoot = "yosys";