From 59906d78bd589ed3cce1b2adf8594e104527a4fe Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 25 Mar 2021 10:25:19 +0000 Subject: [PATCH 01/10] jdupes: 1.19.1 -> 1.19.2 --- pkgs/tools/misc/jdupes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/jdupes/default.nix b/pkgs/tools/misc/jdupes/default.nix index c42abee5e23..d06fc7aef69 100644 --- a/pkgs/tools/misc/jdupes/default.nix +++ b/pkgs/tools/misc/jdupes/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "jdupes"; - version = "1.19.1"; + version = "1.19.2"; src = fetchFromGitHub { owner = "jbruchon"; repo = "jdupes"; rev = "v${version}"; - sha256 = "sha256-1gx3rStqIxLt/iRgpdp5z7tX1/wA0miZ1y5WTeGQ1Vs="; + sha256 = "sha256-3lWrSybYp3RrUnydosgsNkGQjrk7JvxuxjMslN4cGfk="; # Unicode file names lead to different checksums on HFS+ vs. other # filesystems because of unicode normalisation. The testdir # directories have such files and will be removed. From 27a17ac2e4a6a258146b6b8c48bd88735745efe2 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 29 Mar 2021 04:20:00 +0000 Subject: [PATCH 02/10] gitAndTools.delta: 0.6.0 -> 0.7.1 https://github.com/dandavison/delta/releases/tag/0.7.1 --- .../version-management/git-and-tools/delta/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/delta/default.nix b/pkgs/applications/version-management/git-and-tools/delta/default.nix index 4b778537469..20c7f41bc54 100644 --- a/pkgs/applications/version-management/git-and-tools/delta/default.nix +++ b/pkgs/applications/version-management/git-and-tools/delta/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "delta"; - version = "0.6.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "dandavison"; repo = pname; rev = version; - sha256 = "sha256-cEVYU7vMgVxVIKztL6LHcvQjrNRRMrB5XMP/7gPCr5A="; + sha256 = "02gm3fxqq91gn1hffy9kc6dkc0y7p09sl6f8njfpsaficij4bs7a"; }; - cargoSha256 = "sha256-iD3Cr1vo0FNyWvAN5m6ND+8sGyekgbkYmIxGTJkPEYE="; + cargoSha256 = "1crz7410xfixx2vb1c060fnygwkkp2k2lgh7y1mjjxjzhpybniw5"; nativeBuildInputs = [ installShellFiles ]; From 9ea9b7a9f2b4682e8e939eec08a4d41b79d9bff3 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Mon, 29 Mar 2021 19:37:26 +0200 Subject: [PATCH 03/10] wine{Unstable,Staging}: 6.4 -> 6.5 --- pkgs/misc/emulators/wine/sources.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index fb3d430114e..7f02ead3e02 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -44,9 +44,9 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "6.4"; + version = "6.5"; url = "https://dl.winehq.org/wine/source/6.x/wine-${version}.tar.xz"; - sha256 = "sha256-Gy0rRT2Q1sLXEk5H+urlDlxUwl9pvuHQZTGEMmECTI8="; + sha256 = "sha256-BgD9IIwGkl1mNNKfVDu6CmQ2HDTpvXYJwvDiCWEK00c="; inherit (stable) mono gecko32 gecko64; patches = [ @@ -58,7 +58,7 @@ in rec { staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "sha256-gTt75rRoP/HTeD5k/8bW3jjnn8M5atmP9RFqmBQaAfk="; + sha256 = "sha256-u6wDavrFirN1e0fFra4ui3i4PnJF0gcENYoIyNwhIYc="; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; From 02ad6bbb42affc830979ef093a256fd3f52591c5 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 28 Mar 2021 12:28:52 -0500 Subject: [PATCH 04/10] aacgain: build with -Wno-narrowing In recent GCC versions, -Wnarrowing is enabled by default, and compilation of aacgain fails due to -Werror. This commit disables the warning again. --- pkgs/applications/audio/aacgain/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/audio/aacgain/default.nix b/pkgs/applications/audio/aacgain/default.nix index d4fc3fbe698..0f9b511d455 100644 --- a/pkgs/applications/audio/aacgain/default.nix +++ b/pkgs/applications/audio/aacgain/default.nix @@ -12,6 +12,10 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; + # -Wnarrowing is enabled by default in recent GCC versions, + # causing compilation to fail. + NIX_CFLAGS_COMPILE = "-Wno-narrowing"; + postPatch = '' ( cd mp4v2 From 63dc77958d697c8cac4c7374524f8089b03285b8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 26 Mar 2021 00:16:47 +0000 Subject: [PATCH 05/10] parallel: 20210222 -> 20210322 --- pkgs/tools/misc/parallel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index 1209ab9d254..0667327d062 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "parallel"; - version = "20210222"; + version = "20210322"; src = fetchurl { url = "mirror://gnu/parallel/${pname}-${version}.tar.bz2"; - sha256 = "sha256-TmmwCuti906i/cZXnTHStKTMCmT+dc9hkmMSQC8b5ys="; + sha256 = "sha256-mPcbRFojoYu06bzk83S5PmptnezfiSvo0iRZ8iS4VpQ="; }; outputs = [ "out" "man" "doc" ]; From 32c2087987ac9d4f13d80780d97ee6038ffacdc9 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Mon, 29 Mar 2021 17:27:03 -0400 Subject: [PATCH 06/10] zabbix.agent2: minor cleanup --- pkgs/servers/monitoring/zabbix/agent2.nix | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/pkgs/servers/monitoring/zabbix/agent2.nix b/pkgs/servers/monitoring/zabbix/agent2.nix index 741a880a861..c2b6c0bb54b 100644 --- a/pkgs/servers/monitoring/zabbix/agent2.nix +++ b/pkgs/servers/monitoring/zabbix/agent2.nix @@ -10,9 +10,11 @@ import ./versions.nix ({ version, sha256 }: inherit sha256; }; + modRoot = "src/go"; + vendorSha256 = "1ral3xg58x0lf5vl839nlabf443yzqnbrlzm0q127mvv412f5ajc"; - nativeBuildInputs = [ autoreconfHook pkg-config]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libiconv openssl pcre zlib ]; inherit (buildGoModule.go) GOOS GOARCH; @@ -37,10 +39,9 @@ import ./versions.nix ({ version, sha256 }: ''; # zabbix build process is complex to get right in nix... - # we need to manipulate a number of things for their build - # system to properly work + # use automake to build the go project ensuring proper access to the go vendor directory buildPhase = '' - cp -r vendor src/go/vendor + cd ../.. make ''; @@ -49,13 +50,6 @@ import ./versions.nix ({ version, sha256 }: install -Dm0755 src/go/bin/zabbix_agent2 $out/bin/zabbix_agent2 ''; - # run `go mod vendor` from the correct directory - overrideModAttrs = (_oldAttrs : { - preConfigure = '' - cd src/go - ''; - }); - meta = with lib; { description = "An enterprise-class open source distributed monitoring solution (client-side agent)"; homepage = "https://www.zabbix.com/"; From 494d7d98d44b74d9158927230acc64002d45e33d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 30 Mar 2021 04:57:37 +0000 Subject: [PATCH 07/10] python38Packages.breathe: 4.27.0 -> 4.28.0 --- pkgs/development/python-modules/breathe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/breathe/default.nix b/pkgs/development/python-modules/breathe/default.nix index be51e87c95c..1ca33222ef5 100644 --- a/pkgs/development/python-modules/breathe/default.nix +++ b/pkgs/development/python-modules/breathe/default.nix @@ -1,13 +1,13 @@ { lib, fetchPypi, buildPythonPackage, docutils, six, sphinx, isPy3k, isPy27 }: buildPythonPackage rec { - version = "4.27.0"; + version = "4.28.0"; pname = "breathe"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "5b21f86d0cc99d3168f0d9730e07c1438057083ccc9a9c54de322e59e1f4e740"; + sha256 = "11e35a5fed7545554be51b70eea4578643d8c08972bea43774f413943006b17a"; }; propagatedBuildInputs = [ docutils six sphinx ]; From 67c8430202db96e2b41fecb60d63e1c1d1de4d20 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 29 Mar 2021 21:34:32 +0200 Subject: [PATCH 08/10] python3Packages.scramp: 1.2.2 -> 1.4.0 --- pkgs/development/python-modules/scramp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scramp/default.nix b/pkgs/development/python-modules/scramp/default.nix index dc57461d549..68e4b9821b1 100644 --- a/pkgs/development/python-modules/scramp/default.nix +++ b/pkgs/development/python-modules/scramp/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "scramp"; - version = "1.2.2"; + version = "1.4.0"; src = fetchFromGitHub { owner = "tlocke"; repo = "scramp"; rev = version; - sha256 = "sha256-d/kfrhvU96eH8TQX7n1hVRclEFWLseEvOxiR6VaOdrg="; + sha256 = "sha256-aXuRIW/3qBzan8z3EzSSxqaZfa3WnPhlviNa2ugIjik="; }; propagatedBuildInputs = [ asn1crypto ]; From 973ee12e95f6f0613dabf455eaecae25ecc589e9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 29 Mar 2021 21:39:21 +0200 Subject: [PATCH 09/10] python3Packages.pg8000: 1.18.0 -> 1.19.0 --- pkgs/development/python-modules/pg8000/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pg8000/default.nix b/pkgs/development/python-modules/pg8000/default.nix index 3cf843b864c..efa4c3005fc 100644 --- a/pkgs/development/python-modules/pg8000/default.nix +++ b/pkgs/development/python-modules/pg8000/default.nix @@ -8,15 +8,20 @@ buildPythonPackage rec { pname = "pg8000"; - version = "1.18.0"; + version = "1.19.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1nkjxf95ldda41mkmahbikhd1fvxai5lfjb4a5gyhialpz4g5fim"; + sha256 = "sha256-EexwwLIOpECAfiyGmUDxSE7qk9cbQ1gHtjhW3YK3RN0="; }; - propagatedBuildInputs = [ passlib scramp ]; + propagatedBuildInputs = [passlib scramp ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace "scramp==1.3.0" "scramp>=1.3.0" + ''; # Tests require a running PostgreSQL instance doCheck = false; From 04a2b269d8921505a2969fc9ec25c1f517f2b307 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 20 Mar 2021 04:20:00 +0000 Subject: [PATCH 10/10] vale: 2.9.1 -> 2.10.2 --- pkgs/tools/text/vale/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index 59f5e7c0c0f..0de5ea5377c 100644 --- a/pkgs/tools/text/vale/default.nix +++ b/pkgs/tools/text/vale/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "vale"; - version = "2.9.1"; + version = "2.10.2"; subPackages = [ "cmd/vale" ]; outputs = [ "out" "data" ]; @@ -11,10 +11,10 @@ buildGoModule rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - sha256 = "sha256-ItkWmBq1mBVZfHcnqDp8koEAWBH3k9Et2bFA2mNYjVY="; + sha256 = "0cpq2pv6d67fdnm2qbb7p9amk0as8bm4knkywak8fsqadxfadx80"; }; - vendorSha256 = null; + vendorSha256 = "14zimsl0f7sxqqka00krix3q2mxdcpk8n2zh7bz8awjwzn4kg8m3"; postInstall = '' mkdir -p $data/share/vale @@ -24,7 +24,7 @@ buildGoModule rec { buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; meta = with lib; { - homepage = "https://errata-ai.gitbook.io/vale/"; + homepage = "https://docs.errata.ai/vale/about"; description = "A syntax-aware linter for prose built with speed and extensibility in mind"; license = licenses.mit; maintainers = [ maintainers.marsam ];