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

Merge branch 'staging'

Browse Source 
There are a few dozen new failures on Darwin, probably related to
updates of stdenv's llvm and/or pkgconfig.
Still the total number of successes increases.
This commit is contained in:
Vladimír Čunát 2017-04-08 10:55:48 +02:00
commit 26766f0e57
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
21 changed files with 98 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
{ newScope, stdenv, isl, fetchurl, overrideCC, wrapCC, darwin, ccWrapperFun }:
{ newScope, stdenv, cmake, libxml2, python2, isl, fetchurl, overrideCC, wrapCC, darwin, ccWrapperFun }:
let
callPackage = newScope (self // { inherit stdenv isl release_version version fetch; });
callPackage = newScope (self // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
release_version = "4.0.0";
version = release_version; # differentiating these is important for rc's

13
pkgs/development/interpreters/python/catch_conflicts/README.md Normal file
View File

@ -0,0 +1,13 @@
catch_conflicts.py
==================
The file catch_conflicts.py is in a subdirectory because, if it isn't, the
/nix/store/ directory is added to sys.path causing a delay when building.
Pointers:
- https://docs.python.org/3/library/sys.html#sys.path
- https://github.com/NixOS/nixpkgs/pull/23600

0
pkgs/development/interpreters/python/catch_conflicts.py → pkgs/development/interpreters/python/catch_conflicts/catch_conflicts.py
View File

9
pkgs/development/interpreters/python/mk-python-derivation.nix
View File

@ -79,9 +79,10 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled"] // {
postFixup = ''
wrapPythonPrograms
'' + lib.optionalString catchConflicts ''
# check if we have two packages with the same name in closure and fail
# this shouldn't happen, something went wrong with dependencies specs
${python.interpreter} ${./catch_conflicts.py}
# Check if we have two packages with the same name in the closure and fail.
# If this happens, something went wrong with the dependencies specs.
# Intentionally kept in a subdirectory, see catch_conflicts/README.md.
${python.interpreter} ${./catch_conflicts}/catch_conflicts.py
'' + attrs.postFixup or '''';
passthru = {
@ -98,5 +99,3 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled"] // {
isBuildPythonPackage = python.meta.platforms;
};
})

4
pkgs/development/libraries/at-spi2-core/default.nix
View File

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
versionMajor = "2.22";
versionMinor = "0";
versionMinor = "1";
moduleName = "at-spi2-core";
name = "${moduleName}-${versionMajor}.${versionMinor}";
src = fetchurl {
url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
sha256 = "415ea3af21318308798e098be8b3a17b2f0cf2fe16cecde5ad840cf4e0f2c80a";
sha256 = "6f8f39f091bfe2c57870cb8bfbb02edac4fc85cda69665e6967937daf7201c42";
};
outputs = [ "out" "dev" ];

4
pkgs/development/libraries/gdbm/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "gdbm-1.12";
name = "gdbm-1.13";
src = fetchurl {
url = "mirror://gnu/gdbm/${name}.tar.gz";
sha256 = "1smwz4x5qa4js0zf1w3asq6z7mh20zlgwbh2bk5dczw6xrk22yyr";
sha256 = "0lx201q20dvc70f8a3c9s7s18z15inlxvbffph97ngvrgnyjq9cx";
};
doCheck = true;

4
pkgs/development/libraries/gdk-pixbuf/default.nix
View File

@ -3,14 +3,14 @@
let
ver_maj = "2.36";
ver_min = "5";
ver_min = "6";
in
stdenv.mkDerivation rec {
name = "gdk-pixbuf-${ver_maj}.${ver_min}";
src = fetchurl {
url = "mirror://gnome/sources/gdk-pixbuf/${ver_maj}/${name}.tar.xz";
sha256 = "7ace06170291a1f21771552768bace072ecdea9bd4a02f7658939b9a314c40fc";
sha256 = "455eb90c09ed1b71f95f3ebfe1c904c206727e0eeb34fc94e5aaf944663a820c";
};
outputs = [ "out" "dev" "devdoc" ];

4
pkgs/development/libraries/gtk+/3.x.nix
View File

@ -13,7 +13,7 @@ with stdenv.lib;
let
ver_maj = "3.22";
ver_min = "8";
ver_min = "11";
version = "${ver_maj}.${ver_min}";
in
stdenv.mkDerivation rec {
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/gtk+/${ver_maj}/gtk+-${version}.tar.xz";
sha256 = "c7254a88df5c17e9609cee9e848c3d0104512707edad4c3b4f256b131f8d3af1";
sha256 = "db440670cb6f3c098b076df3735fbc4e69359bd605385e87c90ee48344a804ca";
};
outputs = [ "out" "dev" ];

4
pkgs/development/libraries/libdrm/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, valgrind }:
stdenv.mkDerivation rec {
name = "libdrm-2.4.75";
name = "libdrm-2.4.76";
src = fetchurl {
url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2";
sha256 = "2d5a500eef412cc287d12268eed79d571e262d4957a2ec9258073f305985054f";
sha256 = "7cdfb83ea77def453299dd95332aa9257c9f3534ff5844f5c0ce87265c275f3a";
};
outputs = [ "out" "dev" ];

18
pkgs/development/libraries/libgudev/default.nix
View File

@ -1,21 +1,23 @@
{ lib, stdenv, fetchurl, pkgconfig, udev, glib }:
let version = "230"; in
{ stdenv, fetchurl, pkgconfig, udev, glib }:
stdenv.mkDerivation rec {
name = "libgudev-${version}";
version = "231";
src = fetchurl {
url = "https://download.gnome.org/sources/libgudev/${version}/${name}.tar.xz";
sha256 = "a2e77faced0c66d7498403adefcc0707105e03db71a2b2abd620025b86347c18";
sha256 = "15iz0qp57qy5pjrblsn36l0chlncqggqsg8h8i8c71499afzj7iv";
};
buildInputs = [ pkgconfig udev glib ];
meta = {
# There's a dependency cycle with umockdev and the tests fail to LD_PRELOAD anyway.
configureFlags = [ "--disable-umockdev" ];
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Projects/libgudev;
maintainers = [ lib.maintainers.eelco ];
platforms = lib.platforms.linux;
license = lib.licenses.lgpl2Plus;
maintainers = [ maintainers.eelco ];
platforms = platforms.linux;
license = licenses.lgpl2Plus;
};
}

4
pkgs/development/libraries/libpng/default.nix
View File

@ -3,10 +3,10 @@
assert zlib != null;
let
version = "1.6.28";
version = "1.6.29";
patchVersion = "1.6.26";
# patchVersion = version;
sha256 = "0ylgyx93hnk38haqrh8prd3ax5ngzwvjqw5cxw7p9nxmwsfyrlyq";
sha256 = "0fgjqp7x6jynacmqh6dj72cn6nnf6yxjfqqqfsxrx0pyx22bcia2";
patch_src = fetchurl {
url = "mirror://sourceforge/libpng-apng/libpng-${patchVersion}-apng.patch.gz";
sha256 = "0b6p2k4afvhk1svargpllcvhxb4g3p857wkqk85cks0yv42ckph1";

4
pkgs/development/libraries/mesa/default.nix
View File

@ -67,7 +67,7 @@ let
in
let
version = "17.0.2";
version = "17.0.3";
branch = head (splitString "." version);
driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32";
in
@ -82,7 +82,7 @@ stdenv.mkDerivation {
"ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
"https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz"
];
sha256 = "f8f191f909e01e65de38d5bdea5fb057f21649a3aed20948be02348e77a689d4";
sha256 = "ca646f5075a002d60ef9123c8a4331cede155c01712ef945a65c59a5e69fe7ed";
};
prePatch = "patchShebangs .";

6
pkgs/development/libraries/nss/default.nix
View File

@ -9,11 +9,11 @@ let
in stdenv.mkDerivation rec {
name = "nss-${version}";
version = "3.28.3";
version = "3.30";
src = fetchurl {
url = "mirror://mozilla/security/nss/releases/NSS_3_28_3_RTM/src/${name}.tar.gz";
sha256 = "1wrx2ig6yvgywjs25hzy4szgml21hwhd7ds0ghyfybhkiq7lyg6x";
url = "mirror://mozilla/security/nss/releases/NSS_3_30_RTM/src/${name}.tar.gz";
sha256 = "a8c0000dae5e992f6563972e26dbfefc50d006dd845c43b8ca24ea50169ff3a9";
};
buildInputs = [ perl zlib sqlite ];

4
pkgs/development/libraries/pango/default.nix
View File

@ -6,14 +6,14 @@ with stdenv.lib;
let
ver_maj = "1.40";
ver_min = "3";
ver_min = "4";
in
stdenv.mkDerivation rec {
name = "pango-${ver_maj}.${ver_min}";
src = fetchurl {
url = "mirror://gnome/sources/pango/${ver_maj}/${name}.tar.xz";
sha256 = "abba8b5ce728520c3a0f1535eab19eac3c14aeef7faa5aded90017ceac2711d3";
sha256 = "f8fdc5fc66356dc4edf915048cceeee065a0e0cb70b3b2598f62bda320129a3e";
};
outputs = [ "bin" "dev" "out" "devdoc" ];

17
pkgs/development/tools/misc/pkgconfig/default.nix
View File

@ -1,10 +1,9 @@
{stdenv, fetchurl, automake, libiconv, vanilla ? false }:
let
inherit (stdenv.lib) optional;
in
with stdenv.lib;
stdenv.mkDerivation rec {
name = "pkg-config-0.29";
name = "pkg-config-0.29.2";
setupHook = ./setup-hook.sh;
@ -13,26 +12,26 @@ stdenv.mkDerivation rec {
"https://pkgconfig.freedesktop.org/releases/${name}.tar.gz"
"http://fossies.org/linux/misc/${name}.tar.gz"
];
sha256 = "0sq09a39wj4cxf8l2jvkq067g08ywfma4v6nhprnf351s82pfl68";
sha256 = "14fmwzki1rlz8bs2p810lk6jqdxsk966d8drgsjmi54cd00rrikg";
};
# Process Requires.private properly, see
# http://bugs.freedesktop.org/show_bug.cgi?id=4738.
patches = optional (!vanilla) ./requires-private.patch
++ optional stdenv.isCygwin ./2.36.3-not-win32.patch;
preConfigure = stdenv.lib.optionalString (stdenv.system == "mips64el-linux")
preConfigure = optionalString (stdenv.system == "mips64el-linux")
''cp -v ${automake}/share/automake*/config.{sub,guess} .'';
buildInputs = stdenv.lib.optional (stdenv.isCygwin || stdenv.isDarwin || stdenv.isSunOS) libiconv;
buildInputs = optional (stdenv.isCygwin || stdenv.isDarwin || stdenv.isSunOS) libiconv;
configureFlags = [ "--with-internal-glib" ]
++ stdenv.lib.optional (stdenv.isSunOS) [ "--with-libiconv=gnu" "--with-system-library-path" "--with-system-include-path" "CFLAGS=-DENABLE_NLS" ];
++ optional (stdenv.isSunOS) [ "--with-libiconv=gnu" "--with-system-library-path" "--with-system-include-path" "CFLAGS=-DENABLE_NLS" ];
postInstall = ''rm "$out"/bin/*-pkg-config''; # clean the duplicate file
meta = {
description = "A tool that allows packages to find out information about other packages";
homepage = http://pkg-config.freedesktop.org/wiki/;
platforms = stdenv.lib.platforms.all;
platforms = platforms.all;
};
}

24
pkgs/stdenv/darwin/default.nix
View File

@ -4,15 +4,15 @@
# Allow passing in bootstrap files directly so we can test the stdenv bootstrap process when changing the bootstrap tools
, bootstrapFiles ? let
fetch = { file, sha256, executable ? true }: import <nix/fetchurl.nix> {
url = "http://tarballs.nixos.org/stdenv-darwin/x86_64/33f59c9d11b8d5014dfd18cc11a425f6393c884a/${file}";
url = "http://tarballs.nixos.org/stdenv-darwin/x86_64/c4effbe806be9a0a3727fdbbc9a5e28149347532/${file}";
inherit (localSystem) system;
inherit sha256 executable;
}; in {
sh = fetch { file = "sh"; sha256 = "1rx4kg6358xdj05z0m139a0zn4f4zfmq4n4vimlmnwyfiyn4x7wk"; };
bzip2 = fetch { file = "bzip2"; sha256 = "104qnhzk79vkbp2yi0kci6lszgfppvrwk3rgxhry842ly1xz2r7l"; };
mkdir = fetch { file = "mkdir"; sha256 = "0d91c19xjzmqisncvldv79d7ddzai9l7vcmajhwlwwv74g6da5yl"; };
cpio = fetch { file = "cpio"; sha256 = "0lw057bmcqls96j0gv1n3mgl66q31mba7i413cbkkaf0rfzz3dxj"; };
tarball = fetch { file = "bootstrap-tools.cpio.bz2"; sha256 = "13ihbj002pis3fgy1d9c4fi7flca21z9brjsjkklm82h5b4nlwxl"; executable = false; };
sh = fetch { file = "sh"; sha256 = "1b9r3dksj907bpxp589yhc4217cas73vni8sng4r57f04ydjcinr"; };
bzip2 = fetch { file = "bzip2"; sha256 = "1wm28jgap4cbr8hf4ambg6h9flr2b4mcbh7fw20i0l51v6n8igky"; };
mkdir = fetch { file = "mkdir"; sha256 = "0jc32mzx2whhx2xh70grvvgz4jj26118p9yxmhjqcysagc0k7y66"; };
cpio = fetch { file = "cpio"; sha256 = "0x5dcczkzn0g8yb4pah449jmgy3nmpzrqy4s480grcx05b6v6hkp"; };
tarball = fetch { file = "bootstrap-tools.cpio.bz2"; sha256 = "0ifdc8bwxdhmpbhx2vd3lwjg71gqm6pi5mfm0fkcsbqavl8hd8hz"; executable = false; };
}
}:
@ -301,7 +301,7 @@ in rec {
allowedRequisites = (with pkgs; [
xz.out xz.bin libcxx libcxxabi icu.out gmp.out gnumake findutils bzip2.out
bzip2.bin llvmPackages.llvm zlib.out zlib.dev libffi.out coreutils ed diffutils gnutar
bzip2.bin llvmPackages.llvm llvmPackages.llvm.lib zlib.out zlib.dev libffi.out coreutils ed diffutils gnutar
gzip ncurses.out ncurses.dev ncurses.man gnused bash gawk
gnugrep llvmPackages.clang-unwrapped patch pcre.out binutils-raw.out
binutils-raw.dev binutils gettext
@ -309,10 +309,12 @@ in rec {
dyld Libsystem CF cctools libiconv locale
]);
overrides = self: super: persistent4 prevStage self super // {
clang = cc;
inherit cc;
};
overrides = self: super:
let persistent = persistent4 prevStage self super; in persistent // {
clang = cc;
llvmPackages = persistent.llvmPackages // { clang = cc; };
inherit cc;
};
};
stagesDarwin = [

8
pkgs/tools/archivers/p7zip/default.nix
View File

@ -16,6 +16,14 @@ stdenv.mkDerivation rec {
})
];
# Default makefile is full of impurities on Darwin. The patch doesn't hurt Linux so I'm leaving it unconditional
postPatch = ''
sed -i '/CC=\/usr/d' makefile.macosx_llvm_64bits
# I think this is a typo and should be CXX? Either way let's kill it
sed -i '/XX=\/usr/d' makefile.macosx_llvm_64bits
'';
preConfigure = ''
makeFlagsArray=(DEST_HOME=$out)
buildFlags=all3

22
pkgs/tools/archivers/sharutils/default.nix
View File

@ -1,23 +1,17 @@
{ stdenv, fetchurl, gettext, coreutils }:
stdenv.mkDerivation rec {
name = "sharutils-4.11.1";
name = "sharutils-4.15.2";
src = fetchurl {
url = "mirror://gnu/sharutils/${name}.tar.bz2";
sha256 = "1mallg1gprimlggdisfzdmh1xi676jsfdlfyvanlcw72ny8fsj3g";
url = "mirror://gnu/sharutils/${name}.tar.xz";
sha256 = "16isapn8f39lnffc3dp4dan05b7x6mnc76v6q5nn8ysxvvvwy19b";
};
hardeningDisable = [ "format" ];
preConfigure = ''
# Fix for building on Glibc 2.16. Won't be needed once the
# gnulib in sharutils is updated.
sed -i ${stdenv.lib.optionalString (stdenv.isOpenBSD && stdenv.cc.nativeTools) "''"} '/gets is a security hole/d' lib/stdio.in.h
'';
# GNU Gettext is needed on non-GNU platforms.
buildInputs = [ gettext coreutils ];
buildInputs = [ coreutils gettext ];
doCheck = true;
@ -25,7 +19,7 @@ stdenv.mkDerivation rec {
patches = [ ./sharutils-4.11.1-cross-binary-mode-popen.patch ];
};
meta = {
meta = with stdenv.lib; {
description = "Tools for remote synchronization and `shell archives'";
longDescription =
'' GNU shar makes so-called shell archives out of many files, preparing
@ -44,8 +38,8 @@ stdenv.mkDerivation rec {
concatenated shell archives.
'';
homepage = http://www.gnu.org/software/sharutils/;
license = stdenv.lib.licenses.gpl3Plus;
maintainers = [ ];
platforms = stdenv.lib.platforms.all;
license = licenses.gpl3Plus;
maintainers = [ maintainers.ndowens ];
platforms = platforms.all;
};
}

6
pkgs/tools/system/pciutils/default.nix
View File

@ -1,15 +1,13 @@
{ stdenv, fetchurl, pkgconfig, zlib, kmod, which }:
stdenv.mkDerivation rec {
name = "pciutils-3.5.2"; # with database from 2016-10
name = "pciutils-3.5.4"; # with database from 2017-02
src = fetchurl {
url = "mirror://kernel/software/utils/pciutils/${name}.tar.xz";
sha256 = "1z2y4f3cyvm7a0dyan0n6jpb3p9pvh35lrim0058slj0kwd1969s";
sha256 = "0rpy7kkb2y89wmbcbfjjjxsk2x89v5xxhxib4vpl131ip5m3qab4";
};
patches = [ ./module-dir.diff ];
buildInputs = [ pkgconfig zlib kmod which ];
makeFlags = "SHARED=yes PREFIX=\${out}";

23
pkgs/tools/system/pciutils/module-dir.diff
View File

@ -1,23 +0,0 @@
Don't override libkmod's way of finding modules.
(We override that behavior in nixpkgs to fit nixos.)
diff --git a/ls-kernel.c b/ls-kernel.c
index 78b70f1..ecacd0e 100644
--- a/ls-kernel.c
+++ b/ls-kernel.c
@@ -29,13 +29,7 @@ show_kernel_init(void)
if (show_kernel_inited >= 0)
return show_kernel_inited;
- struct utsname uts;
- if (uname(&uts) < 0)
- die("uname() failed: %m");
- char *name = alloca(64 + strlen(uts.release));
- sprintf(name, "/lib/modules/%s", uts.release);
-
- kmod_ctx = kmod_new(name, NULL);
+ kmod_ctx = kmod_new(NULL, NULL);
if (!kmod_ctx)
{
fprintf(stderr, "lspci: Unable to initialize libkmod context\n");

25
pkgs/top-level/all-packages.nix
View File

@ -5421,7 +5421,7 @@ with pkgs;
llvm_34 = llvmPackages_34.llvm;
llvmPackages = recurseIntoAttrs
(if stdenv.isDarwin then llvmPackages_37 else llvmPackages_39);
(if stdenv.isDarwin then llvmPackages_4 else llvmPackages_39);
llvmPackagesSelf = llvmPackages_34.override {
stdenv = libcxxStdenv;
@ -5435,13 +5435,9 @@ with pkgs;
isl = isl_0_14;
};
llvmPackages_37 = callPackage ../development/compilers/llvm/3.7 ({
llvmPackages_37 = callPackage ../development/compilers/llvm/3.7 {
inherit (stdenvAdapters) overrideCC;
} // stdenv.lib.optionalAttrs stdenv.isDarwin {
cmake = cmake.override { isBootstrap = true; useSharedLibraries = false; };
libxml2 = libxml2.override { pythonSupport = false; };
python2 = callPackage ../development/interpreters/python/cpython/2.7/boot.nix { inherit (darwin) CF configd; };
});
};
llvmPackages_38 = callPackage ../development/compilers/llvm/3.8 {
inherit (stdenvAdapters) overrideCC;
@ -5451,9 +5447,13 @@ with pkgs;
inherit (stdenvAdapters) overrideCC;
};
llvmPackages_4 = callPackage ../development/compilers/llvm/4 {
llvmPackages_4 = callPackage ../development/compilers/llvm/4 ({
inherit (stdenvAdapters) overrideCC;
};
} // stdenv.lib.optionalAttrs stdenv.isDarwin {
cmake = cmake.override { isBootstrap = true; useSharedLibraries = false; };
libxml2 = libxml2.override { pythonSupport = false; };
python2 = callPackage ../development/interpreters/python/cpython/2.7/boot.nix { inherit (darwin) CF configd; };
});
manticore = callPackage ../development/compilers/manticore { };
@ -7387,7 +7387,7 @@ with pkgs;
ffmpeg_0 = ffmpeg_0_10;
ffmpeg_1 = ffmpeg_1_2;
ffmpeg_2 = ffmpeg_2_8;
ffmpeg_3 = ffmpeg_3_1;
ffmpeg_3 = ffmpeg_3_2;
ffmpeg = ffmpeg_3;
ffmpeg-full = callPackage ../development/libraries/ffmpeg-full {
@ -14453,10 +14453,7 @@ with pkgs;
lxdvdrip = callPackage ../applications/video/lxdvdrip { };
handbrake = callPackage ../applications/video/handbrake {
# TODO: remove when 3.2 becomes default
ffmpeg = ffmpeg_3_2;
};
handbrake = callPackage ../applications/video/handbrake { };
lilyterm = callPackage ../applications/misc/lilyterm {
inherit (gnome2) vte;