From 694c26b4db3110c00440a65deb22bdc187aa78b8 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Thu, 8 Jul 2021 21:19:57 +0200 Subject: [PATCH 01/14] dovecot_fts_xapian: 1.4.9 -> 1.4.11 --- pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix b/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix index a20068767e52..841ee7915a43 100644 --- a/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix +++ b/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config, dovecot, libtool, xapian, icu64 }: stdenv.mkDerivation rec { pname = "fts-xapian"; - version = "1.4.9"; + version = "1.4.11"; src = fetchFromGitHub { owner = "grosjo"; repo = "fts-xapian"; rev = version; - sha256 = "0p4ps9h24vr9bldrcf9cdx6l4rdz5i8zyc58qp10h7cc3jilwddy"; + sha256 = "sha256-HPmS2Z1PIEM9fc6EerCEigQJg5BK/115zOW2uxFqjP0="; }; buildInputs = [ dovecot xapian icu64 ]; From 1b89efa8104f3445353066e9da4bc8c24715b30a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 10 Jul 2021 11:10:50 +0000 Subject: [PATCH 02/14] charge-lnd: 0.1.3 -> 0.2.1 --- pkgs/applications/blockchains/charge-lnd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/charge-lnd/default.nix b/pkgs/applications/blockchains/charge-lnd/default.nix index a3341a25b144..cc0f801efd68 100644 --- a/pkgs/applications/blockchains/charge-lnd/default.nix +++ b/pkgs/applications/blockchains/charge-lnd/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "charge-lnd"; - version = "0.1.3"; + version = "0.2.1"; src = fetchFromGitHub { owner = "accumulator"; repo = pname; rev = "v${version}"; - sha256 = "0npn45qbbsbzj5qy9kwx662hml1y610ysmfl89sda02l6wf1sp3y"; + sha256 = "0l4h3fdvln03ycbg3xngh8vkhgrz4ad864yyn4gmdjp0ypi69qa1"; }; propagatedBuildInputs = with python3Packages; [ From 1ec09ca60a4a28e1006e69f7bd316e8317466943 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Fri, 9 Jul 2021 16:49:03 +0200 Subject: [PATCH 03/14] nodePackages: fix generate.sh failing on path with space When the path to the Nixpkgs repo contains a space, generate.sh would fail. This can be esily fixed by adding quotes around the variable containing the path. --- pkgs/development/node-packages/generate.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/node-packages/generate.sh b/pkgs/development/node-packages/generate.sh index e7a15d5d869c..b58c71a088c1 100755 --- a/pkgs/development/node-packages/generate.sh +++ b/pkgs/development/node-packages/generate.sh @@ -3,7 +3,7 @@ set -eu -o pipefail DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" node2nix=$(nix-build ../../.. -A nodePackages.node2nix) -cd ${DIR} +cd "$DIR" rm -f ./node-env.nix ${node2nix}/bin/node2nix -i node-packages.json -o node-packages.nix -c composition.nix # using --no-out-link in nix-build argument would cause the From 1325f2626df9a14384fdb0d5f7db5f9c3180e725 Mon Sep 17 00:00:00 2001 From: Alvar Penning Date: Sun, 11 Jul 2021 15:49:45 +0200 Subject: [PATCH 04/14] perlPackages.ImageExifTool: 12.16 -> 12.29 The latest versions are not available on the mirrors, thus the source URL was set to the project's official download link. The patch for CVE-2021-22204 was removed as the vulnerability was patched in version 12.24. --- pkgs/top-level/perl-packages.nix | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5ec39ab41f07..ff35e5231463 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10793,25 +10793,15 @@ let }; }; - ImageExifTool = buildPerlPackage { + ImageExifTool = buildPerlPackage rec { pname = "Image-ExifTool"; - version = "12.16"; + version = "12.29"; src = fetchurl { - url = "mirror://cpan/authors/id/E/EX/EXIFTOOL/Image-ExifTool-12.16.tar.gz"; - sha256 = "0skm22b3gg1bfk0amklrprpva41m6mkrhqp0gi7z1nmcf9ypjh61"; + url = "https://exiftool.org/Image-ExifTool-${version}.tar.gz"; + sha256 = "09yszwhirprqr94jwrsr9kyav5syv0mjmnjngqn20fn7m135wv95"; }; - patches = [ - # Unfortunately, not every release is uploaded to CPAN so security fixes - # would need to be cherry-picked from releases - (fetchpatch { - name = "CVE-2021-22204.patch"; - url = "https://salsa.debian.org/perl-team/modules/packages/libimage-exiftool-perl/-/raw/0347501fda93cb8366d6451aedcf258b34fb4a2b/debian/patches/CVE-2021-22204.patch"; - sha256 = "1fxw32zcssillnv764wsd05lyswn8bbrc90q5cy9aknx0ncgsrxj"; - }) - ]; - nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; postInstall = lib.optionalString stdenv.isDarwin '' shortenPerlShebang $out/bin/exiftool From 0a745f1ef72c5bc120dbe49a2f1d156512110427 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 11 Jul 2021 10:25:56 -0400 Subject: [PATCH 05/14] pythonPackages.awkward: 1.3.0 -> 1.4.0 --- pkgs/development/python-modules/awkward/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix index b39a72903876..53cd4671d2ca 100644 --- a/pkgs/development/python-modules/awkward/default.nix +++ b/pkgs/development/python-modules/awkward/default.nix @@ -5,20 +5,21 @@ , numba , numpy , pytestCheckHook +, pyyaml , rapidjson }: buildPythonPackage rec { pname = "awkward"; - version = "1.3.0"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "b6021694adec9813842bad1987b837e439dabaf5b0dff9041201d238fca71fb4"; + sha256 = "25ae6114d5962c717cb87e3bc30a2f6eaa232b252cf8c51ba805b8f04664ae0d"; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ rapidjson ]; + buildInputs = [ pyyaml rapidjson ]; propagatedBuildInputs = [ numpy ]; dontUseCmakeConfigure = true; From 45bed6d99f7b8ef9130e0bf60d1768be37e685f2 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 11 Jul 2021 10:40:09 -0400 Subject: [PATCH 06/14] snakemake: 6.5.0 -> 6.5.3 --- pkgs/applications/science/misc/snakemake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/misc/snakemake/default.nix b/pkgs/applications/science/misc/snakemake/default.nix index 8919f85e44d9..5ecde8396069 100644 --- a/pkgs/applications/science/misc/snakemake/default.nix +++ b/pkgs/applications/science/misc/snakemake/default.nix @@ -2,7 +2,7 @@ python3Packages.buildPythonApplication rec { pname = "snakemake"; - version = "6.5.0"; + version = "6.5.3"; propagatedBuildInputs = with python3Packages; [ appdirs @@ -28,7 +28,7 @@ python3Packages.buildPythonApplication rec { src = python3Packages.fetchPypi { inherit pname version; - sha256 = "b166ec74537e02553fcaf0ddcffc32dfdb9dcaa1260af297a56eded6a179b2ee"; + sha256 = "a06839346425c74542e6e2e6047db3133cd747ef89e1ebd87dad1fbba041f62d"; }; doCheck = false; # Tests depend on Google Cloud credentials at ${HOME}/gcloud-service-key.json From 2be79bc371d03028508209d3fb3942833eaf2a24 Mon Sep 17 00:00:00 2001 From: Alvar Penning Date: Sun, 11 Jul 2021 17:38:27 +0200 Subject: [PATCH 07/14] pythonPackages.mat2: fix exiftool testing error --- pkgs/development/python-modules/mat2/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/mat2/default.nix b/pkgs/development/python-modules/mat2/default.nix index 6c1ba9a40c63..99d94d3d1a80 100644 --- a/pkgs/development/python-modules/mat2/default.nix +++ b/pkgs/development/python-modules/mat2/default.nix @@ -56,6 +56,12 @@ buildPythonPackage rec { url = "https://0xacab.org/jvoisin/mat2/-/commit/c9be50f968212b01f8d8ad85e59e19c3e67d8578.patch"; sha256 = "0895dkv6575ps3drdfnli15cggx27n9irjx0axigrm4ql4ma0648"; }) + # fix white space error in the tests for exiftool, remove for next release + (fetchpatch { + name = "fix-tests-exiftool.patch"; + url = "https://0xacab.org/jvoisin/mat2/-/commit/6df615281b2a649b85ff7670f6d87d3beed0b977.patch"; + sha256 = "1gix63n0mzavnqjq5ll0v210z4vdz4f93aq03bfzlgifxcd9vl1x"; + }) ]; postPatch = '' From 93d219c8b640f987f5c4d4218ab75811e7bb5497 Mon Sep 17 00:00:00 2001 From: Maas Lalani Date: Sat, 10 Jul 2021 15:37:57 -0400 Subject: [PATCH 08/14] fennel: init at 0.9.2 --- pkgs/development/compilers/fennel/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/compilers/fennel/default.nix diff --git a/pkgs/development/compilers/fennel/default.nix b/pkgs/development/compilers/fennel/default.nix new file mode 100644 index 000000000000..6165a522c3aa --- /dev/null +++ b/pkgs/development/compilers/fennel/default.nix @@ -0,0 +1,31 @@ +{ lib, stdenv, fetchFromSourcehut, installShellFiles, lua }: + +stdenv.mkDerivation rec { + pname = "fennel"; + version = "0.9.2"; + + src = fetchFromSourcehut { + owner = "~technomancy"; + repo = pname; + rev = version; + sha256 = "1kpm3lzxzwkhxm4ghpbx8iw0ni7gb73y68lsc3ll2rcx0fwv9303"; + }; + + nativeBuildInputs = [ installShellFiles ]; + + buildInputs = [ lua ]; + + makeFlags = [ "PREFIX=${placeholder "out"}" ]; + + postInstall = '' + installManPage fennel.1 + ''; + + meta = with lib; { + description = "A Lua Lisp language"; + homepage = "https://fennel-lang.org/"; + license = licenses.mit; + platforms = lua.meta.platforms; + maintainers = [ maintainers.maaslalani ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac525f720f28..5875dd50556a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10760,6 +10760,8 @@ in fasmg = callPackage ../development/compilers/fasmg { }; + fennel = callPackage ../development/compilers/fennel { }; + flasm = callPackage ../development/compilers/flasm { }; flyctl = callPackage ../development/web/flyctl { }; From 74812d638601ce1e7d6f94f6621829ef3f3ba96a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 11 Jul 2021 17:51:49 +0200 Subject: [PATCH 09/14] python3Packages.aiojobs: 0.2.2 -> 0.3.0 --- .../python-modules/aiojobs/default.nix | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/aiojobs/default.nix b/pkgs/development/python-modules/aiojobs/default.nix index 68c34df1afba..20c068080c9c 100644 --- a/pkgs/development/python-modules/aiojobs/default.nix +++ b/pkgs/development/python-modules/aiojobs/default.nix @@ -1,22 +1,22 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , fetchPypi -, isPy27 +, pythonOlder , aiohttp -, pytest +, pytestCheckHook , pytest-aiohttp , pygments -, lib }: buildPythonPackage rec { pname = "aiojobs"; - version = "0.2.2"; + version = "0.3.0"; format = "flit"; - disabled = isPy27; + disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "01a0msjh4w58fd7jplmblh0hwgpzwjs5xkgqz3d0p5yv3cykwjwf"; + sha256 = "sha256-9mMdQtxDCPfYg6u9cNTpdvP8w1o7oejq5dSvSUCh4MM="; }; nativeBuildInputs = [ @@ -28,13 +28,11 @@ buildPythonPackage rec { ]; checkInputs = [ - pytest + pytestCheckHook pytest-aiohttp ]; - checkPhase = '' - pytest tests - ''; + pythonImportsCheck = [ "aiojobs" ]; meta = with lib; { homepage = "https://github.com/aio-libs/aiojobs"; From c8c7b1c22e20e9ffe31052185f5e93d343129fe1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 11 Jul 2021 18:03:12 +0200 Subject: [PATCH 10/14] python3Packages.asgi-csrf: 0.8 -> 0.9 --- pkgs/development/python-modules/asgi-csrf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asgi-csrf/default.nix b/pkgs/development/python-modules/asgi-csrf/default.nix index 4988a04e8e44..a11d1c703044 100644 --- a/pkgs/development/python-modules/asgi-csrf/default.nix +++ b/pkgs/development/python-modules/asgi-csrf/default.nix @@ -11,7 +11,7 @@ }: buildPythonPackage rec { - version = "0.8"; + version = "0.9"; pname = "asgi-csrf"; disabled = isPy27; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "simonw"; repo = pname; rev = version; - sha256 = "sha256-0I/p9SjVVZhJQeR7s1R3tooP9XMNLPlcxl0dBSzsVaw="; + sha256 = "sha256-mmOsN2mW6eGtapq3xLqHK8hhSD0Gjzp3DsY5AGUlI8g="; }; propagatedBuildInputs = [ From c772d7503d2e8b8c919a068b78a2c3bca52f17a8 Mon Sep 17 00:00:00 2001 From: Kid <44045911+kidonng@users.noreply.github.com> Date: Sun, 11 Jul 2021 16:20:38 +0000 Subject: [PATCH 11/14] p7zip: update owner info --- pkgs/tools/archivers/p7zip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix index 8ba87da6b6ac..96f9262427b0 100644 --- a/pkgs/tools/archivers/p7zip/default.nix +++ b/pkgs/tools/archivers/p7zip/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "17.04"; src = fetchFromGitHub { - owner = "szcnick"; + owner = "jinfeihan57"; repo = pname; rev = "v${version}"; sha256 = "sha256-19F4hPV0nKVuFZNbOcXrcA1uW6Y3HQolaHVIYXGmh18="; @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing"; meta = { - homepage = "https://github.com/szcnick/p7zip"; + homepage = "https://github.com/jinfeihan57/p7zip"; description = "A new p7zip fork with additional codecs and improvements (forked from https://sourceforge.net/projects/p7zip/)"; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.raskin ]; From 64bf0aa0239cb94ededa5ec98e155b081b28d574 Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Sun, 11 Jul 2021 18:29:04 +0200 Subject: [PATCH 12/14] neo4j-desktop: 1.4.5 -> 1.4.7 (#129948) --- pkgs/applications/misc/neo4j-desktop/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/neo4j-desktop/default.nix b/pkgs/applications/misc/neo4j-desktop/default.nix index 045f0db42fe8..967c3db4c651 100644 --- a/pkgs/applications/misc/neo4j-desktop/default.nix +++ b/pkgs/applications/misc/neo4j-desktop/default.nix @@ -1,21 +1,22 @@ { appimageTools, lib, fetchurl }: let pname = "neo4j-desktop"; - version = "1.4.5"; + version = "1.4.7"; name = "${pname}-${version}"; src = fetchurl { url = "https://s3-eu-west-1.amazonaws.com/dist.neo4j.org/${pname}/linux-offline/${name}-x86_64.AppImage"; - sha256 = "sha256-TCkjYhvGhgqgrDEMvC4Ww/sDxRhHC70YgfDlCIFitMo"; + hash = "sha256-oEcSW7UIeiGY2fCPJQ5EtDBRtd73Q04HaSk+7ObLKJc="; }; - appimageContents = appimageTools.extract { inherit src; name = pname; }; + appimageContents = appimageTools.extract { inherit name src; }; in appimageTools.wrapType2 { inherit name src; extraPkgs = pkgs: with pkgs; [ libsecret ]; extraInstallCommands = '' + mv $out/bin/${name} $out/bin/${pname} install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications substituteInPlace $out/share/applications/${pname}.desktop \ --replace 'Exec=AppRun' 'Exec=${pname}' From b15ff3e91ebc2510410ed605bfb0f1dcdf230611 Mon Sep 17 00:00:00 2001 From: Ethan Edwards Date: Sun, 11 Jul 2021 12:54:13 -0400 Subject: [PATCH 13/14] cobalt: fix darwin build (#129758) * cobalt: fix darwin build * Update pkgs/applications/misc/cobalt/default.nix Co-authored-by: Sandro --- pkgs/applications/misc/cobalt/default.nix | 5 ++++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/cobalt/default.nix b/pkgs/applications/misc/cobalt/default.nix index a9ccc6a8f870..6e13cc4728e8 100644 --- a/pkgs/applications/misc/cobalt/default.nix +++ b/pkgs/applications/misc/cobalt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, CoreServices }: rustPlatform.buildRustPackage rec { pname = "cobalt"; @@ -13,10 +13,13 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "27LcoGBI4elt80uQkTwvToOyEmd2+/3ma5Y32OFrJaw="; + buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; + meta = with lib; { description = "Static site generator written in Rust"; homepage = "https://github.com/cobalt-org/cobalt.rs/"; license = licenses.mit; maintainers = with maintainers; [ ethancedwards8 ]; + platforms = platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9bad400f08b1..df6c3f0a82ea 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3889,7 +3889,9 @@ in cloud-utils = callPackage ../tools/misc/cloud-utils { }; - cobalt = callPackage ../applications/misc/cobalt { }; + cobalt = callPackage ../applications/misc/cobalt { + inherit (darwin.apple_sdk.frameworks) CoreServices; + }; cocoapods = callPackage ../development/mobile/cocoapods { }; From d6da9bb14bd50cfd7869a0ef66f6e698166ba16d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20K=C4=85dzio=C5=82ka?= Date: Sun, 11 Jul 2021 18:55:06 +0200 Subject: [PATCH 14/14] volatility: Make the screenshot tool work (#129772) Co-authored-by: Sandro --- pkgs/tools/security/volatility/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/volatility/default.nix b/pkgs/tools/security/volatility/default.nix index 6cc5ddbfb4cf..4abbbd2d1d1f 100644 --- a/pkgs/tools/security/volatility/default.nix +++ b/pkgs/tools/security/volatility/default.nix @@ -13,7 +13,7 @@ pythonPackages.buildPythonApplication rec { doCheck = false; - propagatedBuildInputs = [ pythonPackages.pycrypto pythonPackages.distorm3 ]; + propagatedBuildInputs = with pythonPackages; [ pycrypto distorm3 pillow ]; meta = with lib; { homepage = "https://www.volatilityfoundation.org/";