From 0aafa261e3d5e53881688a224fb81feca8c374a2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 13 Sep 2021 21:31:40 +0000 Subject: [PATCH 01/34] vkquake: 1.05.3 -> 1.11.0 --- pkgs/games/quakespasm/vulkan.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/quakespasm/vulkan.nix b/pkgs/games/quakespasm/vulkan.nix index c8882349ce27..a71f36f72376 100644 --- a/pkgs/games/quakespasm/vulkan.nix +++ b/pkgs/games/quakespasm/vulkan.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "vkquake"; - version = "1.05.3"; + version = "1.11.0"; src = fetchFromGitHub { owner = "Novum"; repo = "vkQuake"; rev = version; - sha256 = "sha256-nrqxfJbTkaPgKozkS6ulUZNXymkpw0bbQBHUZEFnLhs="; + sha256 = "sha256-FbHqpBiTJWeJPBHUBTOIuXRoLttmDIpip5wUvuVw8YI="; }; sourceRoot = "source/Quake"; From 13297f4cb76419ca8e419b4b06f63f6b6bd96808 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 13 Sep 2021 22:07:22 +0000 Subject: [PATCH 02/34] vultr-cli: 2.8.0 -> 2.8.2 --- pkgs/development/tools/vultr-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/vultr-cli/default.nix b/pkgs/development/tools/vultr-cli/default.nix index 3b9cebb6439a..10f710a63978 100644 --- a/pkgs/development/tools/vultr-cli/default.nix +++ b/pkgs/development/tools/vultr-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vultr-cli"; - version = "2.8.0"; + version = "2.8.2"; src = fetchFromGitHub { owner = "vultr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BPeOud10cTsZ2flWRMf6F/i9JwnPPDFje3OZIAUa0O8="; + sha256 = "sha256-fjmisTDW35aIFbWFF4gdyP8ygNd0o7sdsNr0NX1Hvfg="; }; vendorSha256 = null; From 4b7e41b6ee8d87a012ca3f318f5d1f5ce5f14b06 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 13 Sep 2021 22:30:26 +0000 Subject: [PATCH 03/34] tty-solitaire: 1.3.0 -> 1.3.1 --- pkgs/applications/misc/tty-solitaire/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/tty-solitaire/default.nix b/pkgs/applications/misc/tty-solitaire/default.nix index 9ea26b52bc34..708596d40747 100644 --- a/pkgs/applications/misc/tty-solitaire/default.nix +++ b/pkgs/applications/misc/tty-solitaire/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "tty-solitaire"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "mpereira"; repo = pname; rev = "v${version}"; - sha256 = "0kix7wfy2bda8cw5kfm7bm5acd5fqmdl9g52ms9bza4kf2jnb754"; + sha256 = "sha256-zMLNWJieHxHALFQoSkdAxGbUBGuZnznLX86lI3P21F0="; }; buildInputs = [ ncurses ]; From 7bd5754a353b12bf53df824c59281e56703f0c89 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 14 Sep 2021 00:21:32 +0000 Subject: [PATCH 04/34] xfce.thunar: 4.16.8 -> 4.16.9 --- pkgs/desktops/xfce/core/thunar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/core/thunar/default.nix b/pkgs/desktops/xfce/core/thunar/default.nix index 7efc64e942de..42c0f1ef674c 100644 --- a/pkgs/desktops/xfce/core/thunar/default.nix +++ b/pkgs/desktops/xfce/core/thunar/default.nix @@ -21,9 +21,9 @@ let unwrapped = mkXfceDerivation { category = "xfce"; pname = "thunar"; - version = "4.16.8"; + version = "4.16.9"; - sha256 = "sha256-KFx01vbVeGR+0U3DkUVRhO7pTv3R2h7qSe5VQE2b+OQ="; + sha256 = "sha256-TpazNC4TwNhcEGQ4AQICxbmfZ1i4RE9vXkM9Zln80vE="; nativeBuildInputs = [ docbook_xsl From cf5db339eb232bdcad503ee9543e123b8f39ab60 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 14 Sep 2021 00:45:49 +0000 Subject: [PATCH 05/34] alembic: 1.8.2 -> 1.8.3 --- pkgs/development/libraries/alembic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/alembic/default.nix b/pkgs/development/libraries/alembic/default.nix index 0ed9aa204706..667d334c9026 100644 --- a/pkgs/development/libraries/alembic/default.nix +++ b/pkgs/development/libraries/alembic/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "alembic"; - version = "1.8.2"; + version = "1.8.3"; src = fetchFromGitHub { owner = "alembic"; repo = "alembic"; rev = version; - sha256 = "sha256-e87pnWIV8fbjEQa5iXRPXA9MkJN9NwY9PW/QI+cVSKo="; + sha256 = "sha256-QnqUD8KmMDmEZ1REoKN70SwVICOdyGPZsB/lU9nojj4="; }; outputs = [ "bin" "dev" "out" "lib" ]; From 053eff5a4670022b048eae0308d3632b5cf3ed27 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 14 Sep 2021 02:14:31 +0000 Subject: [PATCH 06/34] top-git: 0.19.12 -> 0.19.13 --- .../version-management/git-and-tools/topgit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/topgit/default.nix b/pkgs/applications/version-management/git-and-tools/topgit/default.nix index cbb341ae3eb3..86e0d1b3c809 100644 --- a/pkgs/applications/version-management/git-and-tools/topgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/topgit/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "topgit"; - version = "0.19.12"; + version = "0.19.13"; src = fetchFromGitHub { owner = "mackyle"; repo = "topgit"; rev = "${pname}-${version}"; - sha256 = "1wvf8hmwwl7a2fr17cfs3pbxjccdsjw9ngzivxlgja0gvfz4hjd5"; + sha256 = "sha256-K0X1DGc1LQsoteUhoHLxVJRrZaaPLKSSF61OKyGB5Qg="; }; makeFlags = [ "prefix=${placeholder "out"}" ]; From 9bd2d91ec5abea0a70c6ddf50b2621a194246775 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 14 Sep 2021 02:22:54 +0000 Subject: [PATCH 07/34] texmaker: 5.1.1 -> 5.1.2 --- pkgs/applications/editors/texmaker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/texmaker/default.nix b/pkgs/applications/editors/texmaker/default.nix index 265783fe878f..4c176bab057d 100644 --- a/pkgs/applications/editors/texmaker/default.nix +++ b/pkgs/applications/editors/texmaker/default.nix @@ -2,11 +2,11 @@ mkDerivation rec { pname = "texmaker"; - version = "5.1.1"; + version = "5.1.2"; src = fetchurl { url = "http://www.xm1math.net/texmaker/${pname}-${version}.tar.bz2"; - sha256 = "sha256-gANJknSWIMN+B0uAOtPil8EbjyWt4E+xOxOseR87Dd4="; + sha256 = "sha256-UmiW8sGuVhEw7seq6BW53Nqejut3K2VB0NyUzpGnEEQ="; }; buildInputs = [ qtbase qtscript poppler zlib qtwebengine ]; From 35a1ca8a0a8fb680affc784c20415f47b067d296 Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 14 Sep 2021 02:06:56 +0100 Subject: [PATCH 08/34] darwin.trash: fix on aarch64-darwin None of these clang options should be necessary with the nixpkgs stdenv infrastructure, and the -arch was breaking Apple Silicon builds. --- pkgs/os-specific/darwin/trash/trash.diff | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/darwin/trash/trash.diff b/pkgs/os-specific/darwin/trash/trash.diff index fa6edf98b3de..d96f6c9c4fef 100644 --- a/pkgs/os-specific/darwin/trash/trash.diff +++ b/pkgs/os-specific/darwin/trash/trash.diff @@ -7,7 +7,7 @@ index 5e4306f..9c975fc 100644 @echo ---- Compiling: @echo ====================================== - $(CC) -O2 -Wall -Wextra -Wpartial-availability -Wno-unguarded-availability -force_cpusubtype_ALL -mmacosx-version-min=10.7 -arch i386 -arch x86_64 -framework AppKit -framework ScriptingBridge -o $@ $(SOURCE_FILES) -+ $(CC) -O2 -Wall -Wextra -Wpartial-availability -Wno-unguarded-availability -force_cpusubtype_ALL -mmacosx-version-min=10.7 -arch x86_64 -framework AppKit -framework ScriptingBridge -o $@ $(SOURCE_FILES) ++ $(CC) -O2 -Wall -Wextra -Wpartial-availability -Wno-unguarded-availability -framework AppKit -framework ScriptingBridge -o $@ $(SOURCE_FILES) analyze: @echo From 83c4c7ea5b400ec19052d6aff08d1424bcd33504 Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 14 Sep 2021 03:09:55 +0100 Subject: [PATCH 09/34] rpm: fix on aarch64-darwin --- pkgs/tools/package-management/rpm/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index f942efe6dd7b..5e46a0336875 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -36,14 +36,20 @@ stdenv.mkDerivation rec { "--sharedstatedir=/com" ]; - # Small fixes for ndb on darwin - # https://github.com/rpm-software-management/rpm/pull/1465 patches = [ + # Small fixes for ndb on darwin + # https://github.com/rpm-software-management/rpm/pull/1465 (fetchpatch { name = "darwin-support.patch"; url = "https://github.com/rpm-software-management/rpm/commit/2d20e371d5e38f4171235e5c64068cad30bda557.patch"; sha256 = "0p3j5q5a4hl357maf7018k3826jhcpqg6wfrnccrkv30g0ayk171"; }) + # Fix build on aarch64-darwin + # https://github.com/rpm-software-management/rpm/pull/1775 + (fetchpatch { + url = "https://github.com/emilazy/rpm/commit/45120e756930b4787ea2e06fb8a9e623ea13f2f3.patch"; + sha256 = "0zzblwx9apxyjsri4cxd09y9b2hs57r2fck98939j1qgcwy732ar"; + }) ]; postPatch = '' From b4d780dd8f5ae5e7ab882657c73c582e93c50cc2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 14 Sep 2021 02:33:25 +0000 Subject: [PATCH 10/34] bjumblr: 1.6.6 -> 1.6.8 --- pkgs/applications/audio/bjumblr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/bjumblr/default.nix b/pkgs/applications/audio/bjumblr/default.nix index ce81415cd5db..5e3919e04d34 100644 --- a/pkgs/applications/audio/bjumblr/default.nix +++ b/pkgs/applications/audio/bjumblr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bjumblr"; - version = "1.6.6"; + version = "1.6.8"; src = fetchFromGitHub { owner = "sjaehn"; repo = "BJumblr"; rev = version; - sha256 = "1nbxi54023vck3qgmr385cjzinmdnvz62ywb6bcksmc3shl080mg"; + sha256 = "sha256-qSoGmWUGaMjx/bkiCJ/qb4LBbuFPXXlJ0e9hrFBXzwE="; }; nativeBuildInputs = [ pkg-config ]; From c13796af38650b7ad2180473899ddc133a186538 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 14 Sep 2021 02:58:31 +0000 Subject: [PATCH 11/34] bschaffl: 1.4.6 -> 1.4.8 --- pkgs/applications/audio/bschaffl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/bschaffl/default.nix b/pkgs/applications/audio/bschaffl/default.nix index ed988cbcb67f..eabdad3caa9c 100644 --- a/pkgs/applications/audio/bschaffl/default.nix +++ b/pkgs/applications/audio/bschaffl/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bschaffl"; - version = "1.4.6"; + version = "1.4.8"; src = fetchFromGitHub { owner = "sjaehn"; repo = pname; rev = version; - sha256 = "sha256-tD4LsIXb2II+TNEfzXBviMR2fq/FtCSsaL2YGun1vu0="; + sha256 = "sha256-zczDqJdUAN2oSyIRt9m3OnwOWXlwL4Yod8UMCXs5zM0="; }; nativeBuildInputs = [ pkg-config ]; From d9d051ecd9c8fa5d32644f41a695f4d95645a61d Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 14 Sep 2021 04:18:32 +0100 Subject: [PATCH 12/34] dash: use fetchpatch --- pkgs/shells/dash/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/dash/default.nix b/pkgs/shells/dash/default.nix index f044c41b73d6..fa954a4921cd 100644 --- a/pkgs/shells/dash/default.nix +++ b/pkgs/shells/dash/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, buildPackages, autoreconfHook, fetchurl, libedit }: +{ lib +, stdenv +, buildPackages +, autoreconfHook +, fetchurl +, fetchpatch +, libedit +}: stdenv.mkDerivation rec { pname = "dash"; @@ -12,11 +19,11 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; patches = [ - (fetchurl { + (fetchpatch { # Dash executes code when noexec ("-n") is specified # https://www.openwall.com/lists/oss-security/2020/11/11/3 url = "https://git.kernel.org/pub/scm/utils/dash/dash.git/patch/?id=29d6f2148f10213de4e904d515e792d2cf8c968e"; - sha256 = "08q90bx36ixwlcj331dh7420qyj8i0qh1cc1gljrhd83fhl9w0y5"; + sha256 = "0aadb7aaaan6jxmi6icv4p5gqx7k510yszaqsa29b5giyxz5l9i1"; }) ] ++ lib.optionals stdenv.isDarwin [ # Temporary fix until a proper one is accepted upstream From 34f26a5b87cb297f7dc89d3c46e09210b303e697 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 14 Sep 2021 05:29:06 +0000 Subject: [PATCH 13/34] stripe-cli: 1.7.0 -> 1.7.1 --- pkgs/tools/admin/stripe-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/stripe-cli/default.nix b/pkgs/tools/admin/stripe-cli/default.nix index d812cd4b294f..5420916b884d 100644 --- a/pkgs/tools/admin/stripe-cli/default.nix +++ b/pkgs/tools/admin/stripe-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "stripe-cli"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "stripe"; repo = pname; rev = "v${version}"; - sha256 = "sha256-CO+2BpMIUSaOhdia75zDGR4RZQSaxY05Z6TOKxBlKIw="; + sha256 = "sha256-nu4QcL6r7ivp8wQ8SFe4bOfYX6Iui2czHQ3ucy7K+dk="; }; vendorSha256 = "sha256-LOSHoEP0YRjfHav3MXSYPPrrjX6/ItxeVMOihRx0DTQ="; From e9ca9aac71a3d2ea2dd71869d5a9fd1e5d6a4bea Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 14 Sep 2021 05:35:08 +0000 Subject: [PATCH 14/34] dnsproxy: 0.39.4 -> 0.39.5 --- pkgs/tools/networking/dnsproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/tools/networking/dnsproxy/default.nix index 77f1bf694459..586f16ab3382 100644 --- a/pkgs/tools/networking/dnsproxy/default.nix +++ b/pkgs/tools/networking/dnsproxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.39.4"; + version = "0.39.5"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dF3xyyOqWzjHW8cFdGlb3BCCGVy+eWW5OesKEK7pEjw="; + sha256 = "sha256-ID40+moRAdceiEOwB4tmBE6U1om/aWBXIlxzfLtm5E4="; }; vendorSha256 = null; From 1875c0312e2e4e58035b9e55a6783a4812c26514 Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 14 Sep 2021 04:19:17 +0100 Subject: [PATCH 15/34] dash: 0.5.11.2 -> 0.5.11.4 The readdir64/dirent64 patch was obsoleted by an upstream commit. --- .../0001-fix-dirent64-et-al-on-darwin.patch | 41 ------------------- pkgs/shells/dash/default.nix | 8 +--- 2 files changed, 2 insertions(+), 47 deletions(-) delete mode 100644 pkgs/shells/dash/0001-fix-dirent64-et-al-on-darwin.patch diff --git a/pkgs/shells/dash/0001-fix-dirent64-et-al-on-darwin.patch b/pkgs/shells/dash/0001-fix-dirent64-et-al-on-darwin.patch deleted file mode 100644 index f2e0802f7981..000000000000 --- a/pkgs/shells/dash/0001-fix-dirent64-et-al-on-darwin.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 7e75779eaeacdbb46a387a59d9aaf1481a1da3e5 Mon Sep 17 00:00:00 2001 -From: Adrian Gierakowski -Date: Sun, 19 Jul 2020 08:38:05 +0100 -Subject: [PATCH] fix dirent64 et al on darwin - ---- - configure.ac | 11 +++++++++++ - 1 file changed, 11 insertions(+) - -diff --git a/configure.ac b/configure.ac -index b8faca9..cee1e4d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -139,6 +139,7 @@ if test "$ac_cv_func_signal" != yes; then - [klibc has bsd_signal instead of signal])]) - fi - -+dnl TODO: stat64 is deprecated since macOS 10.6 - dnl Check for stat64 (dietlibc/klibc). - AC_CHECK_FUNC(stat64,, [ - AC_DEFINE(fstat64, fstat, [64-bit operations are the same as 32-bit]) -@@ -155,6 +156,16 @@ AC_CHECK_FUNC(open64,, [ - AC_DEFINE(open64, open, [64-bit operations are the same as 32-bit]) - ]) - -+dnl OS X apparently has stat64 but not readdir64. -+AC_CHECK_FUNC(readdir64,, [ -+ AC_DEFINE(readdir64, readdir, [64-bit operations are the same as 32-bit]) -+]) -+ -+dnl OS X apparently has stat64 but not dirent64. -+AC_CHECK_TYPE(struct dirent64,, [ -+ AC_DEFINE(dirent64, dirent, [64-bit operations are the same as 32-bit]) -+],[#include ]) -+ - dnl Check if struct stat has st_mtim. - AC_MSG_CHECKING(for stat::st_mtim) - AC_COMPILE_IFELSE( --- -2.15.1 - diff --git a/pkgs/shells/dash/default.nix b/pkgs/shells/dash/default.nix index fa954a4921cd..0a6eb556a97a 100644 --- a/pkgs/shells/dash/default.nix +++ b/pkgs/shells/dash/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "dash"; - version = "0.5.11.2"; + version = "0.5.11.4"; src = fetchurl { url = "http://gondor.apana.org.au/~herbert/dash/files/${pname}-${version}.tar.gz"; - sha256 = "0pvdpm1cgfbc25ramn4305a0158yq031q1ain4dc972rnxl7vyq0"; + sha256 = "13g06zqfy4n7jkrbb5l1vw0xcnjvq76i16al8fjc5g33afxbf5af"; }; hardeningDisable = [ "format" ]; @@ -25,13 +25,9 @@ stdenv.mkDerivation rec { url = "https://git.kernel.org/pub/scm/utils/dash/dash.git/patch/?id=29d6f2148f10213de4e904d515e792d2cf8c968e"; sha256 = "0aadb7aaaan6jxmi6icv4p5gqx7k510yszaqsa29b5giyxz5l9i1"; }) - ] ++ lib.optionals stdenv.isDarwin [ - # Temporary fix until a proper one is accepted upstream - ./0001-fix-dirent64-et-al-on-darwin.patch ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = lib.optional stdenv.isDarwin autoreconfHook; buildInputs = [ libedit ]; configureFlags = [ "--with-libedit" ]; From a04e858da4b111636f758f01e1ddc726780b1e52 Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 14 Sep 2021 04:19:46 +0100 Subject: [PATCH 16/34] dash: fix on aarch64-darwin --- pkgs/shells/dash/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/shells/dash/default.nix b/pkgs/shells/dash/default.nix index 0a6eb556a97a..2a0d73145607 100644 --- a/pkgs/shells/dash/default.nix +++ b/pkgs/shells/dash/default.nix @@ -25,8 +25,17 @@ stdenv.mkDerivation rec { url = "https://git.kernel.org/pub/scm/utils/dash/dash.git/patch/?id=29d6f2148f10213de4e904d515e792d2cf8c968e"; sha256 = "0aadb7aaaan6jxmi6icv4p5gqx7k510yszaqsa29b5giyxz5l9i1"; }) + + # aarch64-darwin fix from upstream; remove on next release + (fetchpatch { + url = "https://git.kernel.org/pub/scm/utils/dash/dash.git/patch/?id=6f6d1f2da03468c0e131fdcbdcfa9771ffca2614"; + sha256 = "16iz2ylkyhpxqq411ns8pjk8rizh6afhavvsf052wvzsnmmlvfbw"; + }) ]; + # configure.ac patched; remove on next release + nativeBuildInputs = [ autoreconfHook ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; buildInputs = [ libedit ]; From 9d3086d862fe10508c1e5685125d3fe0ab308b51 Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 14 Sep 2021 04:30:39 +0100 Subject: [PATCH 17/34] jwhois: fix on aarch64-darwin This is somewhat of a hack, and other packages are certainly affected by this issue (e.g. assh runs into it in some cgo code), but at least this documents a workaround in-tree and gets one more package building now. --- pkgs/tools/networking/jwhois/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/networking/jwhois/default.nix b/pkgs/tools/networking/jwhois/default.nix index 5a79a09281c3..025169a9fd35 100644 --- a/pkgs/tools/networking/jwhois/default.nix +++ b/pkgs/tools/networking/jwhois/default.nix @@ -18,6 +18,11 @@ stdenv.mkDerivation rec { makeFlags = [ "AR=${stdenv.cc.bintools.targetPrefix}ar" ]; + # Work around error from on aarch64-darwin: + # error: 'TARGET_OS_IPHONE' is not defined, evaluates to 0 [-Werror,-Wundef-prefix=TARGET_OS_] + # TODO: this should probably be fixed at a lower level than this? + NIX_CFLAGS_COMPILE = lib.optional stdenv.isDarwin "-Wno-undef-prefix"; + meta = { description = "A client for the WHOIS protocol allowing you to query the owner of a domain name"; homepage = "https://www.gnu.org/software/jwhois/"; From 0bcd90ecd7777811c04ef983bbd0e5e4d1991b7a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 14 Sep 2021 06:02:47 +0000 Subject: [PATCH 18/34] simdjson: 0.9.7 -> 1.0.0 --- pkgs/development/libraries/simdjson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/simdjson/default.nix b/pkgs/development/libraries/simdjson/default.nix index 3ee1a1d0689e..18ba50cb96f1 100644 --- a/pkgs/development/libraries/simdjson/default.nix +++ b/pkgs/development/libraries/simdjson/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "simdjson"; - version = "0.9.7"; + version = "1.0.0"; src = fetchFromGitHub { owner = "simdjson"; repo = "simdjson"; rev = "v${version}"; - sha256 = "sha256-3ZLEp2RQhQ7QsRGLimWlZQM8PMTv07NlFoe64ES2+Ug="; + sha256 = "sha256-4I3w3sZRBdHVpUP0O7H7LGUM5uInyrSeHTe5ov5Qcyc="; }; nativeBuildInputs = [ cmake ]; From 15abcd7ecaf910954c66a76864ee2f885ca63e9b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 14 Sep 2021 06:06:39 +0000 Subject: [PATCH 19/34] duckdb: 0.2.8 -> 0.2.9 --- pkgs/development/libraries/duckdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/duckdb/default.nix b/pkgs/development/libraries/duckdb/default.nix index 92f6accd4262..71a466067ad6 100644 --- a/pkgs/development/libraries/duckdb/default.nix +++ b/pkgs/development/libraries/duckdb/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "duckdb"; - version = "0.2.8"; + version = "0.2.9"; src = fetchFromGitHub { owner = "cwida"; repo = "duckdb"; rev = "v${version}"; - sha256 = "sha256-X8zk9D7BQQ6iHdfvpaTZ8wS779wt3nRthH7OG4p9bTg="; + sha256 = "sha256-ID65xpNSDyi19OcOs9Gdf5xpK++UVWclp8pVggIWQNU="; }; nativeBuildInputs = [ cmake ]; From 77c881aa82a5a1dbaa2d67f174d108ab9d49b4d3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 14 Sep 2021 06:34:56 +0000 Subject: [PATCH 20/34] python38Packages.lazr-restfulclient: 0.14.3 -> 0.14.4 --- .../development/python-modules/lazr-restfulclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lazr-restfulclient/default.nix b/pkgs/development/python-modules/lazr-restfulclient/default.nix index cb78dfff1a29..74197621ee17 100644 --- a/pkgs/development/python-modules/lazr-restfulclient/default.nix +++ b/pkgs/development/python-modules/lazr-restfulclient/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "lazr.restfulclient"; - version = "0.14.3"; + version = "0.14.4"; disabled = isPy27; # namespace is broken for python2 src = fetchPypi { inherit pname version; - sha256 = "9f28bbb7c00374159376bd4ce36b4dacde7c6b86a0af625aa5e3ae214651a690"; + sha256 = "bf0fd6b2749b3a2d02711f854c9d23704756f7afed21fb5d5b9809d72aa6d087"; }; propagatedBuildInputs = [ distro httplib2 oauthlib setuptools six wadllib ]; From 21f1fcdf8bedf239df336f53f51466d3fb23d251 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 14 Sep 2021 07:17:07 +0000 Subject: [PATCH 21/34] rsyslog: 8.2102.0 -> 8.2108.0 --- pkgs/tools/system/rsyslog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index 6ff5c07721f4..8e1e51469dd1 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -14,11 +14,11 @@ let in stdenv.mkDerivation rec { pname = "rsyslog"; - version = "8.2102.0"; + version = "8.2108.0"; src = fetchurl { url = "https://www.rsyslog.com/files/download/rsyslog/${pname}-${version}.tar.gz"; - sha256 = "sha256-lO4NAxLC7epzdmVZTL5KlHXk47WT4StbiuOnQ6yccqc="; + sha256 = "sha256-SCbCttCBqclfRp+wEVvj+VEgZSl9PeAOxRN1jNswsdk="; }; #patches = [ ./fix-gnutls-detection.patch ]; From 008cd50917dd17584bf590d9c762abc0cb7b1a20 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 14 Sep 2021 07:17:42 +0000 Subject: [PATCH 22/34] flyctl: 0.0.233 -> 0.0.238 --- pkgs/development/web/flyctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index fb239bccb400..1a77082fb387 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.233"; + version = "0.0.238"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "sha256-qDFO9QV6ItYv/QsnXFCViWo2CQj7hGZftVMD22QL+uQ="; + sha256 = "sha256-dW5+Ga3/sfI33DUmJ3OwXvgbLqC1JkTXXauu0POc16s="; }; preBuild = '' @@ -17,7 +17,7 @@ buildGoModule rec { subPackages = [ "." ]; - vendorSha256 = "sha256-+g0VzgdArxUTT5wDw6ddZn9YDNOXHqysye6cIrCc3Iw="; + vendorSha256 = "sha256-cKZk3SU/UAoA1XTegKG7/8XDNceQi+NTKML0UiiOTV0="; doCheck = false; From 03e61e35dd911a43690342d4721f3c964d1bd621 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 13 Sep 2021 23:53:57 +0100 Subject: [PATCH 23/34] basex: fix Icon= store path to point to nix store. Noticed the problem on never disappearing diff reported by: $ ./maintainers/scripts/rebuild-amount.sh --print HEAD Estimating rebuild amount by counting changed Hydra jobs. 1 x86_64-linux basex.x86_64-linux /nix/store/5ng...-basex-9.4.3 Before the change local non-store path was used: $ nix-build -A basex; fgrep -R Icon result/ result/share/applications/basex.desktop:Icon=/home/.../tools/text/xml/basex/basex.svg After the change the file got into store as expected: $ nix-build -A basex; fgrep -R Icon result/ result/share/applications/basex.desktop:Icon=/nix/store/...-basex.svg --- pkgs/tools/text/xml/basex/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/text/xml/basex/default.nix b/pkgs/tools/text/xml/basex/default.nix index 30482196322f..0e2c8b824f5e 100644 --- a/pkgs/tools/text/xml/basex/default.nix +++ b/pkgs/tools/text/xml/basex/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { desktopItem = makeDesktopItem { name = "basex"; exec = "basexgui %f"; - icon = ./basex.svg; # icon copied from Ubuntu basex package + icon = "${./basex.svg}"; # icon copied from Ubuntu basex package comment = "Visually query and analyse your XML data"; desktopName = "BaseX XML Database"; genericName = "XML database tool"; From 3cc437a3dacee85c64ca82865a636a9d5b0eeac3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 14 Sep 2021 07:43:23 +0000 Subject: [PATCH 24/34] gbenchmark: 1.5.6 -> 1.6.0 --- pkgs/development/libraries/gbenchmark/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gbenchmark/default.nix b/pkgs/development/libraries/gbenchmark/default.nix index 70bd37e40d39..0bb9e58fe355 100644 --- a/pkgs/development/libraries/gbenchmark/default.nix +++ b/pkgs/development/libraries/gbenchmark/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gbenchmark"; - version = "1.5.6"; + version = "1.6.0"; src = fetchFromGitHub { owner = "google"; repo = "benchmark"; rev = "v${version}"; - sha256 = "sha256-DFm5cQh1b2BX6qCDaQZ1/XBNDeIYXKWbIETYu1EjDww="; + sha256 = "sha256-EAJk3JhLdkuGKRMtspTLejck8doWPd7Z0Lv/Mvf3KFY="; }; nativeBuildInputs = [ cmake ]; From 5c133e0acce9a0f401073411665ee661d0ef734d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 14 Sep 2021 07:52:34 +0000 Subject: [PATCH 25/34] gdal: 3.3.1 -> 3.3.2 --- pkgs/development/libraries/gdal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index ca5eabd65302..d00b184cae43 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -7,13 +7,13 @@ with lib; stdenv.mkDerivation rec { pname = "gdal"; - version = "3.3.1"; + version = "3.3.2"; src = fetchFromGitHub { owner = "OSGeo"; repo = "gdal"; rev = "v${version}"; - sha256 = "0832w40a92cl8ydkv0pk7nl1ivhfhbhqbhmpqmdjpi0126jlm2y0"; + sha256 = "sha256-fla3EMDmuW0+vmmU0sgtLsGfO7dDApLQ2EoKJeR/1IM="; }; sourceRoot = "source/gdal"; From 64361afd5c5e3d9cf0c99dfc1fadbd6d33181a27 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 14 Sep 2021 08:11:59 +0000 Subject: [PATCH 26/34] python38Packages.launchpadlib: 1.10.13 -> 1.10.14 --- pkgs/development/python-modules/launchpadlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/launchpadlib/default.nix b/pkgs/development/python-modules/launchpadlib/default.nix index e39e313baa7f..14833f7f622c 100644 --- a/pkgs/development/python-modules/launchpadlib/default.nix +++ b/pkgs/development/python-modules/launchpadlib/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "launchpadlib"; - version = "1.10.13"; + version = "1.10.14"; src = fetchPypi { inherit pname version; - sha256 = "5804d68ec93247194449d17d187e949086da0a4d044f12155fad269ef8515435"; + sha256 = "5edfc7f615c88475b3d8549731cb57e2d9bf15d0b9bc21a43e88626b67deef4b"; }; propagatedBuildInputs = [ From b9608ec767fd61a18c3bc4020ddbf6308a7f819d Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Tue, 14 Sep 2021 10:15:08 +0200 Subject: [PATCH 27/34] opentsdb: fix CVE-2020-35476 This contribution pulls in the patch fixing CVE-2020-35476. The fix is also included in the 2.4.1 version but the upgrade requires more work: a tarball with all the third party tools is no more provided. The build process attempts to get them during the build which fail. https://github.com/advisories/GHSA-hv53-q76c-7f8c --- pkgs/tools/misc/opentsdb/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/opentsdb/default.nix b/pkgs/tools/misc/opentsdb/default.nix index 678c2607b614..bc7baa55fecd 100644 --- a/pkgs/tools/misc/opentsdb/default.nix +++ b/pkgs/tools/misc/opentsdb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, autoconf, automake, curl, fetchurl, jdk8, makeWrapper, nettools +{ lib, stdenv, autoconf, automake, curl, fetchurl, fetchpatch, jdk8, makeWrapper, nettools , python, git }: @@ -13,6 +13,14 @@ stdenv.mkDerivation rec { sha256 = "0b0hilqmgz6n1q7irp17h48v8fjpxhjapgw1py8kyav1d51s7mm2"; }; + patches = [ + (fetchpatch { + name = "CVE-2020-35476.patch"; + url = "https://github.com/OpenTSDB/opentsdb/commit/b89fded4ee326dc064b9d7e471e9f29f7d1dede9.patch"; + sha256 = "1vb9m0a4fsjqcjagiypvkngzgsw4dil8jrlhn5xbz7rwx8x96wvb"; + }) + ]; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ autoconf automake curl jdk nettools python git ]; @@ -33,8 +41,5 @@ stdenv.mkDerivation rec { license = licenses.lgpl21Plus; platforms = lib.platforms.linux; maintainers = [ ]; - knownVulnerabilities = [ - "CVE-2020-35476" # https://github.com/OpenTSDB/opentsdb/issues/2051 - ]; }; } From e2d831ad9afff803671ed911cd954370842e44c1 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Tue, 14 Sep 2021 05:18:19 -0300 Subject: [PATCH 28/34] argocd: 2.1.1 -> 2.1.2 --- pkgs/applications/networking/cluster/argocd/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index 4101ac9f3fd0..91ccf67f5579 100644 --- a/pkgs/applications/networking/cluster/argocd/default.nix +++ b/pkgs/applications/networking/cluster/argocd/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "argocd"; - version = "2.1.1"; - commit = "57abbf95ed160c88b2634ec4d37df9555cc74fb3"; + version = "2.1.2"; + commit = "7af9dfb3524c13e941ab604e36e49a617fe47d2e"; tag = "v${version}"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = tag; - sha256 = "0jh7kh4751kb7439vbbh5f03kcy56phdcvzypjw8n0w239n5xmmc"; + sha256 = "1pr48z1qhv7xxnllr00zz2v0ygxmq2hjdyk0j3zazflnqr2mc596"; }; - vendorSha256 = "sha256-KtLEN66Q5WpCi+COId+gPu2XHcs5/D04rYLHV6XohzQ="; + vendorSha256 = "sha256-N45yRlBGZ/c9ve2YPcWA26pylV8hzxjPh6evKtkgnoc="; nativeBuildInputs = [ packr makeWrapper installShellFiles ]; From 8c11f9fc691b0771dbd7a457dfbfbe158f77cc21 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 14 Sep 2021 06:33:28 +0000 Subject: [PATCH 29/34] esbuild: 0.12.25 -> 0.12.27 --- pkgs/development/tools/esbuild/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index 5399e863f949..083d374cd1ac 100644 --- a/pkgs/development/tools/esbuild/default.nix +++ b/pkgs/development/tools/esbuild/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "esbuild"; - version = "0.12.25"; + version = "0.12.27"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - sha256 = "sha256-2qYfev8x+DmtujIRNgwblTD31Lr+WvQQ/XXjjBOVusE="; + sha256 = "sha256-UclUTfm6fxoYEEdEEmO/j+WLZLe8SFzt7+Tej4bR0RU="; }; - vendorSha256 = "sha256-2ABWPqhK2Cf4ipQH7XvRrd+ZscJhYPc3SV2cGT0apdg="; + vendorSha256 = "sha256-QPkBR+FscUc3jOvH7olcGUhM6OW4vxawmNJuRQxPuGs="; meta = with lib; { description = "An extremely fast JavaScript bundler"; From bcfd20bf2dfc0712bd93206f0a09bfa022e990ec Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 14 Sep 2021 08:32:14 +0000 Subject: [PATCH 30/34] rsnapshot: 1.4.3 -> 1.4.4 --- pkgs/tools/backup/rsnapshot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/rsnapshot/default.nix b/pkgs/tools/backup/rsnapshot/default.nix index 3ded8c6b8482..7a903288c671 100644 --- a/pkgs/tools/backup/rsnapshot/default.nix +++ b/pkgs/tools/backup/rsnapshot/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "rsnapshot"; - version = "1.4.3"; + version = "1.4.4"; src = fetchurl { url = "https://rsnapshot.org/downloads/rsnapshot-${version}.tar.gz"; - sha256 = "1lavqmmsf53pim0nvming7fkng6p0nk2a51k2c2jdq0l7snpl31b"; + sha256 = "sha256-wct8t0jFqWVsOGNivfbCZ5WXN3JKu1Bfv56UCp2YhXk="; }; propagatedBuildInputs = [perl openssh rsync logger]; From 8bae8e70f59e881cd7fa7facc8f42191379e6898 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 14 Sep 2021 08:56:16 +0000 Subject: [PATCH 31/34] s3backer: 1.6.1 -> 1.6.2 --- pkgs/tools/filesystems/s3backer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/s3backer/default.nix b/pkgs/tools/filesystems/s3backer/default.nix index b196b2948395..35d0b7af0736 100644 --- a/pkgs/tools/filesystems/s3backer/default.nix +++ b/pkgs/tools/filesystems/s3backer/default.nix @@ -4,10 +4,10 @@ stdenv.mkDerivation rec { pname = "s3backer"; - version = "1.6.1"; + version = "1.6.2"; src = fetchFromGitHub { - sha256 = "sha256-67sVT72i8tOMdGH/+Oh1N7Vh/2/qD56ImGWI+tprMOM="; + sha256 = "sha256-b64EEES7gO9s24hk3sZMd9guEhJNfc3DV4/NnBIcJYw="; rev = version; repo = "s3backer"; owner = "archiecobbs"; From 73f18436e7739fbb2ff79e0c726ea53c2aec9f48 Mon Sep 17 00:00:00 2001 From: happysalada Date: Mon, 13 Sep 2021 14:40:45 +0900 Subject: [PATCH 32/34] meilisearch: enable flake usage --- pkgs/servers/search/meilisearch/default.nix | 5 +++-- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/search/meilisearch/default.nix b/pkgs/servers/search/meilisearch/default.nix index 5a6b6342fa3b..f02a65658149 100644 --- a/pkgs/servers/search/meilisearch/default.nix +++ b/pkgs/servers/search/meilisearch/default.nix @@ -1,4 +1,5 @@ -{ lib +{ pkgs +, lib , stdenv , buildRustCrate , defaultCrateOverrides @@ -27,7 +28,7 @@ let }; }; cargo_nix = import ./Cargo.nix { - nixpkgs = ../../../..; + inherit pkgs; buildRustCrateForPkgs = customBuildRustCrateForPkgs; }; meilisearch-http = cargo_nix.workspaceMembers."meilisearch-http".build.override { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index acd92efaac3e..424046b942b7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6687,6 +6687,7 @@ with pkgs; meilisearch = callPackage ../servers/search/meilisearch { inherit (darwin.apple_sdk.frameworks) Security; + inherit pkgs; }; memtester = callPackage ../tools/system/memtester { }; From e1d6d8138c27da86dd2b7ad7da2c2bf6a495ac2f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 14 Sep 2021 08:58:07 +0000 Subject: [PATCH 33/34] git-cliff: 0.2.6 -> 0.3.0 --- .../version-management/git-and-tools/git-cliff/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-cliff/default.nix b/pkgs/applications/version-management/git-and-tools/git-cliff/default.nix index b0a5ca641a41..74e617021c92 100644 --- a/pkgs/applications/version-management/git-and-tools/git-cliff/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-cliff/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "git-cliff"; - version = "0.2.6"; + version = "0.3.0"; src = fetchFromGitHub { owner = "orhun"; repo = "git-cliff"; rev = "v${version}"; - sha256 = "sha256-oQ23jvKR4HGIMnW56FVE0XlBpO4pnMBbRXVoc6OuiHo="; + sha256 = "sha256-d0qY0yGvFf1V8NhS9cHEawkTqMAN6roReAHJ6FT9qJ4="; }; - cargoSha256 = "sha256-49RHGOhTaYrg+JKYZMWcgSL7dxe6H50G6n9tJyGaLMQ="; + cargoSha256 = "sha256-UxV9trTm4vZ/boWB7Sl6Dbwhjk8jQnB0QT6bC+aCL+A="; # attempts to run the program on .git in src which is not deterministic doCheck = false; From 9db8c0be81c170d41339ff62f48dc868e4d56d42 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 14 Sep 2021 09:15:23 +0000 Subject: [PATCH 34/34] gitui: 0.17 -> 0.17.1 --- .../version-management/git-and-tools/gitui/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/gitui/default.nix b/pkgs/applications/version-management/git-and-tools/gitui/default.nix index 5d1e50d12135..28fc7be24a20 100644 --- a/pkgs/applications/version-management/git-and-tools/gitui/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitui/default.nix @@ -1,16 +1,16 @@ { lib, stdenv, rustPlatform, fetchFromGitHub, libiconv, perl, python3, Security, AppKit, openssl, xclip }: rustPlatform.buildRustPackage rec { pname = "gitui"; - version = "0.17"; + version = "0.17.1"; src = fetchFromGitHub { owner = "extrawurst"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UM1L95VKmUh2E56dlKo3TkNYRlib5Hg5VHGokBqTP+s="; + sha256 = "sha256-dRHlbxNV4nS50WbJP5lD1zB7NkZmv7nlPUm3RlQIBtc="; }; - cargoSha256 = "sha256-i/Z1pOrg7rKH5uDqkyh7V9jZRHXZ3Bhhw5UpzKWOjJ0="; + cargoSha256 = "sha256-9uRvxax0SrvRkD89mbZPxsfRItde11joA/ZgnXK9XBE="; nativeBuildInputs = [ python3 perl ]; buildInputs = [ openssl ]