git.iko.soy/typeable/nixpkgs
on master help sign in
Merge branch 'staging'
commit20c2b45ee661ff08b5b0fe7c946291e9ec8690f6 authorVladimír Čunát <vcunat@gmail.com> dateFri 30 Dec 2016, 22:40 (10 years ago) parentdd2fc99ee3fb42
10 files changed+28−26
compare with master
unifiedsplit
pkgs/development/compilers/llvm/3.9/clang/default.nix+1−1 pkgs/development/compilers/llvm/3.9/default.nix+3−3 pkgs/development/compilers/llvm/3.9/libc++/default.nix+1−1 pkgs/development/compilers/llvm/3.9/libc++abi.nix+1−1 pkgs/development/compilers/llvm/3.9/lldb.nix+1−1 pkgs/development/compilers/llvm/3.9/llvm.nix+1−1 pkgs/development/libraries/libssh2/default.nix+2−2 pkgs/development/libraries/ncurses/default.nix+6−3 pkgs/development/python-modules/numpy.nix+8−5 pkgs/top-level/python-packages.nix+4−8
pkgs/development/compilers/llvm/3.9/clang/default.nix+1−1
@@ -6,7 +6,7 @@ let
66 name = "clang-${version}";
77
88 unpackPhase = ''
9− unpackFile ${fetch "cfe" "0a1x32rxrq4ln079xf58irg56gjdxcfgwa00ws4hqv9pv73sg5km"}
9+ unpackFile ${fetch "cfe" "0qsyyb40iwifhhlx9a3drf8z6ni6zwyk3bvh0kx2gs6yjsxwxi76"}
1010 mv cfe-${version}.src clang
1111 sourceRoot=$PWD/clang
1212 unpackFile ${clang-tools-extra_src}
pkgs/development/compilers/llvm/3.9/default.nix+3−3
@@ -2,7 +2,7 @@
22let
33 callPackage = newScope (self // { inherit stdenv isl version fetch; });
44
5− version = "3.9.0";
5+ version = "3.9.1";
66
77 fetch = fetch_v version;
88 fetch_v = ver: name: sha256: fetchurl {
@@ -10,8 +10,8 @@ let
1010 inherit sha256;
1111 };
1212
13− compiler-rt_src = fetch "compiler-rt" "16m5g0hf8yg9npnw25j2a86g34nsvk9rsm3c84gbch2prm7j5rg0";
14− clang-tools-extra_src = fetch "clang-tools-extra" "052zg0h5vbmxnh2ikc743rw3649f112dfyn8hg39x6cfxi3fqyjv";
13+ compiler-rt_src = fetch "compiler-rt" "16gc2gdmp5c800qvydrdhsp0bzb97s8wrakl6i8a4lgslnqnf2fk";
14+ clang-tools-extra_src = fetch "clang-tools-extra" "0d9nh7j7brbh9avigcn69dlaihsl9p3cf9s45mw6fxzzvrdvd999";
1515
1616 self = {
1717 llvm = callPackage ./llvm.nix {
pkgs/development/compilers/llvm/3.9/libc++/default.nix+1−1
@@ -3,7 +3,7 @@
33stdenv.mkDerivation rec {
44 name = "libc++-${version}";
55
6− src = fetch "libcxx" "01jvgwi9zd46bb1f93c561212bjzg02q2akacvsj4qsw6r8qvcyh";
6+ src = fetch "libcxx" "0qbl3afl2p2h87p977lsqr5kykl6cgjpkzczs0g6a3pn53j1bri5";
77
88 postUnpack = ''
99 unpackFile ${libcxxabi.src}
pkgs/development/compilers/llvm/3.9/libc++abi.nix+1−1
@@ -3,7 +3,7 @@
33stdenv.mkDerivation {
44 name = "libc++abi-${version}";
55
6− src = fetch "libcxxabi" "06c05jlwfgm2q5xhy5wzmsi9bmfphzh22wpmbph84s452wksjdxh";
6+ src = fetch "libcxxabi" "1qi9q06zanqm8awzq83810avmvi52air6gr9zfip8mbg5viqn3cj";
77
88 buildInputs = [ cmake ] ++ stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind;
99
pkgs/development/compilers/llvm/3.9/lldb.nix+1−1
@@ -15,7 +15,7 @@
1515stdenv.mkDerivation {
1616 name = "lldb-${version}";
1717
18− src = fetch "lldb" "1113s6crh94hzk9h9lqrvng0lsy174ml2rq0r962ngqy843hwa31";
18+ src = fetch "lldb" "1z30ljmcpp261bjng1i5k3bb9jkrs1cr97z04qs4s3zql6r12cvy";
1919
2020 postUnpack = ''
2121 # Hack around broken standalone build as of 3.8
pkgs/development/compilers/llvm/3.9/llvm.nix+1−1
@@ -19,7 +19,7 @@
1919}:
2020
2121let
22− src = fetch "llvm" "0j49lkd5d7nnpdqzaybs2472bvcxyx0i4r3iccwf3kj2v9wk3iv6";
22+ src = fetch "llvm" "1vi9sf7rx1q04wj479rsvxayb6z740iaz3qniwp266fgp5a07n8z";
2323 shlib = if stdenv.isDarwin then "dylib" else "so";
2424
2525 # Used when creating a version-suffixed symlink of libLLVM.dylib
pkgs/development/libraries/libssh2/default.nix+2−2
@@ -1,11 +1,11 @@
11{stdenv, fetchurlBoot, openssl, zlib, windows}:
22
33stdenv.mkDerivation rec {
4− name = "libssh2-1.7.0";
4+ name = "libssh2-1.8.0";
55
66 src = fetchurlBoot {
77 url = "${meta.homepage}/download/${name}.tar.gz";
8− sha256 = "116mh112w48vv9k3f15ggp5kxw5sj4b88dzb5j69llsh7ba1ymp4";
8+ sha256 = "1m3n8spv79qhjq4yi0wgly5s5rc8783jb1pyra9bkx1md0plxwrr";
99 };
1010
1111 outputs = [ "out" "dev" "devdoc" ];
pkgs/development/libraries/ncurses/default.nix+6−3
@@ -91,6 +91,12 @@ stdenv.mkDerivation rec {
9191 if [ -e "$out/lib/lib''${library}$suffix.$dylibtype" ]; then
9292 ln -svf lib''${library}$suffix.$dylibtype $out/lib/lib$library$newsuffix.$dylibtype
9393 ln -svf lib''${library}$suffix.$dylibtype.${abiVersion} $out/lib/lib$library$newsuffix.$dylibtype.${abiVersion}
94+ if [ "ncurses" = "$library" ]
95+ then
96+ # make libtinfo symlinks
97+ ln -svf lib''${library}$suffix.$dylibtype $out/lib/libtinfo$newsuffix.$dylibtype
98+ ln -svf lib''${library}$suffix.$dylibtype.${abiVersion} $out/lib/libtinfo$newsuffix.$dylibtype.${abiVersion}
99+ fi
94100 fi
95101 done
96102 for statictype in a dll.a la; do
@@ -102,9 +108,6 @@ stdenv.mkDerivation rec {
102108 done
103109 done
104110
105− # create libtinfo symlink
106− ln -svf $out/lib/libncurses.$dylibtype $out/libtinfo.$dylibtype
107−
108111 # move some utilities to $bin
109112 # these programs are used at runtime and don't really belong in $dev
110113 moveToOutput "bin/clear" "$out"
pkgs/development/python-modules/numpy.nix+8−5
@@ -39,15 +39,18 @@ in buildPythonPackage (args // rec {
3939 runHook postCheck
4040 '';
4141
42+ postInstall = ''
43+ ln -s $out/bin/f2py* $out/bin/f2py
44+ '';
45+
4246 passthru = {
4347 blas = blas;
4448 };
4549
46− # The large file support test is disabled because it takes forever
47− # and can cause the machine to run out of disk space when run.
48− prePatch = ''
49− sed -i 's/test_large_file_support/donttest/' numpy/lib/tests/test_format.py
50− '';
50+ # Disable two tests
51+ # - test_f2py: f2py isn't yet on path.
52+ # - test_large_file_support: takes a long time and can cause the machine to run out of disk space
53+ NOSE_EXCLUDE="test_f2py,test_large_file_support";
5154
5255 meta = {
5356 description = "Scientific tools for Python";
pkgs/top-level/python-packages.nix+4−8
@@ -16142,10 +16142,10 @@ in {
1614216142 };
1614316143
1614416144 numpy_1_11 = self.buildNumpyPackage rec {
16145− version = "1.11.2";
16145+ version = "1.11.3";
1614616146 src = pkgs.fetchurl {
16147− url = "mirror://pypi/n/numpy/numpy-${version}.tar.gz";
16148− sha256 = "04db2fbd64e2e7c68e740b14402b25af51418fc43a59d9e54172b38b906b0f69";
16147+ url = "mirror://pypi/n/numpy/numpy-${version}.zip";
16148+ sha256 = "2e0fc5248246a64628656fe14fcab0a959741a2820e003bd15538226501b82f7";
1614916149 };
1615016150 };
1615116151
@@ -24466,12 +24466,8 @@ in {
2446624466 LC_ALL = "en_US.UTF-8";
2446724467 buildInputs = with self; [ nose simplejson mock pkgs.glibcLocales html5lib ] ++ optional (pythonOlder "3.4") self.enum34;
2446824468 # Disable two tests that require network access.
24469− postPatch = ''
24470− substituteInPlace tests/test_build_linkcheck.py --replace test_defaults dont_test_defaults
24471− substituteInPlace tests/test_build_linkcheck.py --replace test_anchors_ignored dont_test_anchors_ignored
24472− '';
2447324469 checkPhase = ''
24474− make test
24470+ NOSE_EXCLUDE=test_defaults,test_anchors_ignored make test
2447524471 '';
2447624472 propagatedBuildInputs = with self; [
2447724473 docutils