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

Merge branch 'master' into staging

Browse Source 
Haskell updates.  Hydra: ?compare=1416248
This commit is contained in:
Vladimír Čunát
2017-12-06 02:21:40 +01:00
parent 689d6303e8 4b3df44fab
commit 9ab5848335
56 changed files with 914 additions and 1335 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "gambit-${version}";
version = "4.8.8-300db59";
version = "4.8.8-415-g29ed48bb";
bootstrap = import ./bootstrap.nix ( pkgs );
src = fetchgit {
url = "https://github.com/feeley/gambit.git";
rev = "300db59e1d3b66bcd597f617849df0274d2a4472";
sha256 = "1mhy49lasakgvdaswkxasdssik11lx3hfx4h1gs2b6881488ssdp";
rev = "29ed48bb688e8302d2430b5d24a2fc7c2039aeec";
sha256 = "1h3kmczvjir0pi6cmqa2bsc09n68jhw0bxq7m6w4b1f0xvgvn3fr";
};
buildInputs = [ openssl git autoconf bootstrap ];

10
pkgs/development/compilers/gerbil/default.nix
View File

@@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
name = "gerbil-${version}";
version = "0.12-DEV-777-gd855915";
version = "0.12-DEV-836-gcde6802";
src = fetchgit {
url = "https://github.com/vyzo/gerbil.git";
rev = "9db6187dc996eec4087f83b86339e7b17bb69bad";
sha256 = "1hqmsy77d62dvil3az4vdr0rmwvxhinjl1dbcxzamz2c2kcjv1jg";
rev = "2904b0014fac344409d0ae2ba5835d0e67ac83b5";
sha256 = "1nnirqdd11n6pkvidnf8pb39m45jjnpmwj2qy62di024r7ha3y18";
};
buildInputs = [
@@ -52,9 +52,9 @@ stdenv.mkDerivation rec {
export GERBIL_HOME=$out
case "\$1" in -:*) GSIOPTIONS=\$1 ; shift ;; esac
if [[ \$# = 0 ]] ; then
${gambit}/bin/gsi \$GSIOPTIONS \$GERBIL_HOME/lib/gxi-init \$GERBIL_HOME/lib/gxi-interactive - ;
exec ${gambit}/bin/gsi \$GSIOPTIONS \$GERBIL_HOME/lib/gxi-init \$GERBIL_HOME/lib/gxi-interactive - ;
else
${gambit}/bin/gsi \$GSIOPTIONS \$GERBIL_HOME/lib/gxi-init "\$@"
exec ${gambit}/bin/gsi \$GSIOPTIONS \$GERBIL_HOME/lib/gxi-init "\$@"
fi
EOF
runHook postInstall

18
pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
View File

@@ -4,6 +4,7 @@
, sha256_i686
, sha256_x86_64
, sha256_armv7l
, sha256_aarch64
, jceName
, jceDownloadUrl
, sha256JCE
@@ -38,11 +39,12 @@
assert stdenv.system == "i686-linux"
|| stdenv.system == "x86_64-linux"
|| stdenv.system == "armv7l-linux";
|| stdenv.system == "armv7l-linux"
|| stdenv.system == "aarch64-linux";
assert swingSupport -> xorg != null;
let
abortArch = abort "jdk requires i686-linux, x86_64-linux, or armv7l-linux";
abortArch = abort "jdk requires i686-linux, x86_64-linux, aarch64-linux or armv7l-linux";
/**
* The JRE libraries are in directories that depend on the CPU.
@@ -54,6 +56,8 @@ let
"amd64"
else if stdenv.system == "armv7l-linux" then
"arm"
else if stdenv.system == "aarch64-linux" then
"aarch64"
else
abortArch;
@@ -99,6 +103,12 @@ let result = stdenv.mkDerivation rec {
url = downloadUrl;
sha256 = sha256_armv7l;
}
else if stdenv.system == "aarch64-linux" then
requireFile {
name = "jdk-${productVersion}u${patchVersion}-linux-arm64-vfp-hflt.tar.gz";
url = downloadUrl;
sha256 = sha256_aarch64;
}
else
abortArch;
@@ -116,7 +126,7 @@ let result = stdenv.mkDerivation rec {
# Set PaX markings
exes=$(file $sourceRoot/bin/* $sourceRoot/jre/bin/* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//')
for file in $exes; do
paxmark m "$file"
paxmark m "$file" || true
# On x86 for heap sizes over 700MB disable SEGMEXEC and PAGEEXEC as well.
${stdenv.lib.optionalString stdenv.isi686 ''paxmark msp "$file"''}
done
@@ -212,7 +222,7 @@ let result = stdenv.mkDerivation rec {
meta = with stdenv.lib; {
license = licenses.unfree;
platforms = [ "i686-linux" "x86_64-linux" "armv7l-linux" ]; # some inherit jre.meta.platforms
platforms = [ "i686-linux" "x86_64-linux" "armv7l-linux" "aarch64-linux" ]; # some inherit jre.meta.platforms
};
}; in result

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

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

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

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