From e02aeee7d07866a80f90de330923a087049237df Mon Sep 17 00:00:00 2001 From: David Tchekachev Date: Wed, 5 Jan 2022 09:07:37 +0100 Subject: [PATCH 01/15] maintainers: add tchekda as maintainer --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a836de2aa65..9820ad85e96 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11781,6 +11781,16 @@ githubId = 66133083; name = "Tomas Bravo"; }; + tchekda = { + email = "contact@tchekda.fr"; + github = "tchekda"; + githubId = 23559888; + keys = [{ + longkeyid = "rsa4096/0xD0A007EDA4EADA0F"; + fingerprint = "44CE A8DD 3B31 49CD 6246 9D8F D0A0 07ED A4EA DA0F"; + }]; + name = "David Tchekachev"; + }; tckmn = { email = "andy@tck.mn"; github = "tckmn"; From d8604f64d925c4f2b2224c06626b87b105235f84 Mon Sep 17 00:00:00 2001 From: cameronfyfe Date: Fri, 14 Jan 2022 23:26:51 -0700 Subject: [PATCH 02/15] maintainers: add cameronfyfe --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index d0a90fa4cfe..b07b80db2bd 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1830,6 +1830,12 @@ githubId = 7435854; name = "Victor Calvert"; }; + cameronfyfe = { + email = "cameron.j.fyfe@gmail.com"; + github = "cameronfyfe"; + githubId = 21013281; + name = "Cameron Fyfe"; + }; cameronnemo = { email = "cnemo@tutanota.com"; github = "cameronnemo"; From 645c499720e22ba83b68f14db731f4d7f40c7409 Mon Sep 17 00:00:00 2001 From: cameronfyfe Date: Sun, 16 Jan 2022 16:28:01 -0700 Subject: [PATCH 03/15] ets: init at 0.2.1 --- pkgs/tools/misc/ets/default.nix | 37 ++++++++++++++++++++++++++++++++ pkgs/tools/misc/ets/go-mod.patch | 21 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 60 insertions(+) create mode 100644 pkgs/tools/misc/ets/default.nix create mode 100644 pkgs/tools/misc/ets/go-mod.patch diff --git a/pkgs/tools/misc/ets/default.nix b/pkgs/tools/misc/ets/default.nix new file mode 100644 index 00000000000..2822d00febd --- /dev/null +++ b/pkgs/tools/misc/ets/default.nix @@ -0,0 +1,37 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "ets"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "zmwangx"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-XWIDo5msTMTLr60x1R9cwsiZIDG6G+uHWx8idt4F2iA="; + }; + + patches = [ ./go-mod.patch ]; + + vendorSha256 = "sha256-+8dXfqOu8XTw2uEx3GAynQSHtzifejZtddr1CdxrupA="; + + ldflags = [ "-s" "-w" "-X main.version=v${version}-nixpkgs" ]; + + preBuild = '' + rm -rf fixtures + ''; + + postInstall = '' + mkdir -p $out/share/man/man1 + cp ets.1 $out/share/man/man1 + ''; + + doCheck = false; + + meta = with lib; { + description = "Command output timestamper"; + homepage = "https://github.com/zmwangx/ets/"; + license = licenses.mit; + maintainers = with maintainers; [ cameronfyfe ]; + }; +} diff --git a/pkgs/tools/misc/ets/go-mod.patch b/pkgs/tools/misc/ets/go-mod.patch new file mode 100644 index 00000000000..50998e35927 --- /dev/null +++ b/pkgs/tools/misc/ets/go-mod.patch @@ -0,0 +1,21 @@ +diff --git a/go.mod b/go.mod +index 3b5d491..b658c8e 100644 +--- a/go.mod ++++ b/go.mod +@@ -8,4 +8,5 @@ require ( + github.com/mattn/go-runewidth v0.0.9 + github.com/riywo/loginshell v0.0.0-20190610082906-2ed199a032f6 + github.com/spf13/pflag v1.0.5 ++ golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect + ) +diff --git a/go.sum b/go.sum +index c795477..05ea136 100644 +--- a/go.sum ++++ b/go.sum +@@ -24,4 +24,6 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn + golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= + golang.org/x/sys v0.0.0-20190412213103-97732733099d h1:+R4KGOnez64A81RvjARKc4UT5/tI9ujCIVX+P5KiHuI= + golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= ++golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 h1:XfKQ4OlFl8okEOr5UvAqFRVj8pY/4yfcXrddB8qAbU0= ++golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= + golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 080645eb2e7..5018f8f3ef9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5201,6 +5201,8 @@ with pkgs; ethtool = callPackage ../tools/misc/ethtool { }; + ets = callPackage ../tools/misc/ets { }; + ettercap = callPackage ../applications/networking/sniffers/ettercap { }; eventstat = callPackage ../os-specific/linux/eventstat { }; From 9a9a5b4087935b4461694cbedc40764389aeb58f Mon Sep 17 00:00:00 2001 From: cameronfyfe Date: Sun, 16 Jan 2022 16:28:16 -0700 Subject: [PATCH 04/15] ets: use installManPage Co-authored-by: Nikolay Korotkiy --- pkgs/tools/misc/ets/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/ets/default.nix b/pkgs/tools/misc/ets/default.nix index 2822d00febd..9451a5a043e 100644 --- a/pkgs/tools/misc/ets/default.nix +++ b/pkgs/tools/misc/ets/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "ets"; @@ -17,13 +17,14 @@ buildGoModule rec { ldflags = [ "-s" "-w" "-X main.version=v${version}-nixpkgs" ]; + nativeBuildInputs = [ installShellFiles ]; + preBuild = '' rm -rf fixtures ''; postInstall = '' - mkdir -p $out/share/man/man1 - cp ets.1 $out/share/man/man1 + installManPage ets.1 ''; doCheck = false; From 8d2537a820ccf0201f050a3d4f775f2662ca5058 Mon Sep 17 00:00:00 2001 From: cameronfyfe Date: Wed, 19 Jan 2022 01:23:14 -0700 Subject: [PATCH 05/15] ets: use fetchpatch instead of local patch file --- pkgs/tools/misc/ets/default.nix | 8 ++++++-- pkgs/tools/misc/ets/go-mod.patch | 21 --------------------- 2 files changed, 6 insertions(+), 23 deletions(-) delete mode 100644 pkgs/tools/misc/ets/go-mod.patch diff --git a/pkgs/tools/misc/ets/default.nix b/pkgs/tools/misc/ets/default.nix index 9451a5a043e..cccd0db35e2 100644 --- a/pkgs/tools/misc/ets/default.nix +++ b/pkgs/tools/misc/ets/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, fetchpatch, installShellFiles }: buildGoModule rec { pname = "ets"; @@ -11,7 +11,11 @@ buildGoModule rec { sha256 = "sha256-XWIDo5msTMTLr60x1R9cwsiZIDG6G+uHWx8idt4F2iA="; }; - patches = [ ./go-mod.patch ]; + # https://github.com/zmwangx/ets/pull/18/ + patches = [ (fetchpatch { + url = "https://github.com/zmwangx/ets/commit/600ec17a9c86ca63cd022d00439cdc4978e2afa9.patch"; + sha256 = "sha256-SGCISHkWNFubgKkQYx8Vf5/fknNDfPNYkSuw1mMhZaE="; + }) ]; vendorSha256 = "sha256-+8dXfqOu8XTw2uEx3GAynQSHtzifejZtddr1CdxrupA="; diff --git a/pkgs/tools/misc/ets/go-mod.patch b/pkgs/tools/misc/ets/go-mod.patch deleted file mode 100644 index 50998e35927..00000000000 --- a/pkgs/tools/misc/ets/go-mod.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/go.mod b/go.mod -index 3b5d491..b658c8e 100644 ---- a/go.mod -+++ b/go.mod -@@ -8,4 +8,5 @@ require ( - github.com/mattn/go-runewidth v0.0.9 - github.com/riywo/loginshell v0.0.0-20190610082906-2ed199a032f6 - github.com/spf13/pflag v1.0.5 -+ golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect - ) -diff --git a/go.sum b/go.sum -index c795477..05ea136 100644 ---- a/go.sum -+++ b/go.sum -@@ -24,4 +24,6 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn - golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= - golang.org/x/sys v0.0.0-20190412213103-97732733099d h1:+R4KGOnez64A81RvjARKc4UT5/tI9ujCIVX+P5KiHuI= - golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -+golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 h1:XfKQ4OlFl8okEOr5UvAqFRVj8pY/4yfcXrddB8qAbU0= -+golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= - golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= From 2a78dc8e4b47c9ea2de8270e046eec800b13f1cf Mon Sep 17 00:00:00 2001 From: Nicolas Martin Date: Sun, 15 May 2022 14:23:33 +0200 Subject: [PATCH 06/15] wishlist: 0.4.0 -> 0.5.0 --- pkgs/servers/wishlist/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/wishlist/default.nix b/pkgs/servers/wishlist/default.nix index 73a77a7bfc6..942dd7aa96c 100644 --- a/pkgs/servers/wishlist/default.nix +++ b/pkgs/servers/wishlist/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "wishlist"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "wishlist"; rev = "v${version}"; - sha256 = "sha256-qXCPxFdwX+z0aaZbqFt7bWPlBJDnr0SDMrBHSALX1aw="; + sha256 = "sha256-J9Wd2CyQo8vzfE2jXQzbNA+oihG71F3ZQmEW/r0a72I=1"; }; - vendorSha256 = "sha256-vLhRZVEiYUCvGqPMtOz/8T6W5AKwkSzPdEglG3AevE8="; + vendorSha256 = "sha256-5+wuavHLXwjtvwA9tSpdF2Zd8tw5FklzvaTeCZlA4WQ="; doCheck = false; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9d0f42e685f..68aa8e34198 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22700,7 +22700,9 @@ with pkgs; webmetro = callPackage ../servers/webmetro { }; - wishlist = callPackage ../servers/wishlist { }; + wishlist = callPackage ../servers/wishlist { + buildGoModule = buildGo118Module; + }; wsdd = callPackage ../servers/wsdd { }; From bd253b46fa7db40f1b858332e3c5d2ffd00ec83b Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 15 May 2022 10:50:30 -0300 Subject: [PATCH 07/15] frr: 8.1 -> 8.2.2 --- pkgs/servers/frr/default.nix | 45 +++++++++++++++--------------------- 1 file changed, 18 insertions(+), 27 deletions(-) diff --git a/pkgs/servers/frr/default.nix b/pkgs/servers/frr/default.nix index 833710f1fec..302c5a472bd 100644 --- a/pkgs/servers/frr/default.nix +++ b/pkgs/servers/frr/default.nix @@ -1,8 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch -, python3Packages # build time , autoreconfHook @@ -33,31 +31,22 @@ stdenv.mkDerivation rec { pname = "frr"; - version = "8.1"; + version = "8.2.2"; src = fetchFromGitHub { owner = "FRRouting"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-hJcgLiPBxOE5QEh0RhtZhM3dOxFqW5H0TUjN+aP4qRk="; + hash = "sha256-zuOgbRxyyhFdBplH/K1fpyD+KUWa7FXPDmGKF5Kb7SQ="; }; - patches = [ - (fetchpatch { - # Fix clippy build on aarch64-linux - # https://github.com/FRRouting/frr/issues/10267 - url = "https://github.com/FRRouting/frr/commit/3942ee1f7bc754dd0dd9ae79f89d0f2635be334f.patch"; - sha256 = "1i0acfy5k9fbm9cxchrcvkhyw9704srq4wm2hyjqgdimm2dq7ryf"; - }) - ]; - nativeBuildInputs = [ autoreconfHook bison flex perl pkg-config - python3Packages.sphinx + python3.pkgs.sphinx texinfo ]; @@ -78,34 +67,35 @@ stdenv.mkDerivation rec { ]; configureFlags = [ - "--sysconfdir=/etc/frr" - "--localstatedir=/run/frr" - "--sbindir=$(out)/libexec/frr" "--disable-exampledir" - "--enable-user=frr" - "--enable-group=frr" "--enable-configfile-mask=0640" + "--enable-group=frr" "--enable-logfile-mask=0640" - "--enable-vty-group=frrvty" - "--enable-snmp" "--enable-multipath=64" + "--enable-snmp" + "--enable-user=frr" + "--enable-vty-group=frrvty" + "--localstatedir=/run/frr" + "--sbindir=$(out)/libexec/frr" + "--sysconfdir=/etc/frr" ]; postPatch = '' - substituteInPlace tools/frr-reload --replace /usr/lib/frr/ $out/libexec/frr/ + substituteInPlace tools/frr-reload \ + --replace /usr/lib/frr/ $out/libexec/frr/ ''; doCheck = true; + checkInputs = [ nettools - python3Packages.pytest + python3.pkgs.pytest ]; enableParallelBuilding = true; - passthru.tests = { inherit (nixosTests) frr; }; - meta = with lib; { + homepage = "https://frrouting.org/"; description = "FRR BGP/OSPF/ISIS/RIP/RIPNG routing daemon suite"; longDescription = '' FRRouting (FRR) is a free and open source Internet routing protocol suite @@ -129,9 +119,10 @@ stdenv.mkDerivation rec { infrastructure, web 2.0 businesses, hyperscale services, and Fortune 500 private clouds. ''; - homepage = "https://frrouting.org/"; license = with licenses; [ gpl2Plus lgpl21Plus ]; - platforms = platforms.unix; maintainers = with maintainers; [ woffs ]; + platforms = platforms.unix; }; + + passthru.tests = { inherit (nixosTests) frr; }; } From 81cac41c65083b57013699752aaec74854366acd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 15 May 2022 23:58:04 +0200 Subject: [PATCH 08/15] python310Packages.geocachingapi: 0.2.1 -> 0.2.2 --- pkgs/development/python-modules/geocachingapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/geocachingapi/default.nix b/pkgs/development/python-modules/geocachingapi/default.nix index 9d757273178..7bc12f10319 100644 --- a/pkgs/development/python-modules/geocachingapi/default.nix +++ b/pkgs/development/python-modules/geocachingapi/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "geocachingapi"; - version = "0.2.1"; + version = "0.2.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Sholofly"; repo = "geocachingapi-python"; rev = "refs/tags/${version}"; - sha256 = "sha256-36CkbwRDpMTprsZuPJ9khSrzqLb2Sz7iCvXtJ46uTL0="; + sha256 = "sha256-EoAY3kUFCxQY2Dodwl0TWye5MTjjHvbna5AHha1UzCc="; }; nativeBuildInputs = [ From c952517f974254cd9bcd9367e8337fd861747ef8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 15 May 2022 23:59:02 +0200 Subject: [PATCH 09/15] python310Packages.pynx584: 0.6 -> 0.7 --- pkgs/development/python-modules/pynx584/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pynx584/default.nix b/pkgs/development/python-modules/pynx584/default.nix index 0f2fc2e7c0b..0b2583201a9 100644 --- a/pkgs/development/python-modules/pynx584/default.nix +++ b/pkgs/development/python-modules/pynx584/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pynx584"; - version = "0.6"; + version = "0.7"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "kk7ds"; repo = pname; rev = version; - sha256 = "0if1jq8qiqp4w4zhf2xzzcb8y70hr5pxqzh96i008p6izjha89y6"; + sha256 = "sha256-44JFq19fpJmpZzLeVcBILs8c9bOfWyMrb2jA4Yx8+Co="; }; propagatedBuildInputs = [ From a504cc1204007854ee227a6d95e9eeabaa3dc849 Mon Sep 17 00:00:00 2001 From: David Tchekachev Date: Mon, 16 May 2022 02:10:26 +0300 Subject: [PATCH 10/15] redli : init at 0.5.2 --- pkgs/tools/networking/redli/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/tools/networking/redli/default.nix diff --git a/pkgs/tools/networking/redli/default.nix b/pkgs/tools/networking/redli/default.nix new file mode 100644 index 00000000000..d6a9f6f8709 --- /dev/null +++ b/pkgs/tools/networking/redli/default.nix @@ -0,0 +1,22 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "redli"; + version = "0.5.2"; + + src = fetchFromGitHub { + owner = "IBM-Cloud"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-bR02R9M3041oNUEQId1zgAxMNPyXXQNAYEyE/XIDdPE="; + }; + + vendorSha256 = null; + + meta = with lib; { + description = "A humane alternative to the Redis-cli and TLS"; + homepage = "https://github.com/IBM-Cloud/redli"; + license = licenses.asl20; + maintainers = with maintainers; [ tchekda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 223f872aaf7..3f1bc0caf3f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21772,6 +21772,8 @@ with pkgs; redis = callPackage ../servers/nosql/redis { }; + redli = callPackage ../tools/networking/redli { }; + redstore = callPackage ../servers/http/redstore { }; reproxy = callPackage ../servers/reproxy { }; From 27123795ad29ab118455069a0af142668025b247 Mon Sep 17 00:00:00 2001 From: Sandro Date: Mon, 16 May 2022 01:43:05 +0200 Subject: [PATCH 11/15] writeCBin: fix formatting --- pkgs/build-support/trivial-builders.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index bd14971fe78..9b8028ac42c 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/pkgs/build-support/trivial-builders.nix @@ -315,10 +315,10 @@ rec { allowSubstitutes = false; } '' - n=$out/bin/$name - mkdir -p "$(dirname "$n")" - mv "$codePath" code.c - $CC -x c code.c -o "$n" + n=$out/bin/$name + mkdir -p "$(dirname "$n")" + mv "$codePath" code.c + $CC -x c code.c -o "$n" ''; From 2ed533a838c77c7b60ecec25aff3b7088e6521fc Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Fri, 13 May 2022 22:54:42 +0200 Subject: [PATCH 12/15] gtk4: patch fixing g-c-c crashes (cherry picked from commit 5d15a099b94be16ee619053ed6bcbddefd561a19) --- pkgs/development/libraries/gtk/4.x.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix index e59e471a51e..a93459c1f87 100644 --- a/pkgs/development/libraries/gtk/4.x.nix +++ b/pkgs/development/libraries/gtk/4.x.nix @@ -2,6 +2,7 @@ , stdenv , substituteAll , fetchurl +, fetchpatch , pkg-config , gettext , graphene @@ -77,6 +78,15 @@ stdenv.mkDerivation rec { sha256 = "pXrNDkSCmBcA/fhllsdBPLYe9H915HR/2oCegjG42Ww="; }; + patches = [ + # Fix GNOME Control Center crash. + # https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/4670 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gtk/-/commit/ae0166973795e750f08b89f9f0ef974d7ac48bc7.patch"; + sha256 = "qPOplocE+RcTFIEveJe8YLKiUpe7o6CiA834rZpS0Fs="; + }) + ]; + nativeBuildInputs = [ gettext gobject-introspection From ff29d2caa935a8e6216380dfcd7ee714fd8bd5bf Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 15 May 2022 05:13:31 +0000 Subject: [PATCH 13/15] =?UTF-8?q?gtk4:=204.6.3=20=E2=86=92=204.6.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gtk/-/compare/4.6.3...4.6.4 --- pkgs/development/libraries/gtk/4.x.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix index a93459c1f87..e67599e0555 100644 --- a/pkgs/development/libraries/gtk/4.x.nix +++ b/pkgs/development/libraries/gtk/4.x.nix @@ -2,7 +2,6 @@ , stdenv , substituteAll , fetchurl -, fetchpatch , pkg-config , gettext , graphene @@ -63,7 +62,7 @@ in stdenv.mkDerivation rec { pname = "gtk4"; - version = "4.6.3"; + version = "4.6.4"; outputs = [ "out" "dev" ] ++ lib.optionals x11Support [ "devdoc" ]; outputBin = "dev"; @@ -75,18 +74,9 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz"; - sha256 = "pXrNDkSCmBcA/fhllsdBPLYe9H915HR/2oCegjG42Ww="; + sha256 = "p5orvMeTG3A/xPofy+G5BuIpoVIthU1SKAF2anm8rJ8="; }; - patches = [ - # Fix GNOME Control Center crash. - # https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/4670 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gtk/-/commit/ae0166973795e750f08b89f9f0ef974d7ac48bc7.patch"; - sha256 = "qPOplocE+RcTFIEveJe8YLKiUpe7o6CiA834rZpS0Fs="; - }) - ]; - nativeBuildInputs = [ gettext gobject-introspection From aee07772236445705fde307ba9cfadd419d1c41c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 16 May 2022 02:41:38 +0000 Subject: [PATCH 14/15] python310Packages.pex: 2.1.87 -> 2.1.88 --- pkgs/development/python-modules/pex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index a6d66565165..214f5f8bf40 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pex"; - version = "2.1.87"; + version = "2.1.88"; format = "flit"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-LPOHpylnWxwEdPT3oJjbn8NkTY9tE/pMyGE8Dy7nwrU="; + hash = "sha256-lDUmudfs3Py4ytHsEvgnTiMvVQkom9X+uCeZHhTshjc="; }; nativeBuildInputs = [ From be73a96276f9a1cd1f2dfefdb3bc64dff932f434 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 16 May 2022 03:35:41 +0000 Subject: [PATCH 15/15] terraform-providers: update 2022-05-16 --- .../terraform-providers/providers.json | 176 +++++++++--------- 1 file changed, 88 insertions(+), 88 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 82e0d6ff851..94fcafcb48c 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -3,10 +3,10 @@ "owner": "CiscoDevNet", "provider-source-address": "registry.terraform.io/CiscoDevNet/aci", "repo": "terraform-provider-aci", - "rev": "v2.1.0", - "sha256": "sha256-7fOvTEinJUpSaCnlP+191VTSEpE4z11+HUcH2iTFj60=", + "rev": "v2.2.1", + "sha256": "sha256-WYKlkvGmTeaI4+7uWLy6/y+NtFb9n3Lu9lrwSR8Vg/0=", "vendorSha256": null, - "version": "2.1.0" + "version": "2.2.1" }, "acme": { "owner": "vancluever", @@ -30,10 +30,10 @@ "owner": "aiven", "provider-source-address": "registry.terraform.io/aiven/aiven", "repo": "terraform-provider-aiven", - "rev": "v2.7.3", - "sha256": "sha256-ZAYnP2XEa2eJ0YZkqXQedRysmQI31RQ1osg/TqCqthE=", - "vendorSha256": "sha256-nBVLgOrtINrDziQLdqo5rFWfeY/cOdBW/XVDjtNaNhE=", - "version": "2.7.3" + "rev": "v3.0.0", + "sha256": "sha256-k3F6AUcGAddDD3Wy1THgTlcNzDBB403Vy+6c+avi+vQ=", + "vendorSha256": "sha256-gVZpN7Hwi+PbJDgEHSJRYq0tC1GVcetfPBY5pGhMPAc=", + "version": "3.0.0" }, "akamai": { "owner": "akamai", @@ -49,10 +49,10 @@ "owner": "aliyun", "provider-source-address": "registry.terraform.io/aliyun/alicloud", "repo": "terraform-provider-alicloud", - "rev": "v1.166.0", - "sha256": "sha256-+aRRsN3ALTmQOnDciHjoVFKV/W+/gjtdZeg3eyJ+0fY=", - "vendorSha256": "sha256-2w8o0Fc61ayyUyE4RVcmV4A0heuaIXnOZX040l2ws/Y=", - "version": "1.166.0" + "rev": "v1.167.0", + "sha256": "sha256-l2wCcYcAlKQTKkD+3yFi4zBkMVpq27Ygld1UjeD6IHM=", + "vendorSha256": "sha256-qZNYfSlUkCu7FudbKF4IOgK1xWM5LqUghclOeGOxYXg=", + "version": "1.167.0" }, "ansible": { "owner": "nbering", @@ -94,19 +94,19 @@ "owner": "AviatrixSystems", "provider-source-address": "registry.terraform.io/AviatrixSystems/aviatrix", "repo": "terraform-provider-aviatrix", - "rev": "v2.21.2", - "sha256": "sha256-crC/FKAahv1E7TiLf1XaP5ltrXPuudfki2BdggOW+v4=", + "rev": "v2.22.0", + "sha256": "sha256-ZJs9XtoftMihY9VwWw0lPxH2Nu6NmcEcchsRg71os0c=", "vendorSha256": null, - "version": "2.21.2" + "version": "2.22.0" }, "aws": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/aws", "repo": "terraform-provider-aws", - "rev": "v4.13.0", - "sha256": "sha256-KEu+7hKMWsrpS1WYxj3El7M43Chy9HTBjePhWO6bXMo=", - "vendorSha256": "sha256-Ez6uCriNm1OJ2EyMAyjXihzJ/Pzf2p/oAvJ3HN6fDnA=", - "version": "4.13.0" + "rev": "v4.14.0", + "sha256": "sha256-9xJVJw2kIutmmiKGvRBKS+/oyGSq0dipeCn2Gmtk1AU=", + "vendorSha256": "sha256-+YINrbj52ionuQbcgck6Dp2h88+LS5tXPmoVHXCAXOk=", + "version": "4.14.0" }, "azuread": { "owner": "hashicorp", @@ -121,10 +121,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/azurerm", "repo": "terraform-provider-azurerm", - "rev": "v3.5.0", - "sha256": "sha256-LF2Mqj/w1AtoYVGkZJsFpz81cfoUR80PURIsYoIYfsI=", + "rev": "v3.6.0", + "sha256": "sha256-brC9HZbyettgvwuFjrPxeRg/msQ1leD7F/h9aUxXAYo=", "vendorSha256": null, - "version": "3.5.0" + "version": "3.6.0" }, "azurestack": { "owner": "hashicorp", @@ -157,10 +157,10 @@ "owner": "DrFaust92", "provider-source-address": "registry.terraform.io/DrFaust92/bitbucket", "repo": "terraform-provider-bitbucket", - "rev": "v2.15.0", - "sha256": "sha256-m9LNW73CZHfOHX7qIn5Xm5JbMoV6ADGpxL9HNn8E+kA=", - "vendorSha256": "sha256-L8QYz1xgw8ZQjrU33uP18XxNUjImPYATZ02h46G4aXs=", - "version": "2.15.0" + "rev": "v2.17.0", + "sha256": "sha256-nzwfhwiszzhoobq2PlgtKfCch46fLoBVbembzdnkrD4=", + "vendorSha256": "sha256-LLhnF0/tj44vN36yss1JzNvDYy64Iuk5WVRhehf0wkk=", + "version": "2.17.0" }, "brightbox": { "owner": "brightbox", @@ -384,10 +384,10 @@ "owner": "fastly", "provider-source-address": "registry.terraform.io/fastly/fastly", "repo": "terraform-provider-fastly", - "rev": "v1.1.4", - "sha256": "sha256-sLVeVXVCvhSx51B4unYEOs0UpNsChF9guB22gpsratw=", + "rev": "v2.0.0", + "sha256": "sha256-sk146gyBgMWV+EJUrQuC6XY3rRCegezYLympPqqkI2s=", "vendorSha256": null, - "version": "1.1.4" + "version": "2.0.0" }, "flexibleengine": { "owner": "FlexibleEngineCloud", @@ -512,10 +512,10 @@ "owner": "loafoe", "provider-source-address": "registry.terraform.io/loafoe/htpasswd", "repo": "terraform-provider-htpasswd", - "rev": "v1.0.2", - "sha256": "sha256-U8rArNTOmiB06Vrvet6PnkIuylRzswJvVptijvcuVFQ=", - "vendorSha256": "sha256-rotGWkaNbsU+9tGENvkNkR7C3d6334hfPNcvJaZDSKw=", - "version": "1.0.2" + "rev": "v1.0.3", + "sha256": "sha256-rh1AuD2azYj9bCFPFI9z/1cx6K/pHAEixUG1JXoyPEw=", + "vendorSha256": "sha256-FBWwgULCuNilfrGNMETJk7SSOIRFYGpD2L9ExeyFWqE=", + "version": "1.0.3" }, "http": { "owner": "hashicorp", @@ -530,10 +530,10 @@ "owner": "huaweicloud", "provider-source-address": "registry.terraform.io/huaweicloud/huaweicloud", "repo": "terraform-provider-huaweicloud", - "rev": "v1.35.2", - "sha256": "sha256-D1ZaYz+leYU2UNq9c589KVISSNdcjFnDO4JccSVRPYw=", + "rev": "v1.36.0", + "sha256": "sha256-bf/w6BxXOL/Fup8NmYi86tGK3HIYGaYWUSAZ0yUazb8=", "vendorSha256": null, - "version": "1.35.2" + "version": "1.36.0" }, "huaweicloudstack": { "owner": "huaweicloud", @@ -584,10 +584,10 @@ "owner": "Mongey", "provider-source-address": "registry.terraform.io/Mongey/kafka", "repo": "terraform-provider-kafka", - "rev": "v0.4.3", - "sha256": "sha256-6JPwj1BtKOICNIDf7k0gEjVAQAeOZ++f9wvX5aVgOjM=", - "vendorSha256": "sha256-Uw3QFtC1tYtx69vxH3NktTbaav8aLAUagagL0c2gjJ0=", - "version": "0.4.3" + "rev": "v0.5.0", + "sha256": "sha256-1SZkCuAmYlfzYVpS+qrNN+vl3zrFZGUgdrrgKj0VRUE=", + "vendorSha256": "sha256-6wccODr/eJUh5eeDGDCuuK2pCFmvPlXWmdAUnjBHJ5E=", + "version": "0.5.0" }, "kafka-connect": { "owner": "Mongey", @@ -602,10 +602,10 @@ "owner": "mrparkers", "provider-source-address": "registry.terraform.io/mrparkers/keycloak", "repo": "terraform-provider-keycloak", - "rev": "v3.8.0", - "sha256": "sha256-TVSP0oORtiVkPGjgiHHJAsaWDhlN5lnpC3eJ4Ogf2Ss=", + "rev": "v3.8.1", + "sha256": "sha256-++yoMIn6K4VwAGyRVe/MUjMU46gBeHjIRF2nrXktC7E=", "vendorSha256": "sha256-8x0MlwAzeA2O6wXXHSk++K0ePmzE9/2lfo2ID83LzRM=", - "version": "3.8.0" + "version": "3.8.1" }, "ksyun": { "owner": "kingsoftcloud", @@ -656,10 +656,10 @@ "owner": "linode", "provider-source-address": "registry.terraform.io/linode/linode", "repo": "terraform-provider-linode", - "rev": "v1.27.1", - "sha256": "sha256-rEXGKytKdlHO3RcZT+3e85cGfQ6b7mhdcFK+unw44ug=", + "rev": "v1.27.2", + "sha256": "sha256-Do9HOtgnSNnSUp3SSVwyzx9LPFSig/tO3GSigUrRcf4=", "vendorSha256": "sha256-ZJQAZk4TaKT+hLM46gtV1XmBCtwuKwtoom9tPGaOWhc=", - "version": "1.27.1" + "version": "1.27.2" }, "linuxbox": { "owner": "numtide", @@ -728,10 +728,10 @@ "owner": "aminueza", "provider-source-address": "registry.terraform.io/aminueza/minio", "repo": "terraform-provider-minio", - "rev": "v1.5.1", - "sha256": "sha256-guSUdCBbfgwlrBW/592SqS7LSP7mB8cufrDC48K61Is=", - "vendorSha256": "sha256-Xp/Vl+z+hqElg/iCDBTtB6Xy2Ppk1oUAndVQM5hvlRg=", - "version": "1.5.1" + "rev": "v1.5.2", + "sha256": "sha256-QERV6Q/vYm1DWV91aYFCgZtFfnK9V2ATNsIAbuGzgdY=", + "vendorSha256": "sha256-SB7R466O3CbVwk6JSWXiFK4AD0rf6zijVfQW0rlEsVA=", + "version": "1.5.2" }, "mongodbatlas": { "owner": "mongodb", @@ -755,10 +755,10 @@ "owner": "NaverCloudPlatform", "provider-source-address": "registry.terraform.io/NaverCloudPlatform/ncloud", "repo": "terraform-provider-ncloud", - "rev": "v2.2.7", - "sha256": "sha256-5WZOZBFZkJtPdWmxznv/ML6d+UTr+qw+SbBuaG+bGS8=", + "rev": "v2.2.8", + "sha256": "sha256-G12/+tNSMEPCPCJH//MhRKJoRSex3mS7BZt0C2o0pF0=", "vendorSha256": "sha256-ovHg4GcbMzjEi+qJBpdqhR0YUakZCdnpc10SCu8FP8I=", - "version": "2.2.7" + "version": "2.2.8" }, "netlify": { "owner": "AegirHealth", @@ -773,10 +773,10 @@ "owner": "newrelic", "provider-source-address": "registry.terraform.io/newrelic/newrelic", "repo": "terraform-provider-newrelic", - "rev": "v2.44.0", - "sha256": "sha256-CR1GPm8K/9ZOFYvgKqMW63sbnRx0HyAYYESC/ZnBNYI=", - "vendorSha256": "sha256-2m5T6+GJTUDS345GDOW7Yf8X+JpxvtdYvInBjNvNXlg=", - "version": "2.44.0" + "rev": "v2.45.1", + "sha256": "sha256-KA4uvhK54JgzjAeIMvlLWQjul8ZZFbvmXyQTqOonxYY=", + "vendorSha256": "sha256-8nEbs5lDpXZ49QkIC1oRxZm+gVGx9xqDHe6jK8wWOA8=", + "version": "2.45.1" }, "nomad": { "owner": "hashicorp", @@ -800,10 +800,10 @@ "owner": "vmware", "provider-source-address": "registry.terraform.io/vmware/nsxt", "repo": "terraform-provider-nsxt", - "rev": "v3.2.6", - "sha256": "sha256-1uQMjzqMJ1NQVVCXy5aHrrZ4vDK5s1JqUnLyYf1qLVw=", + "rev": "v3.2.7", + "sha256": "sha256-Og/U9bmaZIN7b/JcMnNkt6c3/H+toe4dFYNaQYfxLPM=", "vendorSha256": null, - "version": "3.2.6" + "version": "3.2.7" }, "null": { "owner": "hashicorp", @@ -828,10 +828,10 @@ "owner": "oracle", "provider-source-address": "registry.terraform.io/oracle/oci", "repo": "terraform-provider-oci", - "rev": "v4.74.0", - "sha256": "sha256-hZpEhhI2pqOPLQm6XnVGIccyC1kVmLusUzF3KRbAHys=", + "rev": "v4.75.0", + "sha256": "sha256-tcDo7yvlobHf4+0BuPdifrkA8UPhI0txRCBgToTjIcw=", "vendorSha256": null, - "version": "4.74.0" + "version": "4.75.0" }, "okta": { "owner": "okta", @@ -927,10 +927,10 @@ "owner": "PaloAltoNetworks", "provider-source-address": "registry.terraform.io/PaloAltoNetworks/panos", "repo": "terraform-provider-panos", - "rev": "v1.10.0", - "sha256": "1nh1kc8pz10014p6dw8l2qdiqxdgcj5yy3da2qhbarwn0qm9fs36", + "rev": "v1.10.1", + "sha256": "sha256-acxObc7cgZgyxoCQusrkUzFC68cT3WhExiw2LscKoiQ=", "vendorSha256": null, - "version": "1.10.0" + "version": "1.10.1" }, "pass": { "owner": "camptocamp", @@ -999,10 +999,10 @@ "owner": "scaleway", "provider-source-address": "registry.terraform.io/scaleway/scaleway", "repo": "terraform-provider-scaleway", - "rev": "v2.2.1-rc.3", - "sha256": "sha256-XprfY4Zy3PIrIJA2F1tnwafg4wYuzrm9nwVZULdX1D0=", - "vendorSha256": "sha256-H5KAo2rpgFGYmOgGOx9Z5LuApmftuYA6PfYCjnr7zC0=", - "version": "2.2.1-rc.3" + "rev": "v2.2.1", + "sha256": "sha256-a3tSxGTRYQeGfaJOR8z1Qd0SeuoiLwrEbdlw3B9gc2A=", + "vendorSha256": "sha256-D/pE1uEpkWIuICNJsuWVHfRNGPf73YliFxqODkl+4QY=", + "version": "2.2.1" }, "secret": { "owner": "numtide", @@ -1071,19 +1071,19 @@ "owner": "carlpett", "provider-source-address": "registry.terraform.io/carlpett/sops", "repo": "terraform-provider-sops", - "rev": "v0.7.0", - "sha256": "sha256-Nkqc4w6dHsNEVsvmJcxLa9X9/qHProaZyOIoAADX52M=", - "vendorSha256": "sha256-ZBH8lAHYMVWsjyHkx17gX+0NstoC6PjdSmzCoShuFYQ=", - "version": "0.7.0" + "rev": "v0.7.1", + "sha256": "sha256-6FuThi6iuuUGcMhswAk3Z6Lxth/2nuI57A02Xu2s+/U=", + "vendorSha256": "sha256-NO1r/EWLgH1Gogru+qPeZ4sW7FuDENxzNnpLSKstnE8=", + "version": "0.7.1" }, "spotinst": { "owner": "spotinst", "provider-source-address": "registry.terraform.io/spotinst/spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.73.2", - "sha256": "sha256-Q5DNFJ1g6jfHQVYF5Xf5Phx/4b2nbUvE651JNp/zgJg=", + "rev": "v1.73.3", + "sha256": "sha256-J7hswjjyWOZrsqnhMGAyXnvrVwLRY9jGIdtwN7Dympc=", "vendorSha256": "sha256-szdzI/42RExYQlHnm178RM3wlKOLax+nwgRVzonxXoI=", - "version": "1.73.2" + "version": "1.73.3" }, "stackpath": { "owner": "stackpath", @@ -1107,10 +1107,10 @@ "owner": "SumoLogic", "provider-source-address": "registry.terraform.io/SumoLogic/sumologic", "repo": "terraform-provider-sumologic", - "rev": "v2.14.0", - "sha256": "sha256-rLRU51l4cOBrC+HxVgtAay1L6VJt6qVgWUeYfJ9zSmE=", + "rev": "v2.15.0", + "sha256": "sha256-VAYU1v5uCIcbeLri6tG5RIAgDP4SzZxQDtK9P5gdSPc=", "vendorSha256": "sha256-7DGY+L41bJJrtLwdWgu2aMCefgcmtR6tmH12foi68Kc=", - "version": "2.14.0" + "version": "2.15.0" }, "template": { "owner": "hashicorp", @@ -1125,10 +1125,10 @@ "owner": "tencentcloudstack", "provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud", "repo": "terraform-provider-tencentcloud", - "rev": "v1.72.1", - "sha256": "sha256-vCCIHp8tpAn7PIIBMVXRSI9G420E1ijfYow9bfC3RKs=", + "rev": "v1.72.3", + "sha256": "sha256-NfrLaKPIAMWeRNVdWEg4wn7pFoLO1Hv3HsxFKkVewPc=", "vendorSha256": null, - "version": "1.72.1" + "version": "1.72.3" }, "tfe": { "owner": "hashicorp", @@ -1189,10 +1189,10 @@ "owner": "ucloud", "provider-source-address": "registry.terraform.io/ucloud/ucloud", "repo": "terraform-provider-ucloud", - "rev": "v1.31.1", - "sha256": "sha256-xY8JXjKdi/TXpbZ1dQf9Sp8dbcHYn1cdqiszEK3evg0=", + "rev": "v1.31.3", + "sha256": "sha256-qVBvslXU5pPGMXwaBJ5f0iw4jNLgnnJ4Avr+mhC103Q=", "vendorSha256": null, - "version": "1.31.1" + "version": "1.31.3" }, "utils": { "owner": "cloudposse", @@ -1270,10 +1270,10 @@ "owner": "vultr", "provider-source-address": "registry.terraform.io/vultr/vultr", "repo": "terraform-provider-vultr", - "rev": "v2.10.1", - "sha256": "sha256-Q4qdPfBXnhkr+zUbMvBnBqCDT0cbHFT8oNMTM6cP0SM=", + "rev": "v2.11.0", + "sha256": "sha256-5TtrjWQ6AXYCjOi6Qe3oJVp011s87XyU2CYnXb7hFII=", "vendorSha256": null, - "version": "2.10.1" + "version": "2.11.0" }, "wavefront": { "owner": "vmware",