From 9b8de39d04811cdddd367838e6ea3733963bc5a2 Mon Sep 17 00:00:00 2001
From: arcnmx <arcnmx@users.noreply.github.com>
Date: Thu, 13 Jan 2022 08:43:36 -0800
Subject: [PATCH 01/53] notmuch: install ruby bindings
previously ruby bindings were never actually installed into $out
---
.../networking/mailreaders/notmuch/default.nix | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix
index 2a95453f7ae3..e39e713efd7b 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix
@@ -7,6 +7,7 @@
, ruby
, which, dtach, openssl, bash, gdb, man
, withEmacs ? true
+, withRuby ? true
}:
stdenv.mkDerivation rec {
@@ -29,15 +30,15 @@ stdenv.mkDerivation rec {
pythonPackages.sphinx # (optional) documentation -> doc/INSTALL
texinfo # (optional) documentation -> doc/INSTALL
pythonPackages.cffi
- ] ++ lib.optional withEmacs emacs;
+ ] ++ lib.optional withEmacs emacs
+ ++ lib.optional withRuby ruby;
buildInputs = [
gnupg # undefined dependencies
xapian gmime talloc zlib # dependencies described in INSTALL
perl
pythonPackages.python
- ruby
- ];
+ ] ++ lib.optional withRuby ruby;
postPatch = ''
patchShebangs configure test/
@@ -56,7 +57,7 @@ stdenv.mkDerivation rec {
"--infodir=${placeholder "info"}/share/info"
] ++ lib.optional (!withEmacs) "--without-emacs"
++ lib.optional withEmacs "--emacslispdir=${placeholder "emacs"}/share/emacs/site-lisp"
- ++ lib.optional (isNull ruby) "--without-ruby";
+ ++ lib.optional (!withRuby) "--without-ruby";
# Notmuch doesn't use autoconf and consequently doesn't tag --bindir and
# friends
@@ -87,6 +88,12 @@ stdenv.mkDerivation rec {
postInstall = lib.optionalString withEmacs ''
moveToOutput bin/notmuch-emacs-mua $emacs
+ '' + lib.optionalString withRuby ''
+ make -C bindings/ruby install \
+ vendordir=$out/lib/ruby \
+ SHELL=$SHELL \
+ $makeFlags "''${makeFlagsArray[@]}" \
+ $installFlags "''${installFlagsArray[@]}"
'';
passthru = {
From ed4ac9fc55a3875cd223a69518e03290d5038497 Mon Sep 17 00:00:00 2001
From: arcnmx <arcnmx@users.noreply.github.com>
Date: Sat, 22 Jan 2022 09:02:44 -0800
Subject: [PATCH 02/53] notmuch: place ruby bindings in their own output
---
.../applications/networking/mailreaders/notmuch/default.nix | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix
index e39e713efd7b..aa46529bdbac 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix
@@ -65,7 +65,9 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
makeFlags = [ "V=1" ];
- outputs = [ "out" "man" "info" ] ++ lib.optional withEmacs "emacs";
+ outputs = [ "out" "man" "info" ]
+ ++ lib.optional withEmacs "emacs"
+ ++ lib.optional withRuby "ruby";
preCheck = let
test-database = fetchurl {
@@ -90,7 +92,7 @@ stdenv.mkDerivation rec {
moveToOutput bin/notmuch-emacs-mua $emacs
'' + lib.optionalString withRuby ''
make -C bindings/ruby install \
- vendordir=$out/lib/ruby \
+ vendordir=$ruby/lib/ruby \
SHELL=$SHELL \
$makeFlags "''${makeFlagsArray[@]}" \
$installFlags "''${installFlagsArray[@]}"
From 3e75fb9ab001c8cc103bc101fc5cc69d06aca4c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Vitor=20de=20Lima=20Matos?=
<andre.vmatos@gmail.com>
Date: Wed, 2 Feb 2022 10:06:58 -0500
Subject: [PATCH 03/53] linux_zen: 5.16.3-zen1 -> 5.16.8-zen1
---
pkgs/os-specific/linux/kernel/linux-zen.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/os-specific/linux/kernel/linux-zen.nix b/pkgs/os-specific/linux/kernel/linux-zen.nix
index c1f2429d1239..1432eb5598ee 100644
--- a/pkgs/os-specific/linux/kernel/linux-zen.nix
+++ b/pkgs/os-specific/linux/kernel/linux-zen.nix
@@ -2,7 +2,7 @@
let
# having the full version string here makes it easier to update
- modDirVersion = "5.16.3-zen1";
+ modDirVersion = "5.16.8-zen1";
parts = lib.splitString "-" modDirVersion;
version = lib.elemAt parts 0;
suffix = lib.elemAt parts 1;
@@ -19,7 +19,7 @@ buildLinux (args // {
owner = "zen-kernel";
repo = "zen-kernel";
rev = "v${modDirVersion}";
- sha256 = "sha256-7OoNbDYTFpgE47oNhVA54nAj0keRyYMJvuccFW3ah4c=";
+ sha256 = "sha256-/CYPuj+P5KlYFur0X2FYrrJFUDhKVL7xm53uOSym+Rc=";
};
structuredExtraConfig = with lib.kernel; {
From f569a40a573417e0af8a80a3d49eee8b48c44ea0 Mon Sep 17 00:00:00 2001
From: Renaud <c0bw3b@users.noreply.github.com>
Date: Wed, 9 Feb 2022 20:03:08 +0100
Subject: [PATCH 04/53] rng-tools: 6.14 -> 6.15
Bugfix release:
https://github.com/nhorman/rng-tools/releases/tag/v6.15
---
pkgs/tools/security/rng-tools/default.nix | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/pkgs/tools/security/rng-tools/default.nix b/pkgs/tools/security/rng-tools/default.nix
index 7d8de48800a0..f77417aaaa45 100644
--- a/pkgs/tools/security/rng-tools/default.nix
+++ b/pkgs/tools/security/rng-tools/default.nix
@@ -4,6 +4,7 @@
, autoreconfHook
, libtool
, pkg-config
+, psmisc
, argp-standalone ? null
, openssl
, jitterentropy ? null, withJitterEntropy ? true
@@ -24,13 +25,13 @@ with lib;
stdenv.mkDerivation rec {
pname = "rng-tools";
- version = "6.14";
+ version = "6.15";
src = fetchFromGitHub {
owner = "nhorman";
repo = pname;
rev = "v${version}";
- hash = "sha256-NTXp2l5gVxKhO4Gqcy4VzomYU5B3HydkefMvdzypK8M=";
+ hash = "sha256-km+MEng3VWZF07sdvGLbAG/vf8/A1DxhA/Xa2Y+LAEQ=";
};
nativeBuildInputs = [ autoreconfHook libtool pkg-config ];
@@ -59,6 +60,7 @@ stdenv.mkDerivation rec {
doCheck = true;
preCheck = "patchShebangs tests/*.sh";
+ checkInputs = [ psmisc ]; # rngtestjitter.sh needs killall
doInstallCheck = true;
installCheckPhase = ''
From bfd0500a96787483b5c379b4098e0e57a8d4068c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 12 Feb 2022 04:48:41 +0000
Subject: [PATCH 05/53] crd2pulumi: 1.1.0 -> 1.2.0
---
pkgs/development/tools/crd2pulumi/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/tools/crd2pulumi/default.nix b/pkgs/development/tools/crd2pulumi/default.nix
index 51077c3178a3..a1d5a69e94af 100644
--- a/pkgs/development/tools/crd2pulumi/default.nix
+++ b/pkgs/development/tools/crd2pulumi/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "crd2pulumi";
- version = "1.1.0";
+ version = "1.2.0";
src = fetchFromGitHub {
owner = "pulumi";
repo = "crd2pulumi";
rev = "v${version}";
- sha256 = "sha256-7eNjOVTbZVpjQZPo69DgVCLCXqWnb0UVKd/DIY9Tq08=";
+ sha256 = "sha256-jGCtHDceJMGG2WHRldEyToZRNp3ZTt4Tir7DAsaWgfI=";
};
vendorSha256 = "sha256-XM1uedApVLkFzUpNPYS5YyMiWrOpzTvqKjWIV7s/1mI=";
From 2ad49320c26c65323591ef8c02a43d687a056fa4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 12 Feb 2022 09:20:05 +0000
Subject: [PATCH 06/53] google-guest-oslogin: 20211213.00 -> 20220205.00
---
pkgs/tools/virtualization/google-guest-oslogin/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/tools/virtualization/google-guest-oslogin/default.nix b/pkgs/tools/virtualization/google-guest-oslogin/default.nix
index 6dceeecfd6e9..50ead9de726f 100644
--- a/pkgs/tools/virtualization/google-guest-oslogin/default.nix
+++ b/pkgs/tools/virtualization/google-guest-oslogin/default.nix
@@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "google-guest-oslogin";
- version = "20211213.00";
+ version = "20220205.00";
src = fetchFromGitHub {
owner = "GoogleCloudPlatform";
repo = "guest-oslogin";
rev = version;
- sha256 = "sha256-8RuLYdWfk8zPfoF06r5E/6eHQ7tziZbgGhZlLCUW600=";
+ sha256 = "sha256-CVJAWda8bn5MPO8ACLtosVvZzuxPbOj377WaysZdhDU=";
};
postPatch = ''
From 31b5e1998dc2223832180f5e3906d5dfd2438b8d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 13 Feb 2022 00:04:43 +0100
Subject: [PATCH 07/53] postfix: 3.6.4 -> 3.6.5
http://www.postfix.org/announcements/postfix-3.6.5.html
---
pkgs/servers/mail/postfix/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix
index 064d138d3985..08c55f771724 100644
--- a/pkgs/servers/mail/postfix/default.nix
+++ b/pkgs/servers/mail/postfix/default.nix
@@ -24,11 +24,11 @@ let
in stdenv.mkDerivation rec {
pname = "postfix";
- version = "3.6.4";
+ version = "3.6.5";
src = fetchurl {
url = "http://cdn.postfix.johnriley.me/mirrors/postfix-release/official/${pname}-${version}.tar.gz";
- hash = "sha256-jeBhnc8vp8IVqAz4S4KrcWMdTUciy6CUlyXOPhgDHU4=";
+ hash = "sha256-MA+ogRzqINAdJcYZ01m/+rgmVucE2qcZ4MmvxOz/SAg=";
};
nativeBuildInputs = [ makeWrapper m4 ];
From bfcd989454921a20a81ab16d2032204afe5697df Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 13 Feb 2022 00:19:34 +0000
Subject: [PATCH 08/53] promscale: 0.8.0 -> 0.9.0
---
pkgs/servers/monitoring/prometheus/promscale/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/servers/monitoring/prometheus/promscale/default.nix b/pkgs/servers/monitoring/prometheus/promscale/default.nix
index c318a18a9d9e..4a2df19451fe 100644
--- a/pkgs/servers/monitoring/prometheus/promscale/default.nix
+++ b/pkgs/servers/monitoring/prometheus/promscale/default.nix
@@ -7,20 +7,20 @@
buildGoModule rec {
pname = "promscale";
- version = "0.8.0";
+ version = "0.9.0";
src = fetchFromGitHub {
owner = "timescale";
repo = pname;
rev = version;
- sha256 = "sha256-h76NHEPY3ABq2NbRQXNR+zSkriBasi550rfSkl3Xdas=";
+ sha256 = "sha256-snbQVkJ4J5ElVNfHuSfb7VCZ64TqJ8Lx5uUaJPqBHl4=";
};
patches = [
./0001-remove-jaeger-test-dep.patch
];
- vendorSha256 = "sha256-PxmTS8fSh21BcLS4PsSfHhKOXWWJLboPR6E8/Jx/UGY=";
+ vendorSha256 = "sha256-1t4WNoJrfKTtrpwi9p+L1WQR7mTsD70CRW+RYT7E9Lo=";
ldflags = [
"-s"
From cc758bc4bbdc7130de8654ed32b05abfcbc084bb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 13 Feb 2022 03:25:14 +0000
Subject: [PATCH 09/53] richgo: 0.3.9 -> 0.3.10
---
pkgs/development/tools/richgo/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/development/tools/richgo/default.nix b/pkgs/development/tools/richgo/default.nix
index 4e11b5a64d84..6cc063386ac7 100644
--- a/pkgs/development/tools/richgo/default.nix
+++ b/pkgs/development/tools/richgo/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "richgo";
- version = "0.3.9";
+ version = "0.3.10";
src = fetchFromGitHub {
owner = "kyoh86";
repo = "richgo";
rev = "v${version}";
- sha256 = "sha256-yVt0iFH9tYCeIWJC16ve988xBXgt96357YiHfsxai7g=";
+ sha256 = "sha256-USHg1KXl0MOWifiVu+KdjvrbDlAh6T/ReKFKeIpVK0A=";
};
- vendorSha256 = "sha256-IJjJ4X3mv2PUmwzt5/hgv1N6R0w+EXGSrCS4q+INJrA=";
+ vendorSha256 = "sha256-O63QEo0/+m9cYktMg4+RloLuUfAlCG0eGkxpHPFg/Cw=";
doCheck = false;
From 62d19c5e982986100d2e42b42e9413cc0e9141f2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 13 Feb 2022 05:17:40 +0000
Subject: [PATCH 10/53] sensu-go-agent: 6.4.1 -> 6.6.5
---
pkgs/servers/monitoring/sensu-go/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/servers/monitoring/sensu-go/default.nix b/pkgs/servers/monitoring/sensu-go/default.nix
index 9b07f299f729..0888fc92dbd3 100644
--- a/pkgs/servers/monitoring/sensu-go/default.nix
+++ b/pkgs/servers/monitoring/sensu-go/default.nix
@@ -4,19 +4,19 @@ let
generic = { subPackages, pname, postInstall ? "", mainProgram }:
buildGoModule rec {
inherit pname;
- version = "6.4.1";
+ version = "6.6.5";
shortRev = "3a1ac58"; # for internal version info
src = fetchFromGitHub {
owner = "sensu";
repo = "sensu-go";
rev = "v${version}";
- sha256 = "sha256-tVmjBfRvQQ1+VtARP1lN8Fu06tujZhZj9IpGVF0mKqA=";
+ sha256 = "sha256-mdql8bGSkPfs9wNxNUIIpux5t89CSjOQoFfHXTiScr4=";
};
inherit subPackages postInstall;
- vendorSha256 = "sha256-fStGEKAR9fzA6Uom6r59jFGTBUfTTj0TzytoJWuicbU=";
+ vendorSha256 = "sha256-ha8HHd2jYx+rKvRN3FPDZiO180bWciiiRD5yn2gztLk=";
doCheck = false;
From d9979c182c3596e7c120e4a8d3d0e270e1c8cac2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 13 Feb 2022 05:22:40 +0000
Subject: [PATCH 11/53] sentry-native: 0.4.14 -> 0.4.15
---
pkgs/development/libraries/sentry-native/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/libraries/sentry-native/default.nix b/pkgs/development/libraries/sentry-native/default.nix
index d7fa0f0ff072..1c29b85bebe7 100644
--- a/pkgs/development/libraries/sentry-native/default.nix
+++ b/pkgs/development/libraries/sentry-native/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "sentry-native";
- version = "0.4.14";
+ version = "0.4.15";
src = fetchFromGitHub {
owner = "getsentry";
repo = "sentry-native";
rev = version;
- sha256 = "sha256-DMVMS7Mshglg7+QkHzZvmZ2dhEFbQRqcHU98JiaysCg=";
+ sha256 = "sha256-XHJa4erDxSFiy0u8S9ODQlMNDb1wrz+d1PzWeq5BZLY=";
};
nativeBuildInputs = [ cmake ];
From 8ddadffbd068de20d044ecc1fc8d468b48a75712 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 13 Feb 2022 06:52:39 +0000
Subject: [PATCH 12/53] srain: 1.3.1 -> 1.3.2
---
pkgs/applications/networking/irc/srain/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/networking/irc/srain/default.nix b/pkgs/applications/networking/irc/srain/default.nix
index 8cac8e144b85..2fb6fed15ca8 100644
--- a/pkgs/applications/networking/irc/srain/default.nix
+++ b/pkgs/applications/networking/irc/srain/default.nix
@@ -20,13 +20,13 @@
stdenv.mkDerivation rec {
pname = "srain";
- version = "1.3.1";
+ version = "1.3.2";
src = fetchFromGitHub {
owner = "SrainApp";
repo = "srain";
rev = version;
- sha256 = "sha256-jGt0DlxlR2J9bE5S9pqT45OZTqzsr+DiZ7pON5QbU/Y=";
+ sha256 = "sha256-JsXReGmdBtzMXhrT1cFlkBbw8j/SxzgXSeHcHlns2po=";
};
nativeBuildInputs = [
From de68f80a9a76fb79c29d1eceb168c02bea69c914 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 13 Feb 2022 08:09:59 +0000
Subject: [PATCH 13/53] stripe-cli: 1.7.11 -> 1.7.12
---
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 3fa947273543..ed20f688260a 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.11";
+ version = "1.7.12";
src = fetchFromGitHub {
owner = "stripe";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-a2GoTdt6l6Yayaz1n1VdKxwrziNuFk/MO/6PvjqRxVM=";
+ sha256 = "sha256-xDhLd1tCw+W3xXxBgHDKZtMZszXsNelv2dMygHNVq64=";
};
vendorSha256 = "sha256-AsEem/KuA+jxioG96Ofn0te93fyZ9sebPkLPA+LAUkk=";
From c3d43d2fab38f33e230b27c091078f2894f2420f Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Sun, 13 Feb 2022 09:25:32 +0100
Subject: [PATCH 14/53] mutt: 2.1.5 -> 2.2.0
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
pkgs/applications/networking/mailreaders/mutt/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix
index 98298d854d5f..8b4ce7032ca9 100644
--- a/pkgs/applications/networking/mailreaders/mutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/mutt/default.nix
@@ -27,11 +27,11 @@ with lib;
stdenv.mkDerivation rec {
pname = "mutt";
- version = "2.1.5";
+ version = "2.2.0";
src = fetchurl {
url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz";
- sha256 = "1q1bq5qfv67s6ynbqga19ifaprgavhdbgg154kb9ffingvj0k8wj";
+ sha256 = "052k6kiw6yglgcbs1liynh4hf5ac56ychpivrbw85jh3dpq9fig8";
};
patches = optional smimeSupport (fetchpatch {
From 9884dc9e42ac7df24800cce16a4d175f4b890004 Mon Sep 17 00:00:00 2001
From: Matthias Thym <git@thym.at>
Date: Sun, 13 Feb 2022 09:38:36 +0100
Subject: [PATCH 15/53] qownnotes: 22.2.2 -> 22.2.4
---
pkgs/applications/office/qownnotes/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix
index 7cac4baefafc..58fa569bdf00 100644
--- a/pkgs/applications/office/qownnotes/default.nix
+++ b/pkgs/applications/office/qownnotes/default.nix
@@ -5,13 +5,13 @@
mkDerivation rec {
pname = "qownnotes";
- version = "22.2.2";
+ version = "22.2.4";
src = fetchurl {
url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz";
# Fetch the checksum of current version with curl:
# curl https://download.tuxfamily.org/qownnotes/src/qownnotes-<version>.tar.xz.sha256
- sha256 = "sha256-b2yoy1WhnPTE2fNeHVvkwKLzjeaSBhHiQgSZ9VHwkGY=";
+ sha256 = "d4edaa353039beacab7c324496a165919709814be60d9d7536f9118aab1e4f7e";
};
nativeBuildInputs = [ qmake qttools ];
From e1cdf09dc77a55556392011dc26a8760493c25d6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 13 Feb 2022 08:52:58 +0000
Subject: [PATCH 16/53] symfony-cli: 5.3.3 -> 5.3.4
---
pkgs/development/tools/symfony-cli/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/tools/symfony-cli/default.nix b/pkgs/development/tools/symfony-cli/default.nix
index 5b084aaad3ef..1e182b888cee 100644
--- a/pkgs/development/tools/symfony-cli/default.nix
+++ b/pkgs/development/tools/symfony-cli/default.nix
@@ -2,14 +2,14 @@
buildGoModule rec {
pname = "symfony-cli";
- version = "5.3.3";
+ version = "5.3.4";
vendorSha256 = "sha256-i4p9kEe0eT2L4U/DjkWlLVqgGT5ZJaoGyFAoYyxmoyI=";
src = fetchFromGitHub {
owner = "symfony-cli";
repo = "symfony-cli";
rev = "v${version}";
- sha256 = "sha256-qLgcv6vjPiNJZuZzW0mSKxySz0GdNALtyZ6E3fL3B6Y=";
+ sha256 = "sha256-6k1yMGW/UYCFB1APGlcU8bjNcCD7/IXhG+RJR6ii56I=";
};
# Tests requires network access
From 4eb39a02da0671817a2619f0b5c269738af83da2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 13 Feb 2022 10:12:34 +0000
Subject: [PATCH 17/53] tiled: 1.8.0 -> 1.8.1
---
pkgs/applications/editors/tiled/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix
index 9207d375f30e..688b8d7f04db 100644
--- a/pkgs/applications/editors/tiled/default.nix
+++ b/pkgs/applications/editors/tiled/default.nix
@@ -3,13 +3,13 @@
mkDerivation rec {
pname = "tiled";
- version = "1.8.0";
+ version = "1.8.1";
src = fetchFromGitHub {
owner = "bjorn";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-rJY2PNUxKAv+uQKBwu5kPuwyWkzOK9bg8NJViSgG29I=";
+ sha256 = "sha256-JmnJUpbOPAkURTgRDLuTf1Mqh+simog1BE6s5+mA20Q=";
};
nativeBuildInputs = [ pkg-config qmake ];
From b7229541c621ee57d05a47b736c4d6ae2a187b3f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 13 Feb 2022 10:29:53 +0000
Subject: [PATCH 18/53] tiv: 1.1.0 -> 1.1.1
---
pkgs/applications/misc/tiv/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/misc/tiv/default.nix b/pkgs/applications/misc/tiv/default.nix
index 1ee176166ea4..3a46d2db9be8 100644
--- a/pkgs/applications/misc/tiv/default.nix
+++ b/pkgs/applications/misc/tiv/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "tiv";
- version = "1.1.0";
+ version = "1.1.1";
src = fetchFromGitHub {
owner = "stefanhaustein";
repo = "TerminalImageViewer";
rev = "v${version}";
- sha256 = "17zqbwj2imk6ygyc142mw6v4fh7h4rd5vzn5wxr9gs0g8qdc6ixn";
+ sha256 = "sha256-mCgybL4af19zqECN1pBV+WnxMq2ZtlK5GDTQO3u9CK0=";
};
buildInputs = [ imagemagick ];
From 91a7fe0783686189a031a7961a829bbb20d3ba5d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 13 Feb 2022 10:52:23 +0000
Subject: [PATCH 19/53] python310Packages.pypinyin: 0.45.0 -> 0.46.0
---
pkgs/development/python-modules/pypinyin/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/pypinyin/default.nix b/pkgs/development/python-modules/pypinyin/default.nix
index c01878f3540a..210e6129199b 100644
--- a/pkgs/development/python-modules/pypinyin/default.nix
+++ b/pkgs/development/python-modules/pypinyin/default.nix
@@ -6,13 +6,13 @@
buildPythonPackage rec {
pname = "pypinyin";
- version = "0.45.0";
+ version = "0.46.0";
src = fetchFromGitHub {
owner = "mozillazg";
repo = "python-pinyin";
rev = "v${version}";
- sha256 = "0jz5b5a2bqz2pvx4imnlvz9n765b5yji27fmpijspalkpjcnpa4q";
+ sha256 = "sha256-KPyFvO6TR0mg09xcraHFaWklJgzF5oqk3d8H+G4gh3I=";
};
postPatch = ''
From 3507b350065e6e25e769a153f8a0b16c694f472e Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Sun, 13 Feb 2022 11:55:02 +0100
Subject: [PATCH 20/53] wine{Unstable,Staging}: 7.1 -> 7.2
---
pkgs/misc/emulators/wine/sources.nix | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index 5dcb0295ffed..b98aceddbd4d 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -46,16 +46,22 @@ in rec {
unstable = fetchurl rec {
# NOTE: Don't forget to change the SHA256 for staging as well.
- version = "7.1";
+ version = "7.2";
url = "https://dl.winehq.org/wine/source/7.x/wine-${version}.tar.xz";
- sha256 = "sha256-ETwTDu0vMlbJMv+7f0gqBTPtOsXGLJeWIqKm33+fY2o=";
- inherit (stable) gecko32 gecko64 mono patches;
+ sha256 = "sha256-38ZBUjyNvGZBaLYXREFjPZcSdUVr9n3i3KqZyNql7hU=";
+ inherit (stable) gecko32 gecko64 patches;
+
+ mono = fetchurl rec {
+ version = "7.1.1";
+ url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi";
+ sha256 = "sha256-ncjlYDt7xkNU65SuTqD2ghQkdno/9E/w0Z40akkMEeo=";
+ };
};
staging = fetchFromGitHub rec {
# https://github.com/wine-staging/wine-staging/releases
inherit (unstable) version;
- sha256 = "sha256-exMQG/T6ZJggd6S1yN4wyWuNqr6GjjdG4VutGUcqZhE=";
+ sha256 = "sha256-Ec9rienlsDg+2QkJqPrGorDb5NycG1/iGWhnqLZOrwg=";
owner = "wine-staging";
repo = "wine-staging";
rev = "v${version}";
From 1e96e20eb871480ef5d2f8cec6ec0fb2a8018bf8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 13 Feb 2022 10:55:04 +0000
Subject: [PATCH 21/53] python39Packages.ignite: 0.4.7 -> 0.4.8
---
pkgs/development/python-modules/ignite/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/ignite/default.nix b/pkgs/development/python-modules/ignite/default.nix
index c027eba98742..897b5975c90c 100644
--- a/pkgs/development/python-modules/ignite/default.nix
+++ b/pkgs/development/python-modules/ignite/default.nix
@@ -14,13 +14,13 @@
buildPythonPackage rec {
pname = "ignite";
- version = "0.4.7";
+ version = "0.4.8";
src = fetchFromGitHub {
owner = "pytorch";
repo = pname;
rev = "v${version}";
- sha256 = "11gvw0yqb3y5ddifs5f38bgslvfmw1bmd9rga1ynlrmmgmhxym6h";
+ sha256 = "sha256-S4wL1RyQ6aDW16wbSl+86VhSJ2S9oanYhNtPQdBtdrA=";
};
checkInputs = [ pytestCheckHook matplotlib mock pytest-xdist torchvision ];
From 423dd394153f467497fc8d80a48ce5f8a00aeb85 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 13 Feb 2022 11:04:38 +0000
Subject: [PATCH 22/53] python310Packages.pydal: 20220114.1 -> 20220213.2
---
pkgs/development/python-modules/pydal/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/pydal/default.nix b/pkgs/development/python-modules/pydal/default.nix
index 5457e44dc3b1..f1aacb1c312f 100644
--- a/pkgs/development/python-modules/pydal/default.nix
+++ b/pkgs/development/python-modules/pydal/default.nix
@@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "pydal";
- version = "20220114.1";
+ version = "20220213.2";
format = "setuptools";
src = fetchPypi {
inherit pname version;
- sha256 = "8c872f1fd6759eef497d72cf33fe57537be86ccf23515bd47e1f8a04d862236e";
+ sha256 = "sha256-7DBLcHSEkoT8wV6824TGWRLi9vK2t+r1RwwWmRBYD9I=";
};
postPatch = ''
From ca4c2693bc77540b487c36181a585b532a86e9f3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 13 Feb 2022 11:19:36 +0000
Subject: [PATCH 23/53] tytools: 0.9.3 -> 0.9.7
---
pkgs/development/embedded/tytools/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/embedded/tytools/default.nix b/pkgs/development/embedded/tytools/default.nix
index 027cfde2669a..23bab058c594 100644
--- a/pkgs/development/embedded/tytools/default.nix
+++ b/pkgs/development/embedded/tytools/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "tytools";
- version = "0.9.3";
+ version = "0.9.7";
src = fetchFromGitHub {
owner = "Koromix";
repo = pname;
rev = "v${version}";
- sha256 = "0ax6j17f5nm0q4sp8sg1412hd48qp7whdy7dd699kwjcm763bl5j";
+ sha256 = "sha256-iF2XyWSBBCO23iY/ni+QlpgtOuWKN2JTMTz+9OLEadk=";
};
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
From 54f8f15c3f387c7563b4039e9deebf1dfca8bc01 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 13 Feb 2022 11:29:18 +0000
Subject: [PATCH 24/53] python310Packages.google-cloud-container: 2.10.1 ->
2.10.3
---
.../python-modules/google-cloud-container/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/google-cloud-container/default.nix b/pkgs/development/python-modules/google-cloud-container/default.nix
index 7eb9808c7a2d..d20c005c9267 100644
--- a/pkgs/development/python-modules/google-cloud-container/default.nix
+++ b/pkgs/development/python-modules/google-cloud-container/default.nix
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "google-cloud-container";
- version = "2.10.1";
+ version = "2.10.3";
src = fetchPypi {
inherit pname version;
- sha256 = "939970cd09384dde6d6f6758b03648fd8f52fe5c2f83f73300575f7e4e3b2ee0";
+ sha256 = "sha256-hUbD9OPoqGEZG4lcprklU4EMIPoQrVAmtCtOKV6RB5w=";
};
propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 libcst proto-plus ];
From 3848550bc3a6a35baeb5c5b9623156c0034844d2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 13 Feb 2022 11:30:33 +0000
Subject: [PATCH 25/53] zsh-autocomplete: 21.09.22 -> 22.01.21
---
pkgs/shells/zsh/zsh-autocomplete/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/shells/zsh/zsh-autocomplete/default.nix b/pkgs/shells/zsh/zsh-autocomplete/default.nix
index a58a941189c9..14ea0ec8f63c 100644
--- a/pkgs/shells/zsh/zsh-autocomplete/default.nix
+++ b/pkgs/shells/zsh/zsh-autocomplete/default.nix
@@ -2,13 +2,13 @@
stdenvNoCC.mkDerivation rec {
pname = "zsh-autocomplete";
- version = "21.09.22";
+ version = "22.01.21";
src = fetchFromGitHub {
owner = "marlonrichert";
repo = "zsh-autocomplete";
rev = version;
- sha256 = "sha256-c4+5ta0ATuy9hIygSnqaquHf+YIStvHMaABwq3qyru8=";
+ sha256 = "sha256-+UziTYsjgpiumSulrLojuqHtDrgvuG91+XNiaMD7wIs=";
};
installPhase = ''
From 1555480a4a66661d35f87a41706a438552305fc1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 13 Feb 2022 11:40:33 +0000
Subject: [PATCH 26/53] v2ray-geoip: 202202030030 -> 202202100032
---
pkgs/data/misc/v2ray-geoip/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/data/misc/v2ray-geoip/default.nix b/pkgs/data/misc/v2ray-geoip/default.nix
index c1b6500a1abd..11c3c1cc1044 100644
--- a/pkgs/data/misc/v2ray-geoip/default.nix
+++ b/pkgs/data/misc/v2ray-geoip/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "v2ray-geoip";
- version = "202202030030";
+ version = "202202100032";
src = fetchFromGitHub {
owner = "v2fly";
repo = "geoip";
- rev = "ca550e313a264e05c1fb22f293bc64c7432049ef";
- sha256 = "sha256-gajlNfyaq8HwghBU6Gcq7lyqjVAmNcOgJKKsw5P+8Nc=";
+ rev = "0a16dba825e420425786ff74f51a6bb881a62624";
+ sha256 = "sha256-M3DitRNhvPh4AOocnG6omiQAPKgWziAcN4uO42/7BNE=";
};
installPhase = ''
From cb8b6ea473ef18a6b2768d3da19048c3d1cd19d3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 13 Feb 2022 12:18:38 +0000
Subject: [PATCH 27/53] wakatime: 1.18.7 -> 1.35.4
---
pkgs/tools/misc/wakatime/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/tools/misc/wakatime/default.nix b/pkgs/tools/misc/wakatime/default.nix
index 5cd52a6a4ac3..b9c9d73006aa 100644
--- a/pkgs/tools/misc/wakatime/default.nix
+++ b/pkgs/tools/misc/wakatime/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "wakatime";
- version = "1.18.7";
+ version = "1.35.4";
src = fetchFromGitHub {
owner = "wakatime";
repo = "wakatime-cli";
rev = "v${version}";
- sha256 = "171x4pixmh5ni89iawdjl1fk9gr10bgp5bnslpskhspcqzyl1y5b";
+ sha256 = "sha256-MG2ROWQh8A7LrdOnDWLG9AsHjzfv84KjmjZXhJlMrLQ=";
};
- vendorSha256 = "01c2vbnafhhm345nyfmvbvj5mga6laf9w46lhh0flq6kdgdw168s";
+ vendorSha256 = "sha256-8FaM83+d1VQ/9le2hD0nqErhH/jOHMxbNz2o4D3qWb8=";
meta = with lib; {
inherit (src.meta) homepage;
From 08a3f8b13d7c837f42b6f92f6373533be658b767 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 13 Feb 2022 13:01:51 +0000
Subject: [PATCH 28/53] vazir-fonts: 22.1.0 -> 30.1.0
---
pkgs/data/fonts/vazir-fonts/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/data/fonts/vazir-fonts/default.nix b/pkgs/data/fonts/vazir-fonts/default.nix
index a41013fd490c..9320d29ce7df 100755
--- a/pkgs/data/fonts/vazir-fonts/default.nix
+++ b/pkgs/data/fonts/vazir-fonts/default.nix
@@ -2,7 +2,7 @@
let
pname = "vazir-fonts";
- version = "22.1.0";
+ version = "30.1.0";
in fetchFromGitHub {
name = "${pname}-${version}";
@@ -14,7 +14,7 @@ in fetchFromGitHub {
tar xf $downloadedFile --strip=1
find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/truetype {} \;
'';
- sha256 = "1nh3pyyw3082aizdwgyihh4z122z7kzp45ry7lzdhq9lshkpzglc";
+ sha256 = "sha256-J1l6rBFgaXFtGnK0pH7GbaYTt5TI/OevjZrXmaEgkB4=";
meta = with lib; {
homepage = "https://github.com/rastikerdar/vazir-font";
From 488019c4e652b080bd94476dd84377118e9ddf63 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 13 Feb 2022 13:24:46 +0000
Subject: [PATCH 29/53] z-lua: 1.8.13 -> 1.8.14
---
pkgs/tools/misc/z-lua/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/tools/misc/z-lua/default.nix b/pkgs/tools/misc/z-lua/default.nix
index 751f68bf089d..16d126e4dd75 100644
--- a/pkgs/tools/misc/z-lua/default.nix
+++ b/pkgs/tools/misc/z-lua/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "z-lua";
- version = "1.8.13";
+ version = "1.8.14";
src = fetchFromGitHub {
owner = "skywind3000";
repo = "z.lua";
rev = version;
- sha256 = "sha256-74EWeLkSRrVsJuucdN8sSTl5fPmboViYW0qdovBZQ5U=";
+ sha256 = "sha256-Jy5fcXqXbuJTOAP8vpZjN0qmDR/cVACztcIxl4aXNKs=";
};
dontBuild = true;
From f975ee023359aa524389b9d4e7029d7b0cce1bad Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 13 Feb 2022 14:36:52 +0100
Subject: [PATCH 30/53] tts: pin librosa at 0.8.1
---
pkgs/tools/audio/tts/default.nix | 21 ++++++++++++++++++---
1 file changed, 18 insertions(+), 3 deletions(-)
diff --git a/pkgs/tools/audio/tts/default.nix b/pkgs/tools/audio/tts/default.nix
index 3a00ddc99593..4ee8644d7129 100644
--- a/pkgs/tools/audio/tts/default.nix
+++ b/pkgs/tools/audio/tts/default.nix
@@ -13,7 +13,22 @@
# For now, for deployment check the systemd unit in the pull request:
# https://github.com/NixOS/nixpkgs/pull/103851#issue-521121136
-python3.pkgs.buildPythonApplication rec {
+let
+ python = python3.override {
+ packageOverrides = self: super: {
+ # API breakage with 0.9.0
+ # TypeError: mel() takes 0 positional arguments but 2 positional arguments (and 3 keyword-only arguments) were given
+ librosa = super.librosa.overridePythonAttrs (oldAttrs: rec {
+ version = "0.8.1";
+ src = oldAttrs.src.override {
+ inherit version;
+ sha256 = "c53d05e768ae4a3e553ae21c2e5015293e5efbfd5c12d497f1104cb519cca6b3";
+ };
+ });
+ };
+ };
+in
+python.pkgs.buildPythonApplication rec {
pname = "tts";
version = "0.5.0";
format = "setuptools";
@@ -43,11 +58,11 @@ python3.pkgs.buildPythonApplication rec {
requirements.txt
'';
- nativeBuildInputs = with python3.pkgs; [
+ nativeBuildInputs = with python.pkgs; [
cython
];
- propagatedBuildInputs = with python3.pkgs; [
+ propagatedBuildInputs = with python.pkgs; [
anyascii
coqpit
flask
From cd356ef87219151145eac938880d8e2355e09758 Mon Sep 17 00:00:00 2001
From: arcnmx <arcnmx@users.noreply.github.com>
Date: Sun, 13 Feb 2022 06:22:39 -0800
Subject: [PATCH 31/53] terraform-providers.bitbucket: reintroduce (#159374)
* terraform-providers.bitbucket: reintroduce
* terraform-providers.bitbucket: 1.2.0 -> 2.4.1
This changes the upstream to an active fork of the original archived
provider.
---
.../networking/cluster/terraform-providers/default.nix | 1 -
.../cluster/terraform-providers/providers.json | 9 +++++++++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix
index 53e3aab63491..93be46bc7927 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix
@@ -70,7 +70,6 @@ let
in
lib.optionalAttrs (config.allowAliases or false) {
arukas = archived "2022/01";
- bitbucket = archived "2022/01";
chef = archived "2022/01";
cherryservers = archived "2022/01";
clc = archived "2022/01";
diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index d1cb172d3f51..03d8724b0bcd 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -144,6 +144,15 @@
"vendorSha256": null,
"version": "1.12.2"
},
+ "bitbucket": {
+ "owner": "DrFaust92",
+ "provider-source-address": "registry.terraform.io/DrFaust92/bitbucket",
+ "repo": "terraform-provider-bitbucket",
+ "rev": "v2.4.1",
+ "sha256": "07y0biab2g6plkyp8scqf7b12alijnxq2zqqr05lbm6wgrc22kvk",
+ "vendorSha256": null,
+ "version": "2.4.1"
+ },
"brightbox": {
"owner": "brightbox",
"provider-source-address": "registry.terraform.io/brightbox/brightbox",
From 235763873c4a674336f426e709735fb0944aa654 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 13 Feb 2022 07:04:05 +0000
Subject: [PATCH 32/53] php74Packages.php-cs-fixer: 3.4.0 -> 3.6.0
---
pkgs/development/php-packages/php-cs-fixer/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/php-packages/php-cs-fixer/default.nix b/pkgs/development/php-packages/php-cs-fixer/default.nix
index 8e3329ae0b11..bf1c806dfc38 100644
--- a/pkgs/development/php-packages/php-cs-fixer/default.nix
+++ b/pkgs/development/php-packages/php-cs-fixer/default.nix
@@ -1,14 +1,14 @@
{ mkDerivation, fetchurl, makeWrapper, lib, php }:
let
pname = "php-cs-fixer";
- version = "3.4.0";
+ version = "3.6.0";
in
mkDerivation {
inherit pname version;
src = fetchurl {
url = "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${version}/php-cs-fixer.phar";
- sha256 = "sha256-UlZ3L5JaFN988WaHeZZRdl9yif29zFO0LMiFDGkMFuQ=";
+ sha256 = "sha256-sbz8uq6nJ6dEL6FHJ01VTrovaJa8bwQ9Ic+dLr7yPnA=";
};
dontUnpack = true;
From 5fd5c86643bc0bed90e9df87b95bd98df716fe3d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 13 Feb 2022 17:10:40 +0000
Subject: [PATCH 33/53] tcpreplay: 4.4.0 -> 4.4.1
---
pkgs/tools/networking/tcpreplay/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/tools/networking/tcpreplay/default.nix b/pkgs/tools/networking/tcpreplay/default.nix
index f2bb52318761..45bc3a033945 100644
--- a/pkgs/tools/networking/tcpreplay/default.nix
+++ b/pkgs/tools/networking/tcpreplay/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "tcpreplay";
- version = "4.4.0";
+ version = "4.4.1";
src = fetchurl {
url = "https://github.com/appneta/tcpreplay/releases/download/v${version}/tcpreplay-${version}.tar.gz";
- sha256 = "sha256-o7ElwDGb0JbWj4IcSggFGy09kni6xv4Yz+PJIBcDpWc=";
+ sha256 = "sha256-y2e2SRphiGf8T5hI9YYBnxuy69FJ85OvrFVE7lXkVE8=";
};
buildInputs = [ libpcap ]
From de8a764559cf56bbedd16fa443ca1756c964946f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 13 Feb 2022 12:40:54 +0000
Subject: [PATCH 34/53] yamale: 4.0.2 -> 4.0.3
---
pkgs/development/python-modules/yamale/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/yamale/default.nix b/pkgs/development/python-modules/yamale/default.nix
index 670e46f98055..7444d8d24ac5 100644
--- a/pkgs/development/python-modules/yamale/default.nix
+++ b/pkgs/development/python-modules/yamale/default.nix
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "yamale";
- version = "4.0.2";
+ version = "4.0.3";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "23andMe";
repo = pname;
rev = version;
- sha256 = "sha256-hFBU3o3HpL0Schgzcx3oYq0IAUVGKThIfEteYcFbLnk=";
+ sha256 = "sha256-EkCKUSPRrj3g2AY17tquBDxf+nWfpdnILu5AS/2SsLo=";
};
propagatedBuildInputs = [
From 8102e35ed5bb178c78f72ff376df8c4a8b94adba Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 13 Feb 2022 09:05:29 +0000
Subject: [PATCH 35/53] python310Packages.sense-energy: 0.10.0 -> 0.10.1
---
pkgs/development/python-modules/sense-energy/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/development/python-modules/sense-energy/default.nix b/pkgs/development/python-modules/sense-energy/default.nix
index d458574c1e7c..10eacbccd431 100644
--- a/pkgs/development/python-modules/sense-energy/default.nix
+++ b/pkgs/development/python-modules/sense-energy/default.nix
@@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "sense-energy";
- version = "0.10.0";
+ version = "0.10.1";
format = "setuptools";
src = fetchFromGitHub {
owner = "scottbonline";
repo = "sense";
- rev = "v${version}";
- hash = "sha256-Q4EIAVtCV5n1Ediw4QItchM/GWjUEZi4+hi//xB3Eew=";
+ rev = version;
+ hash = "sha256-93o1UfoZ+Sb+lMg4Xdd4eGBEdrSCVSin5HJVnaRyp8o=";
};
propagatedBuildInputs = [
From 1cb2d4c19f5948e10041c8af77f4c439cfc53445 Mon Sep 17 00:00:00 2001
From: Kevin Amado <kamadorueda@gmail.com>
Date: Sat, 12 Feb 2022 20:01:10 -0500
Subject: [PATCH 36/53] alejandra: unstable-2022-02-10 -> unstable 2022-02-12
---
pkgs/tools/nix/alejandra/default.nix | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pkgs/tools/nix/alejandra/default.nix b/pkgs/tools/nix/alejandra/default.nix
index 92abdce68880..108316c56e0e 100644
--- a/pkgs/tools/nix/alejandra/default.nix
+++ b/pkgs/tools/nix/alejandra/default.nix
@@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "alejandra";
- version = "unstable-2022-02-10";
+ version = "unstable-2022-02-12";
src = fetchFromGitHub {
owner = "kamadorueda";
repo = "alejandra";
- rev = "0c095ed50d3bbfd50f9f97832f7ac8092a8c1289";
- hash = "sha256-eIPyrL8C3qQbEahoryS70cJ4FbXDdPQuWaM2jD2BbI0=";
+ rev = "bfda2490bcb6f7dab2d15f033f65441af283d48d";
+ hash = "sha256-D7dCtwwQcrSnC7MjoqB0ogCsCmrthqy+TqbqbJUT6zE=";
};
- cargoSha256 = "sha256-DyE0TV/dHbDFkFvF9h0+qi+p2XD8lDZzsUByfOt/UjA=";
+ cargoSha256 = "sha256-Gos0ku4wR0jP1FQLYBVMqZN4qW0Tx45qpIL99s6a+t8=";
meta = with lib; {
description = "The Uncompromising Nix Code Formatter";
From 8bd4ebee3289ad387903d38828bd6f12edbc7210 Mon Sep 17 00:00:00 2001
From: Kevin Amado <kamadorueda@gmail.com>
Date: Sat, 12 Feb 2022 19:56:52 -0500
Subject: [PATCH 37/53] vscode-extensions.kamadorueda.alejandra: init at 1.0.0
---
pkgs/misc/vscode-extensions/default.nix | 29 +++++++++++++++++++++++++
1 file changed, 29 insertions(+)
diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix
index 54081b4c7401..3db0f9d95267 100644
--- a/pkgs/misc/vscode-extensions/default.nix
+++ b/pkgs/misc/vscode-extensions/default.nix
@@ -14,6 +14,7 @@
, moreutils
, racket-minimal
, clojure-lsp
+, alejandra
}:
let
@@ -1231,6 +1232,34 @@ let
};
};
+ kamadorueda.alejandra = buildVscodeMarketplaceExtension {
+ mktplcRef = {
+ name = "alejandra";
+ publisher = "kamadorueda";
+ version = "1.0.0";
+ sha256 = "sha256-COlEjKhm8tK5XfOjrpVUDQ7x3JaOLiYoZ4MdwTL8ktk=";
+ };
+ nativeBuildInputs = [ jq moreutils ];
+ postInstall = ''
+ cd "$out/$installPrefix"
+
+ jq -e '
+ .contributes.configuration.properties."alejandra.program".default =
+ "${alejandra}/bin/alejandra" |
+ .contributes.configurationDefaults."alejandra.program" =
+ "${alejandra}/bin/alejandra"
+ ' \
+ < package.json \
+ | sponge package.json
+ '';
+ meta = with lib; {
+ description = "The Uncompromising Nix Code Formatter";
+ homepage = "https://github.com/kamadorueda/alejandra";
+ license = licenses.unlicense;
+ maintainers = with maintainers; [ kamadorueda ];
+ };
+ };
+
kubukoz.nickel-syntax = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "nickel-syntax";
From a69e3a8fa9128c1af54bf7653b531eabacbb5f8c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 13 Feb 2022 07:04:33 +0000
Subject: [PATCH 38/53] python310Packages.canopen: 1.2.1 -> 2.0.0
---
pkgs/development/python-modules/canopen/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/canopen/default.nix b/pkgs/development/python-modules/canopen/default.nix
index 51a6d0d11c0f..efa67780a9e6 100644
--- a/pkgs/development/python-modules/canopen/default.nix
+++ b/pkgs/development/python-modules/canopen/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "canopen";
- version = "1.2.1";
+ version = "2.0.0";
src = fetchPypi {
inherit pname version;
- sha256 = "18d01d56ff0023795cb336cafd4810a76cf402b98b42139b201fa8c5d4ba8c06";
+ sha256 = "sha256-vMiqnqg/etpdoNregQOJd75SqTgCwmV2SXKesfggZdk=";
};
nativeBuildInputs = [
From 79953e76a02233bd5c723e91eec29fe108fe86f3 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 13 Feb 2022 13:07:35 +0100
Subject: [PATCH 39/53] python3Packages.canopen: limit to later Python releases
---
pkgs/development/python-modules/canopen/default.nix | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/canopen/default.nix b/pkgs/development/python-modules/canopen/default.nix
index efa67780a9e6..ccb3626e2f48 100644
--- a/pkgs/development/python-modules/canopen/default.nix
+++ b/pkgs/development/python-modules/canopen/default.nix
@@ -5,15 +5,19 @@
, can
, canmatrix
, pytestCheckHook
+, pythonOlder
}:
buildPythonPackage rec {
pname = "canopen";
version = "2.0.0";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-vMiqnqg/etpdoNregQOJd75SqTgCwmV2SXKesfggZdk=";
+ hash = "sha256-vMiqnqg/etpdoNregQOJd75SqTgCwmV2SXKesfggZdk=";
};
nativeBuildInputs = [
@@ -29,7 +33,9 @@ buildPythonPackage rec {
pytestCheckHook
];
- pythonImportsCheck = [ "canopen" ];
+ pythonImportsCheck = [
+ "canopen"
+ ];
meta = with lib; {
homepage = "https://github.com/christiansandberg/canopen/";
From 68b71c5485246035504711d72147d5782135e2a5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 13 Feb 2022 12:18:43 +0000
Subject: [PATCH 40/53] python310Packages.jupytext: 1.13.6 -> 1.13.7
---
pkgs/development/python-modules/jupytext/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/jupytext/default.nix b/pkgs/development/python-modules/jupytext/default.nix
index b554ce129fb1..6e0668de1470 100644
--- a/pkgs/development/python-modules/jupytext/default.nix
+++ b/pkgs/development/python-modules/jupytext/default.nix
@@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "jupytext";
- version = "1.13.6";
+ version = "1.13.7";
format = "pyproject";
disabled = pythonOlder "3.6";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "mwouts";
repo = pname;
rev = "v${version}";
- sha256 = "0xvc4i3wwycaqx16qylglywa14ky7mikdv1jm3p7yz19cq5hr0fx";
+ sha256 = "sha256-DWK5ZoPL6Ek3dXHOlZfecQKLNwBqDjMZ77XZ7YLCXKI=";
};
buildInputs = [
From 48fb9875ca27f14d0ec79376fe955f1c83d17dcd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 12 Feb 2022 13:55:16 +0000
Subject: [PATCH 41/53] log4j-sniffer: 1.6.0 -> 1.8.0
---
pkgs/tools/security/log4j-sniffer/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/tools/security/log4j-sniffer/default.nix b/pkgs/tools/security/log4j-sniffer/default.nix
index 86b6bf00f54a..0bc08fb6e3c8 100644
--- a/pkgs/tools/security/log4j-sniffer/default.nix
+++ b/pkgs/tools/security/log4j-sniffer/default.nix
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "log4j-sniffer";
- version = "1.6.0";
+ version = "1.8.0";
src = fetchFromGitHub {
owner = "palantir";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-ffutvIxXhA0fCN6mSUwv6F+SO/ab6hLiaVJeatZo57w=";
+ sha256 = "sha256-NojFXonov/80p+6kimfbiMK/v4najiMe//xFDnOi5KE=";
};
vendorSha256 = null;
From 116facd4b47a9406c34125f0abe74035133e0637 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 12 Feb 2022 13:05:13 +0000
Subject: [PATCH 42/53] masterpdfeditor: 5.8.20 -> 5.8.33
---
pkgs/applications/misc/masterpdfeditor/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix
index a1788587d701..cab136d55dc9 100644
--- a/pkgs/applications/misc/masterpdfeditor/default.nix
+++ b/pkgs/applications/misc/masterpdfeditor/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "masterpdfeditor";
- version = "5.8.20";
+ version = "5.8.33";
src = fetchurl {
url = "https://code-industry.net/public/master-pdf-editor-${version}-qt5.x86_64.tar.gz";
- sha256 = "sha256-2YfjTRTC/ZvgnV4tEY4wwoqUeUG8+0SCYuRPBzQ8ba4=";
+ sha256 = "sha256-sgLF/NpaNlkL5iA1l7QzMiYKwRcMDu2DHdTIaeHOtfI=";
};
nativeBuildInputs = [ autoPatchelfHook wrapQtAppsHook ];
From 0cca3ab3f62b0876dea84a0b416a64815105e3a0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 12 Feb 2022 13:43:37 +0000
Subject: [PATCH 43/53] mrtg: 2.17.8 -> 2.17.10
---
pkgs/tools/misc/mrtg/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/tools/misc/mrtg/default.nix b/pkgs/tools/misc/mrtg/default.nix
index ee6c9776c54b..343a3d5c2a25 100644
--- a/pkgs/tools/misc/mrtg/default.nix
+++ b/pkgs/tools/misc/mrtg/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "mrtg";
- version = "2.17.8";
+ version = "2.17.10";
src = fetchurl {
url = "https://oss.oetiker.ch/mrtg/pub/${pname}-${version}.tar.gz";
- sha256 = "sha256-GsLgr2ng7N73VeeYylmDSreKwYXCpe/9t2hcWPLvAbQ=";
+ sha256 = "sha256-x/EcteIXpQDYfuO10mxYqGUu28DTKRaIu3krAQ+uQ6w=";
};
buildInputs = [
From 864919a9b958fe47385db6dadf994887a4de0265 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 12 Feb 2022 14:10:23 +0000
Subject: [PATCH 44/53] mackerel-agent: 0.72.3 -> 0.72.7
---
pkgs/servers/monitoring/mackerel-agent/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/servers/monitoring/mackerel-agent/default.nix b/pkgs/servers/monitoring/mackerel-agent/default.nix
index 13036f81de6d..0e1fc59dc15f 100644
--- a/pkgs/servers/monitoring/mackerel-agent/default.nix
+++ b/pkgs/servers/monitoring/mackerel-agent/default.nix
@@ -2,20 +2,20 @@
buildGoModule rec {
pname = "mackerel-agent";
- version = "0.72.3";
+ version = "0.72.7";
src = fetchFromGitHub {
owner = "mackerelio";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-o2+5kMHDigrLXjwdkMKSujW/Lov72WmRvw7/aew3s9w=";
+ sha256 = "sha256-SnEvY5pwjBHH/m9bB46bcEFvKy0r9lutft0YsuDvT8U=";
};
nativeBuildInputs = [ makeWrapper ];
checkInputs = lib.optionals (!stdenv.isDarwin) [ nettools ];
buildInputs = lib.optionals (!stdenv.isDarwin) [ iproute2 ];
- vendorSha256 = "sha256-h2z+R16XS3AJdG/4gZRLton1DKYrFElGXNjOaekAC0Q=";
+ vendorSha256 = "sha256-Pi/m/T4eBhKHH4Zl0hc13aQ0icolyAP/9sjXZwduKUA=";
subPackages = [ "." ];
From f56f0a68c634d83cbc1a7223495fa123c439f1f3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 12 Feb 2022 14:44:20 +0000
Subject: [PATCH 45/53] tartube: 2.3.332 -> 2.3.367
---
pkgs/applications/video/tartube/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/video/tartube/default.nix b/pkgs/applications/video/tartube/default.nix
index 74ce4446a195..3b333be7afef 100644
--- a/pkgs/applications/video/tartube/default.nix
+++ b/pkgs/applications/video/tartube/default.nix
@@ -15,13 +15,13 @@
python3Packages.buildPythonApplication rec {
pname = "tartube";
- version = "2.3.332";
+ version = "2.3.367";
src = fetchFromGitHub {
owner = "axcore";
repo = "tartube";
rev = "v${version}";
- sha256 = "1m7p4chpvbh4mswsymh89dksdgwhmnkpfbx9zi2jzqgkinfd6a2k";
+ sha256 = "sha256-ZoNe3Ibv0adM6Is5cWMqfUrr0U3R951IJFsdEm1bztc=";
};
nativeBuildInputs = [
From 640b3cb122f0418391ba89616ba3ca6aa7e5b5de Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 12 Feb 2022 13:11:56 +0000
Subject: [PATCH 46/53] mtdutils: 2.1.3 -> 2.1.4
---
pkgs/tools/filesystems/mtdutils/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/tools/filesystems/mtdutils/default.nix b/pkgs/tools/filesystems/mtdutils/default.nix
index 2e58018bf18d..1a6ca5f87000 100644
--- a/pkgs/tools/filesystems/mtdutils/default.nix
+++ b/pkgs/tools/filesystems/mtdutils/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "mtd-utils";
- version = "2.1.3";
+ version = "2.1.4";
src = fetchgit {
url = "git://git.infradead.org/mtd-utils.git";
rev = "v${version}";
- sha256 = "sha256-w20Zp1G0WbNvEJwqpLw2f8VvmW8ZBEL0GSHze8qpPWg";
+ sha256 = "sha256-lnvG2aJiihOyScmWZu0i8OYowmIMRBkgC3j67sdLkT4=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ] ++ lib.optional doCheck cmocka;
From 4c62413a4906ef3b2808d7f29f7f2e4db5c08b58 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 12 Feb 2022 14:55:55 +0000
Subject: [PATCH 47/53] monit: 5.29.0 -> 5.30.0
---
pkgs/tools/system/monit/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/tools/system/monit/default.nix b/pkgs/tools/system/monit/default.nix
index 93cdbe6d546e..96c1c91591dd 100644
--- a/pkgs/tools/system/monit/default.nix
+++ b/pkgs/tools/system/monit/default.nix
@@ -12,11 +12,11 @@
stdenv.mkDerivation rec {
pname = "monit";
- version = "5.29.0";
+ version = "5.30.0";
src = fetchurl {
url = "${meta.homepage}dist/monit-${version}.tar.gz";
- sha256 = "sha256-9mXm3R8mp0tWgomah3k0Fn3islguBIZS7PA2MYR3iF8=";
+ sha256 = "sha256-6FZJ36hYb0/N00oClcVd3Wmw7abPvaxHEFomc9ELEAg=";
};
nativeBuildInputs = [ bison flex ];
From 738944fd5fbd643b66e51960539f4eda640b044b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 12 Feb 2022 12:40:59 +0000
Subject: [PATCH 48/53] mongodb-tools: 100.5.1 -> 100.5.2
---
pkgs/tools/misc/mongodb-tools/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/tools/misc/mongodb-tools/default.nix b/pkgs/tools/misc/mongodb-tools/default.nix
index a4dc2ba905c1..b59a466e3d17 100644
--- a/pkgs/tools/misc/mongodb-tools/default.nix
+++ b/pkgs/tools/misc/mongodb-tools/default.nix
@@ -17,7 +17,7 @@ let
"mongofiles"
"mongotop"
];
- version = "100.5.1";
+ version = "100.5.2";
in buildGoPackage {
pname = "mongo-tools";
@@ -30,7 +30,7 @@ in buildGoPackage {
rev = version;
owner = "mongodb";
repo = "mongo-tools";
- sha256 = "sha256-Qxtb7DJOgrCUvoGVgmKh4qKS4duvEWwW9BLkdt5M5ZY=";
+ sha256 = "sha256-qYTfC7+5XWDCyQQFKmuPmDmwsekDdY6OAerxZgzf8D0=";
};
nativeBuildInputs = [ pkg-config ];
From 838c1a01a5c44c5c62e027d8948c59599552dafb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 12 Feb 2022 12:30:11 +0000
Subject: [PATCH 49/53] macchina: 6.0.5 -> 6.0.6
---
pkgs/tools/misc/macchina/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/tools/misc/macchina/default.nix b/pkgs/tools/misc/macchina/default.nix
index 5ffad1825d46..a38644f32dfd 100644
--- a/pkgs/tools/misc/macchina/default.nix
+++ b/pkgs/tools/misc/macchina/default.nix
@@ -3,16 +3,16 @@
rustPlatform.buildRustPackage rec {
pname = "macchina";
- version = "6.0.5";
+ version = "6.0.6";
src = fetchFromGitHub {
owner = "Macchina-CLI";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-x13ldPUr2PkrweDKyyQWMwd3PL4lsY11TIKrmBV5vkA=";
+ sha256 = "sha256-G95eQ5cIa5313k8YcuicbzPeq9VXVo2DgPMwfFMNXtk=";
};
- cargoSha256 = "sha256-y6UMpzt8uiN4jfYnDmwNFGQ1opUsQz8n870XY775qZo=";
+ cargoSha256 = "sha256-mkAklLtG/sB0eLla5cveMqyPXwMCE5ufer8qA5L9chg=";
nativeBuildInputs = [ installShellFiles ];
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ];
From fff5d485eee4e126e745e75abac0cb85eabbe020 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 12 Feb 2022 12:31:00 +0000
Subject: [PATCH 50/53] lagrange: 1.10.4 -> 1.10.5
---
pkgs/applications/networking/browsers/lagrange/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/networking/browsers/lagrange/default.nix b/pkgs/applications/networking/browsers/lagrange/default.nix
index 4285ee3298b8..1fb348242c7e 100644
--- a/pkgs/applications/networking/browsers/lagrange/default.nix
+++ b/pkgs/applications/networking/browsers/lagrange/default.nix
@@ -19,13 +19,13 @@
stdenv.mkDerivation rec {
pname = "lagrange";
- version = "1.10.4";
+ version = "1.10.5";
src = fetchFromGitHub {
owner = "skyjake";
repo = "lagrange";
rev = "v${version}";
- sha256 = "sha256-tj/RDGPu1hB67eTdq7NrbRd+OwBhIAm1lBgoft5m4v4=";
+ sha256 = "sha256-n6viI9yEqb73691s499vRB48LCOV0LdTbMR81P+Q5pM=";
fetchSubmodules = true;
};
From a0167e41e373123270a88ce1509c7ffef3cea0f6 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 13 Feb 2022 18:01:30 +0100
Subject: [PATCH 51/53] python3Packages.matrix-nio: 0.18.7 -> 0.19.0
https://github.com/poljar/matrix-nio/blob/0.19.0/CHANGELOG.md#0190---2022-02-04
---
pkgs/development/python-modules/matrix-nio/default.nix | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/pkgs/development/python-modules/matrix-nio/default.nix b/pkgs/development/python-modules/matrix-nio/default.nix
index 12c7813ba4b1..665167e290ea 100644
--- a/pkgs/development/python-modules/matrix-nio/default.nix
+++ b/pkgs/development/python-modules/matrix-nio/default.nix
@@ -28,23 +28,21 @@
buildPythonPackage rec {
pname = "matrix-nio";
- version = "0.18.7";
+ version = "0.19.0";
format = "pyproject";
src = fetchFromGitHub {
owner = "poljar";
repo = "matrix-nio";
rev = version;
- hash = "sha256-eti9kvfv3y7m+mJzcxftyn8OyVSd2Ehqd3eU2ezMV5Q=";
+ hash = "sha256-+WZk2m05y/bYj8zSuWTzm+rnCC0L9H9WNQ2RLXv7hDk=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'aiofiles = "^0.6.0"' 'aiofiles = "*"' \
--replace 'jsonschema = "^3.2.0"' 'jsonschema = "*"' \
- # Remove after https://github.com/poljar/matrix-nio/pull/288
- substituteInPlace pyproject.toml \
- --replace 'aiohttp-socks = "^0.6.0"' 'aiohttp-socks = "^0.7.0"'
+ --replace 'cachetools = { version = "^4.2.1", optional = true }' 'cachetools = { version = "*", optional = true }'
'';
nativeBuildInputs = [
From b0b9b9241c6e3690580334fba43fd8d3f9c4b22d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 13 Feb 2022 18:10:10 +0100
Subject: [PATCH 52/53] pantalaimon: 0.10.2 -> 0.10.4
---
.../networking/instant-messengers/pantalaimon/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix
index 9722d3b89e32..894294ae24c5 100644
--- a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix
@@ -10,7 +10,7 @@
buildPythonApplication rec {
pname = "pantalaimon";
- version = "0.10.2";
+ version = "0.10.4";
disabled = pythonOlder "3.6";
@@ -19,7 +19,7 @@ buildPythonApplication rec {
owner = "matrix-org";
repo = pname;
rev = version;
- sha256 = "sha256-sjaJomKMKSZqLlKWTG7Oa87dXa5SnGQlVnrdS707A1w=";
+ sha256 = "sha256-X6DJHH+ZBPw7iWVMa43HvVFh+LDn6shzOU1A2uiAYL4=";
};
propagatedBuildInputs = [
From b80f5c61045dcddbebab370fd030b540a0d17809 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 12 Feb 2022 13:38:28 +0000
Subject: [PATCH 53/53] mixxx: 2.3.1 -> 2.3.2
---
pkgs/applications/audio/mixxx/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix
index bbd0e07a64a4..8b1acc9d0bcb 100644
--- a/pkgs/applications/audio/mixxx/default.nix
+++ b/pkgs/applications/audio/mixxx/default.nix
@@ -53,13 +53,13 @@
mkDerivation rec {
pname = "mixxx";
- version = "2.3.1";
+ version = "2.3.2";
src = fetchFromGitHub {
owner = "mixxxdj";
repo = "mixxx";
rev = version;
- sha256 = "sha256-6M1qaRyRYWTIKqclewuD+RUVDdxVbBHcfpw2qYgO6BA=";
+ sha256 = "sha256-EnOO5OGcaIITqfF9gpGktarzYOx128C1M2VmYNzdRsA=";
};
nativeBuildInputs = [ cmake pkg-config ];
@@ -117,7 +117,7 @@ mkDerivation rec {
# mixxx installs udev rules to DATADIR instead of SYSCONFDIR
# let's disable this and install udev rules manually via postInstall
- # see https://github.com/mixxxdj/mixxx/blob/2.3.1/CMakeLists.txt#L1381-L1392
+ # see https://github.com/mixxxdj/mixxx/blob/2.3.2/CMakeLists.txt#L1381-L1392
cmakeFlags = [
"-DINSTALL_USER_UDEV_RULES=OFF"
];