From 9f738fed286c36a1e2c9497709373343a4528c7d Mon Sep 17 00:00:00 2001 From: Igor Sharonov Date: Thu, 28 Jul 2016 20:50:15 +0300 Subject: [PATCH 001/145] texlive-new: fix wrong xdvi md5.run --- pkgs/tools/typesetting/tex/texlive-new/pkgs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/typesetting/tex/texlive-new/pkgs.nix b/pkgs/tools/typesetting/tex/texlive-new/pkgs.nix index aa0e4690248..4345e9744b7 100644 --- a/pkgs/tools/typesetting/tex/texlive-new/pkgs.nix +++ b/pkgs/tools/typesetting/tex/texlive-new/pkgs.nix @@ -22857,7 +22857,7 @@ tl: { # no indentation version = "prot2.5"; }; "xdvi" = { - md5.run = "ada6dc1ceffd19a5fdd33d0536c8f82a"; + md5.run = "0d66ffa281d713e3395ee0f5db93c9bd"; md5.doc = "eda28e06fbd79ed2bb26aff4d4d2fd22"; hasRunfiles = true; version = "22.87"; From b25aeb8e7f9ce6d3c9a947f61cd90087fc69a645 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Sun, 31 Jul 2016 12:36:38 +0200 Subject: [PATCH 002/145] fftw: 3.3.4 -> 3.3.5 --- pkgs/development/libraries/fftw/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/development/libraries/fftw/default.nix index a7a02521c69..cf009599665 100644 --- a/pkgs/development/libraries/fftw/default.nix +++ b/pkgs/development/libraries/fftw/default.nix @@ -4,14 +4,14 @@ with lib; assert elem precision [ "single" "double" "long-double" "quad-precision" ]; -let version = "3.3.4"; in +let version = "3.3.5"; in stdenv.mkDerivation rec { name = "fftw-${precision}-${version}"; src = fetchurl { url = "ftp://ftp.fftw.org/pub/fftw/fftw-${version}.tar.gz"; - sha256 = "10h9mzjxnwlsjziah4lri85scc05rlajz39nqf3mbh4vja8dw34g"; + sha256 = "1kwbx92ps0r7s2mqy7lxbxanslxdzj7dp7r7gmdkzv1j8yqf3kwf"; }; outputs = [ "dev" "out" "doc" ]; # it's dev-doc only From b6153c8f9cce88d6a90e08e39ad0374435672026 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Mon, 1 Aug 2016 20:53:31 +0200 Subject: [PATCH 003/145] python: add file encoding spec to run_setup.py Newer 'mutagen' versions have a test suite that trips over missing encoding in this file. The file is copied to source trees at build time with the name nix_run_setup.py. --- pkgs/development/python-modules/generic/run_setup.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/generic/run_setup.py b/pkgs/development/python-modules/generic/run_setup.py index d980ac7d23d..e3a530eb0cb 100644 --- a/pkgs/development/python-modules/generic/run_setup.py +++ b/pkgs/development/python-modules/generic/run_setup.py @@ -1,3 +1,5 @@ +# -*- coding: utf-8 -*- + import setuptools import tokenize From 8bff33a4ff6a65d1ecf2ba6c8e42f8a5878c2629 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Wed, 10 Aug 2016 13:45:09 +0200 Subject: [PATCH 004/145] diffutils: 3.3 -> 3.4 See http://lists.gnu.org/archive/html/info-gnu/2016-08/msg00004.html for release announcement. --- pkgs/tools/text/diffutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/diffutils/default.nix b/pkgs/tools/text/diffutils/default.nix index 420e0a37ba7..8b6c5ca5c77 100644 --- a/pkgs/tools/text/diffutils/default.nix +++ b/pkgs/tools/text/diffutils/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, xz, coreutils ? null }: stdenv.mkDerivation rec { - name = "diffutils-3.3"; + name = "diffutils-3.4"; src = fetchurl { url = "mirror://gnu/diffutils/${name}.tar.xz"; - sha256 = "1761vymxbp4wb5rzjvabhdkskk95pghnn67464byvzb5mfl8jpm2"; + sha256 = "1qlw328qpbss07zrb14ls0rhnhbvxrnssgbmrxxj2gdcy8jw0lyv"; }; outputs = [ "out" "info" ]; From 092b6b68a0669121887d79e5d2685ed7a9da2d52 Mon Sep 17 00:00:00 2001 From: Svend Sorensen Date: Tue, 9 Aug 2016 17:01:09 -0700 Subject: [PATCH 005/145] gnupg: Fix gpgsm linking for gnupg 2.1.14 gnupg 2.1.14 fails to compile under OS X due to a missing -lintl flag [1]. This was fixed in commit c49c43d7 in the gnupg repository [2], which adds the flag to Makefile.am. This commit adds the flag to Makefile.in. [1] https://lists.gnupg.org/pipermail/gnupg-devel/2016-July/031354.html [2] https://lists.gnupg.org/pipermail/gnupg-devel/2016-July/031362.html Fixes #17617. --- pkgs/tools/security/gnupg/21.nix | 2 ++ pkgs/tools/security/gnupg/fix-gpgsm-linking.patch | 11 +++++++++++ 2 files changed, 13 insertions(+) create mode 100644 pkgs/tools/security/gnupg/fix-gpgsm-linking.patch diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix index 30ce33bd6a5..b5f1f3b94b7 100644 --- a/pkgs/tools/security/gnupg/21.nix +++ b/pkgs/tools/security/gnupg/21.nix @@ -27,6 +27,8 @@ stdenv.mkDerivation rec { readline libusb gnutls adns openldap zlib bzip2 ]; + patches = [ ./fix-gpgsm-linking.patch ]; + postPatch = stdenv.lib.optionalString stdenv.isLinux '' sed -i 's,"libpcsclite\.so[^"]*","${pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c ''; #" fix Emacs syntax highlighting :-( diff --git a/pkgs/tools/security/gnupg/fix-gpgsm-linking.patch b/pkgs/tools/security/gnupg/fix-gpgsm-linking.patch new file mode 100644 index 00000000000..290d43f5b0d --- /dev/null +++ b/pkgs/tools/security/gnupg/fix-gpgsm-linking.patch @@ -0,0 +1,11 @@ +--- a/tests/gpgscm/Makefile.in ++++ b/tests/gpgscm/Makefile.in +@@ -457,7 +457,7 @@ + scheme-config.h opdefines.h scheme.c scheme.h scheme-private.h + + gpgscm_LDADD = $(LDADD) $(common_libs) \ +- $(NETLIBS) $(LIBICONV) $(LIBREADLINE) \ ++ $(NETLIBS) $(LIBICONV) $(LIBREADLINE) $(LIBINTL) \ + $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) + + t_child_SOURCES = t-child.c From 7d0f05f22c0676f66a3ffd1fa112476beefc4cfd Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sat, 13 Aug 2016 03:41:52 +0200 Subject: [PATCH 006/145] mesa: 11.2.2 -> 12.0.1 --- pkgs/development/libraries/mesa/default.nix | 125 ++++++++++---------- 1 file changed, 63 insertions(+), 62 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 4ed47f46a32..8f037d239d0 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -1,13 +1,12 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, autoreconfHook, substituteAll -, file, expat, libdrm, xorg, wayland, libudev, llvmPackages, libffi, libomxil-bellagio -, libvdpau, libelf, libva -, grsecEnabled +{ stdenv, fetchurl, fetchpatch +, pkgconfig, intltool, autoreconfHook, substituteAll +, file, expat, libdrm, xorg, wayland, libudev +, llvmPackages, libffi, libomxil-bellagio, libva +, libelf, libvdpau, python +, grsecEnabled ? false , enableTextureFloats ? false # Texture floats are patented, see docs/patents.txt }: -if ! stdenv.lib.lists.elem stdenv.system stdenv.lib.platforms.mesaPlatforms then - throw "unsupported platform for Mesa" -else /** Packaging design: - The basic mesa ($out) contains headers and libraries (GLU is in mesa_glu now). @@ -20,11 +19,15 @@ else - libOSMesa is in $osmesa (~4 MB) */ -with { inherit (stdenv.lib) optional optionalString; }; +with stdenv.lib; + +if ! lists.elem stdenv.system platforms.mesaPlatforms then + throw "unsupported platform for Mesa" +else let - version = "11.2.2"; - # this is the default search path for DRI drivers + version = "12.0.1"; + branch = head (splitString "." version); driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32"; in @@ -34,20 +37,20 @@ stdenv.mkDerivation { src = fetchurl { urls = [ "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" - (with stdenv.lib; ''ftp://ftp.freedesktop.org/pub/mesa/older-versions/'' - + head (splitString "." version) + ''.x/${version}/mesa-${version}.tar.xz'') + "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 = "40e148812388ec7c6d7b6657d5a16e2e8dabba8b97ddfceea5197947647bdfb4"; + sha256 = "12b3i59xdn2in2hchrkgh4fwij8zhznibx976l3pdj3qkyvlzcms"; }; prePatch = "patchShebangs ."; + # TODO: + # revive ./dricore-gallium.patch when it gets ported (from Ubuntu), as it saved + # ~35 MB in $drivers; watch https://launchpad.net/ubuntu/+source/mesa/+changelog patches = [ ./glx_ro_text_segm.patch # fix for grsecurity/PaX ./symlink-drivers.patch - # TODO: revive ./dricore-gallium.patch when it gets ported (from Ubuntu), - # as it saved ~35 MB in $drivers; watch https://launchpad.net/ubuntu/+source/mesa/+changelog ] ++ optional stdenv.isLinux (substituteAll { src = ./dlopen-absolute-paths.diff; @@ -61,61 +64,59 @@ stdenv.mkDerivation { outputs = [ "dev" "out" "drivers" "osmesa" ]; + # TODO: Figure out how to enable opencl without having a runtime dependency on clang configureFlags = [ "--sysconfdir=/etc" "--localstatedir=/var" "--with-dri-driverdir=$(drivers)/lib/dri" "--with-dri-searchpath=${driverLink}/lib/dri" + "--with-egl-platforms=x11,wayland,drm" + (optionalString (stdenv.system != "armv7l-linux") + "--with-gallium-drivers=svga,i915,ilo,r300,r600,radeonsi,nouveau,freedreno,swrast") + (optionalString (stdenv.system != "armv7l-linux") + "--with-dri-drivers=i915,i965,nouveau,radeon,r200,swrast") + (enableFeature enableTextureFloats "texture-float") + (enableFeature grsecEnabled "glx-rts") + (enableFeature stdenv.isLinux "dri3") + (enableFeature stdenv.isLinux "nine") # Direct3D in Wine + "--enable-dri" + "--enable-driglx-direct" "--enable-gles1" "--enable-gles2" - "--enable-dri" - ] ++ optional stdenv.isLinux "--enable-dri3" - ++ [ "--enable-glx" + "--enable-glx-tls" "--enable-gallium-osmesa" # used by wine + "--enable-gallium-llvm" "--enable-egl" "--enable-xa" # used in vmware driver "--enable-gbm" - ] ++ optional stdenv.isLinux "--enable-nine" # Direct3D in Wine - ++ [ "--enable-xvmc" "--enable-vdpau" - #"--enable-omx" - #"--enable-va" - - # TODO: Figure out how to enable opencl without having a runtime dependency on clang - "--disable-opencl" - - (if "armv7l-linux" == stdenv.system - then null - else "--with-gallium-drivers=svga,i915,ilo,r300,r600,radeonsi,nouveau,freedreno,swrast") "--enable-shared-glapi" "--enable-sysfs" - "--enable-driglx-direct" # seems enabled anyway - "--enable-glx-tls" - (if "armv7l-linux" == stdenv.system - then "--with-dri-drivers=" - else "--with-dri-drivers=i915,i965,nouveau,radeon,r200,swrast") - "--with-egl-platforms=x11,wayland,drm" - - "--enable-gallium-llvm" "--enable-llvm-shared-libs" - ] ++ optional enableTextureFloats "--enable-texture-float" - ++ optional grsecEnabled "--enable-glx-rts"; # slight performance degradation, enable only for grsec + "--enable-omx" + "--enable-va" + "--disable-opencl" + ]; nativeBuildInputs = [ pkgconfig file ]; - propagatedBuildInputs = with xorg; [ libXdamage libXxf86vm ] + propagatedBuildInputs = with xorg; + [ libXdamage libXxf86vm ] ++ optional stdenv.isLinux libdrm; buildInputs = with xorg; [ autoreconfHook intltool expat llvmPackages.llvm glproto dri2proto dri3proto presentproto libX11 libXext libxcb libXt libXfixes libxshmfence - libffi wayland libvdpau libelf libXvMC /* libomxil-bellagio libva */ + libffi wayland libvdpau libelf libXvMC + libomxil-bellagio libva libpthreadstubs + (python.withPackages (ps: [ ps.Mako ])) ] ++ optional stdenv.isLinux libudev; + enableParallelBuilding = true; doCheck = false; @@ -124,42 +125,42 @@ stdenv.mkDerivation { "localstatedir=\${TMPDIR}" ]; - # move gallium-related stuff to $drivers, so $out doesn't depend on LLVM; - # also move libOSMesa to $osmesa, as it's relatively big - # ToDo: probably not all .la files are completely fixed, but it shouldn't matter - postInstall = with stdenv.lib; '' - mv -t "$drivers/lib/" \ - $out/lib/libXvMC* \ - $out/lib/d3d \ - $out/lib/vdpau \ - $out/lib/libxatracker* + # TODO: probably not all .la files are completely fixed, but it shouldn't matter; + postInstall = '' + # move gallium-related stuff to $drivers, so $out doesn't depend on LLVM + mv -t "$drivers/lib/" \ + $out/lib/libXvMC* \ + $out/lib/d3d \ + $out/lib/vdpau \ + $out/lib/bellagio \ + $out/lib/libxatracker* \ + mv $out/lib/dri/* $drivers/lib/dri + + # move libOSMesa to $osmesa, as it's relatively big mkdir -p {$osmesa,$drivers}/lib/ - mv -t $osmesa/lib/ \ - $out/lib/libOSMesa* + mv -t $osmesa/lib/ $out/lib/libOSMesa* - '' + /* now fix references in .la files */ '' - sed "/^libdir=/s,$out,$osmesa," -i \ - $osmesa/lib/libOSMesa*.la + # now fix references in .la files + sed "/^libdir=/s,$out,$osmesa," -i $osmesa/lib/libOSMesa*.la - '' + /* set the default search path for DRI drivers; used e.g. by X server */ '' + # set the default search path for DRI drivers; used e.g. by X server substituteInPlace "$dev/lib/pkgconfig/dri.pc" --replace '$(drivers)' "${driverLink}" ''; - #ToDo: @vcunat isn't sure if drirc will be found when in $out/etc/, but it doesn't seem important ATM */ - postFixup = + # TODO: + # @vcunat isn't sure if drirc will be found when in $out/etc/; + # check $out doesn't depend on llvm: builder failures are ignored + # for some reason grep -qv '${llvmPackages.llvm}' -R "$out"; + postFixup = '' # add RPATH so the drivers can find the moved libgallium and libdricore9 # moved here to avoid problems with stripping patchelfed files - '' for lib in $drivers/lib/*.so* $drivers/lib/*/*.so*; do if [[ ! -L "$lib" ]]; then patchelf --set-rpath "$(patchelf --print-rpath $lib):$drivers/lib" "$lib" fi done ''; - # ToDo + /* check $out doesn't depend on llvm */ '' - # builder failures are ignored for some reason - # grep -qv '${llvmPackages.llvm}' -R "$out" passthru = { inherit libdrm version driverLink; }; From 9a0dfe23d88131cbd0547cd40c7d295da54d78e1 Mon Sep 17 00:00:00 2001 From: Kranium Gikos Mendoza Date: Sat, 13 Aug 2016 14:23:20 +0800 Subject: [PATCH 007/145] tini: fix build --- pkgs/applications/virtualization/tini/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/tini/default.nix b/pkgs/applications/virtualization/tini/default.nix index fe016da6e58..535ca551785 100644 --- a/pkgs/applications/virtualization/tini/default.nix +++ b/pkgs/applications/virtualization/tini/default.nix @@ -7,14 +7,12 @@ stdenv.mkDerivation rec { url = "https://github.com/krallin/tini/archive/v0.8.3.tar.gz"; sha256 ="1w7rj4crrcyv25idmh4asbp2sxzwyihy5mbpw384bzxjzaxn9xpa"; }; + patchPhase = "sed -i /tini-static/d CMakeLists.txt"; NIX_CFLAGS_COMPILE = [ "-DPR_SET_CHILD_SUBREAPER=36" "-DPR_GET_CHILD_SUBREAPER=37" ]; buildInputs = [ cmake ]; - postInstall = '' - rm $out/bin/tini-static - ''; meta = with stdenv.lib; { description = "A tiny but valid init for containers"; homepage = https://github.com/krallin/tini; From 7143f0aeb0877696b3c4be8a1f22a0fc08244abe Mon Sep 17 00:00:00 2001 From: Tristan Helmich Date: Sat, 13 Aug 2016 12:11:17 +0200 Subject: [PATCH 008/145] emby: 3.0.6030 -> 3.0.6060 --- pkgs/servers/emby/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix index 1cad76bbf20..899c4a13502 100644 --- a/pkgs/servers/emby/default.nix +++ b/pkgs/servers/emby/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "emby-${version}"; - version = "3.0.6030"; + version = "3.0.6060"; src = fetchurl { url = "https://github.com/MediaBrowser/Emby/archive/${version}.tar.gz"; - sha256 = "14fmgb8pwj11n57c1rm002ylwqapdqywbpsv7z6skairbaf6ny09"; + sha256 = "1s895198x3kiqfznhp56vj67wld9fgh2wd7k8hw69mrasby0kmp3"; }; propagatedBuildInputs = with pkgs; [ From 371d17960dffa13bc5154f0aba4d2e7b3a11a1e2 Mon Sep 17 00:00:00 2001 From: Tom Hunger Date: Sat, 13 Aug 2016 17:30:57 +0100 Subject: [PATCH 009/145] libdynd: init at 0.7.2 --- .../development/libraries/libdynd/default.nix | 28 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/libdynd/default.nix diff --git a/pkgs/development/libraries/libdynd/default.nix b/pkgs/development/libraries/libdynd/default.nix new file mode 100644 index 00000000000..119c92d690d --- /dev/null +++ b/pkgs/development/libraries/libdynd/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, cmake }: + +let version = "0.7.2"; in +stdenv.mkDerivation { + name = "libdynd-${version}"; + + src = fetchFromGitHub { + owner = "libdynd"; + repo = "libdynd"; + rev = "v${version}"; + sha256 = "0fkd5rawqni1cq51fmr76iw7ll4fmbahfwv4rglnsabbkylf73pr"; + }; + + cmakeFlags = [ + "-DDYND_BUILD_BENCHMARKS=OFF" + ]; + + buildInputs = [ cmake ]; + + outputs = [ "dev" "out" ]; + outputDoc = "dev"; + + meta = with stdenv.lib; { + description = "C++ dynamic ndarray library, with Python exposure."; + homepage = http://libdynd.org; + license = licenses.bsd2; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c0c95a56c03..d2636f0ee43 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1531,7 +1531,7 @@ in hangul = callPackage ../tools/inputmethods/fcitx-engines/fcitx-hangul { }; unikey = callPackage ../tools/inputmethods/fcitx-engines/fcitx-unikey { }; - + m17n = callPackage ../tools/inputmethods/fcitx-engines/fcitx-m17n { }; mozc = callPackage ../tools/inputmethods/fcitx-engines/fcitx-mozc { @@ -9810,6 +9810,8 @@ in fetchurl = fetchurlBoot; }; + libdynd = callPackage ../development/libraries/libdynd { }; + zlog = callPackage ../development/libraries/zlog { }; zlibStatic = lowPrio (appendToName "static" (callPackage ../development/libraries/zlib { From ab53f39faec020ac49ab51ac1953adfe5a93a87b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 13 Aug 2016 21:29:07 +0100 Subject: [PATCH 010/145] xcbutilxrm: init at 1.0 --- pkgs/servers/x11/xorg/xcb-util-xrm.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/servers/x11/xorg/xcb-util-xrm.nix diff --git a/pkgs/servers/x11/xorg/xcb-util-xrm.nix b/pkgs/servers/x11/xorg/xcb-util-xrm.nix new file mode 100644 index 00000000000..9eb8add6856 --- /dev/null +++ b/pkgs/servers/x11/xorg/xcb-util-xrm.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, pkgconfig, m4, libxcb, xcbutil, libX11 }: + +stdenv.mkDerivation rec { + version = "1.0"; + name = "xcb-util-xrm-${version}"; + + src = fetchurl { + url = "https://github.com/Airblader/xcb-util-xrm/releases/download/v${version}/${name}.tar.bz2"; + sha256 = "1h5vxwpd37dqfw9yj1l4zd9c5dj30r3g0szgysr6kd7xrqgaq04l"; + }; + + buildInputs = [ pkgconfig m4 libxcb xcbutil ] + ++ stdenv.lib.optional doCheck [ libX11 ]; + doCheck = true; + + meta = with stdenv.lib; { + description = "XCB utility functions for the X resource manager"; + homepage = https://github.com/Airblader/xcb-util-xrm; + license = licenses.mit; # X11 variant + platforms = with platforms; unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c0c95a56c03..224558f8774 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9755,6 +9755,8 @@ in xcb-util-cursor = xorg.xcbutilcursor; xcb-util-cursor-HEAD = callPackage ../development/libraries/xcb-util-cursor/HEAD.nix { }; + xcbutilxrm = callPackage ../servers/x11/xorg/xcb-util-xrm.nix { }; + xdo = callPackage ../tools/misc/xdo { }; xineLib = callPackage ../development/libraries/xine-lib { From c2013ac1d68b13ee89a9eff0e74ee490d5366d87 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 13 Aug 2016 21:30:07 +0100 Subject: [PATCH 011/145] rofi: 1.1.0 -> 1.2.0 --- pkgs/applications/misc/rofi/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix index 491f09943b5..d6ff999b23d 100644 --- a/pkgs/applications/misc/rofi/default.nix +++ b/pkgs/applications/misc/rofi/default.nix @@ -1,15 +1,14 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig, libX11, libxkbcommon, pango -, cairo, glib, libxcb, xcbutil, xcbutilwm, libstartup_notification -, i3Support ? false, i3 +{ stdenv, fetchurl, autoreconfHook, pkgconfig, libxkbcommon, pango +, cairo, glib, libxcb, xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification }: stdenv.mkDerivation rec { - version = "1.1.0"; + version = "1.2.0"; name = "rofi-${version}"; src = fetchurl { url = "https://github.com/DaveDavenport/rofi/releases/download/${version}/${name}.tar.xz"; - sha256 = "1l8vl0mh7i0b1ycifqpg6392f5i4qxlv003m126skfk6fnlfq8hn"; + sha256 = "0xxx0xpxhrhlhi2axq9867zqrhwqavc1qrr833k1xr0pvm5m0aqc"; }; preConfigure = '' @@ -18,9 +17,10 @@ stdenv.mkDerivation rec { sed -i 's/~root/~nobody/g' test/helper-expand.c ''; - buildInputs = [ autoreconfHook pkgconfig libX11 libxkbcommon pango - cairo libstartup_notification libxcb xcbutil xcbutilwm - ] ++ stdenv.lib.optional i3Support i3; + buildInputs = [ autoreconfHook pkgconfig libxkbcommon pango cairo + libstartup_notification libxcb xcbutil xcbutilwm xcbutilxrm + ]; + doCheck = true; meta = with stdenv.lib; { description = "Window switcher, run dialog and dmenu replacement"; From b5bd862f243e799108c530976f69089940c6f115 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 13 Aug 2016 21:48:30 +0100 Subject: [PATCH 012/145] maintainers.nix: update own email address --- lib/maintainers.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 7f6c823d68b..8971e6047d6 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -240,7 +240,7 @@ mathnerd314 = "Mathnerd314 "; matthiasbeyer = "Matthias Beyer "; maurer = "Matthew Maurer "; - mbakke = "Marius Bakke "; + mbakke = "Marius Bakke "; matthewbauer = "Matthew Bauer "; mbe = "Brandon Edens "; mboes = "Mathieu Boespflug "; From b81cf59bd7d52903750c43befcc2c382175d03d5 Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Sun, 14 Aug 2016 10:20:39 +0300 Subject: [PATCH 013/145] wine: 1.9.14 -> 1.9.16 Update wineUnstable and wineStaging --- pkgs/misc/emulators/wine/sources.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 9a437971e42..92ed55be2de 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -30,9 +30,9 @@ in rec { }; unstable = fetchurl rec { - version = "1.9.14"; + version = "1.9.16"; url = "mirror://sourceforge/wine/wine-${version}.tar.bz2"; - sha256 = "0b65j8lc2axyc7lpa5rjr7vbjz4y78gkd7hhmvhra78pmwf9dgkz"; + sha256 = "010gjib4nhrn9j9q12v5irda8df8xp17a6v6qqskkadd79kxc871"; inherit (stable) mono; gecko32 = fetchurl rec { version = "2.44"; @@ -48,7 +48,7 @@ in rec { staging = fetchFromGitHub rec { inherit (unstable) version; - sha256 = "0582ylrvl7racpb0il3wmbivb2d7lh6n3mymh19yw94qzgifwqrw"; + sha256 = "0rcy0i36jxv2akczd4sfrdmlsqxmj5v0wzvqb3xl8p2mldk9i8yl"; owner = "wine-compholio"; repo = "wine-staging"; rev = "v${version}"; From ed83a0ec8b0d015d8fb3855bdbc8ae529fa0e041 Mon Sep 17 00:00:00 2001 From: Svein Ove Aas Date: Sun, 14 Aug 2016 11:56:21 +0200 Subject: [PATCH 014/145] crashplan: Wait for filesystems to be mounted before starting --- nixos/modules/services/backup/crashplan.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/backup/crashplan.nix b/nixos/modules/services/backup/crashplan.nix index a69526f968b..38cf8eb72fb 100644 --- a/nixos/modules/services/backup/crashplan.nix +++ b/nixos/modules/services/backup/crashplan.nix @@ -28,7 +28,7 @@ with lib; description = "CrashPlan Backup Engine"; wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; + after = [ "network.target" "local-fs.target" ]; preStart = '' ensureDir() { From 11d1fdfd8bf5411218571ef9fb9441705b23c459 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 14 Aug 2016 12:01:09 +0200 Subject: [PATCH 015/145] Remove top-level cython and cython3 See #11567. --- .../instant-messengers/blink/default.nix | 4 ++-- .../reposurgeon/default.nix | 22 ++++++++++--------- .../interpreters/renpy/default.nix | 6 +++-- pkgs/tools/X11/xpra/default.nix | 7 +++--- pkgs/top-level/all-packages.nix | 4 ---- pkgs/top-level/python-packages.nix | 2 +- 6 files changed, 23 insertions(+), 22 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/blink/default.nix b/pkgs/applications/networking/instant-messengers/blink/default.nix index d2a08b98c07..e771db3795b 100644 --- a/pkgs/applications/networking/instant-messengers/blink/default.nix +++ b/pkgs/applications/networking/instant-messengers/blink/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pythonPackages, pyqt4, cython, libvncserver, zlib, twisted +{ stdenv, fetchurl, pythonPackages, libvncserver, zlib , gnutls, libvpx, makeDesktopItem }: pythonPackages.buildPythonApplication rec { @@ -18,7 +18,7 @@ pythonPackages.buildPythonApplication rec { propagatedBuildInputs = with pythonPackages;[ pyqt4 cjson sipsimple twisted ]; - buildInputs = [ cython zlib libvncserver libvpx ]; + buildInputs = [ pythonPackages.cython zlib libvncserver libvpx ]; desktopItem = makeDesktopItem { name = "Blink"; diff --git a/pkgs/applications/version-management/reposurgeon/default.nix b/pkgs/applications/version-management/reposurgeon/default.nix index 55858034b1c..2408621b9cf 100644 --- a/pkgs/applications/version-management/reposurgeon/default.nix +++ b/pkgs/applications/version-management/reposurgeon/default.nix @@ -1,11 +1,13 @@ -{stdenv, fetchurl, makeWrapper, python27, python27Packages, git, - docbook_xml_dtd_412, docbook_xml_xslt, asciidoc, xmlto, - cython ? null, - bazaar ? null, cvs ? null, darcs ? null, fossil ? null, - mercurial ? null, monotone ? null, rcs ? null, src ? null, - subversion ? null, cvs_fast_export ? null }: +{ stdenv, fetchurl, makeWrapper, python27Packages, git +, docbook_xml_dtd_412, docbook_xml_xslt, asciidoc, xmlto +, bazaar ? null, cvs ? null, darcs ? null, fossil ? null +, mercurial ? null, monotone ? null, rcs ? null, src ? null +, subversion ? null, cvs_fast_export ? null }: + with stdenv; with lib; -mkDerivation rec { +let + inherit (python27Packages) python cython; +in mkDerivation rec { name = "reposurgeon-${meta.version}"; meta = { description = "A tool for editing version-control repository history"; @@ -33,8 +35,8 @@ mkDerivation rec { makeFlagsArray=( XML_CATALOG_FILES="${docbook_xml_dtd_412}/xml/dtd/docbook/catalog.xml ${docbook_xml_xslt}/xml/xsl/docbook/catalog.xml" prefix="$out" - pyinclude="-I${python27}/include/python2.7" - pylib="-L${python27}/lib -lpython2.7" + pyinclude="-I${python}/include/python2.7" + pylib="-L${python}/lib -lpython2.7" ) ''; @@ -51,7 +53,7 @@ mkDerivation rec { [ out git bazaar cvs darcs fossil mercurial monotone rcs src subversion cvs_fast_export ] ); - pythonpath = makeSearchPathOutput "lib" python27.sitePackages ( + pythonpath = makeSearchPathOutput "lib" python.sitePackages ( filter (x: x != null) [ python27Packages.readline or null python27Packages.hglib or null ] ); diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix index 355723ba337..dd735876435 100644 --- a/pkgs/development/interpreters/renpy/default.nix +++ b/pkgs/development/interpreters/renpy/default.nix @@ -1,7 +1,9 @@ -{ stdenv, fetchurl, python, cython, pkgconfig, wrapPython -, pygame, SDL, libpng, ffmpeg, freetype, glew, mesa, fribidi, zlib +{ stdenv, fetchurl, pythonPackages, pkgconfig, SDL +, libpng, ffmpeg, freetype, glew, mesa, fribidi, zlib }: +with pythonPackages; + stdenv.mkDerivation { name = "renpy-6.17.6"; diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index d75e3a16313..4964e47ddc0 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -1,11 +1,12 @@ -{ stdenv, fetchurl, buildPythonApplication, pythonPackages -, python, cython, pkgconfig +{ stdenv, fetchurl, pythonPackages, pkgconfig , xorg, gtk, glib, pango, cairo, gdk_pixbuf, atk, pycairo , makeWrapper, xkbcomp, xorgserver, getopt, xauth, utillinux, which, fontsConf, xkeyboard_config , ffmpeg, x264, libvpx, libwebp , libfakeXinerama }: -buildPythonApplication rec { +let + inherit (pythonPackages) python cython buildPythonApplication; +in buildPythonApplication rec { name = "xpra-0.17.4"; namePrefix = ""; src = fetchurl { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 42cf49c1143..06721febaf1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4398,9 +4398,6 @@ in cryptol = self.haskell.packages.lts.cryptol; - cython = pythonPackages.cython; - cython3 = python3Packages.cython; - devpi-client = callPackage ../development/tools/devpi-client {}; drumstick = callPackage ../development/libraries/drumstick { }; @@ -5972,7 +5969,6 @@ in regina = callPackage ../development/interpreters/regina { }; renpy = callPackage ../development/interpreters/renpy { - wrapPython = pythonPackages.wrapPython; ffmpeg = ffmpeg_2; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 37d1be553e0..c926ee97f62 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -21361,7 +21361,7 @@ in modules // { sha256 = "768e568f3299966c294b7eb8cd114fc648f7bfaef422ee9cc750dd8d9d09e44b"; }; - buildInputs = with self; [ pkgs.cython nose numpy six ]; + buildInputs = with self; [ cython nose numpy six ]; propagatedBuildInputs = with self; [ pillow matplotlib networkx scipy ]; From 7845ca62193efd916ddad9a538154b4d11e7db54 Mon Sep 17 00:00:00 2001 From: Tom Hunger Date: Sat, 13 Aug 2016 18:02:01 +0100 Subject: [PATCH 016/145] dynd-python: init at 0.7.2 --- pkgs/top-level/python-packages.nix | 33 ++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4c7f6308cbe..360fe27bbee 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14849,6 +14849,39 @@ in modules // { }; }; + dynd = buildPythonPackage rec { + version = "0.7.2"; + name = "dynd-${version}"; + disabled = isPyPy; + + src = pkgs.fetchFromGitHub { + owner = "libdynd"; + repo = "dynd-python"; + rev = "v${version}"; + sha256 = "19igd6ibf9araqhq9bxmzbzdz05vp089zxvddkiik3b5gb7l17nh"; + }; + + # setup.py invokes git on build but we're fetching a tarball, so + # can't retrieve git version. We hardcode: + preConfigure = '' + substituteInPlace setup.py --replace "ver = check_output(['git', 'describe', '--dirty'," "ver = '${version}'" + substituteInPlace setup.py --replace "'--always', '--match', 'v*']).decode('ascii').strip('\n')" "" + ''; + + # Python 3 works but has a broken import test that I couldn't + # figure out. + doCheck = !isPy3k; + buildInputs = with pkgs; [ cmake libdynd.dev self.cython ]; + propagatedBuildInputs = with self; [ numpy pkgs.libdynd ]; + + meta = { + homepage = http://libdynd.org; + license = licenses.bsd2; + description = "Python exposure of dynd"; + maintainers = with maintainers; [ teh ]; + }; + }; + livestreamer = buildPythonPackage rec { version = "1.12.2"; name = "livestreamer-${version}"; From 6842a24b21dcc49a5ed485f6ffde14e69e430adb Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 14 Aug 2016 12:37:20 +0200 Subject: [PATCH 017/145] Remove top-level pyqt4 See #11567. --- pkgs/applications/audio/picard/default.nix | 12 ++++++------ .../pybitmessage/default.nix | 6 +++--- pkgs/applications/video/qarte/default.nix | 7 +++++-- pkgs/desktops/kde-4.14/applications/kate.nix | 4 ++-- pkgs/desktops/kde-4.14/kdebindings/pykde4.nix | 9 +++++---- .../kde-4.14/kdeutils/print-manager.nix | 4 ++-- pkgs/development/python-modules/pyqt/4.x.nix | 5 ++++- pkgs/games/mnemosyne/default.nix | 4 +--- pkgs/misc/drivers/hplip/3.15.9.nix | 2 +- pkgs/misc/drivers/hplip/default.nix | 2 +- pkgs/misc/frescobaldi/default.nix | 2 +- pkgs/top-level/all-packages.nix | 19 +++++++------------ pkgs/top-level/python-packages.nix | 6 +++--- 13 files changed, 41 insertions(+), 41 deletions(-) diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index 2373bbc549d..046789119ec 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -1,10 +1,10 @@ -{ stdenv, buildPythonApplication, fetchurl, gettext +{ stdenv, pythonPackages, fetchurl, gettext , pkgconfig, libofa, ffmpeg, chromaprint -, pyqt4, mutagen, python-libdiscid }: -let version = "1.3.2"; in -buildPythonApplication { +let + version = "1.3.2"; +in pythonPackages.buildPythonApplication { name = "picard-${version}"; namePrefix = ""; @@ -20,10 +20,10 @@ buildPythonApplication { gettext ]; - propagatedBuildInputs = [ + propagatedBuildInputs = with pythonPackages; [ pyqt4 mutagen - python-libdiscid + discid ]; installPhase = '' diff --git a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix index 703447594ed..9675b5d5315 100644 --- a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix +++ b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python, pythonPackages, pyqt4, openssl }: +{ stdenv, fetchFromGitHub, pythonPackages, openssl }: stdenv.mkDerivation rec { name = "pybitmessage-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1f4h0yc1mfjnxzvxiv9hxgak59mgr3a5ykv50vlyiay82za20jax"; }; - buildInputs = [ python pyqt4 openssl pythonPackages.wrapPython pythonPackages.sqlite3 ]; + buildInputs = with pythonPackages; [ python pyqt4 wrapPython sqlite3 ] ++ [ openssl ]; preConfigure = '' substituteInPlace Makefile \ @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { postInstall = '' substituteInPlace $out/bin/pybitmessage \ - --replace "exec python2" "exec ${python}/bin/python" \ + --replace "exec python2" "exec ${pythonPackages.python}/bin/python" \ --replace "/opt/openssl-compat-bitcoin/lib/" "${openssl.out}/lib/" wrapProgram $out/bin/pybitmessage \ --prefix PYTHONPATH : "$(toPythonPath $out):$PYTHONPATH" diff --git a/pkgs/applications/video/qarte/default.nix b/pkgs/applications/video/qarte/default.nix index d4221e8f57e..b7da48ef000 100644 --- a/pkgs/applications/video/qarte/default.nix +++ b/pkgs/applications/video/qarte/default.nix @@ -1,6 +1,9 @@ -{ stdenv, fetchbzr, python, pyqt4, sip, rtmpdump, makeWrapper }: +{ stdenv, fetchbzr, pythonPackages, rtmpdump, makeWrapper }: -stdenv.mkDerivation { +let + inherit (pythonPackages) python pyqt4; + sip = pythonPackages.sip_4_16; +in stdenv.mkDerivation { name = "qarte-2.4.0"; src = fetchbzr { url = http://bazaar.launchpad.net/~vincent-vandevyvre/qarte/trunk; diff --git a/pkgs/desktops/kde-4.14/applications/kate.nix b/pkgs/desktops/kde-4.14/applications/kate.nix index 2440d73e7e8..ddeb89063e5 100644 --- a/pkgs/desktops/kde-4.14/applications/kate.nix +++ b/pkgs/desktops/kde-4.14/applications/kate.nix @@ -1,8 +1,8 @@ -{ stdenv, kde, kdelibs, kactivities, qjson, pyqt4, python, pykde4}: +{ stdenv, kde, kdelibs, kactivities, qjson, pythonPackages, pykde4}: kde { - buildInputs = [ kdelibs kactivities qjson pyqt4 python pykde4 ]; + buildInputs = [ kdelibs kactivities qjson pythonPackages.pyqt4 pythonPackages.python pykde4 ]; meta = { description = "Kate, the KDE Advanced Text Editor, as well as KWrite"; diff --git a/pkgs/desktops/kde-4.14/kdebindings/pykde4.nix b/pkgs/desktops/kde-4.14/kdebindings/pykde4.nix index 5a911d4b3ea..48d457e10a7 100644 --- a/pkgs/desktops/kde-4.14/kdebindings/pykde4.nix +++ b/pkgs/desktops/kde-4.14/kdebindings/pykde4.nix @@ -1,9 +1,10 @@ -{ kde, kdelibs, python, pyqt4, kdepimlibs, shared_desktop_ontologies, +{ kde, kdelibs, pythonPackages, kdepimlibs, shared_desktop_ontologies, polkit_qt4, boost, lndir, pkgconfig }: -let pydir = "lib/python${python.majorVersion}"; in - -kde { +let + inherit (pythonPackages) python pyqt4; + pydir = "lib/python${python.majorVersion}"; +in kde { patches = [ ./pykde4-gcc-5.patch ]; diff --git a/pkgs/desktops/kde-4.14/kdeutils/print-manager.nix b/pkgs/desktops/kde-4.14/kdeutils/print-manager.nix index d12c261a728..bc4938103b1 100644 --- a/pkgs/desktops/kde-4.14/kdeutils/print-manager.nix +++ b/pkgs/desktops/kde-4.14/kdeutils/print-manager.nix @@ -1,5 +1,5 @@ { kde, kdelibs -, pythonPackages, cups, pyqt4, pykde4, pycups, system-config-printer }: +, pythonPackages, cups, pykde4, pycups, system-config-printer }: let s_c_p = system-config-printer.override { withGUI = false; }; in @@ -7,7 +7,7 @@ kde rec { buildInputs = [ kdelibs pythonPackages.python pythonPackages.wrapPython ] ++ pythonPath; - pythonPath = [ cups pyqt4 pykde4 pycups s_c_p ]; + pythonPath = [ cups pythonPackages.pyqt4 pykde4 pycups s_c_p ]; # system-config-printer supplies some D-Bus policy that we need. propagatedUserEnvPkgs = [ s_c_p ]; diff --git a/pkgs/development/python-modules/pyqt/4.x.nix b/pkgs/development/python-modules/pyqt/4.x.nix index 746cc747d72..ead5c4ffe9d 100644 --- a/pkgs/development/python-modules/pyqt/4.x.nix +++ b/pkgs/development/python-modules/pyqt/4.x.nix @@ -40,7 +40,10 @@ stdenv.mkDerivation { enableParallelBuilding = true; - passthru.pythonPath = []; + passthru = { + pythonPath = []; + qt = qt4; + }; meta = { description = "Python bindings for Qt"; diff --git a/pkgs/games/mnemosyne/default.nix b/pkgs/games/mnemosyne/default.nix index d4f90a906d8..0d419c08b00 100644 --- a/pkgs/games/mnemosyne/default.nix +++ b/pkgs/games/mnemosyne/default.nix @@ -1,12 +1,10 @@ { stdenv , fetchurl -, buildPythonApplication -, pyqt4 , pythonPackages }: let version = "2.3.2"; -in buildPythonApplication rec { +in pythonPackages.buildPythonApplication rec { name = "mnemosyne-${version}"; src = fetchurl { url = "http://sourceforge.net/projects/mnemosyne-proj/files/mnemosyne/${name}/Mnemosyne-${version}.tar.gz"; diff --git a/pkgs/misc/drivers/hplip/3.15.9.nix b/pkgs/misc/drivers/hplip/3.15.9.nix index 5c989594b3b..298cba88a9f 100644 --- a/pkgs/misc/drivers/hplip/3.15.9.nix +++ b/pkgs/misc/drivers/hplip/3.15.9.nix @@ -3,7 +3,7 @@ , cups, zlib, libjpeg, libusb1, pythonPackages, sane-backends, dbus, usbutils , net_snmp, polkit , bash, coreutils, utillinux -, qtSupport ? true, qt4, pyqt4 +, qtSupport ? true, qt4 , withPlugin ? false }: diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index 32997f98b21..74204cd4e54 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -3,7 +3,7 @@ , cups, zlib, libjpeg, libusb1, pythonPackages, sane-backends, dbus, usbutils , net_snmp, openssl, polkit , bash, coreutils, utillinux -, qtSupport ? true, qt4, pyqt4 +, qtSupport ? true, qt4 , withPlugin ? false }: diff --git a/pkgs/misc/frescobaldi/default.nix b/pkgs/misc/frescobaldi/default.nix index 04370424abb..84272992f2b 100644 --- a/pkgs/misc/frescobaldi/default.nix +++ b/pkgs/misc/frescobaldi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pythonPackages, lilypond, pyqt4, pygame }: +{ stdenv, fetchurl, pythonPackages, lilypond}: pythonPackages.buildPythonApplication rec { name = "frescobaldi-${version}"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 06721febaf1..0e59f1f222c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3220,9 +3220,7 @@ in openmodelica = callPackage ../applications/science/misc/openmodelica { }; - qarte = callPackage ../applications/video/qarte { - sip = pythonPackages.sip_4_16; - }; + qarte = callPackage ../applications/video/qarte { }; qnial = callPackage ../development/interpreters/qnial {}; @@ -10085,8 +10083,6 @@ in rhpl = pythonPackages.rhpl; - pyqt4 = pythonPackages.pyqt4; - pysideApiextractor = pythonPackages.pysideApiextractor; pysideGeneratorrunner = pythonPackages.pysideGeneratorrunner; @@ -10930,7 +10926,9 @@ in fatrace = callPackage ../os-specific/linux/fatrace { }; - ffadoFull = callPackage ../os-specific/linux/ffado { }; + ffadoFull = callPackage ../os-specific/linux/ffado { + inherit (pythonPackages) python pyqt4; + }; libffado = self.ffadoFull.override { prefix = "lib"; }; fbterm = callPackage ../os-specific/linux/fbterm { }; @@ -13071,7 +13069,7 @@ in gksu = callPackage ../applications/misc/gksu { }; gnuradio = callPackage ../applications/misc/gnuradio { - inherit (pythonPackages) lxml numpy scipy matplotlib pyopengl wxPython; + inherit (pythonPackages) lxml matplotlib numpy python pyopengl pyqt4 scipy wxPython; fftw = fftwFloat; }; @@ -14290,10 +14288,7 @@ in pianobooster = callPackage ../applications/audio/pianobooster { }; - picard = callPackage ../applications/audio/picard { - python-libdiscid = pythonPackages.discid; - mutagen = pythonPackages.mutagen; - }; + picard = callPackage ../applications/audio/picard { }; picocom = callPackage ../tools/misc/picocom { }; @@ -15539,7 +15534,7 @@ in angband = callPackage ../games/angband { }; anki = callPackage ../games/anki { - inherit (pythonPackages) wrapPython pysqlite sqlalchemy pyaudio beautifulsoup httplib2 matplotlib; + inherit (pythonPackages) wrapPython pysqlite sqlalchemy pyaudio beautifulsoup httplib2 matplotlib pyqt4; }; armagetronad = callPackage ../games/armagetronad { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c926ee97f62..8823d2ecac3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7744,7 +7744,7 @@ in modules // { sha256 = "00e3f89f4e23a844844d082918a89c2cbb1e8231ecb011b81d592e7e3c33a74c"; }; - propagatedBuildInputs = [ pkgs.pyqt4 pkgs.pkgconfig pkgs.poppler_qt4 ]; + propagatedBuildInputs = [ self.pyqt4 pkgs.pkgconfig pkgs.poppler_qt4 ]; preBuild = "${python}/bin/${python.executable} setup.py build_ext" + " --include-dirs=${pkgs.poppler_qt4.dev}/include/poppler/"; @@ -20376,11 +20376,11 @@ in modules // { src = pkgs.qscintilla.src; - buildInputs = with pkgs; [ xorg.lndir qt4 pyqt4 python ]; + buildInputs = with self; [ pkgs.xorg.lndir pyqt4.qt pyqt4 python ]; preConfigure = '' mkdir -p $out - lndir ${pkgs.pyqt4} $out + lndir ${self.pyqt4} $out cd Python ${python.executable} ./configure-old.py \ --destdir $out/lib/${python.libPrefix}/site-packages/PyQt4 \ From f0fef4defb266af7fa1f24ad081a2407f62655da Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Sun, 14 Aug 2016 19:47:16 +0900 Subject: [PATCH 018/145] wireguard-unstable: 2016-07-22 -> 2016-08-08 (#17727) --- pkgs/os-specific/linux/wireguard/default.nix | 23 ++++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index 0fda5d6b9d5..84f67bfd8cf 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, libmnl, kernel ? null }: +{ stdenv, fetchurl, libmnl, kernel ? null }: # module requires Linux >= 4.1 https://www.wireguard.io/install/#kernel-requirements assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "4.1"; @@ -6,19 +6,20 @@ assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "4.1"; let name = "wireguard-unstable-${version}"; - version = "2016-07-22"; + version = "2016-08-08"; - src = fetchgit { - url = "https://git.zx2c4.com/WireGuard"; - rev = "8e8bf6f848c324603827c0e57f0856d5866ac32d"; - sha256 = "11qrf9fxm6mkwjnjq7dgbisdric5w22cyfkqc6zx9fla2dz99mxk"; + src = fetchurl { + url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-experimental-0.0.20160808.tar.xz"; + sha256 = "0z9s9xi8dzkmjnki7ialf2haxb0mn2x5676sjwmjij1jfi9ypxhw"; }; meta = with stdenv.lib; { - homepage = https://www.wireguard.io/; - description = "Fast, modern, secure VPN tunnel"; - license = licenses.gpl2; - platforms = platforms.linux; + homepage = https://www.wireguard.io/; + downloadPage = https://git.zx2c4.com/WireGuard/refs/; + description = "Fast, modern, secure VPN tunnel"; + maintainers = with maintainers; [ ericsagnes ]; + license = licenses.gpl2; + platforms = platforms.linux; }; module = stdenv.mkDerivation { @@ -33,7 +34,6 @@ let INSTALL_MOD_PATH = "\${out}"; buildPhase = "make module"; - }; tools = stdenv.mkDerivation { @@ -50,7 +50,6 @@ let ]; buildPhase = "make tools"; - }; in if kernel == null From b6452f853496152f373a8587b6064097f91c948c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 14 Aug 2016 12:48:17 +0200 Subject: [PATCH 019/145] Remove top-level pygame See #11567. --- pkgs/applications/office/impressive/default.nix | 12 ++++++------ pkgs/top-level/all-packages.nix | 8 +------- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/office/impressive/default.nix b/pkgs/applications/office/impressive/default.nix index 1c921925cea..1422369d20e 100644 --- a/pkgs/applications/office/impressive/default.nix +++ b/pkgs/applications/office/impressive/default.nix @@ -1,10 +1,10 @@ -{ fetchurl, stdenv, python, makeWrapper, lib -, xpdf, pillow, pyopengl, pygame -, setuptools, mesa, freeglut }: +{ fetchurl, stdenv, pythonPackages, makeWrapper, lib +, xpdf, mesa, freeglut }: -let version = "0.10.5"; -in - stdenv.mkDerivation { +let + inherit (pythonPackages) python pyopengl pygame setuptools pillow; + version = "0.10.5"; +in stdenv.mkDerivation { # This project was formerly known as KeyJNote. # See http://keyj.s2000.ws/?p=77 for details. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0e59f1f222c..283bfccce4c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10065,8 +10065,6 @@ in pyexiv2 = pythonPackages.pyexiv2; - pygame = pythonPackages.pygame; - pygobject = pythonPackages.pygobject; pygobject3 = pythonPackages.pygobject3; @@ -13556,11 +13554,7 @@ in imagemagickBig = callPackage ../applications/graphics/ImageMagick { }; # Impressive, formerly known as "KeyJNote". - impressive = callPackage ../applications/office/impressive { - # XXX These are the PyOpenGL dependencies, which we need here. - inherit (pythonPackages) pyopengl; - inherit (pythonPackages) pillow; - }; + impressive = callPackage ../applications/office/impressive { }; inferno = callPackage_i686 ../applications/inferno { }; From 57b9ff06f1ec734f9156c8b254ce3f64bd053cc3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 14 Aug 2016 12:53:07 +0200 Subject: [PATCH 020/145] Remove top-level pylint See #11567. --- pkgs/applications/version-management/src/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 -- pkgs/top-level/python-packages.nix | 4 ++-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/version-management/src/default.nix b/pkgs/applications/version-management/src/default.nix index cfecd96107b..2bff15adc69 100644 --- a/pkgs/applications/version-management/src/default.nix +++ b/pkgs/applications/version-management/src/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, rcs, git, pylint }: +{ stdenv, fetchurl, python, rcs, git }: stdenv.mkDerivation rec { name = "src-1.11"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 283bfccce4c..6158c9ff674 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10075,8 +10075,6 @@ in pyGtkGlade = pythonPackages.pyGtkGlade; - pylint = pythonPackages.pylint; - pyopenssl = pythonPackages.pyopenssl; rhpl = pythonPackages.rhpl; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8823d2ecac3..7e62a30a8b0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20712,7 +20712,7 @@ in modules // { doCheck = false; # too much - buildInputs = with self; [ mock tox pkgs.pylint ]; + buildInputs = with self; [ mock tox pylint ]; meta = with stdenv.lib; { homepage = "https://github.com/geopy/geopy"; }; @@ -22835,7 +22835,7 @@ in modules // { sha256 = "00z0lzjs4ksr9yr31zs26csyacjvavhpz6r74xaw1r89kk75qg7q"; }; - buildInputs = with self; [ unittest2 scripttest pytz pkgs.pylint tempest-lib mock testtools ]; + buildInputs = with self; [ unittest2 scripttest pytz pylint tempest-lib mock testtools ]; propagatedBuildInputs = with self; [ pbr tempita decorator sqlalchemy six sqlparse ]; checkPhase = '' From eb3e23c49e4f75e20f445f618629c3aebc226b33 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 14 Aug 2016 13:06:42 +0200 Subject: [PATCH 021/145] Remove top-level setuptools See #11567. --- pkgs/applications/audio/morituri/default.nix | 18 ++++++++++-------- pkgs/tools/backup/duplicity/default.nix | 7 +++---- pkgs/tools/misc/debian-devscripts/default.nix | 11 +++++++---- pkgs/top-level/all-packages.nix | 3 --- pkgs/top-level/python-packages.nix | 6 +++--- 5 files changed, 23 insertions(+), 22 deletions(-) diff --git a/pkgs/applications/audio/morituri/default.nix b/pkgs/applications/audio/morituri/default.nix index 7d7b4e47fad..b9a38ab9d03 100644 --- a/pkgs/applications/audio/morituri/default.nix +++ b/pkgs/applications/audio/morituri/default.nix @@ -1,8 +1,10 @@ -{ stdenv, fetchgit, python, pythonPackages, cdparanoia, cdrdao -, pygobject, gst_python, gst_plugins_base, gst_plugins_good -, setuptools, utillinux, makeWrapper, substituteAll, autoreconfHook }: +{ stdenv, fetchgit, pythonPackages, cdparanoia, cdrdao +, gst_python, gst_plugins_base, gst_plugins_good +, utillinux, makeWrapper, substituteAll, autoreconfHook }: -stdenv.mkDerivation rec { +let + inherit (pythonPackages) python; +in stdenv.mkDerivation rec { name = "morituri-${version}"; version = "0.2.3.20151109"; namePrefix = ""; @@ -14,10 +16,10 @@ stdenv.mkDerivation rec { sha256 = "1sl5y5j3gdbynf2v0gf9dwd2hzawj8lm8ywadid7qm34yn8lx12k"; }; - pythonPath = [ - pygobject gst_python pythonPackages.musicbrainzngs - pythonPackages.pycdio pythonPackages.pyxdg setuptools - pythonPackages.CDDB + pythonPath = with pythonPackages; [ + pygobject gst_python musicbrainzngs + pycdio pyxdg setuptools + CDDB ]; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index da847c0d31b..27fc11946aa 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -1,11 +1,10 @@ -{ stdenv, fetchurl, python, librsync, ncftp, gnupg, boto, makeWrapper -, lockfile, setuptools, paramiko, pycrypto, ecdsa +{ stdenv, fetchurl, pythonPackages, librsync, ncftp, gnupg, makeWrapper }: let version = "0.7.07.1"; -in -stdenv.mkDerivation { + inherit (pythonPackages) boto ecdsa lockfile paramiko pycrypto python setuptools; +in stdenv.mkDerivation { name = "duplicity-${version}"; src = fetchurl { diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix index ea56e59ba89..ece9c5ed382 100644 --- a/pkgs/tools/misc/debian-devscripts/default.nix +++ b/pkgs/tools/misc/debian-devscripts/default.nix @@ -1,10 +1,13 @@ {stdenv, fetchurl, perl, CryptSSLeay, LWP, unzip, xz, dpkg, TimeDate, DBFile -, FileDesktopEntry, libxslt, docbook_xsl, python3, setuptools, makeWrapper +, FileDesktopEntry, libxslt, docbook_xsl, makeWrapper +, python3Packages , perlPackages, curl, gnupg, diffutils , sendmailPath ? "/var/setuid-wrappers/sendmail" }: -stdenv.mkDerivation rec { +let + inherit (python3Packages) python setuptools; +in stdenv.mkDerivation rec { version = "2.16.6"; name = "debian-devscripts-${version}"; @@ -14,13 +17,13 @@ stdenv.mkDerivation rec { }; buildInputs = [ perl CryptSSLeay LWP unzip xz dpkg TimeDate DBFile - FileDesktopEntry libxslt python3 setuptools makeWrapper + FileDesktopEntry libxslt python setuptools makeWrapper perlPackages.ParseDebControl perlPackages.LWPProtocolHttps curl gnupg diffutils ]; preConfigure = '' export PERL5LIB="$PERL5LIB''${PERL5LIB:+:}${dpkg}"; - tgtpy="$out/lib/${python3.libPrefix}/site-packages" + tgtpy="$out/lib/${python.libPrefix}/site-packages" mkdir -p "$tgtpy" export PYTHONPATH="$PYTHONPATH''${PYTHONPATH:+:}$tgtpy" find po4a scripts -type f -exec sed -r \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6158c9ff674..f3352370e19 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1398,7 +1398,6 @@ in duo-unix = callPackage ../tools/security/duo-unix { }; duplicity = callPackage ../tools/backup/duplicity { - inherit (pythonPackages) boto lockfile paramiko ecdsa pycrypto; gnupg = gnupg1; }; @@ -10095,8 +10094,6 @@ in rebol = callPackage ../development/interpreters/rebol { }; - setuptools = pythonPackages.setuptools; - slowaes = pythonPackages.slowaes; twisted = pythonPackages.twisted; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7e62a30a8b0..d713bc9e138 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10836,7 +10836,7 @@ in modules // { # FAIL: test_sanitize_remove_src_javascript (genshi.filters.tests.html.HTMLSanitizerTestCase) doCheck = false; - buildInputs = with self; [ pkgs.setuptools ]; + buildInputs = with self; [ setuptools ]; meta = { description = "Python components for parsing HTML, XML and other textual content"; @@ -10930,7 +10930,7 @@ in modules // { sha256 = "c77d007cc32cdff836ecf8df6192371767976c108a75b055e057bb6f4a09cd42"; }; - buildInputs = with self; [ pkgs.setuptools ] ++ (optional isPy26 argparse); + buildInputs = with self; [ setuptools ] ++ (optional isPy26 argparse); meta = { description = "Automatically generated zsh completion function for Python's option parser modules"; @@ -23705,7 +23705,7 @@ in modules // { PYTHON_EGG_CACHE = "`pwd`/.egg-cache"; - propagatedBuildInputs = with self; [ genshi pkgs.setuptools modules.sqlite3 ]; + propagatedBuildInputs = with self; [ genshi setuptools modules.sqlite3 ]; meta = { description = "Enhanced wiki and issue tracking system for software development projects"; From 4271b6d510193240a8bdebc606bbeab757c32822 Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Sun, 14 Aug 2016 20:19:15 +0900 Subject: [PATCH 022/145] fcitx-engines.table-other: fix build for cmake 3.6 (#17721) --- .../fcitx-engines/fcitx-table-other/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-other/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-other/default.nix index 40ef0b33aea..88921dd0ed5 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-other/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-other/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, fcitx, gettext }: +{ stdenv, fetchurl, fetchpatch, cmake, fcitx, gettext }: stdenv.mkDerivation rec { name = "fcitx-table-other-${version}"; @@ -11,6 +11,13 @@ stdenv.mkDerivation rec { buildInputs = [ cmake fcitx gettext ]; + patches = [ + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/fcitx/fcitx-table-other/pull/2.diff"; + sha256 = "1ai2zw4c0k5rr3xjhf4z7kcml9v8hvsbwdshwpmz2ybly2ncf5y7"; + }) + ]; + preInstall = '' substituteInPlace tables/cmake_install.cmake \ --replace ${fcitx} $out From 064b87879309f91cfa945d4cec68aa26118ba65c Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sun, 14 Aug 2016 11:27:28 +0000 Subject: [PATCH 023/145] Revert "fcitx-engines.table-other: fix build for cmake 3.6 (#17721)" This reverts commit 4271b6d510193240a8bdebc606bbeab757c32822. Patch hash is wrong and doesn't build. --- .../fcitx-engines/fcitx-table-other/default.nix | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-other/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-other/default.nix index 88921dd0ed5..40ef0b33aea 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-other/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-other/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, cmake, fcitx, gettext }: +{ stdenv, fetchurl, cmake, fcitx, gettext }: stdenv.mkDerivation rec { name = "fcitx-table-other-${version}"; @@ -11,13 +11,6 @@ stdenv.mkDerivation rec { buildInputs = [ cmake fcitx gettext ]; - patches = [ - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/fcitx/fcitx-table-other/pull/2.diff"; - sha256 = "1ai2zw4c0k5rr3xjhf4z7kcml9v8hvsbwdshwpmz2ybly2ncf5y7"; - }) - ]; - preInstall = '' substituteInPlace tables/cmake_install.cmake \ --replace ${fcitx} $out From 6172662676cb10b37ea2a57d2b04bc0599e546dd Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sun, 14 Aug 2016 19:30:19 +0800 Subject: [PATCH 024/145] syncthing: 0.14.3 -> 0.14.4 (#17723) --- pkgs/applications/networking/syncthing/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 2a02e0e657c..bd156680d4b 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, go }: stdenv.mkDerivation rec { - version = "0.14.3"; + version = "0.14.4"; name = "syncthing-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "114i0911h3q6dn3j9x2qcm5lzpqclvrpf5vk87qpqp9qy62jp3az"; + sha256 = "0i1pgwy7vn2hfcqa7dvrrc40hzrzn47alvnxm058f2hhxjis3fdw"; }; buildInputs = [ go ]; From 14120a423b974dc5c7672e6b38d2f24c7163749d Mon Sep 17 00:00:00 2001 From: 8573 <8573@users.noreply.github.com> Date: Sun, 14 Aug 2016 11:38:25 +0000 Subject: [PATCH 025/145] dmenu: Fix scripts to run commands by store paths (#17709) The `dmenu` package includes two binary programs, `dmenu` and `stest`, and two shell scripts, `dmenu_run` and `dmenu_path`. `dmenu_run` invokes `dmenu` and `dmenu_path`, and `dmenu_path` invokes `stest`. `dmenu_run`'s invocation of `dmenu` was patched to run it by its full store path, but its invocation of `dmenu_path` and `dmenu_path`'s invocation of `stest` were not. If `dmenu_path` and `stest` were not in the set of system packages or otherwise in the `PATH`, this situation would result in `dmenu_run` opening a dmenu instance with no menu entries (which would normally be generated by `dmenu_path`, which `dmenu_run` couldn't find, as it was running it by `PATH` lookup). This commit fixes the package to also patch the invocation of `dmenu_path` in `dmenu_run` and the invocations of `stest` in `dmenu_path` to invoke those programs by their full store paths. I have tested this change on NixOS. --- pkgs/applications/misc/dmenu/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/dmenu/default.nix b/pkgs/applications/misc/dmenu/default.nix index b0879599833..1dc9fe5e202 100644 --- a/pkgs/applications/misc/dmenu/default.nix +++ b/pkgs/applications/misc/dmenu/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { inherit patches; postPatch = '' - sed -ri -e 's!\<(dmenu|stest)\>!'"$out/bin"'/&!g' dmenu_run + sed -ri -e 's!\<(dmenu|dmenu_path|stest)\>!'"$out/bin"'/&!g' dmenu_run + sed -ri -e 's!\!'"$out/bin"'/&!g' dmenu_path ''; preConfigure = '' From 9d8262bd92892a04d390be1da80f6a9acfbf7373 Mon Sep 17 00:00:00 2001 From: Kranium Gikos Mendoza Date: Sun, 14 Aug 2016 19:45:01 +0800 Subject: [PATCH 026/145] wireless-regdb: 2016-05-02 -> 2016-06-10 (#17706) --- pkgs/data/misc/wireless-regdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/wireless-regdb/default.nix b/pkgs/data/misc/wireless-regdb/default.nix index d7dfd60c27f..3aae3adf2a8 100644 --- a/pkgs/data/misc/wireless-regdb/default.nix +++ b/pkgs/data/misc/wireless-regdb/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "wireless-regdb-${version}"; - version = "2016-05-02"; + version = "2016-06-10"; src = fetchgit { - sha256 = "1qa741an242wi6gdikkr4ahanphfhwnjg8q2z3rsv8wdha91k895"; + sha256 = "0im9likzpziircl96pql2jpyl8pfcqc5v0wgqy705j4ga5sx8pmn"; url = https://git.kernel.org/pub/scm/linux/kernel/git/sforshee/wireless-regdb.git; rev = "refs/tags/master-${version}"; }; From e22ea832fd2f180a3b339e857e2f789f9b3d5a0d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 14 Aug 2016 13:11:20 +0200 Subject: [PATCH 027/145] Remove top-level twisted See #11567. --- pkgs/top-level/all-packages.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f3352370e19..16b13f9b43d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10096,8 +10096,6 @@ in slowaes = pythonPackages.slowaes; - twisted = pythonPackages.twisted; - yolk = callPackage ../development/python-modules/yolk {}; ZopeInterface = pythonPackages.zope_interface; From faa9ed0b1046ca065b01b47a9fe72793434d6329 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 14 Aug 2016 13:22:02 +0200 Subject: [PATCH 028/145] Remove top-level pycups See #11567. --- pkgs/desktops/kde-4.14/kdeutils/print-manager.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/kde-4.14/kdeutils/print-manager.nix b/pkgs/desktops/kde-4.14/kdeutils/print-manager.nix index bc4938103b1..b53946fae25 100644 --- a/pkgs/desktops/kde-4.14/kdeutils/print-manager.nix +++ b/pkgs/desktops/kde-4.14/kdeutils/print-manager.nix @@ -1,5 +1,5 @@ { kde, kdelibs -, pythonPackages, cups, pykde4, pycups, system-config-printer }: +, pythonPackages, cups, pykde4, system-config-printer }: let s_c_p = system-config-printer.override { withGUI = false; }; in @@ -7,7 +7,7 @@ kde rec { buildInputs = [ kdelibs pythonPackages.python pythonPackages.wrapPython ] ++ pythonPath; - pythonPath = [ cups pythonPackages.pyqt4 pykde4 pycups s_c_p ]; + pythonPath = [ cups pythonPackages.pyqt4 pykde4 pythonPackages.pycups s_c_p ]; # system-config-printer supplies some D-Bus policy that we need. propagatedUserEnvPkgs = [ s_c_p ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 16b13f9b43d..b2958d0ea92 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10060,8 +10060,6 @@ in pycrypto = pythonPackages.pycrypto; - pycups = pythonPackages.pycups; - pyexiv2 = pythonPackages.pyexiv2; pygobject = pythonPackages.pygobject; From dc24b7df63ae959d0d97e97aab125d85d5168a17 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 14 Aug 2016 13:24:31 +0200 Subject: [PATCH 029/145] Remove top-level ecdsa See #11567. --- pkgs/top-level/all-packages.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b2958d0ea92..a95b7103208 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10052,8 +10052,6 @@ in bsddb3 = pythonPackages.bsddb3; - ecdsa = pythonPackages.ecdsa; - pycairo = pythonPackages.pycairo; pycapnp = pythonPackages.pycapnp; From 7986b718f3129332454f105d86fb30ab78812943 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 14 Aug 2016 13:52:23 +0200 Subject: [PATCH 030/145] Remove pycairo from top-level See #11567. --- pkgs/applications/misc/gramps/default.nix | 9 +++--- pkgs/applications/search/catfish/default.nix | 2 +- .../version-management/meld/default.nix | 20 ++++++------- pkgs/applications/video/miro/default.nix | 27 +++++++++-------- pkgs/tools/X11/xpra/default.nix | 2 +- pkgs/tools/networking/wicd/default.nix | 30 ++++++++++--------- pkgs/tools/security/nmap/default.nix | 11 ++++--- pkgs/top-level/all-packages.nix | 4 --- pkgs/top-level/python-packages.nix | 5 ++-- 9 files changed, 53 insertions(+), 57 deletions(-) diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix index 79393eee7f1..d750aea01ef 100644 --- a/pkgs/applications/misc/gramps/default.nix +++ b/pkgs/applications/misc/gramps/default.nix @@ -1,10 +1,11 @@ -{ stdenv, fetchurl, gtk3, pythonPackages, python, pycairo, pygobject3, intltool, +{ stdenv, fetchurl, gtk3, pythonPackages, intltool, pango, gsettings_desktop_schemas }: -pythonPackages.buildPythonApplication rec { +let + inherit (pythonPackages) python buildPythonApplication; +in buildPythonApplication rec { version = "4.1.1"; name = "gramps-${version}"; - namePrefix = ""; buildInputs = [ intltool gtk3 ]; @@ -16,7 +17,7 @@ pythonPackages.buildPythonApplication rec { sha256 = "0jdps7yx2mlma1hdj64wssvnqd824xdvw0bmn2dnal5fn3h7h060"; }; - pythonPath = [ pygobject3 pango pycairo pythonPackages.bsddb ]; + pythonPath = with pythonPackages; [ pygobject3 pycairo bsddb ] ++ [ pango ]; # Same installPhase as in buildPythonApplication but without --old-and-unmanageble # install flag. diff --git a/pkgs/applications/search/catfish/default.nix b/pkgs/applications/search/catfish/default.nix index bad10a8607a..f6df5fc496d 100644 --- a/pkgs/applications/search/catfish/default.nix +++ b/pkgs/applications/search/catfish/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, file, which, intltool, findutils, xdg_utils, pycairo, +{ stdenv, fetchurl, file, which, intltool, findutils, xdg_utils, gnome3, pythonPackages, wrapGAppsHook }: pythonPackages.buildPythonApplication rec { diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index 99e45438984..503ae4e90b9 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -1,16 +1,14 @@ -{ stdenv, fetchurl, itstool, buildPythonApplication, python27, intltool, wrapGAppsHook -, libxml2, pygobject3, gobjectIntrospection, gtk3, gnome3, pycairo, cairo, file +{ stdenv, fetchurl, itstool, pythonPackages, intltool, wrapGAppsHook +, libxml2, gobjectIntrospection, gtk3, gnome3, cairo, file }: let minor = "3.16"; version = "${minor}.2"; -in - -buildPythonApplication rec { + inherit (pythonPackages) python buildPythonApplication pycairo pygobject3; +in buildPythonApplication rec { name = "meld-${version}"; - namePrefix = ""; src = fetchurl { url = "mirror://gnome/sources/meld/${minor}/meld-${version}.tar.xz"; @@ -18,19 +16,19 @@ buildPythonApplication rec { }; buildInputs = [ - python27 intltool wrapGAppsHook itstool libxml2 + intltool wrapGAppsHook itstool libxml2 gnome3.gtksourceview gnome3.gsettings_desktop_schemas pycairo cairo gnome3.defaultIconTheme gnome3.dconf file ]; propagatedBuildInputs = [ gobjectIntrospection pygobject3 gtk3 ]; installPhase = '' - mkdir -p "$out/lib/${python27.libPrefix}/site-packages" + mkdir -p "$out/lib/${python.libPrefix}/site-packages" - export PYTHONPATH="$out/lib/${python27.libPrefix}/site-packages:$PYTHONPATH" + export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH" - ${python27}/bin/${python27.executable} setup.py install \ - --install-lib=$out/lib/${python27.libPrefix}/site-packages \ + ${python}/bin/${python.executable} setup.py install \ + --install-lib=$out/lib/${python.libPrefix}/site-packages \ --prefix="$out" mkdir -p $out/share/gsettings-schemas/$name diff --git a/pkgs/applications/video/miro/default.nix b/pkgs/applications/video/miro/default.nix index 07d60fe4764..266f3978b99 100644 --- a/pkgs/applications/video/miro/default.nix +++ b/pkgs/applications/video/miro/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, python, buildPythonApplication, pythonPackages, pkgconfig -, pyrex096, ffmpeg, boost, glib, pygobject, gtk2, webkitgtk2, libsoup, pygtk -, taglib, sqlite, pycurl, mutagen, pycairo, pythonDBus, pywebkitgtk +{ stdenv, fetchurl, pkgconfig +, pythonPackages, pyrex096, ffmpeg, boost, glib, gtk2, webkitgtk2, libsoup +, taglib, sqlite , libtorrentRasterbar, glib_networking, gsettings_desktop_schemas , gst_python, gst_plugins_base, gst_plugins_good, gst_ffmpeg , enableBonjour ? false, avahi ? null @@ -10,10 +10,11 @@ assert enableBonjour -> avahi != null; with stdenv.lib; -buildPythonApplication rec { - name = "miro-${version}"; - namePrefix = ""; +let + inherit (pythonPackages) python buildPythonApplication; version = "6.0"; +in buildPythonApplication rec { + name = "miro-${version}"; src = fetchurl { url = "http://ftp.osuosl.org/pub/pculture.org/miro/src/${name}.tar.gz"; @@ -56,7 +57,7 @@ buildPythonApplication rec { preInstall = '' # see https://bitbucket.org/pypa/setuptools/issue/130/install_data-doesnt-respect-prefix - ${python}/bin/${python.executable} setup.py install_data --root=$out + ${python.interpreter} setup.py install_data --root=$out sed -i '/data_files=data_files/d' setup.py ''; @@ -68,14 +69,14 @@ buildPythonApplication rec { --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share" ''; - buildInputs = [ - pkgconfig pyrex096 ffmpeg boost glib pygobject gtk2 webkitgtk2 libsoup - pygtk taglib gsettings_desktop_schemas sqlite + buildInputs = with pythonPackages; [ pygtk pygobject ] ++ [ + pkgconfig pyrex096 ffmpeg boost glib gtk2 webkitgtk2 libsoup + taglib gsettings_desktop_schemas sqlite ]; - propagatedBuildInputs = [ - pygobject pygtk pycurl python.modules.sqlite3 mutagen pycairo pythonDBus - pywebkitgtk libtorrentRasterbar + propagatedBuildInputs = with pythonPackages; [ + pygobject pygtk pycurl sqlite3 mutagen pycairo dbus + pywebkitgtk] ++ [ libtorrentRasterbar gst_python gst_plugins_base gst_plugins_good gst_ffmpeg ] ++ optional enableBonjour avahi; diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 4964e47ddc0..27a3deca736 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pythonPackages, pkgconfig -, xorg, gtk, glib, pango, cairo, gdk_pixbuf, atk, pycairo +, xorg, gtk, glib, pango, cairo, gdk_pixbuf, atk , makeWrapper, xkbcomp, xorgserver, getopt, xauth, utillinux, which, fontsConf, xkeyboard_config , ffmpeg, x264, libvpx, libwebp , libfakeXinerama }: diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix index 8013e6d00cd..fe6ad74c236 100644 --- a/pkgs/tools/networking/wicd/default.nix +++ b/pkgs/tools/networking/wicd/default.nix @@ -1,8 +1,11 @@ -{stdenv, fetchurl, python, pygobject, pycairo, pyGtkGlade, pythonDBus, - wpa_supplicant, dhcp, dhcpcd, wirelesstools, nettools, openresolv, iproute, iputils, - pythonPackages, locale ? "C" }: +{ stdenv, fetchurl, pythonPackages +, wpa_supplicant, dhcp, dhcpcd, wirelesstools +, nettools, openresolv, iproute, iputils +, locale ? "C" }: -stdenv.mkDerivation rec { +let + inherit (pythonPackages) python pygobject dbus pyGtkGlade pycairo; +in stdenv.mkDerivation rec { name = "wicd-${version}"; version = "1.7.2.4"; @@ -11,9 +14,8 @@ stdenv.mkDerivation rec { sha256 = "15ywgh60xzmp5z8l1kzics7yi95isrjg1paz42dvp7dlpdfzpzfw"; }; - buildInputs = [ - python pythonPackages.Babel - pythonPackages.urwid pythonPackages.notify + buildInputs = with pythonPackages; [ + python Babel urwid notify ]; patches = [ @@ -31,20 +33,20 @@ stdenv.mkDerivation rec { # !!! Should use makeWrapper. postPatch = '' # We don't have "python2". - substituteInPlace wicd/wicd-daemon.py --replace 'misc.find_path("python2")' "'${python}/bin/python'" + substituteInPlace wicd/wicd-daemon.py --replace 'misc.find_path("python2")' "'${python.interpreter}'" substituteInPlace in/scripts=wicd.in --subst-var-by TEMPLATE-DEFAULT $out/share/other/dhclient.conf.template.default sed -i "2iexport PATH=${python}/bin:${wpa_supplicant}/sbin:${dhcpcd}/sbin:${dhcp}/sbin:${wirelesstools}/sbin:${nettools}/sbin:${nettools}/bin:${iputils}/bin:${openresolv}/sbin:${iproute}/sbin\$\{PATH:+:\}\$PATH" in/scripts=wicd.in - sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pygobject}):$(toPythonPath ${pythonDBus})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd.in + sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pygobject}):$(toPythonPath ${dbus})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd.in sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-client.in - sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-client.in + sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${dbus})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-client.in sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-gtk.in - sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus}):$(toPythonPath ${pythonPackages.notify})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-gtk.in + sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${dbus}):$(toPythonPath ${pythonPackages.notify})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-gtk.in sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-cli.in - sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-cli.in + sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pycairo}):$(toPythonPath ${dbus})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-cli.in sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-curses.in - sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus}):$(toPythonPath ${pythonPackages.urwid}):$(toPythonPath ${pythonPackages.curses})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-curses.in + sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pycairo}):$(toPythonPath ${dbus}):$(toPythonPath ${pythonPackages.urwid}):$(toPythonPath ${pythonPackages.curses})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-curses.in rm po/ast.po ''; @@ -90,7 +92,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' - python setup.py install --prefix=$out --install-lib=$out/lib/${python.libPrefix}/site-packages + python setup.py install --prefix=$out --install-lib=$out/${python.sitePackages} mkdir -p $out/share/other cp other/dhclient.conf.template.default $out/share/other/dhclient.conf.template.default diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix index 415f8f52a47..f9c7dba5660 100644 --- a/pkgs/tools/security/nmap/default.nix +++ b/pkgs/tools/security/nmap/default.nix @@ -2,16 +2,15 @@ , graphicalSupport ? false , libX11 ? null , gtk ? null -, python ? null -, pygtk ? null +, pythonPackages , makeWrapper ? null -, pygobject ? null -, pycairo ? null -, pysqlite ? null }: with stdenv.lib; -stdenv.mkDerivation rec { + +let + inherit (pythonPackages) python pygtk pygobject pycairo pysqlite; +in stdenv.mkDerivation rec { name = "nmap${optionalString graphicalSupport "-graphical"}-${version}"; version = "7.12"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a95b7103208..cec1083f250 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2775,7 +2775,6 @@ in nmap = callPackage ../tools/security/nmap { }; nmap_graphical = callPackage ../tools/security/nmap { - inherit (pythonPackages) pysqlite; graphicalSupport = true; }; @@ -8757,7 +8756,6 @@ in minmay = callPackage ../development/libraries/minmay { }; miro = callPackage ../applications/video/miro { - inherit (pythonPackages) pywebkitgtk pycurl mutagen; avahi = avahi.override { withLibdnssdCompat = true; }; @@ -10052,8 +10050,6 @@ in bsddb3 = pythonPackages.bsddb3; - pycairo = pythonPackages.pycairo; - pycapnp = pythonPackages.pycapnp; pycrypto = pythonPackages.pycrypto; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d713bc9e138..833cc92d259 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -240,8 +240,7 @@ in modules // { pyatspi = if isPy3k then callPackage ../development/python-modules/pyatspi { } else throw "pyatspi not supported for interpreter ${python.executable}"; - pycairo = callPackage ../development/python-modules/pycairo { - }; + pycairo = callPackage ../development/python-modules/pycairo { }; pycangjie = if isPy3k then callPackage ../development/python-modules/pycangjie { } else throw "pycangjie not supported for interpreter ${python.executable}"; @@ -26219,7 +26218,7 @@ in modules // { sha256 = "472a4403fd5b5364939aee10e78f171b1489e5f6bfe6f150ed9cae8476410114"; }; - propagatedBuildInputs = with self; [ django_1_5 django_tagging modules.sqlite3 whisper pkgs.pycairo ldap memcached ]; + propagatedBuildInputs = with self; [ django_1_5 django_tagging modules.sqlite3 whisper pycairo ldap memcached ]; postInstall = '' wrapProgram $out/bin/run-graphite-devel-server.py \ From a34cc59605a20cc141ab564d8535da61fb0c1d60 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 14 Aug 2016 07:59:57 -0400 Subject: [PATCH 031/145] icu: 56.1 -> 57.1 --- pkgs/development/libraries/icu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix index d2604b03f74..2f7c42c72b7 100644 --- a/pkgs/development/libraries/icu/default.nix +++ b/pkgs/development/libraries/icu/default.nix @@ -2,7 +2,7 @@ let pname = "icu4c"; - version = "56.1"; + version = "57.1"; in stdenv.mkDerivation ({ name = pname + "-" + version; @@ -10,7 +10,7 @@ stdenv.mkDerivation ({ src = fetchurl { url = "http://download.icu-project.org/files/${pname}/${version}/${pname}-" + (stdenv.lib.replaceChars ["."] ["_"] version) + "-src.tgz"; - sha256 = "05j86714qaj0lvhvyr2s1xncw6sk0h2dcghb3iiwykbkbh8fjr1s"; + sha256 = "10cmkqigxh9f73y7q3p991q6j8pph0mrydgj11w1x6wlcp5ng37z"; }; outputs = [ "dev" "out" ]; From 6fa3ead8530f728c42e60144b153d0470774662e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 14 Aug 2016 14:02:14 +0200 Subject: [PATCH 032/145] Remove top-level pyopenssl See #11567. --- pkgs/top-level/all-packages.nix | 2 -- pkgs/top-level/python-packages.nix | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8d187745647..0eea33e7688 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10068,8 +10068,6 @@ in pyGtkGlade = pythonPackages.pyGtkGlade; - pyopenssl = pythonPackages.pyopenssl; - rhpl = pythonPackages.rhpl; pysideApiextractor = pythonPackages.pysideApiextractor; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7494d9aafbe..73a60000b73 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -21059,7 +21059,7 @@ in modules // { patches = [ ../development/python-modules/rpkg-buildfix.diff ]; propagatedBuildInputs = with self; [ pycurl pkgs.koji GitPython pkgs.git - pkgs.rpm pkgs.pyopenssl ]; + pkgs.rpm pyopenssl ]; }); @@ -26925,7 +26925,7 @@ in modules // { url = mirror://pypi/g/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-1.8.tar.gz; sha256 = "0jy62y5bmaf1mb735lqwry1s5nx2qqrxvl5sxip9yg4miih3qkyb"; }; - propagatedBuildInputs = with self; [ boto-230 httplib2 google_api_python_client retry_decorator pkgs.pyopenssl socksipy-branch ]; + propagatedBuildInputs = with self; [ boto-230 httplib2 google_api_python_client retry_decorator pyopenssl socksipy-branch ]; meta = { homepage = https://developers.google.com/storage/docs/gspythonlibrary; description = "Provides OAuth 2.0 credentials that can be used with Google Cloud Storage"; @@ -26950,7 +26950,7 @@ in modules // { }; propagatedBuildInputs = with self; [ boto-230 crcmod httplib2 gcs-oauth2-boto-plugin google_api_python_client gflags - retry_decorator pkgs.pyopenssl socksipy-branch crcmod ]; + retry_decorator pyopenssl socksipy-branch crcmod ]; }; svg2tikz = self.buildPythonPackage { From b54b5a90e40aaeca25079eea0a1ec130613ed5e9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 14 Aug 2016 14:06:36 +0200 Subject: [PATCH 033/145] Remove top-level bsddb3 See #11567. --- pkgs/top-level/all-packages.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0eea33e7688..89e853be7e6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10050,8 +10050,6 @@ in self = pypyPackages; }; - bsddb3 = pythonPackages.bsddb3; - pycapnp = pythonPackages.pycapnp; pycrypto = pythonPackages.pycrypto; From e4b47de69411437a563391a34dda300fee1b006b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 14 Aug 2016 14:28:05 +0200 Subject: [PATCH 034/145] Remove top-level pycrypto See #11567. --- pkgs/applications/graphics/screencloud/default.nix | 6 +++--- pkgs/applications/misc/mysql-workbench/default.nix | 7 +++++-- pkgs/tools/backup/obnam/default.nix | 6 ++---- pkgs/tools/misc/svtplay-dl/default.nix | 10 ++++++---- pkgs/tools/security/knockknock/default.nix | 6 +++--- pkgs/tools/security/volatility/default.nix | 8 +++----- pkgs/top-level/all-packages.nix | 7 +------ pkgs/top-level/python-packages.nix | 2 +- 8 files changed, 24 insertions(+), 28 deletions(-) diff --git a/pkgs/applications/graphics/screencloud/default.nix b/pkgs/applications/graphics/screencloud/default.nix index 5934febb999..6f2b0e34cbb 100644 --- a/pkgs/applications/graphics/screencloud/default.nix +++ b/pkgs/applications/graphics/screencloud/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, cmake, qt4, quazip, qt-mobility, qxt, python, pycrypto, glib }: +{ stdenv, fetchurl, fetchFromGitHub, cmake, qt4, quazip, qt-mobility, qxt, pythonPackages, glib }: with stdenv.lib; stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "1s0dxa1sa37nvna5nfqdsp294810favj68qb7ghl78qna7zw0cim"; }; - buildInputs = [ cmake qt4 quazip qt-mobility qxt python pycrypto ]; + buildInputs = [ cmake qt4 quazip qt-mobility qxt pythonPackages.python pythonPackages.pycrypto ]; patchPhase = '' # Required to make the configure script work. Normally, screencloud's @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { postInstall = '' patchShebangs $prefix/opt/screencloud/screencloud.sh substituteInPlace "$prefix/opt/screencloud/screencloud.sh" --replace "/opt" "$prefix/opt" - sed -i "2 i\export PYTHONPATH=$(toPythonPath ${pycrypto}):\$PYTHONPATH" "$prefix/opt/screencloud/screencloud.sh" + sed -i "2 i\export PYTHONPATH=$(toPythonPath ${pythonPackages.pycrypto}):\$PYTHONPATH" "$prefix/opt/screencloud/screencloud.sh" mkdir $prefix/bin mkdir $prefix/lib ln -s $prefix/opt/screencloud/screencloud.sh $prefix/bin/screencloud diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix index 056edd801c0..775d344643e 100644 --- a/pkgs/applications/misc/mysql-workbench/default.nix +++ b/pkgs/applications/misc/mysql-workbench/default.nix @@ -3,10 +3,13 @@ , libctemplate, libglade , libiodbc , libgnome, libsigcxx, libuuid, libxml2, libzip, lua, mesa, mysql -, pango, paramiko, pcre, pexpect, pkgconfig, pycrypto, python, sqlite, sudo +, pango, pcre, pkgconfig, sqlite, sudo +, pythonPackages }: -stdenv.mkDerivation rec { +let + inherit (pythonPackages) pexpect pycrypto python paramiko; +in stdenv.mkDerivation rec { pname = "mysql-workbench"; version = "5.2.47"; name = "${pname}-${version}"; diff --git a/pkgs/tools/backup/obnam/default.nix b/pkgs/tools/backup/obnam/default.nix index 0df9fa9d39f..048321ea2e5 100644 --- a/pkgs/tools/backup/obnam/default.nix +++ b/pkgs/tools/backup/obnam/default.nix @@ -1,18 +1,16 @@ -{ stdenv, fetchurl, python, pythonPackages, pycrypto, attr }: +{ stdenv, fetchurl, pythonPackages, attr }: pythonPackages.buildPythonApplication rec { name = "obnam-${version}"; version = "1.19.1"; - namePrefix = ""; - src = fetchurl rec { url = "http://code.liw.fi/debian/pool/main/o/obnam/obnam_${version}.orig.tar.xz"; sha256 = "096abbvz2c9vm8r7zm82yqrd7zj04pb1xzlv6z0dspkngd0cfdqc"; }; buildInputs = [ pythonPackages.sphinx attr ]; - propagatedBuildInputs = [ pycrypto pythonPackages.paramiko pythonPackages.tracing pythonPackages.ttystatus pythonPackages.cliapp pythonPackages.larch pythonPackages.pyyaml pythonPackages.fuse ]; + propagatedBuildInputs = with pythonPackages; [ pycrypto paramiko tracing ttystatus cliapp larch pyyaml fuse ]; doCheck = false; diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index 7848abcf14d..1169752b9ca 100644 --- a/pkgs/tools/misc/svtplay-dl/default.nix +++ b/pkgs/tools/misc/svtplay-dl/default.nix @@ -1,7 +1,9 @@ -{ stdenv, fetchFromGitHub, makeWrapper, python, perl, zip -, rtmpdump, nose, mock, pycrypto, requests2, substituteAll }: +{ stdenv, fetchFromGitHub, makeWrapper, pythonPackages, perl, zip +, rtmpdump, substituteAll }: -stdenv.mkDerivation rec { +let + inherit (pythonPackages) python nose pycrypto requests2 mock; +in stdenv.mkDerivation rec { name = "svtplay-dl-${version}"; version = "1.1"; @@ -24,7 +26,7 @@ stdenv.mkDerivation rec { --replace 'PYTHONPATH=lib' 'PYTHONPATH=lib:$PYTHONPATH' ''; - makeFlags = "PREFIX=$(out) SYSCONFDIR=$(out)/etc PYTHON=${python}/bin/python"; + makeFlags = "PREFIX=$(out) SYSCONFDIR=$(out)/etc PYTHON=${python.interpreter}"; postInstall = '' wrapProgram "$out/bin/svtplay-dl" \ diff --git a/pkgs/tools/security/knockknock/default.nix b/pkgs/tools/security/knockknock/default.nix index 089dd0de2bd..7e4ff32e880 100644 --- a/pkgs/tools/security/knockknock/default.nix +++ b/pkgs/tools/security/knockknock/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, buildPythonApplication, python, pycrypto, hping }: +{ stdenv, fetchFromGitHub, pythonPackages, buildPythonApplication, hping }: -buildPythonApplication rec { +pythonPackages.buildPythonApplication rec { rev = "bf14bbff"; name = "knockknock-r${rev}"; @@ -11,7 +11,7 @@ buildPythonApplication rec { sha256 = "1chpfs3w2vkjrgay69pbdr116z1jldv53fi768a1i05fdqhy1px4"; }; - propagatedBuildInputs = [ pycrypto ]; + propagatedBuildInputs = [ pythonPackages.pycrypto ]; patchPhase = '' sed -i '/build\//d' setup.py diff --git a/pkgs/tools/security/volatility/default.nix b/pkgs/tools/security/volatility/default.nix index 511da154c50..6f1b7fe6ef4 100644 --- a/pkgs/tools/security/volatility/default.nix +++ b/pkgs/tools/security/volatility/default.nix @@ -1,10 +1,8 @@ -{ stdenv, fetchurl, buildPythonApplication, pycrypto }: +{ stdenv, fetchurl, pythonPackages }: -buildPythonApplication rec { - namePrefix = ""; +pythonPackages.buildPythonApplication rec { name = "volatility-2.4"; - src = fetchurl { url = "http://downloads.volatilityfoundation.org/releases/2.4/${name}.tar.gz"; sha256 = "1wffrkvj2lrkqhwamyix9fy05y6g6w8h1sz2iqlm6i6ag7yxykv8"; @@ -12,7 +10,7 @@ buildPythonApplication rec { doCheck = false; - propagatedBuildInputs = [ pycrypto ]; + propagatedBuildInputs = [ pythonPackages.pycrypto ]; meta = with stdenv.lib; { homepage = https://code.google.com/p/volatility; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 89e853be7e6..e516f832c25 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3624,9 +3624,7 @@ in svnfs = callPackage ../tools/filesystems/svnfs { }; - svtplay-dl = callPackage ../tools/misc/svtplay-dl { - inherit (pythonPackages) nose mock requests2; - }; + svtplay-dl = callPackage ../tools/misc/svtplay-dl { }; sysbench = callPackage ../development/tools/misc/sysbench {}; @@ -10052,8 +10050,6 @@ in pycapnp = pythonPackages.pycapnp; - pycrypto = pythonPackages.pycrypto; - pyexiv2 = pythonPackages.pyexiv2; pygobject = pythonPackages.pygobject; @@ -17240,7 +17236,6 @@ in mysqlWorkbench = newScope gnome ../applications/misc/mysql-workbench { lua = lua5_1; libctemplate = libctemplate_2_2; - inherit (pythonPackages) pexpect paramiko; }; redis-desktop-manager = qt55.callPackage ../applications/misc/redis-desktop-manager { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 73a60000b73..897e0f160bf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1940,7 +1940,7 @@ in modules // { sha256 = "0grid93yz6i6jb2zggrqncp5awdf7qi88j5y2k7dq0k9r6b8zydw"; }; - propagatedBuildInputs = with stdenv.lib; with pkgs; [ modules.curses zlib xz ncompress gzip bzip2 gnutar p7zip cabextract lzma pycrypto ] + propagatedBuildInputs = with stdenv.lib; with pkgs; [ modules.curses zlib xz ncompress gzip bzip2 gnutar p7zip cabextract lzma self.pycrypto ] ++ optional visualizationSupport [ pyqtgraph ]; meta = with stdenv.lib; { From 4e8775fd17217c3b4ae9aa91f02b24a5172ed8c7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 14 Aug 2016 10:42:40 +0200 Subject: [PATCH 035/145] pythonPackages.tflearn: remove maintainer, fixes eval (cherry picked from commit 9fc37cc89cdbe183b3bf613035e45c793989575d) --- pkgs/top-level/python-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c5963277671..37d1be553e0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -28880,7 +28880,6 @@ in modules // { description = "Deep learning library featuring a higher-level API for TensorFlow"; homepage = "https://github.com/tflearn/tflearn"; license = licenses.mit; - maintainers = with maintainers; [ houqp ]; }; propagatedBuildInputs = with self; [ scipy h5py pillow tensorflow ]; From 344c672bb5b63790f4cf67c1e00e138ad641fb0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 14 Aug 2016 15:20:19 +0200 Subject: [PATCH 036/145] libdrm: 2.4.68 -> 2.4.70 --- pkgs/development/libraries/libdrm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index d2bb05a3bb6..13a7cfe0fb9 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, udev, valgrind }: stdenv.mkDerivation rec { - name = "libdrm-2.4.68"; + name = "libdrm-2.4.70"; src = fetchurl { url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2"; - sha256 = "5b4bd9a5922929bc716411cb74061fbf31b06ba36feb89bc1358a91a8d0ca9df"; + sha256 = "b17d4b39ed97ca0e4cffa0db06ff609e617bac94646ec38e8e0579d530540e7b"; }; outputs = [ "dev" "out" ]; From 670801a56ac15b1c23f0626833c3030a7490b616 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 14 Aug 2016 10:58:44 -0400 Subject: [PATCH 037/145] long-shebang: 1.0.0 -> 1.0.1 --- pkgs/misc/long-shebang/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/long-shebang/default.nix b/pkgs/misc/long-shebang/default.nix index 17bf0e95fee..5d59d778927 100644 --- a/pkgs/misc/long-shebang/default.nix +++ b/pkgs/misc/long-shebang/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: let - version = "1.0.0"; + version = "1.0.1"; in stdenv.mkDerivation { name = "long-shebang-${version}"; src = fetchurl { - url = "https://github.com/shlevy/long-shebang/releases/download/v1.0.0/long-shebang-1.0.0.tar.xz"; - sha256 = "15f5rmihj3r53rmalix1bn1agybbzrc3g2a9xzjyd4v3vfd2vckr"; + url = "https://github.com/shlevy/long-shebang/releases/download/v${version}/long-shebang-${version}.tar.xz"; + sha256 = "0kj299f3a9zawi96fmw1iq6p6yg0pdm1wgmv61iw5w0zn9v4924b"; }; meta = { From 6d27410111d280777c22939f18d980f9b6b30416 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Sat, 13 Aug 2016 09:33:50 +0200 Subject: [PATCH 038/145] byzanz: Let it find gstreamer plugins --- pkgs/applications/video/byzanz/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/byzanz/default.nix b/pkgs/applications/video/byzanz/default.nix index 2d94cea0db9..872ac098f00 100644 --- a/pkgs/applications/video/byzanz/default.nix +++ b/pkgs/applications/video/byzanz/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, which, gnome3, glib, intltool, pkgconfig, libtool, cairo, gtk3, gst_all_1 }: +{ stdenv, fetchgit, wrapGAppsHook, which, gnome3, glib, intltool, pkgconfig, libtool, cairo, gtk3, gst_all_1, xorg }: stdenv.mkDerivation rec { version = "0.2.3.alpha"; @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; - buildInputs = [ which gnome3.gnome_common glib intltool pkgconfig libtool cairo gtk3 gst_all_1.gstreamer gst_all_1.gst-plugins-base ]; + buildInputs = [ which gnome3.gnome_common glib intltool pkgconfig libtool cairo gtk3 xorg.xwininfo ] + ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-bad gst-plugins-good gst-plugins-ugly gst-libav wrapGAppsHook ]); meta = with stdenv.lib; { description = "Tool to record a running X desktop to an animation suitable for presentation in a web browser"; From 7069047f2ed6548910f3f2bff4a23946a363e860 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 14 Aug 2016 12:33:50 -0400 Subject: [PATCH 039/145] long-shebang: 1.0.1 -> 1.1.0 --- pkgs/misc/long-shebang/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/long-shebang/default.nix b/pkgs/misc/long-shebang/default.nix index 5d59d778927..2aac5556e2f 100644 --- a/pkgs/misc/long-shebang/default.nix +++ b/pkgs/misc/long-shebang/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: let - version = "1.0.1"; + version = "1.1.0"; in stdenv.mkDerivation { name = "long-shebang-${version}"; src = fetchurl { url = "https://github.com/shlevy/long-shebang/releases/download/v${version}/long-shebang-${version}.tar.xz"; - sha256 = "0kj299f3a9zawi96fmw1iq6p6yg0pdm1wgmv61iw5w0zn9v4924b"; + sha256 = "0rlyibf7pczjfsi91nl1n5vri2vqibmvyyy070jaw3wb0wjm565a"; }; meta = { From 948b7f23bbc42a87e66a473c5c4543cfa5a03da7 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Sun, 14 Aug 2016 12:52:47 -0400 Subject: [PATCH 040/145] darwin.{xnu, Libc}: 10.9 -> 10.11 I can't submit this in smaller units because the various components all depend on one another during the stdenv bootstrap, so I think this is the smallest sensible change I can make. I also removed the symbol-hiding shenanigans in Libsystem. It might mess up compatibility with 10.9 but I don't really want to support the added complexity and I see little evidence of anyone else wanting to support it. If someone cares, we might be able to revive compatibility, but for now it'll stay like this. --- .../apple-source-releases/Libc/default.nix | 4 +- .../Libsystem/default.nix | 69 ++----------------- .../apple-source-releases/configd/default.nix | 15 ++-- .../darwin/apple-source-releases/default.nix | 25 ++++--- .../libpthread/default.nix | 6 +- .../apple-source-releases/xnu/default.nix | 25 +++++-- 6 files changed, 58 insertions(+), 86 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix index 16cfa9e554b..ce04be0e083 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation, ed, unifdef, Libc_old }: +{ stdenv, appleDerivation, ed, unifdef, Libc_old, Libc_10-9 }: appleDerivation { phases = [ "unpackPhase" "installPhase" ]; @@ -13,6 +13,8 @@ appleDerivation { export PRIVATE_HEADERS_FOLDER_PATH=include bash xcodescripts/headers.sh + cp ${Libc_10-9}/include/NSSystemDirectories.h $out/include + # Ugh Apple stopped releasing this stuff so we need an older one... cp ${Libc_old}/include/spawn.h $out/include cp ${Libc_old}/include/setjmp.h $out/include diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix index 1c9b5879e6e..27d2360a980 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix @@ -5,42 +5,7 @@ appleDerivation rec { phases = [ "unpackPhase" "installPhase" ]; - buildInputs = [ cpio libpthread ]; - - systemlibs = [ "cache" - "commonCrypto" - "compiler_rt" - "copyfile" - "corecrypto" - "dispatch" - "dyld" - "keymgr" - "kxld" - "launch" - "macho" - "quarantine" - "removefile" - "system_asl" - "system_blocks" - # "system_c" # special re-export here to hide newer functions - "system_configuration" - "system_dnssd" - "system_info" - # "system_kernel" # special re-export here to hide newer functions - "system_m" - "system_malloc" - "system_network" - "system_notify" - "system_platform" - "system_pthread" - "system_sandbox" - # does not exist in El Capitan beta - # FIXME: does anything on yosemite actually need this? - # "system_stats" - "unc" - "unwind" - "xpc" - ]; + buildInputs = [ cpio ]; installPhase = '' export NIX_ENFORCE_PURITY= @@ -54,7 +19,7 @@ appleDerivation rec { for dep in ${Libc} ${Libm} ${Libinfo} ${dyld} ${architecture} ${libclosure} ${CarbonHeaders} \ ${libdispatch} ${ncurses.dev} ${CommonCrypto} ${copyfile} ${removefile} ${libresolv} \ - ${Libnotify} ${mDNSResponder} ${launchd} ${libutil}; do + ${Libnotify} ${mDNSResponder} ${launchd} ${libutil} ${libpthread}; do (cd $dep/include && find . -name '*.h' | cpio -pdm $out/include) done @@ -91,33 +56,9 @@ appleDerivation rec { # The startup object files cp ${Csu}/lib/* $out/lib - # selectively re-export functions from libsystem_c and libsystem_kernel - # to provide a consistent interface across OSX verions - mkdir -p $out/lib/system - ld -macosx_version_min 10.7 -arch x86_64 -dylib \ - -o $out/lib/system/libsystem_c.dylib \ - /usr/lib/libSystem.dylib \ - -reexported_symbols_list ${./system_c_symbols} - - ld -macosx_version_min 10.7 -arch x86_64 -dylib \ - -o $out/lib/system/libsystem_kernel.dylib \ - /usr/lib/libSystem.dylib \ - -reexported_symbols_list ${./system_kernel_symbols} - - # Set up the actual library link - clang -c -o CompatibilityHacks.o -Os CompatibilityHacks.c - clang -c -o init.o -Os init.c - ld -macosx_version_min 10.7 \ - -arch x86_64 \ - -dylib \ - -o $out/lib/libSystem.dylib \ - CompatibilityHacks.o init.o \ - -compatibility_version 1.0 \ - -current_version 1197.1.1 \ - -reexport_library $out/lib/system/libsystem_c.dylib \ - -reexport_library $out/lib/system/libsystem_kernel.dylib \ - ${stdenv.lib.concatStringsSep " " - (map (l: "-reexport_library /usr/lib/system/lib${l}.dylib") systemlibs)} + # OMG impurity + ln -s /usr/lib/libSystem.B.dylib $out/lib/libSystem.B.dylib + ln -s /usr/lib/libSystem.dylib $out/lib/libSystem.dylib # Set up links to pretend we work like a conventional unix (Apple's design, not mine!) for name in c dbm dl info m mx poll proc pthread rpcsvc util gcc_s.10.4 gcc_s.10.5; do diff --git a/pkgs/os-specific/darwin/apple-source-releases/configd/default.nix b/pkgs/os-specific/darwin/apple-source-releases/configd/default.nix index 1fbacfb9284..24797fc286a 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/configd/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/configd/default.nix @@ -3,7 +3,7 @@ appleDerivation { meta.broken = stdenv.cc.nativeLibc; - buildInputs = [ launchd bootstrap_cmds xnu ppp IOKit eap8021x ]; + buildInputs = [ launchd bootstrap_cmds ppp IOKit eap8021x ]; propagatedBuildInputs = [ Security ]; @@ -12,6 +12,11 @@ appleDerivation { ''; patchPhase = '' + HACK=$PWD/hack + mkdir $HACK + cp -r ${xnu}/Library/Frameworks/System.framework/Versions/B/PrivateHeaders/net $HACK + + substituteInPlace SystemConfiguration.fproj/SCNetworkReachabilityInternal.h \ --replace '#include ' "" @@ -172,9 +177,9 @@ appleDerivation { cc -I. -Ihelper -Iderived -F. -c DHCP.c -o DHCP.o cc -I. -Ihelper -Iderived -F. -c moh.c -o moh.o cc -I. -Ihelper -Iderived -F. -c DeviceOnHold.c -o DeviceOnHold.o - cc -I. -Ihelper -Iderived -I${xnu}/Library/Frameworks/System.framework/Versions/B/PrivateHeaders -F. -c LinkConfiguration.c -o LinkConfiguration.o + cc -I. -Ihelper -Iderived -I $HACK -F. -c LinkConfiguration.c -o LinkConfiguration.o cc -I. -Ihelper -Iderived -F. -c dy_framework.c -o dy_framework.o - cc -I. -Ihelper -Iderived -I${xnu}/Library/Frameworks/System.framework/Versions/B/PrivateHeaders -F. -c VLANConfiguration.c -o VLANConfiguration.o + cc -I. -Ihelper -Iderived -I $HACK -F. -c VLANConfiguration.c -o VLANConfiguration.o cc -I. -Ihelper -Iderived -F. -c derived/configUser.c -o configUser.o cc -I. -Ihelper -Iderived -F. -c SCPreferencesPathKey.c -o SCPreferencesPathKey.o cc -I. -Ihelper -Iderived -I../dnsinfo -F. -c derived/shared_dns_infoUser.c -o shared_dns_infoUser.o @@ -183,8 +188,8 @@ appleDerivation { cc -I. -Ihelper -Iderived -F. -c SCNetworkProtocol.c -o SCNetworkProtocol.o cc -I. -Ihelper -Iderived -F. -c SCNetworkService.c -o SCNetworkService.o cc -I. -Ihelper -Iderived -F. -c SCNetworkSet.c -o SCNetworkSet.o - cc -I. -Ihelper -Iderived -I${xnu}/Library/Frameworks/System.framework/Versions/B/PrivateHeaders -F. -c BondConfiguration.c -o BondConfiguration.o - cc -I. -Ihelper -Iderived -I${xnu}/Library/Frameworks/System.framework/Versions/B/PrivateHeaders -F. -c BridgeConfiguration.c -o BridgeConfiguration.o + cc -I. -Ihelper -Iderived -I $HACK -F. -c BondConfiguration.c -o BondConfiguration.o + cc -I. -Ihelper -Iderived -I $HACK -F. -c BridgeConfiguration.c -o BridgeConfiguration.o cc -I. -Ihelper -Iderived -F. -c helper/SCHelper_client.c -o SCHelper_client.o cc -I. -Ihelper -Iderived -F. -c SCPreferencesKeychainPrivate.c -o SCPreferencesKeychainPrivate.o cc -I. -Ihelper -Iderived -F. -c SCNetworkSignature.c -o SCNetworkSignature.o diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index ce128f14530..d7710abf291 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgs }: +{ stdenv, fetchurl, fetchzip, pkgs }: let # This attrset can in theory be computed automatically, but for that to work nicely we need @@ -6,9 +6,13 @@ let # a stdenv out of something like this. With some care we can probably get rid of this, but for # now it's staying here. versions = { - "osx-10.11.2" = { - dtrace = "168"; - xnu = "3248.20.55"; + "osx-10.11.6" = { + dtrace = "168"; + xnu = "3248.60.10"; + libpthread = "138.10.4"; + }; + "osx-10.11.5" = { + Libc = "1082.50.1"; # 10.11.6 still unreleased :/ }; "osx-10.10.5" = { adv_cmds = "158"; @@ -185,13 +189,18 @@ let CoreOSMakefiles = applePackage "CoreOSMakefiles" "osx-10.5" "0kxp53spbn7109l7cvhi88pmfsi81lwmbws819b6wr3hm16v84f4" {}; Csu = applePackage "Csu" "osx-10.10.5" "0yh5mslyx28xzpv8qww14infkylvc1ssi57imhi471fs91sisagj" {}; dtrace = applePackage "dtrace" "osx-10.10.5" "0pp5x8dgvzmg9vvg32hpy2brm17dpmbwrcr4prsmdmfvd4767wcf" {}; - dtracen = applePackage "dtrace" "osx-10.11.2" "04mi0jy8gy0w59rk9i9dqznysv6fzz1v5mq779s41cp308yi0h1c" {}; + dtracen = applePackage "dtrace" "osx-10.11.6" "04mi0jy8gy0w59rk9i9dqznysv6fzz1v5mq779s41cp308yi0h1c" {}; dyld = applePackage "dyld" "osx-10.10.5" "167f74ln8pmfimwn6kwh199ylvy3fw72fd15da94mf34ii0zar6k" {}; eap8021x = applePackage "eap8021x" "osx-10.10.5" "1f37dpbcgrd1b14nrv2lpqrkap74myjbparz9masx92df6kcn7l2" {}; IOKit = applePackage "IOKit" "osx-10.10.5" "0kcbrlyxcyirvg5p95hjd9k8a01k161zg0bsfgfhkb90kh2s8x0m" { inherit IOKitSrcs; }; launchd = applePackage "launchd" "osx-10.9.5" "0w30hvwqq8j5n90s3qyp0fccxflvrmmjnicjri4i1vd2g196jdgj" {}; libauto = applePackage "libauto" "osx-10.9.5" "17z27yq5d7zfkwr49r7f0vn9pxvj95884sd2k6lq6rfaz9gxqhy3" {}; - Libc = applePackage "Libc" "osx-10.9.5" "1jz5bx9l4q484vn28c6n9b28psja3rpxiqbj6zwrwvlndzmq1yz5" {}; + Libc = applePackage "Libc" "osx-10.11.5" "1qv7r0dgz06jy9i5agbqzxgdibb0m8ylki6g5n5pary88lzrawfd" { + Libc_10-9 = fetchzip { + url = "http://www.opensource.apple.com/tarballs/Libc/Libc-997.90.3.tar.gz"; + sha256 = "1xchgxkxg5288r2b9yfrqji2gsgdap92k4wx2dbjwslixws12pq7"; + }; + }; Libc_old = applePackage "Libc/825_40_1.nix" "osx-10.8.5" "0xsx1im52gwlmcrv4lnhhhn9dyk5ci6g27k6yvibn9vj8fzjxwcf" {}; libclosure = applePackage "libclosure" "osx-10.10.5" "1zqy1zvra46cmqv6vsf1mcsz3a76r9bky145phfwh4ab6y15vjpq" {}; libdispatch = applePackage "libdispatch" "osx-10.9.5" "1lc5033cmkwxy3r26gh9plimxshxfcbgw6i0j7mgjlnpk86iy5bk" {}; @@ -199,7 +208,7 @@ let Libinfo = applePackage "Libinfo" "osx-10.10.5" "19n72s652rrqnc9hzlh4xq3h7xsfyjyklmcgyzyj0v0z68ww3z6h" {}; Libm = applePackage "Libm" "osx-10.7.4" "02sd82ig2jvvyyfschmb4gpz6psnizri8sh6i982v341x6y4ysl7" {}; Libnotify = applePackage "Libnotify" "osx-10.9.5" "164rx4za5z74s0mk9x0m1815r1m9kfal8dz3bfaw7figyjd6nqad" {}; - libpthread = applePackage "libpthread" "osx-10.10.5" "1p2y6xvsfqyakivr6d48fgrd163b5m9r045cxyfwrf8w0r33nfn3" {}; + libpthread = applePackage "libpthread" "osx-10.11.6" "1kbw738cmr9pa7pz1igmajs307clfq7gv2vm1sqdzhcnnjxbl28w" {}; libresolv = applePackage "libresolv" "osx-10.10.5" "0nvssf4qaqgs1dxwayzdy66757k99969f6c7n68n58n2yh6f5f6a" {}; Libsystem = applePackage "Libsystem" "osx-10.9.5" "1yfj2qdrf9vrzs7p9m4wlb7zzxcrim1gw43x4lvz4qydpp5kg2rh" {}; libutil = applePackage "libutil" "osx-10.10.5" "12gsvmj342n5d81kqwba68bmz3zf2757442g1sz2y5xmcapa3g5f" {}; @@ -209,7 +218,7 @@ let ppp = applePackage "ppp" "osx-10.10.5" "01v7i0xds185glv8psvlffylfcfhbx1wgsfg74kx5rh3lyrigwrb" {}; removefile = applePackage "removefile" "osx-10.10.5" "1f2jw5irq6fz2jv5pag1w2ivfp8659v74f0h8kh0yx0rqw4asm33" {}; Security = applePackage "Security" "osx-10.9.5" "1nv0dczf67dhk17hscx52izgdcyacgyy12ag0jh6nl5hmfzsn8yy" {}; - xnu = applePackage "xnu" "osx-10.9.5" "1ssw5fzvgix20bw6y13c39ib0zs7ykpig3irlwbaccpjpci5jl0s" {}; + xnu = applePackage "xnu" "osx-10.11.6" "0yhziq4dqqcbjpf6vyqn8xhwva2zb525gndkx8cp8alzwp76jnr9" {}; # Pending work... we can't change the above packages in place because the bootstrap depends on them, so we detach the expressions # here so we can work on them. diff --git a/pkgs/os-specific/darwin/apple-source-releases/libpthread/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libpthread/default.nix index 027784e2ea6..50794814aa0 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libpthread/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libpthread/default.nix @@ -6,8 +6,12 @@ appleDerivation { propagatedBuildInputs = [ libdispatch xnu ]; installPhase = '' - mkdir -p $out/include/pthread + mkdir -p $out/include/pthread/ + mkdir -p $out/include/sys/_types cp pthread/*.h $out/include/pthread/ cp private/*.h $out/include/pthread/ + cp -r sys $out/include + cp -r sys/_pthread/*.h $out/include/sys/_types/ + ''; } diff --git a/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix b/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix index 4933f94d4a9..0ce9c54e48c 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix @@ -30,11 +30,12 @@ appleDerivation { substituteInPlace libsyscall/xcodescripts/mach_install_mig.sh \ --replace "/usr/include" "/include" \ --replace "/usr/local/include" "/include" \ - --replace "MIG=" "# " \ - --replace "MIGCC=" "# " \ + --replace 'MIG=`' "# " \ + --replace 'MIGCC=`' "# " \ --replace " -o 0" "" \ --replace '$SRC/$mig' '-I$DSTROOT/include $SRC/$mig' \ - --replace '$SRC/servers/netname.defs' '-I$DSTROOT/include $SRC/servers/netname.defs' + --replace '$SRC/servers/netname.defs' '-I$DSTROOT/include $SRC/servers/netname.defs' \ + --replace '$BUILT_PRODUCTS_DIR/mig_hdr' '$BUILT_PRODUCTS_DIR' patchShebangs . ''; @@ -46,9 +47,9 @@ appleDerivation { cat > sdk/usr/local/libexec/availability.pl < Date: Sun, 14 Aug 2016 19:55:52 +0200 Subject: [PATCH 041/145] caddy: 0.8.3 -> 0.9.0 Closes https://github.com/NixOS/nixpkgs/issues/17678 --- pkgs/servers/caddy/default.nix | 20 +- pkgs/servers/caddy/deps.json | 324 ++++++++++++++++++--------------- 2 files changed, 193 insertions(+), 151 deletions(-) diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix index 68ce9440f4f..4e5703bc531 100644 --- a/pkgs/servers/caddy/default.nix +++ b/pkgs/servers/caddy/default.nix @@ -1,18 +1,24 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: buildGoPackage rec { name = "caddy-${version}"; - version = "0.8.3"; - rev = "e2234497b79603388b58ba226abb157aa4aaf065"; + version = "v0.9.0"; + rev = "f28af637327a4f12ae745284c519cfdeca5502ef"; goPackagePath = "github.com/mholt/caddy"; - src = fetchFromGitHub { + subPackages = [ "caddy" ]; + + src = fetchgit { inherit rev; - owner = "mholt"; - repo = "caddy"; - sha256 = "1snijkbz02yr7wij7bcmrj4257709sbklb3nhb5qmy95b9ssffm6"; + url = "https://github.com/mholt/caddy.git"; + sha256 = "1s7z0xbcw516i37pyj1wgxd9diqrifdghf97vs31ilbqs6z0nyls"; }; + buildFlagsArray = '' + -ldflags= + -X github.com/mholt/caddy/caddy/caddymain.gitTag=${version} + ''; + goDeps = ./deps.json; } diff --git a/pkgs/servers/caddy/deps.json b/pkgs/servers/caddy/deps.json index e026c7c6369..3ed975cab76 100644 --- a/pkgs/servers/caddy/deps.json +++ b/pkgs/servers/caddy/deps.json @@ -1,146 +1,182 @@ [ - { - "goPackagePath": "gopkg.in/yaml.v2", - "fetch": { - "type": "git", - "url": "https://gopkg.in/yaml.v2", - "rev": "a83829b6f1293c91addabc89d0571c246397bbf4", - "sha256": "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh" - } - }, - { - "goPackagePath": "golang.org/x/crypto", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/crypto", - "rev": "575fdbe86e5dd89229707ebec0575ce7d088a4a6", - "sha256": "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa" - } - }, - { - "goPackagePath": "golang.org/x/net", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/net", - "rev": "62ac18b461605b4be188bbc7300e9aa2bc836cd4", - "sha256": "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p" - } - }, - { - "goPackagePath": "github.com/gorilla/websocket", - "fetch": { - "type": "git", - "url": "https://github.com/gorilla/websocket", - "rev": "a622679ebd7a3b813862379232f645f8e690e43f", - "sha256": "1nc9jbcmgya1i6dmf6sbcqsnxi9hbjg6dz1z0k7zmc6xdwlq0y4q" - } - }, - { - "goPackagePath": "github.com/miekg/dns", - "fetch": { - "type": "git", - "url": "https://github.com/miekg/dns", - "rev": "7e024ce8ce18b21b475ac6baf8fa3c42536bf2fa", - "sha256": "0hlwb52lnnj3c6papjk9i5w5cjdw6r7c891v4xksnfvk1f9cy9kl" - } - }, - { - "goPackagePath": "github.com/BurntSushi/toml", - "fetch": { - "type": "git", - "url": "https://github.com/BurntSushi/toml", - "rev": "056c9bc7be7190eaa7715723883caffa5f8fa3e4", - "sha256": "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw" - } - }, - { - "goPackagePath": "github.com/hashicorp/go-syslog", - "fetch": { - "type": "git", - "url": "https://github.com/hashicorp/go-syslog", - "rev": "42a2b573b664dbf281bd48c3cc12c086b17a39ba", - "sha256": "1j53m2wjyczm9m55znfycdvm4c8vfniqgk93dvzwy8vpj5gm6sb3" - } - }, - { - "goPackagePath": "github.com/flynn/go-shlex", - "fetch": { - "type": "git", - "url": "https://github.com/flynn/go-shlex", - "rev": "3f9db97f856818214da2e1057f8ad84803971cff", - "sha256": "1j743lysygkpa2s2gii2xr32j7bxgc15zv4113b0q9jhn676ysia" - } - }, - { - "goPackagePath": "github.com/xenolf/lego", - "fetch": { - "type": "git", - "url": "https://github.com/xenolf/lego", - "rev": "ca19a90028e242e878585941c2a27c8f3b3efc25", - "sha256": "1zkcsbdzbmfzk3kqmcj9l13li8sz228xhrw2wj3ab4a0w6drbw3x" - } - }, - { - "goPackagePath": "gopkg.in/natefinch/lumberjack.v2", - "fetch": { - "type": "git", - "url": "https://gopkg.in/natefinch/lumberjack.v2", - "rev": "514cbda263a734ae8caac038dadf05f8f3f9f738", - "sha256": "1v92v8vkip36l2fs6l5dpp655151hrijjc781cif658r8nf7xr82" - } - }, - { - "goPackagePath": "github.com/shurcooL/sanitized_anchor_name", - "fetch": { - "type": "git", - "url": "https://github.com/shurcooL/sanitized_anchor_name", - "rev": "10ef21a441db47d8b13ebcc5fd2310f636973c77", - "sha256": "1cnbzcf47cn796rcjpph1s64qrabhkv5dn9sbynsy7m9zdwr5f01" - } - }, - { - "goPackagePath": "gopkg.in/square/go-jose.v1", - "fetch": { - "type": "git", - "url": "https://gopkg.in/square/go-jose.v1", - "rev": "40d457b439244b546f023d056628e5184136899b", - "sha256": "0asa1kl1qbx0cyayk44jhxxff0awpkwiw6va7yzrzjzhfc5kvg7p" - } - }, - { - "goPackagePath": "github.com/mholt/archiver", - "fetch": { - "type": "git", - "url": "https://github.com/mholt/archiver", - "rev": "85f054813ed511646b0ce5e047697e0651b8e1a4", - "sha256": "0b38mrfm3rwgdi7hrp4gjhf0y0f6bw73qjkfrkafxjrdpdg7nyly" - } - }, - { - "goPackagePath": "github.com/dustin/go-humanize", - "fetch": { - "type": "git", - "url": "https://github.com/dustin/go-humanize", - "rev": "8929fe90cee4b2cb9deb468b51fb34eba64d1bf0", - "sha256": "1g155kxjh6hd3ibx41nbpj6f7h5bh54zgl9dr53xzg2xlxljgjy0" - } - }, - { - "goPackagePath": "github.com/jimstudt/http-authentication", - "fetch": { - "type": "git", - "url": "https://github.com/jimstudt/http-authentication", - "rev": "3eca13d6893afd7ecabe15f4445f5d2872a1b012", - "sha256": "1drw3bhrxpjzwryqz9nq5s0yyjqyd42iym3bh1zjs5qsh401cq08" - } - }, - { - "goPackagePath": "github.com/russross/blackfriday", - "fetch": { - "type": "git", - "url": "https://github.com/russross/blackfriday", - "rev": "d18b67ae0afd61dae240896eae1785f00709aa31", - "sha256": "1l78hz8k1ixry5fjw29834jz1q5ysjcpf6kx2ggjj1s6xh0bfzvf" - } + { + "goPackagePath": "github.com/BurntSushi/toml", + "fetch": { + "type": "git", + "url": "https://github.com/BurntSushi/toml", + "rev": "99064174e013895bbd9b025c31100bd1d9b590ca", + "sha256": "058qrar8rvw3wb0ci1mf1axnqq2729cvv9zmdr4ms2nn9s97yiz9" } -] + }, + { + "goPackagePath": "github.com/dustin/go-humanize", + "fetch": { + "type": "git", + "url": "https://github.com/dustin/go-humanize", + "rev": "2fcb5204cdc65b4bec9fd0a87606bb0d0e3c54e8", + "sha256": "1m2qgn5vh5m66ggmclgikvwc05np2r7sxgpvlj2jip5d61x29j5k" + } + }, + { + "goPackagePath": "github.com/flynn/go-shlex", + "fetch": { + "type": "git", + "url": "https://github.com/flynn/go-shlex", + "rev": "3f9db97f856818214da2e1057f8ad84803971cff", + "sha256": "1j743lysygkpa2s2gii2xr32j7bxgc15zv4113b0q9jhn676ysia" + } + }, + { + "goPackagePath": "github.com/gorilla/websocket", + "fetch": { + "type": "git", + "url": "https://github.com/gorilla/websocket", + "rev": "a69d25be2fe2923a97c2af6849b2f52426f68fc0", + "sha256": "1z09mff5yfdrw8vbylrgrick5m5hczjy8m2x6swdq8v062s45g3v" + } + }, + { + "goPackagePath": "github.com/hashicorp/go-syslog", + "fetch": { + "type": "git", + "url": "https://github.com/hashicorp/go-syslog", + "rev": "42a2b573b664dbf281bd48c3cc12c086b17a39ba", + "sha256": "1j53m2wjyczm9m55znfycdvm4c8vfniqgk93dvzwy8vpj5gm6sb3" + } + }, + { + "goPackagePath": "github.com/jimstudt/http-authentication", + "fetch": { + "type": "git", + "url": "https://github.com/jimstudt/http-authentication", + "rev": "3eca13d6893afd7ecabe15f4445f5d2872a1b012", + "sha256": "1drw3bhrxpjzwryqz9nq5s0yyjqyd42iym3bh1zjs5qsh401cq08" + } + }, + { + "goPackagePath": "github.com/lucas-clemente/aes12", + "fetch": { + "type": "git", + "url": "https://github.com/lucas-clemente/aes12", + "rev": "5a3c52721c1e81aa8162601ac2342486525156d5", + "sha256": "16z4h752na2d4sskjvbgi9bpwx874lpnzn6i13n33xjz599nps4y" + } + }, + { + "goPackagePath": "github.com/lucas-clemente/fnv128a", + "fetch": { + "type": "git", + "url": "https://github.com/lucas-clemente/fnv128a", + "rev": "393af48d391698c6ae4219566bfbdfef67269997", + "sha256": "1cvq0p0k86p668yz9rb3z98fz3f9phvbvqp6ilbasiy4y2x5w184" + } + }, + { + "goPackagePath": "github.com/lucas-clemente/quic-go", + "fetch": { + "type": "git", + "url": "https://github.com/lucas-clemente/quic-go", + "rev": "61454ac85f1209c41ffcc000213a42f3e76346e5", + "sha256": "0y7qmwlb93r0aq5m5qarc86550d75yx86pwv31wd2m0474yv7jk9" + } + }, + { + "goPackagePath": "github.com/lucas-clemente/quic-go-certificates", + "fetch": { + "type": "git", + "url": "https://github.com/lucas-clemente/quic-go-certificates", + "rev": "9bb36d3159787cca26dcfa15e23049615e307ef8", + "sha256": "146674p0rg0m4j8p33r5idn5j5k4a277fz1yzf87v5m8wf4694q5" + } + }, + { + "goPackagePath": "github.com/mholt/caddy", + "fetch": { + "type": "git", + "url": "https://github.com/mholt/caddy.git", + "rev": "f28af637327a4f12ae745284c519cfdeca5502ef", + "sha256": "1s7z0xbcw516i37pyj1wgxd9diqrifdghf97vs31ilbqs6z0nyls" + } + }, + { + "goPackagePath": "github.com/miekg/dns", + "fetch": { + "type": "git", + "url": "https://github.com/miekg/dns", + "rev": "db96a2b759cdef4f11a34506a42eb8d1290c598e", + "sha256": "0h5n4psd0p7q55jadgsgz2a1aj791yanrfj76avalh6aawvdpcm6" + } + }, + { + "goPackagePath": "github.com/russross/blackfriday", + "fetch": { + "type": "git", + "url": "https://github.com/russross/blackfriday", + "rev": "93622da34e54fb6529bfb7c57e710f37a8d9cbd8", + "sha256": "19y4cx4afm3fjj7w83g0wklbzqdjm7m1j5nq64l4yq8bi50y2iv2" + } + }, + { + "goPackagePath": "github.com/shurcooL/sanitized_anchor_name", + "fetch": { + "type": "git", + "url": "https://github.com/shurcooL/sanitized_anchor_name", + "rev": "10ef21a441db47d8b13ebcc5fd2310f636973c77", + "sha256": "1cnbzcf47cn796rcjpph1s64qrabhkv5dn9sbynsy7m9zdwr5f01" + } + }, + { + "goPackagePath": "github.com/xenolf/lego", + "fetch": { + "type": "git", + "url": "https://github.com/xenolf/lego", + "rev": "4c33bee13d438d72ea22be3ff806f8093fb8d072", + "sha256": "191wx4jmi2hs2m233da0c7j1l80alf2493wmnixfphwwdik7qdvw" + } + }, + { + "goPackagePath": "golang.org/x/crypto", + "fetch": { + "type": "git", + "url": "https://go.googlesource.com/crypto", + "rev": "7a1054f3ac58191481dc500077c6b060f5d6c7e5", + "sha256": "1n34nalvan3mydjzi48hxa30mz0i3zcb2rynw07s39m457ab1412" + } + }, + { + "goPackagePath": "golang.org/x/net", + "fetch": { + "type": "git", + "url": "https://go.googlesource.com/net", + "rev": "57bfaa875b96fb91b4766077f34470528d4b03e9", + "sha256": "17gfka5dv1n7v0z49clyl3h0xm5w2qcaldyyzlar6rh6l14g2dq5" + } + }, + { + "goPackagePath": "gopkg.in/natefinch/lumberjack.v2", + "fetch": { + "type": "git", + "url": "https://gopkg.in/natefinch/lumberjack.v2", + "rev": "514cbda263a734ae8caac038dadf05f8f3f9f738", + "sha256": "1v92v8vkip36l2fs6l5dpp655151hrijjc781cif658r8nf7xr82" + } + }, + { + "goPackagePath": "gopkg.in/square/go-jose.v1", + "fetch": { + "type": "git", + "url": "https://gopkg.in/square/go-jose.v1", + "rev": "e3f973b66b91445ec816dd7411ad1b6495a5a2fc", + "sha256": "18icclnws5bz4xmlyybkxl38nhvyr990h88rvp4lp9n4r1fk3lhb" + } + }, + { + "goPackagePath": "gopkg.in/yaml.v2", + "fetch": { + "type": "git", + "url": "https://gopkg.in/yaml.v2", + "rev": "e4d366fc3c7938e2958e662b4258c7a89e1f0e3e", + "sha256": "1himz6569rcgn27q6sdrwvdldx45q2spgjb5cfihgb80zww8di8x" + } + } +] \ No newline at end of file From 1f0df5f21fa038eb27e1a02ed47141d2d6fa214f Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Sun, 14 Aug 2016 14:14:11 -0400 Subject: [PATCH 042/145] jemalloc: remove symbol prefix on darwin The default darwin build added a je_ prefix to all exported symbols, and that broke downstream consumers that were not expecting the prefix, like mariadb. --- pkgs/development/libraries/jemalloc/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/jemalloc/default.nix b/pkgs/development/libraries/jemalloc/default.nix index 9b54ce48239..a332487d4ed 100644 --- a/pkgs/development/libraries/jemalloc/default.nix +++ b/pkgs/development/libraries/jemalloc/default.nix @@ -8,6 +8,11 @@ stdenv.mkDerivation rec { sha256 = "1bmdr51wxiir595k2r6z9a7rcgm42kkgnr586xir7vdcndr3pwf8"; }; + # By default, jemalloc puts a je_ prefix onto all its symbols on OSX, which + # then stops downstream builds (mariadb in particular) from detecting it. This + # option should remove the prefix and give us a working jemalloc. + configureFlags = stdenv.lib.optional stdenv.isDarwin "--with-jemalloc-prefix="; + meta = with stdenv.lib; { homepage = http://www.canonware.com/jemalloc/index.html; description = "General purpose malloc(3) implementation"; From ccd16f87d545448ad8c3b5037d191d1994226a67 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Sun, 14 Aug 2016 14:29:02 -0400 Subject: [PATCH 043/145] mariadb: re-enable jemalloc on darwin and fix impurity CMake in its usual infinite wisdom searches all over the system for java and finds the host OSX java and JNI headers. It then decides to build the connector and fails later on because we didn't actually tell Nix that we wanted java in scope. So instead, we just tell CMake that we don't want the jdbc connector. I believe it does the same with GSS, so I disable that stuff too. None of this should affect Linux, but let me know if it does somheow. --- pkgs/servers/sql/mariadb/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 76a7755f395..97b7a90892a 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -32,8 +32,8 @@ common = rec { # attributes common to both builds nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ - ncurses openssl zlib pcre - ] ++ stdenv.lib.optionals stdenv.isLinux [ jemalloc libaio systemd ] + ncurses openssl zlib pcre jemalloc + ] ++ stdenv.lib.optionals stdenv.isLinux [ libaio systemd ] ++ stdenv.lib.optionals stdenv.isDarwin [ perl fixDarwinDylibNames cctools CoreServices ]; cmakeFlags = [ @@ -49,9 +49,18 @@ common = rec { # attributes common to both builds "-DWITH_ZLIB=system" "-DWITH_SSL=system" "-DWITH_PCRE=system" + + # On Darwin without sandbox, CMake will find the system java and attempt to build with java support, but + # then it will fail during the actual build. Let's just disable the flag explicitly until someone decides + # to pass in java explicitly. This should have no effect on Linux. + "-DCONNECT_WITH_JDBC=OFF" + + # Same as above. Somehow on Darwin CMake decides that we support GSS even though we aren't provding the + # library through Nix, and then breaks later on. This should have no effect on Linux. + "-DPLUGIN_AUTH_GSSAPI=NO" + "-DPLUGIN_AUTH_GSSAPI_CLIENT=NO" ] ++ optional stdenv.isDarwin "-DCURSES_LIBRARY=${ncurses.out}/lib/libncurses.dylib" - ++ optional (!stdenv.isLinux) "-DWITH_JEMALLOC=no" # bad build at least on Darwin ; preConfigure = '' From 5524d29f1b1a9a3e6462cb51588ceb245207e72d Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 23 Jul 2016 12:23:25 +0300 Subject: [PATCH 044/145] ejabberd: 16.04 -> 16.08 --- pkgs/servers/xmpp/ejabberd/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix index b830567e303..5b4a22d562e 100644 --- a/pkgs/servers/xmpp/ejabberd/default.nix +++ b/pkgs/servers/xmpp/ejabberd/default.nix @@ -23,12 +23,12 @@ let ctlpath = lib.makeBinPath [ bash gnused gnugrep coreutils utillinux procps ]; in stdenv.mkDerivation rec { - version = "16.04"; + version = "16.08"; name = "ejabberd-${version}"; src = fetchurl { url = "http://www.process-one.net/downloads/ejabberd/${version}/${name}.tgz"; - sha256 = "1hrcswk03x5x6f6xy8sac4ihhi6jcmsfp6449k3570j39vklz5ix"; + sha256 = "0dqikg0xgph8xjvaxc9r6cyq7k7c8l5jiqr3kyhricziyak9hmdl"; }; nativeBuildInputs = [ fakegit ]; @@ -74,7 +74,7 @@ in stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "08s1j0xa65xkrqw810wzgssngs67sz722jsvj7p02v4ra8jcl31f"; + outputHash = "040l336570lwxsvlli7kqaa18pz92jbf9105mx394ib62z72vvlp"; }; configureFlags = @@ -95,6 +95,7 @@ in stdenv.mkDerivation rec { preBuild = '' cp -r $deps deps chmod -R +w deps + patchShebangs deps ''; postInstall = '' From 0f59901b57eb2ac9e3bb43b252415657b9a98277 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Fri, 12 Aug 2016 04:31:02 +0300 Subject: [PATCH 045/145] ejabberd service: move service to foreground --- .../modules/services/networking/ejabberd.nix | 29 ++++++++----------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/nixos/modules/services/networking/ejabberd.nix b/nixos/modules/services/networking/ejabberd.nix index 8ecc16257db..82ed7fc4a83 100644 --- a/nixos/modules/services/networking/ejabberd.nix +++ b/nixos/modules/services/networking/ejabberd.nix @@ -111,10 +111,10 @@ in { description = "ejabberd server"; wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; - path = [ pkgs.findutils pkgs.coreutils ] ++ lib.optional cfg.imagemagick pkgs.imagemagick; + path = [ pkgs.findutils pkgs.coreutils pkgs.runit ] ++ lib.optional cfg.imagemagick pkgs.imagemagick; serviceConfig = { - Type = "forking"; + ExecStart = ''${ectl} foreground''; # FIXME: runit is used for `chpst` -- can we get rid of this? ExecStop = ''${pkgs.runit}/bin/chpst -u "${cfg.user}:${cfg.group}" ${ectl} stop''; ExecReload = ''${pkgs.runit}/bin/chpst -u "${cfg.user}:${cfg.group}" ${ectl} reload_config''; @@ -132,29 +132,24 @@ in { mkdir -p -m750 "${cfg.spoolDir}" chown -R "${cfg.user}:${cfg.group}" "${cfg.spoolDir}" + + if [ -z "$(ls -A '${cfg.spoolDir}')" ]; then + touch "${cfg.spoolDir}/.firstRun" + fi ''; - script = '' - [ -z "$(ls -A '${cfg.spoolDir}')" ] && firstRun=1 - - ${ectl} start - - count=0 + postStart = '' while ! ${ectl} status >/dev/null 2>&1; do - if [ $count -eq 30 ]; then - echo "ejabberd server hasn't started in 30 seconds, giving up" - exit 1 - fi - - count=$((count++)) - sleep 1 + if ! kill -0 "$MAINPID"; then exit 1; fi + sleep 0.1 done - if [ -n "$firstRun" ]; then + if [ -e "${cfg.spoolDir}/.firstRun" ]; then + rm "${cfg.spoolDir}/.firstRun" for src in ${dumps}; do find "$src" -type f | while read dump; do echo "Loading configuration dump at $dump" - ${ectl} load "$dump" + chpst -u "${cfg.user}:${cfg.group}" ${ectl} load "$dump" done done fi From bd8217a2bca0c55b47140f936b42ffe3ff7cefd9 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 13 Aug 2016 03:20:44 +0300 Subject: [PATCH 046/145] logmein-hamachi: 2.1.0.139 -> 2.1.0.165 --- pkgs/tools/networking/logmein-hamachi/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/networking/logmein-hamachi/default.nix b/pkgs/tools/networking/logmein-hamachi/default.nix index 28fb39db571..7b441c72cbf 100644 --- a/pkgs/tools/networking/logmein-hamachi/default.nix +++ b/pkgs/tools/networking/logmein-hamachi/default.nix @@ -10,16 +10,17 @@ let else if stdenv.system == "i686-linux" then "x86" else abort "Unsupported architecture"; sha256 = - if stdenv.system == "x86_64-linux" then "1j9sba5prpihlmxr98ss3vls2qjfc6hypzlakr1k97z0a8433nif" - else if stdenv.system == "i686-linux" then "100x6gib2np72wrvcn1yhdyn4fplf5x8xm4x0g77izyfdb3yjg8h" + if stdenv.system == "x86_64-linux" then "0l8y8z8fqvxrypx3dp83mm3qr9shgpcn5h7x2k2z13gp4aq0yw6g" + else if stdenv.system == "i686-linux" then "00nl442k4pij9fm8inlk4qrcvbnz55fbwf3sm3dgbzvd5jcgsa0f" else abort "Unsupported architecture"; libraries = stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]; in stdenv.mkDerivation rec { - name = "logmein-hamachi-2.1.0.139"; + name = "logmein-hamachi-${version}"; + version = "2.1.0.165"; src = fetchurl { - url = "https://secure.logmein.com/labs/${name}-${arch}.tgz"; + url = "https://www.vpn.net/installers/${name}-${arch}.tgz"; inherit sha256; }; @@ -37,7 +38,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A hosted VPN service that lets you securely extend LAN-like networks to distributed teams"; - homepage = https://secure.logmein.com/products/hamachi/; + homepage = "https://secure.logmein.com/products/hamachi/"; license = licenses.unfreeRedistributable; maintainers = with maintainers; [ abbradar ]; platforms = platforms.linux; From 8f62339911e57a5492e750b1d2275b4900306d64 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 13 Aug 2016 03:01:54 +0300 Subject: [PATCH 047/145] yed: 3.15.0.2 -> 3.16.1 --- pkgs/applications/graphics/yed/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix index 0dad1238876..afb48c697b5 100644 --- a/pkgs/applications/graphics/yed/default.nix +++ b/pkgs/applications/graphics/yed/default.nix @@ -1,12 +1,13 @@ { stdenv, fetchurl, requireFile, makeWrapper, unzip, jre }: stdenv.mkDerivation rec { - name = "yEd-3.15.0.2"; + name = "yEd-${version}"; + version = "3.16.1"; src = requireFile { name = "${name}.zip"; url = "https://www.yworks.com/en/products/yfiles/yed/"; - sha256 = "c60e4868f267303ee8b6fc2587beb4cc846f32bd8a6a557b77e01f0d8039aa4d"; + sha256 = "0h7ykcpvsikjfap51hpcz6z814riiwyps585j2i1yv9dmsbqdi7j"; }; nativeBuildInputs = [ unzip makeWrapper ]; From 503eefa412086e2849db0ed652df62d7a9a065ba Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 13 Aug 2016 03:02:34 +0300 Subject: [PATCH 048/145] octoprint: 1.12.10 -> 1.12.15 --- pkgs/applications/misc/octoprint/default.nix | 35 +++++++++++--------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index 3178ea5684d..b39b73c830f 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -2,41 +2,44 @@ pythonPackages.buildPythonApplication rec { name = "OctoPrint-${version}"; - version = "1.2.10"; + version = "1.2.15"; src = fetchFromGitHub { owner = "foosel"; repo = "OctoPrint"; rev = version; - sha256 = "1ips1083c4qrfnkssvp1lxrs92svlid29l225ifsymrinpbjawav"; + sha256 = "0qfragp7n8m7l5l30s5fz1x7xzini2sdh2y3m1ahs7ay8zp4xk56"; }; # We need old Tornado propagatedBuildInputs = with pythonPackages; [ - awesome-slugify flask_assets watchdog rsa requests2 pkginfo pylru - semantic-version flask_principal sarge tornado_4_0_1 werkzeug netaddr flaskbabel - netifaces psutil pyserial flask_login pyyaml sockjs-tornado + awesome-slugify flask_assets rsa requests2 pkginfo watchdog + semantic-version flask_principal werkzeug flaskbabel tornado_4_0_1 + psutil pyserial flask_login netaddr markdown sockjs-tornado + pylru pyyaml sarge feedparser netifaces ]; + # Jailbreak dependencies. + # Currently broken for new: tornado, pyserial, flask_login postPatch = '' - # Jailbreak dependencies sed -i \ - -e 's,rsa==,rsa>=,g' \ - -e 's,sockjs-tornado==,sockjs-tornado>=,g' \ - -e 's,Flask-Principal==,Flask-Principal>=,g' \ - -e 's,werkzeug==,werkzeug>=,g' \ - -e 's,netaddr==,netaddr>=,g' \ - -e 's,requests==,requests>=,g' \ - -e 's,netifaces==,netifaces>=,g' \ - -e 's,psutil==,psutil>=,g' \ - -e 's,PyYAML==,PyYAML>=,g' \ + -e 's,werkzeug>=[^"]*,werkzeug,g' \ + -e 's,requests>=[^"]*,requests,g' \ + -e 's,pkginfo>=[^"]*,pkginfo,g' \ + -e 's,semantic_version>=[^"]*,semantic_version,g' \ + -e 's,psutil>=[^"]*,psutil,g' \ + -e 's,Flask-Babel>=[^"]*,Flask-Babel,g' \ + -e 's,Flask-Principal>=[^"]*,Flask-Principal,g' \ + -e 's,markdown>=[^"]*,markdown,g' \ + -e 's,Flask-Assets>=[^"]*,Flask-Assets,g' \ + -e 's,rsa>=[^"]*,rsa,g' \ + -e 's,PyYAML>=[^"]*,PyYAML,g' \ setup.py ''; meta = with stdenv.lib; { homepage = "http://octoprint.org/"; description = "The snappy web interface for your 3D printer"; - platforms = platforms.all; license = licenses.agpl3; maintainers = with maintainers; [ abbradar ]; }; From 909094a3ce5e33ac3e0efe05e7878e81331e92ea Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 13 Aug 2016 03:04:10 +0300 Subject: [PATCH 049/145] octoprint-plugins.m3d-fio: 0.32 -> 1.5 --- .../0001-Don-t-use-static-library.patch | 113 ------------ .../misc/octoprint/m33-fio-one-library.patch | 161 ++++++++++++++++++ pkgs/applications/misc/octoprint/plugins.nix | 139 +++++++-------- 3 files changed, 233 insertions(+), 180 deletions(-) delete mode 100644 pkgs/applications/misc/octoprint/0001-Don-t-use-static-library.patch create mode 100644 pkgs/applications/misc/octoprint/m33-fio-one-library.patch diff --git a/pkgs/applications/misc/octoprint/0001-Don-t-use-static-library.patch b/pkgs/applications/misc/octoprint/0001-Don-t-use-static-library.patch deleted file mode 100644 index 54116b80a6e..00000000000 --- a/pkgs/applications/misc/octoprint/0001-Don-t-use-static-library.patch +++ /dev/null @@ -1,113 +0,0 @@ -From 0be3198cccf753226758684955f49a32d8d920c0 Mon Sep 17 00:00:00 2001 -From: Nikolay Amiantov -Date: Wed, 17 Feb 2016 14:37:31 +0300 -Subject: [PATCH] Don't use static library - ---- - octoprint_m3dfio/__init__.py | 67 +----------------------------------------- - shared library source/Makefile | 6 ++-- - 2 files changed, 5 insertions(+), 68 deletions(-) - -diff --git a/octoprint_m3dfio/__init__.py b/octoprint_m3dfio/__init__.py -index a2ca533..43f178a 100644 ---- a/octoprint_m3dfio/__init__.py -+++ b/octoprint_m3dfio/__init__.py -@@ -793,72 +793,7 @@ class M3DFioPlugin( - # Set file locations - self.setFileLocations() - -- # Check if running on Linux -- if platform.uname()[0].startswith("Linux") : -- -- # Check if running on a Raspberry Pi 1 -- if platform.uname()[4].startswith("armv6l") and self.getCpuHardware() == "BCM2708" : -- -- # Set shared library -- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_arm1176jzf-s.so") -- -- # Otherwise check if running on a Raspberry Pi 2 or Raspberry Pi 3 -- elif platform.uname()[4].startswith("armv7l") and self.getCpuHardware() == "BCM2709" : -- -- # Set shared library -- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_arm_cortex-a7.so") -- -- # Otherwise check if running on an ARM7 device -- elif platform.uname()[4].startswith("armv7") : -- -- # Set shared library -- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_arm7.so") -- -- # Otherwise check if using an i386 or x86-64 device -- elif platform.uname()[4].endswith("86") or platform.uname()[4].endswith("64") : -- -- # Check if Python is running as 32-bit -- if platform.architecture()[0].startswith("32") : -- -- # Set shared library -- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_i386.so") -- -- # Otherwise check if Python is running as 64-bit -- elif platform.architecture()[0].startswith("64") : -- -- # Set shared library -- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_x86-64.so") -- -- # Otherwise check if running on Windows and using an i386 or x86-64 device -- elif platform.uname()[0].startswith("Windows") and (platform.uname()[4].endswith("86") or platform.uname()[4].endswith("64")) : -- -- # Check if Python is running as 32-bit -- if platform.architecture()[0].startswith("32") : -- -- # Set shared library -- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_i386.dll") -- -- # Otherwise check if Python is running as 64-bit -- elif platform.architecture()[0].startswith("64") : -- -- # Set shared library -- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_x86-64.dll") -- -- # Otherwise check if running on OS X and using an i386 or x86-64 device -- elif platform.uname()[0].startswith("Darwin") and (platform.uname()[4].endswith("86") or platform.uname()[4].endswith("64")) : -- -- # Check if Python is running as 32-bit -- if platform.architecture()[0].startswith("32") : -- -- # Set shared library -- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_i386.dylib") -- -- # Otherwise check if Python is running as 64-bit -- elif platform.architecture()[0].startswith("64") : -- -- # Set shared library -- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_x86-64.dylib") -- -+ self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/../../../libpreprocessor.so") - # Check if shared library was set - if self.sharedLibrary : - -diff --git a/shared library source/Makefile b/shared library source/Makefile -index 9d015a1..a24f134 100644 ---- a/shared library source/Makefile -+++ b/shared library source/Makefile -@@ -58,13 +58,15 @@ ifeq ($(TARGET_PLATFORM), OSX64) - CFLAGS = -fPIC -m64 -stdlib=libc++ -O3 -Wl,-install_name,$(PROG)$(VER) - endif - -+PROG = lib$(LIBRARY_NAME).so -+CC = g++ - SRCS = preprocessor.cpp gcode.cpp vector.cpp --CFLAGS += -Wall -std=c++11 -fvisibility=hidden -shared -+CFLAGS = -O3 -fPIC -Wall -std=c++11 -fvisibility=hidden -shared - - all: $(PROG) - - $(PROG): $(SRCS) -- $(CC) $(CFLAGS) -o ../octoprint_m3dfio/static/libraries/$(PROG) $(SRCS) -+ $(CC) $(CFLAGS) -o $(PROG) $(SRCS) - - clean: - rm -f ../octoprint_m3dfio/static/libraries/$(PROG) --- -2.7.1 - diff --git a/pkgs/applications/misc/octoprint/m33-fio-one-library.patch b/pkgs/applications/misc/octoprint/m33-fio-one-library.patch new file mode 100644 index 00000000000..968983696fe --- /dev/null +++ b/pkgs/applications/misc/octoprint/m33-fio-one-library.patch @@ -0,0 +1,161 @@ +From 62b4fabd1d4ee7a584a565d48c7eaec6e80fe0bd Mon Sep 17 00:00:00 2001 +From: Nikolay Amiantov +Date: Fri, 12 Aug 2016 23:41:22 +0300 +Subject: [PATCH] Build and use one version of preprocessor library + +--- + octoprint_m33fio/__init__.py | 66 +----------------------------------------- + shared library source/Makefile | 59 +++---------------------------------- + 2 files changed, 5 insertions(+), 120 deletions(-) + +diff --git a/octoprint_m33fio/__init__.py b/octoprint_m33fio/__init__.py +index da539f5..b0a17ad 100755 +--- a/octoprint_m33fio/__init__.py ++++ b/octoprint_m33fio/__init__.py +@@ -979,71 +979,7 @@ class M33FioPlugin( + # Check if using shared library or checking if it is usable + if self._settings.get_boolean(["UseSharedLibrary"]) or isUsable : + +- # Check if running on Linux +- if platform.uname()[0].startswith("Linux") : +- +- # Check if running on a Raspberry Pi 1 +- if platform.uname()[4].startswith("armv6l") and self.getCpuHardware() == "BCM2708" : +- +- # Set shared library +- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_arm1176jzf-s.so") +- +- # Otherwise check if running on a Raspberry Pi 2 or Raspberry Pi 3 +- elif platform.uname()[4].startswith("armv7l") and self.getCpuHardware() == "BCM2709" : +- +- # Set shared library +- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_arm_cortex-a7.so") +- +- # Otherwise check if running on an ARM7 device +- elif platform.uname()[4].startswith("armv7") : +- +- # Set shared library +- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_arm7.so") +- +- # Otherwise check if using an i386 or x86-64 device +- elif platform.uname()[4].endswith("86") or platform.uname()[4].endswith("64") : +- +- # Check if Python is running as 32-bit +- if platform.architecture()[0].startswith("32") : +- +- # Set shared library +- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_i386.so") +- +- # Otherwise check if Python is running as 64-bit +- elif platform.architecture()[0].startswith("64") : +- +- # Set shared library +- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_x86-64.so") +- +- # Otherwise check if running on Windows and using an i386 or x86-64 device +- elif platform.uname()[0].startswith("Windows") and (platform.uname()[4].endswith("86") or platform.uname()[4].endswith("64")) : +- +- # Check if Python is running as 32-bit +- if platform.architecture()[0].startswith("32") : +- +- # Set shared library +- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_i386.dll") +- +- # Otherwise check if Python is running as 64-bit +- elif platform.architecture()[0].startswith("64") : +- +- # Set shared library +- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_x86-64.dll") +- +- # Otherwise check if running on OS X and using an i386 or x86-64 device +- elif platform.uname()[0].startswith("Darwin") and (platform.uname()[4].endswith("86") or platform.uname()[4].endswith("64")) : +- +- # Check if Python is running as 32-bit +- if platform.architecture()[0].startswith("32") : +- +- # Set shared library +- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_i386.dylib") +- +- # Otherwise check if Python is running as 64-bit +- elif platform.architecture()[0].startswith("64") : +- +- # Set shared library +- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_x86-64.dylib") ++ self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/libpreprocessor.so") + + # Check if shared library was set + if self.sharedLibrary : +diff --git a/shared library source/Makefile b/shared library source/Makefile +index a43d657..0b254aa 100755 +--- a/shared library source/Makefile ++++ b/shared library source/Makefile +@@ -1,62 +1,11 @@ + # Target platform options: LINUX32, LINUX64, WINDOWS32, WINDOWS64, PI, PI2, ARM7, OSX32, OSX64 +-LIBRARY_NAME = preprocessor ++LIBRARY_NAME = libpreprocessor + TARGET_PLATFORM = LINUX64 + VER = .1 + +-ifeq ($(TARGET_PLATFORM), LINUX32) +- PROG = $(LIBRARY_NAME)_i386.so +- CC = g++ +- CFLAGS = -fPIC -m32 -static-libgcc -O3 -Wl,-soname,$(PROG)$(VER) -static-libstdc++ +-endif +- +-ifeq ($(TARGET_PLATFORM), LINUX64) +- PROG = $(LIBRARY_NAME)_x86-64.so +- CC = g++ +- CFLAGS = -fPIC -m64 -static-libgcc -O3 -Wl,-soname,$(PROG)$(VER) -static-libstdc++ +-endif +- +-ifeq ($(TARGET_PLATFORM), WINDOWS32) +- PROG = $(LIBRARY_NAME)_i386.dll +- CC = i686-w64-mingw32-g++ +- CFLAGS = -static-libgcc -O3 -Wl,-soname,$(PROG)$(VER) -static-libstdc++ +-endif +- +-ifeq ($(TARGET_PLATFORM), WINDOWS64) +- PROG = $(LIBRARY_NAME)_x86-64.dll +- CC = x86_64-w64-mingw32-g++ +- CFLAGS = -static-libgcc -O3 -Wl,-soname,$(PROG)$(VER) -static-libstdc++ +-endif +- +-ifeq ($(TARGET_PLATFORM), PI) +- PROG = $(LIBRARY_NAME)_arm1176jzf-s.so +- CC = ~/tools/arm-bcm2708/arm-rpi-4.9.3-linux-gnueabihf/bin/arm-linux-gnueabihf-g++ +- CFLAGS = -fPIC -mcpu=arm1176jzf-s -mfpu=vfp -mfloat-abi=hard -static-libgcc -O3 -Wl,-soname,$(PROG)$(VER) -static-libstdc++ +-endif +- +-ifeq ($(TARGET_PLATFORM), PI2) +- PROG = $(LIBRARY_NAME)_arm_cortex-a7.so +- CC = ~/tools/arm-bcm2708/arm-rpi-4.9.3-linux-gnueabihf/bin/arm-linux-gnueabihf-g++ +- CFLAGS = -fPIC -mcpu=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard -static-libgcc -O3 -Wl,-soname,$(PROG)$(VER) -static-libstdc++ +-endif +- +-ifeq ($(TARGET_PLATFORM), ARM7) +- PROG = $(LIBRARY_NAME)_arm7.so +- CC = ~/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin/arm-linux-gnueabihf-g++ +- CFLAGS = -fPIC -mcpu=generic-armv7-a -mfpu=vfp -mfloat-abi=hard -static-libgcc -O3 -Wl,-soname,$(PROG)$(VER) -static-libstdc++ +-endif +- +-ifeq ($(TARGET_PLATFORM), OSX32) +- PROG = $(LIBRARY_NAME)_i386.dylib +- CC = clang++ +- CFLAGS = -fPIC -m32 -stdlib=libc++ -O3 -Wl,-install_name,$(PROG)$(VER) +- +-endif +- +-ifeq ($(TARGET_PLATFORM), OSX64) +- PROG = $(LIBRARY_NAME)_x86-64.dylib +- CC = clang++ +- CFLAGS = -fPIC -m64 -stdlib=libc++ -O3 -Wl,-install_name,$(PROG)$(VER) +-endif ++PROG = $(LIBRARY_NAME).so ++CC = g++ ++CFLAGS = -fPIC -O3 -Wl,-soname,$(PROG)$(VER) + + SRCS = preprocessor.cpp gcode.cpp vector.cpp + CFLAGS += -Wall -std=c++11 -fvisibility=hidden -shared +-- +2.9.2 + diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index 852ec5b444d..3c07bfa80e8 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -4,79 +4,84 @@ let buildPlugin = args: pythonPackages.buildPythonApplication (args // { buildInputs = (args.buildInputs or []) ++ [ octoprint ]; }); -in { - m3d-fio = buildPlugin rec { - name = "M3D-Fio-${version}"; - version = "0.32"; + self = { - src = fetchFromGitHub { - owner = "donovan6000"; - repo = "M3D-Fio"; - rev = "V${version}"; - sha256 = "1s15nx6v56yjwd88b19fx0gk1l0abp76nz10yicspdn91fpr1sf4"; + # Deprecated alias + m3d-fio = self.m33-fio; # added 2016-08-13 + + m33-fio = buildPlugin rec { + name = "M33-Fio-${version}"; + version = "1.5"; + + src = fetchFromGitHub { + owner = "donovan6000"; + repo = "M33-Fio"; + rev = "V${version}"; + sha256 = "0ss8ic9l5srb5wj2mj0qafam0z4d6zv0cixhxgghh03fp0lvwjyq"; + }; + + patches = [ + ./m33-fio-one-library.patch + ]; + + postPatch = '' + rm -rf octoprint_m33fio/static/libraries/* + ( + cd 'shared library source' + make + ) + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/donovan6000/M3D-Fio"; + description = "OctoPrint plugin for the Micro 3D printer"; + platforms = platforms.all; + license = licenses.gpl3; + maintainers = with maintainers; [ abbradar ]; + }; }; - patches = [ - ./0001-Don-t-use-static-library.patch - ]; + titlestatus = buildPlugin rec { + name = "OctoPrint-TitleStatus-${version}"; + version = "0.0.4"; - postInstall = '' - ( - cd 'shared library source' - make - install -Dm755 libpreprocessor.so $out/lib/libpreprocessor.so - ) - rm -rf $out/${pythonPackages.python.sitePackages}/octoprint_m3dfio/static/libraries - ''; + src = fetchFromGitHub { + owner = "MoonshineSG"; + repo = "OctoPrint-TitleStatus"; + rev = version; + sha256 = "1l78xrabn5hcly2mgxwi17nwgnp2s6jxi9iy4wnw8k8icv74ag7k"; + }; - meta = with stdenv.lib; { - homepage = "https://github.com/donovan6000/M3D-Fio"; - description = "OctoPrint plugin for the Micro 3D printer"; - platforms = platforms.all; - license = licenses.gpl3; - maintainers = with maintainers; [ abbradar ]; + meta = with stdenv.lib; { + homepage = "https://github.com/MoonshineSG/OctoPrint-TitleStatus"; + description = "Show printers status in window title"; + platforms = platforms.all; + license = licenses.agpl3; + maintainers = with maintainers; [ abbradar ]; + }; }; + + stlviewer = buildPlugin rec { + name = "OctoPrint-STLViewer-${version}"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "jneilliii"; + repo = "OctoPrint-STLViewer"; + rev = "v${version}"; + sha256 = "1a6sa8pw9ay7x27pfwr3nzb22x3jaw0c9vwyz4mrj76zkiw6svfi"; + }; + + meta = with stdenv.lib; { + homepage = "https://github.com/jneilliii/Octoprint-STLViewer"; + description = "A simple stl viewer tab for OctoPrint"; + platforms = platforms.all; + license = licenses.agpl3; + maintainers = with maintainers; [ abbradar ]; + }; + }; + }; - titlestatus = buildPlugin rec { - name = "OctoPrint-TitleStatus-${version}"; - version = "0.0.4"; - - src = fetchFromGitHub { - owner = "MoonshineSG"; - repo = "OctoPrint-TitleStatus"; - rev = version; - sha256 = "1l78xrabn5hcly2mgxwi17nwgnp2s6jxi9iy4wnw8k8icv74ag7k"; - }; - - meta = with stdenv.lib; { - homepage = https://github.com/MoonshineSG/OctoPrint-TitleStatus; - description = "Show printers status in window title"; - platforms = platforms.all; - license = licenses.agpl3; - maintainers = with maintainers; [ abbradar ]; - }; - }; - - stlviewer = buildPlugin rec { - name = "OctoPrint-STLViewer-${version}"; - version = "0.3.0"; - - src = fetchFromGitHub { - owner = "jneilliii"; - repo = "OctoPrint-STLViewer"; - rev = "v${version}"; - sha256 = "1a6sa8pw9ay7x27pfwr3nzb22x3jaw0c9vwyz4mrj76zkiw6svfi"; - }; - - meta = with stdenv.lib; { - homepage = https://github.com/jneilliii/Octoprint-STLViewer; - description = "A simple stl viewer tab for OctoPrint"; - platforms = platforms.all; - license = licenses.agpl3; - maintainers = with maintainers; [ abbradar ]; - }; - }; - -} +in self From 9e7f77a6341e8dd221b54698e72575c5e86a0f1b Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 13 Aug 2016 03:05:48 +0300 Subject: [PATCH 050/145] urxvt_tabbedex: 2015-03-03 -> 2016-08-09 --- .../urxvt-tabbedex/default.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix index 5dc6ed65070..901afab78bc 100644 --- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix +++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix @@ -1,17 +1,18 @@ -{ stdenv, fetchgit }: +{ stdenv, fetchFromGitHub, perl }: stdenv.mkDerivation { - name = "urxvt-tabbedex-2015-03-03"; + name = "urxvt-tabbedex-2016-08-09"; - src = fetchgit { - url = "https://github.com/mina86/urxvt-tabbedex"; - rev = "b0a02018b1cbaaba2a0c8ea7af9368db0adf3363"; - sha256 = "f0025f2741d424736620147d9fc39faac68193cb9f74bde0fb6e02a6f1ae61c3"; + src = fetchFromGitHub { + owner = "mina86"; + repo = "urxvt-tabbedex"; + rev = "ac220eb3984e151ba14dce08f446bc7bc8ca29a2"; + sha256 = "1b5mff5137jb5ysklsmfp5ql3m4g1z3bdhk0nwhz2hgwz40ap6k8"; }; - installPhase = '' - install -D tabbedex $out/lib/urxvt/perl/tabbedex - ''; + nativeBuildInputs = [ perl ]; + + installFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { description = "Tabbed plugin for rxvt-unicode with many enhancements (mina86's fork)"; From 86f3595cfe9628c98971f344b5d81d64bb4c5d5d Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 13 Aug 2016 03:07:07 +0300 Subject: [PATCH 051/145] tdesktop: 0.9.56 -> 0.10.1 --- .../telegram/tdesktop/default.nix | 31 +++++-------------- 1 file changed, 8 insertions(+), 23 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 461e755505c..130fe644143 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -16,20 +16,20 @@ let in stdenv.mkDerivation rec { name = "telegram-desktop-${version}"; - version = "0.9.56"; + version = "0.10.1"; qtVersion = lib.replaceStrings ["."] ["_"] packagedQt; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${version}"; - sha256 = "000ngg6arfb6mif0hvin099f83q3sn7mw4vfvrikskczblw3a5lc"; + sha256 = "08isxwif6zllglkpd9i7ypxm2s4bibzqris48607bafr88ylksdk"; }; tgaur = fetchgit { url = "https://aur.archlinux.org/telegram-desktop.git"; - rev = "f8907d1ccaf8345c06232238342921213270e3d8"; - sha256 = "04jh0fsrh4iwg188d20z15qkxv05wa5lpd8h21yxx3jxqljpdkws"; + rev = "9ce7be9efed501f988bb099956fa63729f2c25ea"; + sha256 = "1wp6lqscpm2byizchm0bj48dg9bga02r9r69ns10zxk0gk0qvvdn"; }; buildInputs = [ @@ -50,22 +50,8 @@ in stdenv.mkDerivation rec { "CONFIG+=release" "DEFINES+=TDESKTOP_DISABLE_AUTOUPDATE" "DEFINES+=TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME" - "INCLUDEPATH+=${gtk2.dev}/include/gtk-2.0" - "INCLUDEPATH+=${glib.dev}/include/glib-2.0" - "INCLUDEPATH+=${glib.out}/lib/glib-2.0/include" - "INCLUDEPATH+=${cairo.dev}/include/cairo" - "INCLUDEPATH+=${pango.dev}/include/pango-1.0" - "INCLUDEPATH+=${gtk2.out}/lib/gtk-2.0/include" - "INCLUDEPATH+=${gdk_pixbuf.dev}/include/gdk-pixbuf-2.0" - "INCLUDEPATH+=${atk.dev}/include/atk-1.0" - "INCLUDEPATH+=${libappindicator-gtk2}/include/libappindicator-0.1" - "INCLUDEPATH+=${libunity}/include/unity" - "INCLUDEPATH+=${dee}/include/dee-1.0" - "INCLUDEPATH+=${libdbusmenu-glib}/include/libdbusmenu-glib-0.4" "INCLUDEPATH+=${breakpad}/include/breakpad" "QT_TDESKTOP_VERSION=${systemQt}" - "LIBS+=-lcrypto" - "LIBS+=-lssl" ]; qtSrcs = [ qtbase.src qtimageformats.src ]; @@ -79,11 +65,10 @@ in stdenv.mkDerivation rec { sed -i 'Telegram/Telegram.pro' \ -e 's,CUSTOM_API_ID,,g' \ -e 's,/usr,/does-not-exist,g' \ - -e '/LIBS += .*libxkbcommon.a/d' \ - -e 's,LIBS += .*libz.a,LIBS += -lz,' \ - -e 's,LIBS += .*libbreakpad_client.a,LIBS += ${breakpad}/lib/libbreakpad_client.a,' \ -e 's, -flto,,g' \ - -e 's, -static-libstdc++,,g' + -e 's,LIBS += .*libbreakpad_client.a,LIBS += ${breakpad}/lib/libbreakpad_client.a,' \ + -e 's, -static-libstdc++,,g' \ + -e '/LIBS += .*libxkbcommon.a/d' export qmakeFlags="$qmakeFlags QT_TDESKTOP_PATH=$PWD/../qt" @@ -105,7 +90,7 @@ in stdenv.mkDerivation rec { export configureFlags="-prefix "$PWD/../qt" -release -opensource -confirm-license -system-zlib \ -system-libpng -system-libjpeg -system-freetype -system-harfbuzz -system-pcre -system-xcb \ -system-xkbcommon-x11 -no-opengl -static -nomake examples -nomake tests \ - -openssl-linked -dbus-linked -system-sqlite -verbose \ + -openssl-linked -dbus-linked -system-sqlite -verbose -no-gtkstyle \ ${lib.optionalString (!system-x86_64) "-no-sse2"} -no-sse3 -no-ssse3 \ -no-sse4.1 -no-sse4.2 -no-avx -no-avx2 -no-mips_dsp -no-mips_dspr2" export dontAddPrefix=1 From 423504d0fd919726ea77bbe05a4c6a326844827a Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 13 Aug 2016 03:07:33 +0300 Subject: [PATCH 052/145] emojione: 1.2 -> 1.3 --- pkgs/data/fonts/emojione/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/emojione/default.nix b/pkgs/data/fonts/emojione/default.nix index 3e74ca9270a..e19734c1913 100644 --- a/pkgs/data/fonts/emojione/default.nix +++ b/pkgs/data/fonts/emojione/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "emojione-${version}"; - version = "1.2"; + version = "1.3"; src = fetchFromGitHub { owner = "eosrei"; repo = "emojione-color-font"; rev = "v${version}"; - sha256 = "001c2bph4jcdg9arfmyxrscf1i09gvg44kqy28chjmhxzq99hpcg"; + sha256 = "0hgs661g1j91lkafhrfx5ix7ymarh5bzcx34r2id6jl7dc3j41l3"; }; preBuild = '' From f54188e65993422004135ec83ce4773270dc90a7 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 13 Aug 2016 03:07:51 +0300 Subject: [PATCH 053/145] cppzmq: 2016-01-20 -> 2016-07-18 --- pkgs/development/libraries/cppzmq/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/cppzmq/default.nix b/pkgs/development/libraries/cppzmq/default.nix index 62563cfb968..9da83ca913e 100644 --- a/pkgs/development/libraries/cppzmq/default.nix +++ b/pkgs/development/libraries/cppzmq/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "cppzmq-${version}"; - version = "2016-01-20"; + version = "2016-07-18"; src = fetchFromGitHub { owner = "zeromq"; repo = "cppzmq"; - rev = "68a7b09cfce01c4c279fba2cf91686fcfc566848"; - sha256 = "00dsqqlm8mxhm8kfdspxfln0wzwkyywscnf264afw02k6xf28ndm"; + rev = "92d2af6def80a01b76d5e73f073c439ad00ab757"; + sha256 = "0lnwh314hh5ifad2sa2nz1g1ld1jc4vplm7clyvx304sjjvbvl27"; }; installPhase = '' From 552f63ab8eae21e7ac6576dc47bd58f5198e947a Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 13 Aug 2016 03:08:10 +0300 Subject: [PATCH 054/145] folly: 2016-04-29 -> 2016.08.08.00 --- pkgs/development/libraries/folly/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index dc07c481b10..f4ab12e3c7f 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, boost, libevent, double_conversion, glog -, google-gflags, python, libiberty, openssl }: +{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkgconfig, boost, libevent +, double_conversion, glog, google-gflags, python, libiberty, openssl }: stdenv.mkDerivation rec { name = "folly-${version}"; - version = "2016-04-29"; + version = "2016.08.08.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; - rev = "b31eb722e444ab0293a73fe9de3f94e657ca6de9"; - sha256 = "0s95y0wnz4xbrkzbiksnb0n0d0qrkcsbssznng57kwlq8jlfka24"; + rev = "v${version}"; + sha256 = "0f9xdi8w2mbn6gxjfvpzh8i22ca8p11a2ss6qkw31yhdgd3s9087"; }; - nativeBuildInputs = [ autoreconfHook python ]; + nativeBuildInputs = [ autoreconfHook python pkgconfig ]; buildInputs = [ libiberty boost libevent double_conversion glog google-gflags openssl ]; postPatch = "cd folly"; From 9fea2698c0a029f01de859589b31c0793b6243bf Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 13 Aug 2016 03:08:33 +0300 Subject: [PATCH 055/145] libvdpau-va-gl: 0.3.6 -> 0.4.0 --- pkgs/development/libraries/libvdpau-va-gl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libvdpau-va-gl/default.nix b/pkgs/development/libraries/libvdpau-va-gl/default.nix index 0cbac567a45..8065df5c5b5 100644 --- a/pkgs/development/libraries/libvdpau-va-gl/default.nix +++ b/pkgs/development/libraries/libvdpau-va-gl/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "libvdpau-va-gl-${version}"; - version = "0.3.6"; + version = "0.4.0"; src = fetchFromGitHub { owner = "i-rinat"; repo = "libvdpau-va-gl"; rev = "v${version}"; - sha256 = "06lcg6zfj6mn17svz7s0y6ijdah55l9rnp9r440lcbixivjbgyn5"; + sha256 = "1y511jxs0df1fqzjcvb6zln7nbmchv1g6z3lw0z9nsf64ziycj8k"; }; nativeBuildInputs = [ cmake pkgconfig ]; From 0464600859f5979d1d82b8f3ccc885c92c887b90 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 13 Aug 2016 03:08:46 +0300 Subject: [PATCH 056/145] ipopt: 3.12.4 -> 3.12.6 --- pkgs/development/libraries/science/math/ipopt/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/science/math/ipopt/default.nix b/pkgs/development/libraries/science/math/ipopt/default.nix index f9897e4add3..9ea3a54f2b0 100644 --- a/pkgs/development/libraries/science/math/ipopt/default.nix +++ b/pkgs/development/libraries/science/math/ipopt/default.nix @@ -1,17 +1,15 @@ { stdenv, fetchurl, unzip, openblas, gfortran }: stdenv.mkDerivation rec { - version = "3.12.4"; + version = "3.12.6"; name = "ipopt-${version}"; src = fetchurl { url = "http://www.coin-or.org/download/source/Ipopt/Ipopt-${version}.zip"; - sha256 = "0hxmpi3zx5zgv2ijscdvc40xf88hx5if0d9sgch155z70g15wx0l"; + sha256 = "0lx09h1757s5jppwnxwblcjk0biqjxy7yaf3z4vfqbl4rl93avs0"; }; - preConfigure = '' - export CXXDEFS="-DHAVE_RAND -DHAVE_CSTRING -DHAVE_CSTDIO" - ''; + CXXDEFS = [ "-DHAVE_RAND" "-DHAVE_CSTRING" "-DHAVE_CSTDIO" ]; configureFlags = [ "--with-blas-lib=-lopenblas" From 0e72026f3e3a2adeb497085da509fa3e5f063f34 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 13 Aug 2016 03:09:01 +0300 Subject: [PATCH 057/145] xgboost: 2016-05-14 -> 0.60 --- pkgs/development/libraries/xgboost/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/xgboost/default.nix b/pkgs/development/libraries/xgboost/default.nix index 4ba366be56f..bdc21d72ac3 100644 --- a/pkgs/development/libraries/xgboost/default.nix +++ b/pkgs/development/libraries/xgboost/default.nix @@ -2,17 +2,15 @@ stdenv.mkDerivation rec { name = "xgboost-${version}"; - version = "2016-05-14"; + version = "0.60"; # needs submodules src = fetchgit { url = "https://github.com/dmlc/xgboost"; - rev = "9c26566eb09733423f821f139938ff4105c3775d"; - sha256 = "1d7lnbwxwakclqqfjwyk9w3wd2clkihdr6ljs5z08ydiaspri093"; + rev = "refs/tags/v${version}"; + sha256 = "0536vfl59n9vlagl1cpdl06c9y19dscwhwdzvi27zk5nc5qb6rdq"; }; - postPatch = "sed '1i#include ' -i src/tree/param.h"; - enableParallelBuilding = true; installPhase = '' From 309de1364a3f41b56f772384bffd65a5b81f604c Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 13 Aug 2016 03:09:22 +0300 Subject: [PATCH 058/145] crawl: 0.18.0 -> 0.18.1 --- pkgs/games/crawl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix index 32f9afaacf2..edaa3ef1fcc 100644 --- a/pkgs/games/crawl/default.nix +++ b/pkgs/games/crawl/default.nix @@ -3,15 +3,15 @@ , tileMode ? false }: -let version = "0.18.0"; -in stdenv.mkDerivation rec { name = "crawl-${version}" + (if tileMode then "-tiles" else ""); + version = "0.18.1"; + src = fetchFromGitHub { owner = "crawl-ref"; repo = "crawl-ref"; rev = version; - sha256 = "0mgg9lzy7lp5bhp8340a6c6qyz7yiz80wb39gknls8hvv0f6i0si"; + sha256 = "1cg5mxhx0lfhadls6n8avcpkjx08nqf1y085li97zqxl3gjaj64j"; }; patches = [ ./crawl_purify.patch ]; From 0f3da549246053464db53de016cd5df0c21752e0 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 13 Aug 2016 03:11:45 +0300 Subject: [PATCH 059/145] dwarf-fortress-packages.dwarf-fortress-unfuck: 2016-04-22 -> 2016-07-13 --- pkgs/games/dwarf-fortress/default.nix | 2 +- pkgs/games/dwarf-fortress/unfuck.nix | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix index 4eab8290933..7e590f5c1a2 100644 --- a/pkgs/games/dwarf-fortress/default.nix +++ b/pkgs/games/dwarf-fortress/default.nix @@ -14,7 +14,7 @@ let }; }; - dwarf-fortress-unfuck = callPackage_i686 ./unfuck.nix { }; + dwarf-fortress-unfuck = callPackage ./unfuck.nix { }; dwarf-fortress = callPackage ./wrapper { themes = { diff --git a/pkgs/games/dwarf-fortress/unfuck.nix b/pkgs/games/dwarf-fortress/unfuck.nix index 5b2327c2ff5..5e299c5316b 100644 --- a/pkgs/games/dwarf-fortress/unfuck.nix +++ b/pkgs/games/dwarf-fortress/unfuck.nix @@ -4,17 +4,15 @@ }: stdenv.mkDerivation { - name = "dwarf_fortress_unfuck-2016-04-22"; + name = "dwarf_fortress_unfuck-2016-07-13"; src = fetchFromGitHub { owner = "svenstaro"; repo = "dwarf_fortress_unfuck"; - rev = "dde40a2c619eac119b6db1bcd0c8d8612472f866"; - sha256 = "12bqh3k4wsk1c0bz2zly8h0ilbsdmsbwr9cdjc6i7liwg9906g7i"; + rev = "d6a4ee67e7b41bec1caa87548640643db35a6080"; + sha256 = "17p7jzmwd5z54wn6bxmic0i8y8mma3q359zcy3r9x2mp2wv1yd7p"; }; - postPatch = "sed '1i#include ' -i g_src/ttf_manager.cpp"; - cmakeFlags = [ "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include" "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include" @@ -32,13 +30,13 @@ stdenv.mkDerivation { enableParallelBuilding = true; - passthru.dfVersion = "0.42.06"; + passthru.dfVersion = "0.43.05"; meta = with stdenv.lib; { description = "Unfucked multimedia layer for Dwarf Fortress"; homepage = https://github.com/svenstaro/dwarf_fortress_unfuck; license = licenses.free; - platforms = [ "i686-linux" ]; + platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; }; } From b940a098ec4f68063a825cf469d757770b7f8f3e Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 13 Aug 2016 03:10:46 +0300 Subject: [PATCH 060/145] dwarf-fortress-packages.dwarf-fortress-original: 0.42.06 -> 0.43.05 --- pkgs/games/dwarf-fortress/default.nix | 2 +- pkgs/games/dwarf-fortress/game.nix | 24 ++++++++++++++++-------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix index 7e590f5c1a2..64109279060 100644 --- a/pkgs/games/dwarf-fortress/default.nix +++ b/pkgs/games/dwarf-fortress/default.nix @@ -5,7 +5,7 @@ let callPackage_i686 = pkgsi686Linux.newScope self; self = rec { - dwarf-fortress-original = callPackage_i686 ./game.nix { }; + dwarf-fortress-original = callPackage ./game.nix { }; dfhack = callPackage_i686 ./dfhack { inherit (pkgsi686Linux.perlPackages) XMLLibXML XMLLibXSLT; diff --git a/pkgs/games/dwarf-fortress/game.nix b/pkgs/games/dwarf-fortress/game.nix index 0665075356c..740125bf442 100644 --- a/pkgs/games/dwarf-fortress/game.nix +++ b/pkgs/games/dwarf-fortress/game.nix @@ -3,10 +3,18 @@ }: let - baseVersion = "42"; - patchVersion = "06"; + baseVersion = "43"; + patchVersion = "05"; dfVersion = "0.${baseVersion}.${patchVersion}"; libpath = lib.makeLibraryPath [ stdenv.cc.cc stdenv.glibc dwarf-fortress-unfuck SDL ]; + platform = + if stdenv.system == "x86_64-linux" then "linux" + else if stdenv.system == "i686-linux" then "linux32" + else throw "Unsupported platform"; + sha256 = + if stdenv.system == "x86_64-linux" then "1r0b96yrdf24m9476k5x7rmp3faxr0kfwwdf35agpvlb1qbi6v45" + else if stdenv.system == "i686-linux" then "16l1lydpkbnl3zhz4i2snmjk7pps8vmw3zv0bjgr8dncbsrycd03" + else throw "Unsupported platform"; in @@ -16,8 +24,8 @@ stdenv.mkDerivation { name = "dwarf-fortress-original-${dfVersion}"; src = fetchurl { - url = "http://www.bay12games.com/dwarves/df_${baseVersion}_${patchVersion}_linux.tar.bz2"; - sha256 = "17y9zq9xn1g0a501w4vkinb0n2yjiczsi2g7r6zggr41pxrqxpq3"; + url = "http://www.bay12games.com/dwarves/df_${baseVersion}_${patchVersion}_${platform}.tar.bz2"; + inherit sha256; }; installPhase = '' @@ -39,11 +47,11 @@ stdenv.mkDerivation { passthru = { inherit baseVersion patchVersion dfVersion; }; - meta = { + meta = with stdenv.lib; { description = "A single-player fantasy game with a randomly generated adventure world"; homepage = http://www.bay12games.com/dwarves; - license = lib.licenses.unfreeRedistributable; - platforms = [ "i686-linux" ]; - maintainers = with lib.maintainers; [ a1russell robbinch roconnor the-kenny abbradar ]; + license = licenses.unfreeRedistributable; + platforms = platforms.linux; + maintainers = with maintainers; [ a1russell robbinch roconnor the-kenny abbradar ]; }; } From d0bee3aeec2ac5d79ab8644fc0193f14420d5b45 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 13 Aug 2016 03:12:20 +0300 Subject: [PATCH 061/145] dwarf-fortress-packages.dfhack: 0.42.06-r1 -> 0.43.03-r1 --- pkgs/games/dwarf-fortress/dfhack/default.nix | 12 +++--- .../dfhack/use-system-libraries.patch | 42 +++++++------------ 2 files changed, 22 insertions(+), 32 deletions(-) diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix index 1ee0f829571..17697192007 100644 --- a/pkgs/games/dwarf-fortress/dfhack/default.nix +++ b/pkgs/games/dwarf-fortress/dfhack/default.nix @@ -5,8 +5,9 @@ }: let - dfVersion = "0.42.06"; + dfVersion = "0.43.03"; version = "${dfVersion}-r1"; + rev = "refs/tags/${version}"; # revision of library/xml submodule xmlRev = "98cc1e01886aaea161d651cf97229ad08e9782b0"; @@ -14,7 +15,7 @@ let fakegit = writeScriptBin "git" '' #! ${stdenv.shell} if [ "$*" = "describe --tags --long" ]; then - echo "${dfVersion}-unknown" + echo "${version}-unknown" elif [ "$*" = "rev-parse HEAD" ]; then if [ "$(dirname "$(pwd)")" = "xml" ]; then echo "${xmlRev}" @@ -35,19 +36,20 @@ in stdenv.mkDerivation rec { src = fetchgit { url = "https://github.com/DFHack/dfhack"; inherit rev; - sha256 = "1p234m8r84cdr4bx622hcd13mshnjc5bw7hdxhv18waaxvdpv6jh"; + sha256 = "0m5kqpaz0ypji4c32w0hhbsicvgvnjh56pqvq7af6pqqnyg1nzcx"; }; patches = [ ./use-system-libraries.patch ]; - postPatch = "sed '1i#include ' -i plugins/3dveins.cpp"; nativeBuildInputs = [ cmake perl XMLLibXML XMLLibXSLT fakegit ]; # we can't use native Lua; upstream uses private headers buildInputs = [ zlib jsoncpp protobuf tinyxml ]; + cmakeFlags = [ "-DEXTERNAL_TINYXML=ON" ]; + enableParallelBuilding = true; - passthru = { inherit dfVersion; }; + passthru = { inherit version dfVersion; }; meta = with stdenv.lib; { description = "Memory hacking library for Dwarf Fortress and a set of tools that use it"; diff --git a/pkgs/games/dwarf-fortress/dfhack/use-system-libraries.patch b/pkgs/games/dwarf-fortress/dfhack/use-system-libraries.patch index b6ff92398a5..e33fec9f87e 100644 --- a/pkgs/games/dwarf-fortress/dfhack/use-system-libraries.patch +++ b/pkgs/games/dwarf-fortress/dfhack/use-system-libraries.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 46fd565..254c3c0 100644 +index 956edfc..fb0e6bc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -160,8 +160,6 @@ ELSEIF(MSVC) @@ -11,7 +11,7 @@ index 46fd565..254c3c0 100644 ADD_DEFINITIONS(-DLUA_BUILD_AS_DLL) if(APPLE) -@@ -182,11 +180,8 @@ else() +@@ -182,10 +180,8 @@ else() set(ZLIB_ROOT /usr/lib/i386-linux-gnu) endif() find_package(ZLIB REQUIRED) @@ -19,27 +19,31 @@ index 46fd565..254c3c0 100644 include_directories(depends/lua/include) include_directories(depends/md5) -include_directories(depends/jsoncpp) --include_directories(depends/tinyxml) - include_directories(depends/tthread) - include_directories(${ZLIB_INCLUDE_DIRS}) - include_directories(depends/clsocket/src) + + # Support linking against external tinyxml + # If we find an external tinyxml, set the DFHACK_TINYXML variable to "tinyxml" diff --git a/depends/CMakeLists.txt b/depends/CMakeLists.txt -index bf0345b..2a1a852 100644 +index d8442b1..b47dc2a 100644 --- a/depends/CMakeLists.txt +++ b/depends/CMakeLists.txt -@@ -1,10 +1,7 @@ +@@ -1,7 +1,6 @@ #list depends here. add_subdirectory(lua) add_subdirectory(md5) -add_subdirectory(protobuf) --add_subdirectory(tinyxml) + + # Don't build tinyxml if it's being externally linked against. + if(NOT TinyXML_FOUND) +@@ -9,7 +8,6 @@ if(NOT TinyXML_FOUND) + endif() + add_subdirectory(tthread) -add_subdirectory(jsoncpp) # build clsocket static and only as a dependency. Setting those options here overrides its own default settings. OPTION(CLSOCKET_SHARED "Build clsocket lib as shared." OFF) OPTION(CLSOCKET_DEP_ONLY "Build for use inside other CMake projects as dependency." ON) diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt -index 54300ec..128bfd1 100644 +index d3e3480..5d4b572 100644 --- a/library/CMakeLists.txt +++ b/library/CMakeLists.txt @@ -223,10 +223,10 @@ LIST(APPEND PROJECT_SOURCES ${PROJECT_PROTO_SRCS}) @@ -55,24 +59,8 @@ index 54300ec..128bfd1 100644 ) # Merge headers into sources -@@ -269,12 +269,12 @@ IF(UNIX) - ENDIF() - - IF(APPLE) -- SET(PROJECT_LIBS dl dfhack-md5 dfhack-tinyxml dfhack-tinythread) -+ SET(PROJECT_LIBS dl dfhack-md5 tinyxml dfhack-tinythread) - ELSEIF(UNIX) -- SET(PROJECT_LIBS rt dl dfhack-md5 dfhack-tinyxml dfhack-tinythread) -+ SET(PROJECT_LIBS rt dl dfhack-md5 tinyxml dfhack-tinythread) - ELSE(WIN32) - #FIXME: do we really need psapi? -- SET(PROJECT_LIBS psapi dfhack-md5 dfhack-tinyxml dfhack-tinythread) -+ SET(PROJECT_LIBS psapi dfhack-md5 tinyxml dfhack-tinythread) - ENDIF() - - ADD_LIBRARY(dfhack-version STATIC DFHackVersion.cpp) diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt -index dd1c634..7bd8c17 100644 +index c24b940..afeb888 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -47,11 +47,11 @@ STRING(REPLACE ".proto" ".pb.h" PROJECT_PROTO_HDRS "${PROJECT_PROTOS}") From b510492d99cec4fb3a28ee1e4a696be23c25a049 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 13 Aug 2016 03:12:38 +0300 Subject: [PATCH 062/145] dwarf-fortress-packages.cla-theme: 42.06-v22 -> 43.04-v23 --- pkgs/games/dwarf-fortress/themes/cla.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/dwarf-fortress/themes/cla.nix b/pkgs/games/dwarf-fortress/themes/cla.nix index b1a27c7e47b..3933d62b1d3 100644 --- a/pkgs/games/dwarf-fortress/themes/cla.nix +++ b/pkgs/games/dwarf-fortress/themes/cla.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "cla-theme-${version}"; - version = "42.06-v22"; + version = "43.04-v23"; src = fetchFromGitHub { owner = "DFgraphics"; repo = "CLA"; rev = version; - sha256 = "1rr52j1wns17axc27fab0wn0338axzwkqp7cpa690kb3bl1y0pf5"; + sha256 = "0a88jkcli9iq0prg5w0xh1cyms0b7dnc9rdahn7wy7fyakyp7s27"; }; installPhase = '' @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { cp -r data raw $out ''; - passthru.dfVersion = "0.42.06"; + passthru.dfVersion = "0.43.05"; preferLocalBuild = true; From df063d8b46d19b3944f9d08552f68f5ea8f36a64 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 13 Aug 2016 03:12:55 +0300 Subject: [PATCH 063/145] dwarf-fortress-packages.phoebus-theme: 42.06a -> 43.03 --- pkgs/games/dwarf-fortress/themes/phoebus.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/dwarf-fortress/themes/phoebus.nix b/pkgs/games/dwarf-fortress/themes/phoebus.nix index 0022f9dc1c7..01ae192e75e 100644 --- a/pkgs/games/dwarf-fortress/themes/phoebus.nix +++ b/pkgs/games/dwarf-fortress/themes/phoebus.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "phoebus-theme-${version}"; - version = "42.06a"; + version = "43.03"; src = fetchFromGitHub { owner = "DFgraphics"; repo = "Phoebus"; rev = version; - sha256 = "1mkj882mf1lvjs2b7jxfazym9fl1y20slbfi1lgqzbp1872aaxi0"; + sha256 = "1mga5w3mks3bm6qch7azffr51g3q26za7hnas4qmxfs3m56bjav7"; }; installPhase = '' @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { cp -r data raw $out ''; - passthru.dfVersion = "0.42.06"; + passthru.dfVersion = "0.43.05"; preferLocalBuild = true; From f2913e46fda262c6511218ee475df5a1d0b6b6fc Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 13 Aug 2016 03:13:24 +0300 Subject: [PATCH 064/145] ioquake3: 2016-04-05 -> 2016-08-11 --- pkgs/games/quake3/ioquake/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/quake3/ioquake/default.nix b/pkgs/games/quake3/ioquake/default.nix index 2fff7e7a026..f03b8dde13e 100644 --- a/pkgs/games/quake3/ioquake/default.nix +++ b/pkgs/games/quake3/ioquake/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "ioquake3-git-${version}"; - version = "2016-04-05"; + version = "2016-08-11"; src = fetchFromGitHub { owner = "ioquake"; repo = "ioq3"; - rev = "1f6703821f11be9c711c6ee42371ab290dd12776"; - sha256 = "0jbn4lv85khfcmn1dc3mrx7zxldj3p4cggx85hdfpiwmnsjl4w67"; + rev = "1cf0b21cda562bade9152958f1525e5ac281ab9c"; + sha256 = "104yrgi9dnfb493pm9wvk2kn80nazcr1nllb5vd7di66jnvcjks0"; }; nativeBuildInputs = [ which pkgconfig ]; From c3868a1d747fd59faa48e4c8b791dd5dbdfc5276 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 13 Aug 2016 03:14:45 +0300 Subject: [PATCH 065/145] steam-packages.steam-runtime: 2016-03-03 -> 2016-08-13 --- pkgs/games/steam/runtime-generated.nix | 18 ++++++++++++++++++ pkgs/games/steam/runtime.nix | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/pkgs/games/steam/runtime-generated.nix b/pkgs/games/steam/runtime-generated.nix index 854796cac3e..260b7a9b8d8 100644 --- a/pkgs/games/steam/runtime-generated.nix +++ b/pkgs/games/steam/runtime-generated.nix @@ -1254,6 +1254,15 @@ name = "libvpx1.deb"; }; } + rec { + name = "libvulkan1_1.0.3~git20160215-0.1+steamos5+srt1_amd64"; + md5 = "4d9ac7966de8160a13817291206b51a4"; + url = "mirror://steamrt/pool/main/v/vulkan-loader/libvulkan1_1.0.3~git20160215-0.1+steamos5+srt1_amd64.deb"; + source = fetchurl { + inherit url md5; + name = "libvulkan1.deb"; + }; + } rec { name = "libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64"; md5 = "a1e5b4a8f8200feef82dab976f1b4e5d"; @@ -2993,6 +3002,15 @@ name = "libvpx1.deb"; }; } + rec { + name = "libvulkan1_1.0.3~git20160215-0.1+steamos5+srt1_i386"; + md5 = "de2c787fcc443fb989b1862367a2e0c7"; + url = "mirror://steamrt/pool/main/v/vulkan-loader/libvulkan1_1.0.3~git20160215-0.1+steamos5+srt1_i386.deb"; + source = fetchurl { + inherit url md5; + name = "libvulkan1.deb"; + }; + } rec { name = "libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386"; md5 = "6265aab9d541aea8aad3496ebcc5908e"; diff --git a/pkgs/games/steam/runtime.nix b/pkgs/games/steam/runtime.nix index 9236243427a..fa1da479196 100644 --- a/pkgs/games/steam/runtime.nix +++ b/pkgs/games/steam/runtime.nix @@ -9,7 +9,7 @@ let arch = if stdenv.system == "x86_64-linux" then "amd64" inputFile = writeText "steam-runtime.json" (builtins.toJSON input); in stdenv.mkDerivation { - name = "steam-runtime-2016-03-03"; + name = "steam-runtime-2016-08-13"; nativeBuildInputs = [ python2 dpkg binutils ]; From d7d1efe27f90a33d708f8a91658f26a5e48e6507 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 13 Aug 2016 03:15:04 +0300 Subject: [PATCH 066/145] the-powder-toy: 91.3.328 -> 91.5.330 --- pkgs/games/the-powder-toy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/the-powder-toy/default.nix b/pkgs/games/the-powder-toy/default.nix index 14f05f8f1a8..142fbb2b71a 100644 --- a/pkgs/games/the-powder-toy/default.nix +++ b/pkgs/games/the-powder-toy/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, scons, pkgconfig, SDL, lua, fftwFloat }: -let version = "91.3.328"; -in stdenv.mkDerivation rec { name = "the-powder-toy-${version}"; + version = "91.5.330"; + src = fetchFromGitHub { owner = "simtr"; repo = "The-Powder-Toy"; rev = "v${version}"; - sha256 = "0krg4d2m8cnfabm5qq7wr1y53h21i49xjcggzg98xjd0972zvfrk"; + sha256 = "19m7jyg3pnppymvr6lz454mjiw18hvldpdhi33596m9ji3nrq8x7"; }; patches = [ ./fix-env.patch ]; From af376b90e30154bf58d7ea069b8e5fdf459c0334 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 13 Aug 2016 03:16:03 +0300 Subject: [PATCH 067/145] wesnoth-dev: 1.13.4 -> 1.13.5 --- pkgs/games/wesnoth/dev.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/wesnoth/dev.nix b/pkgs/games/wesnoth/dev.nix index 84b135a5df8..a7e621460b6 100644 --- a/pkgs/games/wesnoth/dev.nix +++ b/pkgs/games/wesnoth/dev.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "wesnoth"; - version = "1.13.4"; + version = "1.13.5"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/sourceforge/${pname}/${name}.tar.bz2"; - sha256 = "1ys25ijwphld11002cad9iz5mc5rqazmjn8866l8gcdfrrhk943s"; + sha256 = "15hvf06r7086plwmagh89plcxal2zql8k4mg0yf1zgwjvdz284dx"; }; nativeBuildInputs = [ cmake pkgconfig ]; From 526a8acb5797beb857e2eebfc319e68bff2914bd Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 13 Aug 2016 03:17:09 +0300 Subject: [PATCH 068/145] m33-linux: rename from m3d-linux, 2016-01-20 -> 2016-06-23 --- pkgs/misc/drivers/{m3d-linux => m33-linux}/default.nix | 10 +++++----- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) rename pkgs/misc/drivers/{m3d-linux => m33-linux}/default.nix (60%) diff --git a/pkgs/misc/drivers/m3d-linux/default.nix b/pkgs/misc/drivers/m33-linux/default.nix similarity index 60% rename from pkgs/misc/drivers/m3d-linux/default.nix rename to pkgs/misc/drivers/m33-linux/default.nix index 0e970e30d58..492488f675f 100644 --- a/pkgs/misc/drivers/m3d-linux/default.nix +++ b/pkgs/misc/drivers/m33-linux/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation { - name = "M3D-Linux-2016-01-20"; + name = "M33-Linux-2016-06-23"; src = fetchFromGitHub { owner = "donovan6000"; repo = "M3D-Linux"; - rev = "d0bbb0379c52a88af55740a937edc92af162cdf6"; - sha256 = "0fwzb9mf04bw5wxabh3js7nir60kfq8iz7kcigw6c233aadwg03i"; + rev = "5c1b90c13d260771dac970b49fdc9f840fee5f4a"; + sha256 = "1bvbclkyfcv23vxb4s1zssvygklks1nhp4iwi4v90c1fvyz0356f"; }; installPhase = '' - install -Dm755 m3d-linux $out/bin/m3d-linux - install -Dm755 90-m3d-local.rules $out/lib/udev/rules.d/90-m3d-local.rules + install -Dm755 m33-linux $out/bin/m33-linux + install -Dm755 90-micro-3d-local.rules $out/lib/udev/rules.d/90-micro-3d-local.rules ''; meta = with stdenv.lib; { diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index dd458deb289..0445975e792 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -111,4 +111,5 @@ doNotDisplayTwice rec { xf86_video_nouveau = xorg.xf86videonouveau; # added 2015-09 xlibs = xorg; # added 2015-09 youtubeDL = youtube-dl; # added 2014-10-26 + m3d-linux = m33-linux; # added 2016-08-13 } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e516f832c25..2bc8c9e91b7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17229,7 +17229,7 @@ in lkproof = callPackage ../tools/typesetting/tex/lkproof { }; - m3d-linux = callPackage ../misc/drivers/m3d-linux { }; + m33-linux = callPackage ../misc/drivers/m33-linux { }; mnemonicode = callPackage ../misc/mnemonicode { }; From b30f4e5e4f2c4c3e89d84312f9eba3dd6bb87aec Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 13 Aug 2016 03:17:18 +0300 Subject: [PATCH 069/145] android-udev-rules: 2016-04-26 -> 20160805 --- pkgs/os-specific/linux/android-udev-rules/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/android-udev-rules/default.nix b/pkgs/os-specific/linux/android-udev-rules/default.nix index be2b8026817..677eb890a5b 100644 --- a/pkgs/os-specific/linux/android-udev-rules/default.nix +++ b/pkgs/os-specific/linux/android-udev-rules/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "android-udev-rules-${version}"; - version = "2016-04-26"; + version = "20160805"; src = fetchFromGitHub { owner = "M0Rf30"; repo = "android-udev-rules"; - rev = "9af6e552016392db35191142b599a5199cf8a9fa"; - sha256 = "1lvh7md6qz91q8jy9phnfxlb19s104lvsk75a5r07d8bjc4w9pxb"; + rev = version; + sha256 = "0sdf3insqs73cdzmwl3lqy7nj82f1lprxd3vm0jh3qpf0sd1k93c"; }; installPhase = '' @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/M0Rf30/android-udev-rules; + homepage = "https://github.com/M0Rf30/android-udev-rules"; description = "Android udev rules list aimed to be the most comprehensive on the net"; platforms = platforms.linux; license = licenses.gpl3; From c60deb0266f904bc26f06db3bd07d379ab3f9a7c Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 13 Aug 2016 03:18:13 +0300 Subject: [PATCH 070/145] quote homepages for better clickability Done while I was traversing packages which I maintain to save extra clicks on urxvt (it captures semicolon as a part of URL). --- pkgs/os-specific/linux/pam_pgsql/default.nix | 2 +- pkgs/servers/mail/dspam/default.nix | 2 +- pkgs/servers/rpcbind/default.nix | 2 +- pkgs/servers/uwsgi/default.nix | 2 +- pkgs/tools/X11/virtualgl/lib.nix | 2 +- pkgs/tools/bluetooth/blueman/default.nix | 2 +- pkgs/tools/graphics/imgurbash2/default.nix | 2 +- pkgs/tools/video/mjpegtools/default.nix | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/os-specific/linux/pam_pgsql/default.nix b/pkgs/os-specific/linux/pam_pgsql/default.nix index 8e34028e078..42949a3557a 100644 --- a/pkgs/os-specific/linux/pam_pgsql/default.nix +++ b/pkgs/os-specific/linux/pam_pgsql/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Support to authenticate against PostgreSQL for PAM-enabled appliations"; - homepage = https://github.com/pam-pgsql/pam-pgsql; + homepage = "https://github.com/pam-pgsql/pam-pgsql"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/servers/mail/dspam/default.nix b/pkgs/servers/mail/dspam/default.nix index 6f52e62aab7..0c3ed84deff 100644 --- a/pkgs/servers/mail/dspam/default.nix +++ b/pkgs/servers/mail/dspam/default.nix @@ -99,7 +99,7 @@ in stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = http://dspam.nuclearelephant.com/; + homepage = "http://nuclearelephant.com/"; description = "Community Driven Antispam Filter"; license = licenses.agpl3; platforms = platforms.linux; diff --git a/pkgs/servers/rpcbind/default.nix b/pkgs/servers/rpcbind/default.nix index 7cb2c5a0c38..ba2e1447ffe 100644 --- a/pkgs/servers/rpcbind/default.nix +++ b/pkgs/servers/rpcbind/default.nix @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { description = "ONC RPC portmapper"; license = licenses.bsd3; platforms = platforms.unix; - homepage = http://sourceforge.net/projects/rpcbind/; + homepage = "http://sourceforge.net/projects/rpcbind/"; maintainers = with maintainers; [ abbradar ]; longDescription = '' Universal addresses to RPC program number mapper. diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix index 3bec62ebe03..dd6eeff616f 100644 --- a/pkgs/servers/uwsgi/default.nix +++ b/pkgs/servers/uwsgi/default.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_LINK = [ "-lsystemd" ]; meta = with stdenv.lib; { - homepage = http://uwsgi-docs.readthedocs.org/en/latest/; + homepage = "http://uwsgi-docs.readthedocs.org/en/latest/"; description = "A fast, self-healing and developer/sysadmin-friendly application container server coded in pure C"; license = licenses.gpl2; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/tools/X11/virtualgl/lib.nix b/pkgs/tools/X11/virtualgl/lib.nix index 6b93c6432c3..5707679c03c 100644 --- a/pkgs/tools/X11/virtualgl/lib.nix +++ b/pkgs/tools/X11/virtualgl/lib.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://www.virtualgl.org/; + homepage = "http://www.virtualgl.org/"; description = "X11 GL rendering in a remote computer with full 3D hw acceleration"; license = licenses.free; # many parts under different free licenses platforms = platforms.linux; diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix index def096a571d..31020656867 100644 --- a/pkgs/tools/bluetooth/blueman/default.nix +++ b/pkgs/tools/bluetooth/blueman/default.nix @@ -40,7 +40,7 @@ in stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = https://github.com/blueman-project; + homepage = "https://github.com/blueman-project/blueman"; description = "GTK+-based Bluetooth Manager"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/tools/graphics/imgurbash2/default.nix b/pkgs/tools/graphics/imgurbash2/default.nix index 5a655b9ff16..847b3b81749 100644 --- a/pkgs/tools/graphics/imgurbash2/default.nix +++ b/pkgs/tools/graphics/imgurbash2/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; - homepage = https://github.com/ram-on/imgurbash2; + homepage = "https://github.com/ram-on/imgurbash2"; }; } diff --git a/pkgs/tools/video/mjpegtools/default.nix b/pkgs/tools/video/mjpegtools/default.nix index 4aee9064d72..1b259b5b91b 100644 --- a/pkgs/tools/video/mjpegtools/default.nix +++ b/pkgs/tools/video/mjpegtools/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A suite of programs for processing MPEG or MJPEG video"; - homepage = http://mjpeg.sourceforge.net/; + homepage = "http://mjpeg.sourceforge.net/"; license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ abbradar ]; From 6086328b2d81012babdaf013d5a603606653a609 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 13 Aug 2016 03:19:04 +0300 Subject: [PATCH 071/145] primusLib: fix version, quote homepage for better clickability --- pkgs/tools/X11/primus/lib.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/X11/primus/lib.nix b/pkgs/tools/X11/primus/lib.nix index 2ecf91edba5..fccd01eaead 100644 --- a/pkgs/tools/X11/primus/lib.nix +++ b/pkgs/tools/X11/primus/lib.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation { - name = "primus-lib-20151204"; + name = "primus-lib-2015-04-28"; src = fetchFromGitHub { owner = "amonakov"; @@ -28,7 +28,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Low-overhead client-side GPU offloading"; - homepage = https://github.com/amonakov/primus; + homepage = "https://github.com/amonakov/primus"; platforms = platforms.linux; license = licenses.bsd2; maintainers = with maintainers; [ abbradar ]; From bdc700c23adfa460e773a4b471e946eccd72672c Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 13 Aug 2016 03:19:50 +0300 Subject: [PATCH 072/145] grub4dos: 0.4.6a-2016-04-26 -> 0.4.6a-2016-08-06 --- pkgs/tools/misc/grub4dos/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/grub4dos/default.nix b/pkgs/tools/misc/grub4dos/default.nix index 94a0b3289dd..ec784d8e1a4 100644 --- a/pkgs/tools/misc/grub4dos/default.nix +++ b/pkgs/tools/misc/grub4dos/default.nix @@ -6,13 +6,13 @@ let arch = else abort "Unknown architecture"; in stdenv.mkDerivation rec { name = "grub4dos-${version}"; - version = "0.4.6a-2016-04-26"; + version = "0.4.6a-2016-08-06"; src = fetchFromGitHub { owner = "chenall"; repo = "grub4dos"; - rev = "61d8229375c679436d56376518456723b2025e1a"; - sha256 = "1r4jmvykk5cvpf1kysykvksa9vfy7p29q20x72inw2pbhipj0f10"; + rev = "99d6ddbe7611f942d2708d77a620d6aa94a284d1"; + sha256 = "0gnllk0qkx6d0azf7v9cr0b23gp577avksz0f4dl3v3ldgi0dksq"; }; nativeBuildInputs = [ nasm ]; From 49fe339b09bd4a3cdbcaa7590db94abce73db9be Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 13 Aug 2016 03:21:08 +0300 Subject: [PATCH 073/145] update-resolv-conf: 20141003 -> 2016-04-24 --- .../networking/openvpn/update-resolv-conf.nix | 27 +++++++++++-------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/networking/openvpn/update-resolv-conf.nix b/pkgs/tools/networking/openvpn/update-resolv-conf.nix index 80f7d149b7f..f59e70ed318 100644 --- a/pkgs/tools/networking/openvpn/update-resolv-conf.nix +++ b/pkgs/tools/networking/openvpn/update-resolv-conf.nix @@ -1,27 +1,32 @@ -{ stdenv, fetchgit, makeWrapper, openresolv, coreutils }: +{ stdenv, lib, fetchFromGitHub, makeWrapper, openresolv, coreutils, which, systemd }: -stdenv.mkDerivation rec { - name = "update-resolv-conf-20141003"; +let + binPath = lib.makeBinPath [ coreutils openresolv which systemd ]; - src = fetchgit { - url = https://github.com/masterkorp/openvpn-update-resolv-conf/; - rev = "dd968419373bce71b22bbd26de962e89eb470670"; - sha256 = "0j7mg66lqhgvhybgbn98y7i5skj1ify41hmb0yhkx2xrli8027b9"; +in stdenv.mkDerivation rec { + name = "update-resolv-conf-2016-04-24"; + + src = fetchFromGitHub { + owner = "masterkorp"; + repo = "openvpn-update-resolv-conf"; + rev = "994574f36b9147cc78674a5f13874d503a625c98"; + sha256 = "1rvzlaj53k8s09phg4clsyzlmf44dmwwyvg0nbg966sxp3xsqlxc"; }; nativeBuildInputs = [ makeWrapper ]; installPhase = '' install -Dm555 update-resolv-conf.sh $out/libexec/openvpn/update-resolv-conf - sed -i 's,^\(RESOLVCONF=\).*,\1resolvconf,' $out/libexec/openvpn/update-resolv-conf + install -Dm555 update-systemd-network.sh $out/libexec/openvpn/update-systemd-network - wrapProgram $out/libexec/openvpn/update-resolv-conf \ - --prefix PATH : ${coreutils}/bin:${openresolv}/sbin + for i in $out/libexec/openvpn/*; do + wrapProgram $i --prefix PATH : ${binPath} + done ''; meta = with stdenv.lib; { description = "Script to update your /etc/resolv.conf with DNS settings that come from the received push dhcp-options"; - homepage = https://github.com/masterkorp/openvpn-update-resolv-conf/; + homepage = "https://github.com/masterkorp/openvpn-update-resolv-conf/"; maintainers = with maintainers; [ abbradar ]; license = licenses.gpl2; platforms = platforms.unix; From 28158b21b9465ba7ca2644177f96506b0866ce92 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 13 Aug 2016 03:22:49 +0300 Subject: [PATCH 074/145] pythonPackages.pkginfo: 1.2.1 -> 1.3.2 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 897e0f160bf..97b912fd6ae 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4337,12 +4337,12 @@ in modules // { pkginfo = buildPythonPackage rec { - version = "1.2.1"; + version = "1.3.2"; name = "pkginfo-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/p/pkginfo/${name}.tar.gz"; - sha256 = "0g0g6avplfqw1adzqybbrh1a2z0kfjl8qn3annkrc7w3ibz6sgxd"; + sha256 = "0qg4sq3m0pxvjahc3sncwhw42z5rfw22k0ybskmdqkl2agykay7q"; }; doCheck = false; # I don't know why, but with doCheck = true it fails. From 2f52628b004baad5d323e6e2e649e3ee7735432f Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 13 Aug 2016 03:23:28 +0300 Subject: [PATCH 075/145] pythonPackages.flask_assets: 1.2.1 -> 1.3.2 --- pkgs/top-level/python-packages.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 97b912fd6ae..af66c07446a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10123,11 +10123,11 @@ in modules // { flask_assets = buildPythonPackage rec { name = "Flask-Assets-${version}"; - version = "0.10"; + version = "0.11"; src = pkgs.fetchurl { url = "mirror://pypi/F/Flask-Assets/${name}.tar.gz"; - sha256 = "1v6ika3ias21xzhg7kglki99nwfx1i33rdhnw9kdqbwxkpwbwkyl"; + sha256 = "1vs59gygwhwqj37if8hiw6vd2rns09xkblaz4qkmpp6hpy3shrvf"; }; propagatedBuildInputs = with self; [ flask webassets flask_script nose ]; @@ -10136,7 +10136,6 @@ in modules // { homepage = http://github.com/miracle2k/flask-assets; description = "Asset management for Flask, to compress and merge CSS and Javascript files"; license = licenses.bsd2; - platforms = platforms.all; maintainers = with maintainers; [ abbradar ]; }; }; From 86caec1be1ac98dee4e6a1b993293e9bacaa53ee Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 13 Aug 2016 03:24:31 +0300 Subject: [PATCH 076/145] pythonPackages.psutil: 3.4.2 -> 4.3.0 --- pkgs/top-level/python-packages.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index af66c07446a..53615ff5516 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17827,17 +17827,13 @@ in modules // { psutil = buildPythonPackage rec { name = "psutil-${version}"; - version = "3.4.2"; + version = "4.3.0"; src = pkgs.fetchurl { url = "mirror://pypi/p/psutil/${name}.tar.gz"; - sha256 = "b17fa01aa766daa388362d0eda5c215d77e03a8d37676b68971f37bf3913b725"; + sha256 = "1w4r09fvn6kd80m5mx4ws1wz100brkaq6hzzpwrns8cgjzjpl6c6"; }; - # Certain tests fail due to being in a chroot. - # See also the older issue: https://code.google.com/p/psutil/issues/detail?id=434 - doCheck = false; - buildInputs = with self; [ mock ] ++ optionals stdenv.isDarwin [ pkgs.darwin.IOKit ]; meta = { From 229801f7a6be952315ed3d640a92e6cf26453022 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 13 Aug 2016 03:24:57 +0300 Subject: [PATCH 077/145] pythonPackages.Babel: 2.2.0 -> 2.3.4 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 53615ff5516..3868c62e247 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18173,11 +18173,11 @@ in modules // { Babel = buildPythonPackage (rec { - name = "Babel-2.2.0"; + name = "Babel-2.3.4"; src = pkgs.fetchurl { url = "mirror://pypi/B/Babel/${name}.tar.gz"; - sha256 = "d8cb4c0e78148aee89560f9fe21587aa57739c975bb89ff66b1e842cc697428f"; + sha256 = "0x98qqqw35xllpcama013a9788ly84z8dm1w2wwfpxh2710c8df5"; }; buildInputs = with self; [ pytest ]; From a1e40f1efc5f48bd4e082d74018beb1cc25413ba Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 13 Aug 2016 03:26:04 +0300 Subject: [PATCH 078/145] pythonPackages.requests2: 2.9.1 -> 2.11.0 --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3868c62e247..ce6870d1824 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20323,14 +20323,14 @@ in modules // { requests2 = buildPythonPackage rec { name = "requests-${version}"; - version = "2.9.1"; + version = "2.11.0"; src = pkgs.fetchurl { url = "mirror://pypi/r/requests/${name}.tar.gz"; - sha256 = "0zsqrzlybf25xscgi7ja4s48y2abf9wvjkn47wh984qgs1fq2xy5"; + sha256 = "11d3vrbiqrz30qbplv80y72y9i47hihs35p5n04fl4ggjcz0bzxj"; }; - buildInputs = [ self.pytest ]; + nativeBuildInputs = [ self.pytest ]; # sadly, tests require networking doCheck = false; From 3065f54a64ac3f096590c9e0b3b48fd726393c8d Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 13 Aug 2016 03:26:45 +0300 Subject: [PATCH 079/145] pythonPackages.rsa: 3.3 -> 3.4.2 --- pkgs/top-level/python-packages.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ce6870d1824..e2081eab3d0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -21100,22 +21100,18 @@ in modules // { rsa = buildPythonPackage rec { name = "rsa-${version}"; - version = "3.3"; + version = "3.4.2"; src = pkgs.fetchurl { url = "mirror://pypi/r/rsa/${name}.tar.gz"; - sha256 = "03f3d9bebad06681771016b8752a40b12f615ff32363c7aa19b3798e73ccd615"; + sha256 = "1dcxvszbikgzh99ybdc7jq0zb9wspy2ds8z9mjsqiyv3q884xpr5"; }; nativeBuildInputs = with self; [ unittest2 ]; propagatedBuildInputs = with self; [ pyasn1 ]; - checkPhase = '' - ${python.interpreter} run_tests.py - ''; - meta = { - homepage = http://stuvel.eu/rsa; + homepage = "http://stuvel.eu/rsa"; license = licenses.asl20; description = "A pure-Python RSA implementation"; }; From 7916a16c8ec3340f85cf5b3e27722f0da6fef141 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 13 Aug 2016 03:28:13 +0300 Subject: [PATCH 080/145] pythonPackages.Werkzeug: 0.10.4 -> 0.11.10 --- pkgs/top-level/python-packages.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e2081eab3d0..94df9c47988 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -24663,21 +24663,20 @@ in modules // { werkzeug = buildPythonPackage rec { - name = "Werkzeug-0.10.4"; + name = "Werkzeug-0.11.10"; src = pkgs.fetchurl { url = "mirror://pypi/W/Werkzeug/${name}.tar.gz"; - sha256 = "9d2771e4c89be127bc4bac056ab7ceaf0e0064c723d6b6e195739c3af4fd5c1d"; + sha256 = "1vpf98k4jp4yhbv2jbyq8dj5fdasrd26rkq34pacs5n7mkxxlr6c"; }; propagatedBuildInputs = with self; [ itsdangerous ]; - - doCheck = false; # tests fail, not sure why + nativeBuildInputs = with self; [ pytest requests ]; meta = { homepage = http://werkzeug.pocoo.org/; description = "A WSGI utility library for Python"; - license = "BSD"; + license = licenses.bsd3; }; }; From 70efa5aa1e2c1189836e7a12dc75c726920f02ad Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 13 Aug 2016 03:28:30 +0300 Subject: [PATCH 081/145] pythonPackages.flasklabel: 0.9 -> 0.11.1 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 94df9c47988..8167503ca30 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -26614,11 +26614,11 @@ in modules // { }; flaskbabel = buildPythonPackage rec { - name = "Flask-Babel-0.9"; + name = "Flask-Babel-0.11.1"; src = pkgs.fetchurl { url = "mirror://pypi/F/Flask-Babel/${name}.tar.gz"; - sha256 = "0k7vk4k54y55ma0nx2k5s0phfqbriwslhy5shh3b0d046q7ibzaa"; + sha256 = "16b80cipdba9xj3jlaiaq6wgrgpjb70w3j01jjy9hbp4k71kd6yj"; }; propagatedBuildInputs = with self; [ flask jinja2 speaklater Babel pytz ]; From 4fb1f1ff6e4de22522adf68461206bde8b046523 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 14 Aug 2016 12:58:27 +0300 Subject: [PATCH 082/145] bcache-tools: remove kmod from arguments --- pkgs/tools/filesystems/bcache-tools/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/bcache-tools/default.nix b/pkgs/tools/filesystems/bcache-tools/default.nix index 14d8d282c81..288cd14c16b 100644 --- a/pkgs/tools/filesystems/bcache-tools/default.nix +++ b/pkgs/tools/filesystems/bcache-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, utillinux, kmod }: +{ stdenv, fetchurl, pkgconfig, utillinux }: stdenv.mkDerivation rec { name = "bcache-tools-${version}"; From 6d6f6b474811d3cdbd7e50d4ac7f540e46101574 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 14 Aug 2016 12:59:25 +0300 Subject: [PATCH 083/145] makeModulesClosure: don't set pipefail as it's already set in $stdenv/setup --- pkgs/build-support/kernel/modules-closure.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/build-support/kernel/modules-closure.sh b/pkgs/build-support/kernel/modules-closure.sh index 71d507b1e2b..8a31c760da0 100644 --- a/pkgs/build-support/kernel/modules-closure.sh +++ b/pkgs/build-support/kernel/modules-closure.sh @@ -1,7 +1,5 @@ source $stdenv/setup -set -o pipefail - version=$(cd $kernel/lib/modules && ls -d *) echo "kernel version is $version" From fc7e8bd96ea643508e98335b93d7c0a7e178c65f Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 14 Aug 2016 13:25:55 +0300 Subject: [PATCH 084/145] networkmanager: fix ExecReload in the service --- pkgs/tools/networking/network-manager/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 63740558a27..66a261c7cf6 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -26,6 +26,8 @@ stdenv.mkDerivation rec { --replace /bin/sh ${stdenv.shell} \ --replace /usr/sbin/ethtool ${ethtool}/sbin/ethtool \ --replace /bin/sed ${gnused}/bin/sed + substituteInPlace data/NetworkManager.service.in \ + --replace /bin/kill ${coreutils}/bin/kill # to enable link-local connections configureFlags="$configureFlags --with-udev-dir=$out/lib/udev" ''; From bda3423b3afb6f0d815f4fb8bb5f862e543a61ec Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 14 Aug 2016 13:27:14 +0300 Subject: [PATCH 085/145] networkmanager service: make wanted by network.target, drop networkmanager-init --- nixos/modules/services/networking/networkmanager.nix | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 8aac1360526..d198e3bfc02 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -235,19 +235,13 @@ in { systemd.packages = cfg.packages; - # Create an initialisation service that both starts - # NetworkManager when network.target is reached, - # and sets up necessary directories for NM. - systemd.services."networkmanager-init" = { - description = "NetworkManager initialisation"; + systemd.services."network-manager" = { wantedBy = [ "network.target" ]; - wants = [ "network-manager.service" ]; - before = [ "network-manager.service" ]; - script = '' + + preStart = '' mkdir -m 700 -p /etc/NetworkManager/system-connections mkdir -m 755 -p ${stateDirs} ''; - serviceConfig.Type = "oneshot"; }; # Turn off NixOS' network management From 3e84cbc4caafe95ef17289d52769e65f572d34f7 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 14 Aug 2016 22:32:08 +0300 Subject: [PATCH 086/145] autofs5: 5.1.1 -> 5.1.2 --- pkgs/os-specific/linux/autofs/default.nix | 30 ++++++++++++----------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/pkgs/os-specific/linux/autofs/default.nix b/pkgs/os-specific/linux/autofs/default.nix index 6ae9d8d2667..4401eb24cb4 100644 --- a/pkgs/os-specific/linux/autofs/default.nix +++ b/pkgs/os-specific/linux/autofs/default.nix @@ -1,27 +1,27 @@ -{ stdenv, fetchurl, flex, bison, linuxHeaders }: +{ stdenv, lib, fetchurl, flex, bison, linuxHeaders, libtirpc, utillinux, nfs-utils, e2fsprogs +, libxml2 }: let - version = "5.1.1"; + version = "5.1.2"; name = "autofs-${version}"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "mirror://kernel/linux/daemons/autofs/v5/${name}.tar.xz"; - sha256 = "1hr1f11wp538h7r298wpa5khfkhfs8va3p1kdixxhrgkkzpz13z0"; + sha256 = "031z64hmbzyllgvi72cw87755vnmafvsfwi0w21xksla10wxxdw8"; }; preConfigure = '' - configureFlags="--disable-move-mount --with-path=$PATH" - export MOUNT=/var/run/current-system/sw/bin/mount - export UMOUNT=/var/run/current-system/sw/bin/umount - export MODPROBE=/var/run/current-system/sw/bin/modprobe - # Grrr, rpcgen can't find cpp. (NIXPKGS-48) - mkdir rpcgen - echo "#! $shell" > rpcgen/rpcgen - echo "exec $(type -tp rpcgen) -Y $(dirname $(type -tp cpp)) \"\$@\"" >> rpcgen/rpcgen - chmod +x rpcgen/rpcgen - export RPCGEN=$(pwd)/rpcgen/rpcgen + configureFlags="--enable-force-shutdown --enable-ignore-busy --with-path=$PATH" + + export MOUNT=${lib.getBin utillinux}/bin/mount + export MOUNT_NFS=${lib.getBin nfs-utils}/bin/mount.nfs + export UMOUNT=${lib.getBin utillinux}/bin/umount + export MODPROBE=${lib.getBin utillinux}/bin/modprobe + export E2FSCK=${lib.getBin e2fsprogs}/bin/fsck.ext2 + export E3FSCK=${lib.getBin e2fsprogs}/bin/fsck.ext3 + export E4FSCK=${lib.getBin e2fsprogs}/bin/fsck.ext4 ''; installPhase = '' @@ -29,7 +29,9 @@ in stdenv.mkDerivation { #make install SUBDIRS="samples" # impure! ''; - buildInputs = [ flex bison linuxHeaders ]; + buildInputs = [ linuxHeaders libtirpc libxml2 ]; + + nativeBuildInputs = [ flex bison ]; meta = { inherit version; From 4a35d089703b034137fa6904183f28a62e2e7977 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 14 Aug 2016 13:27:33 +0300 Subject: [PATCH 087/145] autofs service: make service more like upstream one --- nixos/modules/services/misc/autofs.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/misc/autofs.nix b/nixos/modules/services/misc/autofs.nix index 8913030e0ea..18f0c3eb83d 100644 --- a/nixos/modules/services/misc/autofs.nix +++ b/nixos/modules/services/misc/autofs.nix @@ -75,9 +75,10 @@ in boot.kernelModules = [ "autofs4" ]; systemd.services.autofs = - { description = "Filesystem automounter"; + { description = "Automounts filesystems on demand"; + after = [ "network.target" "ypbind.service" "sssd.service" "network-online.target" ]; + wants = [ "network-online.target" ]; wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; preStart = '' # There should be only one autofs service managed by systemd, so this should be safe. @@ -85,7 +86,9 @@ in ''; serviceConfig = { - ExecStart = "${pkgs.autofs5}/sbin/automount ${if cfg.debug then "-d" else ""} -f -t ${builtins.toString cfg.timeout} ${autoMaster} ${if cfg.debug then "-l7" else ""}"; + Type = "forking"; + PIDFile = "/run/autofs.pid"; + ExecStart = "${pkgs.autofs5}/bin/automount ${optionalString cfg.debug "-d"} -p /run/autofs.pid -t ${builtins.toString cfg.timeout} ${autoMaster}"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; }; }; From 8f4bbdce99938bc9387f9d9e9a6a8d8b2d1cc34f Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Sun, 14 Aug 2016 16:20:33 -0400 Subject: [PATCH 088/145] make-bootstrap-tools: fix on darwin A couple of things broke after my stdenv change. --- pkgs/stdenv/darwin/make-bootstrap-tools.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix index deefb6bbad2..41c94bd1674 100644 --- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix @@ -27,7 +27,6 @@ rec { # C standard library stuff cp -d ${darwin.Libsystem}/lib/*.o $out/lib/ cp -d ${darwin.Libsystem}/lib/*.dylib $out/lib/ - cp -d ${darwin.Libsystem}/lib/system/*.dylib $out/lib/ # Resolv is actually a link to another package, so let's copy it properly rm $out/lib/libresolv.9.dylib @@ -91,7 +90,7 @@ rec { cp -d ${xz.out}/lib/liblzma*.* $out/lib # Copy binutils. - for i in as ld ar ranlib nm strip otool install_name_tool dsymutil; do + for i in as ld ar ranlib nm strip otool install_name_tool dsymutil lipo; do cp ${darwin.cctools}/bin/$i $out/bin done From 340a9571f54583918663936456c5695c1c808688 Mon Sep 17 00:00:00 2001 From: Michele Guerini Rocco Date: Sun, 14 Aug 2016 22:48:56 +0200 Subject: [PATCH 089/145] btfs: 2.10 -> 2.11 (#17737) --- pkgs/os-specific/linux/btfs/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/btfs/default.nix b/pkgs/os-specific/linux/btfs/default.nix index f0d1b3d7357..f6b3839c6bc 100644 --- a/pkgs/os-specific/linux/btfs/default.nix +++ b/pkgs/os-specific/linux/btfs/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "btfs-${version}"; - version = "2.10"; + version = "2.11"; src = fetchFromGitHub { owner = "johang"; repo = "btfs"; - rev = "2eac5e70a1ed22fa0761b6357c54fd90eea02de6"; - sha256 = "146vgwn79dnbkkn35safga55lkwhvarkmilparmr26hjb56cs1dk"; + rev = "fe585ca285690579db50b1624cec81ae76279ba2"; + sha256 = "1vqya2k8cx5x7jfapl9vmmb002brwbsz4j5xs4417kzv3j2bsms9"; }; buildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2bc8c9e91b7..89dba01a302 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -646,9 +646,7 @@ in sha256 = "0p2sxrpzd0vsk11zf3kb5h12yl1nq4yypb5mpjrm8ww0cfaijck2"; }; - btfs = callPackage ../os-specific/linux/btfs { - libtorrentRasterbar = libtorrentRasterbar_1_09; - }; + btfs = callPackage ../os-specific/linux/btfs { }; cabal2nix = self.haskell.lib.overrideCabal self.haskellPackages.cabal2nix (drv: { isLibrary = false; From dd3142a14e056f23601f792adf58464d6eb5c2f5 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 14 Aug 2016 22:50:04 +0200 Subject: [PATCH 090/145] libtorrentRasterbar_1_09: remove, not used anymore Last package depengin on it was removed in #17737. --- pkgs/development/libraries/libtorrent-rasterbar/1.09.nix | 6 ------ pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 8 deletions(-) delete mode 100644 pkgs/development/libraries/libtorrent-rasterbar/1.09.nix diff --git a/pkgs/development/libraries/libtorrent-rasterbar/1.09.nix b/pkgs/development/libraries/libtorrent-rasterbar/1.09.nix deleted file mode 100644 index e2809e9d483..00000000000 --- a/pkgs/development/libraries/libtorrent-rasterbar/1.09.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./generic.nix (args // { - version = "1.0.9"; - sha256 = "1kfydlvmx4pgi5lpbhqr4p3jr78p3f61ic32046mkp4yfyydrspl"; -}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 89dba01a302..98adbf3bda8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8502,8 +8502,6 @@ in libtorrentRasterbar = callPackage ../development/libraries/libtorrent-rasterbar { }; - libtorrentRasterbar_1_09 = callPackage ../development/libraries/libtorrent-rasterbar/1.09.nix { }; - libtorrentRasterbar_0_16 = callPackage ../development/libraries/libtorrent-rasterbar/0.16.nix { # fix "unrecognized option -arch" error stdenv = if stdenv.isDarwin From a510c5046f8bb4486cb613f3ee74ce50c7c613ce Mon Sep 17 00:00:00 2001 From: Bryan Gardiner Date: Sun, 14 Aug 2016 13:54:07 -0700 Subject: [PATCH 091/145] claws-mail: 3.13.2 -> 3.14.0 (#17734) --- .../networking/mailreaders/claws-mail/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix index 86bf0b2e14b..62a58c42cd4 100644 --- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -32,7 +32,7 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "claws-mail-${version}"; - version = "3.13.2"; + version = "3.14.0"; meta = { description = "The user-friendly, lightweight, and fast email client"; @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://www.claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz"; - sha256 = "1l8ankx0qpq1ix1an8viphcf11ksh53jsrm1xjmq8cjbh5910wva"; + sha256 = "0nfchgga3ir91s8rky0a0vnz8cgj2f6h716wh3cmb466a01xfss6"; }; patches = [ ./mime.patch ]; From a6c56385657192d6e3acae4d463ee652d2295217 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sun, 14 Aug 2016 21:12:21 +0000 Subject: [PATCH 092/145] Revert "btfs: 2.10 -> 2.11 (#17737)" This reverts commit 340a9571f54583918663936456c5695c1c808688. --- pkgs/os-specific/linux/btfs/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/btfs/default.nix b/pkgs/os-specific/linux/btfs/default.nix index f6b3839c6bc..f0d1b3d7357 100644 --- a/pkgs/os-specific/linux/btfs/default.nix +++ b/pkgs/os-specific/linux/btfs/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "btfs-${version}"; - version = "2.11"; + version = "2.10"; src = fetchFromGitHub { owner = "johang"; repo = "btfs"; - rev = "fe585ca285690579db50b1624cec81ae76279ba2"; - sha256 = "1vqya2k8cx5x7jfapl9vmmb002brwbsz4j5xs4417kzv3j2bsms9"; + rev = "2eac5e70a1ed22fa0761b6357c54fd90eea02de6"; + sha256 = "146vgwn79dnbkkn35safga55lkwhvarkmilparmr26hjb56cs1dk"; }; buildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 98adbf3bda8..68f6f2e0ed5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -646,7 +646,9 @@ in sha256 = "0p2sxrpzd0vsk11zf3kb5h12yl1nq4yypb5mpjrm8ww0cfaijck2"; }; - btfs = callPackage ../os-specific/linux/btfs { }; + btfs = callPackage ../os-specific/linux/btfs { + libtorrentRasterbar = libtorrentRasterbar_1_09; + }; cabal2nix = self.haskell.lib.overrideCabal self.haskellPackages.cabal2nix (drv: { isLibrary = false; From 7522de2f4b5034cd00804de8df3cc7094eaba956 Mon Sep 17 00:00:00 2001 From: Michele Guerini Rocco Date: Sun, 14 Aug 2016 22:48:56 +0200 Subject: [PATCH 093/145] btfs: 2.10 -> 2.11 (#17737) (cherry picked from commit 340a9571f54583918663936456c5695c1c808688) --- pkgs/os-specific/linux/btfs/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/btfs/default.nix b/pkgs/os-specific/linux/btfs/default.nix index f0d1b3d7357..f6b3839c6bc 100644 --- a/pkgs/os-specific/linux/btfs/default.nix +++ b/pkgs/os-specific/linux/btfs/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "btfs-${version}"; - version = "2.10"; + version = "2.11"; src = fetchFromGitHub { owner = "johang"; repo = "btfs"; - rev = "2eac5e70a1ed22fa0761b6357c54fd90eea02de6"; - sha256 = "146vgwn79dnbkkn35safga55lkwhvarkmilparmr26hjb56cs1dk"; + rev = "fe585ca285690579db50b1624cec81ae76279ba2"; + sha256 = "1vqya2k8cx5x7jfapl9vmmb002brwbsz4j5xs4417kzv3j2bsms9"; }; buildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 68f6f2e0ed5..98adbf3bda8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -646,9 +646,7 @@ in sha256 = "0p2sxrpzd0vsk11zf3kb5h12yl1nq4yypb5mpjrm8ww0cfaijck2"; }; - btfs = callPackage ../os-specific/linux/btfs { - libtorrentRasterbar = libtorrentRasterbar_1_09; - }; + btfs = callPackage ../os-specific/linux/btfs { }; cabal2nix = self.haskell.lib.overrideCabal self.haskellPackages.cabal2nix (drv: { isLibrary = false; From 4cbcab54a633534fccfa3126da783b387fbff090 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sun, 14 Aug 2016 21:31:06 +0000 Subject: [PATCH 094/145] Revert "libtorrentRasterbar_1_09: remove, not used anymore" This reverts commit dd3142a14e056f23601f792adf58464d6eb5c2f5. --- pkgs/development/libraries/libtorrent-rasterbar/1.09.nix | 6 ++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 8 insertions(+) create mode 100644 pkgs/development/libraries/libtorrent-rasterbar/1.09.nix diff --git a/pkgs/development/libraries/libtorrent-rasterbar/1.09.nix b/pkgs/development/libraries/libtorrent-rasterbar/1.09.nix new file mode 100644 index 00000000000..e2809e9d483 --- /dev/null +++ b/pkgs/development/libraries/libtorrent-rasterbar/1.09.nix @@ -0,0 +1,6 @@ +{ callPackage, ... } @ args: + +callPackage ./generic.nix (args // { + version = "1.0.9"; + sha256 = "1kfydlvmx4pgi5lpbhqr4p3jr78p3f61ic32046mkp4yfyydrspl"; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 98adbf3bda8..89dba01a302 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8502,6 +8502,8 @@ in libtorrentRasterbar = callPackage ../development/libraries/libtorrent-rasterbar { }; + libtorrentRasterbar_1_09 = callPackage ../development/libraries/libtorrent-rasterbar/1.09.nix { }; + libtorrentRasterbar_0_16 = callPackage ../development/libraries/libtorrent-rasterbar/0.16.nix { # fix "unrecognized option -arch" error stdenv = if stdenv.isDarwin From 98b5e3a531a5f560314104ceecb730e59fc78a58 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Sun, 14 Aug 2016 17:34:55 -0400 Subject: [PATCH 095/145] darwin.libpthread: fix messed-up header We don't actually need the private headers and the private qos.h was overwriting the public one, causing weird issues downstream (especially with Swift's CoreFoundation) --- .../darwin/apple-source-releases/libpthread/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/libpthread/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libpthread/default.nix index 50794814aa0..c9d4b654a58 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libpthread/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libpthread/default.nix @@ -9,9 +9,11 @@ appleDerivation { mkdir -p $out/include/pthread/ mkdir -p $out/include/sys/_types cp pthread/*.h $out/include/pthread/ - cp private/*.h $out/include/pthread/ + + # This overwrites qos.h, and is probably not necessary, but I'll leave it here for now + # cp private/*.h $out/include/pthread/ + cp -r sys $out/include cp -r sys/_pthread/*.h $out/include/sys/_types/ - ''; } From 1861744e7cea7db1014b35ba3b1fdce6190d7ac9 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Sun, 14 Aug 2016 17:35:44 -0400 Subject: [PATCH 096/145] swift-corefoundation: init This currently only produces a static library, but is a start :) soon we might be able to incorporate it into our stdenv, but we need to get the build system to produce a proper .framework first. --- .../darwin/swift-corefoundation/default.nix | 38 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/os-specific/darwin/swift-corefoundation/default.nix diff --git a/pkgs/os-specific/darwin/swift-corefoundation/default.nix b/pkgs/os-specific/darwin/swift-corefoundation/default.nix new file mode 100644 index 00000000000..0ec282b503b --- /dev/null +++ b/pkgs/os-specific/darwin/swift-corefoundation/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, python, ninja, libpthread, libxml2 }: + +stdenv.mkDerivation { + name = "swift-corefoundation"; + + src = fetchFromGitHub { + owner = "apple"; + repo = "swift-corelibs-foundation"; + rev = "87d1a97d6af07fec568765c47daddff0aaa0d59c"; + sha256 = "05cmqwzqqxb489g9hq7hhj2yva12pi488iblbpnvyk1y4nx077cw"; + }; + + buildInputs = [ ninja python libpthread libxml2 ]; + + patchPhase = '' + HACK=$PWD/hack + mkdir -p $HACK/CoreFoundation + cp CoreFoundation/Base.subproj/CFAsmMacros.h $HACK/CoreFoundation + + substituteInPlace CoreFoundation/build.py \ + --replace "','" "'," \ + --replace '-I''${SYSROOT}/usr/include/libxml2' '-I${libxml2.dev}/include/libxml2' \ + --replace 'cf.ASFLAGS = " ".join([' "cf.ASFLAGS = ' '.join([ '-I$HACK', " \ + ''; + + configureFlags = "--sysroot unused"; + + buildPhase = '' + cd CoreFoundation + ../configure --sysroot foo + ninja + ''; + + installPhase = '' + mkdir -p $out/lib + cp ../Build/CoreFoundation/libCoreFoundation.a $out/lib + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 42cf49c1143..bb3689467ab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10848,6 +10848,8 @@ in opencflite = callPackage ../os-specific/darwin/opencflite {}; + swift-corefoundation = callPackage ../os-specific/darwin/swift-corefoundation { inherit (apple-source-releases) libpthread; }; + xcode = callPackage ../os-specific/darwin/xcode {}; osx_sdk = callPackage ../os-specific/darwin/osx-sdk {}; From 7cbab3437935509dacda1d2bde009d70501eab76 Mon Sep 17 00:00:00 2001 From: "Susan Potter (@SusanPotter)" Date: Sun, 14 Aug 2016 14:57:05 -0500 Subject: [PATCH 097/145] apacheKafka: 0.9.0.1 -> 0.10.0.1 --- pkgs/servers/apache-kafka/default.nix | 4 ++++ pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix index be9410d3048..418286d81f6 100755 --- a/pkgs/servers/apache-kafka/default.nix +++ b/pkgs/servers/apache-kafka/default.nix @@ -11,6 +11,10 @@ let scalaVersion = "2.11"; sha256 = "0ykcjv5dz9i5bws9my2d60pww1g9v2p2nqr67h0i2xrjm7az8a6v"; }; + "0.10" = { kafkaVersion = "0.10.0.1"; + scalaVersion = "2.11"; + sha256 = "0bdhzbhmm87a47162hyazcjmfibqg9r3ryzfjag7r0nxxmd64wrd"; + }; }; in diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 89dba01a302..56b5f6d29d4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6112,9 +6112,10 @@ in apacheAnt = callPackage ../development/tools/build-managers/apache-ant { }; - apacheKafka = apacheKafka_0_9; + apacheKafka = apacheKafka_0_10; apacheKafka_0_8 = callPackage ../servers/apache-kafka { majorVersion = "0.8"; }; apacheKafka_0_9 = callPackage ../servers/apache-kafka { majorVersion = "0.9"; }; + apacheKafka_0_10 = callPackage ../servers/apache-kafka { majorVersion = "0.10"; }; astyle = callPackage ../development/tools/misc/astyle { }; From 6cf13bfe6697734c282b4e36cd882cc8c3d3a429 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Sun, 14 Aug 2016 17:40:05 -0400 Subject: [PATCH 098/145] swift-corefoundation: remove spurious buildInput libpthread is part of libSystem, so there's no need to depend on it explicitly --- pkgs/os-specific/darwin/swift-corefoundation/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/darwin/swift-corefoundation/default.nix b/pkgs/os-specific/darwin/swift-corefoundation/default.nix index 0ec282b503b..34c64c11590 100644 --- a/pkgs/os-specific/darwin/swift-corefoundation/default.nix +++ b/pkgs/os-specific/darwin/swift-corefoundation/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "05cmqwzqqxb489g9hq7hhj2yva12pi488iblbpnvyk1y4nx077cw"; }; - buildInputs = [ ninja python libpthread libxml2 ]; + buildInputs = [ ninja python libxml2 ]; patchPhase = '' HACK=$PWD/hack From 4705a9a6c1809840333a612aabe1fc8feb5c089e Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Sun, 14 Aug 2016 17:42:03 -0400 Subject: [PATCH 099/145] swift-corefoundation: actually remove spurious dependency --- pkgs/os-specific/darwin/swift-corefoundation/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/swift-corefoundation/default.nix b/pkgs/os-specific/darwin/swift-corefoundation/default.nix index 34c64c11590..f69aa59c09c 100644 --- a/pkgs/os-specific/darwin/swift-corefoundation/default.nix +++ b/pkgs/os-specific/darwin/swift-corefoundation/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python, ninja, libpthread, libxml2 }: +{ stdenv, fetchFromGitHub, python, ninja, libxml2 }: stdenv.mkDerivation { name = "swift-corefoundation"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bb3689467ab..ffe9cb1bc88 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10848,7 +10848,7 @@ in opencflite = callPackage ../os-specific/darwin/opencflite {}; - swift-corefoundation = callPackage ../os-specific/darwin/swift-corefoundation { inherit (apple-source-releases) libpthread; }; + swift-corefoundation = callPackage ../os-specific/darwin/swift-corefoundation {}; xcode = callPackage ../os-specific/darwin/xcode {}; From 7802a0f14b3dfb5dfa06012afc11b228949cd827 Mon Sep 17 00:00:00 2001 From: Ram Kromberg Date: Mon, 15 Aug 2016 00:49:19 +0300 Subject: [PATCH 100/145] midori: update to current webkitgtk (#17731) --- .../networking/browsers/midori/default.nix | 33 +++++++++++-------- pkgs/top-level/all-packages.nix | 4 +-- 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix index 476137581cc..70968b97c3c 100644 --- a/pkgs/applications/networking/browsers/midori/default.nix +++ b/pkgs/applications/networking/browsers/midori/default.nix @@ -1,19 +1,21 @@ -{ stdenv, fetchurl, cmake, pkgconfig, intltool, vala, makeWrapper +{ stdenv, fetchurl, cmake, pkgconfig, intltool, vala, wrapGAppsHook , gtk3, webkitgtk, librsvg, libnotify, sqlite , glib_networking, gsettings_desktop_schemas, libsoup, pcre, gnome3 +, libxcb, libpthreadstubs, libXdmcp, libxkbcommon, epoxy, at_spi2_core +, zeitgeistSupport ? false, zeitgeist ? null }: -let - version = "0.5.11"; -in +assert zeitgeistSupport -> zeitgeist != null; + stdenv.mkDerivation rec { name = "midori-${version}"; + version = "0.5.11"; meta = with stdenv.lib; { description = "Lightweight WebKitGTK+ web browser"; homepage = "http://midori-browser.org"; - license = licenses.lgpl21Plus; - platforms = platforms.linux; + license = with licenses; [ lgpl21Plus ]; + platforms = with platforms; linux; maintainers = with maintainers; [ raskin ramkromberg ]; }; @@ -26,24 +28,29 @@ stdenv.mkDerivation rec { sha256 = "0gcwqkcyliqz10i33ww3wl02mmfnl7jzl2d493l4l53ipsb1l6cn"; }; + nativeBuildInputs = [ + pkgconfig wrapGAppsHook cmake intltool + ]; + buildInputs = [ - cmake pkgconfig intltool vala makeWrapper - webkitgtk librsvg libnotify sqlite gsettings_desktop_schemas pcre gnome3.gcr + vala + gtk3 webkitgtk librsvg libnotify sqlite gsettings_desktop_schemas pcre gnome3.gcr + libxcb libpthreadstubs libXdmcp libxkbcommon epoxy at_spi2_core (libsoup.override {gnomeSupport = true; valaSupport = true;}) + ] ++ stdenv.lib.optionals zeitgeistSupport [ + zeitgeist ]; cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" - "-DUSE_ZEITGEIST=OFF" - "-DHALF_BRO_INCOM_WEBKIT2=OFF" + "-DUSE_ZEITGEIST=${if zeitgeistSupport then "ON" else "OFF"}" + "-DHALF_BRO_INCOM_WEBKIT2=ON" "-DUSE_GTK3=1" ]; NIX_LDFLAGS="-lX11"; preFixup = '' - wrapProgram $out/bin/midori \ - --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" + gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules") ''; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 89dba01a302..e19e5d00976 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13848,9 +13848,7 @@ in mid2key = callPackage ../applications/audio/mid2key { }; - midori-unwrapped = callPackage ../applications/networking/browsers/midori { - webkitgtk = webkitgtk24x; - }; + midori-unwrapped = callPackage ../applications/networking/browsers/midori { }; midori = wrapFirefox midori-unwrapped { }; mikmod = callPackage ../applications/audio/mikmod { }; From ea34fe82bced57d11127d4c23e5a5ade9fa56334 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Sun, 14 Aug 2016 18:22:19 -0400 Subject: [PATCH 101/145] swift-corefoundation: some cleanup I upstreamed some patches so I'm using those now --- .../darwin/swift-corefoundation/default.nix | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/pkgs/os-specific/darwin/swift-corefoundation/default.nix b/pkgs/os-specific/darwin/swift-corefoundation/default.nix index f69aa59c09c..969168fa54b 100644 --- a/pkgs/os-specific/darwin/swift-corefoundation/default.nix +++ b/pkgs/os-specific/darwin/swift-corefoundation/default.nix @@ -6,28 +6,22 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "apple"; repo = "swift-corelibs-foundation"; - rev = "87d1a97d6af07fec568765c47daddff0aaa0d59c"; - sha256 = "05cmqwzqqxb489g9hq7hhj2yva12pi488iblbpnvyk1y4nx077cw"; + rev = "dce4233f583ec15190b240d6116396bf9641cd57"; + sha256 = "0i2ldvy14x05k2vgl5z0g5l2i5llifdfbij5zwfdwb8jmmq215qr"; }; buildInputs = [ ninja python libxml2 ]; patchPhase = '' - HACK=$PWD/hack - mkdir -p $HACK/CoreFoundation - cp CoreFoundation/Base.subproj/CFAsmMacros.h $HACK/CoreFoundation - substituteInPlace CoreFoundation/build.py \ - --replace "','" "'," \ --replace '-I''${SYSROOT}/usr/include/libxml2' '-I${libxml2.dev}/include/libxml2' \ - --replace 'cf.ASFLAGS = " ".join([' "cf.ASFLAGS = ' '.join([ '-I$HACK', " \ ''; - configureFlags = "--sysroot unused"; + configurePhase = ":"; buildPhase = '' cd CoreFoundation - ../configure --sysroot foo + ../configure --sysroot unused ninja ''; From cbe8832cd7ad4c57eec43e0a66b782004bafa4ee Mon Sep 17 00:00:00 2001 From: Svein Ove Aas Date: Sun, 14 Aug 2016 23:47:00 +0100 Subject: [PATCH 102/145] factorio: Fix the fetch script (#17741) --- pkgs/games/factorio/fetch.nix | 4 ++-- pkgs/games/factorio/fetch.sh | 21 ++++++++++++++++----- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/pkgs/games/factorio/fetch.nix b/pkgs/games/factorio/fetch.nix index 78c7faf018c..04b31ac10d3 100644 --- a/pkgs/games/factorio/fetch.nix +++ b/pkgs/games/factorio/fetch.nix @@ -1,4 +1,4 @@ -{ stdenv, curl, cacert +{ stdenv, curl, xidel, cacert # Begin download parameters , username ? "" , password ? "" @@ -18,7 +18,7 @@ stdenv.mkDerivation { name = "factorio.tar.gz"; - buildInputs = [ curl ]; + buildInputs = [ curl xidel ]; inherit url loginUrl username password cacert; diff --git a/pkgs/games/factorio/fetch.sh b/pkgs/games/factorio/fetch.sh index d6549c0a676..30d9c9fdefe 100644 --- a/pkgs/games/factorio/fetch.sh +++ b/pkgs/games/factorio/fetch.sh @@ -9,23 +9,34 @@ curl="curl \ --max-redirs 20 \ --retry 3 \ --cacert $cacert/etc/ssl/certs/ca-bundle.crt \ + -b cookies \ + -c cookies \ $curlOpts \ $NIX_CURL_FLAGS" # We don't want the password to be on any program's argv, as it may be # visible in /proc. Writing it to file with echo should be safe, since # it's a shell builtin. -echo "password=$password" > password +echo -n "$password" > password # Might as well hide the username as well. -echo "username-or-email=$username" > username +echo -n "$username" > username + +# Get a CSRF token. +csrf=$($curl $loginUrl | xidel - -e '//input[@id="csrf_token"]/@value') # Log in. We don't especially care about the result, but let's check if login failed. -$curl -c cookies -d @username -d @password $loginUrl -D headers > /dev/null +$curl --data-urlencode csrf_token="$csrf" \ + --data-urlencode username_or_email@username \ + --data-urlencode password@password \ + -d action=Login \ + $loginUrl -D headers > /dev/null -if grep -q 'Location: /' headers; then +if grep -q 'Location: https://' headers; then # Now download. We need --insecure for this, but the sha256 should cover us. - $curl -b cookies --insecure --location $url > $out + $curl --insecure --location $url > $out + set +x else + set +x echo 'Login failed' echo 'Please set username and password with config.nix,' echo 'or /etc/nix/nixpkgs-config.nix if on NixOS.' From f5b2d63e4c5bd1d01c286666ccd5252a380fd68c Mon Sep 17 00:00:00 2001 From: mimadrid Date: Sun, 14 Aug 2016 18:30:26 +0200 Subject: [PATCH 103/145] nano: 2.6.2 -> 2.6.3 --- pkgs/applications/editors/nano/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index 62da04577f7..dee2d6f0dff 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -12,10 +12,10 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "nano-${version}"; - version = "2.6.2"; + version = "2.6.3"; src = fetchurl { url = "https://nano-editor.org/dist/v2.6/${name}.tar.gz"; - sha256 = "11c9iqiah4q7q3ndn7z9192a796vp4fffkg27s6q1dn8avp06dj5"; + sha256 = "00ym3zws1vdds726drgr5wj14mjn18d96ghn6vjci0915zhm8h2g"; }; nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext; buildInputs = [ ncurses ]; From 792ba4a4667a4c1211b4fcfed4887780b902b4fc Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 1 Aug 2016 11:30:51 +0000 Subject: [PATCH 104/145] libbsd: remove unnecessary patchPhase `substituteInPlace` was operating on a non-existant file. --- pkgs/development/libraries/libbsd/default.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix index 8597e0d9cf1..b7ec7533880 100644 --- a/pkgs/development/libraries/libbsd/default.nix +++ b/pkgs/development/libraries/libbsd/default.nix @@ -9,12 +9,6 @@ in stdenv.mkDerivation { sha256 = "02i5brb2007sxq3mn862mr7yxxm0g6nj172417hjyvjax7549xmj"; }; - patchPhase = '' - substituteInPlace Makefile \ - --replace "/usr" "$out" \ - --replace "{exec_prefix}" "{prefix}" - ''; - meta = { description = "Common functions found on BSD systems"; homepage = http://libbsd.freedesktop.org/; From a37d695c95a42cbe4df4e0ba06f330ceae9db2c0 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 1 Aug 2016 12:03:08 +0000 Subject: [PATCH 105/145] linuxPackages.spl: remove unnecessary substituteInPlace `substituteInPlace` was operating on a non-existant file. Updated to use `autoreconfHook`. --- pkgs/os-specific/linux/spl/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index 91fce8f2aa2..45926228b6c 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, stdenv, autoconf, automake, libtool, coreutils, gawk +{ fetchFromGitHub, stdenv, autoreconfHook, coreutils, gawk , configFile ? "all" # Kernel dependencies @@ -28,14 +28,10 @@ stdenv.mkDerivation rec { patches = [ ./const.patch ./install_prefix.patch ]; - buildInputs = [ autoconf automake libtool ]; + nativeBuildInputs = [ autoreconfHook ]; preConfigure = '' - ./autogen.sh - substituteInPlace ./module/spl/spl-generic.c --replace /usr/bin/hostid hostid - substituteInPlace ./module/spl/spl-module.c --replace /bin/mknod mknod - substituteInPlace ./module/spl/spl-generic.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:${gawk}:/bin" substituteInPlace ./module/splat/splat-vnode.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin" substituteInPlace ./module/splat/splat-linux.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin" From afbeda22d561114209e79da88a06aac810a33637 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 1 Aug 2016 12:14:02 +0000 Subject: [PATCH 106/145] fail2ban: remove unnecessary substituteInPlace `substituteInPlace` was operating on non-existant files. --- pkgs/tools/security/fail2ban/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix index c886b10e220..70dfb9e82c6 100644 --- a/pkgs/tools/security/fail2ban/default.nix +++ b/pkgs/tools/security/fail2ban/default.nix @@ -17,11 +17,6 @@ pythonPackages.buildPythonApplication { ++ (stdenv.lib.optional stdenv.isLinux pythonPackages.systemd); preConfigure = '' - for i in fail2ban-client fail2ban-regex fail2ban-server; do - substituteInPlace $i \ - --replace /usr/share/fail2ban $out/share/fail2ban - done - for i in config/action.d/sendmail*.conf; do substituteInPlace $i \ --replace /usr/sbin/sendmail sendmail \ From d1d9b93417679bffeacc06ee4443956d04e9ce37 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 1 Aug 2016 12:18:48 +0000 Subject: [PATCH 107/145] pythonPackages.urllib3: remove unnecessary substituteInPlace `substituteInPlace` was operating on a non-existant file. --- pkgs/top-level/python-packages.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8167503ca30..b064618520a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5752,10 +5752,6 @@ in modules // { sha256 = "1ikj72kd4cdcq7pmmcd5p6s9dvp7wi0zw01635v4xzkid5vi598f"; }; - preConfigure = '' - substituteInPlace test-requirements.txt --replace 'nose==1.3' 'nose' - ''; - doCheck = !isPy3k; # lots of transient failures checkPhase = '' # Not worth the trouble @@ -5768,7 +5764,6 @@ in modules // { nosetests -v --cover-min-percentage 1 ''; - buildInputs = with self; [ coverage tornado mock nose ]; meta = { From 3fa7ef49d5417ba9ce4be49590e6714e4c74cf63 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 1 Aug 2016 12:29:00 +0000 Subject: [PATCH 108/145] gnupg21: remove unnecessary substituteInPlace `substituteInPlace` was operating on a non-existant file. --- pkgs/tools/security/gnupg/21.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix index 30ce33bd6a5..baee3a42d7b 100644 --- a/pkgs/tools/security/gnupg/21.nix +++ b/pkgs/tools/security/gnupg/21.nix @@ -33,8 +33,6 @@ stdenv.mkDerivation rec { configureFlags = optional x11Support "--with-pinentry-pgm=${pinentry}/bin/pinentry"; - postConfigure = "substituteAllInPlace tools/gpgkey2ssh.c"; - meta = with stdenv.lib; { homepage = http://gnupg.org; description = "A complete and free implementation of the OpenPGP standard"; From f11f3b05198222ab165e5f10587857b9b17932f6 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 1 Aug 2016 13:01:10 +0000 Subject: [PATCH 109/145] gnome3.vte: remove unnecessary substituteInPlace `substituteInPlace` was operating on a non-existant file. --- pkgs/desktops/gnome-3/3.20/core/vte/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.20/core/vte/default.nix b/pkgs/desktops/gnome-3/3.20/core/vte/default.nix index 38850f0fe76..6b7eb804008 100644 --- a/pkgs/desktops/gnome-3/3.20/core/vte/default.nix +++ b/pkgs/desktops/gnome-3/3.20/core/vte/default.nix @@ -19,10 +19,6 @@ let baseAttrs = rec { enableParallelBuilding = true; - postInstall = '' - substituteInPlace $out/lib/libvte2_90.la --replace "-lncurses" "-L${ncurses.out}/lib -lncurses" - ''; - meta = with stdenv.lib; { homepage = http://www.gnome.org/; description = "A library implementing a terminal emulator widget for GTK+"; From 45d183614d7f9ba86884ef5a8887ea1d7f41a640 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sun, 14 Aug 2016 20:24:03 +0000 Subject: [PATCH 110/145] gnome3.gnome_control_center: remove unneeded substituteInPlace --- pkgs/desktops/gnome-3/3.20/core/gnome-control-center/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-control-center/default.nix index 1b83bc061b7..e77e9e19970 100644 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/3.20/core/gnome-control-center/default.nix @@ -30,7 +30,6 @@ stdenv.mkDerivation rec { networkmanager modemmanager makeWrapper gnome3.gnome-bluetooth grilo ]; preBuild = '' - substituteInPlace tz.h --replace "/usr/share/zoneinfo/zone.tab" "${tzdata}/share/zoneinfo/zone.tab" substituteInPlace panels/datetime/tz.h --replace "/usr/share/zoneinfo/zone.tab" "${tzdata}/share/zoneinfo/zone.tab" # hack to make test-endianess happy From b5194d7b9ad27b834288585a2a70aba19cea3586 Mon Sep 17 00:00:00 2001 From: Mike Cooper Date: Sun, 14 Aug 2016 16:03:19 -0700 Subject: [PATCH 111/145] firefox-bin: Add libxcb to build inputs (#17700) This is needed for future versions of Firefox, and makes external packaging of prerelease versions of Firefox much easier. --- pkgs/applications/networking/browsers/firefox-bin/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index e1e603b28fd..d782f4a7b53 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -17,6 +17,7 @@ , gtk3 , libX11 , libXScrnSaver +, libxcb , libXcomposite , libXdamage , libXext @@ -90,6 +91,7 @@ stdenv.mkDerivation { libX11 libXScrnSaver libXcomposite + libxcb libXdamage libXext libXfixes From c29e76063e5561f267dca32316342c3e9ba71845 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Mon, 15 Aug 2016 03:46:43 +0200 Subject: [PATCH 112/145] pypi2nix: 1.3.0 -> 1.4.0 --- pkgs/development/tools/pypi2nix/default.nix | 21 ++++++--------------- pkgs/development/tools/pypi2nix/deps.nix | 8 ++++++++ 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/pkgs/development/tools/pypi2nix/default.nix b/pkgs/development/tools/pypi2nix/default.nix index 2884b23049a..4e152ea4f56 100644 --- a/pkgs/development/tools/pypi2nix/default.nix +++ b/pkgs/development/tools/pypi2nix/default.nix @@ -3,21 +3,17 @@ let deps = import ./deps.nix { inherit fetchurl; }; - version = "1.3.0"; + version = "1.4.0"; src = fetchurl { url = "https://github.com/garbas/pypi2nix/archive/v${version}.tar.gz"; - sha256 = "0mk9v4s51jdrrcs78v3cm131pz3fdhjkd4cmmfn1kkcfcpqzw6j8"; + sha256 = "0pkm93lg7i2chcw59bm5yv09qwcq3wifk8hgr6i3dvv20mifbndr"; }; in stdenv.mkDerivation rec { name = "pypi2nix-${version}"; srcs = with deps; [ src - pip click - setuptools - zcbuildout - zcrecipeegg requests ]; # six attrs effect ]; buildInputs = [ python zip makeWrapper ]; @@ -26,17 +22,13 @@ in stdenv.mkDerivation rec { postUnpack = '' mkdir -p $out/pkgs - mv pip-*/pip $out/pkgs/pip mv click-*/click $out/pkgs/click - mv setuptools-*/setuptools $out/pkgs/setuptools - mv zc.buildout-*/src/zc $out/pkgs/zc - mv zc.recipe.egg-*/src/zc/recipe $out/pkgs/zc/recipe # mv six-*/six.py $out/pkgs/ # mv attrs-*/src/attr $out/pkgs/attrs # mv effect-*/effect $out/pkgs/effect mv requests-*/requests $out/pkgs/ - if [ -z "$IN_NIX_SHELL" ]; then + if [ "$IN_NIX_SHELL" != "1" ]; then if [ -e git-export ]; then mv git-export/src/pypi2nix $out/pkgs/pypi2nix else @@ -48,9 +40,9 @@ in stdenv.mkDerivation rec { commonPhase = '' mkdir -p $out/bin - echo "#!${python}/bin/python3" > $out/bin/pypi2nix - echo "import pypi2nix.cli" >> $out/bin/pypi2nix - echo "pypi2nix.cli.main()" >> $out/bin/pypi2nix + echo "#!${python.interpreter}" > $out/bin/pypi2nix + echo "import pypi2nix.cli" >> $out/bin/pypi2nix + echo "pypi2nix.cli.main()" >> $out/bin/pypi2nix chmod +x $out/bin/pypi2nix @@ -81,6 +73,5 @@ in stdenv.mkDerivation rec { homepage = https://github.com/garbas/pypi2nix; description = "A tool that generates nix expressions for your python packages, so you don't have to."; maintainers = with stdenv.lib.maintainers; [ garbas ]; - platforms = with stdenv.lib.platforms; unix; }; } diff --git a/pkgs/development/tools/pypi2nix/deps.nix b/pkgs/development/tools/pypi2nix/deps.nix index 5d6f23c26c0..e67cb51c67c 100644 --- a/pkgs/development/tools/pypi2nix/deps.nix +++ b/pkgs/development/tools/pypi2nix/deps.nix @@ -17,6 +17,9 @@ rec { zcrecipeeggVersion = "2.0.3"; zcrecipeeggHash = "69a8ce276029390a36008150444aa0b4"; + buildoutrequirementsVersion = "0.2.2"; + buildoutrequirementsHash = "0b4e53d871b167eaac0846942221af00"; + wheelVersion = "0.29.0"; wheelHash = "555a67e4507cedee23a0deb9651e452f"; @@ -71,6 +74,11 @@ rec { md5 = zcrecipeeggHash; }; + buildoutrequirements = fetchurl { + url = "https://github.com/garbas/buildout.requirements/archive/1e2977e2d254184399401746736d2b17c912b350.tar.gz"; + md5 = buildoutrequirementsHash; + }; + wheel = fetchurl { url = "https://pypi.python.org/packages/c9/1d/bd19e691fd4cfe908c76c429fe6e4436c9e83583c4414b54f6c85471954a/wheel-${wheelVersion}.tar.gz"; md5 = wheelHash; From e775eff2a94164a0df32b8447ec38c7873226b38 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Mon, 15 Aug 2016 04:01:14 +0200 Subject: [PATCH 113/145] pypi2nix: wrong hash --- pkgs/development/tools/pypi2nix/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/tools/pypi2nix/default.nix b/pkgs/development/tools/pypi2nix/default.nix index 4e152ea4f56..01fe4b73d6c 100644 --- a/pkgs/development/tools/pypi2nix/default.nix +++ b/pkgs/development/tools/pypi2nix/default.nix @@ -6,8 +6,7 @@ let version = "1.4.0"; src = fetchurl { url = "https://github.com/garbas/pypi2nix/archive/v${version}.tar.gz"; - sha256 = "0pkm93lg7i2chcw59bm5yv09qwcq3wifk8hgr6i3dvv20mifbndr"; - + sha256 = "0w5f10p4d4ppwg2plbbrmqwmi1ycgpaidyajza11c9svka014zrb"; }; in stdenv.mkDerivation rec { name = "pypi2nix-${version}"; From 2a8718fb0bcc175ca48f0a2eb5d0dcc3b18da8e6 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 15 Aug 2016 04:26:11 +0200 Subject: [PATCH 114/145] linux_4_5: remove, not support by upstream anymore --- pkgs/os-specific/linux/kernel/linux-4.5.nix | 19 ------------------- pkgs/top-level/all-packages.nix | 13 ------------- 2 files changed, 32 deletions(-) delete mode 100644 pkgs/os-specific/linux/kernel/linux-4.5.nix diff --git a/pkgs/os-specific/linux/kernel/linux-4.5.nix b/pkgs/os-specific/linux/kernel/linux-4.5.nix deleted file mode 100644 index 63db1779014..00000000000 --- a/pkgs/os-specific/linux/kernel/linux-4.5.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, perl, buildLinux, ... } @ args: - -import ./generic.nix (args // rec { - version = "4.5.7"; - extraMeta.branch = "4.5"; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0azvh7lf9kak1xcs5f9smlvx4gkf45vyandizmxhx0zyjlhacw60"; - }; - - kernelPatches = args.kernelPatches; - - features.iwlwifi = true; - features.efiBootStub = true; - features.needsCifsUtils = true; - features.canDisableNetfilterConntrackHelpers = true; - features.netfilterRPFilter = true; -} // (args.argsOverride or {})) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d7ef90c69e0..fc94f85e1e2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11129,18 +11129,6 @@ in ]; }; - linux_4_5 = callPackage ../os-specific/linux/kernel/linux-4.5.nix { - kernelPatches = - [ kernelPatches.bridge_stp_helper - kernelPatches.hiddev_CVE_2016_5829 - ] - ++ lib.optionals ((platform.kernelArch or null) == "mips") - [ kernelPatches.mips_fpureg_emu - kernelPatches.mips_fpu_sigill - kernelPatches.mips_ext3_n32 - ]; - }; - linux_4_6 = callPackage ../os-specific/linux/kernel/linux-4.6.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -11332,7 +11320,6 @@ in linuxPackages_3_18 = recurseIntoAttrs (self.linuxPackagesFor self.linux_3_18 linuxPackages_3_18); linuxPackages_4_1 = recurseIntoAttrs (self.linuxPackagesFor self.linux_4_1 linuxPackages_4_1); linuxPackages_4_4 = recurseIntoAttrs (self.linuxPackagesFor self.linux_4_4 linuxPackages_4_4); - linuxPackages_4_5 = recurseIntoAttrs (self.linuxPackagesFor self.linux_4_5 linuxPackages_4_5); linuxPackages_4_6 = recurseIntoAttrs (self.linuxPackagesFor self.linux_4_6 linuxPackages_4_6); linuxPackages_4_7 = recurseIntoAttrs (self.linuxPackagesFor self.linux_4_7 linuxPackages_4_7); # Don't forget to update linuxPackages_latest! From 64c79e85269f34059593e3490800dd9e9d80b44a Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 15 Aug 2016 04:27:02 +0200 Subject: [PATCH 115/145] linux: 4.6.5 -> 4.6.6 --- pkgs/os-specific/linux/kernel/linux-4.6.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.6.nix b/pkgs/os-specific/linux/kernel/linux-4.6.nix index 0559df72ae6..c7ea0a95f81 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.6.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.6.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.6.5"; + version = "4.6.6"; extraMeta.branch = "4.6"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1i8ksv8w6dn86q54gzk230gxrylqx3m55x789d29q5balg456bby"; + sha256 = "1lx00j0z0rasmc87mcvqd1h6r4znb9c2q22jbs2mrissr5w05vgm"; }; kernelPatches = args.kernelPatches; From 397a17aef9e6c213cc2b3adc2c2ca3db76b213cb Mon Sep 17 00:00:00 2001 From: Michal Rus Date: Mon, 15 Aug 2016 05:45:48 +0200 Subject: [PATCH 116/145] visualvm: init at 1.3.8 (#17745) --- lib/maintainers.nix | 1 + .../tools/java/visualvm/default.nix | 42 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 45 insertions(+) create mode 100644 pkgs/development/tools/java/visualvm/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 8971e6047d6..af43ae639ea 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -248,6 +248,7 @@ meditans = "Carlo Nucera "; meisternu = "Matt Miemiec "; michaelpj = "Michael Peyton Jones "; + michalrus = "Michal Rus "; michelk = "Michel Kuhlmann "; mimadrid = "Miguel Madrid "; mingchuan = "Ming Chuan "; diff --git a/pkgs/development/tools/java/visualvm/default.nix b/pkgs/development/tools/java/visualvm/default.nix new file mode 100644 index 00000000000..2620a5b7741 --- /dev/null +++ b/pkgs/development/tools/java/visualvm/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchzip, lib, makeWrapper, jdk, gtk }: + +stdenv.mkDerivation rec { + name = "visualvm-1.3.8"; + + src = fetchzip { + url = "https://java.net/projects/visualvm/downloads/download/release138/visualvm_138.zip"; + sha256 = "09wsi85z1g7bwyfhb37vw0gy3wl0j1cy35aj59rg7067q262gy1y"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + rm bin/visualvm.exe + + substituteInPlace etc/visualvm.conf \ + --replace "#visualvm_jdkhome=" "visualvm_jdkhome=" \ + --replace "/path/to/jdk" "${jdk.home}" \ + --replace 'visualvm_default_options="' 'visualvm_default_options="--laf com.sun.java.swing.plaf.gtk.GTKLookAndFeel -J-Dawt.useSystemAAFontSettings=lcd -J-Dswing.aatext=true ' + + cp -r . $out + + # To get the native LAF, JVM needs to see GTK’s .so-s. + wrapProgram $out/bin/visualvm \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ gtk ]}" + ''; + + meta = with stdenv.lib; { + description = "A visual interface for viewing information about Java applications"; + longDescription = '' + VisualVM is a visual tool integrating several commandline JDK + tools and lightweight profiling capabilities. Designed for both + production and development time use, it further enhances the + capability of monitoring and performance analysis for the Java + SE platform. + ''; + homepage = https://visualvm.java.net/; + license = licenses.gpl2ClasspathPlus; + platforms = platforms.all; + maintainers = with maintainers; [ michalrus ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fc94f85e1e2..d336eb4ae1a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6793,6 +6793,8 @@ in ocamlPackages = ocamlPackages_4_02; }); + visualvm = callPackage ../development/tools/java/visualvm { }; + xc3sprog = callPackage ../development/tools/misc/xc3sprog { }; xmlindent = callPackage ../development/web/xmlindent {}; From 9b4a7984a4803ed5ab9c9515682778444370eb01 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 15 Aug 2016 11:36:12 +0300 Subject: [PATCH 117/145] qutebrowser: add shared files and cleanup --- .../browsers/qutebrowser/default.nix | 39 +++++++++++++++---- pkgs/top-level/all-packages.nix | 6 +-- 2 files changed, 35 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index c8a719b194a..6c4dcc4e119 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -1,6 +1,7 @@ -{ stdenv, fetchurl, python, buildPythonApplication, qtmultimedia, pyqt5 -, jinja2, pygments, pyyaml, pypeg2, gst-plugins-base, gst-plugins-good -, gst-plugins-bad, gst-libav, wrapGAppsHook, glib_networking, makeQtWrapper }: +{ stdenv, fetchurl, buildPythonApplication, makeQtWrapper, wrapGAppsHook +, qtmultimedia, pyqt5, jinja2, pygments, pyyaml, pypeg2, glib_networking +, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2, libxslt +, gst-plugins-base, gst-plugins-good, gst-plugins-bad, gst-plugins-ugly, gst-libav }: let version = "0.8.2"; in @@ -16,18 +17,42 @@ buildPythonApplication rec { # Needs tox doCheck = false; - buildInputs = [ wrapGAppsHook makeQtWrapper + buildInputs = [ qtmultimedia - gst-plugins-base gst-plugins-good gst-plugins-bad gst-libav - glib_networking ]; + gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav + glib_networking + ]; + + nativeBuildInputs = [ + makeQtWrapper wrapGAppsHook asciidoc docbook_xml_dtd_45 docbook_xsl libxml2 libxslt + ]; propagatedBuildInputs = [ - python pyyaml pyqt5 jinja2 pygments pypeg2 + pyyaml pyqt5 jinja2 pygments pypeg2 ]; + postPatch = '' + sed -i "s,/usr/share/qutebrowser,$out/share/qutebrowser,g" qutebrowser/utils/standarddir.py + ''; + + postBuild = '' + a2x -f manpage doc/qutebrowser.1.asciidoc + ''; + postInstall = '' mv $out/bin/qutebrowser $out/bin/.qutebrowser-noqtpath makeQtWrapper $out/bin/.qutebrowser-noqtpath $out/bin/qutebrowser + + install -Dm644 doc/qutebrowser.1 "$out/share/man/man1/qutebrowser.1" + install -Dm644 qutebrowser.desktop \ + "$out/share/applications/qutebrowser.desktop" + for i in 16 24 32 48 64 128 256 512; do + install -Dm644 "icons/qutebrowser-''${i}x''${i}.png" \ + "$out/share/icons/hicolor/''${i}x''${i}/apps/qutebrowser.png" + done + install -Dm644 icons/qutebrowser.svg \ + "$out/share/icons/hicolor/scalable/apps/qutebrowser.svg" + install -Dm755 -t "$out/share/qutebrowser/userscripts/" misc/userscripts/* ''; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d336eb4ae1a..603374b5e6f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14408,9 +14408,9 @@ in gst_plugins_bad = null; }; - qutebrowser = qt55.callPackage ../applications/networking/browsers/qutebrowser { - inherit (python34Packages) buildPythonApplication python pyqt5 jinja2 pygments pyyaml pypeg2; - inherit (gst_all_1) gst-plugins-base gst-plugins-good gst-plugins-bad gst-libav; + qutebrowser = qt5.callPackage ../applications/networking/browsers/qutebrowser { + inherit (python3Packages) buildPythonApplication pyqt5 jinja2 pygments pyyaml pypeg2; + inherit (gst_all_1) gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav; }; rabbitvcs = callPackage ../applications/version-management/rabbitvcs {}; From 21df40f85fd3c59cb90a6a44f05c3d4d29daeffa Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Mon, 15 Aug 2016 12:41:45 +0200 Subject: [PATCH 118/145] systemd-cryptsetup-generator: Fix bug. The annoying wrapper script also wraps `systemd-cryptsetup`. We need to copy the original binary to $out too. --- pkgs/os-specific/linux/systemd/cryptsetup-generator.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix b/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix index 3d617ece1c0..dc0a23be98f 100644 --- a/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix +++ b/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix @@ -18,10 +18,10 @@ stdenv.lib.overrideDerivation systemd (p: { # For some reason systemd-cryptsetup-generator is a wrapper-script # with the current release of systemd. We want the real one. - # TODO: Revert 3efadce when the wrapper-script is gone + # TODO: Remove `.libs` prefix when the wrapper-script is gone installPhase = '' mkdir -p $out/lib/systemd/ - cp systemd-cryptsetup $out/lib/systemd/systemd-cryptsetup + cp .libs/systemd-cryptsetup $out/lib/systemd/systemd-cryptsetup cp .libs/*.so $out/lib/ mkdir -p $out/lib/systemd/system-generators/ From 6eb2ca22477d756d4310f07dcec3aba835ca4486 Mon Sep 17 00:00:00 2001 From: obadz Date: Mon, 15 Aug 2016 13:05:55 +0100 Subject: [PATCH 119/145] haskellPackages.Lazy-Pbkdf2.i686-linux: don't run tests that keep aborting --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 5faceef8573..a6f5a4ace67 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -25,6 +25,9 @@ self: super: { statistics = dontCheck super.statistics; c2hs = if pkgs.stdenv.isDarwin then dontCheck super.c2hs else super.c2hs; + # This test keeps being aborted because it runs too quietly for too long + Lazy-Pbkdf2 = if pkgs.stdenv.isi686 then dontCheck super.Lazy-Pbkdf2 else super.Lazy-Pbkdf2; + # Use the default version of mysql to build this package (which is actually mariadb). mysql = super.mysql.override { mysql = pkgs.mysql.lib; }; From dacc3fa98575caee3d2a5f27dfad9a8e35041382 Mon Sep 17 00:00:00 2001 From: Robin Lambertz Date: Mon, 15 Aug 2016 14:41:26 +0200 Subject: [PATCH 120/145] phpfpm: allow old config format as well (#17754) --- nixos/modules/services/web-servers/phpfpm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-servers/phpfpm/default.nix b/nixos/modules/services/web-servers/phpfpm/default.nix index 819d0c251bf..29cfbb8e9a0 100644 --- a/nixos/modules/services/web-servers/phpfpm/default.nix +++ b/nixos/modules/services/web-servers/phpfpm/default.nix @@ -105,7 +105,7 @@ in { }; }; - config = mkIf (cfg.pools != {}) { + config = mkIf (cfg.pools != {} || cfg.poolConfigs != {}) { systemd.services.phpfpm = { wantedBy = [ "multi-user.target" ]; From 888570438c664808c95e35c2b51cced43fde4970 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 14 Aug 2016 19:23:59 -0500 Subject: [PATCH 121/145] breeze-gtk: install GTK 3.20-compatible theme --- pkgs/desktops/kde-5/plasma/breeze-gtk.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/desktops/kde-5/plasma/breeze-gtk.nix b/pkgs/desktops/kde-5/plasma/breeze-gtk.nix index 664387de170..57de2fa2d47 100644 --- a/pkgs/desktops/kde-5/plasma/breeze-gtk.nix +++ b/pkgs/desktops/kde-5/plasma/breeze-gtk.nix @@ -5,4 +5,5 @@ plasmaPackage { name = "breeze-gtk"; nativeBuildInputs = [ ecm ]; + cmakeFlags = [ "-DWITH_GTK3_VERSION=3.20" ]; } From 9ff4501c55ea1467278324a6111b338a19d211cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?ibrahim=20Sa=C4=9F=C4=B1ro=C4=9Flu?= Date: Mon, 15 Aug 2016 17:13:05 +0300 Subject: [PATCH 122/145] marathon: 0.15.3 -> v1.1.1 (#17612) --- pkgs/applications/networking/cluster/marathon/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/marathon/default.nix b/pkgs/applications/networking/cluster/marathon/default.nix index 11c275c9f49..f737d4e04bd 100644 --- a/pkgs/applications/networking/cluster/marathon/default.nix +++ b/pkgs/applications/networking/cluster/marathon/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "marathon-${version}"; - version = "0.15.3"; + version = "1.1.1"; src = fetchurl { - url = "https://downloads.mesosphere.io/marathon/v${version}/marathon-${version}.tgz"; - sha256 = "1br4k596sjp4cf5l2nyaqhlsfdr443n08fvdyf4kilhr803x2rjq"; + url = "https://downloads.mesosphere.com/marathon/v${version}/marathon-${version}.tgz"; + sha256 = "35a80401383f6551c45c676beed30b3c1af6d3ad027f44735c208abe8eaca93d"; }; buildInputs = [ makeWrapper jdk mesos ]; From 3313353899aebd9e6907648387ae1d966a6e41a0 Mon Sep 17 00:00:00 2001 From: Michal Rus Date: Mon, 15 Aug 2016 16:25:46 +0200 Subject: [PATCH 123/145] guitarix: 0.34.0 -> 0.35.1; add glib_networking dep (#17740) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit glib_networking is needed for downloading presets from withing Guitarix UI. Before, Guitarix would return an “install glib_networking” error. --- pkgs/applications/audio/guitarix/default.nix | 22 +++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index 7af7fbb4a25..af213f1a835 100644 --- a/pkgs/applications/audio/guitarix/default.nix +++ b/pkgs/applications/audio/guitarix/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, gettext, intltool, pkgconfig, python -, avahi, bluez, boost, eigen, fftw, glib, glibmm, gtk, gtkmm, libjack2 +, avahi, bluez, boost, eigen, fftw, glib, glib_networking +, glibmm, gsettings_desktop_schemas, gtk, gtkmm, libjack2 , ladspaH, librdf, libsndfile, lilv, lv2, serd, sord, sratom -, webkitgtk2, zita-convolver, zita-resampler +, webkitgtk2, wrapGAppsHook, zita-convolver, zita-resampler , optimizationSupport ? false # Enable support for native CPU extensions }: @@ -11,19 +12,20 @@ in stdenv.mkDerivation rec { name = "guitarix-${version}"; - version = "0.34.0"; + version = "0.35.1"; src = fetchurl { - url = "mirror://sourceforge/guitarix/guitarix2-${version}.tar.bz2"; - sha256 = "0pamaq8iybsaglq6y1m1rlmz4wgbs2r6m24bj7x4fwg4grjvzjl8"; + url = "mirror://sourceforge/guitarix/guitarix2-${version}.tar.xz"; + sha256 = "066qva1zk63qw60s0vbi9g9jh22ljw67p91pk82kv11gw24h3vg6"; }; - nativeBuildInputs = [ gettext intltool pkgconfig python ]; + nativeBuildInputs = [ gettext intltool wrapGAppsHook pkgconfig python ]; buildInputs = [ - avahi bluez boost eigen fftw glib glibmm gtk gtkmm libjack2 - ladspaH librdf libsndfile lilv lv2 serd sord sratom - webkitgtk2 zita-convolver zita-resampler + avahi bluez boost eigen fftw glib glibmm glib_networking.out + gsettings_desktop_schemas gtk gtkmm libjack2 ladspaH librdf + libsndfile lilv lv2 serd sord sratom webkitgtk2 zita-convolver + zita-resampler ]; configureFlags = [ @@ -39,7 +41,7 @@ stdenv.mkDerivation rec { installPhase = ''python waf install''; - meta = with stdenv.lib; { + meta = with stdenv.lib; { description = "A virtual guitar amplifier for Linux running with JACK"; longDescription = '' guitarix is a virtual guitar amplifier for Linux running with From de27f97e2d612bf372ad625f42d860ca8363dee4 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 15 Aug 2016 09:12:42 -0500 Subject: [PATCH 124/145] Remove kde5PackagesFun --- pkgs/top-level/all-packages.nix | 188 +++++++++++++++----------------- 1 file changed, 86 insertions(+), 102 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 603374b5e6f..2ceedffa611 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -664,6 +664,12 @@ in caddy = callPackage ../servers/caddy { }; + calamares = qt5.callPackage ../tools/misc/calamares rec { + python = python3; + boost = pkgs.boost.override { python=python3; }; + libyamlcpp = callPackage ../development/libraries/libyaml-cpp { makePIC=true; boost=boost; }; + }; + capstone = callPackage ../development/libraries/capstone { }; catch = callPackage ../development/libraries/catch { }; @@ -698,6 +704,8 @@ in clib = callPackage ../tools/package-management/clib { }; + colord-kde = qt5.callPackage ../tools/misc/colord-kde/0.5.nix {}; + consul = callPackage ../servers/consul { }; consul-ui = callPackage ../servers/consul/ui.nix { }; @@ -2217,6 +2225,8 @@ in kpcli = callPackage ../tools/security/kpcli { }; + kronometer = qt5.callPackage ../tools/misc/kronometer { }; + kst = qt5.callPackage ../tools/graphics/kst { gsl = gsl_1; }; leocad = callPackage ../applications/graphics/leocad { }; @@ -6419,6 +6429,8 @@ in inherit (xorg) libX11 libXext libXi libXtst; }; + github-release = callPackage ../development/tools/github/github-release { }; + global = callPackage ../development/tools/misc/global { }; gnome_doc_utils = callPackage ../development/tools/documentation/gnome-doc-utils {}; @@ -6588,6 +6600,8 @@ in oprofile = callPackage ../development/tools/profiling/oprofile { }; + pahole = callPackage ../development/tools/misc/pahole {}; + parse-cli-bin = callPackage ../development/tools/parse-cli-bin { }; patchelf = callPackage ../development/tools/misc/patchelf { }; @@ -12242,9 +12256,6 @@ in alpine = callPackage ../applications/networking/mailreaders/alpine { tcl = tcl-8_5; }; - realpine = callPackage ../applications/networking/mailreaders/realpine { - tcl = tcl-8_5; - }; AMB-plugins = callPackage ../applications/audio/AMB-plugins { }; @@ -12636,6 +12647,8 @@ in dfasma = qt5.callPackage ../applications/audio/dfasma { }; + dfilemanager = qt5.callPackage ../applications/misc/dfilemanager { }; + dia = callPackage ../applications/graphics/dia { inherit (pkgs.gnome) libart_lgpl libgnomeui; }; @@ -13215,6 +13228,16 @@ in gimpPlugins = recurseIntoAttrs (callPackage ../applications/graphics/gimp/plugins {}); + girara = callPackage ../applications/misc/girara { + gtk = gtk3; + }; + + girara-light = callPackage ../applications/misc/girara { + gtk = gtk3; + withBuildColors = false; + ncurses = null; + }; + gitAndTools = recurseIntoAttrs (callPackage ../applications/version-management/git-and-tools {}); inherit (self.gitAndTools) git gitFull gitSVN git-cola svn2git git-radar transcrypt git-crypt; @@ -13604,6 +13627,10 @@ in boost = boost155; }; + k9copy = qt5.callPackage ../applications/video/k9copy {}; + + kdeconnect = qt5.callPackage ../applications/misc/kdeconnect { }; + keepnote = callPackage ../applications/office/keepnote { pygtk = pyGtkGlade; }; @@ -13624,6 +13651,8 @@ in qt = qt4; }; + kile = qt5.callPackage ../applications/editors/kile/frameworks.nix { }; + kino = callPackage ../applications/video/kino { inherit (gnome) libglade; ffmpeg = ffmpeg_2; @@ -13633,6 +13662,13 @@ in koji = callPackage ../tools/package-management/koji { }; + konversation = qt5.callPackage ../applications/networking/irc/konversation/1.6.nix { }; + + krita = qt5.callPackage ../applications/graphics/krita { + vc = vc_0_7; + openjpeg = openjpeg_1; + }; + ksuperkey = callPackage ../tools/X11/ksuperkey { }; kubernetes = callPackage ../applications/networking/cluster/kubernetes { @@ -14366,6 +14402,10 @@ in inherit (darwin.stubs) rez setfile; }; + qgis = callPackage ../applications/gis/qgis {}; + + qgroundcontrol = qt55.callPackage ../applications/science/robotics/qgroundcontrol { }; + qjackctl = callPackage ../applications/audio/qjackctl { }; qmidinet = callPackage ../applications/audio/qmidinet { }; @@ -14386,6 +14426,8 @@ in qsynth = callPackage ../applications/audio/qsynth { }; + qtbitcointrader = callPackage ../applications/misc/qtbitcointrader { }; + qtox = qt5.callPackage ../applications/networking/instant-messengers/qtox { }; qtpass = qt5.callPackage ../applications/misc/qtpass { }; @@ -14396,6 +14438,28 @@ in qtscrobbler = callPackage ../applications/audio/qtscrobbler { }; + quassel = qt5.callPackage ../applications/networking/irc/quassel/qt-5.nix { + monolithic = true; + daemon = false; + client = false; + withKDE = true; + dconf = gnome3.dconf; + tag = "-kf5"; + }; + + quasselClient = quassel.override { + monolithic = false; + client = true; + tag = "-client-kf5"; + }; + + quasselDaemon = quassel.override { + monolithic = false; + daemon = true; + tag = "-daemon-qt5"; + withKDE = false; + }; + quirc = callPackage ../tools/graphics/quirc {}; quodlibet = callPackage ../applications/audio/quodlibet { @@ -14444,6 +14508,10 @@ in rdup = callPackage ../tools/backup/rdup { }; + realpine = callPackage ../applications/networking/mailreaders/realpine { + tcl = tcl-8_5; + }; + recode = callPackage ../tools/text/recode { }; remotebox = callPackage ../applications/virtualization/remotebox { }; @@ -14649,7 +14717,9 @@ in printrun = callPackage ../applications/misc/printrun { }; - sddm = kde5.sddm; + sddm = qt5.callPackage ../applications/display-managers/sddm { + themes = []; # extra themes, etc. + }; slim = callPackage ../applications/display-managers/slim { libpng = libpng12; @@ -14909,7 +14979,8 @@ in tribler = callPackage ../applications/networking/p2p/tribler { }; - github-release = callPackage ../development/tools/github/github-release { }; + # We need QtWebkit which was deprecated in Qt 5.6 although it can still be build + trojita = with qt55; callPackage ../applications/networking/mailreaders/trojita { }; tudu = callPackage ../applications/office/tudu { }; @@ -15407,30 +15478,24 @@ in yabar = callPackage ../applications/window-managers/yabar { }; - yate = callPackage ../applications/misc/yate { }; - - inherit (gnome3) yelp; - - inherit (python3Packages) you-get; - - inherit (pythonPackages) youtube-dl; - - qgis = callPackage ../applications/gis/qgis {}; - - qgroundcontrol = qt55.callPackage ../applications/science/robotics/qgroundcontrol { }; - - qtbitcointrader = callPackage ../applications/misc/qtbitcointrader { }; - - pahole = callPackage ../development/tools/misc/pahole {}; + yakuake = qt5.callPackage ../applications/misc/yakuake/3.0.nix {}; yarp = callPackage ../applications/science/robotics/yarp {}; + yate = callPackage ../applications/misc/yate { }; + yed = callPackage ../applications/graphics/yed {}; + inherit (gnome3) yelp; + ykpers = callPackage ../applications/misc/ykpers {}; yoshimi = callPackage ../applications/audio/yoshimi { }; + inherit (python3Packages) you-get; + + inherit (pythonPackages) youtube-dl; + zam-plugins = callPackage ../applications/audio/zam-plugins { }; zathuraCollection = recurseIntoAttrs @@ -15447,16 +15512,6 @@ in zexy = callPackage ../applications/audio/pd-plugins/zexy { }; - girara = callPackage ../applications/misc/girara { - gtk = gtk3; - }; - - girara-light = callPackage ../applications/misc/girara { - gtk = gtk3; - withBuildColors = false; - ncurses = null; - }; - zgrviewer = callPackage ../applications/graphics/zgrviewer {}; zgv = callPackage ../applications/graphics/zgv { @@ -16341,76 +16396,6 @@ in numix-gtk-theme = callPackage ../misc/themes/numix { }; - # We need QtWebkit which was deprecated in Qt 5.6 although it can still be build - trojita = with qt55; callPackage ../applications/networking/mailreaders/trojita { }; - - kde5PackagesFun = self: with self; { - - calamares = callPackage ../tools/misc/calamares rec { - python = python3; - boost = pkgs.boost.override { python=python3; }; - libyamlcpp = callPackage ../development/libraries/libyaml-cpp { makePIC=true; boost=boost; }; - }; - - colord-kde = callPackage ../tools/misc/colord-kde/0.5.nix {}; - - dfilemanager = callPackage ../applications/misc/dfilemanager { }; - - k9copy = callPackage ../applications/video/k9copy {}; - - kdeconnect = callPackage ../applications/misc/kdeconnect { }; - - kile = callPackage ../applications/editors/kile/frameworks.nix { }; - - konversation = callPackage ../applications/networking/irc/konversation/1.6.nix { }; - - kronometer = callPackage ../tools/misc/kronometer { }; - - krita = callPackage ../applications/graphics/krita { - vc = vc_0_7; - openjpeg = openjpeg_1; - }; - - quassel = callPackage ../applications/networking/irc/quassel/qt-5.nix { - monolithic = true; - daemon = false; - client = false; - withKDE = true; - dconf = gnome3.dconf; - tag = "-kf5"; - }; - - quasselClient = quassel.override { - monolithic = false; - client = true; - tag = "-client-kf5"; - }; - - quassel_qt5 = quassel.override { - withKDE = false; - tag = "-qt5"; - }; - - quasselClient_qt5 = quasselClient.override { - withKDE = false; - tag = "-client-qt5"; - }; - - quasselDaemon = quassel.override { - monolithic = false; - daemon = true; - tag = "-daemon-qt5"; - withKDE = false; - }; - - sddm = callPackage ../applications/display-managers/sddm { - themes = []; # extra themes, etc. - }; - - yakuake = callPackage ../applications/misc/yakuake/3.0.nix {}; - - }; - kde5 = let plasma = import ../desktops/kde-5/plasma { inherit pkgs; }; @@ -16421,8 +16406,7 @@ in applications = applications self; } // qt5.kdeFrameworks // plasma self - // applications self - // kde5PackagesFun self; + // applications self; in recurseIntoAttrs (lib.makeScope qt5.newScope merged); From 1e3a00aca54e6b77d5701719f280864869376562 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 15 Aug 2016 10:34:37 -0500 Subject: [PATCH 125/145] dfilemanager: remove duplicate definition --- pkgs/top-level/all-packages.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2ceedffa611..b9b54c312b1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -740,8 +740,6 @@ in deis = callPackage ../development/tools/deis {}; - dfilemanager = self.kde5.dfilemanager; - diagrams-builder = callPackage ../tools/graphics/diagrams-builder { inherit (haskellPackages) ghcWithPackages diagrams-builder; }; From cc82bdf7df81c78fbdcf34c6737c50e5251ed618 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 15 Aug 2016 10:47:01 -0500 Subject: [PATCH 126/145] kile: get Konsole from kde5 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b9b54c312b1..c9d08ef236c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13649,7 +13649,7 @@ in qt = qt4; }; - kile = qt5.callPackage ../applications/editors/kile/frameworks.nix { }; + kile = kde5.callPackage ../applications/editors/kile/frameworks.nix { }; kino = callPackage ../applications/video/kino { inherit (gnome) libglade; From ea9b7053405b207627f2a3b39c192865a75ad4dc Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 15 Aug 2016 11:03:11 -0500 Subject: [PATCH 127/145] Remove obsolete Quassel aliases --- pkgs/top-level/aliases.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 0445975e792..a8e18f2bb46 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -79,11 +79,6 @@ doNotDisplayTwice rec { qca-qt5 = qt5.qca-qt5; # added 2015-12-19 QmidiNet = qmidinet; # added 2016-05-22 quake3game = ioquake3; # added 2016-01-14 - quassel_kf5 = kde5.quassel; # added 2015-09-30 - quassel_qt5 = kde5.quassel_qt5; # added 2015-09-30 - quasselClient_kf5 = kde5.quasselClient; # added 2015-09-30 - quasselClient_qt5 = kde5.quasselClient_qt5; # added 2015-09-30 - quasselDaemon_qt5 = kde5.quasselDaemon; # added 2015-09-30 qwt6 = qt5.qwt; # added 2015-12-19 rdiff_backup = rdiff-backup; # added 2014-11-23 rekonqWrapper = rekonq; # added 2015-01 From ef15f01a43eecf374705ca9cec46c95867f61239 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 15 Aug 2016 11:15:46 -0500 Subject: [PATCH 128/145] yakuake: get Konsole from kde5 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c9d08ef236c..796400d3568 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15476,7 +15476,7 @@ in yabar = callPackage ../applications/window-managers/yabar { }; - yakuake = qt5.callPackage ../applications/misc/yakuake/3.0.nix {}; + yakuake = kde5.callPackage ../applications/misc/yakuake/3.0.nix {}; yarp = callPackage ../applications/science/robotics/yarp {}; From ac2836610d864e9ccbe6247baddcd74d4f11094f Mon Sep 17 00:00:00 2001 From: Svend Sorensen Date: Mon, 15 Aug 2016 11:16:55 -0700 Subject: [PATCH 129/145] gnupg: Add comment about when to drop fix-gpgsm-linking.patch --- pkgs/tools/security/gnupg/21.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix index b5f1f3b94b7..7913b22976b 100644 --- a/pkgs/tools/security/gnupg/21.nix +++ b/pkgs/tools/security/gnupg/21.nix @@ -27,6 +27,8 @@ stdenv.mkDerivation rec { readline libusb gnutls adns openldap zlib bzip2 ]; + # gpgsm-linking is fixed by commit (c49c43d7) in the gnupg master branch; + # fix-gpgsm-linking.patch should be dropped after gnupg 2.1.15 is released patches = [ ./fix-gpgsm-linking.patch ]; postPatch = stdenv.lib.optionalString stdenv.isLinux '' From 567640d80caeaa70abd95b9841111f31a5193685 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Fri, 5 Aug 2016 17:39:47 +0200 Subject: [PATCH 130/145] grsecurity docs: add note about user namespaces --- nixos/doc/manual/configuration/grsecurity.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/doc/manual/configuration/grsecurity.xml b/nixos/doc/manual/configuration/grsecurity.xml index 3c17fc19397..8387658f1e5 100644 --- a/nixos/doc/manual/configuration/grsecurity.xml +++ b/nixos/doc/manual/configuration/grsecurity.xml @@ -265,6 +265,11 @@ Issues and work-arounds + User namespaces require CAP_SYS_ADMIN: + consequently, unprivileged namespaces are unsupported. Applications that + rely on namespaces for sandboxing (e.g., chromium) must use a privileged + helper. + Access to EFI runtime services is disabled by default: this plugs a potential code injection attack vector; use to override From 9062c6791431b79640b55dcd84b95fedcd1dda60 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Mon, 15 Aug 2016 19:52:30 +0200 Subject: [PATCH 131/145] grsecurity: 4.6.5-201607312210 -> 4.7-201608131240 --- pkgs/os-specific/linux/kernel/linux-grsecurity.nix | 7 ++++--- pkgs/os-specific/linux/kernel/patches.nix | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix index 0559df72ae6..be84d5f76da 100644 --- a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix +++ b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix @@ -1,12 +1,13 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.6.5"; - extraMeta.branch = "4.6"; + version = "4.7"; + modDirVersion = "4.7.0"; + extraMeta.branch = "4.7"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1i8ksv8w6dn86q54gzk230gxrylqx3m55x789d29q5balg456bby"; + sha256 = "042z53ik3mqaqlfrn5b70kw882fwd42zanqld10s1vcs438w742i"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index f0aa4c92b3c..62b70ac67c2 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -93,9 +93,9 @@ rec { grsecurity_4_4 = throw "grsecurity stable is no longer supported"; grsecurity_testing = grsecPatch - { kver = "4.6.5"; - grrev = "201607312210"; - sha256 = "17dnp6w092kvqxqxbdgjpl4mrsn2wkb7z8q5d8ck7dfanpmqap0w"; + { kver = "4.7"; + grrev = "201608131240"; + sha256 = "0bcng47xk5nf4xwcl1l6a2nfb54b8v5piwg42nf3d99hy4si8fvd"; }; # This patch relaxes grsec constraints on the location of usermode helpers, From 7fd99066c44c72c1b78d3bf6626bfffa96162902 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Mon, 15 Aug 2016 19:55:12 +0200 Subject: [PATCH 132/145] grsecurity module: permit chmod +s in sandboxed builds While useless, some builds may dabble with setuid bits (e.g., util-linux), which breaks under grsec. In the interest of user friendliness, we once again compromise by disabling an otherwise useful feature ... Closes https://github.com/NixOS/nixpkgs/issues/17501 --- nixos/modules/security/grsecurity.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/security/grsecurity.nix b/nixos/modules/security/grsecurity.nix index 60e9058dd69..5eb88917dd5 100644 --- a/nixos/modules/security/grsecurity.nix +++ b/nixos/modules/security/grsecurity.nix @@ -119,6 +119,7 @@ in "kernel.grsecurity.chroot_deny_chroot" = mkForce 0; "kernel.grsecurity.chroot_deny_mount" = mkForce 0; "kernel.grsecurity.chroot_deny_pivot" = mkForce 0; + "kernel.grsecurity.chroot_deny_chmod" = mkForce 0; } // optionalAttrs containerSupportRequired { # chroot(2) restrictions that conflict with NixOS lightweight containers "kernel.grsecurity.chroot_deny_chmod" = mkForce 0; From 050b7eec1688c2c4cd3391aa673bed9398d3bf9f Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Mon, 15 Aug 2016 20:01:12 +0200 Subject: [PATCH 133/145] grsecurity module: systemd-nspawn requires cap_sys_admin As with 9ca3504a798291fbd7c49fcfeec8b64daa2022ad Closes https://github.com/NixOS/nixpkgs/issues/17714 --- nixos/modules/security/grsecurity.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/security/grsecurity.nix b/nixos/modules/security/grsecurity.nix index 5eb88917dd5..9a2f62a1488 100644 --- a/nixos/modules/security/grsecurity.nix +++ b/nixos/modules/security/grsecurity.nix @@ -125,6 +125,7 @@ in "kernel.grsecurity.chroot_deny_chmod" = mkForce 0; "kernel.grsecurity.chroot_deny_mount" = mkForce 0; "kernel.grsecurity.chroot_restrict_nice" = mkForce 0; + "kernel.grsecurity.chroot_caps" = mkForce 0; }; assertions = [ From f9c3076e58595043d528a42e92dad49cd4e2e1d2 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Mon, 15 Aug 2016 20:36:13 +0200 Subject: [PATCH 134/145] grsecurity docs: mention chromium setuid sandbox --- nixos/doc/manual/configuration/grsecurity.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/doc/manual/configuration/grsecurity.xml b/nixos/doc/manual/configuration/grsecurity.xml index 8387658f1e5..28415e89bfa 100644 --- a/nixos/doc/manual/configuration/grsecurity.xml +++ b/nixos/doc/manual/configuration/grsecurity.xml @@ -267,8 +267,8 @@ User namespaces require CAP_SYS_ADMIN: consequently, unprivileged namespaces are unsupported. Applications that - rely on namespaces for sandboxing (e.g., chromium) must use a privileged - helper. + rely on namespaces for sandboxing must use a privileged helper. For chromium + there is . Access to EFI runtime services is disabled by default: this plugs a potential code injection attack vector; use From 760b2b9048ea775c319cb348d74447a20dea513e Mon Sep 17 00:00:00 2001 From: obadz Date: Mon, 15 Aug 2016 19:39:39 +0100 Subject: [PATCH 135/145] nixos/make-disk-image: add ability to defer bootloader install until image has been flashed --- nixos/lib/make-disk-image.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix index 63666c99b23..9f8ec419256 100644 --- a/nixos/lib/make-disk-image.nix +++ b/nixos/lib/make-disk-image.nix @@ -12,6 +12,9 @@ # directly. partitioned ? true + # Whether to invoke switch-to-configuration boot during image creation +, installBootLoader ? true + , # The root file system type. fsType ? "ext4" @@ -108,7 +111,7 @@ pkgs.vmTools.runInLinuxVM ( # Generate the GRUB menu. ln -s vda /dev/xvda ln -s vda /dev/sda - chroot /mnt ${config.system.build.toplevel}/bin/switch-to-configuration boot + ${optionalString installBootLoader "chroot /mnt ${config.system.build.toplevel}/bin/switch-to-configuration boot"} umount /mnt/proc /mnt/dev /mnt/sys umount /mnt From 131fca0a85c6a2f7912061f8f3e57f582fb94f38 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 14 Aug 2016 12:53:52 +0300 Subject: [PATCH 136/145] kmod: add patch to allow searching for modules in several directories --- pkgs/os-specific/linux/kmod/default.nix | 30 ++-- pkgs/os-specific/linux/kmod/module-dir.patch | 153 +++++++++++++++---- 2 files changed, 146 insertions(+), 37 deletions(-) diff --git a/pkgs/os-specific/linux/kmod/default.nix b/pkgs/os-specific/linux/kmod/default.nix index 12449a0a7dd..58b0b988351 100644 --- a/pkgs/os-specific/linux/kmod/default.nix +++ b/pkgs/os-specific/linux/kmod/default.nix @@ -1,25 +1,37 @@ -{ stdenv, fetchurl, xz, zlib, pkgconfig, libxslt }: +{ stdenv, lib, fetchurl, autoreconfHook, xz, zlib, pkgconfig, libxslt }: -stdenv.mkDerivation rec { - name = "kmod-22"; +let + systems = [ "current-system" "booted-system" ]; + modulesDirs = lib.concatMapStringsSep ":" (x: "/run/${x}/kernel-modules/lib/modules") systems; + +in stdenv.mkDerivation rec { + name = "kmod-${version}"; + version = "22"; src = fetchurl { url = "mirror://kernel/linux/utils/kernel/kmod/${name}.tar.xz"; sha256 = "10lzfkmnpq6a43a3gkx7x633njh216w0bjwz31rv8a1jlgg1sfxs"; }; - buildInputs = [ pkgconfig libxslt xz /* zlib */ ]; + nativeBuildInputs = [ autoreconfHook pkgconfig libxslt ]; + buildInputs = [ xz /* zlib */ ]; - configureFlags = [ "--sysconfdir=/etc" "--with-xz" /* "--with-zlib" */ ]; + configureFlags = [ + "--sysconfdir=/etc" + "--with-xz" + "--with-modulesdirs=${modulesDirs}" + # "--with-zlib" + ]; patches = [ ./module-dir.patch ]; postInstall = '' - ln -s kmod $out/bin/lsmod - mkdir -p $out/sbin - for prog in rmmod insmod modinfo modprobe depmod; do - ln -sv $out/bin/kmod $out/sbin/$prog + for prog in rmmod insmod lsmod modinfo modprobe depmod; do + ln -sv $out/bin/kmod $out/bin/$prog done + + # Backwards compatibility + ln -s bin $out/sbin ''; meta = { diff --git a/pkgs/os-specific/linux/kmod/module-dir.patch b/pkgs/os-specific/linux/kmod/module-dir.patch index 0c4ab4bd4c4..f7432e3756e 100644 --- a/pkgs/os-specific/linux/kmod/module-dir.patch +++ b/pkgs/os-specific/linux/kmod/module-dir.patch @@ -1,7 +1,46 @@ -diff -ru -x '*~' kmod-17-orig/libkmod/libkmod.c kmod-17/libkmod/libkmod.c ---- kmod-17-orig/libkmod/libkmod.c 2014-04-01 12:40:37.161940089 +0200 -+++ kmod-17/libkmod/libkmod.c 2014-04-17 13:47:15.871441987 +0200 -@@ -201,7 +201,7 @@ +diff --git a/Makefile.am b/Makefile.am +index d4eeb7e..5c9f603 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -19,6 +19,7 @@ AM_CPPFLAGS = \ + -include $(top_builddir)/config.h \ + -I$(top_srcdir) \ + -DSYSCONFDIR=\""$(sysconfdir)"\" \ ++ -DMODULESDIRS=\""$(shell echo $(modulesdirs) | $(SED) 's|:|\\",\\"|g')"\" \ + ${zlib_CFLAGS} + + AM_CFLAGS = $(OUR_CFLAGS) +diff --git a/configure.ac b/configure.ac +index 23510c8..66490cf 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -202,6 +202,12 @@ GTK_DOC_CHECK([1.14],[--flavour no-tmpl-flat]) + ], [ + AM_CONDITIONAL([ENABLE_GTK_DOC], false)]) + ++AC_ARG_WITH([modulesdirs], ++ AS_HELP_STRING([--with-modulesdirs=DIRS], [Kernel modules directories, separated by :]), ++ [], ++ [with_modulesdirs=/lib/modules]) ++AC_SUBST([modulesdirs], [$with_modulesdirs]) ++ + + ##################################################################### + # Default CFLAGS and LDFLAGS +diff --git a/libkmod/libkmod.c b/libkmod/libkmod.c +index 69fe431..d37da32 100644 +--- a/libkmod/libkmod.c ++++ b/libkmod/libkmod.c +@@ -206,12 +206,15 @@ static int log_priority(const char *priority) + return 0; + } + +-static const char *dirname_default_prefix = "/lib/modules"; ++static const char *dirname_default_prefixes[] = { ++ MODULESDIRS, ++ NULL ++}; + static char *get_kernel_release(const char *dirname) { struct utsname u; @@ -10,51 +49,109 @@ diff -ru -x '*~' kmod-17-orig/libkmod/libkmod.c kmod-17/libkmod/libkmod.c if (dirname != NULL) return path_make_absolute_cwd(dirname); -@@ -209,7 +209,10 @@ +@@ -219,8 +222,42 @@ static char *get_kernel_release(const char *dirname) if (uname(&u) < 0) return NULL; - if (asprintf(&p, "%s/%s", dirname_default_prefix, u.release) < 0) -+ if ((dirname_prefix = getenv("MODULE_DIR")) == NULL) -+ dirname_prefix = dirname_default_prefix; +- return NULL; ++ if ((dirname_prefix = getenv("MODULE_DIR")) != NULL) { ++ if(asprintf(&p, "%s/%s", dirname_prefix, u.release) < 0) ++ return NULL; ++ } else { ++ size_t i; ++ char buf[PATH_MAX]; + -+ if (asprintf(&p, "%s/%s", dirname_prefix, u.release) < 0) - return NULL; ++ for (i = 0; dirname_default_prefixes[i] != NULL; i++) { ++ int plen; ++ struct stat dirstat; ++ ++ plen = snprintf(buf, sizeof(buf), "%s/%s", dirname_default_prefixes[i], u.release); ++ if (plen < 0) ++ return NULL; ++ else if (plen >= PATH_MAX) ++ continue; ++ ++ if (dirname_default_prefixes[i + 1] != NULL) { ++ if (stat(buf, &dirstat) < 0) { ++ if (errno == ENOENT) ++ continue; ++ else ++ return NULL; ++ } ++ ++ if (!S_ISDIR(dirstat.st_mode)) ++ continue; ++ } ++ ++ p = malloc(plen + 1); ++ if (p == NULL) ++ return NULL; ++ memcpy(p, buf, plen + 1); ++ break; ++ } ++ } return p; -diff -ru -x '*~' kmod-17-orig/tools/static-nodes.c kmod-17/tools/static-nodes.c ---- kmod-17-orig/tools/static-nodes.c 2013-12-17 22:05:42.159047316 +0100 -+++ kmod-17/tools/static-nodes.c 2014-04-17 13:51:17.945974320 +0200 -@@ -159,6 +159,7 @@ + } +diff --git a/tools/static-nodes.c b/tools/static-nodes.c +index 8d2356d..2ed306d 100644 +--- a/tools/static-nodes.c ++++ b/tools/static-nodes.c +@@ -29,10 +29,11 @@ + #include + #include + #include +-#include + + #include + ++#include ++ + #include "kmod.h" + + struct static_nodes_format { +@@ -154,8 +155,8 @@ static void help(void) + + static int do_static_nodes(int argc, char *argv[]) + { +- struct utsname kernel; + char modules[PATH_MAX], buf[4096]; ++ struct kmod_ctx *ctx; + const char *output = "/dev/stdout"; FILE *in = NULL, *out = NULL; const struct static_nodes_format *format = &static_nodes_format_human; - int r, ret = EXIT_SUCCESS; -+ char *dirname_prefix; - - for (;;) { - int c, idx = 0, valid; -@@ -211,16 +212,19 @@ - goto finish; +@@ -206,22 +207,25 @@ static int do_static_nodes(int argc, char *argv[]) + } } +- if (uname(&kernel) < 0) { +- fputs("Error: uname failed!\n", stderr); ++ ctx = kmod_new(NULL, NULL); ++ if (ctx == NULL) { ++ fprintf(stderr, "Error: failed to create kmod context\n"); + ret = EXIT_FAILURE; + goto finish; + } +- - snprintf(modules, sizeof(modules), "/lib/modules/%s/modules.devname", kernel.release); -+ if ((dirname_prefix = getenv("MODULE_DIR")) == NULL) -+ dirname_prefix = "/lib/modules"; -+ -+ snprintf(modules, sizeof(modules), "%s/%s/modules.devname", dirname_prefix, kernel.release); ++ if (snprintf(modules, sizeof(modules), "%s/modules.devname", kmod_get_dirname(ctx)) < 0) { ++ fprintf(stderr, "Error: path to modules.devname is too long\n"); ++ ret = EXIT_FAILURE; ++ goto finish; ++ } ++ kmod_unref(ctx); in = fopen(modules, "re"); if (in == NULL) { if (errno == ENOENT) { - fprintf(stderr, "Warning: /lib/modules/%s/modules.devname not found - ignoring\n", - kernel.release); -+ fprintf(stderr, "Warning: %s/%s/modules.devname not found - ignoring\n", -+ dirname_prefix, kernel.release); ++ fprintf(stderr, "Warning: %s not found - ignoring\n", modules); ret = EXIT_SUCCESS; } else { - fprintf(stderr, "Error: could not open /lib/modules/%s/modules.devname - %m\n", - kernel.release); -+ fprintf(stderr, "Error: could not open %s/%s/modules.devname - %m\n", -+ dirname_prefix, kernel.release); ++ fprintf(stderr, "Error: could not open %s - %m\n", modules); ret = EXIT_FAILURE; } goto finish; From 1afd2506768760a6a55d23c47dc064f732f27807 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 14 Aug 2016 12:57:45 +0300 Subject: [PATCH 137/145] treewide: replace several /sbin paths by /bin --- .../openafs-client/default.nix | 2 +- nixos/modules/virtualisation/qemu-vm.nix | 26 +++++++++---------- .../tools/misc/lttng-tools/default.nix | 2 +- .../linux/kernel/manual-config.nix | 4 +-- pkgs/os-specific/linux/kmod/aggregator.nix | 2 +- .../networking/network-manager/default.nix | 2 +- .../network-manager/openconnect.nix | 6 ++--- .../networking/network-manager/openvpn.nix | 6 ++--- .../tools/networking/network-manager/vpnc.nix | 6 ++--- 9 files changed, 28 insertions(+), 28 deletions(-) diff --git a/nixos/modules/services/network-filesystems/openafs-client/default.nix b/nixos/modules/services/network-filesystems/openafs-client/default.nix index 61c66bb8835..891f41c8dcd 100644 --- a/nixos/modules/services/network-filesystems/openafs-client/default.nix +++ b/nixos/modules/services/network-filesystems/openafs-client/default.nix @@ -80,7 +80,7 @@ in preStart = '' mkdir -p -m 0755 /afs mkdir -m 0700 -p ${cfg.cacheDirectory} - ${pkgs.kmod}/sbin/insmod ${openafsPkgs}/lib/openafs/libafs-*.ko || true + ${pkgs.kmod}/bin/insmod ${openafsPkgs}/lib/openafs/libafs-*.ko || true ${openafsPkgs}/sbin/afsd -confdir ${afsConfig} -cachedir ${cfg.cacheDirectory} ${if cfg.sparse then "-dynroot-sparse" else "-dynroot"} -fakestat -afsdb ${openafsPkgs}/bin/fs setcrypt ${if cfg.crypt then "on" else "off"} ''; diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index b77b319f4a2..777ee31e4dc 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -135,13 +135,13 @@ let } '' # Create a /boot EFI partition with 40M - ${pkgs.gptfdisk}/sbin/sgdisk -G /dev/vda - ${pkgs.gptfdisk}/sbin/sgdisk -a 1 -n 1:34:2047 -c 1:"BIOS Boot Partition" -t 1:ef02 /dev/vda - ${pkgs.gptfdisk}/sbin/sgdisk -a 512 -N 2 -c 2:"EFI System" -t 2:ef00 /dev/vda - ${pkgs.gptfdisk}/sbin/sgdisk -A 1:set:1 /dev/vda - ${pkgs.gptfdisk}/sbin/sgdisk -A 2:set:2 /dev/vda - ${pkgs.gptfdisk}/sbin/sgdisk -h 2 /dev/vda - ${pkgs.gptfdisk}/sbin/sgdisk -C /dev/vda + ${pkgs.gptfdisk}/bin/sgdisk -G /dev/vda + ${pkgs.gptfdisk}/bin/sgdisk -a 1 -n 1:34:2047 -c 1:"BIOS Boot Partition" -t 1:ef02 /dev/vda + ${pkgs.gptfdisk}/bin/sgdisk -a 512 -N 2 -c 2:"EFI System" -t 2:ef00 /dev/vda + ${pkgs.gptfdisk}/bin/sgdisk -A 1:set:1 /dev/vda + ${pkgs.gptfdisk}/bin/sgdisk -A 2:set:2 /dev/vda + ${pkgs.gptfdisk}/bin/sgdisk -h 2 /dev/vda + ${pkgs.gptfdisk}/bin/sgdisk -C /dev/vda ${pkgs.utillinux}/bin/sfdisk /dev/vda -A 2 . /sys/class/block/vda2/uevent mknod /dev/vda2 b $MAJOR $MINOR @@ -151,11 +151,11 @@ let ${pkgs.mtools}/bin/mlabel -i /dev/vda2 ::boot # Mount /boot; load necessary modules first. - ${pkgs.kmod}/sbin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/nls/nls_cp437.ko.xz || true - ${pkgs.kmod}/sbin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/nls/nls_iso8859-1.ko.xz || true - ${pkgs.kmod}/sbin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/fat/fat.ko.xz || true - ${pkgs.kmod}/sbin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/fat/vfat.ko.xz || true - ${pkgs.kmod}/sbin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/efivarfs/efivarfs.ko.xz || true + ${pkgs.kmod}/bin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/nls/nls_cp437.ko.xz || true + ${pkgs.kmod}/bin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/nls/nls_iso8859-1.ko.xz || true + ${pkgs.kmod}/bin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/fat/fat.ko.xz || true + ${pkgs.kmod}/bin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/fat/vfat.ko.xz || true + ${pkgs.kmod}/bin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/efivarfs/efivarfs.ko.xz || true mkdir /boot mount /dev/vda2 /boot @@ -370,7 +370,7 @@ in boot.initrd.extraUtilsCommands = '' # We need mke2fs in the initrd. - copy_bin_and_libs ${pkgs.e2fsprogs}/sbin/mke2fs + copy_bin_and_libs ${pkgs.e2fsprogs}/bin/mke2fs ''; boot.initrd.postDeviceCommands = diff --git a/pkgs/development/tools/misc/lttng-tools/default.nix b/pkgs/development/tools/misc/lttng-tools/default.nix index 627a51916cb..827c1d0e67f 100644 --- a/pkgs/development/tools/misc/lttng-tools/default.nix +++ b/pkgs/development/tools/misc/lttng-tools/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ popt libuuid liburcu lttng-ust libxml2 ]; prePatch = '' - sed -e "s|/sbin/modprobe|${kmod}/sbin/modprobe|g" \ + sed -e "s|/sbin/modprobe|${kmod}/bin/modprobe|g" \ -i src/bin/lttng-sessiond/modprobe.c ''; diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 8da8f20eae2..c5a4ba2b18a 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -93,7 +93,7 @@ let echo "stripping FHS paths in \`$mf'..." sed -i "$mf" -e 's|/usr/bin/||g ; s|/bin/||g ; s|/sbin/||g' done - sed -i Makefile -e 's|= depmod|= ${kmod}/sbin/depmod|' + sed -i Makefile -e 's|= depmod|= ${kmod}/bin/depmod|' ''; configurePhase = '' @@ -188,7 +188,7 @@ let find -empty -type d -delete # Remove reference to kmod - sed -i Makefile -e 's|= ${kmod}/sbin/depmod|= depmod|' + sed -i Makefile -e 's|= ${kmod}/bin/depmod|= depmod|' '' else optionalString installsFirmware '' make firmware_install $makeFlags "''${makeFlagsArray[@]}" \ $installFlags "''${installFlagsArray[@]}" diff --git a/pkgs/os-specific/linux/kmod/aggregator.nix b/pkgs/os-specific/linux/kmod/aggregator.nix index 161af38ff60..88069ba4bf1 100644 --- a/pkgs/os-specific/linux/kmod/aggregator.nix +++ b/pkgs/os-specific/linux/kmod/aggregator.nix @@ -21,7 +21,7 @@ buildEnv { # kernel version number, otherwise depmod will use `uname -r'. if test -w $out/lib/modules/$kernelVersion; then rm -f $out/lib/modules/$kernelVersion/modules.* - ${kmod}/sbin/depmod -b $out -a $kernelVersion + ${kmod}/bin/depmod -b $out -a $kernelVersion fi ''; } diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 66a261c7cf6..dcaf339782b 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { substituteInPlace configure --replace /usr/bin/uname ${coreutils}/bin/uname substituteInPlace configure --replace /usr/bin/file ${file}/bin/file substituteInPlace src/devices/nm-device.c --replace /usr/bin/ping ${inetutils}/bin/ping - substituteInPlace src/NetworkManagerUtils.c --replace /sbin/modprobe /run/current-system/sw/sbin/modprobe + substituteInPlace src/NetworkManagerUtils.c --replace /sbin/modprobe /run/current-system/sw/bin/modprobe substituteInPlace data/84-nm-drivers.rules \ --replace /bin/sh ${stdenv.shell} substituteInPlace data/85-nm-unmanaged.rules \ diff --git a/pkgs/tools/networking/network-manager/openconnect.nix b/pkgs/tools/networking/network-manager/openconnect.nix index 43eb681be29..b1b24bceb57 100644 --- a/pkgs/tools/networking/network-manager/openconnect.nix +++ b/pkgs/tools/networking/network-manager/openconnect.nix @@ -23,10 +23,10 @@ stdenv.mkDerivation rec { preConfigure = '' substituteInPlace "configure" \ - --replace "/sbin/sysctl" "${procps}/sbin/sysctl" + --replace "/sbin/sysctl" "${procps}/bin/sysctl" substituteInPlace "src/nm-openconnect-service.c" \ - --replace "/usr/sbin/openconnect" "${openconnect}/sbin/openconnect" \ - --replace "/sbin/modprobe" "${kmod}/sbin/modprobe" + --replace "/usr/sbin/openconnect" "${openconnect}/bin/openconnect" \ + --replace "/sbin/modprobe" "${kmod}/bin/modprobe" ''; meta = { diff --git a/pkgs/tools/networking/network-manager/openvpn.nix b/pkgs/tools/networking/network-manager/openvpn.nix index 34e3a3e2959..6fd1a666f0e 100644 --- a/pkgs/tools/networking/network-manager/openvpn.nix +++ b/pkgs/tools/networking/network-manager/openvpn.nix @@ -27,10 +27,10 @@ stdenv.mkDerivation rec { substituteInPlace "configure" \ --replace "/sbin/sysctl" "${procps}/sbin/sysctl" substituteInPlace "src/nm-openvpn-service.c" \ - --replace "/sbin/openvpn" "${openvpn}/sbin/openvpn" \ - --replace "/sbin/modprobe" "${kmod}/sbin/modprobe" + --replace "/sbin/openvpn" "${openvpn}/bin/openvpn" \ + --replace "/sbin/modprobe" "${kmod}/bin/modprobe" substituteInPlace "properties/auth-helpers.c" \ - --replace "/sbin/openvpn" "${openvpn}/sbin/openvpn" + --replace "/sbin/openvpn" "${openvpn}/bin/openvpn" ''; meta = { diff --git a/pkgs/tools/networking/network-manager/vpnc.nix b/pkgs/tools/networking/network-manager/vpnc.nix index 97b2001d759..b760fe6e4f7 100644 --- a/pkgs/tools/networking/network-manager/vpnc.nix +++ b/pkgs/tools/networking/network-manager/vpnc.nix @@ -24,10 +24,10 @@ stdenv.mkDerivation rec { preConfigure = '' substituteInPlace "configure" \ - --replace "/sbin/sysctl" "${procps}/sbin/sysctl" + --replace "/sbin/sysctl" "${procps}/bin/sysctl" substituteInPlace "src/nm-vpnc-service.c" \ - --replace "/sbin/vpnc" "${vpnc}/sbin/vpnc" \ - --replace "/sbin/modprobe" "${kmod}/sbin/modprobe" + --replace "/sbin/vpnc" "${vpnc}/bin/vpnc" \ + --replace "/sbin/modprobe" "${kmod}/bin/modprobe" ''; meta = { From b2ebecd9e50471ec967ab9cdb2aba793d75cb747 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 14 Aug 2016 13:00:52 +0300 Subject: [PATCH 138/145] modprobe service: drop kmod wrapper --- nixos/modules/config/zram.nix | 2 +- nixos/modules/services/hardware/udev.nix | 2 +- nixos/modules/services/networking/fan.nix | 2 +- .../services/networking/strongswan.nix | 2 +- nixos/modules/system/boot/modprobe.nix | 39 +------------------ nixos/modules/tasks/cpu-freq.nix | 2 +- nixos/modules/virtualisation/docker.nix | 2 +- 7 files changed, 8 insertions(+), 43 deletions(-) diff --git a/nixos/modules/config/zram.nix b/nixos/modules/config/zram.nix index 019932b04e8..ad41ad4f3d7 100644 --- a/nixos/modules/config/zram.nix +++ b/nixos/modules/config/zram.nix @@ -8,7 +8,7 @@ let devices = map (nr: "zram${toString nr}") (range 0 (cfg.numDevices - 1)); - modprobe = "${config.system.sbin.modprobe}/sbin/modprobe"; + modprobe = "${pkgs.kmod}/bin/modprobe"; in diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix index e7741083d1a..fb44790ab1f 100644 --- a/nixos/modules/services/hardware/udev.nix +++ b/nixos/modules/services/hardware/udev.nix @@ -58,7 +58,7 @@ let # Fix some paths in the standard udev rules. Hacky. for i in $out/*.rules; do substituteInPlace $i \ - --replace \"/sbin/modprobe \"${config.system.sbin.modprobe}/sbin/modprobe \ + --replace \"/sbin/modprobe \"${pkgs.kmod}/bin/modprobe \ --replace \"/sbin/mdadm \"${pkgs.mdadm}/sbin/mdadm \ --replace \"/sbin/blkid \"${pkgs.utillinux}/sbin/blkid \ --replace \"/bin/mount \"${pkgs.utillinux}/bin/mount \ diff --git a/nixos/modules/services/networking/fan.nix b/nixos/modules/services/networking/fan.nix index 3170567e5b4..7f4e3647832 100644 --- a/nixos/modules/services/networking/fan.nix +++ b/nixos/modules/services/networking/fan.nix @@ -5,7 +5,7 @@ with lib; let cfg = config.networking.fan; - modprobe = "${config.system.sbin.modprobe}/sbin/modprobe"; + modprobe = "${pkgs.kmod}/bin/modprobe"; in diff --git a/nixos/modules/services/networking/strongswan.nix b/nixos/modules/services/networking/strongswan.nix index d6960a5df47..8778b0364f9 100644 --- a/nixos/modules/services/networking/strongswan.nix +++ b/nixos/modules/services/networking/strongswan.nix @@ -118,7 +118,7 @@ in systemd.services.strongswan = { description = "strongSwan IPSec Service"; wantedBy = [ "multi-user.target" ]; - path = with pkgs; [ config.system.sbin.modprobe iproute iptables utillinux ]; # XXX Linux + path = with pkgs; [ kmod iproute iptables utillinux ]; # XXX Linux wants = [ "keys.target" ]; after = [ "network.target" "keys.target" ]; environment = { diff --git a/nixos/modules/system/boot/modprobe.nix b/nixos/modules/system/boot/modprobe.nix index 9bb10eac988..91f440535a4 100644 --- a/nixos/modules/system/boot/modprobe.nix +++ b/nixos/modules/system/boot/modprobe.nix @@ -8,41 +8,6 @@ with lib; options = { - system.sbin.modprobe = mkOption { - internal = true; - default = pkgs.stdenv.mkDerivation { - name = "modprobe"; - buildCommand = '' - mkdir -p $out/bin - for i in ${pkgs.kmod}/sbin/*; do - name=$(basename $i) - echo "$text" > $out/bin/$name - echo 'exec '$i' "$@"' >> $out/bin/$name - chmod +x $out/bin/$name - done - ln -s bin $out/sbin - ''; - text = - '' - #! ${pkgs.stdenv.shell} - export MODULE_DIR=/run/current-system/kernel-modules/lib/modules - - # Fall back to the kernel modules used at boot time if the - # modules in the current configuration don't match the - # running kernel. - if [ ! -d "$MODULE_DIR/$(${pkgs.coreutils}/bin/uname -r)" ]; then - MODULE_DIR=/run/booted-system/kernel-modules/lib/modules/ - fi - - ''; - meta.priority = 4; - }; - description = '' - Wrapper around modprobe that sets the path to the modules - tree. - ''; - }; - boot.blacklistedKernelModules = mkOption { type = types.listOf types.str; default = []; @@ -87,7 +52,7 @@ with lib; ''; environment.etc."modprobe.d/debian.conf".source = pkgs.kmod-debian-aliases; - environment.systemPackages = [ config.system.sbin.modprobe pkgs.kmod ]; + environment.systemPackages = [ pkgs.kmod ]; system.activationScripts.modprobe = '' @@ -95,7 +60,7 @@ with lib; # in the right location in the Nix store for kernel modules). # We need this when the kernel (or some module) auto-loads a # module. - echo ${config.system.sbin.modprobe}/sbin/modprobe > /proc/sys/kernel/modprobe + echo ${pkgs.kmod}/bin/modprobe > /proc/sys/kernel/modprobe ''; environment.sessionVariables.MODULE_DIR = "/run/current-system/kernel-modules/lib/modules"; diff --git a/nixos/modules/tasks/cpu-freq.nix b/nixos/modules/tasks/cpu-freq.nix index 1f4d1db33ce..2fe7f4f8197 100644 --- a/nixos/modules/tasks/cpu-freq.nix +++ b/nixos/modules/tasks/cpu-freq.nix @@ -38,7 +38,7 @@ in description = "CPU Frequency Governor Setup"; after = [ "systemd-modules-load.service" ]; wantedBy = [ "multi-user.target" ]; - path = [ cpupower config.system.sbin.modprobe ]; + path = [ cpupower pkgs.kmod ]; unitConfig.ConditionVirtualization = false; serviceConfig = { Type = "oneshot"; diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix index c99fc78d49e..97b2927cf1b 100644 --- a/nixos/modules/virtualisation/docker.nix +++ b/nixos/modules/virtualisation/docker.nix @@ -95,7 +95,7 @@ in LimitNPROC = 1048576; } // proxy_env; - path = [ config.system.sbin.modprobe ] ++ (optional (cfg.storageDriver == "zfs") pkgs.zfs); + path = [ pkgs.kmod ] ++ (optional (cfg.storageDriver == "zfs") pkgs.zfs); environment.MODULE_DIR = "/run/current-system/kernel-modules/lib/modules"; postStart = if cfg.socketActivation then "" else cfg.postStart; From 1f639587729daf6c34535addbc35fd6e5c816ffc Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 14 Aug 2016 13:01:14 +0300 Subject: [PATCH 139/145] nixos treewide: don't set MODULE_DIR --- nixos/modules/hardware/video/bumblebee.nix | 1 - nixos/modules/hardware/video/webcam/facetimehd.nix | 1 - nixos/modules/services/hardware/tlp.nix | 4 ---- nixos/modules/services/hardware/udev.nix | 3 +-- nixos/modules/system/boot/kernel.nix | 5 ----- nixos/modules/system/boot/modprobe.nix | 2 -- nixos/modules/system/boot/stage-2-init.sh | 1 - nixos/modules/virtualisation/docker.nix | 1 - 8 files changed, 1 insertion(+), 17 deletions(-) diff --git a/nixos/modules/hardware/video/bumblebee.nix b/nixos/modules/hardware/video/bumblebee.nix index b10846ac18a..69db518ab21 100644 --- a/nixos/modules/hardware/video/bumblebee.nix +++ b/nixos/modules/hardware/video/bumblebee.nix @@ -75,7 +75,6 @@ in serviceConfig = { ExecStart = "${bumblebee}/bin/bumblebeed --use-syslog -g ${cfg.group} --driver ${cfg.driver}"; }; - environment.MODULE_DIR="/run/current-system/kernel-modules/lib/modules/"; }; }; } diff --git a/nixos/modules/hardware/video/webcam/facetimehd.nix b/nixos/modules/hardware/video/webcam/facetimehd.nix index 2a2fcf3057d..d311f600c31 100644 --- a/nixos/modules/hardware/video/webcam/facetimehd.nix +++ b/nixos/modules/hardware/video/webcam/facetimehd.nix @@ -36,7 +36,6 @@ in # and load it back on resume powerManagement.resumeCommands = '' - export MODULE_DIR=/run/current-system/kernel-modules/lib/modules ${pkgs.kmod}/bin/modprobe -v facetimehd ''; diff --git a/nixos/modules/services/hardware/tlp.nix b/nixos/modules/services/hardware/tlp.nix index 5ab7daafa85..281d02a8c65 100644 --- a/nixos/modules/services/hardware/tlp.nix +++ b/nixos/modules/services/hardware/tlp.nix @@ -72,8 +72,6 @@ in ExecStart = "${tlp}/bin/tlp init start"; ExecStop = "${tlp}/bin/tlp init stop"; }; - - environment.MODULE_DIR="/run/current-system/kernel-modules/lib/modules/"; }; tlp-sleep = { @@ -92,8 +90,6 @@ in ExecStart = "${tlp}/bin/tlp suspend"; ExecStop = "${tlp}/bin/tlp resume"; }; - - environment.MODULE_DIR="/run/current-system/kernel-modules/lib/modules/"; }; }; diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix index fb44790ab1f..7c4c93d0fcb 100644 --- a/nixos/modules/services/hardware/udev.nix +++ b/nixos/modules/services/hardware/udev.nix @@ -316,8 +316,7 @@ in ''; systemd.services.systemd-udevd = - { environment.MODULE_DIR = "/run/booted-system/kernel-modules/lib/modules"; - restartTriggers = cfg.packages; + { restartTriggers = cfg.packages; }; }; diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix index a6bbca9b30b..0f342f44fe7 100644 --- a/nixos/modules/system/boot/kernel.nix +++ b/nixos/modules/system/boot/kernel.nix @@ -228,7 +228,6 @@ in systemd.services."systemd-modules-load" = { wantedBy = [ "multi-user.target" ]; restartTriggers = [ kernelModulesConf ]; - environment.MODULE_DIR = "/run/booted-system/kernel-modules/lib/modules"; serviceConfig = { # Ignore failed module loads. Typically some of the # modules in ‘boot.kernelModules’ are "nice to have but @@ -238,10 +237,6 @@ in }; }; - systemd.services.kmod-static-nodes = - { environment.MODULE_DIR = "/run/booted-system/kernel-modules/lib/modules"; - }; - lib.kernelConfig = { isYes = option: { assertion = config: config.isYes option; diff --git a/nixos/modules/system/boot/modprobe.nix b/nixos/modules/system/boot/modprobe.nix index 91f440535a4..b915a98d537 100644 --- a/nixos/modules/system/boot/modprobe.nix +++ b/nixos/modules/system/boot/modprobe.nix @@ -63,8 +63,6 @@ with lib; echo ${pkgs.kmod}/bin/modprobe > /proc/sys/kernel/modprobe ''; - environment.sessionVariables.MODULE_DIR = "/run/current-system/kernel-modules/lib/modules"; - }; } diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh index 4a7f073ea8a..c5a14f0766d 100644 --- a/nixos/modules/system/boot/stage-2-init.sh +++ b/nixos/modules/system/boot/stage-2-init.sh @@ -207,6 +207,5 @@ exec {logOutFd}>&- {logErrFd}>&- # Start systemd. echo "starting systemd..." PATH=/run/current-system/systemd/lib/systemd \ - MODULE_DIR=/run/booted-system/kernel-modules/lib/modules \ LOCALE_ARCHIVE=/run/current-system/sw/lib/locale/locale-archive \ exec systemd diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix index 97b2927cf1b..ebc2be087a5 100644 --- a/nixos/modules/virtualisation/docker.nix +++ b/nixos/modules/virtualisation/docker.nix @@ -96,7 +96,6 @@ in } // proxy_env; path = [ pkgs.kmod ] ++ (optional (cfg.storageDriver == "zfs") pkgs.zfs); - environment.MODULE_DIR = "/run/current-system/kernel-modules/lib/modules"; postStart = if cfg.socketActivation then "" else cfg.postStart; From cd05a8ed000a48a617f3fd061c2837774f4e8c66 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 15 Aug 2016 10:32:32 +0300 Subject: [PATCH 140/145] networkmanager: point to kmod's modprobe --- pkgs/tools/networking/network-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index dcaf339782b..57bf1a51a1a 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -2,7 +2,7 @@ , systemd, libgudev, libnl, libuuid, polkit, gnutls, ppp, dhcp, iptables , libgcrypt, dnsmasq, bluez5, readline , gobjectIntrospection, modemmanager, openresolv, libndp, newt, libsoup -, ethtool, gnused, coreutils, file, inetutils }: +, ethtool, gnused, coreutils, file, inetutils, kmod }: stdenv.mkDerivation rec { name = "network-manager-${version}"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { substituteInPlace configure --replace /usr/bin/uname ${coreutils}/bin/uname substituteInPlace configure --replace /usr/bin/file ${file}/bin/file substituteInPlace src/devices/nm-device.c --replace /usr/bin/ping ${inetutils}/bin/ping - substituteInPlace src/NetworkManagerUtils.c --replace /sbin/modprobe /run/current-system/sw/bin/modprobe + substituteInPlace src/NetworkManagerUtils.c --replace /sbin/modprobe ${kmod}/bin/modprobe substituteInPlace data/84-nm-drivers.rules \ --replace /bin/sh ${stdenv.shell} substituteInPlace data/85-nm-unmanaged.rules \ From b067b5301104c7d09d86d69febaa423a49ce14c0 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 15 Aug 2016 10:32:51 +0300 Subject: [PATCH 141/145] networkmanager098: fix binary paths --- pkgs/tools/networking/network-manager/0.9.8/default.nix | 8 +++++++- .../networking/network-manager/0.9.8/nixos-purity.patch | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/network-manager/0.9.8/default.nix b/pkgs/tools/networking/network-manager/0.9.8/default.nix index 4fad1ca2ab9..0c791631daa 100644 --- a/pkgs/tools/networking/network-manager/0.9.8/default.nix +++ b/pkgs/tools/networking/network-manager/0.9.8/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, intltool, pkgconfig, dbus_glib , udev, libnl, libuuid, gnutls, dhcp -, libgcrypt, perl, libgudev }: +, libgcrypt, perl, libgudev, avahi, ppp, kmod }: stdenv.mkDerivation rec { name = "network-manager-${version}"; @@ -13,6 +13,12 @@ stdenv.mkDerivation rec { preConfigure = '' substituteInPlace tools/glib-mkenums --replace /usr/bin/perl ${perl}/bin/perl + substituteInPlace src/nm-device.c \ + --replace @avahi@ ${avahi} \ + --replace @kmod@ ${kmod} + substituteInPlace src/ppp-manager/nm-ppp-manager.c \ + --replace @ppp@ ${ppp} \ + --replace @kmod@ ${kmod} ''; # Right now we hardcode quite a few paths at build time. Probably we should diff --git a/pkgs/tools/networking/network-manager/0.9.8/nixos-purity.patch b/pkgs/tools/networking/network-manager/0.9.8/nixos-purity.patch index 831b2010fcf..9ebc080ba96 100644 --- a/pkgs/tools/networking/network-manager/0.9.8/nixos-purity.patch +++ b/pkgs/tools/networking/network-manager/0.9.8/nixos-purity.patch @@ -47,7 +47,7 @@ index 1dc94ee..e60f3c8 100644 for (iter = modules; *iter; iter++) { - char *argv[3] = { "/sbin/modprobe", *iter, NULL }; -+ char *argv[3] = { "/var/run/current-system/sw/bin/modprobe", *iter, NULL }; ++ char *argv[3] = { "@kmod@/bin/modprobe", *iter, NULL }; char *envp[1] = { NULL }; GError *error = NULL; @@ -71,7 +71,7 @@ index 59698c3..7dba0f7 100644 /* Make sure /dev/ppp exists (bgo #533064) */ if (stat ("/dev/ppp", &st) || !S_ISCHR (st.st_mode)) - ignored = system ("/sbin/modprobe ppp_generic"); -+ ignored = system ("/var/run/current-system/sw/bin/modprobe ppp_generic"); ++ ignored = system ("@kmod@/bin/modprobe ppp_generic"); connection = nm_act_request_get_connection (req); g_assert (connection); From 9adad8612b082bcbae30c81678a04b79a44079a4 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 15 Aug 2016 19:05:52 -0400 Subject: [PATCH 142/145] Revert "Merge branch 'modprobe-fix' of git://github.com/abbradar/nixpkgs" Was meant to go into staging, sorry This reverts commit 57b2d1e9b0dcdd1d25bd2d450174764b9417ffc1, reversing changes made to 760b2b9048ea775c319cb348d74447a20dea513e. --- nixos/modules/config/zram.nix | 2 +- nixos/modules/hardware/video/bumblebee.nix | 1 + .../hardware/video/webcam/facetimehd.nix | 1 + nixos/modules/services/hardware/tlp.nix | 4 + nixos/modules/services/hardware/udev.nix | 5 +- .../openafs-client/default.nix | 2 +- nixos/modules/services/networking/fan.nix | 2 +- .../services/networking/strongswan.nix | 2 +- nixos/modules/system/boot/kernel.nix | 5 + nixos/modules/system/boot/modprobe.nix | 41 ++++- nixos/modules/system/boot/stage-2-init.sh | 1 + nixos/modules/tasks/cpu-freq.nix | 2 +- nixos/modules/virtualisation/docker.nix | 3 +- nixos/modules/virtualisation/qemu-vm.nix | 26 +-- pkgs/development/libraries/fftw/default.nix | 22 ++- pkgs/development/libraries/libdrm/default.nix | 4 +- pkgs/development/libraries/mesa/default.nix | 125 +++++++-------- .../python-modules/generic/run_setup.py | 2 - .../tools/misc/lttng-tools/default.nix | 2 +- .../apple-source-releases/Libc/default.nix | 4 +- .../Libsystem/default.nix | 69 +++++++- .../apple-source-releases/configd/default.nix | 15 +- .../darwin/apple-source-releases/default.nix | 25 +-- .../libpthread/default.nix | 10 +- .../apple-source-releases/xnu/default.nix | 25 +-- .../darwin/swift-corefoundation/default.nix | 32 ---- .../linux/kernel/manual-config.nix | 4 +- pkgs/os-specific/linux/kmod/aggregator.nix | 2 +- pkgs/os-specific/linux/kmod/default.nix | 30 ++-- pkgs/os-specific/linux/kmod/module-dir.patch | 151 ++++-------------- pkgs/stdenv/darwin/make-bootstrap-tools.nix | 3 +- .../network-manager/0.9.8/default.nix | 8 +- .../network-manager/0.9.8/nixos-purity.patch | 4 +- .../networking/network-manager/default.nix | 4 +- .../network-manager/openconnect.nix | 6 +- .../networking/network-manager/openvpn.nix | 6 +- .../tools/networking/network-manager/vpnc.nix | 6 +- pkgs/tools/text/diffutils/default.nix | 4 +- pkgs/top-level/all-packages.nix | 2 - 39 files changed, 299 insertions(+), 363 deletions(-) delete mode 100644 pkgs/os-specific/darwin/swift-corefoundation/default.nix diff --git a/nixos/modules/config/zram.nix b/nixos/modules/config/zram.nix index ad41ad4f3d7..019932b04e8 100644 --- a/nixos/modules/config/zram.nix +++ b/nixos/modules/config/zram.nix @@ -8,7 +8,7 @@ let devices = map (nr: "zram${toString nr}") (range 0 (cfg.numDevices - 1)); - modprobe = "${pkgs.kmod}/bin/modprobe"; + modprobe = "${config.system.sbin.modprobe}/sbin/modprobe"; in diff --git a/nixos/modules/hardware/video/bumblebee.nix b/nixos/modules/hardware/video/bumblebee.nix index 69db518ab21..b10846ac18a 100644 --- a/nixos/modules/hardware/video/bumblebee.nix +++ b/nixos/modules/hardware/video/bumblebee.nix @@ -75,6 +75,7 @@ in serviceConfig = { ExecStart = "${bumblebee}/bin/bumblebeed --use-syslog -g ${cfg.group} --driver ${cfg.driver}"; }; + environment.MODULE_DIR="/run/current-system/kernel-modules/lib/modules/"; }; }; } diff --git a/nixos/modules/hardware/video/webcam/facetimehd.nix b/nixos/modules/hardware/video/webcam/facetimehd.nix index d311f600c31..2a2fcf3057d 100644 --- a/nixos/modules/hardware/video/webcam/facetimehd.nix +++ b/nixos/modules/hardware/video/webcam/facetimehd.nix @@ -36,6 +36,7 @@ in # and load it back on resume powerManagement.resumeCommands = '' + export MODULE_DIR=/run/current-system/kernel-modules/lib/modules ${pkgs.kmod}/bin/modprobe -v facetimehd ''; diff --git a/nixos/modules/services/hardware/tlp.nix b/nixos/modules/services/hardware/tlp.nix index 281d02a8c65..5ab7daafa85 100644 --- a/nixos/modules/services/hardware/tlp.nix +++ b/nixos/modules/services/hardware/tlp.nix @@ -72,6 +72,8 @@ in ExecStart = "${tlp}/bin/tlp init start"; ExecStop = "${tlp}/bin/tlp init stop"; }; + + environment.MODULE_DIR="/run/current-system/kernel-modules/lib/modules/"; }; tlp-sleep = { @@ -90,6 +92,8 @@ in ExecStart = "${tlp}/bin/tlp suspend"; ExecStop = "${tlp}/bin/tlp resume"; }; + + environment.MODULE_DIR="/run/current-system/kernel-modules/lib/modules/"; }; }; diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix index 7c4c93d0fcb..e7741083d1a 100644 --- a/nixos/modules/services/hardware/udev.nix +++ b/nixos/modules/services/hardware/udev.nix @@ -58,7 +58,7 @@ let # Fix some paths in the standard udev rules. Hacky. for i in $out/*.rules; do substituteInPlace $i \ - --replace \"/sbin/modprobe \"${pkgs.kmod}/bin/modprobe \ + --replace \"/sbin/modprobe \"${config.system.sbin.modprobe}/sbin/modprobe \ --replace \"/sbin/mdadm \"${pkgs.mdadm}/sbin/mdadm \ --replace \"/sbin/blkid \"${pkgs.utillinux}/sbin/blkid \ --replace \"/bin/mount \"${pkgs.utillinux}/bin/mount \ @@ -316,7 +316,8 @@ in ''; systemd.services.systemd-udevd = - { restartTriggers = cfg.packages; + { environment.MODULE_DIR = "/run/booted-system/kernel-modules/lib/modules"; + restartTriggers = cfg.packages; }; }; diff --git a/nixos/modules/services/network-filesystems/openafs-client/default.nix b/nixos/modules/services/network-filesystems/openafs-client/default.nix index 891f41c8dcd..61c66bb8835 100644 --- a/nixos/modules/services/network-filesystems/openafs-client/default.nix +++ b/nixos/modules/services/network-filesystems/openafs-client/default.nix @@ -80,7 +80,7 @@ in preStart = '' mkdir -p -m 0755 /afs mkdir -m 0700 -p ${cfg.cacheDirectory} - ${pkgs.kmod}/bin/insmod ${openafsPkgs}/lib/openafs/libafs-*.ko || true + ${pkgs.kmod}/sbin/insmod ${openafsPkgs}/lib/openafs/libafs-*.ko || true ${openafsPkgs}/sbin/afsd -confdir ${afsConfig} -cachedir ${cfg.cacheDirectory} ${if cfg.sparse then "-dynroot-sparse" else "-dynroot"} -fakestat -afsdb ${openafsPkgs}/bin/fs setcrypt ${if cfg.crypt then "on" else "off"} ''; diff --git a/nixos/modules/services/networking/fan.nix b/nixos/modules/services/networking/fan.nix index 7f4e3647832..3170567e5b4 100644 --- a/nixos/modules/services/networking/fan.nix +++ b/nixos/modules/services/networking/fan.nix @@ -5,7 +5,7 @@ with lib; let cfg = config.networking.fan; - modprobe = "${pkgs.kmod}/bin/modprobe"; + modprobe = "${config.system.sbin.modprobe}/sbin/modprobe"; in diff --git a/nixos/modules/services/networking/strongswan.nix b/nixos/modules/services/networking/strongswan.nix index 8778b0364f9..d6960a5df47 100644 --- a/nixos/modules/services/networking/strongswan.nix +++ b/nixos/modules/services/networking/strongswan.nix @@ -118,7 +118,7 @@ in systemd.services.strongswan = { description = "strongSwan IPSec Service"; wantedBy = [ "multi-user.target" ]; - path = with pkgs; [ kmod iproute iptables utillinux ]; # XXX Linux + path = with pkgs; [ config.system.sbin.modprobe iproute iptables utillinux ]; # XXX Linux wants = [ "keys.target" ]; after = [ "network.target" "keys.target" ]; environment = { diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix index 0f342f44fe7..a6bbca9b30b 100644 --- a/nixos/modules/system/boot/kernel.nix +++ b/nixos/modules/system/boot/kernel.nix @@ -228,6 +228,7 @@ in systemd.services."systemd-modules-load" = { wantedBy = [ "multi-user.target" ]; restartTriggers = [ kernelModulesConf ]; + environment.MODULE_DIR = "/run/booted-system/kernel-modules/lib/modules"; serviceConfig = { # Ignore failed module loads. Typically some of the # modules in ‘boot.kernelModules’ are "nice to have but @@ -237,6 +238,10 @@ in }; }; + systemd.services.kmod-static-nodes = + { environment.MODULE_DIR = "/run/booted-system/kernel-modules/lib/modules"; + }; + lib.kernelConfig = { isYes = option: { assertion = config: config.isYes option; diff --git a/nixos/modules/system/boot/modprobe.nix b/nixos/modules/system/boot/modprobe.nix index b915a98d537..9bb10eac988 100644 --- a/nixos/modules/system/boot/modprobe.nix +++ b/nixos/modules/system/boot/modprobe.nix @@ -8,6 +8,41 @@ with lib; options = { + system.sbin.modprobe = mkOption { + internal = true; + default = pkgs.stdenv.mkDerivation { + name = "modprobe"; + buildCommand = '' + mkdir -p $out/bin + for i in ${pkgs.kmod}/sbin/*; do + name=$(basename $i) + echo "$text" > $out/bin/$name + echo 'exec '$i' "$@"' >> $out/bin/$name + chmod +x $out/bin/$name + done + ln -s bin $out/sbin + ''; + text = + '' + #! ${pkgs.stdenv.shell} + export MODULE_DIR=/run/current-system/kernel-modules/lib/modules + + # Fall back to the kernel modules used at boot time if the + # modules in the current configuration don't match the + # running kernel. + if [ ! -d "$MODULE_DIR/$(${pkgs.coreutils}/bin/uname -r)" ]; then + MODULE_DIR=/run/booted-system/kernel-modules/lib/modules/ + fi + + ''; + meta.priority = 4; + }; + description = '' + Wrapper around modprobe that sets the path to the modules + tree. + ''; + }; + boot.blacklistedKernelModules = mkOption { type = types.listOf types.str; default = []; @@ -52,7 +87,7 @@ with lib; ''; environment.etc."modprobe.d/debian.conf".source = pkgs.kmod-debian-aliases; - environment.systemPackages = [ pkgs.kmod ]; + environment.systemPackages = [ config.system.sbin.modprobe pkgs.kmod ]; system.activationScripts.modprobe = '' @@ -60,9 +95,11 @@ with lib; # in the right location in the Nix store for kernel modules). # We need this when the kernel (or some module) auto-loads a # module. - echo ${pkgs.kmod}/bin/modprobe > /proc/sys/kernel/modprobe + echo ${config.system.sbin.modprobe}/sbin/modprobe > /proc/sys/kernel/modprobe ''; + environment.sessionVariables.MODULE_DIR = "/run/current-system/kernel-modules/lib/modules"; + }; } diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh index c5a14f0766d..4a7f073ea8a 100644 --- a/nixos/modules/system/boot/stage-2-init.sh +++ b/nixos/modules/system/boot/stage-2-init.sh @@ -207,5 +207,6 @@ exec {logOutFd}>&- {logErrFd}>&- # Start systemd. echo "starting systemd..." PATH=/run/current-system/systemd/lib/systemd \ + MODULE_DIR=/run/booted-system/kernel-modules/lib/modules \ LOCALE_ARCHIVE=/run/current-system/sw/lib/locale/locale-archive \ exec systemd diff --git a/nixos/modules/tasks/cpu-freq.nix b/nixos/modules/tasks/cpu-freq.nix index 2fe7f4f8197..1f4d1db33ce 100644 --- a/nixos/modules/tasks/cpu-freq.nix +++ b/nixos/modules/tasks/cpu-freq.nix @@ -38,7 +38,7 @@ in description = "CPU Frequency Governor Setup"; after = [ "systemd-modules-load.service" ]; wantedBy = [ "multi-user.target" ]; - path = [ cpupower pkgs.kmod ]; + path = [ cpupower config.system.sbin.modprobe ]; unitConfig.ConditionVirtualization = false; serviceConfig = { Type = "oneshot"; diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix index ebc2be087a5..c99fc78d49e 100644 --- a/nixos/modules/virtualisation/docker.nix +++ b/nixos/modules/virtualisation/docker.nix @@ -95,7 +95,8 @@ in LimitNPROC = 1048576; } // proxy_env; - path = [ pkgs.kmod ] ++ (optional (cfg.storageDriver == "zfs") pkgs.zfs); + path = [ config.system.sbin.modprobe ] ++ (optional (cfg.storageDriver == "zfs") pkgs.zfs); + environment.MODULE_DIR = "/run/current-system/kernel-modules/lib/modules"; postStart = if cfg.socketActivation then "" else cfg.postStart; diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 777ee31e4dc..b77b319f4a2 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -135,13 +135,13 @@ let } '' # Create a /boot EFI partition with 40M - ${pkgs.gptfdisk}/bin/sgdisk -G /dev/vda - ${pkgs.gptfdisk}/bin/sgdisk -a 1 -n 1:34:2047 -c 1:"BIOS Boot Partition" -t 1:ef02 /dev/vda - ${pkgs.gptfdisk}/bin/sgdisk -a 512 -N 2 -c 2:"EFI System" -t 2:ef00 /dev/vda - ${pkgs.gptfdisk}/bin/sgdisk -A 1:set:1 /dev/vda - ${pkgs.gptfdisk}/bin/sgdisk -A 2:set:2 /dev/vda - ${pkgs.gptfdisk}/bin/sgdisk -h 2 /dev/vda - ${pkgs.gptfdisk}/bin/sgdisk -C /dev/vda + ${pkgs.gptfdisk}/sbin/sgdisk -G /dev/vda + ${pkgs.gptfdisk}/sbin/sgdisk -a 1 -n 1:34:2047 -c 1:"BIOS Boot Partition" -t 1:ef02 /dev/vda + ${pkgs.gptfdisk}/sbin/sgdisk -a 512 -N 2 -c 2:"EFI System" -t 2:ef00 /dev/vda + ${pkgs.gptfdisk}/sbin/sgdisk -A 1:set:1 /dev/vda + ${pkgs.gptfdisk}/sbin/sgdisk -A 2:set:2 /dev/vda + ${pkgs.gptfdisk}/sbin/sgdisk -h 2 /dev/vda + ${pkgs.gptfdisk}/sbin/sgdisk -C /dev/vda ${pkgs.utillinux}/bin/sfdisk /dev/vda -A 2 . /sys/class/block/vda2/uevent mknod /dev/vda2 b $MAJOR $MINOR @@ -151,11 +151,11 @@ let ${pkgs.mtools}/bin/mlabel -i /dev/vda2 ::boot # Mount /boot; load necessary modules first. - ${pkgs.kmod}/bin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/nls/nls_cp437.ko.xz || true - ${pkgs.kmod}/bin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/nls/nls_iso8859-1.ko.xz || true - ${pkgs.kmod}/bin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/fat/fat.ko.xz || true - ${pkgs.kmod}/bin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/fat/vfat.ko.xz || true - ${pkgs.kmod}/bin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/efivarfs/efivarfs.ko.xz || true + ${pkgs.kmod}/sbin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/nls/nls_cp437.ko.xz || true + ${pkgs.kmod}/sbin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/nls/nls_iso8859-1.ko.xz || true + ${pkgs.kmod}/sbin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/fat/fat.ko.xz || true + ${pkgs.kmod}/sbin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/fat/vfat.ko.xz || true + ${pkgs.kmod}/sbin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/efivarfs/efivarfs.ko.xz || true mkdir /boot mount /dev/vda2 /boot @@ -370,7 +370,7 @@ in boot.initrd.extraUtilsCommands = '' # We need mke2fs in the initrd. - copy_bin_and_libs ${pkgs.e2fsprogs}/bin/mke2fs + copy_bin_and_libs ${pkgs.e2fsprogs}/sbin/mke2fs ''; boot.initrd.postDeviceCommands = diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/development/libraries/fftw/default.nix index cf009599665..6b92848fd0f 100644 --- a/pkgs/development/libraries/fftw/default.nix +++ b/pkgs/development/libraries/fftw/default.nix @@ -1,24 +1,34 @@ -{ fetchurl, stdenv, lib, precision ? "double" }: +{ fetchFromGitHub , stdenv, lib, ocaml, perl, indent, transfig, ghostscript, texinfo, libtool, gettext, automake, autoconf, precision ? "double" }: with lib; assert elem precision [ "single" "double" "long-double" "quad-precision" ]; -let version = "3.3.5"; in +let version = "3.3.5-rc1"; in stdenv.mkDerivation rec { name = "fftw-${precision}-${version}"; - src = fetchurl { - url = "ftp://ftp.fftw.org/pub/fftw/fftw-${version}.tar.gz"; - sha256 = "1kwbx92ps0r7s2mqy7lxbxanslxdzj7dp7r7gmdkzv1j8yqf3kwf"; + src = fetchFromGitHub { + owner = "FFTW"; + repo = "fftw3"; + rev = "fftw-${version}"; + sha256 = "1gc57xvdqbapq30ylj3fxwkv61la4kzyf7ji0q0xqjwpji2ynqi4"; }; + nativeBuildInputs = [ ocaml perl indent transfig ghostscript texinfo libtool gettext automake autoconf ]; + + # remove the ./configure lines, so we can use nix's configureFlags + patchPhase = "sed -e '27,29d' -i bootstrap.sh"; + + preConfigurePhases = "./bootstrap.sh"; + outputs = [ "dev" "out" "doc" ]; # it's dev-doc only outputBin = "dev"; # fftw-wisdom configureFlags = - [ "--enable-shared" "--disable-static" + [ "--enable-maintainer-mode" + "--enable-shared" "--disable-static" "--enable-threads" ] ++ optional (precision != "double") "--enable-${precision}" diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 13a7cfe0fb9..d2bb05a3bb6 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, udev, valgrind }: stdenv.mkDerivation rec { - name = "libdrm-2.4.70"; + name = "libdrm-2.4.68"; src = fetchurl { url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2"; - sha256 = "b17d4b39ed97ca0e4cffa0db06ff609e617bac94646ec38e8e0579d530540e7b"; + sha256 = "5b4bd9a5922929bc716411cb74061fbf31b06ba36feb89bc1358a91a8d0ca9df"; }; outputs = [ "dev" "out" ]; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 8f037d239d0..4ed47f46a32 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -1,12 +1,13 @@ -{ stdenv, fetchurl, fetchpatch -, pkgconfig, intltool, autoreconfHook, substituteAll -, file, expat, libdrm, xorg, wayland, libudev -, llvmPackages, libffi, libomxil-bellagio, libva -, libelf, libvdpau, python -, grsecEnabled ? false +{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, autoreconfHook, substituteAll +, file, expat, libdrm, xorg, wayland, libudev, llvmPackages, libffi, libomxil-bellagio +, libvdpau, libelf, libva +, grsecEnabled , enableTextureFloats ? false # Texture floats are patented, see docs/patents.txt }: +if ! stdenv.lib.lists.elem stdenv.system stdenv.lib.platforms.mesaPlatforms then + throw "unsupported platform for Mesa" +else /** Packaging design: - The basic mesa ($out) contains headers and libraries (GLU is in mesa_glu now). @@ -19,15 +20,11 @@ - libOSMesa is in $osmesa (~4 MB) */ -with stdenv.lib; - -if ! lists.elem stdenv.system platforms.mesaPlatforms then - throw "unsupported platform for Mesa" -else +with { inherit (stdenv.lib) optional optionalString; }; let - version = "12.0.1"; - branch = head (splitString "." version); + version = "11.2.2"; + # this is the default search path for DRI drivers driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32"; in @@ -37,20 +34,20 @@ stdenv.mkDerivation { src = fetchurl { urls = [ "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" - "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" + (with stdenv.lib; ''ftp://ftp.freedesktop.org/pub/mesa/older-versions/'' + + head (splitString "." version) + ''.x/${version}/mesa-${version}.tar.xz'') "https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz" ]; - sha256 = "12b3i59xdn2in2hchrkgh4fwij8zhznibx976l3pdj3qkyvlzcms"; + sha256 = "40e148812388ec7c6d7b6657d5a16e2e8dabba8b97ddfceea5197947647bdfb4"; }; prePatch = "patchShebangs ."; - # TODO: - # revive ./dricore-gallium.patch when it gets ported (from Ubuntu), as it saved - # ~35 MB in $drivers; watch https://launchpad.net/ubuntu/+source/mesa/+changelog patches = [ ./glx_ro_text_segm.patch # fix for grsecurity/PaX ./symlink-drivers.patch + # TODO: revive ./dricore-gallium.patch when it gets ported (from Ubuntu), + # as it saved ~35 MB in $drivers; watch https://launchpad.net/ubuntu/+source/mesa/+changelog ] ++ optional stdenv.isLinux (substituteAll { src = ./dlopen-absolute-paths.diff; @@ -64,59 +61,61 @@ stdenv.mkDerivation { outputs = [ "dev" "out" "drivers" "osmesa" ]; - # TODO: Figure out how to enable opencl without having a runtime dependency on clang configureFlags = [ "--sysconfdir=/etc" "--localstatedir=/var" "--with-dri-driverdir=$(drivers)/lib/dri" "--with-dri-searchpath=${driverLink}/lib/dri" - "--with-egl-platforms=x11,wayland,drm" - (optionalString (stdenv.system != "armv7l-linux") - "--with-gallium-drivers=svga,i915,ilo,r300,r600,radeonsi,nouveau,freedreno,swrast") - (optionalString (stdenv.system != "armv7l-linux") - "--with-dri-drivers=i915,i965,nouveau,radeon,r200,swrast") - (enableFeature enableTextureFloats "texture-float") - (enableFeature grsecEnabled "glx-rts") - (enableFeature stdenv.isLinux "dri3") - (enableFeature stdenv.isLinux "nine") # Direct3D in Wine - "--enable-dri" - "--enable-driglx-direct" "--enable-gles1" "--enable-gles2" + "--enable-dri" + ] ++ optional stdenv.isLinux "--enable-dri3" + ++ [ "--enable-glx" - "--enable-glx-tls" "--enable-gallium-osmesa" # used by wine - "--enable-gallium-llvm" "--enable-egl" "--enable-xa" # used in vmware driver "--enable-gbm" + ] ++ optional stdenv.isLinux "--enable-nine" # Direct3D in Wine + ++ [ "--enable-xvmc" "--enable-vdpau" + #"--enable-omx" + #"--enable-va" + + # TODO: Figure out how to enable opencl without having a runtime dependency on clang + "--disable-opencl" + + (if "armv7l-linux" == stdenv.system + then null + else "--with-gallium-drivers=svga,i915,ilo,r300,r600,radeonsi,nouveau,freedreno,swrast") "--enable-shared-glapi" "--enable-sysfs" + "--enable-driglx-direct" # seems enabled anyway + "--enable-glx-tls" + (if "armv7l-linux" == stdenv.system + then "--with-dri-drivers=" + else "--with-dri-drivers=i915,i965,nouveau,radeon,r200,swrast") + "--with-egl-platforms=x11,wayland,drm" + + "--enable-gallium-llvm" "--enable-llvm-shared-libs" - "--enable-omx" - "--enable-va" - "--disable-opencl" - ]; + ] ++ optional enableTextureFloats "--enable-texture-float" + ++ optional grsecEnabled "--enable-glx-rts"; # slight performance degradation, enable only for grsec nativeBuildInputs = [ pkgconfig file ]; - propagatedBuildInputs = with xorg; - [ libXdamage libXxf86vm ] + propagatedBuildInputs = with xorg; [ libXdamage libXxf86vm ] ++ optional stdenv.isLinux libdrm; buildInputs = with xorg; [ autoreconfHook intltool expat llvmPackages.llvm glproto dri2proto dri3proto presentproto libX11 libXext libxcb libXt libXfixes libxshmfence - libffi wayland libvdpau libelf libXvMC - libomxil-bellagio libva libpthreadstubs - (python.withPackages (ps: [ ps.Mako ])) + libffi wayland libvdpau libelf libXvMC /* libomxil-bellagio libva */ ] ++ optional stdenv.isLinux libudev; - enableParallelBuilding = true; doCheck = false; @@ -125,42 +124,42 @@ stdenv.mkDerivation { "localstatedir=\${TMPDIR}" ]; - # TODO: probably not all .la files are completely fixed, but it shouldn't matter; - postInstall = '' - # move gallium-related stuff to $drivers, so $out doesn't depend on LLVM - mv -t "$drivers/lib/" \ - $out/lib/libXvMC* \ - $out/lib/d3d \ - $out/lib/vdpau \ - $out/lib/bellagio \ - $out/lib/libxatracker* \ + # move gallium-related stuff to $drivers, so $out doesn't depend on LLVM; + # also move libOSMesa to $osmesa, as it's relatively big + # ToDo: probably not all .la files are completely fixed, but it shouldn't matter + postInstall = with stdenv.lib; '' + mv -t "$drivers/lib/" \ + $out/lib/libXvMC* \ + $out/lib/d3d \ + $out/lib/vdpau \ + $out/lib/libxatracker* - mv $out/lib/dri/* $drivers/lib/dri - - # move libOSMesa to $osmesa, as it's relatively big mkdir -p {$osmesa,$drivers}/lib/ - mv -t $osmesa/lib/ $out/lib/libOSMesa* + mv -t $osmesa/lib/ \ + $out/lib/libOSMesa* - # now fix references in .la files - sed "/^libdir=/s,$out,$osmesa," -i $osmesa/lib/libOSMesa*.la + '' + /* now fix references in .la files */ '' + sed "/^libdir=/s,$out,$osmesa," -i \ + $osmesa/lib/libOSMesa*.la - # set the default search path for DRI drivers; used e.g. by X server + '' + /* set the default search path for DRI drivers; used e.g. by X server */ '' substituteInPlace "$dev/lib/pkgconfig/dri.pc" --replace '$(drivers)' "${driverLink}" ''; + #ToDo: @vcunat isn't sure if drirc will be found when in $out/etc/, but it doesn't seem important ATM */ - # TODO: - # @vcunat isn't sure if drirc will be found when in $out/etc/; - # check $out doesn't depend on llvm: builder failures are ignored - # for some reason grep -qv '${llvmPackages.llvm}' -R "$out"; - postFixup = '' + postFixup = # add RPATH so the drivers can find the moved libgallium and libdricore9 # moved here to avoid problems with stripping patchelfed files + '' for lib in $drivers/lib/*.so* $drivers/lib/*/*.so*; do if [[ ! -L "$lib" ]]; then patchelf --set-rpath "$(patchelf --print-rpath $lib):$drivers/lib" "$lib" fi done ''; + # ToDo + /* check $out doesn't depend on llvm */ '' + # builder failures are ignored for some reason + # grep -qv '${llvmPackages.llvm}' -R "$out" passthru = { inherit libdrm version driverLink; }; diff --git a/pkgs/development/python-modules/generic/run_setup.py b/pkgs/development/python-modules/generic/run_setup.py index e3a530eb0cb..d980ac7d23d 100644 --- a/pkgs/development/python-modules/generic/run_setup.py +++ b/pkgs/development/python-modules/generic/run_setup.py @@ -1,5 +1,3 @@ -# -*- coding: utf-8 -*- - import setuptools import tokenize diff --git a/pkgs/development/tools/misc/lttng-tools/default.nix b/pkgs/development/tools/misc/lttng-tools/default.nix index 827c1d0e67f..627a51916cb 100644 --- a/pkgs/development/tools/misc/lttng-tools/default.nix +++ b/pkgs/development/tools/misc/lttng-tools/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ popt libuuid liburcu lttng-ust libxml2 ]; prePatch = '' - sed -e "s|/sbin/modprobe|${kmod}/bin/modprobe|g" \ + sed -e "s|/sbin/modprobe|${kmod}/sbin/modprobe|g" \ -i src/bin/lttng-sessiond/modprobe.c ''; diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix index ce04be0e083..16cfa9e554b 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation, ed, unifdef, Libc_old, Libc_10-9 }: +{ stdenv, appleDerivation, ed, unifdef, Libc_old }: appleDerivation { phases = [ "unpackPhase" "installPhase" ]; @@ -13,8 +13,6 @@ appleDerivation { export PRIVATE_HEADERS_FOLDER_PATH=include bash xcodescripts/headers.sh - cp ${Libc_10-9}/include/NSSystemDirectories.h $out/include - # Ugh Apple stopped releasing this stuff so we need an older one... cp ${Libc_old}/include/spawn.h $out/include cp ${Libc_old}/include/setjmp.h $out/include diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix index 27d2360a980..1c9b5879e6e 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix @@ -5,7 +5,42 @@ appleDerivation rec { phases = [ "unpackPhase" "installPhase" ]; - buildInputs = [ cpio ]; + buildInputs = [ cpio libpthread ]; + + systemlibs = [ "cache" + "commonCrypto" + "compiler_rt" + "copyfile" + "corecrypto" + "dispatch" + "dyld" + "keymgr" + "kxld" + "launch" + "macho" + "quarantine" + "removefile" + "system_asl" + "system_blocks" + # "system_c" # special re-export here to hide newer functions + "system_configuration" + "system_dnssd" + "system_info" + # "system_kernel" # special re-export here to hide newer functions + "system_m" + "system_malloc" + "system_network" + "system_notify" + "system_platform" + "system_pthread" + "system_sandbox" + # does not exist in El Capitan beta + # FIXME: does anything on yosemite actually need this? + # "system_stats" + "unc" + "unwind" + "xpc" + ]; installPhase = '' export NIX_ENFORCE_PURITY= @@ -19,7 +54,7 @@ appleDerivation rec { for dep in ${Libc} ${Libm} ${Libinfo} ${dyld} ${architecture} ${libclosure} ${CarbonHeaders} \ ${libdispatch} ${ncurses.dev} ${CommonCrypto} ${copyfile} ${removefile} ${libresolv} \ - ${Libnotify} ${mDNSResponder} ${launchd} ${libutil} ${libpthread}; do + ${Libnotify} ${mDNSResponder} ${launchd} ${libutil}; do (cd $dep/include && find . -name '*.h' | cpio -pdm $out/include) done @@ -56,9 +91,33 @@ appleDerivation rec { # The startup object files cp ${Csu}/lib/* $out/lib - # OMG impurity - ln -s /usr/lib/libSystem.B.dylib $out/lib/libSystem.B.dylib - ln -s /usr/lib/libSystem.dylib $out/lib/libSystem.dylib + # selectively re-export functions from libsystem_c and libsystem_kernel + # to provide a consistent interface across OSX verions + mkdir -p $out/lib/system + ld -macosx_version_min 10.7 -arch x86_64 -dylib \ + -o $out/lib/system/libsystem_c.dylib \ + /usr/lib/libSystem.dylib \ + -reexported_symbols_list ${./system_c_symbols} + + ld -macosx_version_min 10.7 -arch x86_64 -dylib \ + -o $out/lib/system/libsystem_kernel.dylib \ + /usr/lib/libSystem.dylib \ + -reexported_symbols_list ${./system_kernel_symbols} + + # Set up the actual library link + clang -c -o CompatibilityHacks.o -Os CompatibilityHacks.c + clang -c -o init.o -Os init.c + ld -macosx_version_min 10.7 \ + -arch x86_64 \ + -dylib \ + -o $out/lib/libSystem.dylib \ + CompatibilityHacks.o init.o \ + -compatibility_version 1.0 \ + -current_version 1197.1.1 \ + -reexport_library $out/lib/system/libsystem_c.dylib \ + -reexport_library $out/lib/system/libsystem_kernel.dylib \ + ${stdenv.lib.concatStringsSep " " + (map (l: "-reexport_library /usr/lib/system/lib${l}.dylib") systemlibs)} # Set up links to pretend we work like a conventional unix (Apple's design, not mine!) for name in c dbm dl info m mx poll proc pthread rpcsvc util gcc_s.10.4 gcc_s.10.5; do diff --git a/pkgs/os-specific/darwin/apple-source-releases/configd/default.nix b/pkgs/os-specific/darwin/apple-source-releases/configd/default.nix index 24797fc286a..1fbacfb9284 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/configd/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/configd/default.nix @@ -3,7 +3,7 @@ appleDerivation { meta.broken = stdenv.cc.nativeLibc; - buildInputs = [ launchd bootstrap_cmds ppp IOKit eap8021x ]; + buildInputs = [ launchd bootstrap_cmds xnu ppp IOKit eap8021x ]; propagatedBuildInputs = [ Security ]; @@ -12,11 +12,6 @@ appleDerivation { ''; patchPhase = '' - HACK=$PWD/hack - mkdir $HACK - cp -r ${xnu}/Library/Frameworks/System.framework/Versions/B/PrivateHeaders/net $HACK - - substituteInPlace SystemConfiguration.fproj/SCNetworkReachabilityInternal.h \ --replace '#include ' "" @@ -177,9 +172,9 @@ appleDerivation { cc -I. -Ihelper -Iderived -F. -c DHCP.c -o DHCP.o cc -I. -Ihelper -Iderived -F. -c moh.c -o moh.o cc -I. -Ihelper -Iderived -F. -c DeviceOnHold.c -o DeviceOnHold.o - cc -I. -Ihelper -Iderived -I $HACK -F. -c LinkConfiguration.c -o LinkConfiguration.o + cc -I. -Ihelper -Iderived -I${xnu}/Library/Frameworks/System.framework/Versions/B/PrivateHeaders -F. -c LinkConfiguration.c -o LinkConfiguration.o cc -I. -Ihelper -Iderived -F. -c dy_framework.c -o dy_framework.o - cc -I. -Ihelper -Iderived -I $HACK -F. -c VLANConfiguration.c -o VLANConfiguration.o + cc -I. -Ihelper -Iderived -I${xnu}/Library/Frameworks/System.framework/Versions/B/PrivateHeaders -F. -c VLANConfiguration.c -o VLANConfiguration.o cc -I. -Ihelper -Iderived -F. -c derived/configUser.c -o configUser.o cc -I. -Ihelper -Iderived -F. -c SCPreferencesPathKey.c -o SCPreferencesPathKey.o cc -I. -Ihelper -Iderived -I../dnsinfo -F. -c derived/shared_dns_infoUser.c -o shared_dns_infoUser.o @@ -188,8 +183,8 @@ appleDerivation { cc -I. -Ihelper -Iderived -F. -c SCNetworkProtocol.c -o SCNetworkProtocol.o cc -I. -Ihelper -Iderived -F. -c SCNetworkService.c -o SCNetworkService.o cc -I. -Ihelper -Iderived -F. -c SCNetworkSet.c -o SCNetworkSet.o - cc -I. -Ihelper -Iderived -I $HACK -F. -c BondConfiguration.c -o BondConfiguration.o - cc -I. -Ihelper -Iderived -I $HACK -F. -c BridgeConfiguration.c -o BridgeConfiguration.o + cc -I. -Ihelper -Iderived -I${xnu}/Library/Frameworks/System.framework/Versions/B/PrivateHeaders -F. -c BondConfiguration.c -o BondConfiguration.o + cc -I. -Ihelper -Iderived -I${xnu}/Library/Frameworks/System.framework/Versions/B/PrivateHeaders -F. -c BridgeConfiguration.c -o BridgeConfiguration.o cc -I. -Ihelper -Iderived -F. -c helper/SCHelper_client.c -o SCHelper_client.o cc -I. -Ihelper -Iderived -F. -c SCPreferencesKeychainPrivate.c -o SCPreferencesKeychainPrivate.o cc -I. -Ihelper -Iderived -F. -c SCNetworkSignature.c -o SCNetworkSignature.o diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index d7710abf291..ce128f14530 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchzip, pkgs }: +{ stdenv, fetchurl, pkgs }: let # This attrset can in theory be computed automatically, but for that to work nicely we need @@ -6,13 +6,9 @@ let # a stdenv out of something like this. With some care we can probably get rid of this, but for # now it's staying here. versions = { - "osx-10.11.6" = { - dtrace = "168"; - xnu = "3248.60.10"; - libpthread = "138.10.4"; - }; - "osx-10.11.5" = { - Libc = "1082.50.1"; # 10.11.6 still unreleased :/ + "osx-10.11.2" = { + dtrace = "168"; + xnu = "3248.20.55"; }; "osx-10.10.5" = { adv_cmds = "158"; @@ -189,18 +185,13 @@ let CoreOSMakefiles = applePackage "CoreOSMakefiles" "osx-10.5" "0kxp53spbn7109l7cvhi88pmfsi81lwmbws819b6wr3hm16v84f4" {}; Csu = applePackage "Csu" "osx-10.10.5" "0yh5mslyx28xzpv8qww14infkylvc1ssi57imhi471fs91sisagj" {}; dtrace = applePackage "dtrace" "osx-10.10.5" "0pp5x8dgvzmg9vvg32hpy2brm17dpmbwrcr4prsmdmfvd4767wcf" {}; - dtracen = applePackage "dtrace" "osx-10.11.6" "04mi0jy8gy0w59rk9i9dqznysv6fzz1v5mq779s41cp308yi0h1c" {}; + dtracen = applePackage "dtrace" "osx-10.11.2" "04mi0jy8gy0w59rk9i9dqznysv6fzz1v5mq779s41cp308yi0h1c" {}; dyld = applePackage "dyld" "osx-10.10.5" "167f74ln8pmfimwn6kwh199ylvy3fw72fd15da94mf34ii0zar6k" {}; eap8021x = applePackage "eap8021x" "osx-10.10.5" "1f37dpbcgrd1b14nrv2lpqrkap74myjbparz9masx92df6kcn7l2" {}; IOKit = applePackage "IOKit" "osx-10.10.5" "0kcbrlyxcyirvg5p95hjd9k8a01k161zg0bsfgfhkb90kh2s8x0m" { inherit IOKitSrcs; }; launchd = applePackage "launchd" "osx-10.9.5" "0w30hvwqq8j5n90s3qyp0fccxflvrmmjnicjri4i1vd2g196jdgj" {}; libauto = applePackage "libauto" "osx-10.9.5" "17z27yq5d7zfkwr49r7f0vn9pxvj95884sd2k6lq6rfaz9gxqhy3" {}; - Libc = applePackage "Libc" "osx-10.11.5" "1qv7r0dgz06jy9i5agbqzxgdibb0m8ylki6g5n5pary88lzrawfd" { - Libc_10-9 = fetchzip { - url = "http://www.opensource.apple.com/tarballs/Libc/Libc-997.90.3.tar.gz"; - sha256 = "1xchgxkxg5288r2b9yfrqji2gsgdap92k4wx2dbjwslixws12pq7"; - }; - }; + Libc = applePackage "Libc" "osx-10.9.5" "1jz5bx9l4q484vn28c6n9b28psja3rpxiqbj6zwrwvlndzmq1yz5" {}; Libc_old = applePackage "Libc/825_40_1.nix" "osx-10.8.5" "0xsx1im52gwlmcrv4lnhhhn9dyk5ci6g27k6yvibn9vj8fzjxwcf" {}; libclosure = applePackage "libclosure" "osx-10.10.5" "1zqy1zvra46cmqv6vsf1mcsz3a76r9bky145phfwh4ab6y15vjpq" {}; libdispatch = applePackage "libdispatch" "osx-10.9.5" "1lc5033cmkwxy3r26gh9plimxshxfcbgw6i0j7mgjlnpk86iy5bk" {}; @@ -208,7 +199,7 @@ let Libinfo = applePackage "Libinfo" "osx-10.10.5" "19n72s652rrqnc9hzlh4xq3h7xsfyjyklmcgyzyj0v0z68ww3z6h" {}; Libm = applePackage "Libm" "osx-10.7.4" "02sd82ig2jvvyyfschmb4gpz6psnizri8sh6i982v341x6y4ysl7" {}; Libnotify = applePackage "Libnotify" "osx-10.9.5" "164rx4za5z74s0mk9x0m1815r1m9kfal8dz3bfaw7figyjd6nqad" {}; - libpthread = applePackage "libpthread" "osx-10.11.6" "1kbw738cmr9pa7pz1igmajs307clfq7gv2vm1sqdzhcnnjxbl28w" {}; + libpthread = applePackage "libpthread" "osx-10.10.5" "1p2y6xvsfqyakivr6d48fgrd163b5m9r045cxyfwrf8w0r33nfn3" {}; libresolv = applePackage "libresolv" "osx-10.10.5" "0nvssf4qaqgs1dxwayzdy66757k99969f6c7n68n58n2yh6f5f6a" {}; Libsystem = applePackage "Libsystem" "osx-10.9.5" "1yfj2qdrf9vrzs7p9m4wlb7zzxcrim1gw43x4lvz4qydpp5kg2rh" {}; libutil = applePackage "libutil" "osx-10.10.5" "12gsvmj342n5d81kqwba68bmz3zf2757442g1sz2y5xmcapa3g5f" {}; @@ -218,7 +209,7 @@ let ppp = applePackage "ppp" "osx-10.10.5" "01v7i0xds185glv8psvlffylfcfhbx1wgsfg74kx5rh3lyrigwrb" {}; removefile = applePackage "removefile" "osx-10.10.5" "1f2jw5irq6fz2jv5pag1w2ivfp8659v74f0h8kh0yx0rqw4asm33" {}; Security = applePackage "Security" "osx-10.9.5" "1nv0dczf67dhk17hscx52izgdcyacgyy12ag0jh6nl5hmfzsn8yy" {}; - xnu = applePackage "xnu" "osx-10.11.6" "0yhziq4dqqcbjpf6vyqn8xhwva2zb525gndkx8cp8alzwp76jnr9" {}; + xnu = applePackage "xnu" "osx-10.9.5" "1ssw5fzvgix20bw6y13c39ib0zs7ykpig3irlwbaccpjpci5jl0s" {}; # Pending work... we can't change the above packages in place because the bootstrap depends on them, so we detach the expressions # here so we can work on them. diff --git a/pkgs/os-specific/darwin/apple-source-releases/libpthread/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libpthread/default.nix index c9d4b654a58..027784e2ea6 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libpthread/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libpthread/default.nix @@ -6,14 +6,8 @@ appleDerivation { propagatedBuildInputs = [ libdispatch xnu ]; installPhase = '' - mkdir -p $out/include/pthread/ - mkdir -p $out/include/sys/_types + mkdir -p $out/include/pthread cp pthread/*.h $out/include/pthread/ - - # This overwrites qos.h, and is probably not necessary, but I'll leave it here for now - # cp private/*.h $out/include/pthread/ - - cp -r sys $out/include - cp -r sys/_pthread/*.h $out/include/sys/_types/ + cp private/*.h $out/include/pthread/ ''; } diff --git a/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix b/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix index 0ce9c54e48c..4933f94d4a9 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix @@ -30,12 +30,11 @@ appleDerivation { substituteInPlace libsyscall/xcodescripts/mach_install_mig.sh \ --replace "/usr/include" "/include" \ --replace "/usr/local/include" "/include" \ - --replace 'MIG=`' "# " \ - --replace 'MIGCC=`' "# " \ + --replace "MIG=" "# " \ + --replace "MIGCC=" "# " \ --replace " -o 0" "" \ --replace '$SRC/$mig' '-I$DSTROOT/include $SRC/$mig' \ - --replace '$SRC/servers/netname.defs' '-I$DSTROOT/include $SRC/servers/netname.defs' \ - --replace '$BUILT_PRODUCTS_DIR/mig_hdr' '$BUILT_PRODUCTS_DIR' + --replace '$SRC/servers/netname.defs' '-I$DSTROOT/include $SRC/servers/netname.defs' patchShebangs . ''; @@ -47,9 +46,9 @@ appleDerivation { cat > sdk/usr/local/libexec/availability.pl <= PATH_MAX) -+ continue; -+ -+ if (dirname_default_prefixes[i + 1] != NULL) { -+ if (stat(buf, &dirstat) < 0) { -+ if (errno == ENOENT) -+ continue; -+ else -+ return NULL; -+ } -+ -+ if (!S_ISDIR(dirstat.st_mode)) -+ continue; -+ } -+ -+ p = malloc(plen + 1); -+ if (p == NULL) -+ return NULL; -+ memcpy(p, buf, plen + 1); -+ break; -+ } -+ } ++ if (asprintf(&p, "%s/%s", dirname_prefix, u.release) < 0) + return NULL; return p; - } -diff --git a/tools/static-nodes.c b/tools/static-nodes.c -index 8d2356d..2ed306d 100644 ---- a/tools/static-nodes.c -+++ b/tools/static-nodes.c -@@ -29,10 +29,11 @@ - #include - #include - #include --#include - - #include - -+#include -+ - #include "kmod.h" - - struct static_nodes_format { -@@ -154,8 +155,8 @@ static void help(void) - - static int do_static_nodes(int argc, char *argv[]) - { -- struct utsname kernel; - char modules[PATH_MAX], buf[4096]; -+ struct kmod_ctx *ctx; - const char *output = "/dev/stdout"; +diff -ru -x '*~' kmod-17-orig/tools/static-nodes.c kmod-17/tools/static-nodes.c +--- kmod-17-orig/tools/static-nodes.c 2013-12-17 22:05:42.159047316 +0100 ++++ kmod-17/tools/static-nodes.c 2014-04-17 13:51:17.945974320 +0200 +@@ -159,6 +159,7 @@ FILE *in = NULL, *out = NULL; const struct static_nodes_format *format = &static_nodes_format_human; -@@ -206,22 +207,25 @@ static int do_static_nodes(int argc, char *argv[]) - } - } + int r, ret = EXIT_SUCCESS; ++ char *dirname_prefix; -- if (uname(&kernel) < 0) { -- fputs("Error: uname failed!\n", stderr); -+ ctx = kmod_new(NULL, NULL); -+ if (ctx == NULL) { -+ fprintf(stderr, "Error: failed to create kmod context\n"); - ret = EXIT_FAILURE; + for (;;) { + int c, idx = 0, valid; +@@ -211,16 +212,19 @@ goto finish; } -- + - snprintf(modules, sizeof(modules), "/lib/modules/%s/modules.devname", kernel.release); -+ if (snprintf(modules, sizeof(modules), "%s/modules.devname", kmod_get_dirname(ctx)) < 0) { -+ fprintf(stderr, "Error: path to modules.devname is too long\n"); -+ ret = EXIT_FAILURE; -+ goto finish; -+ } -+ kmod_unref(ctx); ++ if ((dirname_prefix = getenv("MODULE_DIR")) == NULL) ++ dirname_prefix = "/lib/modules"; ++ ++ snprintf(modules, sizeof(modules), "%s/%s/modules.devname", dirname_prefix, kernel.release); in = fopen(modules, "re"); if (in == NULL) { if (errno == ENOENT) { - fprintf(stderr, "Warning: /lib/modules/%s/modules.devname not found - ignoring\n", - kernel.release); -+ fprintf(stderr, "Warning: %s not found - ignoring\n", modules); ++ fprintf(stderr, "Warning: %s/%s/modules.devname not found - ignoring\n", ++ dirname_prefix, kernel.release); ret = EXIT_SUCCESS; } else { - fprintf(stderr, "Error: could not open /lib/modules/%s/modules.devname - %m\n", - kernel.release); -+ fprintf(stderr, "Error: could not open %s - %m\n", modules); ++ fprintf(stderr, "Error: could not open %s/%s/modules.devname - %m\n", ++ dirname_prefix, kernel.release); ret = EXIT_FAILURE; } goto finish; diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix index 41c94bd1674..deefb6bbad2 100644 --- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix @@ -27,6 +27,7 @@ rec { # C standard library stuff cp -d ${darwin.Libsystem}/lib/*.o $out/lib/ cp -d ${darwin.Libsystem}/lib/*.dylib $out/lib/ + cp -d ${darwin.Libsystem}/lib/system/*.dylib $out/lib/ # Resolv is actually a link to another package, so let's copy it properly rm $out/lib/libresolv.9.dylib @@ -90,7 +91,7 @@ rec { cp -d ${xz.out}/lib/liblzma*.* $out/lib # Copy binutils. - for i in as ld ar ranlib nm strip otool install_name_tool dsymutil lipo; do + for i in as ld ar ranlib nm strip otool install_name_tool dsymutil; do cp ${darwin.cctools}/bin/$i $out/bin done diff --git a/pkgs/tools/networking/network-manager/0.9.8/default.nix b/pkgs/tools/networking/network-manager/0.9.8/default.nix index 0c791631daa..4fad1ca2ab9 100644 --- a/pkgs/tools/networking/network-manager/0.9.8/default.nix +++ b/pkgs/tools/networking/network-manager/0.9.8/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, intltool, pkgconfig, dbus_glib , udev, libnl, libuuid, gnutls, dhcp -, libgcrypt, perl, libgudev, avahi, ppp, kmod }: +, libgcrypt, perl, libgudev }: stdenv.mkDerivation rec { name = "network-manager-${version}"; @@ -13,12 +13,6 @@ stdenv.mkDerivation rec { preConfigure = '' substituteInPlace tools/glib-mkenums --replace /usr/bin/perl ${perl}/bin/perl - substituteInPlace src/nm-device.c \ - --replace @avahi@ ${avahi} \ - --replace @kmod@ ${kmod} - substituteInPlace src/ppp-manager/nm-ppp-manager.c \ - --replace @ppp@ ${ppp} \ - --replace @kmod@ ${kmod} ''; # Right now we hardcode quite a few paths at build time. Probably we should diff --git a/pkgs/tools/networking/network-manager/0.9.8/nixos-purity.patch b/pkgs/tools/networking/network-manager/0.9.8/nixos-purity.patch index 9ebc080ba96..831b2010fcf 100644 --- a/pkgs/tools/networking/network-manager/0.9.8/nixos-purity.patch +++ b/pkgs/tools/networking/network-manager/0.9.8/nixos-purity.patch @@ -47,7 +47,7 @@ index 1dc94ee..e60f3c8 100644 for (iter = modules; *iter; iter++) { - char *argv[3] = { "/sbin/modprobe", *iter, NULL }; -+ char *argv[3] = { "@kmod@/bin/modprobe", *iter, NULL }; ++ char *argv[3] = { "/var/run/current-system/sw/bin/modprobe", *iter, NULL }; char *envp[1] = { NULL }; GError *error = NULL; @@ -71,7 +71,7 @@ index 59698c3..7dba0f7 100644 /* Make sure /dev/ppp exists (bgo #533064) */ if (stat ("/dev/ppp", &st) || !S_ISCHR (st.st_mode)) - ignored = system ("/sbin/modprobe ppp_generic"); -+ ignored = system ("@kmod@/bin/modprobe ppp_generic"); ++ ignored = system ("/var/run/current-system/sw/bin/modprobe ppp_generic"); connection = nm_act_request_get_connection (req); g_assert (connection); diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 57bf1a51a1a..66a261c7cf6 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -2,7 +2,7 @@ , systemd, libgudev, libnl, libuuid, polkit, gnutls, ppp, dhcp, iptables , libgcrypt, dnsmasq, bluez5, readline , gobjectIntrospection, modemmanager, openresolv, libndp, newt, libsoup -, ethtool, gnused, coreutils, file, inetutils, kmod }: +, ethtool, gnused, coreutils, file, inetutils }: stdenv.mkDerivation rec { name = "network-manager-${version}"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { substituteInPlace configure --replace /usr/bin/uname ${coreutils}/bin/uname substituteInPlace configure --replace /usr/bin/file ${file}/bin/file substituteInPlace src/devices/nm-device.c --replace /usr/bin/ping ${inetutils}/bin/ping - substituteInPlace src/NetworkManagerUtils.c --replace /sbin/modprobe ${kmod}/bin/modprobe + substituteInPlace src/NetworkManagerUtils.c --replace /sbin/modprobe /run/current-system/sw/sbin/modprobe substituteInPlace data/84-nm-drivers.rules \ --replace /bin/sh ${stdenv.shell} substituteInPlace data/85-nm-unmanaged.rules \ diff --git a/pkgs/tools/networking/network-manager/openconnect.nix b/pkgs/tools/networking/network-manager/openconnect.nix index b1b24bceb57..43eb681be29 100644 --- a/pkgs/tools/networking/network-manager/openconnect.nix +++ b/pkgs/tools/networking/network-manager/openconnect.nix @@ -23,10 +23,10 @@ stdenv.mkDerivation rec { preConfigure = '' substituteInPlace "configure" \ - --replace "/sbin/sysctl" "${procps}/bin/sysctl" + --replace "/sbin/sysctl" "${procps}/sbin/sysctl" substituteInPlace "src/nm-openconnect-service.c" \ - --replace "/usr/sbin/openconnect" "${openconnect}/bin/openconnect" \ - --replace "/sbin/modprobe" "${kmod}/bin/modprobe" + --replace "/usr/sbin/openconnect" "${openconnect}/sbin/openconnect" \ + --replace "/sbin/modprobe" "${kmod}/sbin/modprobe" ''; meta = { diff --git a/pkgs/tools/networking/network-manager/openvpn.nix b/pkgs/tools/networking/network-manager/openvpn.nix index 6fd1a666f0e..34e3a3e2959 100644 --- a/pkgs/tools/networking/network-manager/openvpn.nix +++ b/pkgs/tools/networking/network-manager/openvpn.nix @@ -27,10 +27,10 @@ stdenv.mkDerivation rec { substituteInPlace "configure" \ --replace "/sbin/sysctl" "${procps}/sbin/sysctl" substituteInPlace "src/nm-openvpn-service.c" \ - --replace "/sbin/openvpn" "${openvpn}/bin/openvpn" \ - --replace "/sbin/modprobe" "${kmod}/bin/modprobe" + --replace "/sbin/openvpn" "${openvpn}/sbin/openvpn" \ + --replace "/sbin/modprobe" "${kmod}/sbin/modprobe" substituteInPlace "properties/auth-helpers.c" \ - --replace "/sbin/openvpn" "${openvpn}/bin/openvpn" + --replace "/sbin/openvpn" "${openvpn}/sbin/openvpn" ''; meta = { diff --git a/pkgs/tools/networking/network-manager/vpnc.nix b/pkgs/tools/networking/network-manager/vpnc.nix index b760fe6e4f7..97b2001d759 100644 --- a/pkgs/tools/networking/network-manager/vpnc.nix +++ b/pkgs/tools/networking/network-manager/vpnc.nix @@ -24,10 +24,10 @@ stdenv.mkDerivation rec { preConfigure = '' substituteInPlace "configure" \ - --replace "/sbin/sysctl" "${procps}/bin/sysctl" + --replace "/sbin/sysctl" "${procps}/sbin/sysctl" substituteInPlace "src/nm-vpnc-service.c" \ - --replace "/sbin/vpnc" "${vpnc}/bin/vpnc" \ - --replace "/sbin/modprobe" "${kmod}/bin/modprobe" + --replace "/sbin/vpnc" "${vpnc}/sbin/vpnc" \ + --replace "/sbin/modprobe" "${kmod}/sbin/modprobe" ''; meta = { diff --git a/pkgs/tools/text/diffutils/default.nix b/pkgs/tools/text/diffutils/default.nix index 8b6c5ca5c77..420e0a37ba7 100644 --- a/pkgs/tools/text/diffutils/default.nix +++ b/pkgs/tools/text/diffutils/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, xz, coreutils ? null }: stdenv.mkDerivation rec { - name = "diffutils-3.4"; + name = "diffutils-3.3"; src = fetchurl { url = "mirror://gnu/diffutils/${name}.tar.xz"; - sha256 = "1qlw328qpbss07zrb14ls0rhnhbvxrnssgbmrxxj2gdcy8jw0lyv"; + sha256 = "1761vymxbp4wb5rzjvabhdkskk95pghnn67464byvzb5mfl8jpm2"; }; outputs = [ "out" "info" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e107eb1dbcf..796400d3568 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10832,8 +10832,6 @@ in opencflite = callPackage ../os-specific/darwin/opencflite {}; - swift-corefoundation = callPackage ../os-specific/darwin/swift-corefoundation {}; - xcode = callPackage ../os-specific/darwin/xcode {}; osx_sdk = callPackage ../os-specific/darwin/osx-sdk {}; From 1759825b34cad43f8925aa015c80f56a57eb12e6 Mon Sep 17 00:00:00 2001 From: obadz Date: Tue, 16 Aug 2016 02:46:13 +0100 Subject: [PATCH 143/145] nixos/tests/ecryptfs: placate some commands causing many builds failure These commands shouldn't have to be here in the first place as ecryptfs homes should be automatically unmounted during logoff. --- nixos/tests/ecryptfs.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/ecryptfs.nix b/nixos/tests/ecryptfs.nix index eceb25a0dea..db800c7bb2c 100644 --- a/nixos/tests/ecryptfs.nix +++ b/nixos/tests/ecryptfs.nix @@ -30,7 +30,7 @@ import ./make-test.nix ({ pkgs, ... }: $machine->sleep(2); # Why do I need to do this?? - $machine->succeed("su alice -c ecryptfs-umount-private"); + $machine->succeed("su alice -c ecryptfs-umount-private || true"); $machine->sleep(1); $machine->fail("mount | grep ecryptfs"); # check that encrypted home is not mounted @@ -53,7 +53,7 @@ import ./make-test.nix ({ pkgs, ... }: $machine->sleep(2); # Why do I need to do this?? - $machine->succeed("su alice -c ecryptfs-umount-private"); + $machine->succeed("su alice -c ecryptfs-umount-private || true"); $machine->sleep(1); # Check that the filesystem is not accessible From 24ab0460a9cf63a91aa3681e6f6557c05b48bf33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= Date: Tue, 16 Aug 2016 08:29:15 +0200 Subject: [PATCH 144/145] armadillo: Fix failing build (#17764) The upgrade of cmake to v3.6.0 broke this build. HDF5 now can only be found if hdf5-cpp is used as buildInput. However the upgrade made it possible to remove a patch: CMake can now find openblas on its own. --- pkgs/development/libraries/armadillo/default.nix | 7 +++---- .../armadillo/use-OpenBLAS-as-LAPACK.patch | 14 -------------- 2 files changed, 3 insertions(+), 18 deletions(-) delete mode 100644 pkgs/development/libraries/armadillo/use-OpenBLAS-as-LAPACK.patch diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index 937275b6528..62b5ddf8011 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, openblasCompat, superlu, hdf5 }: +{ stdenv, fetchurl, cmake, openblasCompat, superlu, hdf5-cpp }: stdenv.mkDerivation rec { version = "7.200.2"; @@ -9,12 +9,11 @@ stdenv.mkDerivation rec { sha256 = "1yvx75caks477jqwx5gspi6946jialddk00wdvg6dnh5wdi2xasm"; }; - buildInputs = [ cmake openblasCompat superlu hdf5 ]; + buildInputs = [ cmake openblasCompat superlu hdf5-cpp ]; cmakeFlags = [ "-DDETECT_HDF5=ON" ]; - patches = [ ./use-unix-config-on-OS-X.patch - ./use-OpenBLAS-as-LAPACK.patch ]; + patches = [ ./use-unix-config-on-OS-X.patch ]; meta = with stdenv.lib; { description = "C++ linear algebra library"; diff --git a/pkgs/development/libraries/armadillo/use-OpenBLAS-as-LAPACK.patch b/pkgs/development/libraries/armadillo/use-OpenBLAS-as-LAPACK.patch deleted file mode 100644 index e4c77d2cc2e..00000000000 --- a/pkgs/development/libraries/armadillo/use-OpenBLAS-as-LAPACK.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/cmake_aux/Modules/ARMA_FindLAPACK.cmake b/cmake_aux/Modules/ARMA_FindLAPACK.cmake -index 5395afb..a203c93 100644 ---- a/cmake_aux/Modules/ARMA_FindLAPACK.cmake -+++ b/cmake_aux/Modules/ARMA_FindLAPACK.cmake -@@ -5,7 +5,7 @@ - # also defined, but not for general use are - # LAPACK_LIBRARY, where to find the LAPACK library. - --SET(LAPACK_NAMES ${LAPACK_NAMES} lapack) -+SET(LAPACK_NAMES ${LAPACK_NAMES} openblas) - FIND_LIBRARY(LAPACK_LIBRARY - NAMES ${LAPACK_NAMES} - PATHS /usr/lib64/atlas /usr/lib/atlas /usr/lib64 /usr/lib /usr/local/lib64 /usr/local/lib - From 888efed972d95e1f2bc31e4394ff841f0690d216 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Aug 2016 09:47:13 +0200 Subject: [PATCH 145/145] Doc: fix python examples --- doc/languages-frameworks/python.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md index bb1094e2b74..434a9b156e7 100644 --- a/doc/languages-frameworks/python.md +++ b/doc/languages-frameworks/python.md @@ -566,7 +566,7 @@ running `nix-shell` with the following `shell.nix` with import {}; (python3.buildEnv.override { - extraLibs = with python3Packages; [ numpy requests ]; + extraLibs = with python3Packages; [ numpy requests2 ]; }).env will drop you into a shell where Python will have the @@ -605,7 +605,7 @@ attribute. The `shell.nix` file from the previous section can thus be also writt with import {}; - (python33.withPackages (ps: [ps.numpy ps.requests])).env + (python33.withPackages (ps: [ps.numpy ps.requests2])).env In contrast to `python.buildEnv`, `python.withPackages` does not support the more advanced options such as `ignoreCollisions = true` or `postBuild`. If you need them, you have to use `python.buildEnv`.