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

Merge branch 'master' into staging

Browse Source 
* master: (125 commits)
  scummvm: fix eval
  tinycc: 0.9.27pre-20171016 -> 0.9.27
  Update terraform provider versions
  vscode: 1.18.1 -> 1.19.0
  linux: 4.14.6 -> 4.14.7
  scummvm: 1.9.0 -> 2.0.0
  cmst: 2017.03.18 -> 2017.09.19
  albert: 0.14.7 -> 0.14.14
  obs-studio: fix vlc plugin
  ffmpeg, ffmpeg-full: 3.4 -> 3.4.1
  uchiwa: 0.26.3 -> 1.1.0
  linux-testing: 4.15-rc3 -> 4.15-rc4
  steam: override nss, nspr, fixes #32781
  ponyc: 0.20.0 -> 0.21.0
  pythonPackages.pwntools: disable tests
  gnome3.gnome-tweak-tool: 3.26.3 → 3.26.4
  vim-rhubarb: init at 2017-06-28
  atom: depend on libsecret
  nvidia-settings: Make sure binary can find libXv.so
  backblaze-b2: 0.6.2 -> 1.1.0
  ...
This commit is contained in:
Orivej Desh
2017-12-18 15:56:03 +00:00
parent c4b71137bf 68d57167b0
commit 7c58e8dfc2
152 changed files with 2979 additions and 2427 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/development/compilers/edk2/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, libuuid, python2, iasl }:
{ stdenv, fetchFromGitHub, fetchpatch, libuuid, python2, iasl }:
let
pythonEnv = python2.withPackages(ps: [ps.tkinter]);
@@ -11,16 +11,24 @@ else
throw "Unsupported architecture";
edk2 = stdenv.mkDerivation {
name = "edk2-2014-12-10";
name = "edk2-2017-12-05";
src = fetchFromGitHub {
owner = "tianocore";
repo = "edk2";
rev = "vUDK2017";
sha256 = "0sswa028644yr8fbl8j6rhrdm717fj29h4dys3ygklmjhss90a2g";
rev = "f71a70e7a4c93a6143d7bad8ab0220a947679697";
sha256 = "0k48xfwxcgcim1bhkggc19hilvsxsf5axvvcpmld0ng1fcfg0cr6";
};
buildInputs = [ libuuid pythonEnv];
patches = [
(fetchpatch {
name = "short-circuit-the-transfer-of-an-empty-S3_CONTEXT.patch";
url = "https://github.com/tianocore/edk2/commit/9e2a8e928995c3b1bb664b73fd59785055c6b5f6";
sha256 = "0mdqa9w1p6cmli6976v4wi0sw9r4p5prkj7lzfd1877wk11c9c73";
})
];
buildInputs = [ libuuid pythonEnv ];
makeFlags = "-C BaseTools";
@@ -33,10 +41,13 @@ edk2 = stdenv.mkDerivation {
mv -v edksetup.sh $out
'';
enableParallelBuilding = true;
meta = {
description = "Intel EFI development kit";
homepage = https://sourceforge.net/projects/edk2/;
license = stdenv.lib.licenses.bsd2;
branch = "UDK2017";
platforms = ["x86_64-linux" "i686-linux"];
};

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

@@ -2,15 +2,15 @@
stdenv.mkDerivation rec {
name = "glslang-git-${version}";
version = "2017-03-29";
version = "2017-08-31";
# `vulkan-loader` requires a specific version of `glslang` as specified in
# `<vulkan-loader-repo>/external_revisions/glslang_revision`.
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "glslang";
rev = "714e58b2fc5a45714596e6aa2f6ac8f64260365c";
sha256 = "0ihnd0c4mr6ppbv9g7z1abrn8vx66simfzx5q48nqcpnywn35jxv";
rev = "3a21c880500eac21cdf79bef5b80f970a55ac6af";
sha256 = "1i15m17r0acmzjrkybris2rgw15il05a4w5h7vhhsiyngcvajcyn";
};
buildInputs = [ cmake bison ];

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

@@ -1,10 +1,7 @@
{ productVersion
, patchVersion
, downloadUrl
, sha256_i686
, sha256_x86_64
, sha256_armv7l
, sha256_aarch64
, sha256
, jceName
, jceDownloadUrl
, sha256JCE
@@ -37,29 +34,19 @@
, setJavaClassPath
}:
assert stdenv.system == "i686-linux"
|| stdenv.system == "x86_64-linux"
|| stdenv.system == "armv7l-linux"
|| stdenv.system == "aarch64-linux";
assert swingSupport -> xorg != null;
let
abortArch = throw "Unsupported system: ${stdenv.system}";
/**
* The JRE libraries are in directories that depend on the CPU.
*/
architecture =
if stdenv.system == "i686-linux" then
"i386"
else if stdenv.system == "x86_64-linux" then
"amd64"
else if stdenv.system == "armv7l-linux" then
"arm"
else if stdenv.system == "aarch64-linux" then
"aarch64"
else
abortArch;
architecture = {
i686-linux = "i386";
x86_64-linux = "amd64";
armv7l-linux = "arm";
aarch64-linux = "aarch64";
}.${stdenv.system};
jce =
if installjce then
@@ -84,33 +71,16 @@ let result = stdenv.mkDerivation rec {
name =
if installjdk then "oraclejdk-${productVersion}u${patchVersion}" else "oraclejre-${productVersion}u${patchVersion}";
src =
if stdenv.system == "i686-linux" then
requireFile {
name = "jdk-${productVersion}u${patchVersion}-linux-i586.tar.gz";
url = downloadUrl;
sha256 = sha256_i686;
}
else if stdenv.system == "x86_64-linux" then
requireFile {
name = "jdk-${productVersion}u${patchVersion}-linux-x64.tar.gz";
url = downloadUrl;
sha256 = sha256_x86_64;
}
else if stdenv.system == "armv7l-linux" then
requireFile {
name = "jdk-${productVersion}u${patchVersion}-linux-arm32-vfp-hflt.tar.gz";
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;
src = requireFile {
name = {
i686-linux = "jdk-${productVersion}u${patchVersion}-linux-i586.tar.gz";
x86_64-linux = "jdk-${productVersion}u${patchVersion}-linux-x64.tar.gz";
armv7l-linux = "jdk-${productVersion}u${patchVersion}-linux-arm32-vfp-hflt.tar.gz";
aarch64-linux = "jdk-${productVersion}u${patchVersion}-linux-arm64-vfp-hflt.tar.gz";
}.${stdenv.system};
url = downloadUrl;
sha256 = sha256.${stdenv.system};
};
nativeBuildInputs = [ file ]
++ stdenv.lib.optional installjce unzip;

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

@@ -2,10 +2,10 @@ import ./jdk-linux-base.nix {
productVersion = "8";
patchVersion = "151";
downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
sha256_i686 = "0w1snn9hxwvdnk77frhdzbsm6v30v99dy5zmpy8ij7yxd57z6ql0";
sha256_x86_64 = "0zq2dxbxmshz080yskhc8y2wbqi0y0kl9girxjbb4rwk837010n7";
sha256_armv7l = "0fdkvg1al7g9lqbq10rlw400aqr0xxi2a802319sw5n0zipkrjic";
sha256_aarch64 = "1xva22cjjpwa95h7x3xzyymn1bgxp1q67j5j304kn6cqah4k31j1";
sha256.i686-linux = "0w1snn9hxwvdnk77frhdzbsm6v30v99dy5zmpy8ij7yxd57z6ql0";
sha256.x86_64-linux = "0zq2dxbxmshz080yskhc8y2wbqi0y0kl9girxjbb4rwk837010n7";
sha256.armv7l-linux = "0fdkvg1al7g9lqbq10rlw400aqr0xxi2a802319sw5n0zipkrjic";
sha256.aarch64-linux = "1xva22cjjpwa95h7x3xzyymn1bgxp1q67j5j304kn6cqah4k31j1";
jceName = "jce_policy-8.zip";
jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;
sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk";

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

@@ -2,10 +2,10 @@ import ./jdk-linux-base.nix {
productVersion = "8";
patchVersion = "152";
downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
sha256_i686 = "0gjc7kcfx40f43z1w1qsn1fqxdz8d46wml2g11qgm55ishhv2q7w";
sha256_x86_64 = "1gv1348hrgna9l3sssv3g9jzs37y1lkx05xq83chav9z1hs3p2r1";
sha256_armv7l = "1w0hwslsd3z0kvb3z7gmbh20xsyiz73vglmdqz2108y7alim7arm";
sha256_aarch64 = "13qpxa8nxsnikmm7h6ysnsdqg5vl8j7hzfa8kgh20z8a17fhj9kk";
sha256.i686-linux = "0gjc7kcfx40f43z1w1qsn1fqxdz8d46wml2g11qgm55ishhv2q7w";
sha256.x86_64-linux = "1gv1348hrgna9l3sssv3g9jzs37y1lkx05xq83chav9z1hs3p2r1";
sha256.armv7l-linux = "1w0hwslsd3z0kvb3z7gmbh20xsyiz73vglmdqz2108y7alim7arm";
sha256.aarch64-linux = "13qpxa8nxsnikmm7h6ysnsdqg5vl8j7hzfa8kgh20z8a17fhj9kk";
jceName = "jce_policy-8.zip";
jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;
sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk";

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

@@ -3,13 +3,13 @@
stdenv.mkDerivation ( rec {
name = "ponyc-${version}";
version = "0.20.0";
version = "0.21.0";
src = fetchFromGitHub {
owner = "ponylang";
repo = "ponyc";
rev = version;
sha256 = "0shln9v0bp0q9qfipm3834vl284q5vwz9333yzgx46d0l2ivggyi";
sha256 = "0kpnmgxhha22nhl2bmch47cpr0d9h5718h3w9h7qqwd994xcfk9z";
};
buildInputs = [ llvm makeWrapper which ];

36
pkgs/development/compilers/ponyc/disable-tests.patch
View File

@@ -1,19 +1,27 @@
diff -Naur a/packages/net/_test.pony b/packages/net/_test.pony
--- a/packages/net/_test.pony 1970-01-01 01:00:01.000000000 +0100
+++ b/packages/net/_test.pony 2016-12-01 22:25:59.102433053 +0100
@@ -5,14 +5,7 @@
diff --git a/packages/net/_test.pony b/packages/net/_test.pony
index baf29e7..b63f368 100644
--- a/packages/net/_test.pony
+++ b/packages/net/_test.pony
@@ -5,9 +5,6 @@ actor Main is TestList
new make() => None
fun tag tests(test: PonyTest) =>
- test(_TestBroadcast)
- test(_TestTCPWritev)
- test(_TestTCPExpect)
- test(_TestTCPMute)
- test(_TestTCPUnmute)
- ifdef not windows then
- test(_TestTCPThrottle)
- ifdef not osx then
- test(_TestBroadcast)
- end
+ None
test(_TestTCPWritev)
test(_TestTCPExpect)
test(_TestTCPMute)
diff --git a/packages/net/http/_test.pony b/packages/net/http/_test.pony
index e55d5a7..40a4cb6 100644
--- a/packages/net/http/_test.pony
+++ b/packages/net/http/_test.pony
@@ -29,8 +29,6 @@ actor Main is TestList
test(_Valid)
test(_ToStringFun)
- test(_HTTPConnTest)
-
class iso _Encode is UnitTest
fun name(): String => "net/http/URLEncode.encode"
class _TestPing is UDPNotify
let _h: TestHelper

12
pkgs/development/compilers/tinycc/default.nix
View File

@@ -1,20 +1,14 @@
{ stdenv, fetchFromRepoOrCz, perl, texinfo }:
with stdenv.lib;
let
date = "20171016";
rev = "da8c62f75d893449e232944fc62566c020b4d010";
sha256 = "0pdvyhrx7g9imxpc7gr75116imi6ifn0ihsl4fbffsji2dpi61y2";
version = "0.9.27pre-${date}";
in
stdenv.mkDerivation rec {
name = "tcc-${version}";
version = "0.9.27";
src = fetchFromRepoOrCz {
repo = "tinycc";
inherit rev;
inherit sha256;
rev = "release_0_9_27";
sha256 = "12mm1lqywz0akr2yb2axjfbw8lwv57nh395vzsk534riz03ml977";
};
nativeBuildInputs = [ perl texinfo ];