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

Merge remote-tracking branch 'NixOS/master' into staging

Browse Source
This commit is contained in:
Matthew Bauer
2019-01-27 00:01:13 -05:00
parent 319ebef3a3 4866cbe341
commit 92f0f8dd68
403 changed files with 4759 additions and 3164 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py
+2 -8
View File
@@ -38,21 +38,15 @@ def generate_sources(release, assets):
type_map = out.setdefault(asset["os"], {})
impl_map = type_map.setdefault(asset["binary_type"], {})
arch_map = impl_map.setdefault(asset["openjdk_impl"], {
"version": version,
"build": build,
"packageType": asset["binary_type"],
"vmType": asset["openjdk_impl"],
})
if arch_map["version"] != version or arch_map["build"] != build:
print("error: architectures have different latest versions ({}+{} vs {}+{})".format(
arch_map["version"], arch_map["build"], version, build
), file=sys.stderr)
sys.exit(1)
arch_map[arch_to_nixos[asset["architecture"]]] = {
"url": asset["binary_link"],
"sha256": get_sha256(asset["checksum_link"]),
"version": version,
"build": build,
}
return out
pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix
+5 -4
View File
@@ -5,13 +5,14 @@ sourcePerArch:
, fetchurl
}:
let result = stdenv.mkDerivation rec {
let cpuName = stdenv.hostPlatform.parsed.cpu.name;
result = stdenv.mkDerivation rec {
name = if sourcePerArch.packageType == "jdk"
then "adoptopenjdk-${sourcePerArch.vmType}-bin-${sourcePerArch.version}"
else "adoptopenjdk-${sourcePerArch.packageType}-${sourcePerArch.vmType}-bin-${sourcePerArch.version}";
then "adoptopenjdk-${sourcePerArch.vmType}-bin-${sourcePerArch.${cpuName}.version}"
else "adoptopenjdk-${sourcePerArch.packageType}-${sourcePerArch.vmType}-bin-${sourcePerArch.${cpuName}.version}";
src = fetchurl {
inherit (sourcePerArch.${stdenv.hostPlatform.parsed.cpu.name}) url sha256;
inherit (sourcePerArch.${cpuName}) url sha256;
};
# See: https://github.com/NixOS/patchelf/issues/10
pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
+5 -3
View File
@@ -42,15 +42,17 @@ let
xorg.libXrender
stdenv.cc.cc
]);
cpuName = stdenv.hostPlatform.parsed.cpu.name;
in
let result = stdenv.mkDerivation rec {
name = if sourcePerArch.packageType == "jdk"
then "adoptopenjdk-${sourcePerArch.vmType}-bin-${sourcePerArch.version}"
else "adoptopenjdk-${sourcePerArch.packageType}-${sourcePerArch.vmType}-bin-${sourcePerArch.version}";
then "adoptopenjdk-${sourcePerArch.vmType}-bin-${sourcePerArch.${cpuName}.version}"
else "adoptopenjdk-${sourcePerArch.packageType}-${sourcePerArch.vmType}-bin-${sourcePerArch.${cpuName}.version}";
src = fetchurl {
inherit (sourcePerArch.${stdenv.hostPlatform.parsed.cpu.name}) url sha256;
inherit (sourcePerArch.${cpuName}) url sha256;
};
nativeBuildInputs = [ file ];
pkgs/development/compilers/adoptopenjdk-bin/sources.json
+30 -26
View File
@@ -4,52 +4,56 @@
"jdk": {
"hotspot": {
"aarch64": {
"build": "13",
"sha256": "b66121b9a0c2e7176373e670a499b9d55344bcb326f67140ad6d0dc24d13d3e2",
"url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.1_13.tar.gz"
"url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.1_13.tar.gz",
"version": "11.0.1"
},
"build": "13",
"packageType": "jdk",
"version": "11.0.1",
"vmType": "hotspot",
"x86_64": {
"sha256": "22bd2f1a2e0cb6e4075967bfeda4a960b0325879305aa739a0ba2d6e5cd4c3e2",
"url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_x64_linux_hotspot_11.0.1_13.tar.gz"
"build": "7",
"sha256": "d89304a971e5186e80b6a48a9415e49583b7a5a9315ba5552d373be7782fc528",
"url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.2%2B7/OpenJDK11U-jdk_x64_linux_hotspot_11.0.2_7.tar.gz",
"version": "11.0.2"
}
},
"openj9": {
"build": "13",
"packageType": "jdk",
"version": "11.0.1",
"vmType": "openj9",
"x86_64": {
"build": "13",
"sha256": "ef9bf07cba79082285a9d426ea4eb3e8df57561ce2afe07cc5f299a8fa203279",
"url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_x64_linux_openj9_jdk-11.0.1_13_openj9-0.11.0_11.0.1_13.tar.gz"
"url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_x64_linux_openj9_jdk-11.0.1_13_openj9-0.11.0_11.0.1_13.tar.gz",
"version": "11.0.1"
}
}
},
"jre": {
"hotspot": {
"aarch64": {
"build": "28",
"sha256": "6fd756bda392e3fddb48382460daae263c6fb5708683a691c8d30af2eb870bb8",
"url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11%2B28/OpenJDK11-jre_aarch64_linux_hotspot_11_28.tar.gz"
"url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11%2B28/OpenJDK11-jre_aarch64_linux_hotspot_11_28.tar.gz",
"version": "11"
},
"build": "28",
"packageType": "jre",
"version": "11",
"vmType": "hotspot",
"x86_64": {
"sha256": "346448142d46c6e51d0fadcaadbcde31251d7678922ec3eb010fcb1b6e17804c",
"url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11%2B28/OpenJDK11-jre_x64_linux_hotspot_11_28.tar.gz"
"build": "7",
"sha256": "59c34373eec16b53798aedac73776b19e43f396fdff8a2879e66dc4b0cfd73cc",
"url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.2%2B7/OpenJDK11U-jre_x64_linux_hotspot_11.0.2_7.tar.gz",
"version": "11.0.2"
}
},
"openj9": {
"build": "28",
"packageType": "jre",
"version": "11",
"vmType": "openj9",
"x86_64": {
"build": "28",
"sha256": "83a7c95e6b2150a739bdd5e8a6fe0315904fd13d8867c95db67c0318304a2c42",
"url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11%2B28/OpenJDK11-jre_x64_linux_openj9_11_28.tar.gz"
"url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11%2B28/OpenJDK11-jre_x64_linux_openj9_11_28.tar.gz",
"version": "11"
}
}
}
@@ -57,35 +61,35 @@
"mac": {
"jdk": {
"hotspot": {
"build": "13",
"packageType": "jdk",
"version": "11.0.1",
"vmType": "hotspot",
"x86_64": {
"build": "13",
"sha256": "e219e7e2d586ed09ae65f4ec390fca5d5f0c37a61b47677648610194daf1aaa7",
"url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_x64_mac_hotspot_11.0.1_13.tar.gz"
"url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_x64_mac_hotspot_11.0.1_13.tar.gz",
"version": "11.0.1"
}
},
"openj9": {
"build": "13",
"packageType": "jdk",
"version": "11.0.1",
"vmType": "openj9",
"x86_64": {
"sha256": "c9a816d6a3f8aac9dc5b3b41c5a9e4e5460af433a06e003ae25d5a06dea8375f",
"url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_x64_mac_openj9_macosXL-jdk-11.0.1_13_openj9-0.11.0_11.0.1_13.tar.gz"
"build": "13",
"sha256": "b8960753a66190fa81982682357a2449b4183f3e23c20a5e3b4cf01e2989846b",
"url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_x64_mac_openj9_jdk-11.0.1_13_openj9-0.11.0_11.0.1_13.tar.gz",
"version": "11.0.1"
}
}
},
"jre": {
"hotspot": {
"build": "28",
"packageType": "jre",
"version": "11",
"vmType": "hotspot",
"x86_64": {
"build": "28",
"sha256": "ef4dbfe5aed6ab2278fcc14db6cc73abbaab56e95f6ebb023790a7ebc6d7f30c",
"url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11%2B28/OpenJDK11-jre_x64_mac_hotspot_11_28.tar.gz"
"url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11%2B28/OpenJDK11-jre_x64_mac_hotspot_11_28.tar.gz",
"version": "11"
}
}
}
pkgs/development/compilers/elm/default.nix
+6
View File
@@ -14,6 +14,12 @@ let
elmPackages = (import ./packages/elm-srcs.nix);
versionsDat = ./versions.dat;
};
patches = [
(fetchpatch {
url = "https://github.com/elm/compiler/pull/1886/commits/39d86a735e28da514be185d4c3256142c37c2a8a.patch";
sha256 = "0nni5qx1523rjz1ja42z6z9pijxvi3fgbw1dhq5qi11mh1nb9ay7";
})
];
buildTools = drv.buildTools or [] ++ [ makeWrapper ];
jailbreak = true;
postInstall = ''
pkgs/development/compilers/go/1.11.nix
+5
View File
@@ -1,5 +1,6 @@
{ stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin
, perl, which, pkgconfig, patch, procps, pcre, cacert, llvm, Security, Foundation
, mailcap
, buildPackages, targetPackages }:
let
@@ -56,6 +57,10 @@ stdenv.mkDerivation rec {
substituteInPlace misc/cgo/testcarchive/carchive_test.go \
--replace '#!/usr/bin/env bash' '#!${stdenv.shell}'
# Patch the mimetype database location which is missing on NixOS.
substituteInPlace src/mime/type_unix.go \
--replace '/etc/mime.types' '${mailcap}/etc/mime.types'
# Disabling the 'os/http/net' tests (they want files not available in
# chroot builds)
rm src/net/{listen,parse}_test.go
pkgs/development/compilers/go/1.4.nix
+1 -1
View File
@@ -156,7 +156,7 @@ stdenv.mkDerivation rec {
homepage = http://golang.org/;
description = "The Go Programming language";
license = licenses.bsd3;
maintainers = with maintainers; [ cstrahan wkennington ];
maintainers = with maintainers; [ cstrahan ];
platforms = platforms.linux ++ platforms.darwin;
};
}
pkgs/development/compilers/go/1.9.nix
+1 -1
View File
@@ -178,7 +178,7 @@ stdenv.mkDerivation rec {
homepage = http://golang.org/;
description = "The Go Programming language";
license = licenses.bsd3;
maintainers = with maintainers; [ cstrahan orivej wkennington ];
maintainers = with maintainers; [ cstrahan orivej ];
platforms = platforms.linux ++ platforms.darwin;
};
}
pkgs/development/compilers/ispc/default.nix
+3 -10
View File
@@ -3,7 +3,7 @@ testedTargets ? ["sse2" "host"] # the default test target is sse4, but that is n
}:
stdenv.mkDerivation rec {
version = "1.9.2";
version = "1.10.0";
rev = "v${version}";
inherit testedTargets;
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
owner = "ispc";
repo = "ispc";
inherit rev;
sha256 = "0zaw7mwvly1csbdcbz9j8ry89n0r1fag1m1f579l4mgg1x6ksqry";
sha256 = "1x07n2gaff3v32yvddrb659mx5gg12bnbsqbyfimp396wn04w60b";
};
# there are missing dependencies in the Makefile, causing sporadic build failures
@@ -32,14 +32,7 @@ stdenv.mkDerivation rec {
llvmPackages.clang-unwrapped # we need to link against libclang, so we need the unwrapped
];
patches = [
(fetchpatch {
url = https://github.com/ispc/ispc/commit/d504641f5af9d5992e7c8f0ed42c1063a39ede5b.patch;
sha256 = "192q3gyvam79469bmlwf0jpfi2y4f8hl2vgcvjngsqhvscwira0s";
})
];
postPatch = "sed -i -e 's/\\/bin\\///g' -e 's/-lcurses/-lncurses/g' Makefile";
postPatch = "sed -i -e 's,/bin/,,g' -e 's/-lcurses/-lncurses/g' Makefile";
# TODO: this correctly catches errors early, but also some things that are just weird and don't seem to be real
# errors
pkgs/development/compilers/osl/default.nix
+3 -3
View File
@@ -8,13 +8,13 @@ in clangStdenv.mkDerivation rec {
# In theory this could use GCC + Clang rather than just Clang,
# but https://github.com/NixOS/nixpkgs/issues/29877 stops this
name = "openshadinglanguage-${version}";
version = "1.9.10";
version = "1.10.2";
src = fetchFromGitHub {
owner = "imageworks";
repo = "OpenShadingLanguage";
rev = "Release-1.9.10";
sha256 = "1iaw3pgh0h53gxk3bl148n1lfr54cx2yv0gnx2rjp2m5599acbz4";
rev = "Release-1.10.2";
sha256 = "1549hav5nd67a3cmhbalyaqhs39dh7w0nilf91pypnadrl1g03k7";
};
cmakeFlags = [ "-DUSE_BOOST_WAVE=ON" "-DENABLERTTI=ON" ];
pkgs/development/compilers/rust/rustc.nix
+3 -1
View File
@@ -166,10 +166,12 @@ stdenv.mkDerivation {
# https://github.com/rust-lang/rust/issues/30181
# enableParallelBuilding = false;
requiredSystemFeatures = [ "big-parallel" ];
meta = with stdenv.lib; {
homepage = https://www.rust-lang.org/;
description = "A safe, concurrent, practical language";
maintainers = with maintainers; [ madjar cstrahan wizeman globin havvy wkennington ];
maintainers = with maintainers; [ madjar cstrahan wizeman globin havvy ];
license = [ licenses.mit licenses.asl20 ];
platforms = platforms.linux ++ platforms.darwin;
broken = broken;