From 90718478af59a8772b3caa4f710199a1b61737d5 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 21 Sep 2019 11:43:17 +0200 Subject: [PATCH 001/102] cask: Fix cask usage MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Without python as a dependency I only get the following error: /usr/bin/env: ‘python’: No such file or directory (cherry picked from commit 4f297c2b6fbe354ed78f4bc68b97314dd8967152) --- pkgs/development/tools/cask/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/cask/default.nix b/pkgs/development/tools/cask/default.nix index 8ec2552aeffb..f89bd1ddf02a 100644 --- a/pkgs/development/tools/cask/default.nix +++ b/pkgs/development/tools/cask/default.nix @@ -10,10 +10,15 @@ stdenv.mkDerivation rec { }; doCheck = true; + + nativeBuildInputs = [ emacsPackages.emacs ]; buildInputs = with emacsPackages; [ s f dash ansi ecukes servant ert-runner el-mock noflet ert-async shell-split-string git package-build + ] ++ [ + python ]; + buildPhase = '' emacs --batch -L . -f batch-byte-compile cask.el cask-cli.el ''; @@ -38,11 +43,9 @@ stdenv.mkDerivation rec { Cask can also be used to manage dependencies for your local Emacs configuration. ''; - homepage = https://cask.readthedocs.io/en/latest/index.html; + homepage = "https://cask.readthedocs.io/en/latest/index.html"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = [ maintainers.flexw ]; }; - - nativeBuildInputs = [ emacsPackages.emacs python ]; } From 1f4cd317c006e1a7c550ee448a3154e238416b2d Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Fri, 20 Sep 2019 19:10:02 -0400 Subject: [PATCH 002/102] wrapQtAppsHook: correct skip directories heuristic (cherry picked from commit 15e99a06a8d06f992ff4b148ee2cbeaf763a674f) --- pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh b/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh index d7a44cace036..d2aadbd956a8 100644 --- a/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh +++ b/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh @@ -80,7 +80,7 @@ wrapQtAppsHook() { do [ -d "$targetDir" ] || continue - find "$targetDir" -type f -executable -print0 | while IFS= read -r -d '' file + find "$targetDir" ! -type d -executable -print0 | while IFS= read -r -d '' file do patchelf --print-interpreter "$file" >/dev/null 2>&1 || continue From 2e4218645cfbb9da2a2f27fc170e4f0bf9e6cf61 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 22 Sep 2019 14:05:37 +0200 Subject: [PATCH 003/102] haskell-postmaster: mark the build as broken --- pkgs/development/haskell-modules/hackage-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index bb00b7c1fbab..a4347ac10c34 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -185223,6 +185223,8 @@ self: { description = "Postmaster ESMTP Server"; license = "GPL"; maintainers = with stdenv.lib.maintainers; [ peti ]; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "potato-tool" = callPackage From df74899305f863ba4f2956ebf64a9e84687aaaa7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 22 Sep 2019 14:09:50 +0200 Subject: [PATCH 004/102] python-mailmanclient: this package builds only with Python 3.x --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 450930462c5f..5326f795c222 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -717,7 +717,7 @@ in { mailman-web = disabledIf (!isPy3k) (callPackage ../servers/mail/mailman/web.nix { }); - mailmanclient = callPackage ../development/python-modules/mailmanclient { }; + mailmanclient = disabledIf (!isPy3k) (callPackage ../development/python-modules/mailmanclient { }); mailman-hyperkitty = callPackage ../development/python-modules/mailman-hyperkitty { }; From fdffddd90ba5efe2fee2ecdf59674f684e6a0e1d Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sun, 22 Sep 2019 15:58:42 +0200 Subject: [PATCH 005/102] radeon-profile: use Qt mkDerivation (cherry picked from commit f93006638109877f10003898baa0bb1d0abf97f5) This solves the runtime error due to missing Qt libraries. --- pkgs/tools/misc/radeon-profile/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/radeon-profile/default.nix b/pkgs/tools/misc/radeon-profile/default.nix index 613ad263ed34..e687b30e8349 100644 --- a/pkgs/tools/misc/radeon-profile/default.nix +++ b/pkgs/tools/misc/radeon-profile/default.nix @@ -1,6 +1,8 @@ -{ stdenv, fetchFromGitHub, qtbase, qtcharts, qmake, libXrandr, libdrm }: +{ lib, mkDerivation, fetchFromGitHub +, qtbase, qtcharts, qmake, libXrandr, libdrm +}: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "radeon-profile"; version = "20170714"; @@ -20,7 +22,7 @@ stdenv.mkDerivation rec { cp ./radeon-profile $out/bin/radeon-profile ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Application to read current clocks of AMD Radeon cards"; homepage = https://github.com/marazmista/radeon-profile; license = licenses.gpl2Plus; From 21c6e12dc1b868a47a8b68c23efd4b14828459c4 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sun, 22 Sep 2019 16:11:30 +0200 Subject: [PATCH 006/102] radeon-profile: 20170714 -> 20190903 (cherry picked from commit 608b6b5b5ca008168b8cb1961c014da44449577e) --- pkgs/tools/misc/radeon-profile/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/radeon-profile/default.nix b/pkgs/tools/misc/radeon-profile/default.nix index e687b30e8349..90498767c995 100644 --- a/pkgs/tools/misc/radeon-profile/default.nix +++ b/pkgs/tools/misc/radeon-profile/default.nix @@ -5,7 +5,7 @@ mkDerivation rec { pname = "radeon-profile"; - version = "20170714"; + version = "20190903"; nativeBuildInputs = [ qmake ]; buildInputs = [ qtbase qtcharts libXrandr libdrm ]; @@ -14,12 +14,12 @@ mkDerivation rec { owner = "marazmista"; repo = "radeon-profile"; rev = version; - sha256 = "08fv824iq00zbl9xk9zsfs8gkk8rsy6jlxbmszrjfx7ji28hansd"; + sha256 = "0ax5417q03xjwi3pn7yyjdb90ssaygdprfgb1pz9nkyk6773ckx5"; }) + "/radeon-profile"; - postInstall = '' - mkdir -p $out/bin - cp ./radeon-profile $out/bin/radeon-profile + preConfigure = '' + substituteInPlace radeon-profile.pro \ + --replace "/usr/" "$out/" ''; meta = with lib; { From dbf071d5ed0e22ccfa36b60c92852079efd992b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 22 Sep 2019 15:29:56 +0100 Subject: [PATCH 007/102] python.pkgs.flask_oauthlib: remove deprecated by upstream & broken: https://github.com/lepture/flask-oauthlib (cherry picked from commit fe5c9079fd15825a47fbc8afaa644c0dc8623064) --- .../python-modules/flask-oauthlib/default.nix | 29 ------------------- pkgs/top-level/python-packages.nix | 2 -- 2 files changed, 31 deletions(-) delete mode 100644 pkgs/development/python-modules/flask-oauthlib/default.nix diff --git a/pkgs/development/python-modules/flask-oauthlib/default.nix b/pkgs/development/python-modules/flask-oauthlib/default.nix deleted file mode 100644 index 587057514156..000000000000 --- a/pkgs/development/python-modules/flask-oauthlib/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub -, flask, oauthlib, requests_oauthlib, flask_sqlalchemy -, mock, nose}: -buildPythonPackage rec { - pname = "Flask-OAuthlib"; - version = "0.9.5"; - - src = fetchFromGitHub { - owner = "lepture"; - repo = "flask-oauthlib"; - rev = "v${version}"; - sha256 = "1l82niwrpm7411xvwh65bj263si90kcbrbfg5fa52mpixhxcp40f"; - }; - - buildInputs = [ mock nose ]; - propagatedBuildInputs = [ - flask flask_sqlalchemy oauthlib requests_oauthlib - ]; - - checkPhase = "nosetests -d"; - doCheck = false; # request mocking fails - - meta = with stdenv.lib; { - description = "OAuthlib implementation for Flask"; - license = licenses.mit; - maintainers = [ maintainers.mic92 ]; - homepage = https://github.com/lepture/flask-oauthlib; - }; -} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5326f795c222..0b4bba984814 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3101,8 +3101,6 @@ in { flask_migrate = callPackage ../development/python-modules/flask-migrate { }; - flask_oauthlib = callPackage ../development/python-modules/flask-oauthlib { }; - flask-paginate = callPackage ../development/python-modules/flask-paginate { }; flask_principal = callPackage ../development/python-modules/flask-principal { }; From 88f32cca5a47b788556c00c7057d09ef083d3bfb Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sun, 22 Sep 2019 16:09:08 +0200 Subject: [PATCH 008/102] afew: propagate setuptools (cherry picked from commit acd7c02ea9d913dd6275e6b0c4d4ff28fbe804aa) --- pkgs/applications/networking/mailreaders/afew/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/mailreaders/afew/default.nix b/pkgs/applications/networking/mailreaders/afew/default.nix index cd512e776130..85b73141966b 100644 --- a/pkgs/applications/networking/mailreaders/afew/default.nix +++ b/pkgs/applications/networking/mailreaders/afew/default.nix @@ -12,7 +12,7 @@ pythonPackages.buildPythonApplication rec { nativeBuildInputs = with pythonPackages; [ sphinx setuptools_scm ]; propagatedBuildInputs = with pythonPackages; [ - pythonPackages.notmuch chardet dkimpy + pythonPackages.setuptools pythonPackages.notmuch chardet dkimpy ] ++ stdenv.lib.optional (!pythonPackages.isPy3k) subprocess32; makeWrapperArgs = [ From d03904fd9fb39309db9ff77c098761bb94729773 Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Sun, 22 Sep 2019 13:35:24 +0200 Subject: [PATCH 009/102] wordpress: 5.2.2 -> 5.2.3 https://wordpress.org/news/2019/09/wordpress-5-2-3-security-and-maintenance-release/ --- pkgs/servers/web-apps/wordpress/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/wordpress/default.nix b/pkgs/servers/web-apps/wordpress/default.nix index 4a9af9d329cc..9dbf060aa9a7 100644 --- a/pkgs/servers/web-apps/wordpress/default.nix +++ b/pkgs/servers/web-apps/wordpress/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "wordpress"; - version = "5.2.2"; + version = "5.2.3"; src = fetchurl { url = "https://wordpress.org/${pname}-${version}.tar.gz"; - sha256 = "08iilbvf1gam2nmacj0a8fgldnd2gighmslf9sny8dsdlqlwjgvq"; + sha256 = "07gqdzhnqivyfah386lwyz984y9k2bc0hmji1y2pbvv0a60r63wr"; }; installPhase = '' From 6ebebe1e7d9cef446716235961b50544fa7c355c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 19 Sep 2019 22:38:31 +0200 Subject: [PATCH 010/102] vista-fonts: Use new download location (cherry picked from commit d8e35fdbf97e8e1295f6dbe6f3a9403d8adff188) --- pkgs/data/fonts/vista-fonts/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/data/fonts/vista-fonts/default.nix b/pkgs/data/fonts/vista-fonts/default.nix index e8784d90e7fd..59cff1b0f470 100644 --- a/pkgs/data/fonts/vista-fonts/default.nix +++ b/pkgs/data/fonts/vista-fonts/default.nix @@ -3,7 +3,7 @@ fetchzip { name = "vista-fonts-1"; - url = http://download.microsoft.com/download/f/5/a/f5a3df76-d856-4a61-a6bd-722f52a5be26/PowerPointViewer.exe; + url = https://web.archive.org/web/20171225132744/http://download.microsoft.com/download/E/6/7/E675FFFC-2A6D-4AB0-B3EB-27C9F8C8F696/PowerPointViewer.exe; postFetch = '' ${cabextract}/bin/cabextract --lowercase --filter ppviewer.cab $downloadedFile @@ -21,7 +21,7 @@ fetchzip { done ''; - sha256 = "1q2d24c203vkl6pwk86frmaj6jra49hr9mydq7cnlx4hilqslw3g"; + sha256 = "1l27zg5jraa16zm11d3qz1w7m6f1ih3xy5avww454ylm50fw6z11"; meta = { description = "Some TrueType fonts from Microsoft Windows Vista (Calibri, Cambria, Candara, Consolas, Constantia, Corbel)"; @@ -31,6 +31,5 @@ fetchzip { # Set a non-zero priority to allow easy overriding of the # fontconfig configuration files. priority = 5; - broken = true; # source url is 404 }; } From 2289446c6ec40a28be8a2b5b3e61bc91228cf40f Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 16 Sep 2019 14:00:15 -0400 Subject: [PATCH 011/102] glibc: fix cross compilation with gcc8 (cherry picked from commit 3fcc4441d7ab18d10694a3dce3c8644339bcaf9d) --- pkgs/development/libraries/glibc/common.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 33c8e5076daa..8e8e445f0173 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -19,7 +19,7 @@ { stdenv, lib , buildPackages -, fetchurl ? null +, fetchurl, fetchpatch , linuxHeaders ? null , gd ? null, libpng ? null , bison @@ -95,7 +95,15 @@ stdenv.mkDerivation ({ ] ++ lib.optional stdenv.isx86_64 ./fix-x64-abi.patch ++ lib.optional stdenv.hostPlatform.isMusl ./fix-rpc-types-musl-conflicts.patch - ++ lib.optional stdenv.buildPlatform.isDarwin ./darwin-cross-build.patch; + ++ lib.optional stdenv.buildPlatform.isDarwin ./darwin-cross-build.patch + + # Remove after upgrading to glibc 2.28+ + ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) (fetchpatch { + url = "https://sourceware.org/git/?p=glibc.git;a=patch;h=780684eb04298977bc411ebca1eadeeba4877833"; + name = "correct-pwent-parsing-issue-and-resulting-build.patch"; + sha256 = "08fja894vzaj8phwfhsfik6jj2pbji7kypy3q8pgxvsd508zdv1q"; + excludes = [ "ChangeLog" ]; + }); postPatch = '' From b9c0859e67444f61ad05d49e82bc9a706b9ad383 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Sun, 22 Sep 2019 21:18:54 +0200 Subject: [PATCH 012/102] daemon: init at 0.6.4 (cherry picked from commit 96ffba10f5c959656314998f667f4999406b4144) --- pkgs/tools/system/daemon/default.nix | 25 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/system/daemon/default.nix diff --git a/pkgs/tools/system/daemon/default.nix b/pkgs/tools/system/daemon/default.nix new file mode 100644 index 000000000000..9bc6ecc6ddfa --- /dev/null +++ b/pkgs/tools/system/daemon/default.nix @@ -0,0 +1,25 @@ +{stdenv, fetchurl, perl}: + +stdenv.mkDerivation { + name = "daemon-0.6.4"; + src = fetchurl { + url = http://libslack.org/daemon/download/daemon-0.6.4.tar.gz; + sha256 = "18aw0f8k3j30xqwv4z03962kdpqd10nf1w9liihylmadlx5fmff4"; + }; + makeFlags = "PREFIX=$(out)"; + buildInputs = [ perl ]; + + meta = { + description = "Daemon turns other process into daemons"; + longDescription = '' + Daemon turns other process into daemons. There are many tasks that need + to be performed to correctly set up a daemon process. This can be tedious. + Daemon performs these tasks for other processes. This is useful for + writing daemons in languages other than C, C++ or Perl (e.g. /bin/sh, + Java). + ''; + license = stdenv.lib.licenses.gpl2Plus; + maintainers = [ stdenv.lib.maintainers.sander ]; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4a62f17d2ba9..5353f89c4c78 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2515,6 +2515,8 @@ in dadadodo = callPackage ../tools/text/dadadodo { }; + daemon = callPackage ../tools/system/daemon { }; + daemonize = callPackage ../tools/system/daemonize { }; daq = callPackage ../applications/networking/ids/daq { }; From b0993afcaa9d0b87e6abace5ac0431367ee5816d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 13 Sep 2019 20:13:14 +0200 Subject: [PATCH 013/102] nixFlakes: 2.3pre20190830_04np4n6 -> 2.4pre20190913_a25c022 (cherry picked from commit b9e81b2138fa1f3475e9dcbdfc764fdd8a47e2bc) --- pkgs/tools/package-management/nix/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 69489e271cba..c038249b69f7 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -200,13 +200,13 @@ in rec { }); nixFlakes = lib.lowPrio (callPackage common rec { - name = "nix-2.3${suffix}"; - suffix = "pre20190830_04np4n6"; + name = "nix-2.4${suffix}"; + suffix = "pre20190913_a25c022"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "aa82f8b2d2a2c42f0d713e8404b668cef1a4b108"; - hash = "sha256-09ZHwpxf9pRDacCSGTHYx+fnKYgxKx8G37Jqb4wl1xI="; + rev = "a25c022af3fa0a35be406942869edae1bdff2cf8"; + hash = "sha256-HIvgrkXxQ57TPcf2pn9PkSDzM4XOCwXa1zYyIvcAdpg="; }; fromGit = true; From f6599e35ce841802e014140e50c791d4a2193fd4 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 18 Sep 2019 12:48:25 -0400 Subject: [PATCH 014/102] nix: mark unix only Nix is only known to work on unix like platforms. https://hydra.nixos.org/job/nixpkgs/cross-trunk/crossMingw32.nix.x86_64-linux (cherry picked from commit 2c32f91bfc3d50175dd1f1eb87bf34626b7e8ab5) --- pkgs/tools/package-management/nix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index c038249b69f7..4d4f73ad7c24 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -121,7 +121,7 @@ common = homepage = https://nixos.org/; license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.unix; outputsToInstall = [ "out" "man" ]; }; From 03762d6bef588e878eb460d9aecfa076fd5dc7e1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 22 Sep 2019 22:01:35 +0200 Subject: [PATCH 015/102] nixFlakes: 2.4pre20190913_a25c022 -> 2.4pre20190922_382aa05 (cherry picked from commit 8109be4859615f624c16d1de8502eb7367434cc9) --- pkgs/tools/package-management/nix/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 4d4f73ad7c24..518c1baad5ad 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -201,12 +201,12 @@ in rec { nixFlakes = lib.lowPrio (callPackage common rec { name = "nix-2.4${suffix}"; - suffix = "pre20190913_a25c022"; + suffix = "pre20190922_382aa05"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "a25c022af3fa0a35be406942869edae1bdff2cf8"; - hash = "sha256-HIvgrkXxQ57TPcf2pn9PkSDzM4XOCwXa1zYyIvcAdpg="; + rev = "382aa05ff71b61379f5c2792eaf517bdf4a5c5bf"; + hash = "sha256-k4vV3Q1YVmLd+49AETnsSGetpDjD6sdd9yBrnpi8Q3g="; }; fromGit = true; From 7a7a80bc463f5f1fdea8739fca937630f3486cc4 Mon Sep 17 00:00:00 2001 From: talyz Date: Mon, 16 Sep 2019 16:22:18 +0200 Subject: [PATCH 016/102] nixos/gitlab: Add gnutar and gzip to gitlab-sidekiq's path Tar and gzip are needed when importing GitLab project exports. (cherry picked from commit aceac9d531b72a49546f743ef96ee515770295c9) --- nixos/modules/services/misc/gitlab.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index bcf0603c6f39..dc28c0a98c97 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -675,6 +675,10 @@ in { openssh nodejs gnupg + + # Needed for GitLab project imports + gnutar + gzip ]; serviceConfig = { Type = "simple"; From 579f204e3dbc63b1297521beb699c2ea2b033b04 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 16 Sep 2019 16:51:19 +0200 Subject: [PATCH 017/102] Revert systemd interface version to 2 The new systemd in 19.09 gives an "Access Denied" error when doing "systemctl daemon-reexec" on an 19.03 system. The fix is to use the previous systemctl to signal the daemon to re-exec itself. This ensures that users don't have to reboot when upgrading from NixOS 19.03 to 19.09. (cherry picked from commit b20a0e49c8c0d5c84b917bfbbe3f2ead31886a67) --- .../activation/switch-to-configuration.pl | 19 +++++++++++++------ pkgs/os-specific/linux/systemd/default.nix | 2 +- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl index 8ff00fa11dc7..641cf9faadc9 100644 --- a/nixos/modules/system/activation/switch-to-configuration.pl +++ b/nixos/modules/system/activation/switch-to-configuration.pl @@ -10,6 +10,9 @@ use Cwd 'abs_path'; my $out = "@out@"; +# FIXME: maybe we should use /proc/1/exe to get the current systemd. +my $curSystemd = abs_path("/run/current-system/sw/bin"); + # To be robust against interruption, record what units need to be started etc. my $startListFile = "/run/systemd/start-list"; my $restartListFile = "/run/systemd/restart-list"; @@ -267,7 +270,7 @@ while (my ($unit, $state) = each %{$activePrev}) { sub pathToUnitName { my ($path) = @_; # Use current version of systemctl binary before daemon is reexeced. - open my $cmd, "-|", "/run/current-system/sw/bin/systemd-escape", "--suffix=mount", "-p", $path + open my $cmd, "-|", "$curSystemd/systemd-escape", "--suffix=mount", "-p", $path or die "Unable to escape $path!\n"; my $escaped = join "", <$cmd>; chomp $escaped; @@ -370,7 +373,7 @@ if (scalar (keys %unitsToStop) > 0) { print STDERR "stopping the following units: ", join(", ", @unitsToStopFiltered), "\n" if scalar @unitsToStopFiltered; # Use current version of systemctl binary before daemon is reexeced. - system("/run/current-system/sw/bin/systemctl", "stop", "--", sort(keys %unitsToStop)); # FIXME: ignore errors? + system("$curSystemd/systemctl", "stop", "--", sort(keys %unitsToStop)); # FIXME: ignore errors? } print STDERR "NOT restarting the following changed units: ", join(", ", sort(keys %unitsToSkip)), "\n" @@ -382,10 +385,12 @@ my $res = 0; print STDERR "activating the configuration...\n"; system("$out/activate", "$out") == 0 or $res = 2; -# Restart systemd if necessary. +# Restart systemd if necessary. Note that this is done using the +# current version of systemd, just in case the new one has trouble +# communicating with the running pid 1. if ($restartSystemd) { print STDERR "restarting systemd...\n"; - system("@systemd@/bin/systemctl", "daemon-reexec") == 0 or $res = 2; + system("$curSystemd/systemctl", "daemon-reexec") == 0 or $res = 2; } # Forget about previously failed services. @@ -401,8 +406,10 @@ while (my $f = <$listActiveUsers>) { my ($uid, $name) = ($+{uid}, $+{user}); print STDERR "reloading user units for $name...\n"; - system("@su@", "-s", "@shell@", "-l", $name, "-c", "XDG_RUNTIME_DIR=/run/user/$uid @systemd@/bin/systemctl --user daemon-reload"); - system("@su@", "-s", "@shell@", "-l", $name, "-c", "XDG_RUNTIME_DIR=/run/user/$uid @systemd@/bin/systemctl --user start nixos-activation.service"); + system("@su@", "-s", "@shell@", "-l", $name, "-c", + "export XDG_RUNTIME_DIR=/run/user/$uid; " . + "$curSystemd/systemctl --user daemon-reexec; " . + "@systemd@/bin/systemctl --user start nixos-activation.service"); } close $listActiveUsers; diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 90b33e183cef..083166848f2c 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -223,7 +223,7 @@ in stdenv.mkDerivation { # in a backwards-incompatible way. If the interface version of two # systemd builds is the same, then we can switch between them at # runtime; otherwise we can't and we need to reboot. - passthru.interfaceVersion = 3; + passthru.interfaceVersion = 2; meta = with stdenv.lib; { homepage = http://www.freedesktop.org/wiki/Software/systemd; From e9f7d9cad5a1d9f21d4625d1c252c066fe378438 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Madrid=20Menc=C3=ADa?= Date: Mon, 16 Sep 2019 21:04:25 +0200 Subject: [PATCH 018/102] gigedit: 1.1.0 -> 1.1.1 (cherry picked from commit 3ffd7ba6d039e5764349b680d9a5996924a62a67) Backport of #68934 --- pkgs/applications/audio/gigedit/default.nix | 6 ++---- .../gigedit/gigedit-1.1.0-pangomm-2.40.1.patch | 15 --------------- 2 files changed, 2 insertions(+), 19 deletions(-) delete mode 100644 pkgs/applications/audio/gigedit/gigedit-1.1.0-pangomm-2.40.1.patch diff --git a/pkgs/applications/audio/gigedit/default.nix b/pkgs/applications/audio/gigedit/default.nix index d8fada45eb16..b8ec2d7116f5 100644 --- a/pkgs/applications/audio/gigedit/default.nix +++ b/pkgs/applications/audio/gigedit/default.nix @@ -4,15 +4,13 @@ stdenv.mkDerivation rec { pname = "gigedit"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { url = "https://download.linuxsampler.org/packages/${pname}-${version}.tar.bz2"; - sha256 = "087pc919q28r1vw31c7w4m14bqnp4md1i2wbmk8w0vmwv2cbx2ni"; + sha256 = "08db12crwf0dy1dbyrmivqqpg5zicjikqkmf2kb1ywpq0a9hcxrb"; }; - patches = [ ./gigedit-1.1.0-pangomm-2.40.1.patch ]; - preConfigure = "make -f Makefile.svn"; nativeBuildInputs = [ autoconf automake intltool libtool pkgconfig which ]; diff --git a/pkgs/applications/audio/gigedit/gigedit-1.1.0-pangomm-2.40.1.patch b/pkgs/applications/audio/gigedit/gigedit-1.1.0-pangomm-2.40.1.patch deleted file mode 100644 index eb00fcc87a24..000000000000 --- a/pkgs/applications/audio/gigedit/gigedit-1.1.0-pangomm-2.40.1.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/src/gigedit/wrapLabel.cc -+++ b/src/gigedit/wrapLabel.cc -@@ -64,12 +64,7 @@ WrapLabel::WrapLabel(const Glib::ustring &text) // IN: The label text - : mWrapWidth(0), - mWrapHeight(0) - { -- // pangomm >= 2.35.1 --#if PANGOMM_MAJOR_VERSION > 2 || (PANGOMM_MAJOR_VERSION == 2 && (PANGOMM_MINOR_VERSION > 35 || (PANGOMM_MINOR_VERSION == 35 && PANGOMM_MICRO_VERSION >= 1))) -- get_layout()->set_wrap(Pango::WrapMode::WORD_CHAR); --#else - get_layout()->set_wrap(Pango::WRAP_WORD_CHAR); --#endif - set_alignment(0.0, 0.0); - set_text(text); - } From f649240940836acd96e94bdd11b35d3bf82a4a57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D1=83=D1=85=D0=B0=D1=80=D0=B8=D0=BA?= Date: Sun, 22 Sep 2019 22:24:03 +0300 Subject: [PATCH 019/102] kvirc: use qt5.mkDerivation (cherry picked from commit fa435f229182b9ec0237dfab28539826a4988222) --- pkgs/applications/networking/irc/kvirc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/irc/kvirc/default.nix b/pkgs/applications/networking/irc/kvirc/default.nix index bd38855109a1..6fd66096b5b2 100644 --- a/pkgs/applications/networking/irc/kvirc/default.nix +++ b/pkgs/applications/networking/irc/kvirc/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchFromGitHub +{ lib, mkDerivation, fetchFromGitHub , qtbase, qtmultimedia, qtsvg, qtx11extras , pkgconfig, cmake, gettext }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "kvirc"; version = "5.0.0"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { pkgconfig cmake gettext ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Advanced IRC Client"; homepage = "http://www.kvirc.net/"; license = licenses.gpl2; From 12cc54f6cd5acde116481ea889af9c9b95d347a3 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 23 Sep 2019 09:55:57 +0200 Subject: [PATCH 020/102] firefox: Use default icu (cherry picked from commit 13beb8d753a854807b4f823ae37928e4b8cf91f6) --- pkgs/top-level/all-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5353f89c4c78..4850e2b6ea9f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18241,7 +18241,6 @@ in libpng = libpng_apng; python = python2; gnused = gnused_422; - icu = icu63; inherit (darwin.apple_sdk.frameworks) CoreMedia ExceptionHandling Kerberos AVFoundation MediaToolbox CoreLocation Foundation AddressBook; From 82e1d6fc19b1c24b36a0641e79b0e7d2d167de2a Mon Sep 17 00:00:00 2001 From: Yorick Date: Sat, 21 Sep 2019 15:10:41 +0200 Subject: [PATCH 021/102] pythonPackages.license-expression: fix build (cherry picked from commit c6e002c0fc3d813099329ecf24ff72f0110219dc) --- pkgs/development/python-modules/license-expression/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/license-expression/default.nix b/pkgs/development/python-modules/license-expression/default.nix index 6d52e5f5c1f5..12d26cf6dd09 100644 --- a/pkgs/development/python-modules/license-expression/default.nix +++ b/pkgs/development/python-modules/license-expression/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { rev = "v${version}"; sha256 = "0q8sha38w7ajg7ar0rmbqrwv0n58l8yzyl96cqwcbvp578fn3ir0"; }; + postPatch = "patchShebangs ."; propagatedBuildInputs = [ boolean-py ]; From 05f275f4510fe909320963666185d66e3f8906aa Mon Sep 17 00:00:00 2001 From: Yorick Date: Mon, 23 Sep 2019 13:50:31 +0200 Subject: [PATCH 022/102] pythonPackages.license-expression: make patchShebangs more specific (cherry picked from commit b640dbd00877f51616750e347a32fbcb49d2968c) --- pkgs/development/python-modules/license-expression/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/license-expression/default.nix b/pkgs/development/python-modules/license-expression/default.nix index 12d26cf6dd09..2bf204a9a628 100644 --- a/pkgs/development/python-modules/license-expression/default.nix +++ b/pkgs/development/python-modules/license-expression/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { rev = "v${version}"; sha256 = "0q8sha38w7ajg7ar0rmbqrwv0n58l8yzyl96cqwcbvp578fn3ir0"; }; - postPatch = "patchShebangs ."; + postPatch = "patchShebangs ./configure"; propagatedBuildInputs = [ boolean-py ]; From d0d296fb805b628b5bf9fdca6c2cb4b3e197212f Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sun, 22 Sep 2019 20:14:05 -0400 Subject: [PATCH 023/102] treewide: replace daemon with enableDaemon broken with the introducation of "daemon" in https://github.com/NixOS/nixpkgs/commit/96ffba10f5c959656314998f667f4999406b4144 (cherry picked from commit ad22b9084df5c8f436f1b7b17e80e21e24d8ab4b) --- pkgs/applications/networking/irc/quassel/default.nix | 12 ++++++------ pkgs/tools/networking/p2p/amule/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix index 6aacdde544bc..6addd66ac634 100644 --- a/pkgs/applications/networking/irc/quassel/default.nix +++ b/pkgs/applications/networking/irc/quassel/default.nix @@ -1,5 +1,5 @@ { monolithic ? true # build monolithic Quassel -, daemon ? false # build Quassel daemon +, enableDaemon ? false # build Quassel daemon , client ? false # build Quassel client , tag ? "-kf5" # tag added to the package name , static ? false # link statically @@ -21,11 +21,11 @@ let buildClient = monolithic || client; - buildCore = monolithic || daemon; + buildCore = monolithic || enableDaemon; in -assert monolithic -> !client && !daemon; -assert client || daemon -> !monolithic; +assert monolithic -> !client && !enableDaemon; +assert client || enableDaemon -> !monolithic; assert !buildClient -> !withKDE; # KDE is used by the client only let @@ -63,12 +63,12 @@ in with stdenv; mkDerivation rec { ] ++ edf static "STATIC" ++ edf monolithic "WANT_MONO" - ++ edf daemon "WANT_CORE" + ++ edf enableDaemon "WANT_CORE" ++ edf client "WANT_QTCLIENT" ++ edf withKDE "WITH_KDE"; preFixup = - lib.optionalString daemon '' + lib.optionalString enableDaemon '' wrapProgram "$out/bin/quasselcore" --suffix PATH : "${qtbase.bin}/bin" '' + lib.optionalString buildClient '' diff --git a/pkgs/tools/networking/p2p/amule/default.nix b/pkgs/tools/networking/p2p/amule/default.nix index b9a4360abfb9..0a240248806d 100644 --- a/pkgs/tools/networking/p2p/amule/default.nix +++ b/pkgs/tools/networking/p2p/amule/default.nix @@ -1,5 +1,5 @@ { monolithic ? true # build monolithic amule -, daemon ? false # build amule daemon +, enableDaemon ? false # build amule daemon , httpServer ? false # build web interface for the daemon , client ? false # build amule remote gui , fetchurl, stdenv, zlib, wxGTK, perl, cryptopp, libupnp, gettext, libpng ? null @@ -32,7 +32,7 @@ mkDerivation rec { "--disable-debug" "--enable-optimize" (stdenv.lib.enableFeature monolithic "monolithic") - (stdenv.lib.enableFeature daemon "amule-daemon") + (stdenv.lib.enableFeature enableDaemon "amule-daemon") (stdenv.lib.enableFeature client "amule-gui") (stdenv.lib.enableFeature httpServer "webserver") ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7e66f91bbcc6..d2cd20c0e047 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -713,7 +713,7 @@ in amuleDaemon = appendToName "daemon" (amule.override { monolithic = false; - daemon = true; + enableDaemon = true; }); amuleGui = appendToName "gui" (amule.override { @@ -20119,7 +20119,7 @@ in quasselDaemon = quassel.override { monolithic = false; - daemon = true; + enableDaemon = true; withKDE = false; tag = "-daemon-qt5"; }; From dee217386e09f85d5aaffbbaf49043156553109c Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sun, 22 Sep 2019 17:31:22 -0400 Subject: [PATCH 024/102] mariadb: add patch for missing libcrypt on darwin Really fixes #69034 (cherry picked from commit 067b4dbb931bec94976a7660353ce8617d558b29) --- pkgs/servers/sql/mariadb/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 15553055457c..b0fdd333238b 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -3,7 +3,7 @@ , libaio, libevent, jemalloc, cracklib, systemd, numactl, perl , fixDarwinDylibNames, cctools, CoreServices , asio, buildEnv, check, scons -, less +, less, fetchpatch , withoutClient ? false }: @@ -56,7 +56,12 @@ common = rec { # attributes common to both builds patches = [ ./cmake-includedir.patch ./cmake-libmariadb-includedir.patch - ]; + ] ++ optional stdenv.hostPlatform.isDarwin (fetchpatch { + url = "https://github.com/MariaDB/mariadb-connector-c/commit/ee91b2c98a63acb787114dee4f2694e154630928.patch"; + extraPrefix = "libmariadb/"; + sha256 = "06i865zwyhs9fvrgmargzn09pbg1cmably3c4wifd241bj8ig8qk"; + stripLen = 1; + }); cmakeFlags = [ "-DBUILD_CONFIG=mysql_release" From 6b7a7b3e7a8c6294a58afa7e7e662658e9750bb8 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sun, 22 Sep 2019 17:36:14 -0400 Subject: [PATCH 025/102] dolphin: add baloo to propagatedUseEnvPkgs This is needed for "Search for..." feature in dolphin. Fixes #68174 (cherry picked from commit de15e981f61f7eedebf97a14e7ee82aac3f4f297) --- pkgs/applications/kde/dolphin.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/kde/dolphin.nix b/pkgs/applications/kde/dolphin.nix index 241bb71983a0..76d4e989e8c3 100644 --- a/pkgs/applications/kde/dolphin.nix +++ b/pkgs/applications/kde/dolphin.nix @@ -15,6 +15,7 @@ mkDerivation { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + propagatedUserEnvPkgs = [ baloo ]; propagatedBuildInputs = [ baloo baloo-widgets kactivities kbookmarks kcmutils kcompletion kconfig kcoreaddons kdelibs4support kdbusaddons kfilemetadata ki18n kiconthemes From 6a5b4ad1e5786e0dc56eb6fa964b644fa61a8bcc Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sun, 22 Sep 2019 17:39:21 -0400 Subject: [PATCH 026/102] aws-sdk-cpp: fix libatomic detection Needed for https://hydra.nixos.org/build/100470050 /cc @lopsided98 (cherry picked from commit 980c80c08d81d1647f3b80ba9369d437c52191e4) --- pkgs/development/libraries/aws-sdk-cpp/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 1cc65b53b3e9..6bfb80d3a174 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, curl, openssl, zlib +{ lib, stdenv, fetchFromGitHub, cmake, curl, openssl, zlib, fetchpatch , aws-c-common, aws-c-event-stream, aws-checksums , CoreAudio, AudioToolbox , # Allow building a limited set of APIs, e.g. ["s3" "ec2"]. @@ -50,6 +50,13 @@ stdenv.mkDerivation rec { __darwinAllowLocalNetworking = true; + patches = [ + (fetchpatch { + url = "https://github.com/aws/aws-sdk-cpp/commit/42991ab549087c81cb630e5d3d2413e8a9cf8a97.patch"; + sha256 = "0myq5cm3lvl5r56hg0sc0zyn1clbkd9ys0wr95ghw6bhwpvfv8gr"; + }) + ]; + meta = with lib; { description = "A C++ interface for Amazon Web Services"; homepage = https://github.com/awslabs/aws-sdk-cpp; From 34f71a778d0a41cdc331b85c223424b255b5a13d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Mon, 12 Aug 2019 02:26:04 +0200 Subject: [PATCH 027/102] libdrm: Add patch to fix musl build. Fixes #66441 (cherry picked from commit b577340eb5bc3b72549f0544b50e2e37df78bf12) Co-authored-by: Matthew Bauer (cherry picked from commit 23399ff0127093081f51100068b1e412617a48e1) --- pkgs/development/libraries/libdrm/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 11fb21fe52e2..d5cbbccba015 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, pkgconfig, meson, ninja, libpthreadstubs, libpciaccess -, withValgrind ? valgrind-light.meta.available, valgrind-light +, withValgrind ? valgrind-light.meta.available, valgrind-light, fetchpatch }: stdenv.mkDerivation rec { @@ -17,7 +17,15 @@ stdenv.mkDerivation rec { buildInputs = [ libpthreadstubs libpciaccess ] ++ lib.optional withValgrind valgrind-light; - patches = [ ./cross-build-nm-path.patch ]; + patches = [ ./cross-build-nm-path.patch ] ++ + lib.optionals stdenv.hostPlatform.isMusl [ + # Fix tests not building on musl because they use the glibc-specific + # (non-POSIX) `ioctl()` type signature. See #66441. + (fetchpatch { + url = "https://raw.githubusercontent.com/openembedded/openembedded-core/30a2af80f5f8c8ddf0f619e4f50451b02baa22dd/meta/recipes-graphics/drm/libdrm/musl-ioctl.patch"; + sha256 = "0rdmh4k5kb80hhk1sdhlil30yf0s8d8w0fnq0hzyvw3ir1mki3by"; + }) + ]; postPatch = '' for a in */*-symbol-check ; do From b0448a752c82bed29d88d74cbac699b290046bce Mon Sep 17 00:00:00 2001 From: WilliButz Date: Mon, 23 Sep 2019 13:42:03 +0200 Subject: [PATCH 028/102] grafana: 6.3.5 -> 6.3.6 (cherry picked from commit c846b0a52fcde16daf498f9f5216c0677dcdad9a) --- pkgs/servers/monitoring/grafana/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 615edeb81ec1..3d61961321d4 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "grafana"; - version = "6.3.5"; + version = "6.3.6"; goPackagePath = "github.com/grafana/grafana"; @@ -12,12 +12,12 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "0qimqdlxkvh31n730gp1wl1va0bza69bw90nyzrmfb34733pmni2"; + sha256 = "1dxsd32ny7wcpfyhhdf5m6anzgs0mkyvlrha7ps5pfyiix7brrlk"; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "1rw2ws610ba2vl5kv3yay8s69xkqzisrl6q27zxa5kj48khvy101"; + sha256 = "0cz6bg8q8lxxvqh9nb2b64rr5brkmbvpvvg4x7dykc04vcjivf6n"; }; postPatch = '' From 07f018b337a530a6221e093db409873b140314ba Mon Sep 17 00:00:00 2001 From: Tom Hunger Date: Sun, 15 Sep 2019 21:48:04 +0100 Subject: [PATCH 029/102] dynd: fix build (cherry picked from commit f9da799b87936d93c329aa0da1ac48b411e2cc63) --- pkgs/development/python-modules/dynd/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/dynd/default.nix b/pkgs/development/python-modules/dynd/default.nix index d4cd0e711a0d..f3e4e0a8b732 100644 --- a/pkgs/development/python-modules/dynd/default.nix +++ b/pkgs/development/python-modules/dynd/default.nix @@ -26,6 +26,8 @@ buildPythonPackage rec { substituteInPlace setup.py --replace "'--always', '--match', 'v*']).decode('ascii').strip('\n')" "" ''; + dontUseCmakeConfigure = true; + # Python 3 works but has a broken import test that I couldn't # figure out. doCheck = !isPy3k; From 408b7e4dac4f6aa50695eb1cea1580e17ba68fd9 Mon Sep 17 00:00:00 2001 From: Dima Date: Sun, 22 Sep 2019 16:27:36 +0200 Subject: [PATCH 030/102] pythonPackages.cairocffi: v1.0.2 -> v.1.1.0 The tests were failing due the switch to pytest5. This issue has been addressed upstream in https://github.com/Kozea/cairocffi/commit/a500f208660ba9861828a2a92b32c33565ee18fd which is included in v.1.1.0, so bumping the version and updating the old patch. Hydra log of the failure: https://hydra.nixos.org/build/100785460/nixlog/6 (cherry picked from commit 7ff2638b7f6a72e47055173269ef00fd624a1d38) --- .../python-modules/cairocffi/default.nix | 4 +- .../cairocffi/dlopen-paths.patch | 73 +++++++++++-------- 2 files changed, 46 insertions(+), 31 deletions(-) diff --git a/pkgs/development/python-modules/cairocffi/default.nix b/pkgs/development/python-modules/cairocffi/default.nix index f91b33d20102..574aeefa7fca 100644 --- a/pkgs/development/python-modules/cairocffi/default.nix +++ b/pkgs/development/python-modules/cairocffi/default.nix @@ -19,8 +19,8 @@ }@args: import ./generic.nix ({ - version = "1.0.2"; - sha256 = "01ac51ae12c4324ca5809ce270f9dd1b67f5166fe63bd3e497e9ea3ca91946ff"; + version = "1.1.0"; + sha256 = "1nq53f5jipgy9jgyfxp43j40qfbmrhgn1cj8bp5rrb3liy3wbh7i"; dlopen_patch = ./dlopen-paths.patch; disabled = pythonOlder "3.5"; inherit withXcffib; diff --git a/pkgs/development/python-modules/cairocffi/dlopen-paths.patch b/pkgs/development/python-modules/cairocffi/dlopen-paths.patch index 10e2294981d4..6542b4367eb4 100644 --- a/pkgs/development/python-modules/cairocffi/dlopen-paths.patch +++ b/pkgs/development/python-modules/cairocffi/dlopen-paths.patch @@ -1,46 +1,61 @@ -commit 0435bc2577d4b18f54b78b2f5185abb2b2005982 -Author: Alexander V. Nikolaev -Date: Sat Feb 6 08:09:06 2016 +0200 +Patch dlopen() to allow direct paths to all required libs - Patch dlopen() to allow direct paths to all required libs +This is an update of the patch submitted in +https://github.com/NixOS/nixpkgs/commit/b13e44e094989d3a902f8c73b22e8d3c0cc7acf4 +by Alexander V. Nikolaev - This patch is NixOS specific +--- + cairocffi/__init__.py | 34 ++++++++++++++++------------------ + 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/cairocffi/__init__.py b/cairocffi/__init__.py -index 6061973..3538a58 100644 +index 307d58c..43c29e3 100644 --- a/cairocffi/__init__.py +++ b/cairocffi/__init__.py -@@ -21,19 +21,22 @@ VERSION = __version__ = (Path(__file__).parent / 'VERSION').read_text().strip() - version = '1.16.0' - version_info = (1, 16, 0) +@@ -21,28 +21,26 @@ VERSION = __version__ = (Path(__file__).parent / 'VERSION').read_text().strip() + version = '1.17.2' + version_info = (1, 17, 2) -+# Use hardcoded soname, because ctypes.util use gcc/objdump which shouldn't be required for runtime ++# Use hardcoded soname, because ctypes.util use gcc/objdump which shouldn't be ++# required for runtime +_LIBS = { + 'cairo': '@cairo@/lib/libcairo@ext@', + 'glib-2.0': '@glib@/lib/libglib-2.0@ext@', + 'gobject-2.0': '@glib@/lib/libgobject-2.0@ext@', + 'gdk_pixbuf-2.0': '@gdk_pixbuf@/lib/libgdk_pixbuf-2.0@ext@', +} ++ --def dlopen(ffi, *names): -+def dlopen(ffi, name, *names): + def dlopen(ffi, library_names, filenames): """Try various names for the same library, for different platforms.""" -- for name in names: -- for lib_name in (name, 'lib' + name): -- try: -- path = ctypes.util.find_library(lib_name) -- lib = ffi.dlopen(path or lib_name) -- if lib: -- return lib -- except OSError: -- pass -- raise OSError("dlopen() failed to load a library: %s" % ' / '.join(names)) -+ path = _LIBS.get(name, None) -+ if path: -+ lib = ffi.dlopen(path) -+ if lib: -+ return lib -+ raise OSError("dlopen() failed to load a library: %s as %s" % (name, path)) +- exceptions = [] +- + for library_name in library_names: +- library_filename = find_library(library_name) +- if library_filename: +- filenames = (library_filename,) + filenames +- else: +- exceptions.append( +- 'no library called "{}" was found'.format(library_name)) +- +- for filename in filenames: +- try: +- return ffi.dlopen(filename) +- except OSError as exception: # pragma: no cover +- exceptions.append(exception) +- +- error_message = '\n'.join( # pragma: no cover +- str(exception) for exception in exceptions) +- raise OSError(error_message) # pragma: no cover ++ path = _LIBS.get(library_name, None) ++ if path: ++ lib = ffi.dlopen(path) ++ if lib: ++ return lib ++ ++ raise OSError("dlopen() failed to load a library: %s as %s" % (library_name, path)) - cairo = dlopen(ffi, 'cairo', 'cairo-2', 'cairo-gobject-2', 'cairo.so.2') + cairo = dlopen( +-- +2.19.2 From 0c07921c906ccc15d3bc8871354c8e41d2d43068 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 23 Sep 2019 14:37:08 +0100 Subject: [PATCH 031/102] rtlwifi_new: 2018-02-17 -> 2019-08-21 (cherry picked from commit 434a69f5b59cc38d35bddbc5a68b3f69ebfb2d0d) --- pkgs/os-specific/linux/rtlwifi_new/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/rtlwifi_new/default.nix b/pkgs/os-specific/linux/rtlwifi_new/default.nix index 447f9127d607..94ba31d59e1a 100644 --- a/pkgs/os-specific/linux/rtlwifi_new/default.nix +++ b/pkgs/os-specific/linux/rtlwifi_new/default.nix @@ -6,13 +6,13 @@ let modDestDir = "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/wi in stdenv.mkDerivation rec { pname = "rtlwifi_new"; - version = "2018-02-17"; + version = "2019-08-21"; src = fetchFromGitHub { owner = "lwfinger"; repo = "rtlwifi_new"; - rev = "0588ac0cc5f530e7764705416370b70d3c2afedc"; - sha256 = "1vs8rfw19lcs04bapa97zlnl5x0kf02sdw5ik0hdm27wgk0z969m"; + rev = "a108e3de87c2ed30b71c3c4595b79ab7a2f9e348"; + sha256 = "15kjs9i9vvmn1cdzccd5cljf3m45r4ssm65klkj2fdkf3kljj38k"; }; hardeningDisable = [ "pic" "format" ]; From 6e5766e0c0ba87d7aa62102c1132a3d7494f0563 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Fri, 2 Aug 2019 16:28:20 -0400 Subject: [PATCH 032/102] build-support: Add p11_kit to appimage dependency set This was in the upstream list but missing from nixpkgs' list. (cherry picked from commit d1139e340d11d544786b9637698fa5cda3b60be0) --- pkgs/build-support/appimage/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix index 1f84403c10fc..b4906d72f19a 100644 --- a/pkgs/build-support/appimage/default.nix +++ b/pkgs/build-support/appimage/default.nix @@ -185,6 +185,7 @@ rec { keyutils.lib libjack2 fribidi + p11_kit # libraries not on the upstream include list, but nevertheless expected # by at least one appimage From 9cf3bcfdae0786fe8ee82add37f03e7cf5b64ea2 Mon Sep 17 00:00:00 2001 From: Kevin Rauscher Date: Mon, 9 Sep 2019 15:20:48 +0200 Subject: [PATCH 033/102] mopidy-iris: 3.39.0 -> 3.40.0 (cherry picked from commit 49e52b7ba5e41573be9d07086d3f3e342cfbfd85) --- pkgs/applications/audio/mopidy/iris.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix index 3a663fd33c81..90b81e1163d8 100644 --- a/pkgs/applications/audio/mopidy/iris.nix +++ b/pkgs/applications/audio/mopidy/iris.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonApplication rec { pname = "Mopidy-Iris"; - version = "3.39.0"; + version = "3.40.0"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "1d2g66gvm7yaz4nbxlh23lj2xfkhi3hsg2k646m1za510f8dzlag"; + sha256 = "1cn68zmyvig114dsw7vhx761v9c1za3wnbq4y2z0f0cbl958n49v"; }; propagatedBuildInputs = [ From 5220486f44e483a76c7e83d18718cb88a69f611f Mon Sep 17 00:00:00 2001 From: Kevin Rauscher Date: Mon, 23 Sep 2019 21:55:46 +0200 Subject: [PATCH 034/102] mopidy: add setuptools to propagatedBuildInputs (cherry picked from commit 09dac43f3271bbae6bece130b58423ef53baa26d) --- pkgs/applications/audio/mopidy/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index c574c862f521..a5248e2a89ef 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -21,7 +21,7 @@ pythonPackages.buildPythonApplication rec { ]; propagatedBuildInputs = with pythonPackages; [ - gst-python pygobject3 pykka tornado_4 requests + gst-python pygobject3 pykka tornado_4 requests setuptools ] ++ stdenv.lib.optional (!stdenv.isDarwin) dbus-python; # There are no tests From 6faeaac5e6de9c0fa241dd6aaba233f9822d6573 Mon Sep 17 00:00:00 2001 From: Mitsuhiro Nakamura Date: Tue, 24 Sep 2019 07:59:04 +0900 Subject: [PATCH 035/102] r-pan: fix build on Darwin (cherry picked from commit 3001a1f3ffe787b5dea79afdaf157c2772e564ef) --- pkgs/development/r-modules/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 1616eacffc65..f4c26d07322a 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -445,6 +445,7 @@ let ape = [ pkgs.libiconv ]; expm = [ pkgs.libiconv ]; mnormt = [ pkgs.libiconv ]; + pan = [ pkgs.libiconv ]; phangorn = [ pkgs.libiconv ]; quadprog = [ pkgs.libiconv ]; sundialr = [ pkgs.libiconv ]; From 27f187b96a541e59ad31261ac11369be6564cfd2 Mon Sep 17 00:00:00 2001 From: Mitsuhiro Nakamura Date: Tue, 24 Sep 2019 08:06:26 +0900 Subject: [PATCH 036/102] r-minqa: fix build on Darwin (cherry picked from commit aefe6bc2e11da32172e44171127e7c7fc17de26a) --- pkgs/development/r-modules/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index f4c26d07322a..c25f7c36ebd6 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -441,6 +441,7 @@ let nlme = [ pkgs.libiconv ]; Matrix = [ pkgs.libiconv ]; mgcv = [ pkgs.libiconv ]; + minqa = [ pkgs.libiconv ]; igraph = [ pkgs.libiconv ]; ape = [ pkgs.libiconv ]; expm = [ pkgs.libiconv ]; From fe4cb7eaf7e7eb2f144c1e4719699899535eca80 Mon Sep 17 00:00:00 2001 From: Mitsuhiro Nakamura Date: Tue, 24 Sep 2019 07:23:25 +0900 Subject: [PATCH 037/102] r-randomForest: fix build on Darwin (cherry picked from commit 8df713999656f118a65a26275fea6b9143da0d76) --- pkgs/development/r-modules/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index c25f7c36ebd6..4c8935d92221 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -449,6 +449,7 @@ let pan = [ pkgs.libiconv ]; phangorn = [ pkgs.libiconv ]; quadprog = [ pkgs.libiconv ]; + randomForest = [ pkgs.libiconv ]; sundialr = [ pkgs.libiconv ]; }; From 3900cdf95a68545e25742611133bc4597a0d2076 Mon Sep 17 00:00:00 2001 From: MetaDark Date: Mon, 23 Sep 2019 17:42:31 -0400 Subject: [PATCH 038/102] protontricks: 1.2.4 -> 1.2.5 (cherry picked from commit c52f723d5e6edc77d37a837ea14ca7134090558d) --- pkgs/tools/package-management/protontricks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/protontricks/default.nix b/pkgs/tools/package-management/protontricks/default.nix index 2683192c89e3..24301fc76d87 100644 --- a/pkgs/tools/package-management/protontricks/default.nix +++ b/pkgs/tools/package-management/protontricks/default.nix @@ -4,13 +4,13 @@ buildPythonApplication rec { pname = "protontricks"; - version = "1.2.4"; + version = "1.2.5"; src = fetchFromGitHub { owner = "Matoking"; repo = pname; rev = version; - sha256 = "0kwf2m62v4w7ds9y2fpcb8scazirkj114rn8y0ak62ph7lav8ma4"; + sha256 = "1nkhp1mnvah7zkc1s55jji9lxxbph1miw8dfl9kb72khmaqfzsf0"; }; propagatedBuildInputs = [ vdf ]; From 6146674966b85f7886dd5e4b3b9ae7a6386fce67 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 6 Sep 2019 11:39:38 -0700 Subject: [PATCH 039/102] radeontool: 1.5 -> 1.6.3 (cherry picked from commit 11e62297da422a3ab8ee3971e329a2fb707e06a3) --- .../os-specific/linux/radeontools/default.nix | 42 ++++++++----------- 1 file changed, 17 insertions(+), 25 deletions(-) diff --git a/pkgs/os-specific/linux/radeontools/default.nix b/pkgs/os-specific/linux/radeontools/default.nix index 81e5a2af9cdf..d2c3c11c9390 100644 --- a/pkgs/os-specific/linux/radeontools/default.nix +++ b/pkgs/os-specific/linux/radeontools/default.nix @@ -1,33 +1,25 @@ -{ stdenv, fetchurl, pciutils }: +{ stdenv, fetchurl +, autoreconfHook +, pciutils +, pkgconfig +, xorg +}: -stdenv.mkDerivation { - name = "radeontool-1.5"; - - inherit pciutils; - - # Don't know wether it's a good idea to hardcode the lspci path.. - # But it will work on nix.. - postUnpack = '' - cd $sourceRoot - sed -i "s%lspci%$pciutils/sbin/lspci%g" radeontool.c - cd .. - ''; +stdenv.mkDerivation rec { + pname = "radeontool"; + version = "1.6.3"; src = fetchurl { - url = http://fdd.com/software/radeon/radeontool-1.5.tar.gz; - sha256 = "0qbkawhhq0y0gqbbql7q04y0v0hims5c4jkjsbc1y03rf9kr10ar"; + url = "https://people.freedesktop.org/~airlied/radeontool/${pname}-${version}.tar.gz"; + sha256 = "0mjk9wr9rsb17yy92j6yi16hfpa6v5r1dbyiy60zp4r125wr63za"; }; - installPhase = '' - mkdir -p $out/bin - chmod +x lightwatch.pl - cp radeontool lightwatch.pl $out/bin - ''; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ xorg.libpciaccess ]; - meta = { - description = "Control the backlight and external video output of ATI Radeon Mobility graphics cards"; - homepage = http://fdd.com/software/radeon/; - license = stdenv.lib.licenses.zlib; - broken = true; + meta = with stdenv.lib; { + description = "Lowlevel tools to tweak register and dump state on radeon GPUs"; + homepage = "https://airlied.livejournal.com/"; + license = licenses.zlib; }; } From 630bffe451e62c2e2b29f1435ea92a1252f186a4 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 13 Sep 2019 08:43:15 +0200 Subject: [PATCH 040/102] linuxPackages.exfat-nofuse: 2018-04-16 -> 2019-09-06 Upstream repository is unmaintained since 2018, maintainership got taken over by AdrianBan ( https://github.com/dorimanx/exfat-nofuse/issues/145#issuecomment-528632096 ) (cherry picked from commit 8a6e2f5d53a895c0bd4cffe05dd4c6a2fd41c02e) --- pkgs/os-specific/linux/exfat/default.nix | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/pkgs/os-specific/linux/exfat/default.nix b/pkgs/os-specific/linux/exfat/default.nix index 036cd3f28a1b..e66ac4d65ab9 100644 --- a/pkgs/os-specific/linux/exfat/default.nix +++ b/pkgs/os-specific/linux/exfat/default.nix @@ -6,13 +6,13 @@ assert lib.versionAtLeast kernel.version "4.2" || lib.versionOlder kernel.versi stdenv.mkDerivation rec { name = "exfat-nofuse-${version}-${kernel.version}"; - version = "2018-04-16"; + version = "2019-09-06"; src = fetchFromGitHub { - owner = "dorimanx"; + owner = "AdrianBan"; repo = "exfat-nofuse"; - rev = "01c30ad52625a7261e1b0d874553b6ca7af25966"; - sha256 = "0n1ibamf1yj8iqapc86lfscnky9p07ngsi4f2kpv3d5r2s6mzsh6"; + rev = "5536f067373c196f152061f5000fe0032dc07c48"; + sha256 = "00mhadsv2iw8z00a6170hwbvk3afx484nn3irmd5f5kmhs34sw7k"; }; hardeningDisable = [ "pic" ]; @@ -27,18 +27,9 @@ stdenv.mkDerivation rec { install -m644 -b -D exfat.ko $out/lib/modules/${kernel.modDirVersion}/kernel/fs/exfat/exfat.ko ''; - patches = [ - # fix compile-errors in 4.18 and 4.20 - # ref: https://github.com/dorimanx/exfat-nofuse/pull/137 - (fetchpatch { - url = https://github.com/dorimanx/exfat-nofuse/compare/01c30ad52625a7261e1b0d874553b6ca7af25966...f93a47e6414d567a1e7f6ab7f34b015b20f9a050.patch ; - sha256 = "0w57pi9h6dwjxfgc3zpwy6sr4zw42hn1zj72f7wgfpqrx6d8xkh5"; - } ) - ]; - meta = { description = "exfat kernel module"; - homepage = https://github.com/dorimanx/exfat-nofuse; + inherit (src.meta) homepage; license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ makefu ]; platforms = lib.platforms.linux; From e102f874d17f7a399f71b66492eb5fc1e238af31 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Mon, 23 Sep 2019 10:34:49 +0200 Subject: [PATCH 041/102] brave: 0.68.131 -> 0.69.128 (cherry picked from commit 4235d8b07caec04acd50c887813b1d3541370b96) --- pkgs/applications/networking/browsers/brave/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 45fb820a076c..ae3659a21fef 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -82,11 +82,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "0.68.131"; + version = "0.69.128"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "0syhwy1gxy82jbxbryi1n4zp1ya7wvm20g1vqvd2s7kqspprsi0l"; + sha256 = "1w5p2hbn14k239fbqrbxkw9h3p8wm7cdyjcyvrsss57fj00j8s4r"; }; dontConfigure = true; From 0b1e1241a4882f1df86435d115f8da3e3474f7ee Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 16 Sep 2019 22:15:21 +0000 Subject: [PATCH 042/102] treewide: fix string escapes (cherry picked from commit 8276314608e4a253b65cc72d29fef36935f52e02) --- pkgs/applications/video/kino/default.nix | 2 +- .../haskell-modules/hackage-packages.nix | 4 ++-- pkgs/development/tools/misc/ctags/wrapped.nix | 14 +++++++------- .../apple-source-releases/system_cmds/default.nix | 4 ++-- pkgs/tools/typesetting/tex/texlive/combine.nix | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/video/kino/default.nix b/pkgs/applications/video/kino/default.nix index 4ddd84433e88..1b9f0d0997a0 100644 --- a/pkgs/applications/video/kino/default.nix +++ b/pkgs/applications/video/kino/default.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation { postInstall = " rpath=`patchelf --print-rpath \$out/bin/kino`; - for i in $\buildInputs; do + for i in $buildInputs; do echo adding \$i/lib rpath=\$rpath\${rpath:+:}\$i/lib done diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index a4347ac10c34..7114151e1dc0 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -57673,7 +57673,7 @@ self: { version = "0.1.0.1"; sha256 = "0rwi5zwvqn18g7qyp9aw51w3yzkqbff9g7rcqdk1l871fvq8qhha"; libraryHaskellDepends = [ base ]; - description = "Haskell operator `g ... f = \x1 .. xn -> g (f x1 .. xn)`."; + description = "Haskell operator `g ... f = \\x1 .. xn -> g (f x1 .. xn)`."; license = stdenv.lib.licenses.bsd3; }) {}; @@ -251720,7 +251720,7 @@ self: { base containers exceptions free spiros split text transformers ]; executableHaskellDepends = [ base ]; - description = "Automate keyboard\/mouse\/clipboard\/application interaction"; + description = "Automate keyboard/mouse/clipboard/application interaction"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; diff --git a/pkgs/development/tools/misc/ctags/wrapped.nix b/pkgs/development/tools/misc/ctags/wrapped.nix index 869e7a61121d..08f8049aa8a1 100644 --- a/pkgs/development/tools/misc/ctags/wrapped.nix +++ b/pkgs/development/tools/misc/ctags/wrapped.nix @@ -27,10 +27,10 @@ with pkgs.stdenv.lib; # don't scan version control directories defaultArgs = [ - "--exclude=\.svn" - "--exclude=\.hg" - "--exclude=\.git" - "--exclude=\_darcs" + "--exclude=.svn" + "--exclude=.hg" + "--exclude=.git" + "--exclude=_darcs" "--sort=yes" ]; @@ -38,8 +38,8 @@ with pkgs.stdenv.lib; asLang = [ "--langdef=ActionScript" "--langmap=ActionScript:.as" - "--regex-ActionScript=/function[ \\t]+([A-Za-z0-9_]+)[ \\t]*\\(/\1/f,function,functions/" - "--regex-ActionScript=/function[ \\t]+(set|get)[ \\t]+([A-Za-z0-9_]+)[ \\t]*\\(/\2/p,property,properties/" + "--regex-ActionScript=/function[ \\t]+([A-Za-z0-9_]+)[ \\t]*\\(/\\1/f,function,functions/" + "--regex-ActionScript=/function[ \\t]+(set|get)[ \\t]+([A-Za-z0-9_]+)[ \\t]*\\(/\\2/p,property,properties/" "--regex-ActionScript=/interface[ \\t]+[a-z0-9_.]*([A-Z][A-Za-z0-9_]+)/\\1/i,interface,interfaces/" "--regex-ActionScript=/package[ \\t]+([^ \\t]*)/\\1/p/" "--regex-ActionScript=/class[ \\t]+[a-z0-9_.]*([A-Z][A-Za-z0-9_]+)/\\1/c,class,classes/" @@ -67,7 +67,7 @@ with pkgs.stdenv.lib; nixLang = [ "--langdef=NIX" "--langmap=NIX:.nix" - "--regex-NIX=/\([^ \\t*]*\)[ \\t]*=/\\1/f/" + "--regex-NIX=/([^ \\t*]*)[ \\t]*=/\\1/f/" ]; rubyLang = [ diff --git a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix index 03556296ca1d..16454cbc1a5f 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix @@ -14,8 +14,8 @@ appleDerivation { # + lib.optionalString hostPlatform.isAarch32 "-D__arm__"; NIX_CFLAGS_COMPILE = [ "-DDAEMON_UID=1" "-DDAEMON_GID=1" - "-DDEFAULT_AT_QUEUE=\'a\'" - "-DDEFAULT_BATCH_QUEUE=\'b\'" + "-DDEFAULT_AT_QUEUE='a'" + "-DDEFAULT_BATCH_QUEUE='b'" "-DPERM_PATH=\"/usr/lib/cron/\"" "-DOPEN_DIRECTORY" "-DNO_DIRECT_RPC" diff --git a/pkgs/tools/typesetting/tex/texlive/combine.nix b/pkgs/tools/typesetting/tex/texlive/combine.nix index 69fde7784f59..6622a03decc5 100644 --- a/pkgs/tools/typesetting/tex/texlive/combine.nix +++ b/pkgs/tools/typesetting/tex/texlive/combine.nix @@ -136,9 +136,9 @@ in buildEnv { script = writeText "hyphens.sed" ( # pick up the header - "1,/^\% from/p;" + "1,/^% from/p;" # pick up all sections matching packages that we combine - + lib.concatMapStrings (pname: "/^\% from ${pname}:$/,/^\%/p;\n") pnames + + lib.concatMapStrings (pname: "/^% from ${pname}:$/,/^%/p;\n") pnames ); in '' ( From 40608754f7f5c2c40016169437f2f14eafa4910d Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 16 Sep 2019 23:40:32 +0000 Subject: [PATCH 043/102] nixos/rspamd: fix fancy unicode quote (cherry picked from commit 602a39c31825629f03c7e65169f040d73305c3e7) --- nixos/modules/services/mail/rspamd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/mail/rspamd.nix b/nixos/modules/services/mail/rspamd.nix index 89aa9d17ff7f..4db35d9e89ab 100644 --- a/nixos/modules/services/mail/rspamd.nix +++ b/nixos/modules/services/mail/rspamd.nix @@ -68,7 +68,7 @@ let replaced with rspamd_proxy. ''; apply = let - from = "services.rspamd.workers.\”${name}\".type"; + from = "services.rspamd.workers.\"${name}\".type"; files = options.type.files; warning = "The option `${from}` defined in ${showFiles files} has enum value `proxy` which has been renamed to `rspamd_proxy`"; in x: if x == "proxy" then traceWarning warning "rspamd_proxy" else x; From 48d07aab3a13eac806ea5867e2108bfd5dba6207 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 17 Sep 2019 00:18:14 +0000 Subject: [PATCH 044/102] nixos/less: fix escape (cherry picked from commit 1aadcee68a3857459499208c376ef687584f72b9) --- nixos/modules/programs/less.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/programs/less.nix b/nixos/modules/programs/less.nix index e19935b77caf..75b3e707d576 100644 --- a/nixos/modules/programs/less.nix +++ b/nixos/modules/programs/less.nix @@ -54,8 +54,8 @@ in type = types.attrsOf types.str; default = {}; example = { - h = "noaction 5\e("; - l = "noaction 5\e)"; + h = "noaction 5\\e("; + l = "noaction 5\\e)"; }; description = "Defines new command keys."; }; From b315611e938000342283f97b18fa7bdd6844ba40 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 17 Sep 2019 00:19:28 +0000 Subject: [PATCH 045/102] nixos/graphite: fix escape (cherry picked from commit fbd2b55715f10a5b8b2e15992dbb1ddebc9e7e29) --- nixos/modules/services/monitoring/graphite.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix index 64cb6c3da1e5..f7874af3df29 100644 --- a/nixos/modules/services/monitoring/graphite.nix +++ b/nixos/modules/services/monitoring/graphite.nix @@ -239,7 +239,7 @@ in { description = "Any metrics received which match one of the experssions will be dropped."; default = null; type = types.nullOr types.str; - example = "^some\.noisy\.metric\.prefix\..*"; + example = "^some\\.noisy\\.metric\\.prefix\\..*"; }; whitelist = mkOption { From 0d94bf8d382c194ca237a10c181282caf879d96e Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 17 Sep 2019 00:20:05 +0000 Subject: [PATCH 046/102] nixos/prosody: fix escape (cherry picked from commit b384420f2c9365236c2dc35e95321e53df4d2f1d) --- nixos/modules/services/networking/prosody.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/prosody.nix b/nixos/modules/services/networking/prosody.nix index 1ae063aa6bb5..7a503e711665 100644 --- a/nixos/modules/services/networking/prosody.nix +++ b/nixos/modules/services/networking/prosody.nix @@ -465,7 +465,7 @@ in modules_enabled = { - ${ lib.concatStringsSep "\n\ \ " (lib.mapAttrsToList + ${ lib.concatStringsSep "\n " (lib.mapAttrsToList (name: val: optionalString val "${toLua name};") cfg.modules) } ${ lib.concatStringsSep "\n" (map (x: "${toLua x};") cfg.package.communityModules)} From 1d794ca494c11410544dbf52da58c5da5f73bafc Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 17 Sep 2019 00:22:11 +0000 Subject: [PATCH 047/102] nixos/matomo: fix string escape (cherry picked from commit 08195254aa9a554a903a165617abd0e51a2c550e) --- nixos/modules/services/web-apps/matomo.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/web-apps/matomo.nix b/nixos/modules/services/web-apps/matomo.nix index d9f840408cc8..8e0f9f8582d8 100644 --- a/nixos/modules/services/web-apps/matomo.nix +++ b/nixos/modules/services/web-apps/matomo.nix @@ -105,8 +105,8 @@ in { default = null; example = { serverAliases = [ - "matomo.$\{config.networking.domain\}" - "stats.$\{config.networking.domain\}" + "matomo.\${config.networking.domain}" + "stats.\${config.networking.domain}" ]; enableACME = false; }; @@ -115,7 +115,7 @@ in { Either this option or the webServerUser option is mandatory. Set this to {} to just enable the virtualHost if you don't need any customization. If enabled, then by default, the is - ${user}.$\{config.networking.hostName\}.$\{config.networking.domain\}, + ${user}.''${config.networking.hostName}.''${config.networking.domain}, SSL is active, and certificates are acquired via ACME. If this is set to null (the default), no nginx virtualHost will be configured. ''; @@ -275,7 +275,7 @@ in { fastcgi_pass unix:${phpSocket}; ''; # Any other attempt to access any php files is forbidden - locations."~* ^.+\.php$".extraConfig = '' + locations."~* ^.+\\.php$".extraConfig = '' return 403; ''; # Disallow access to unneeded directories @@ -284,7 +284,7 @@ in { return 403; ''; # Disallow access to several helper files - locations."~* \.(?:bat|git|ini|sh|txt|tpl|xml|md)$".extraConfig = '' + locations."~* \\.(?:bat|git|ini|sh|txt|tpl|xml|md)$".extraConfig = '' return 403; ''; # No crawling of this site for bots that obey robots.txt - no useful information here. From a50fbe30862efab71472971a4fb9f0d0523b827a Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 17 Sep 2019 00:22:56 +0000 Subject: [PATCH 048/102] nixos/restya-board: fix string escape (cherry picked from commit 4641b683f6d8c8e769ae849316de1522ae18179f) --- nixos/modules/services/web-apps/restya-board.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/web-apps/restya-board.nix b/nixos/modules/services/web-apps/restya-board.nix index f220669c9108..d3c97e86582f 100644 --- a/nixos/modules/services/web-apps/restya-board.nix +++ b/nixos/modules/services/web-apps/restya-board.nix @@ -236,7 +236,7 @@ in locations."/".root = "${runDir}/client"; - locations."~ \.php$" = { + locations."~ \\.php$" = { tryFiles = "$uri =404"; extraConfig = '' include ${pkgs.nginx}/conf/fastcgi_params; @@ -247,7 +247,7 @@ in ''; }; - locations."~* \.(css|js|less|html|ttf|woff|jpg|jpeg|gif|png|bmp|ico)" = { + locations."~* \\.(css|js|less|html|ttf|woff|jpg|jpeg|gif|png|bmp|ico)" = { root = "${runDir}/client"; extraConfig = '' if (-f $request_filename) { From 92f8173f844e3205cc2955f113dcb8550669f73d Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 17 Sep 2019 00:23:51 +0000 Subject: [PATCH 049/102] nixos/tt-rss: fix string escape (cherry picked from commit 432a2d73be9a4cc70a030abc8a8d8e445fc814f9) --- nixos/modules/services/web-apps/tt-rss.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix index abe4748591e9..b92e34498949 100644 --- a/nixos/modules/services/web-apps/tt-rss.nix +++ b/nixos/modules/services/web-apps/tt-rss.nix @@ -548,7 +548,7 @@ let index = "index.php"; }; - locations."~ \.php$" = { + locations."~ \\.php$" = { extraConfig = '' fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_pass unix:${config.services.phpfpm.pools.${cfg.pool}.socket}; From e055c5a6693e2e765906069f9e1c7d6725cd9d02 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 17 Sep 2019 00:27:13 +0000 Subject: [PATCH 050/102] nixos/matomo: fix escape (cherry picked from commit 48086fbd702d83ae0839272724350c73184f22fb) --- nixos/modules/services/web-apps/matomo.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/matomo.nix b/nixos/modules/services/web-apps/matomo.nix index 8e0f9f8582d8..1e34aff8d171 100644 --- a/nixos/modules/services/web-apps/matomo.nix +++ b/nixos/modules/services/web-apps/matomo.nix @@ -115,7 +115,7 @@ in { Either this option or the webServerUser option is mandatory. Set this to {} to just enable the virtualHost if you don't need any customization. If enabled, then by default, the is - ${user}.''${config.networking.hostName}.''${config.networking.domain}, + ''${user}.''${config.networking.hostName}.''${config.networking.domain}, SSL is active, and certificates are acquired via ACME. If this is set to null (the default), no nginx virtualHost will be configured. ''; From daf223549d8bccfd00a98b6704b719e9420dc710 Mon Sep 17 00:00:00 2001 From: Colin L Rice Date: Sat, 21 Sep 2019 19:51:04 -0400 Subject: [PATCH 051/102] linux_rpi: copy dtb so raspberry pi 3a+ boots (cherry picked from commit 56d198b7757499e09140f9ee3c3d3dc3eb16c722) --- pkgs/os-specific/linux/kernel/linux-rpi.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix index 1b4700a2e392..6c24311338ac 100644 --- a/pkgs/os-specific/linux/kernel/linux-rpi.nix +++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix @@ -54,6 +54,7 @@ lib.overrideDerivation (buildLinux (args // { copyDTB bcm2709-rpi-2-b.dtb bcm2836-rpi-2-b.dtb '' + lib.optionalString (lib.elem stdenv.hostPlatform.system ["armv7l-linux" "aarch64-linux"]) '' copyDTB bcm2710-rpi-3-b.dtb bcm2837-rpi-3-b.dtb + copyDTB bcm2710-rpi-3-b-plus.dtb bcm2837-rpi-3-a-plus.dtb copyDTB bcm2710-rpi-3-b-plus.dtb bcm2837-rpi-3-b-plus.dtb copyDTB bcm2710-rpi-cm3.dtb bcm2837-rpi-cm3.dtb ''; From 404d1cd097915793e8200de8fd496a112ecef1f7 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Tue, 24 Sep 2019 01:45:14 +0000 Subject: [PATCH 052/102] firefoxPackages.tor-browser: 8.5.4 -> 8.5.6 (cherry picked from commit 54c8da078781e9d85c395d0d2c05b215f7f7924f) --- .../networking/browsers/firefox/packages.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 6a5bcbfcdbea..3fd0691727aa 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -265,17 +265,17 @@ in rec { gtk3Support = false; }; - tor-browser-8-5 = tbcommon { - ffversion = "60.8.0esr"; - tbversion = "8.5.4"; + tor-browser-8-5 = tbcommon rec { + ffversion = "60.9.0esr"; + tbversion = "8.5.6"; # FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb src = fetchFromGitHub { owner = "SLNOS"; repo = "tor-browser"; - # branch "tor-browser-60.8.0esr-8.5-1-slnos" - rev = "9ec7e4832a68ba3a77f5e8e21dc930a25757f55d"; - sha256 = "10x9h2nm1p8cs0qnd8yjp7ly5raxagqyfjn4sj2y3i86ya5zygb9"; + # branch "tor-browser-60.9.0esr-8.5-2-slnos" + rev = "0489ae3158cd8c0e16c2e78b94083d8cbf0209dc"; + sha256 = "0y5s7d8pg8ak990dp8d801j9823igaibfhv9hsa79nib5yllifzs"; }; patches = [ From fbc7e7e94ce6cf04af4be12af12cd188675652fb Mon Sep 17 00:00:00 2001 From: talyz Date: Fri, 20 Sep 2019 18:00:36 +0200 Subject: [PATCH 053/102] nixos/gitlab: Mention secret option transition in release notes Document the breaking secret option transition from literal secrets to file-based ones. (cherry picked from commit 7e325c2251cd9d21f5d7010add19c14f6b7badae) --- nixos/doc/manual/release-notes/rl-1909.xml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml index a1d9199b4e1d..800da14ed563 100644 --- a/nixos/doc/manual/release-notes/rl-1909.xml +++ b/nixos/doc/manual/release-notes/rl-1909.xml @@ -895,6 +895,28 @@ Citrix Receiver (citrix_receiver) has been dropped in favor of Citrix Workspace (citrix_workspace). + + + The services.gitlab module has had its literal secret options (, + , + , + , + , + and + ) replaced by file-based versions (, + , + , + , + , + and + ). This was done so that secrets aren't stored + in the world-readable nix store, but means that for each option you'll have to create a file with + the same exact string, add "File" to the end of the option name, and change the definition to a + string pointing to the corresponding file; e.g. services.gitlab.databasePassword = "supersecurepassword" + becomes services.gitlab.databasePasswordFile = "/path/to/secret_file" where the + file secret_file contains the string supersecurepassword. + + From 74869e2897416a749bbdb7cac309540817318aa8 Mon Sep 17 00:00:00 2001 From: talyz Date: Fri, 20 Sep 2019 18:04:03 +0200 Subject: [PATCH 054/102] nixos/gitlab: Document the restriction introduced on statePath The state path now, since the transition from initialization in preStart to using systemd-tmpfiles, has the following restriction: no parent directory can be owned by any other user than root or the user specified in services.gitlab.user. This is a potentially breaking change and the cause of the error isn't immediately obvious, so document it both in the release notes and statePath description. (cherry picked from commit dfc43f7d0a6c22417b4522f42d9c4e196fdbe7f7) --- nixos/doc/manual/release-notes/rl-1909.xml | 7 +++++++ nixos/modules/services/misc/gitlab.nix | 10 +++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml index 800da14ed563..4220a9500b0e 100644 --- a/nixos/doc/manual/release-notes/rl-1909.xml +++ b/nixos/doc/manual/release-notes/rl-1909.xml @@ -916,6 +916,13 @@ becomes services.gitlab.databasePasswordFile = "/path/to/secret_file" where the file secret_file contains the string supersecurepassword. + + The state path () now has the following restriction: + no parent directory can be owned by any other user than root or the user + specified in ; i.e. if + is set to /var/lib/gitlab/state, gitlab and all parent directories + must be owned by either root or the user specified in . + diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index dc28c0a98c97..97cc0624c160 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -225,7 +225,15 @@ in { statePath = mkOption { type = types.str; default = "/var/gitlab/state"; - description = "Gitlab state directory, logs are stored here."; + description = '' + Gitlab state directory. Configuration, repositories and + logs, among other things, are stored here. + + The directory will be created automatically if it doesn't + exist already. Its parent directories must be owned by + either root or the user set in + . + ''; }; backupPath = mkOption { From 315aa052f88aa6bbba4ff1def980775f54f43c64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 24 Sep 2019 12:55:48 +0200 Subject: [PATCH 055/102] knot-dns: 2.8.3 -> 2.8.4 https://gitlab.labs.nic.cz/knot/knot-dns/raw/v2.8.4/NEWS (cherry picked from commit 1b0771ac42f43e88a0b73143fd5c1b13e40c1c0a) It should be fairly safe maintenance update. --- pkgs/servers/dns/knot-dns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 8191bf5acbf1..ad1bb26a54d9 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -7,11 +7,11 @@ let inherit (stdenv.lib) optional optionals; in # Note: ATM only the libraries have been tested in nixpkgs. stdenv.mkDerivation rec { pname = "knot-dns"; - version = "2.8.3"; + version = "2.8.4"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "8a62d81e5cf3df938f469b60ed4e46d9161007c2b89fbf7ae07525fa68368bad"; + sha256 = "541e7e43503765c91405c5797b3838103bb656154712e69b3f959c6ab0e700a9"; }; outputs = [ "bin" "out" "dev" ]; From 805dcabd26e88193cd6482d22f89b9c55b652181 Mon Sep 17 00:00:00 2001 From: William Kral Date: Mon, 23 Sep 2019 12:28:21 -0700 Subject: [PATCH 056/102] virtualbox: Temporary fix for kernel >= 5.3 (cherry picked from commit 2f2da824edd957aabff97529d55cdfd8da6f8f72) --- .../virtualization/virtualbox/default.nix | 3 + .../virtualbox/kernel-5.3-fix.patch | 72 +++++++++++++++++++ 2 files changed, 75 insertions(+) create mode 100644 pkgs/applications/virtualization/virtualbox/kernel-5.3-fix.patch diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index ac52b83e43d2..633f047be5a0 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -92,6 +92,9 @@ in stdenv.mkDerivation { }) ++ [ ./qtx11extras.patch + # Kernel 5.3 fix, should be fixed with VirtualBox 6.0.14 + # https://www.virtualbox.org/ticket/18911 + ./kernel-5.3-fix.patch ]; postPatch = '' diff --git a/pkgs/applications/virtualization/virtualbox/kernel-5.3-fix.patch b/pkgs/applications/virtualization/virtualbox/kernel-5.3-fix.patch new file mode 100644 index 000000000000..ba9c7c941db9 --- /dev/null +++ b/pkgs/applications/virtualization/virtualbox/kernel-5.3-fix.patch @@ -0,0 +1,72 @@ +--- a/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c ++++ b/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c +@@ -2123,7 +2123,9 @@ + #endif + if (in_dev != NULL) + { +- for_ifa(in_dev) { ++ struct in_ifaddr *ifa; ++ ++ for (ifa = in_dev->ifa_list; ifa; ifa = ifa->ifa_next) { + if (VBOX_IPV4_IS_LOOPBACK(ifa->ifa_address)) + return NOTIFY_OK; + +@@ -2137,7 +2139,7 @@ + + pThis->pSwitchPort->pfnNotifyHostAddress(pThis->pSwitchPort, + /* :fAdded */ true, kIntNetAddrType_IPv4, &ifa->ifa_address); +- } endfor_ifa(in_dev); ++ } + } + + /* +--- a/src/VBox/Runtime/r0drv/linux/mp-r0drv-linux.c ++++ a/src/VBox/Runtime/r0drv/linux/mp-r0drv-linux.c +@@ -283,12 +283,15 @@ + if (RTCpuSetCount(&OnlineSet) > 1) + { + /* Fire the function on all other CPUs without waiting for completion. */ +-# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27) ++# if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 3, 0) ++ smp_call_function(rtmpLinuxAllWrapper, &Args, 0 /* wait */); ++# elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27) + int rc = smp_call_function(rtmpLinuxAllWrapper, &Args, 0 /* wait */); ++ Assert(!rc); NOREF(rc); + # else + int rc = smp_call_function(rtmpLinuxAllWrapper, &Args, 0 /* retry */, 0 /* wait */); +-# endif + Assert(!rc); NOREF(rc); ++# endif + } + #endif + +@@ -326,7 +329,6 @@ + { + #ifdef CONFIG_SMP + IPRT_LINUX_SAVE_EFL_AC(); +- int rc; + RTMPARGS Args; + + RTTHREADPREEMPTSTATE PreemptState = RTTHREADPREEMPTSTATE_INITIALIZER; +@@ -337,14 +339,17 @@ + Args.cHits = 0; + + RTThreadPreemptDisable(&PreemptState); +-# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27) +- rc = smp_call_function(rtmpLinuxWrapper, &Args, 1 /* wait */); ++# if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 3, 0) ++ smp_call_function(rtmpLinuxWrapper, &Args, 1 /* wait */); ++# elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27) ++ int rc = smp_call_function(rtmpLinuxWrapper, &Args, 1 /* wait */); ++ Assert(rc == 0); NOREF(rc); + # else /* older kernels */ +- rc = smp_call_function(rtmpLinuxWrapper, &Args, 0 /* retry */, 1 /* wait */); ++ int rc = smp_call_function(rtmpLinuxWrapper, &Args, 0 /* retry */, 1 /* wait */); ++ Assert(rc == 0); NOREF(rc); + # endif /* older kernels */ + RTThreadPreemptRestore(&PreemptState); + +- Assert(rc == 0); NOREF(rc); + IPRT_LINUX_RESTORE_EFL_AC(); + #else + RT_NOREF(pfnWorker, pvUser1, pvUser2); From 1be0dd0e5093c5c0688b21fa4ee2b84c3376cbd9 Mon Sep 17 00:00:00 2001 From: "Tristan Helmich (omniIT)" Date: Tue, 24 Sep 2019 10:07:48 +0000 Subject: [PATCH 057/102] graylog: 3.1.0 -> 3.1.2 (cherry picked from commit e702263b4a93bf8a33523e5f74fd3d734d495dd9) --- pkgs/tools/misc/graylog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix index 0f448cc089c8..52e712c5cb1b 100644 --- a/pkgs/tools/misc/graylog/default.nix +++ b/pkgs/tools/misc/graylog/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "graylog"; - version = "3.1.0"; + version = "3.1.2"; src = fetchurl { url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz"; - sha256 = "0zv64cnd5nrn2hgbjmcwjam8dx5y2a7gz5x7xb9kr134132dm0yd"; + sha256 = "14zr1aln34j5wifhg6ak3f83l959vic8i11jr90ibmnxl5v4hcqp"; }; dontBuild = true; From ec6c4a83bea89937bf0db64eac4e20333cd3a849 Mon Sep 17 00:00:00 2001 From: "Tristan Helmich (omniIT)" Date: Tue, 24 Sep 2019 10:08:47 +0000 Subject: [PATCH 058/102] graylog-plugin-auth-sso: 3.0.0 -> 3.1.0 (cherry picked from commit 3649ee54913b7d646c026d478a3ead145eab148b) --- pkgs/tools/misc/graylog/plugins.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/graylog/plugins.nix b/pkgs/tools/misc/graylog/plugins.nix index a8d571da7ebd..e7d32dd4b373 100644 --- a/pkgs/tools/misc/graylog/plugins.nix +++ b/pkgs/tools/misc/graylog/plugins.nix @@ -38,10 +38,10 @@ in { auth_sso = glPlugin rec { name = "graylog-auth-sso-${version}"; pluginName = "graylog-plugin-auth-sso"; - version = "3.0.0"; + version = "3.1.0"; src = fetchurl { url = "https://github.com/Graylog2/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar"; - sha256 = "09y1s71mk8fm6lsghla7mrh9z5y230r8zpv84klhavh2dacs8gq5"; + sha256 = "0hwgpq1j3qk0j1zgap5f1avh2nvkcscgds81x8xr0gamphgps8y2"; }; meta = { homepage = https://github.com/Graylog2/graylog-plugin-auth-sso; From f96eabaa03e9533a3b606e3b0b70203bb9f0bcce Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Tue, 24 Sep 2019 11:33:31 +0200 Subject: [PATCH 059/102] nixos/network: replace deprecated DHCP=both by DHCP=yes (cherry picked from commit a0a3675bdf2065a8305020f30dc157138bdfe4f1) --- nixos/modules/tasks/network-interfaces-systemd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix index 34e270667151..7c6604922cf7 100644 --- a/nixos/modules/tasks/network-interfaces-systemd.nix +++ b/nixos/modules/tasks/network-interfaces-systemd.nix @@ -12,7 +12,7 @@ let i.ipv4.addresses ++ optionals cfg.enableIPv6 i.ipv6.addresses; - dhcpStr = useDHCP: if useDHCP == true || useDHCP == null then "both" else "no"; + dhcpStr = useDHCP: if useDHCP == true || useDHCP == null then "yes" else "no"; slaves = concatLists (map (bond: bond.interfaces) (attrValues cfg.bonds)) From c1e6017cb87968e6ffa299d87ed66476676b13af Mon Sep 17 00:00:00 2001 From: Arian van Putten Date: Mon, 16 Sep 2019 10:49:59 +0200 Subject: [PATCH 060/102] vault: 1.2.2 -> 1.2.3 Fixes the build because https://git.apache.org has been taken offline and now has been replaced with another mirror (cherry picked from commit 35e9b2915a12d3641c6e412f3ad14b2b942e85b5) --- pkgs/tools/security/vault/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index c0fa221c9691..7620fc9760d8 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "vault"; - version = "1.2.2"; + version = "1.2.3"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "1xljm7xmb4ldg3wx8s9kw1spffg4ywk4r1jqfa743czd2xxmqavl"; + sha256 = "11zi12j09vi6j112a1n8f7sxwp15pbh0801bzh27ihcy01hlzdf8"; }; - modSha256 = "13pr3piv6hrsc562qagpn1h5wckiziyfqraj13172hdglz3n2i7q"; + modSha256 = "10pr3piv6hrsc562qagpn1h5wckiziyfqraj13172hdglz3n2i7q"; buildFlagsArray = [ "-tags='vault'" From e9f97cf82c3bce4810faa438b4bcf0a39fb3eb69 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Sep 2019 04:32:00 -0500 Subject: [PATCH 061/102] vault: use buildGoPackage (cherry picked from commit 9db2a8154c5ae4447df7ea8ca517045c65fccb62) --- pkgs/tools/security/vault/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index 7620fc9760d8..4d47e5d4134f 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, buildGoModule }: +{ stdenv, fetchFromGitHub, buildGoPackage }: -buildGoModule rec { +buildGoPackage rec { pname = "vault"; version = "1.2.3"; @@ -11,7 +11,9 @@ buildGoModule rec { sha256 = "11zi12j09vi6j112a1n8f7sxwp15pbh0801bzh27ihcy01hlzdf8"; }; - modSha256 = "10pr3piv6hrsc562qagpn1h5wckiziyfqraj13172hdglz3n2i7q"; + goPackagePath = "github.com/hashicorp/vault"; + + subPackages = [ "." ]; buildFlagsArray = [ "-tags='vault'" @@ -19,8 +21,8 @@ buildGoModule rec { ]; postInstall = '' - mkdir -p $out/share/bash-completion/completions - echo "complete -C $out/bin/vault vault" > $out/share/bash-completion/completions/vault + mkdir -p $bin/share/bash-completion/completions + echo "complete -C $bin/bin/vault vault" > $bin/share/bash-completion/completions/vault ''; meta = with stdenv.lib; { From f19b3ec555270909ecb487225b140e9bd059a064 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=B6ller?= Date: Mon, 16 Sep 2019 01:37:19 +0200 Subject: [PATCH 062/102] cheroot: fix darwin sandbox build (cherry picked from commit 5347a8038af081a52e485bcefe850243850ea9e8) --- pkgs/development/python-modules/cheroot/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix index 8c55c3ac8bbb..88f77503b9bd 100644 --- a/pkgs/development/python-modules/cheroot/default.nix +++ b/pkgs/development/python-modules/cheroot/default.nix @@ -34,6 +34,9 @@ buildPythonPackage rec { pytest ${lib.optionalString stdenv.isDarwin "--deselect=cheroot/test/test_ssl.py::test_http_over_https_error --deselect=cheroot/test/test_server.py::test_bind_addr_unix"} ''; + # Some of the tests use localhost networking. + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "High-performance, pure-Python HTTP"; homepage = https://github.com/cherrypy/cheroot; From c23263abb00aeebcd7218ffcdf28b0bf881c2267 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 14 Sep 2019 11:45:38 -0700 Subject: [PATCH 063/102] pythonPackages.cheroot: fix tests (cherry picked from commit 9a88d2c8272547a39179a311164dc3a9ad539464) --- pkgs/development/python-modules/cheroot/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix index 88f77503b9bd..9b3050942a88 100644 --- a/pkgs/development/python-modules/cheroot/default.nix +++ b/pkgs/development/python-modules/cheroot/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { checkPhase = '' substituteInPlace pytest.ini --replace "--doctest-modules" "" --replace "-n auto" "" ${lib.optionalString (pythonAtLeast "3.7") "sed -i '/warnings/,+2d' pytest.ini"} - pytest ${lib.optionalString stdenv.isDarwin "--deselect=cheroot/test/test_ssl.py::test_http_over_https_error --deselect=cheroot/test/test_server.py::test_bind_addr_unix"} + pytest -k 'not tls' ${lib.optionalString stdenv.isDarwin "--deselect=cheroot/test/test_ssl.py::test_http_over_https_error --deselect=cheroot/test/test_server.py::test_bind_addr_unix"} ''; # Some of the tests use localhost networking. From 1d37ea57b5cb695be92f366bdcdb43463b9ffca4 Mon Sep 17 00:00:00 2001 From: Dima Date: Sat, 14 Sep 2019 23:32:11 +0200 Subject: [PATCH 064/102] python37Packages.scikitlearn: patching build For numpy>=1.17 a test-case broke that required adjustments to a threshold. See https://github.com/NixOS/nixpkgs/issues/68494 (cherry picked from commit 82d7833b9b65f3d274ddef9597b5f66d8453a2cc) --- .../development/python-modules/scikitlearn/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/python-modules/scikitlearn/default.nix b/pkgs/development/python-modules/scikitlearn/default.nix index 7eb020bbe609..939782722c6e 100644 --- a/pkgs/development/python-modules/scikitlearn/default.nix +++ b/pkgs/development/python-modules/scikitlearn/default.nix @@ -2,6 +2,7 @@ , lib , buildPythonPackage , fetchPypi +, fetchpatch , gfortran, glibcLocales , numpy, scipy, pytest, pillow , cython @@ -40,6 +41,15 @@ buildPythonPackage rec { ]; checkInputs = [ pytest ]; + patches = [ + # Fixes tests by changing threshold of a test-case that broke + # with numpy versions >= 1.17. This should be removed for versions > 0.21.2. + ( fetchpatch { + url = "https://github.com/scikit-learn/scikit-learn/commit/b730befc821caec5b984d9ff3aa7bc4bd7f4d9bb.patch"; + sha256 = "0z36m05mv6d494qwq0688rgwa7c4bbnm5s2rcjlrp29fwn3fy1bv"; + }) + ]; + LC_ALL="en_US.UTF-8"; doCheck = !stdenv.isAarch64; From 2cf6ae8e01aa896bdf202332b90f67063f7cd429 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Wed, 11 Sep 2019 08:38:13 +0200 Subject: [PATCH 065/102] home-assistant: remove outdated pyyaml_3 pinning The recent bump to 0.96.2 now requires pyyaml 5.1.1. The PRs upgrading home-assistant to a newer version and the one pinning to an old PyYAML version raced each other and we ended up with both submitted. Fixes home-assistant build. (cherry picked from commit 04c1fcd09caa70f47c240437f2af5fd5a9028e03) --- pkgs/servers/home-assistant/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 5f7ef11246ed..c36388b26fc3 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -65,10 +65,6 @@ let }; }) - (self: super: { - pyyaml = super.pyyaml_3; - }) - # hass-frontend does not exist in python3.pkgs (self: super: { hass-frontend = self.callPackage ./frontend.nix { }; From 5ada0bf95b4a30e341d69e8f79904d0abd3c79ac Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 19 Sep 2019 22:09:57 +0200 Subject: [PATCH 066/102] piper: temporarily propagate gobject-introspection On startup piper would be unable to find Pango: > ImportError: Typelib file for namespace 'Pango', version '1.0' not found Workaround for #56943 (cherry picked from commit fb9b7446ee0f2e57e6819982121ac01fa15d9601) --- pkgs/os-specific/linux/piper/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/piper/default.nix b/pkgs/os-specific/linux/piper/default.nix index e177b284bbda..be3a5612a297 100644 --- a/pkgs/os-specific/linux/piper/default.nix +++ b/pkgs/os-specific/linux/piper/default.nix @@ -16,8 +16,12 @@ python3.pkgs.buildPythonApplication rec { }; nativeBuildInputs = [ meson ninja gettext pkgconfig wrapGAppsHook desktop-file-utils appstream-glib gobject-introspection ]; - buildInputs = [ gtk3 glib gnome3.adwaita-icon-theme python3 ]; - propagatedBuildInputs = with python3.pkgs; [ lxml evdev pygobject3 ]; + buildInputs = [ + gtk3 glib gnome3.adwaita-icon-theme python3 + ]; + propagatedBuildInputs = with python3.pkgs; [ lxml evdev pygobject3 ] ++ [ + gobject-introspection # fixes https://github.com/NixOS/nixpkgs/issues/56943 for now + ]; postPatch = '' chmod +x meson_install.sh # patchShebangs requires executable file From 2ac5c9e7bb8a53ebf1d5ea05a78e579b39149505 Mon Sep 17 00:00:00 2001 From: Nathan van Doorn Date: Tue, 24 Sep 2019 12:21:38 +0100 Subject: [PATCH 067/102] manticore: 2018.09.29 -> 2019.09.20 (cherry picked from commit 400431a0de941c8dc12e2ff959bf5caef33c8a2c) --- pkgs/development/compilers/manticore/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/manticore/default.nix b/pkgs/development/compilers/manticore/default.nix index 6e0716659c79..1e9b77cfb79b 100644 --- a/pkgs/development/compilers/manticore/default.nix +++ b/pkgs/development/compilers/manticore/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchFromGitHub, coreutils, autoreconfHook, smlnj }: let - rev= "47273c463fc3c5d0a0ae655cf75a4700bdb020b4"; + rev= "4528ccacdfd53d36f5959c005b27cd7ab6175b83"; in stdenv.mkDerivation { pname = "manticore"; - version = "2018.09.29"; + version = "2019.09.20"; src = fetchFromGitHub { owner = "ManticoreProject"; repo = "manticore"; - sha256 = "1prrgp7ldkdnrdbj224qqkirw8bj72460ix97c96fy264j9c97cn"; + sha256 = "1xz7msiq5x2c56zjxydbxlj6r001mm5zszcda6f6v5qfmmd1bakz"; inherit rev; }; From cb802929a6c455980d8a53cdc87461e93ae39608 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 24 Sep 2019 15:57:05 +0200 Subject: [PATCH 068/102] vtk: build with system libtiff fixes vtktiff, therefore at least gdcm (cherry picked from commit 2d6fbcd94eef8857a7eb35947a5ac9b282186eaf) --- pkgs/development/libraries/vtk/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix index c0b8fd7d1679..3cb8998485a9 100644 --- a/pkgs/development/libraries/vtk/default.nix +++ b/pkgs/development/libraries/vtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, libGLU_combined, libX11, xorgproto, libXt +{ stdenv, fetchurl, cmake, libGLU_combined, libX11, xorgproto, libXt, libtiff , qtLib ? null # Darwin support , Cocoa, CoreServices, DiskArbitration, IOKit, CFNetwork, Security, GLUT, OpenGL @@ -20,7 +20,9 @@ stdenv.mkDerivation rec { sha256 = "0nm7xwwj7rnsxjdv2ssviys8nhci4n9iiiqm2y14s520hl2dsp1d"; }; - buildInputs = [ cmake ] + nativeBuildInputs = [ cmake ]; + + buildInputs = [ libtiff ] ++ optional (qtLib != null) qtLib ++ optionals stdenv.isLinux [ libGLU_combined libX11 xorgproto libXt ] ++ optionals stdenv.isDarwin [ xpc Cocoa CoreServices DiskArbitration IOKit @@ -38,7 +40,7 @@ stdenv.mkDerivation rec { # built and requiring one of the shared objects. # At least, we use -fPIC for other packages to be able to use this in shared # objects. - cmakeFlags = [ "-DCMAKE_C_FLAGS=-fPIC" "-DCMAKE_CXX_FLAGS=-fPIC" ] + cmakeFlags = [ "-DCMAKE_C_FLAGS=-fPIC" "-DCMAKE_CXX_FLAGS=-fPIC" "-DVTK_USE_SYSTEM_TIFF=1" ] ++ optional (qtLib != null) [ "-DVTK_USE_QT:BOOL=ON" ] ++ optional stdenv.isDarwin "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks"; From dce457f7bcd66f32672a99e92999744bd3c63089 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 24 Sep 2019 15:57:46 +0200 Subject: [PATCH 069/102] xtreemfs: mark as broken does not support openssl 1.1 (cherry picked from commit daa724ae5ad1f901820734079bfc588ea5313c87) --- pkgs/tools/filesystems/xtreemfs/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/filesystems/xtreemfs/default.nix b/pkgs/tools/filesystems/xtreemfs/default.nix index ea25b302e355..436037245bbb 100644 --- a/pkgs/tools/filesystems/xtreemfs/default.nix +++ b/pkgs/tools/filesystems/xtreemfs/default.nix @@ -66,5 +66,6 @@ stdenv.mkDerivation { maintainers = with lib.maintainers; [ raskin matejc ]; platforms = lib.platforms.linux; license = lib.licenses.bsd3; + broken = true; # does not support openssl 1.1 }; } From 1a9eec8a07186274cdb59a68b5959e827cac0785 Mon Sep 17 00:00:00 2001 From: Daniel Schaefer Date: Fri, 13 Sep 2019 18:45:58 +0200 Subject: [PATCH 070/102] pythonPackages.astropy: Disable tests A ton of tests fail and it's not obvious to me how to fix them. Adding bleach to checkInputs fixes a tiny number of them, though. (cherry picked from commit 4c714c1f582d113778ca0a25e7a27646ba93312d) --- pkgs/development/python-modules/astropy/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix index f46ca274f2e1..35bb7b1aa59a 100644 --- a/pkgs/development/python-modules/astropy/default.nix +++ b/pkgs/development/python-modules/astropy/default.nix @@ -39,6 +39,9 @@ buildPythonPackage rec { pytest ''; + # 368 failed, 10889 passed, 978 skipped, 69 xfailed in 196.24s + doCheck = false; + meta = { description = "Astronomy/Astrophysics library for Python"; homepage = https://www.astropy.org; From 78a4175e0b3635d7998cccafa12bc423d429c851 Mon Sep 17 00:00:00 2001 From: Samuel Leathers Date: Tue, 17 Sep 2019 23:30:53 -0400 Subject: [PATCH 071/102] linuxPackages.ply: add rsync to native build inputs (cherry picked from commit 48c0062fe92852ae0a77c1355793f81c43f3c40e) --- pkgs/os-specific/linux/ply/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/ply/default.nix b/pkgs/os-specific/linux/ply/default.nix index 24213cd2fb5a..42739e53fdac 100644 --- a/pkgs/os-specific/linux/ply/default.nix +++ b/pkgs/os-specific/linux/ply/default.nix @@ -1,4 +1,4 @@ -{ stdenv, kernel, fetchFromGitHub, autoreconfHook, yacc, flex, p7zip }: +{ stdenv, kernel, fetchFromGitHub, autoreconfHook, yacc, flex, p7zip, rsync }: assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "4.0"; @@ -7,7 +7,7 @@ let in stdenv.mkDerivation { pname = "ply"; inherit version; - nativeBuildInputs = [ autoreconfHook flex yacc p7zip ]; + nativeBuildInputs = [ autoreconfHook flex yacc p7zip rsync ]; src = fetchFromGitHub { owner = "iovisor"; From d3feb15340016b48d6bd96c1d39d575597855252 Mon Sep 17 00:00:00 2001 From: danme Date: Fri, 13 Sep 2019 18:59:45 +0200 Subject: [PATCH 072/102] gnuk: 1.0.4 -> 1.2.14 (cherry picked from commit 5aa5fd4657bc41eea6917e551cddc830f277b09d) --- pkgs/misc/gnuk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/gnuk/default.nix b/pkgs/misc/gnuk/default.nix index 4597fa40390d..afef861c0dc4 100644 --- a/pkgs/misc/gnuk/default.nix +++ b/pkgs/misc/gnuk/default.nix @@ -1,11 +1,11 @@ { callPackage, fetchgit, ... } @ args: callPackage ./generic.nix (args // { - version = "1.0.4"; + version = "1.2.14"; src = fetchgit { url = "git://git.gniibe.org/gnuk/gnuk.git"; - rev = "93867d0c8b90c485f9832c0047c3a2e17a029aca"; - sha256 = "0ah2gc772kdq7gdwpqwdmfh5nzbx2wgpk5ljnhwc4i3mrkafdiih"; + rev = "177ef67edfa2306c2a369a037362385c354083e1"; + sha256 = "16wa3xsaq4r8caw6c24hnv4j78bklacix4in2y66j35h68ggr3j1"; }; }) From 9c0c769bfa71537bb315e7c834e804eb20dd1fe1 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 13 Sep 2019 12:27:09 -0700 Subject: [PATCH 073/102] pythonPackage.pycurl2: fix build (cherry picked from commit cc7c778bf143fd5651034d88bc5b9db7bba1e91b) --- .../development/python-modules/pycurl2/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/pycurl2/default.nix b/pkgs/development/python-modules/pycurl2/default.nix index 01428d41b7d2..478f4451cf7a 100644 --- a/pkgs/development/python-modules/pycurl2/default.nix +++ b/pkgs/development/python-modules/pycurl2/default.nix @@ -1,6 +1,4 @@ -{ stdenv -, buildPythonPackage -, fetchgit +{ lib, buildPythonPackage, fetchFromGitHub , isPy3k , simplejson , unittest2 @@ -13,8 +11,9 @@ buildPythonPackage { version = "7.20.0"; disabled = isPy3k; - src = fetchgit { - url = "https://github.com/Lispython/pycurl.git"; + src = fetchFromGitHub { + owner = "Lispython"; + repo = "pycurl"; rev = "0f00109950b883d680bd85dc6e8a9c731a7d0d13"; sha256 = "1qmw3cm93kxj94s71a8db9lwv2cxmr2wjv7kp1r8zildwdzhaw7j"; }; @@ -22,9 +21,10 @@ buildPythonPackage { # error: (6, "Couldn't resolve host 'h.wrttn.me'") doCheck = false; - buildInputs = [ pkgs.curl simplejson unittest2 nose ]; + nativeBuildInputs = [ pkgs.curl.dev ]; + buildInputs = [ simplejson unittest2 nose ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = https://pypi.python.org/pypi/pycurl2; description = "A fork from original PycURL library that no maintained from 7.19.0"; license = licenses.mit; From e757e397b5173e098fdce4c0a7c980ac7ee0af6d Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Mon, 23 Sep 2019 10:14:25 -0400 Subject: [PATCH 074/102] perlPackages.StructDumb: init at 0.09 (cherry picked from commit cd7ed820a09a2de82e606beb6c51f010ca271d83) --- pkgs/top-level/perl-packages.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8b1e7943fb6e..6bc878725d3d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15736,6 +15736,20 @@ let }; }; + StructDumb = buildPerlModule { + pname = "Struct-Dumb"; + version = "0.09"; + src = fetchurl { + url = mirror://cpan/authors/id/P/PE/PEVANS/Struct-Dumb-0.09.tar.gz; + sha256 = "0g9rziaqxkm00vh30g1yfwzq3b1xl23p8fbm4rszqsp641wr2z9k"; + }; + buildInputs = [ TestFatal ]; + meta = { + description = "make simple lightweight record-like structures"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + SubExporter = buildPerlPackage { pname = "Sub-Exporter"; version = "0.987"; From 24771272388f1d74cb294c4e1135f0f637796d73 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Mon, 23 Sep 2019 10:30:03 -0400 Subject: [PATCH 075/102] perlPackages.NetPrometheus: init at 0.07 (cherry picked from commit 9005bdd4609dd26a49f7d08644f5685290d01fea) --- pkgs/top-level/perl-packages.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6bc878725d3d..047ef07746a8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12665,6 +12665,21 @@ let }; }; + NetPrometheus = buildPerlModule { + pname = "Net-Prometheus"; + version = "0.07"; + src = fetchurl { + url = mirror://cpan/authors/id/P/PE/PEVANS/Net-Prometheus-0.07.tar.gz; + sha256 = "1dh498b26wdaip053hw52317jjmb2n2r5209a1zv5yfrlxpblqm7"; + }; + propagatedBuildInputs = [ RefUtil StructDumb ]; + buildInputs = [ TestFatal ]; + meta = { + description = "export monitoring metrics for F"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + NetSCP = buildPerlPackage { pname = "Net-SCP"; version = "0.08.reprise"; From 72833e97ec4ca02d0fa12030388735a0bfafb494 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 25 Sep 2019 04:12:05 +0800 Subject: [PATCH 076/102] dxx-rebirth: build with gcc6 as gcc8 is not supported (cherry picked from commit fe8b82f557a265c1069f8a48233e3aaf7c0df1dc) --- pkgs/games/dxx-rebirth/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/dxx-rebirth/default.nix b/pkgs/games/dxx-rebirth/default.nix index 518b63ed483c..82806c7521cf 100644 --- a/pkgs/games/dxx-rebirth/default.nix +++ b/pkgs/games/dxx-rebirth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, scons, pkgconfig +{ gcc6Stdenv, fetchurl, fetchpatch, scons, pkgconfig , SDL, SDL_mixer, libGLU_combined, physfs }: @@ -8,7 +8,7 @@ let sha256 = "05mz77vml396mff43dbs50524rlm4fyds6widypagfbh5hc55qdc"; }; -in stdenv.mkDerivation rec { +in gcc6Stdenv.mkDerivation rec { pname = "dxx-rebirth"; version = "0.59.100"; @@ -44,9 +44,9 @@ in stdenv.mkDerivation rec { install -Dm644 -t $out/share/doc/dxx-rebirth *.txt ''; - meta = with stdenv.lib; { + meta = with gcc6Stdenv.lib; { description = "Source Port of the Descent 1 and 2 engines"; - homepage = https://www.dxx-rebirth.com/; + homepage = "https://www.dxx-rebirth.com/"; license = licenses.free; maintainers = with maintainers; [ peterhoeg ]; platforms = with platforms; linux; From a5771ef41a199c76b9783b9965bd059570794be1 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 23 Sep 2019 13:46:50 -0400 Subject: [PATCH 077/102] =?UTF-8?q?gmp:=20don=E2=80=99t=20disable=20assemb?= =?UTF-8?q?ly=20on=20x86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit this should always work, even on android / iOS toolchains (cherry picked from commit 699fae259deb8ee121fc9e539e71285d60666126) --- pkgs/development/libraries/gmp/6.x.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix index de31128e5a67..d9ea5a71dd30 100644 --- a/pkgs/development/libraries/gmp/6.x.nix +++ b/pkgs/development/libraries/gmp/6.x.nix @@ -37,7 +37,7 @@ let self = stdenv.mkDerivation rec { "--build=${stdenv.buildPlatform.config}" ] ++ optional (cxx && stdenv.isDarwin) "CPPFLAGS=-fexceptions" ++ optional (stdenv.isDarwin && stdenv.is64bit) "ABI=64" - ++ optional (with stdenv.hostPlatform; useAndroidPrebuilt || useiOSPrebuilt) "--disable-assembly" + ++ optional (with stdenv.hostPlatform; (useAndroidPrebuilt || useiOSPrebuilt) && !isx86) "--disable-assembly" ; doCheck = true; # not cross; From d79521cd3e52e9d7cbb5bc97b7bb7454eda44448 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 23 Sep 2019 13:40:45 -0400 Subject: [PATCH 078/102] androidndk: get correct libs for x86_64 (cherry picked from commit f089afe96539f90c24cdba9005e689d410a24e93) --- pkgs/development/androidndk-pkgs/androidndk-pkgs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix index 02aa6567c1a9..6bcfcfc30235 100644 --- a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix +++ b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix @@ -103,6 +103,6 @@ rec { cp -r ${buildAndroidndk}/libexec/android-sdk/ndk-bundle/sysroot/usr/include $out/include chmod +w $out/include cp -r ${buildAndroidndk}/libexec/android-sdk/ndk-bundle/sysroot/usr/include/${targetInfo.triple}/* $out/include - ln -s ${buildAndroidndk}/libexec/android-sdk/ndk-bundle/platforms/android-${stdenv.hostPlatform.sdkVer}/arch-${hostInfo.arch}/usr/lib $out/lib + ln -s ${buildAndroidndk}/libexec/android-sdk/ndk-bundle/platforms/android-${stdenv.hostPlatform.sdkVer}/arch-${hostInfo.arch}/usr/${if hostInfo.arch == "x86_64" then "lib64" else "lib"} $out/lib ''; } From 5d92232ed6bc8cd9d8c95f1d7b82a516c06aa865 Mon Sep 17 00:00:00 2001 From: Ambroz Bizjak Date: Mon, 23 Sep 2019 18:06:15 +0200 Subject: [PATCH 079/102] virtualboxGuestAdditions: Fix clipboard integration. VBoxClient needs a RUNPATH entry to dlopen libXfixes successfully. Fixes https://github.com/NixOS/nixpkgs/issues/65542 (cherry picked from commit 7dcef37ef8e1551abbcfe4e926c38aa9cb91b6f3) --- .../virtualbox/guest-additions/default.nix | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index ad860b07bdf6..08b6fa63e84c 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -12,9 +12,16 @@ let # It's likely to work again in some future update. xserverABI = let abi = xserverVListFunc 0 + xserverVListFunc 1; in if abi == "119" || abi == "120" then "118" else abi; -in -stdenv.mkDerivation { + # Specifies how to patch binaries to make sure that libraries loaded using + # dlopen are found. We grep binaries for specific library names and patch + # RUNPATH in matching binaries to contain the needed library paths. + dlopenLibs = [ + { name = "libdbus-1.so"; pkg = dbus; } + { name = "libXfixes.so"; pkg = xorg.libXfixes; } + ]; + +in stdenv.mkDerivation { name = "VirtualBox-GuestAdditions-${version}-${kernel.version}"; src = fetchurl { @@ -134,13 +141,13 @@ stdenv.mkDerivation { # Stripping breaks these binaries for some reason. dontStrip = true; - # Some code dlopen() libdbus, patch RUNPATH in fixupPhase so it isn't stripped. - postFixup = '' - for i in $(grep -F libdbus-1.so -l -r $out/{lib,bin}); do + # Patch RUNPATH according to dlopenLibs (see the comment there). + postFixup = lib.concatMapStrings (library: '' + for i in $(grep -F ${lib.escapeShellArg library.name} -l -r $out/{lib,bin}); do origRpath=$(patchelf --print-rpath "$i") - patchelf --set-rpath "$origRpath:${lib.makeLibraryPath [ dbus ]}" "$i" + patchelf --set-rpath "$origRpath:${lib.makeLibraryPath [ library.pkg ]}" "$i" done - ''; + '') dlopenLibs; meta = { description = "Guest additions for VirtualBox"; From 5205e5f1d2aface55ae9f784b677844ae8a26ce9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Vask=C3=B3?= Date: Wed, 25 Sep 2019 08:51:46 +0200 Subject: [PATCH 080/102] IPMIView: fix indentation (cherry picked from commit 96b2c4c3951d7c7d89148cb13f4a6bfcf304cdd9) --- pkgs/applications/misc/ipmiview/default.nix | 42 ++++++++++----------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/pkgs/applications/misc/ipmiview/default.nix b/pkgs/applications/misc/ipmiview/default.nix index 64e0f0d325b5..991a706cc6aa 100644 --- a/pkgs/applications/misc/ipmiview/default.nix +++ b/pkgs/applications/misc/ipmiview/default.nix @@ -1,33 +1,33 @@ { stdenv, fetchurl, patchelf, makeWrapper, xorg, gcc, gcc-unwrapped }: stdenv.mkDerivation rec { - pname = "IPMIView"; - version = "2.14.0"; - buildVersion = "180213"; + pname = "IPMIView"; + version = "2.14.0"; + buildVersion = "180213"; - src = fetchurl { + src = fetchurl { url = "ftp://ftp.supermicro.com/utility/IPMIView/Linux/IPMIView_${version}_build.${buildVersion}_bundleJRE_Linux_x64.tar.gz"; sha256 = "1wp22wm7smlsb25x0cck4p660cycfczxj381930crd1qrf68mw4h"; }; - nativeBuildInputs = [ patchelf makeWrapper ]; + nativeBuildInputs = [ patchelf makeWrapper ]; - buildPhase = with xorg; '' - patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ libX11 libXext libXrender libXtst libXi ]}" ./jre/lib/amd64/xawt/libmawt.so - patchelf --set-rpath "${gcc-unwrapped.lib}/lib" ./libiKVM64.so - patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ libXcursor libX11 libXext libXrender libXtst libXi ]}" --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./jre/bin/javaws - patchelf --set-rpath "${gcc.cc}/lib:$out/jre/lib/amd64/jli" --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./jre/bin/java - ''; + buildPhase = with xorg; '' + patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ libX11 libXext libXrender libXtst libXi ]}" ./jre/lib/amd64/xawt/libmawt.so + patchelf --set-rpath "${gcc-unwrapped.lib}/lib" ./libiKVM64.so + patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ libXcursor libX11 libXext libXrender libXtst libXi ]}" --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./jre/bin/javaws + patchelf --set-rpath "${gcc.cc}/lib:$out/jre/lib/amd64/jli" --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./jre/bin/java + ''; - installPhase = '' - mkdir -p $out/bin - cp -R . $out/ - makeWrapper $out/jre/bin/java $out/bin/IPMIView \ - --prefix PATH : "$out/jre/bin" \ - --add-flags "-jar $out/IPMIView20.jar" - ''; + installPhase = '' + mkdir -p $out/bin + cp -R . $out/ + makeWrapper $out/jre/bin/java $out/bin/IPMIView \ + --prefix PATH : "$out/jre/bin" \ + --add-flags "-jar $out/IPMIView20.jar" + ''; - meta = with stdenv.lib; { + meta = with stdenv.lib; { license = licenses.unfree; - }; - } + }; +} From 784940ad438be1617880d463eeb7a35cbbbd637b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Vask=C3=B3?= Date: Wed, 25 Sep 2019 09:07:49 +0200 Subject: [PATCH 081/102] IPMIView: 2.14.0 --> 2.16.0 Notes: * Previous URL is no longer accesible * build has to be adjusted for the updated JRE bundle (cherry picked from commit 13cd9e1bf3fd12458d201f7908898b3ee7c5bb20) --- pkgs/applications/misc/ipmiview/default.nix | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/misc/ipmiview/default.nix b/pkgs/applications/misc/ipmiview/default.nix index 991a706cc6aa..17b552a141bf 100644 --- a/pkgs/applications/misc/ipmiview/default.nix +++ b/pkgs/applications/misc/ipmiview/default.nix @@ -1,33 +1,37 @@ -{ stdenv, fetchurl, patchelf, makeWrapper, xorg, gcc, gcc-unwrapped }: +{ stdenv, fetchurl, patchelf, makeWrapper, xorg, fontconfig, freetype, gcc, gcc-unwrapped }: stdenv.mkDerivation rec { pname = "IPMIView"; - version = "2.14.0"; - buildVersion = "180213"; + version = "2.16.0"; + buildVersion = "190815"; src = fetchurl { - url = "ftp://ftp.supermicro.com/utility/IPMIView/Linux/IPMIView_${version}_build.${buildVersion}_bundleJRE_Linux_x64.tar.gz"; - sha256 = "1wp22wm7smlsb25x0cck4p660cycfczxj381930crd1qrf68mw4h"; + url = "https://www.supermicro.com/wftp/utility/IPMIView/Linux/IPMIView_${version}_build.${buildVersion}_bundleJRE_Linux_x64.tar.gz"; + sha256 = "0qw9zfnj0cyvab7ndamlw2y0gpczjhh1jkz8340kl42r2xmhkvpl"; }; nativeBuildInputs = [ patchelf makeWrapper ]; buildPhase = with xorg; '' - patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ libX11 libXext libXrender libXtst libXi ]}" ./jre/lib/amd64/xawt/libmawt.so + patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ libX11 libXext libXrender libXtst libXi ]}" ./jre/lib/amd64/libawt_xawt.so + patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ freetype ]}" ./jre/lib/amd64/libfontmanager.so patchelf --set-rpath "${gcc-unwrapped.lib}/lib" ./libiKVM64.so - patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ libXcursor libX11 libXext libXrender libXtst libXi ]}" --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./jre/bin/javaws patchelf --set-rpath "${gcc.cc}/lib:$out/jre/lib/amd64/jli" --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./jre/bin/java ''; installPhase = '' mkdir -p $out/bin cp -R . $out/ + + # LD_LIBRARY_PATH: fontconfig is used from java code makeWrapper $out/jre/bin/java $out/bin/IPMIView \ + --set LD_LIBRARY_PATH "${stdenv.lib.makeLibraryPath [ fontconfig ]}" \ --prefix PATH : "$out/jre/bin" \ - --add-flags "-jar $out/IPMIView20.jar" + --add-flags "-jar $out/IPMIView20.jar" \ ''; meta = with stdenv.lib; { license = licenses.unfree; + maintainers = with maintainers; [ vlaci ]; }; } From 9a94674fd2d68f16fea6cb2bcba2323940a2d4c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Vask=C3=B3?= Date: Wed, 25 Sep 2019 09:10:41 +0200 Subject: [PATCH 082/102] IPMIView: fix iKVM console This commit fixes #26650 The main problem was that the iKVM related libraries are always loaded from the current working directory. The bundled wrapper script makes sure to CD to the package root folder. This is a no-go in nix as the application writes its settings in the current working directory and the store is read-only. Workaround: create a directory in the users home, where the required binaries are symlinked and is writable for the current user. There was an additional issue that for some BMCs IPMIView relies on the bundled `stunnel` binary to wrap the iKVM traffic in a TLS tunnel. Therefore it has to be patched to make it executable and the `killall` command is needed on the PATH because it is used to terminate the `stunnel` process upon exit. (cherry picked from commit 15b847821191b5fe80c836cdf7146448603a8928) --- pkgs/applications/misc/ipmiview/default.nix | 32 ++++++++++++++++++--- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/ipmiview/default.nix b/pkgs/applications/misc/ipmiview/default.nix index 17b552a141bf..774b84947da1 100644 --- a/pkgs/applications/misc/ipmiview/default.nix +++ b/pkgs/applications/misc/ipmiview/default.nix @@ -1,4 +1,14 @@ -{ stdenv, fetchurl, patchelf, makeWrapper, xorg, fontconfig, freetype, gcc, gcc-unwrapped }: +{ stdenv +, fetchurl +, makeWrapper +, patchelf +, fontconfig +, freetype +, gcc +, gcc-unwrapped +, iputils +, psmisc +, xorg }: stdenv.mkDerivation rec { pname = "IPMIView"; @@ -11,12 +21,18 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ patchelf makeWrapper ]; - - buildPhase = with xorg; '' + buildPhase = with xorg; + let + stunnelBinary = if stdenv.hostPlatform.system == "x86_64-linux" then "linux/stunnel64" + else if stdenv.hostPlatform.system == "i686-linux" then "linux/stunnel32" + else throw "IPMIView is not supported on this platform"; + in + '' patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ libX11 libXext libXrender libXtst libXi ]}" ./jre/lib/amd64/libawt_xawt.so patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ freetype ]}" ./jre/lib/amd64/libfontmanager.so patchelf --set-rpath "${gcc-unwrapped.lib}/lib" ./libiKVM64.so patchelf --set-rpath "${gcc.cc}/lib:$out/jre/lib/amd64/jli" --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./jre/bin/java + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./BMCSecurity/${stunnelBinary} ''; installPhase = '' @@ -24,14 +40,22 @@ stdenv.mkDerivation rec { cp -R . $out/ # LD_LIBRARY_PATH: fontconfig is used from java code + # PATH: iputils is used for ping, and psmisc is for killall + # WORK_DIR: unfortunately the ikvm related binaries are loaded from + # and user configuration is written to files in the CWD makeWrapper $out/jre/bin/java $out/bin/IPMIView \ --set LD_LIBRARY_PATH "${stdenv.lib.makeLibraryPath [ fontconfig ]}" \ - --prefix PATH : "$out/jre/bin" \ + --prefix PATH : "$out/jre/bin:${iputils}/bin:${psmisc}/bin" \ --add-flags "-jar $out/IPMIView20.jar" \ + --run 'WORK_DIR=''${XDG_DATA_HOME:-~/.local/share}/ipmiview + mkdir -p $WORK_DIR + ln -snf '$out'/iKVM.jar '$out'/libiKVM* '$out'/libSharedLibrary* $WORK_DIR + cd $WORK_DIR' ''; meta = with stdenv.lib; { license = licenses.unfree; maintainers = with maintainers; [ vlaci ]; + platforms = [ "x86_64-linux" "i686-linux" ]; }; } From b133bff35eb327139792c8fb712b0667686372ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Vask=C3=B3?= Date: Wed, 25 Sep 2019 09:59:02 +0200 Subject: [PATCH 083/102] IPMIView: create desktop file (cherry picked from commit 3848206bd22fc2e5ba1aa04389ae0517dfacb80c) --- pkgs/applications/misc/ipmiview/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/applications/misc/ipmiview/default.nix b/pkgs/applications/misc/ipmiview/default.nix index 774b84947da1..e46df5d59e0e 100644 --- a/pkgs/applications/misc/ipmiview/default.nix +++ b/pkgs/applications/misc/ipmiview/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchurl +, makeDesktopItem , makeWrapper , patchelf , fontconfig @@ -35,10 +36,20 @@ stdenv.mkDerivation rec { patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./BMCSecurity/${stunnelBinary} ''; + desktopItem = makeDesktopItem rec { + name = "IPMIView"; + exec = "IPMIView"; + desktopName = name; + genericName = "Supermicro BMC manager"; + categories = "Network;Configuration"; + }; + installPhase = '' mkdir -p $out/bin cp -R . $out/ + ln -s ${desktopItem}/share $out/share + # LD_LIBRARY_PATH: fontconfig is used from java code # PATH: iputils is used for ping, and psmisc is for killall # WORK_DIR: unfortunately the ikvm related binaries are loaded from From f3739e610329965fd85e93925712f7486bcf18da Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 25 Sep 2019 11:25:47 +0200 Subject: [PATCH 084/102] paulstretch: fix build (cherry picked from commit fb6595eafdb90ef0bc7a31c2bfc9204e4cad11d9) --- pkgs/applications/audio/paulstretch/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/paulstretch/default.nix b/pkgs/applications/audio/paulstretch/default.nix index b2c049c9eeeb..b9a3f39affb1 100644 --- a/pkgs/applications/audio/paulstretch/default.nix +++ b/pkgs/applications/audio/paulstretch/default.nix @@ -1,5 +1,7 @@ -{ stdenv, fetchFromGitHub, audiofile, libvorbis, fltk, fftw, fftwFloat, -minixml, pkgconfig, libmad, libjack2, portaudio, libsamplerate }: +{ stdenv, fetchFromGitHub, fetchpatch +, audiofile, libvorbis, fltk, fftw, fftwFloat +, minixml, pkgconfig, libmad, libjack2, portaudio, libsamplerate +}: stdenv.mkDerivation { pname = "paulstretch"; @@ -27,6 +29,13 @@ stdenv.mkDerivation { libsamplerate ]; + patches = [ + (fetchpatch { + url = "https://github.com/paulnasca/paulstretch_cpp/pull/12.patch"; + sha256 = "0lx1rfrs53afkiz1drp456asqgj5yv6hx3lkc01165cv1jsbw6q4"; + }) + ]; + buildPhase = '' bash compile_linux_fftw_jack.sh ''; From 46cbfeaaa76261fe72380ba892f9ff4e281774e6 Mon Sep 17 00:00:00 2001 From: Daniel Schaefer Date: Sat, 14 Sep 2019 16:33:29 +0200 Subject: [PATCH 085/102] pythonPackages.pycountry: 19.7.15 -> 19.8.18 (cherry picked from commit f2b28387d0f93bedbc2d7141c9649916c58fe690) --- pkgs/development/python-modules/pycountry/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pycountry/default.nix b/pkgs/development/python-modules/pycountry/default.nix index 99ba6845fa08..aec477d36a0d 100644 --- a/pkgs/development/python-modules/pycountry/default.nix +++ b/pkgs/development/python-modules/pycountry/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pycountry"; - version = "19.7.15"; + version = "19.8.18"; src = fetchPypi { inherit pname version; - sha256 = "15lhv18za0zv36laksr86rszjhp0slmqzcylm6ds9vpd7gyqprb8"; + sha256 = "1jxkdjffrhn0il0nm14dlzxpd6f3v1hbxzxsprcksafgmm0almrw"; }; meta = with stdenv.lib; { From c5d408bb85abb2523ea85e07b4a43e03a6455c75 Mon Sep 17 00:00:00 2001 From: Daniel Schaefer Date: Sat, 14 Sep 2019 16:35:19 +0200 Subject: [PATCH 086/102] pythonPackages.cairosvg: 2.3.0 -> 2.4.2 (cherry picked from commit a73937384e8c8dfcdbeae8691c34dae353e1df88) --- .../development/python-modules/cairosvg/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/cairosvg/default.nix b/pkgs/development/python-modules/cairosvg/default.nix index beee82950496..77c5c21befee 100644 --- a/pkgs/development/python-modules/cairosvg/default.nix +++ b/pkgs/development/python-modules/cairosvg/default.nix @@ -4,24 +4,15 @@ buildPythonPackage rec { pname = "CairoSVG"; - version = "2.3.0"; + version = "2.4.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "66f333ef5dc79fdfbd3bbe98adc791b1f854e0461067d202fa7b15de66d517ec"; + sha256 = "1bb7irxbaxxb9ahm3z5wsx1q96mm5gzskc7b6q07h9ikcnb8yrjf"; }; - patches = [ - # fix isort-check - (fetchpatch { - url = https://github.com/Kozea/CairoSVG/commit/b2534b0fc80b9f24a2bff2c938ac5da73ff1e478.patch; - excludes = [ "test_non_regression/__init__.py" ]; - sha256 = "1bms75dd0fd978yhlr0k565zq45lzxf0vkihryb7gcwnd42bl6yf"; - }) - ]; - propagatedBuildInputs = [ cairocffi cssselect2 defusedxml pillow tinycss2 ]; checkInputs = [ pytest pytestrunner pytestcov pytest-flake8 pytest-isort ]; From c10e6c8f661348413fbe1085e321e2b58347858d Mon Sep 17 00:00:00 2001 From: Daniel Schaefer Date: Sat, 14 Sep 2019 16:36:06 +0200 Subject: [PATCH 087/102] pythonPackages.dict2xml: init at 1.6.1 (cherry picked from commit d769048286c6cf0d4f00eb18f09aba8790750b89) --- .../python-modules/dict2xml/default.nix | 20 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/python-modules/dict2xml/default.nix diff --git a/pkgs/development/python-modules/dict2xml/default.nix b/pkgs/development/python-modules/dict2xml/default.nix new file mode 100644 index 000000000000..88cbee2649da --- /dev/null +++ b/pkgs/development/python-modules/dict2xml/default.nix @@ -0,0 +1,20 @@ +{ lib, fetchPypi, buildPythonPackage, six }: + +buildPythonPackage rec { + pname = "dict2xml"; + version = "1.6.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "17wsybqq0916i1yh7bpf2cmicldn7d0y2b9mzlgs503fkcpxda5w"; + }; + + propagatedBuildInputs = [ six ]; + + meta = with lib; { + description = "Super simple library to convert a Python dictionary into an xml string"; + homepage = "https://github.com/delfick/python-dict2xml"; + license = licenses.mit; + maintainers = with maintainers; [ johnazoidberg ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0b4bba984814..ce2126071da5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5707,6 +5707,8 @@ in { basemap = callPackage ../development/python-modules/basemap { }; + dict2xml = callPackage ../development/python-modules/dict2xml { }; + dicttoxml = callPackage ../development/python-modules/dicttoxml { }; markdown2 = callPackage ../development/python-modules/markdown2 { }; From 1851ab8c44498cf08760e29cc6505e60bd3dffbe Mon Sep 17 00:00:00 2001 From: Daniel Schaefer Date: Sat, 14 Sep 2019 17:07:30 +0200 Subject: [PATCH 088/102] pythonPackages.xml2rfc: 2.18.0 -> 2.27.1 (cherry picked from commit bf050e94562e75046892f4f86d624bfc7e60649e) --- pkgs/development/python-modules/xml2rfc/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix index f737cf344b88..63bb594cd43b 100644 --- a/pkgs/development/python-modules/xml2rfc/default.nix +++ b/pkgs/development/python-modules/xml2rfc/default.nix @@ -1,15 +1,15 @@ { lib, fetchPypi, buildPythonPackage, intervaltree, pyflakes, requests, lxml, google-i18n-address -, pycountry, html5lib, six +, pycountry, html5lib, six, kitchen, pypdf2, dict2xml, weasyprint , stdenv }: buildPythonPackage rec { pname = "xml2rfc"; - version = "2.18.0"; + version = "2.27.1"; src = fetchPypi { inherit pname version; - sha256 = "e192236798615f34479a9bb9f30df72ce0e5f319df75ecc0473d896713a17451"; + sha256 = "00v5gsshy1rmjd334d2awh0mvri949lmyk8f02wfr20rq6fc3xqd"; }; propagatedBuildInputs = [ @@ -21,13 +21,18 @@ buildPythonPackage rec { pycountry html5lib six + kitchen + pypdf2 + dict2xml + weasyprint ]; preCheck = '' export HOME=$(mktemp -d) ''; - doCheck = !stdenv.isDarwin; + # lxml tries to fetch from the internet + doCheck = false; meta = with lib; { description = "Tool generating IETF RFCs and drafts from XML sources"; From 12c51ea2a4e90e563860ab6a1a9050b1822922c0 Mon Sep 17 00:00:00 2001 From: Daniel Schaefer Date: Sat, 14 Sep 2019 17:07:49 +0200 Subject: [PATCH 089/102] xml2rfc: Use pythonPackages.xml2rfc (cherry picked from commit 8fd8f3a44a3121cf67f55afebcd67452d9ebc7c4) --- .../python-modules/xml2rfc/default.nix | 2 +- pkgs/tools/typesetting/xml2rfc/default.nix | 24 ------------------- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 2 insertions(+), 26 deletions(-) delete mode 100644 pkgs/tools/typesetting/xml2rfc/default.nix diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix index 63bb594cd43b..1a854845cc42 100644 --- a/pkgs/development/python-modules/xml2rfc/default.nix +++ b/pkgs/development/python-modules/xml2rfc/default.nix @@ -40,6 +40,6 @@ buildPythonPackage rec { # Well, parts might be considered unfree, if being strict; see: # http://metadata.ftp-master.debian.org/changelogs/non-free/x/xml2rfc/xml2rfc_2.9.6-1_copyright license = licenses.bsd3; - maintainers = [ maintainers.vcunat ]; + maintainers = with maintainers; [ vcunat yrashk ]; }; } diff --git a/pkgs/tools/typesetting/xml2rfc/default.nix b/pkgs/tools/typesetting/xml2rfc/default.nix deleted file mode 100644 index 7fe0396ae440..000000000000 --- a/pkgs/tools/typesetting/xml2rfc/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ python, stdenv }: - -with python.pkgs; - -buildPythonPackage rec { - pname = "xml2rfc"; - version = "2.9.8"; - - buildInputs = [ intervaltree lxml requests pyflakes ]; - propagatedBuildInputs = [ intervaltree lxml requests six ]; - - src = fetchPypi { - inherit pname version; - sha256 = "b50ce2f98bc431cadbcef0523213497049b78c2829ee81c399976f1e4832afc6"; - }; - - meta = with stdenv.lib; { - homepage = "https://xml2rfc.tools.ietf.org/"; - license = licenses.bsdOriginal; - description = "Xml2rfc generates RFCs and IETF drafts from document source in XML according to the dtd in RFC2629."; - maintainers = [ maintainers.yrashk ]; - }; - -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d2cd20c0e047..82412c1e450c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24706,7 +24706,7 @@ in diceware = callPackage ../tools/security/diceware { }; - xml2rfc = callPackage ../tools/typesetting/xml2rfc { }; + xml2rfc = with python3Packages; toPythonApplication xml2rfc; mmark = callPackage ../tools/typesetting/mmark { }; From 7c267b5c7b9837ec2981d5ce60ba4fae1f71960b Mon Sep 17 00:00:00 2001 From: Daniel Schaefer Date: Sat, 14 Sep 2019 17:50:00 +0200 Subject: [PATCH 090/102] pythonPackages.qiskit: Mark as broken (cherry picked from commit 5c65c2e329690ac8304f7426903e2f96691c8c1b) --- pkgs/development/python-modules/qiskit/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/qiskit/default.nix b/pkgs/development/python-modules/qiskit/default.nix index bb92fc9df9ac..285f50e3cb32 100644 --- a/pkgs/development/python-modules/qiskit/default.nix +++ b/pkgs/development/python-modules/qiskit/default.nix @@ -59,5 +59,7 @@ buildPythonPackage rec { maintainers = with stdenv.lib.maintainers; [ pandaman ]; + # Needs to be updated and have its new dependencies added + broken = true; }; } From 9d1d9016b64500a13ba6076b4ea8f4d3759f2217 Mon Sep 17 00:00:00 2001 From: Daniel Schaefer Date: Wed, 25 Sep 2019 09:08:06 +0200 Subject: [PATCH 091/102] pythonPackages.weasyprint: 47 -> 50 (cherry picked from commit cedb0ecf4da85ac6d3d084d344dcc5b87f4d1548) --- .../python-modules/weasyprint/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/weasyprint/default.nix b/pkgs/development/python-modules/weasyprint/default.nix index 7dc09d58aad6..bac3e9b77b54 100644 --- a/pkgs/development/python-modules/weasyprint/default.nix +++ b/pkgs/development/python-modules/weasyprint/default.nix @@ -23,11 +23,15 @@ buildPythonPackage rec { pname = "weasyprint"; - version = "47"; + version = "50"; disabled = !isPy3k; - # ignore failing pytest - checkPhase = "pytest -k 'not test_font_stretch'"; + # ignore failing test cases + checkPhase = '' + runHook preCheck + pytest -k 'not test_table_vertical_align and not test_text_overflow_ellipsis and not test_text_overflow_clip' + runHook postCheck + ''; # ignore failing flake8-test prePatch = '' @@ -55,7 +59,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "WeasyPrint"; - sha256 = "0hd1zwrkfnj7g0jaaf6jvarlj6l5imar6ar78zxdgv17a3s3k3dg"; + sha256 = "0invs96zvmcr6wh5klj52jrcnr9qg150v9wpmbhcsf3vv1d1hbcw"; }; meta = with stdenv.lib; { From 64c655127139d5d0ba7a9d2397561ade20296ddc Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 25 Sep 2019 11:44:09 +0200 Subject: [PATCH 092/102] pythonPackages.weasyprint: disable test Needs an extra font for that test (cherry picked from commit 6d71209af30e6cde6d31a7539e44daa8397b96b9) --- pkgs/development/python-modules/weasyprint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/weasyprint/default.nix b/pkgs/development/python-modules/weasyprint/default.nix index bac3e9b77b54..f112d6f15557 100644 --- a/pkgs/development/python-modules/weasyprint/default.nix +++ b/pkgs/development/python-modules/weasyprint/default.nix @@ -26,10 +26,10 @@ buildPythonPackage rec { version = "50"; disabled = !isPy3k; - # ignore failing test cases + # excluded test needs the Ahem font checkPhase = '' runHook preCheck - pytest -k 'not test_table_vertical_align and not test_text_overflow_ellipsis and not test_text_overflow_clip' + pytest -k 'not test_font_stretch' runHook postCheck ''; From 3c3a377e7fd8a8bca3f6414c99c23591c1e61865 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= Date: Tue, 24 Sep 2019 15:25:43 +0200 Subject: [PATCH 093/102] tamarin-prover: mark as broken because upstream is broken (cherry picked from commit 815d940e524624ec78651617b928ba58eecd6699) --- pkgs/applications/science/logic/tamarin-prover/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/science/logic/tamarin-prover/default.nix b/pkgs/applications/science/logic/tamarin-prover/default.nix index 40378f8c04d5..9b87b8c899e5 100644 --- a/pkgs/applications/science/logic/tamarin-prover/default.nix +++ b/pkgs/applications/science/logic/tamarin-prover/default.nix @@ -104,4 +104,6 @@ mkDerivation (common "tamarin-prover" src // { tamarin-prover-term tamarin-prover-theory ]; + + broken = true; }) From bb46e0f2c6bec2db8a2128d6eb1f602f0d4c42ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= Date: Tue, 24 Sep 2019 17:01:21 +0200 Subject: [PATCH 094/102] idrisPackages.heyting-algebra: mark as broken The functionality provided by this package has been added to the Idris contrib library (module `Interfaces.Verified`). Therefore identifiers cannot be disambiguated anymore. (cherry picked from commit 7df8575a723abaac022fa6bbd77aba66b96631f6) --- pkgs/development/idris-modules/heyting-algebra.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/idris-modules/heyting-algebra.nix b/pkgs/development/idris-modules/heyting-algebra.nix index 3fa546466c8a..e6656545cbe9 100644 --- a/pkgs/development/idris-modules/heyting-algebra.nix +++ b/pkgs/development/idris-modules/heyting-algebra.nix @@ -22,4 +22,6 @@ build-idris-package { license = lib.licenses.mit; maintainers = [ lib.maintainers.brainrape ]; }; + + broken = true; } From 8d3c8b9aef16f0c983ba1a7d6767daab0eb704fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= Date: Tue, 24 Sep 2019 19:49:25 +0200 Subject: [PATCH 095/102] idrisPackages.heyting-algebra: remove (cherry picked from commit 8eb0413c05df225fa697d3d413bfa25158d753ce) --- pkgs/development/idris-modules/default.nix | 2 -- .../idris-modules/heyting-algebra.nix | 27 ------------------- 2 files changed, 29 deletions(-) delete mode 100644 pkgs/development/idris-modules/heyting-algebra.nix diff --git a/pkgs/development/idris-modules/default.nix b/pkgs/development/idris-modules/default.nix index 47c6998a587d..074a260b8169 100644 --- a/pkgs/development/idris-modules/default.nix +++ b/pkgs/development/idris-modules/default.nix @@ -103,8 +103,6 @@ html = callPackage ./html.nix {}; - heyting-algebra = callPackage ./heyting-algebra.nix {}; - hezarfen = callPackage ./hezarfen.nix {}; hrtime = callPackage ./hrtime.nix {}; diff --git a/pkgs/development/idris-modules/heyting-algebra.nix b/pkgs/development/idris-modules/heyting-algebra.nix deleted file mode 100644 index e6656545cbe9..000000000000 --- a/pkgs/development/idris-modules/heyting-algebra.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ build-idris-package -, fetchFromGitHub -, contrib -, lib -}: -build-idris-package { - name = "heyting-algebra"; - version = "2017-08-18"; - - idrisDeps = [ contrib ]; - - src = fetchFromGitHub { - owner = "Risto-Stevcev"; - repo = "idris-heyting-algebra"; - rev = "2c814c48246a5e19bff66e64a753208c7d59d397"; - sha256 = "199cvhxiimlhchvsc66zwn0dls78f9lamam256ad65mv4cjmxv40"; - }; - - meta = { - description = "Interfaces for heyting algebras and verified bounded join and meet semilattices"; - homepage = https://github.com/Risto-Stevcev/idris-heyting-algebra; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.brainrape ]; - }; - - broken = true; -} From 3c1a25f1c7240a20e7492171d6215d0a3a27052e Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 25 Sep 2019 16:45:54 +0200 Subject: [PATCH 096/102] linuxPackages.jool: 4.0.0 -> 4.0.5 (cherry picked from commit 0fe41d4a87a3e4f60053bd8798e7d89cdae364d2) --- pkgs/os-specific/linux/jool/source.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/jool/source.nix b/pkgs/os-specific/linux/jool/source.nix index 0dd0eeed616f..9e8de46edba7 100644 --- a/pkgs/os-specific/linux/jool/source.nix +++ b/pkgs/os-specific/linux/jool/source.nix @@ -1,11 +1,11 @@ { fetchFromGitHub }: rec { - version = "4.0.0"; + version = "4.0.5"; src = fetchFromGitHub { owner = "NICMx"; repo = "Jool"; rev = "v${version}"; - sha256 = "1ivnx7ijqf41kxmi2bmsf9qfcv6b1rvag35754ddlndry3sgvimr"; + sha256 = "0zfda8mbcg4mgg39shxdx5n2bq6zi9w3v8bcx03b3dp09lmq45y3"; }; } From d8c1b4e8f2f6a2097b2f83f2a4bc673be3b4787a Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 25 Sep 2019 17:09:26 +0200 Subject: [PATCH 097/102] linuxPackages.r8168: 8.046.00 -> 8.047.00 (cherry picked from commit d4212d66a8c793413bdb317a3af5f70f10c1f60c) --- pkgs/os-specific/linux/r8168/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/r8168/default.nix b/pkgs/os-specific/linux/r8168/default.nix index f2c87b97c4ff..b3d8965704fd 100644 --- a/pkgs/os-specific/linux/r8168/default.nix +++ b/pkgs/os-specific/linux/r8168/default.nix @@ -6,7 +6,7 @@ let modDestDir = "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/wi in stdenv.mkDerivation rec { name = "r8168-${kernel.version}-${version}"; # on update please verify that the source matches the realtek version - version = "8.046.00"; + version = "8.047.04"; # This is a mirror. The original website[1] doesn't allow non-interactive # downloads, instead emailing you a download link. @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { owner = "mtorromeo"; repo = "r8168"; rev = version; - sha256 = "0y8w3biw5mshn5bvl24b9rybfh67f1s9gfzkcv9p4m7s7nchj2dg"; + sha256 = "1rni8jimwdhyx75603mdcylrdxgfwfpyprf1lf5x5cli2i4bbijg"; }; hardeningDisable = [ "pic" ]; From f4ee84dfeb7c46010b55d2f1f45092c6b856abc6 Mon Sep 17 00:00:00 2001 From: Max Wittig Date: Wed, 25 Sep 2019 15:53:55 +0200 Subject: [PATCH 098/102] gitlab-runner: 12.2.0 -> 12.3.0 (cherry picked from commit 92d5acb41ae7508b4af822952cfb424c32c6bca0) --- .../continuous-integration/gitlab-runner/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index d8b18fcd121e..fbb7461bbc7e 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl }: let - version = "12.2.0"; + version = "12.3.0"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz"; - sha256 = "0r0jy571dxcspsl0q31wyw4017rfq7i4rxsgf83jqdjqaigas8dk"; + sha256 = "11xbz24811vi3l1dwhyqv3mypawrky85qjsg6aaigfv8zj9l2xmi"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz"; - sha256 = "1pbzyfvfgwp9r67a148nr4gh2p9lrmnn4hxap37abb5q5209pjir"; + sha256 = "04gfhlm32wrdq0s9blmfknpcnmr30vrnd7afib1lfbzbdl99g4sx"; }; in buildGoPackage rec { @@ -29,7 +29,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "0id0ivysn0396dwi357iig28d4xr2wd7q05r6ksgml8xyfijdgd3"; + sha256 = "155im9sybkldh0rx34j9fm3qg95dm5q3jcjjx635b7fwq1wyl7c7"; }; patches = [ ./fix-shell-path.patch ]; From 78d05675a4186c3b7b2de214f3c3b245ba0d2fa5 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 25 Sep 2019 22:07:41 +0200 Subject: [PATCH 099/102] prometheus-wireguard-exporter: 3.0.1 -> 3.1.0 Although this is a minor release, this only contains a single, but improtant bugfix: https://github.com/MindFlavor/prometheus_wireguard_exporter/releases/tag/3.1.0 (cherry picked from commit 99b12cfc0818892f74d2f7fe22b9f34b93014915) --- pkgs/servers/monitoring/prometheus/wireguard-exporter.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix index 80fe9b2357f4..9b0d91747ad1 100644 --- a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "wireguard-exporter"; - version = "3.0.1"; + version = "3.1.0"; src = fetchFromGitHub { owner = "MindFlavor"; repo = "prometheus_wireguard_exporter"; rev = version; - sha256 = "0wfv54ny557mjajjdf0lyq5sbf9m7y50ggm7s2v30c639i0swyrc"; + sha256 = "0hl82cg6cijk3xf35cgi4v14gmxk3fj4c3z1x5hrs2i0j1i26ilw"; }; - cargoSha256 = "06s9194lvwd7lynxnsrjfbjfj87ngvjbqjhx3idf7d1w9mgi4ysw"; + cargoSha256 = "1ndb33bi08j40b4jkj4q7d3k0cw5fscz2gc2cc3134nbs2r7jamk"; buildInputs = lib.optional stdenv.isDarwin Security; From 5c72219eb303621743ee8591f95bea6962769530 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 25 Sep 2019 22:47:51 -0400 Subject: [PATCH 100/102] xfce4-14.tumbler: manually wrap (cherry picked from commit 28a7e8fb753c82c579a6505053e2a683857c1a5c) --- pkgs/desktops/xfce4-14/tumbler/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/desktops/xfce4-14/tumbler/default.nix b/pkgs/desktops/xfce4-14/tumbler/default.nix index ecbc62d8ffbf..e99551bd8d26 100644 --- a/pkgs/desktops/xfce4-14/tumbler/default.nix +++ b/pkgs/desktops/xfce4-14/tumbler/default.nix @@ -27,4 +27,9 @@ mkXfceDerivation { libgsf poppler # technically the glib binding ]; + + # WrapGAppsHook won't touch this binary automatically, so we wrap manually. + postFixup = '' + wrapProgram $out/lib/tumbler-1/tumblerd "''${gappsWrapperArgs[@]}" + ''; } From 60493b43cbf4a90389d2d46a584240e4a050ccb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Tue, 24 Sep 2019 22:07:47 +0200 Subject: [PATCH 101/102] xdg-utils: add missing perl dependencies Or else `xdg-screensaver suspend ` fails with errors like: Can't locate Net/DBus.pm in @INC [...] This increases the closure of xdg-utils from 53 MiB to 119 MiB. (The issue was found when testing retroarch.) (cherry picked from commit e584eba7f8f2954dd53cca32e79634165f5333f3) --- pkgs/tools/X11/xdg-utils/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix index f1e6e28627c7..e5c4a47b110d 100644 --- a/pkgs/tools/X11/xdg-utils/default.nix +++ b/pkgs/tools/X11/xdg-utils/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchFromGitHub , file, libxslt, docbook_xml_dtd_412, docbook_xsl, xmlto -, w3m, gnugrep, gnused, coreutils, xset +, w3m, gnugrep, gnused, coreutils, xset, perlPackages , mimiSupport ? false, gawk ? null }: assert mimiSupport -> gawk != null; @@ -13,6 +13,11 @@ let rev = "8e0070f17bcd3612ee83cb84e663e7c7fabcca3d"; sha256 = "15gw2nyrqmdsdin8gzxihpn77grhk9l97jp7s7pr7sl4n9ya2rpj"; }; + + perlPath = with perlPackages; makePerlPath [ + NetDBus XMLTwig XMLParser X11Protocol + ]; + in stdenv.mkDerivation rec { @@ -39,6 +44,7 @@ stdenv.mkDerivation rec { awk() { ${gawk}/bin/awk "$@"; }\ sort() { ${coreutils}/bin/sort "$@"; }\ xset() { ${xset}/bin/xset "$@"; }\ + perl() { PERL5LIB=${perlPath} ${perlPackages.perl}/bin/perl "$@"; }\ &#' -i "$out"/bin/* substituteInPlace $out/bin/xdg-open \ From b30f86ffc6a5406ec1e78eb22d8c59b52fec896f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Tue, 24 Sep 2019 22:12:10 +0200 Subject: [PATCH 102/102] retroarch: 1.7.5 -> 1.7.8.4 Fixes missing GUI elements. (cherry picked from commit bf7a1d6afe7f4f50802748b7b8211a4006221e7a) --- pkgs/misc/emulators/retroarch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix index f26769cd28dd..3b55c44d173e 100644 --- a/pkgs/misc/emulators/retroarch/default.nix +++ b/pkgs/misc/emulators/retroarch/default.nix @@ -27,12 +27,12 @@ let in stdenv.mkDerivation rec { pname = "retroarch-bare"; - version = "1.7.5"; + version = "1.7.8.4"; src = fetchFromGitHub { owner = "libretro"; repo = "RetroArch"; - sha256 = "1jfpgl34jjxn3dvxd1kd564swkw7v98hnn562v998b7vllz3dxdm"; + sha256 = "1i3i23xwvmck8k2fpalr49np7xjzfg507243mybqrljawlnbxvph"; rev = "v${version}"; };