From 311a1ee33a74c69dbb0dd31e5117a273316caff9 Mon Sep 17 00:00:00 2001 From: Balletie Date: Fri, 1 Sep 2017 15:57:05 +0200 Subject: [PATCH 01/10] rtags: Fix configure phase errors Add pkgconfig as buildinput, so that the install path is correctly set with cmake. PkgConfig is an optional dependency for rtags, but they say it's necessary if you want to replace the prefix with CMAKE_INSTALL_PREFIX. See: https://github.com/Andersbakken/rtags/blob/caad9ac494f09960bd60a00061279efacc8d1d26/cmake/BashCompletion.cmake#L13 Furthermore, I let the configurePhase of the rtags emacs package be a noop. --- pkgs/development/tools/rtags/default.nix | 14 +++++++------- pkgs/top-level/emacs-packages.nix | 5 ++++- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/rtags/default.nix b/pkgs/development/tools/rtags/default.nix index 39ee3179e9c..1825bbe81c3 100644 --- a/pkgs/development/tools/rtags/default.nix +++ b/pkgs/development/tools/rtags/default.nix @@ -1,17 +1,12 @@ -{ stdenv, lib, fetchgit, cmake, llvmPackages, openssl, writeScript, apple_sdk, bash, emacs }: +{ stdenv, lib, fetchgit, cmake, llvmPackages, openssl, writeScript, apple_sdk, bash, emacs, pkgconfig }: stdenv.mkDerivation rec { name = "rtags-${version}"; version = "2.12"; - buildInputs = [ cmake llvmPackages.llvm openssl llvmPackages.clang emacs ] + buildInputs = [ cmake llvmPackages.llvm openssl llvmPackages.clang emacs pkgconfig ] ++ lib.optionals stdenv.isDarwin [ apple_sdk.libs.xpc apple_sdk.frameworks.CoreServices ]; - preConfigure = '' - export LIBCLANG_CXXFLAGS="-isystem ${llvmPackages.clang.cc}/include $(llvm-config --cxxflags) -fexceptions" \ - LIBCLANG_LIBDIR="${llvmPackages.clang.cc}/lib" - ''; - src = fetchgit { rev = "refs/tags/v${version}"; @@ -25,6 +20,11 @@ stdenv.mkDerivation rec { ''; }; + preConfigure = '' + export LIBCLANG_CXXFLAGS="-isystem ${llvmPackages.clang.cc}/include $(llvm-config --cxxflags) -fexceptions" \ + LIBCLANG_LIBDIR="${llvmPackages.clang.cc}/lib" + ''; + enableParallelBuilding = true; meta = { diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 5c50fe383bb..4734b51046f 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -269,8 +269,11 @@ let rtags = melpaBuild rec { pname = "rtags"; - version = "2.0"; # really, it's some arbitrary git hash + version = "2.12"; src = external.rtags.src; + + configurePhase = ":"; + propagatedUserEnvPkgs = [ external.rtags ]; fileSpecs = [ "src/*.el" ]; inherit (external.rtags) meta; From 243952d9d44ec42a05821849a7fdf0f101b8d126 Mon Sep 17 00:00:00 2001 From: Moritz Kiefer Date: Sun, 3 Sep 2017 07:50:40 +0200 Subject: [PATCH 02/10] haskell/natural-transformation: add dependency on semigroups for GHC 7.10 --- pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index 18040e9fb3c..656d21c739f 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -199,6 +199,7 @@ self: super: { semigroups = addBuildDepends (dontCheck super.semigroups) (with self; [hashable tagged text unordered-containers]); texmath = addBuildDepend super.texmath self.network-uri; yesod-auth-oauth2 = overrideCabal super.yesod-auth-oauth2 (drv: { testDepends = (drv.testDepends or []) ++ [ self.load-env self.yesod ]; }); + natural-transformation = addBuildDepend super.natural-transformation self.semigroups; # cereal must have `fail` in pre-ghc-8.0.x versions # also tests require bytestring>=0.10.8.1 cereal = dontCheck (addBuildDepend super.cereal self.fail); From 4912c68aca2ecd7f9950ab7d23d21703e1c0276e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= Date: Mon, 4 Sep 2017 11:49:51 +0200 Subject: [PATCH 03/10] mcomix: Disable test suite for now Regression introduced by 94351197cd40d7e2d22e8a971e888b8333764cb5 Exactly the same problem (and solution) that here: bd2aeb4883176554214bdf2af404b88eb09d83fa --- pkgs/applications/graphics/mcomix/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/graphics/mcomix/default.nix b/pkgs/applications/graphics/mcomix/default.nix index 20c01f77bbf..318c2caee6f 100644 --- a/pkgs/applications/graphics/mcomix/default.nix +++ b/pkgs/applications/graphics/mcomix/default.nix @@ -11,6 +11,10 @@ python27Packages.buildPythonApplication rec { propagatedBuildInputs = with python27Packages; [ pygtk pillow ]; + postPatch = '' + sed -i -e '/test_suite/d' setup.py + ''; + meta = { description = "Image viewer designed to handle comic books"; From ca54a8616274b0149ce5c77808370f9114229adb Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 6 Sep 2017 14:42:41 +0200 Subject: [PATCH 04/10] dnscrypt-wrapper module: fix permissions and options When keys get refreshed a folder with the permissions of the root user get created in the home directory of the user dnscrypt-wrapper. This prevents the service from restarting. In addition to that the parameters of dnscrypt-wrapper have changed in upstream and in the newly packaged software. --- nixos/modules/services/networking/dnscrypt-wrapper.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/networking/dnscrypt-wrapper.nix b/nixos/modules/services/networking/dnscrypt-wrapper.nix index 85fac660d52..23cc92946e4 100644 --- a/nixos/modules/services/networking/dnscrypt-wrapper.nix +++ b/nixos/modules/services/networking/dnscrypt-wrapper.nix @@ -45,7 +45,7 @@ let rotateKeys = '' # check if keys are not expired keyValid() { - fingerprint=$(dnscrypt-wrapper --show-provider-publickey-fingerprint | awk '{print $(NF)}') + fingerprint=$(dnscrypt-wrapper --show-provider-publickey | awk '{print $(NF)}') dnscrypt-proxy --test=${toString (cfg.keys.checkInterval + 1)} \ --resolver-address=127.0.0.1:${toString cfg.port} \ --provider-name=${cfg.providerName} \ @@ -56,9 +56,10 @@ let # archive old keys and restart the service if ! keyValid; then + echo "certificate soon to become invalid; backing up old cert" mkdir -p oldkeys - mv ${cfg.providerName}.key oldkeys/${cfg.providerName}-$(date +%F-%T).key - mv ${cfg.providerName}.crt oldkeys/${cfg.providerName}-$(date +%F-%T).crt + mv -v ${cfg.providerName}.key oldkeys/${cfg.providerName}-$(date +%F-%T).key + mv -v ${cfg.providerName}.crt oldkeys/${cfg.providerName}-$(date +%F-%T).crt systemctl restart dnscrypt-wrapper fi ''; @@ -169,6 +170,7 @@ in { path = with pkgs; [ dnscrypt-wrapper dnscrypt-proxy gawk ]; script = rotateKeys; + serviceConfig.User = "dnscrypt-wrapper"; }; From 41d98840670bd2bb72ff12ce0cb11869369b3b40 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 6 Sep 2017 10:19:17 -0400 Subject: [PATCH 05/10] i3-gaps: Install man pages properly --- pkgs/applications/window-managers/i3/default.nix | 2 +- pkgs/applications/window-managers/i3/gaps.nix | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index c706b5a1928..54dfc08e3b5 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { sed -i 's/which/command -v/' $program done - install -vD -t $out/share/man/man1 man/*.1 + install -vD -t $out/share/man/man1 man/*.{1,man} ''; separateDebugInfo = true; diff --git a/pkgs/applications/window-managers/i3/gaps.nix b/pkgs/applications/window-managers/i3/gaps.nix index f3472be7a72..58ab5b1d676 100644 --- a/pkgs/applications/window-managers/i3/gaps.nix +++ b/pkgs/applications/window-managers/i3/gaps.nix @@ -3,12 +3,12 @@ i3.overrideDerivation (super : rec { name = "i3-gaps-${version}"; - version = "4.13"; - releaseDate = "2016-11-08"; + version = "4.14"; + releaseDate = "2017-09-04"; src = fetchurl { url = "https://github.com/Airblader/i3/archive/${version}.tar.gz"; - sha256 = "0w959nx2crn00fckqwb5y78vcr1j9mvq5lh25wyjszx04pjhf378"; + sha256 = "08y2m0afcm8mbzb92qz286fd1hnqfya2pvhpxbgv83sgjcsg6hlr"; }; nativeBuildInputs = super.nativeBuildInputs ++ [ autoreconfHook ]; From 993a83d3958214aa12f012d66f057a5c1d0a432b Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 6 Sep 2017 14:53:09 +0200 Subject: [PATCH 06/10] tcpdump: 4.9.1 -> 4.9.2 This is a security release theoretically under emgargo, but leaked by Mageia and Fedora. We have permission to deliver this prior to public release. --- pkgs/tools/networking/tcpdump/default.nix | 38 +++++++---------------- 1 file changed, 12 insertions(+), 26 deletions(-) diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix index 69893f0a832..8dba4b373a3 100644 --- a/pkgs/tools/networking/tcpdump/default.nix +++ b/pkgs/tools/networking/tcpdump/default.nix @@ -1,36 +1,22 @@ -{ stdenv, fetchFromGitHub, fetchpatch, libpcap, enableStatic ? false +{ stdenv, fetchurl, fetchpatch, libpcap, enableStatic ? false , hostPlatform }: stdenv.mkDerivation rec { name = "tcpdump-${version}"; - version = "4.9.1"; + version = "4.9.2"; - src = fetchFromGitHub rec { - owner = "the-tcpdump-group"; - repo = "tcpdump"; - rev = "${repo}-${version}"; - sha256 = "1vzrvn1q7x28h18yskqc390y357pzpg5xd3pzzj4xz3llnvsr64p"; + # leaked embargoed security update + src = fetchurl { + url = "https://src.fedoraproject.org/lookaside/pkgs/tcpdump/tcpdump-4.9.2.tar.gz/sha512/e1bc19a5867d6e3628f3941bdf3ec831bf13784f1233ca1bccc46aac1702f47ee9357d7ff0ca62cddf211b3c8884488c21144cabddd92c861e32398cd8f7c44b/tcpdump-4.9.2.tar.gz"; + sha256 = "0ygy0layzqaj838r5xd613iraz09wlfgpyh7pc6cwclql8v3b2vr"; }; - - patches = [ - (fetchpatch { - url = "http://www.tcpdump.org/pre-4.9.2/PUBLISHED-CVE-2017-11541.patch"; - sha256 = "1lqg4lbyddnv75wpj0rs2sxz4lb3d1vp8n385i27mrpcxw9qaxia"; - }) - (fetchpatch { - url = "http://www.tcpdump.org/pre-4.9.2/PUBLISHED-CVE-2017-11542.patch"; - sha256 = "0vqgmw9i5vr3d4siyrh8mw60jdmp5r66rbjxfmbnwhlfjf4bwxz4"; - }) - (fetchpatch { - url = "http://www.tcpdump.org/pre-4.9.2/PUBLISHED-CVE-2017-11543.patch"; - sha256 = "1vk9ncpx0qjja8l69xw5kkvgy9fkcii2n98diazv1yndln2cs26l"; - }) - (fetchpatch { - url = "http://www.tcpdump.org/pre-4.9.2/PUBLISHED-OpenSSL-1.1-segfault.patch"; - sha256 = "0mw0jdj5nyg4sviqj7wxwf2492b2bdqmjrvf1k34ak417xfcvy1d"; - }) - ]; + # src = fetchFromGitHub rec { + # owner = "the-tcpdump-group"; + # repo = "tcpdump"; + # rev = "${repo}-${version}"; + # sha256 = "1vzrvn1q7x28h18yskqc390y357pzpg5xd3pzzj4xz3llnvsr64p"; + # }; buildInputs = [ libpcap ]; From cf6f9009896d8433bf67bcbfd1be9cc0c1f2d9d3 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Wed, 6 Sep 2017 15:56:08 +0000 Subject: [PATCH 07/10] tiled: 1.0.1 -> 1.0.3 --- pkgs/applications/editors/tiled/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix index 7e8a85cf48a..d1c0ab274f0 100644 --- a/pkgs/applications/editors/tiled/default.nix +++ b/pkgs/applications/editors/tiled/default.nix @@ -5,13 +5,13 @@ let # qtEnv = with qt5; env "qt-${qtbase.version}" [ qtbase qttools ]; in stdenv.mkDerivation rec { name = "tiled-${version}"; - version = "1.0.1"; + version = "1.0.3"; src = fetchFromGitHub { owner = "bjorn"; repo = "tiled"; rev = "v${version}"; - sha256 = "062ja3j84v5s4qslp01gqif8c6i1klkkxpxyyrrvjhxmbyn6nmgd"; + sha256 = "1j8307h7xkxqwr8rpr9fn1svm5h10k61w6zxr4sgph1hiv8x33aa"; }; nativeBuildInputs = [ pkgconfig qmake ]; From 572361f3960758d77bc69c810c797e842d4af51b Mon Sep 17 00:00:00 2001 From: Markus Hauck Date: Sun, 3 Sep 2017 11:07:13 +0200 Subject: [PATCH 08/10] rawtherapee: 5.0-r1 -> 5.2 --- pkgs/applications/graphics/rawtherapee/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix index 97d04b03622..3edb97e3e20 100644 --- a/pkgs/applications/graphics/rawtherapee/default.nix +++ b/pkgs/applications/graphics/rawtherapee/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - version = "5.0-r1"; + version = "5.2"; name = "rawtherapee-" + version; src = fetchFromGitHub { owner = "Beep6581"; repo = "RawTherapee"; - rev = version + "-gtk3"; - sha256 = "06v3ir5562yg4zk9z8kc8a7sw7da88193sizjlk74gh5d3smgr4q"; + rev = version; + sha256 = "0i3cr3335bw8yxxzn6kcdx6ccinlnxzrdbgl3ld1kym1w2n5449k"; }; buildInputs = [ @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DPROC_TARGET_NUMBER=2" + "-DCACHE_NAME_SUFFIX=\"\"" ]; CMAKE_CXX_FLAGS = "-std=c++11 -Wno-deprecated-declarations -Wno-unused-result"; From 57ef1a35646028d851f733b7c5502e0b9a8dadad Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Wed, 6 Sep 2017 19:44:30 +0200 Subject: [PATCH 09/10] go: fix darwin build --- pkgs/development/compilers/go/1.9.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/go/1.9.nix b/pkgs/development/compilers/go/1.9.nix index 1a148447c6b..c5d44af2b5b 100644 --- a/pkgs/development/compilers/go/1.9.nix +++ b/pkgs/development/compilers/go/1.9.nix @@ -95,9 +95,10 @@ stdenv.mkDerivation rec { sed -i 's,/_go_os_test,'"$TMPDIR"'/_go_os_test,' src/os/path_test.go sed -i '/TestChdirAndGetwd/areturn' src/os/os_test.go - sed -i '/TestRead0/areturn' src/os/os_test.go - sed -i '/TestNohup/areturn' src/os/signal/signal_test.go + sed -i '/TestCredentialNoSetGroups/areturn' src/os/exec/exec_posix_test.go sed -i '/TestCurrent/areturn' src/os/user/user_test.go + sed -i '/TestNohup/areturn' src/os/signal/signal_test.go + sed -i '/TestRead0/areturn' src/os/os_test.go sed -i '/TestSystemRoots/areturn' src/crypto/x509/root_darwin_test.go sed -i '/TestGoInstallRebuildsStalePackagesInOtherGOPATH/areturn' src/cmd/go/go_test.go @@ -106,7 +107,6 @@ stdenv.mkDerivation rec { sed -i '/TestDisasmExtld/areturn' src/cmd/objdump/objdump_test.go sed -i 's/unrecognized/unknown/' src/cmd/link/internal/ld/lib.go - sed -i 's/unrecognized/unknown/' src/cmd/go/build.go touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd From dcbf59d8a780c6d73b1bac10e61ef9d7582c77d7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 6 Sep 2017 20:16:53 +0200 Subject: [PATCH 10/10] python.pkgs.pytest-warnings: fix homepage, fixes eval --- pkgs/development/python-modules/pytest-warnings/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pytest-warnings/default.nix b/pkgs/development/python-modules/pytest-warnings/default.nix index 6b835abcafe..753250315a3 100644 --- a/pkgs/development/python-modules/pytest-warnings/default.nix +++ b/pkgs/development/python-modules/pytest-warnings/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = { description = "Plugin to list Python warnings in pytest report"; - homepage = github.com/fschulze/pytest-warnings; + homepage = https://github.com/fschulze/pytest-warnings; license = lib.licenses.mit; }; }