From 5e053d9d79db15703fe26c76460efb3fa6328ab8 Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Tue, 24 Aug 2021 10:14:33 +0100
Subject: [PATCH 01/37] terraform-ls: 0.20.1 -> 0.21.0
---
pkgs/development/tools/misc/terraform-ls/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/development/tools/misc/terraform-ls/default.nix b/pkgs/development/tools/misc/terraform-ls/default.nix
index d484ee56aa11..7ea4625bad11 100644
--- a/pkgs/development/tools/misc/terraform-ls/default.nix
+++ b/pkgs/development/tools/misc/terraform-ls/default.nix
@@ -2,15 +2,15 @@
buildGoModule rec {
pname = "terraform-ls";
- version = "0.20.1";
+ version = "0.21.0";
src = fetchFromGitHub {
owner = "hashicorp";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-KEuqE09EvI00e2YwPaExuM9ji5Z7YDTOF+4jw6SvtKo=";
+ sha256 = "sha256-x1HPr1xzByyNnuNr8B4vqdxw+EeFJsqse/FG1I/b0+g=";
};
- vendorSha256 = "sha256-hPa1xaYqKs++Ifw732bfs2VHW7DFRggO/faJgX4M2F4=";
+ vendorSha256 = "sha256-f/y2i/aPeiUBiUaoCyehO8835qtxJkJsSh9/RAowsLI=";
ldflags = [ "-s" "-w" "-X main.version=v${version}" "-X main.prerelease=" ];
From 7442367e582b286401f1c87d535d649c8595651e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 25 Aug 2021 14:05:22 +0000
Subject: [PATCH 02/37] terragrunt: 0.31.5 -> 0.31.7
---
pkgs/applications/networking/cluster/terragrunt/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix
index dba9ff4ae789..214d3bfe3440 100644
--- a/pkgs/applications/networking/cluster/terragrunt/default.nix
+++ b/pkgs/applications/networking/cluster/terragrunt/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "terragrunt";
- version = "0.31.5";
+ version = "0.31.7";
src = fetchFromGitHub {
owner = "gruntwork-io";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-yovrqDGvw+GwzEiuveO2eLnP7mVVY5CQB0agzxIsHto=";
+ sha256 = "sha256-PCBKuTJ0IbYma584qIPrxGfwOIzHszWH+bW8iy0OUvo=";
};
- vendorSha256 = "sha256-CVWg2SvRO//xye05G3svGeqgaTKdRcoERrR7Tp0JZUo=";
+ vendorSha256 = "sha256-y84EFmoJS4SeA5YFIVFU0iWa5NnjU5yvOj7OFE+jGN0=";
doCheck = false;
From 241d81556f153a87a999ea53edeeed454e550f60 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Aug 2021 07:19:51 +0000
Subject: [PATCH 03/37] infracost: 0.9.5 -> 0.9.6
---
pkgs/tools/misc/infracost/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/tools/misc/infracost/default.nix b/pkgs/tools/misc/infracost/default.nix
index fc078ca64dfd..43dcbc4a74fc 100644
--- a/pkgs/tools/misc/infracost/default.nix
+++ b/pkgs/tools/misc/infracost/default.nix
@@ -2,15 +2,15 @@
buildGoModule rec {
pname = "infracost";
- version = "0.9.5";
+ version = "0.9.6";
src = fetchFromGitHub {
owner = "infracost";
rev = "v${version}";
repo = "infracost";
- sha256 = "sha256-B9byIortXH9v1aZNVU55uXA+5w7rdLijoE+JNq3OZlE=";
+ sha256 = "sha256-lcvpNhfSgr8ky03sTo7kjnaLUJeIrzFqpYUjvQpT1Po=";
};
- vendorSha256 = "sha256-TfaT5xPzdyTR0sH+EsZKCNXONkfjDRvT/jevAVQt+Zg=";
+ vendorSha256 = "sha256-TKs3xuZaO9PvlAcV5GDa3Jb36zeVWX3LcdcPxWR6KzE=";
ldflags = [ "-s" "-w" "-X github.com/infracost/infracost/internal/version.Version=v${version}" ];
From 64c693aebf45d3dfaafc0d429c640758259b7a3c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 26 Aug 2021 17:56:19 +0200
Subject: [PATCH 04/37] python3Packages.ring-doorbell: 0.7.0 -> 0.7.1
---
pkgs/development/python-modules/ring-doorbell/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/ring-doorbell/default.nix b/pkgs/development/python-modules/ring-doorbell/default.nix
index f70e4921b9e7..041a959ca5b2 100644
--- a/pkgs/development/python-modules/ring-doorbell/default.nix
+++ b/pkgs/development/python-modules/ring-doorbell/default.nix
@@ -12,13 +12,13 @@
buildPythonPackage rec {
pname = "ring-doorbell";
- version = "0.7.0";
+ version = "0.7.1";
disabled = !isPy3k;
src = fetchPypi {
pname = "ring_doorbell";
inherit version;
- sha256 = "1qnx9q9rzxhh0pygl3f9bg21b5zv7csv9h1w4zngdvsphbs0yiwg";
+ sha256 = "sha256-xE3TqXdhiUf9Tzmzc48D65Y5t1ekauacsTwwSG1urz4=";
};
propagatedBuildInputs = [
From db2f3345f44688a40b0d8db5aaeb44b9fbd037a4 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 26 Aug 2021 18:58:18 +0200
Subject: [PATCH 05/37] home-assistant: unpin ring-doorbell
---
pkgs/servers/home-assistant/default.nix | 5 -----
1 file changed, 5 deletions(-)
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 2aea87aff623..7bf04b65c723 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -65,11 +65,6 @@ let
});
})
- # Pinned due to bug in ring-doorbell 0.7.0
- # https://github.com/tchellomello/python-ring-doorbell/issues/240
- (mkOverride "ring-doorbell" "0.6.2"
- "fbd537722a27b3b854c26506d894b7399bb8dc57ff36083285971227a2d46560")
-
# Pinned due to API changes in pylast 4.2.1
(mkOverride "pylast" "4.2.0"
"0zd0dn2l738ndz62vpa751z0ldnm91dcz9zzbvxv53r08l0s9yf3")
From a267254318933eb62336cff468f4c1d642503f11 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Aug 2021 01:51:56 +0000
Subject: [PATCH 06/37] chamber: 2.10.2 -> 2.10.3
---
pkgs/tools/admin/chamber/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/tools/admin/chamber/default.nix b/pkgs/tools/admin/chamber/default.nix
index d69e96a45551..45c62fd42f92 100644
--- a/pkgs/tools/admin/chamber/default.nix
+++ b/pkgs/tools/admin/chamber/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "chamber";
- version = "2.10.2";
+ version = "2.10.3";
src = fetchFromGitHub {
owner = "segmentio";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-JPc57s5FIoZJNKNpd5OO4vZ3j7bPTQSBcJUeNhGvOgk=";
+ sha256 = "sha256-nIIoU+iz2uOglNaqGIhQ2kUjpFOyOx+flXXwu02UG6Y=";
};
CGO_ENABLED = 0;
From 93edf35cc57d6aeedf452ace674c457269d8fb8e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Aug 2021 05:07:59 +0000
Subject: [PATCH 07/37] python38Packages.itemadapter: 0.3.0 -> 0.4.0
---
pkgs/development/python-modules/itemadapter/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/itemadapter/default.nix b/pkgs/development/python-modules/itemadapter/default.nix
index d50ad3a78a46..5d85ad719527 100644
--- a/pkgs/development/python-modules/itemadapter/default.nix
+++ b/pkgs/development/python-modules/itemadapter/default.nix
@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "itemadapter";
- version = "0.3.0";
+ version = "0.4.0";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "ab2651ba20f5f6d0e15f041deba4c13ffc59270def2bd01518d13e94c4cd27d1";
+ sha256 = "f05df8da52619da4b8c7f155d8a15af19083c0c7ad941d8c1de799560ad994ca";
};
doCheck = false; # infinite recursion with Scrapy
From 1f7711f0dd9d0a1163b5758038cafd324b274e81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20G=2E=20Dr=C3=B6ge?= <fabian.g.droege@gmail.com>
Date: Fri, 27 Aug 2021 07:49:52 +0200
Subject: [PATCH 08/37] python3Packages.anybadge: init at 1.7.0
---
.../python-modules/anybadge/default.nix | 27 +++++++++++++++++++
pkgs/top-level/all-packages.nix | 2 ++
pkgs/top-level/python-packages.nix | 2 ++
3 files changed, 31 insertions(+)
create mode 100644 pkgs/development/python-modules/anybadge/default.nix
diff --git a/pkgs/development/python-modules/anybadge/default.nix b/pkgs/development/python-modules/anybadge/default.nix
new file mode 100644
index 000000000000..a8aaec9f45b2
--- /dev/null
+++ b/pkgs/development/python-modules/anybadge/default.nix
@@ -0,0 +1,27 @@
+{ lib, fetchFromGitHub, buildPythonPackage, pytestCheckHook }:
+
+buildPythonPackage rec {
+ pname = "anybadge";
+ version = "1.7.0";
+
+ src = fetchFromGitHub {
+ owner = "jongracecox";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1d02fnig04zlrhfqqcf4505vy4p51whl2ifilnx3mkhis9lcwrmr";
+ };
+
+ # setup.py reads its version from the TRAVIS_TAG environment variable
+ TRAVIS_TAG = "v${version}";
+
+ pythonImportsCheck = [ "anybadge" ];
+
+ checkInputs = [ pytestCheckHook ];
+
+ meta = with lib; {
+ description = "A Python project for generating badges for your projects, with a focus on simplicity and flexibility";
+ license = licenses.mit;
+ homepage = "https://github.com/jongracecox/anybadge";
+ maintainers = [ maintainers.fabiangd ];
+ };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 20aecbc2994e..db7019804b23 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13170,6 +13170,8 @@ with pkgs;
ameba = callPackage ../development/tools/ameba { };
+ anybadge = with python3Packages; toPythonApplication anybadge;
+
augeas = callPackage ../tools/system/augeas { };
inherit (callPackage ../tools/admin/ansible { })
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bce658066d28..50f4bf108def 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -477,6 +477,8 @@ in {
anyascii = callPackage ../development/python-modules/anyascii { };
+ anybadge = callPackage ../development/python-modules/anybadge { };
+
anyio = callPackage ../development/python-modules/anyio { };
anyjson = callPackage ../development/python-modules/anyjson { };
From d890b9b6179199bf021ed0b3c1dbe0310b623992 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Aug 2021 07:13:24 +0000
Subject: [PATCH 09/37] kube-capacity: 0.6.0 -> 0.6.1
---
.../networking/cluster/kube-capacity/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/applications/networking/cluster/kube-capacity/default.nix b/pkgs/applications/networking/cluster/kube-capacity/default.nix
index de4cdcce44f1..9ab32c644747 100644
--- a/pkgs/applications/networking/cluster/kube-capacity/default.nix
+++ b/pkgs/applications/networking/cluster/kube-capacity/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "kube-capacity";
- version = "0.6.0";
+ version = "0.6.1";
src = fetchFromGitHub {
rev = "v${version}";
owner = "robscott";
repo = pname;
- sha256 = "sha256-IwlcxlzNNYWNANszTM+s6/SA1C2LXrydSTtAvniNKXE=";
+ sha256 = "sha256-4UdNmuxJsPekA0y4mP302AYIFkG3ee3n99Redb/rPHw=";
};
- vendorSha256 = "sha256-EgLWZs282IV1euCUCc5ucf267E2Z7GF9SgoImiGvuVM=";
+ vendorSha256 = "sha256-PQlOuBqn+b7fO9eHgtTAKxo3YdWmgbxx2JomklttCrM=";
meta = with lib; {
description =
From 6f8fe2e58b7ff1a6e5e2ed36dbaf76d3a576aae1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Aug 2021 08:40:21 +0000
Subject: [PATCH 10/37] mob: 1.9.0 -> 1.10.0
---
pkgs/applications/misc/mob/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/misc/mob/default.nix b/pkgs/applications/misc/mob/default.nix
index d5966d1dbdc3..72aa41d03c26 100644
--- a/pkgs/applications/misc/mob/default.nix
+++ b/pkgs/applications/misc/mob/default.nix
@@ -2,14 +2,14 @@
buildGoPackage rec {
pname = "mob";
- version = "1.9.0";
+ version = "1.10.0";
goPackagePath = "github.com/remotemobprogramming/mob";
src = fetchFromGitHub {
rev = "v${version}";
owner = "remotemobprogramming";
repo = pname;
- sha256 = "sha256-PvFECy5wgpdOdToeYsW+NiVC2LXkBCMBorIl8m++Lic=";
+ sha256 = "sha256-O732PNmE+RDmETHAX/vlaSF4ZUShmO7P1B41kCw+/cQ=";
};
meta = with lib; {
From bc2cd8712855d57df39a271d4e2fc32c19a9ad03 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Aug 2021 03:34:17 +0000
Subject: [PATCH 11/37] esbuild: 0.12.22 -> 0.12.23
---
pkgs/development/tools/esbuild/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix
index ae8579c16a91..bd080d235bc7 100644
--- a/pkgs/development/tools/esbuild/default.nix
+++ b/pkgs/development/tools/esbuild/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "esbuild";
- version = "0.12.22";
+ version = "0.12.23";
src = fetchFromGitHub {
owner = "evanw";
repo = "esbuild";
rev = "v${version}";
- sha256 = "sha256-vZlrHfcXOz4QHTH9otpwtPIWHGxK4TAol5o/Tl0M98E=";
+ sha256 = "sha256-WS3Vy//5lL7xnMOgSeLh6RHAlonQDPQ3K2L+MIK+j7A=";
};
vendorSha256 = "sha256-2ABWPqhK2Cf4ipQH7XvRrd+ZscJhYPc3SV2cGT0apdg=";
From a0eae3b8777f1d0d9e865a50fec1728bf279b009 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Aug 2021 05:44:17 +0000
Subject: [PATCH 12/37] headscale: 0.7.0 -> 0.7.1
---
pkgs/servers/headscale/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/servers/headscale/default.nix b/pkgs/servers/headscale/default.nix
index 755a538f58d9..06b2fa867e84 100644
--- a/pkgs/servers/headscale/default.nix
+++ b/pkgs/servers/headscale/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "headscale";
- version = "0.7.0";
+ version = "0.7.1";
src = fetchFromGitHub {
owner = "juanfont";
repo = "headscale";
rev = "v${version}";
- sha256 = "sha256-N1WjfsiLuroXsmD67HeWw/2lLJ8r3iWYwGac9DbbFsQ=";
+ sha256 = "sha256-/mpSIS3UajxFTQm+/Ko6e0hZ8kbPWSNNctaYKaGl8Gs=";
};
vendorSha256 = "sha256-ususDOF/LznhK4EInHE7J/ItMjziGfP9Gn8/Q5wd78g=";
From 9f01f3f2670a085420d0da4c8c39e5f0580e4945 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 27 Aug 2021 15:35:23 +0200
Subject: [PATCH 13/37] intel-gmmlib: 21.2.1 -> 21.2.2
---
pkgs/development/libraries/intel-gmmlib/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/development/libraries/intel-gmmlib/default.nix
index c0bb8ec9ab41..23e4b2b3508d 100644
--- a/pkgs/development/libraries/intel-gmmlib/default.nix
+++ b/pkgs/development/libraries/intel-gmmlib/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "intel-gmmlib";
- version = "21.2.1";
+ version = "21.2.2";
src = fetchFromGitHub {
owner = "intel";
repo = "gmmlib";
rev = "${pname}-${version}";
- sha256 = "1icnxq4sqhi11c82kg0hnavk3gvbwgw2fshc7a7nb6w1wdiibj5n";
+ sha256 = "134l0d74ai4mqlp244nvkvg3mgzbzy20mjd274yay8g8hvb1g90v";
};
nativeBuildInputs = [ cmake ];
From 33567bd3b329560b424c526f419539273f25b48f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Aug 2021 13:38:17 +0000
Subject: [PATCH 14/37] ssh-audit: 2.4.0 -> 2.5.0
---
pkgs/tools/security/ssh-audit/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/tools/security/ssh-audit/default.nix b/pkgs/tools/security/ssh-audit/default.nix
index a7ef677759f3..34d39390b438 100644
--- a/pkgs/tools/security/ssh-audit/default.nix
+++ b/pkgs/tools/security/ssh-audit/default.nix
@@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec {
pname = "ssh-audit";
- version = "2.4.0";
+ version = "2.5.0";
src = fetchFromGitHub {
owner = "jtesta";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-Xq1q/i43vZAv8BayVOdKuZ3+mJcQQ0x4Kc3WlASE6m8=";
+ sha256 = "0ks1zr0ksma285sm2dyy0nsbrkpssdk4mdzc3srr4mcyd6v927jd";
};
checkInputs = with python3Packages; [
From b49afb3fe6096f6b2047dba6730c6f6b6d4c3473 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 27 Aug 2021 15:32:11 +0200
Subject: [PATCH 15/37] signal-desktop: 5.14.0 -> 5.15.0
---
.../networking/instant-messengers/signal-desktop/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
index 3f4ba56f5ded..b73b87fc897f 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -25,7 +25,7 @@ let
else "");
in stdenv.mkDerivation rec {
pname = "signal-desktop";
- version = "5.14.0"; # Please backport all updates to the stable channel.
+ version = "5.15.0"; # Please backport all updates to the stable channel.
# All releases have a limited lifetime and "expire" 90 days after the release.
# When releases "expire" the application becomes unusable until an update is
# applied. The expiration date for the current release can be extracted with:
@@ -35,7 +35,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
- sha256 = "0rb7ixha07v0l3bm9jbgnlf78l9hhjc9acyd1aji9l4fpq3azbq1";
+ sha256 = "0cbz2l31cg87n6qlbvwdjy92q9qgmmkrsvaj37cc34ajh7asd833";
};
nativeBuildInputs = [
From f2e2b9d98870706936613cad32ad5ee7228600f6 Mon Sep 17 00:00:00 2001
From: TredwellGit <tredwell@tutanota.com>
Date: Fri, 27 Aug 2021 14:14:39 +0000
Subject: [PATCH 16/37] electron_13: 13.2.0 -> 13.2.2
https://github.com/electron/electron/releases/tag/v13.2.1
https://github.com/electron/electron/releases/tag/v13.2.2
---
pkgs/development/tools/electron/default.nix | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix
index 106361502a7a..fd1ddc2651e2 100644
--- a/pkgs/development/tools/electron/default.nix
+++ b/pkgs/development/tools/electron/default.nix
@@ -115,13 +115,13 @@ rec {
headers = "0b66a7nbi1mybqy0j8x6hnp9k0jzvr6lpp4zsazhbfpk47px116y";
};
- electron_13 = mkElectron "13.2.0" {
- x86_64-linux = "def2e796fd0726f097d2c6997827f60de1940944dabcad33257bee9b4f8734da";
- x86_64-darwin = "8d9970c0153e0a79aae5aed053da8652d05fc67c8f29cd17416a860bf7f82c1d";
- i686-linux = "507d57e01b16549fe627bc55d8b94bf0f7676c7368438e749c6048869216d290";
- armv7l-linux = "9f46b2e18729ff50d290babbef3bf57711ed96eceffdd101b109572790f914f2";
- aarch64-linux = "386e0937ef78dce21e48589d6b76748c316ef6d4f8e8157a8b2ca08780ffbe2f";
- aarch64-darwin = "232fa40a9ce498a17aa0be1e72c81173c1f614fd5d48cc34c3f387a3c9921e08";
- headers = "00fwlqpiy2872d2yx4nhcg5a3n7z7cb0z0a82xbrlp6g0clh5v0w";
+ electron_13 = mkElectron "13.2.2" {
+ x86_64-linux = "3d64bc0eab8dc1fd162693a5492ad694bb65b110fc846293faa3e8ed5c7b6a4b";
+ x86_64-darwin = "276916b97960d9e49944b9c6dcd35746feb3b55e86747b4ed0e0eb569c47ec0f";
+ i686-linux = "b4bcb41473d240d2078b9ca1d71fd879f5e89a8e6cafd13fa8bdcc615b77fe68";
+ armv7l-linux = "fd5fab50764f50dcf4b77c7617fe69895ea177d787fe58a54cc0adb5de026801";
+ aarch64-linux = "c4f112945d41304c796a7460018721df4598114cc087c1114c72f1e41d985d11";
+ aarch64-darwin = "1bc30f12cf6ff3cedde5f90e138b604cd610176be63bb87a9f023146c2f7c81d";
+ headers = "1992ss04078drjybh7pn0lmfmk2kcg9y2jdq9z24caf2xlabfb2d";
};
}
From 0e6f0724c6dae128fa1e7ffcf34a8b4bc9e51aa6 Mon Sep 17 00:00:00 2001
From: TredwellGit <tredwell@tutanota.com>
Date: Fri, 27 Aug 2021 14:15:52 +0000
Subject: [PATCH 17/37] electron_12: 12.0.16 -> 12.0.17
https://github.com/electron/electron/releases/tag/v12.0.17
---
pkgs/development/tools/electron/default.nix | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix
index fd1ddc2651e2..492e11c363a8 100644
--- a/pkgs/development/tools/electron/default.nix
+++ b/pkgs/development/tools/electron/default.nix
@@ -105,14 +105,14 @@ rec {
headers = "1rar3c4qx3rylxjqryfr16bcqph8ivs0qgzmiqglyc9avgz9bn9z";
};
- electron_12 = mkElectron "12.0.16" {
- x86_64-linux = "ba20154a752d93f15264619c05c4a08ce6a00fbe13e1f5655b0cca2d4053014c";
- x86_64-darwin = "0279c9907f4c87861259e686463e910eac214ca4f3da6a4608974b4030347689";
- i686-linux = "bacfb2135395bbc31de479f81e8392e5619337684e71f8973d4c04dab75a2569";
- armv7l-linux = "b3ce3e60f5cb9135fa8cb8859f62194ab1ba1d792c6ee7c451877a96bd13d47c";
- aarch64-linux = "d3ab4f93d32d8fe9674d807c4b216e141b75ee116f73458cc496c57032ebe66f";
- aarch64-darwin = "d7f390dca9f6af1eb647b65217f470b89a2dc3b2360351e016e283db8f2ce7d8";
- headers = "0b66a7nbi1mybqy0j8x6hnp9k0jzvr6lpp4zsazhbfpk47px116y";
+ electron_12 = mkElectron "12.0.17" {
+ x86_64-linux = "00c05d20372a14b84984f1c30e4c6f293480ef0c35c63949468e9d1ab4918db7";
+ x86_64-darwin = "3600d64945474c7a7f7ef5ac9cbc7241432bf778096004d13fe05603a43407c2";
+ i686-linux = "3ee6c565f74492b658b5fd4c648dbd0b5d556c8a193125e5f7ee840b088823d7";
+ armv7l-linux = "fa1cde8a59c1118baf0f98c1a22b9c99ffac51fd40c65a9fef490c938106ad96";
+ aarch64-linux = "92c129b50c17f8a7977c2c61eb721f0c8b831201d3fa1bdcc7d93f63df705ee0";
+ aarch64-darwin = "58cdcefa89d4d3d8e669290fd8caced636f969e327d6c772444fda2482df3244";
+ headers = "0sg8ybnrmx11xm7yc0lj8yy0g57ln48gvqhrr9g725zimzza9v3l";
};
electron_13 = mkElectron "13.2.2" {
From 032baedc9777520ffdeaeac5bc3c378deef275f1 Mon Sep 17 00:00:00 2001
From: TredwellGit <tredwell@tutanota.com>
Date: Fri, 27 Aug 2021 14:16:43 +0000
Subject: [PATCH 18/37] electron_11: 11.4.11 -> 11.4.12
https://github.com/electron/electron/releases/tag/v11.4.12
---
pkgs/development/tools/electron/default.nix | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix
index 492e11c363a8..7bef2cb4ef7f 100644
--- a/pkgs/development/tools/electron/default.nix
+++ b/pkgs/development/tools/electron/default.nix
@@ -95,14 +95,14 @@ rec {
headers = "01x6a0r2jawjpl09ixgzap3g0z6znj34hsnnhzanavkbds0ri4k6";
};
- electron_11 = mkElectron "11.4.11" {
- x86_64-linux = "8c9525bffa3479e3a2de88f65348585948e4d03ecfc35b71641dc3833d9b639f";
- x86_64-darwin = "48b89a46c6d4d117bcac6a45fbe0690adfd2b7f1f3602976d8e0859f16324bff";
- i686-linux = "33eff09dfc655da756b247580b790060c93f306c4a8f33a457e8df1fd4f196c3";
- armv7l-linux = "58251a2b9fc5ac68ad7e5fd8a1ab07b6e4cd675e8476e6f177388310b1831a3c";
- aarch64-linux = "edd622f99cd628a90d46fe62cdf8ca473b8125680d4b46a82dfd6dfee6f71088";
- aarch64-darwin = "03e6023e80b7d1b3e8df23dc69db53b4cc32c0663899f920f9bed8be504d7076";
- headers = "1rar3c4qx3rylxjqryfr16bcqph8ivs0qgzmiqglyc9avgz9bn9z";
+ electron_11 = mkElectron "11.4.12" {
+ x86_64-linux = "948e6377c3efc63429f3fa689566238ccb196abb8077dd984d3959c2b239b8be";
+ x86_64-darwin = "f932761acaf78a69fcacf5b4ec858877a05afa3cea03952a3ad9619b51095398";
+ i686-linux = "593df3f688032fd035a7e49c6b34c3c801eef0cf47671d2437ce51ccafde8d69";
+ armv7l-linux = "0905b508f30a9ab4f5e6d166e3c7fb924da3cfe569a684ca6dcf5159beb8439d";
+ aarch64-linux = "886bdd7f6b85ed4ba9a1de0d50dd51fbdbe76b2d669e91683a9156f073b69a2c";
+ aarch64-darwin = "bb9d65d7c9d02be57e62435e8f7427c1c8608e74aff709a20abc76ee0be005a9";
+ headers = "0gb56pxdkn8970z141l3p30lkizqca6kqj1cvgbp685xmb231hzq";
};
electron_12 = mkElectron "12.0.17" {
From af5ec6d616ab4d9af17becf8a1079fb8576c6bf4 Mon Sep 17 00:00:00 2001
From: TredwellGit <tredwell@tutanota.com>
Date: Fri, 27 Aug 2021 14:33:33 +0000
Subject: [PATCH 19/37] wireshark: 3.4.7 -> 3.4.8
https://www.wireshark.org/docs/relnotes/wireshark-3.4.8.html
---
pkgs/applications/networking/sniffers/wireshark/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index d9bc78bb2fe1..4e57bfe4b17e 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -10,7 +10,7 @@ assert withQt -> qt5 != null;
with lib;
let
- version = "3.4.7";
+ version = "3.4.8";
variant = if withQt then "qt" else "cli";
in stdenv.mkDerivation {
@@ -20,7 +20,7 @@ in stdenv.mkDerivation {
src = fetchurl {
url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz";
- sha256 = "17d00kl0s010wg2dfhy7sdbr2qm54lsi317fmbcvjz4rxx8ywk3c";
+ sha256 = "09fpvfj4m7glisj6p4zb8wylkrjkqqw69xnwnz4ah410zs6zm9sq";
};
cmakeFlags = [
From b4804fdffe268d4051b3cf6999a7ff18ca6c5b7c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Aug 2021 04:54:16 +0000
Subject: [PATCH 20/37] python38Packages.mautrix: 0.10.4 -> 0.10.5
---
pkgs/development/python-modules/mautrix/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/mautrix/default.nix b/pkgs/development/python-modules/mautrix/default.nix
index 2dcea79fdc5d..f0005eef61bf 100644
--- a/pkgs/development/python-modules/mautrix/default.nix
+++ b/pkgs/development/python-modules/mautrix/default.nix
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "mautrix";
- version = "0.10.4";
+ version = "0.10.5";
src = fetchPypi {
inherit pname version;
- sha256 = "ffbc4e29eb56089539b408f8e4c12a5d5a5d11d7fe7d40f8c6279784c618b869";
+ sha256 = "b7d52d72a9739963b6d39d5e58ef367c00490a90cf7795f23c8b2e2c140c8882";
};
propagatedBuildInputs = [
From 54197b57b26aae15ec1add88f16ebe51a5e7daf2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Aug 2021 05:55:12 +0000
Subject: [PATCH 21/37] python38Packages.msal: 1.13.0 -> 1.14.0
---
pkgs/development/python-modules/msal/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/msal/default.nix b/pkgs/development/python-modules/msal/default.nix
index 73a40741f3d6..2a1206bef6f9 100644
--- a/pkgs/development/python-modules/msal/default.nix
+++ b/pkgs/development/python-modules/msal/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "msal";
- version = "1.13.0";
+ version = "1.14.0";
src = fetchPypi {
inherit pname version;
- sha256 = "1ab72dbb623fb8663e8fdefc052b1f9d4ae0951ea872f5f488dad58f3618c89d";
+ sha256 = "0d389ef5db19ca8a30ae88fe05ba633a4623d3202d90f8dfcc81973dc28ee834";
};
propagatedBuildInputs = [
From 467e3a7a8758b533147912c2b790ec5de93b4500 Mon Sep 17 00:00:00 2001
From: TredwellGit <tredwell@tutanota.com>
Date: Fri, 27 Aug 2021 01:12:05 +0000
Subject: [PATCH 22/37] linux: 4.14.244 -> 4.14.245
---
pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index c2c0078dc60c..914626124e54 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
- version = "4.14.244";
+ version = "4.14.245";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "0x554dck5f78ljknwahjvf49952s1w0zja3yh4vfz6lmf6hvzq5n";
+ sha256 = "085jls7b2rzxlmvp0zsp4l3wi5xdrqlv2qczzwvbhzna1f4n2x0d";
};
} // (args.argsOverride or {}))
From 500a91bf685c9c00b2d89634d800c84a395f6f4f Mon Sep 17 00:00:00 2001
From: TredwellGit <tredwell@tutanota.com>
Date: Fri, 27 Aug 2021 01:12:17 +0000
Subject: [PATCH 23/37] linux: 4.19.204 -> 4.19.205
---
pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix
index 8b739463a2d0..e3d58da923ec 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.19.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
- version = "4.19.204";
+ version = "4.19.205";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "1rcx99sz4fgr2d138i92dw2vfplnqgys58hxywgmjb56c83l3qy4";
+ sha256 = "1ii9l44d6jxhyd5qkc5h83ixailma9v7hyl60wi3rskkafqnwv2m";
};
} // (args.argsOverride or {}))
From 770b3058744d01afe5582dc4c9a84f8d1471ceab Mon Sep 17 00:00:00 2001
From: TredwellGit <tredwell@tutanota.com>
Date: Fri, 27 Aug 2021 01:12:28 +0000
Subject: [PATCH 24/37] linux: 4.4.281 -> 4.4.282
---
pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index f1f26e601d33..91a1ad5311cd 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,12 +1,12 @@
{ buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args:
buildLinux (args // rec {
- version = "4.4.281";
+ version = "4.4.282";
extraMeta.branch = "4.4";
extraMeta.broken = stdenv.isAarch64;
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "12grr2vc2mcvy7k8w1apqs9mhfg0lvz6mrpksym234m4n5yy48ng";
+ sha256 = "1rgxznjb6gsi64wk7x2rylyi64y2nx5yiah5gfm40c6l2f7lb9cc";
};
} // (args.argsOverride or {}))
From 12ea01bac9d989f7ac60bfbba1ffb099ccfb8362 Mon Sep 17 00:00:00 2001
From: TredwellGit <tredwell@tutanota.com>
Date: Fri, 27 Aug 2021 01:12:40 +0000
Subject: [PATCH 25/37] linux: 4.9.280 -> 4.9.281
---
pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index daafa08def49..4586467bb577 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,12 +1,12 @@
{ buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args:
buildLinux (args // rec {
- version = "4.9.280";
+ version = "4.9.281";
extraMeta.branch = "4.9";
extraMeta.broken = stdenv.isAarch64;
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "0am9qg9j18j4fc5zi6bk1g0mi8dp31pl62wlihxhhkc5yspzrna3";
+ sha256 = "1dg70jv3bqanmjs31s0x2p7nd5g37bqzjn9rc1y6wvkgm4pwahi6";
};
} // (args.argsOverride or {}))
From 6c457d29b8865344e07e2383b6fc1f3d31f27085 Mon Sep 17 00:00:00 2001
From: TredwellGit <tredwell@tutanota.com>
Date: Fri, 27 Aug 2021 01:12:51 +0000
Subject: [PATCH 26/37] linux: 5.10.60 -> 5.10.61
---
pkgs/os-specific/linux/kernel/linux-5.10.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix
index cde04b146928..e992196f7e7a 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
- version = "5.10.60";
+ version = "5.10.61";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
- sha256 = "13gpamqj0shvad4nd9v11iv8qdfbjgb242nbvcim2z3c7xszfvv9";
+ sha256 = "1lci78584c0rg5m5rkylssppnv001pzh4769m9mds4fdqn6f7sl2";
};
} // (args.argsOverride or {}))
From 198f0a0f30e56992692e44a07f1817703120da69 Mon Sep 17 00:00:00 2001
From: TredwellGit <tredwell@tutanota.com>
Date: Fri, 27 Aug 2021 01:13:03 +0000
Subject: [PATCH 27/37] linux: 5.13.12 -> 5.13.13
---
pkgs/os-specific/linux/kernel/linux-5.13.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/os-specific/linux/kernel/linux-5.13.nix b/pkgs/os-specific/linux/kernel/linux-5.13.nix
index e7f9aaede27b..8a321456fd11 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.13.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.13.nix
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
- version = "5.13.12";
+ version = "5.13.13";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
- sha256 = "0948w1zc2gqnl8x60chjqngfzdi0kcxm12i1nx3nx4ksiwj5vc98";
+ sha256 = "0d1lr3rivgf9j3bn2a9hpzdf74nq8kybf3rfxxvw68vr1hhd4cam";
};
} // (args.argsOverride or { }))
From aeb198d7ced73f236637322b6cd2894c5c902b26 Mon Sep 17 00:00:00 2001
From: TredwellGit <tredwell@tutanota.com>
Date: Fri, 27 Aug 2021 01:13:34 +0000
Subject: [PATCH 28/37] linux: 5.4.142 -> 5.4.143
---
pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix
index cc86b1a991be..7c7661eb75f6 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
- version = "5.4.142";
+ version = "5.4.143";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
- sha256 = "0l8l4cg04p5vx890jm45r35js1v0nljd0lp5qwkvlr45jql5fy4r";
+ sha256 = "090x087p8hxnc1daf2xwj7vg8hg1jhz5i4andkbhdy550l5nalq9";
};
} // (args.argsOverride or {}))
From cc93163a9543c97e7f2775bbee3fb1a719d944a0 Mon Sep 17 00:00:00 2001
From: TredwellGit <tredwell@tutanota.com>
Date: Fri, 27 Aug 2021 01:14:15 +0000
Subject: [PATCH 29/37] linux-rt_5_10: 5.10.56-rt49 -> 5.10.59-rt52
---
pkgs/os-specific/linux/kernel/linux-rt-5.10.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix
index b71748b75af5..826d99883e4d 100644
--- a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix
@@ -6,7 +6,7 @@
, ... } @ args:
let
- version = "5.10.56-rt49"; # updated by ./update-rt.sh
+ version = "5.10.59-rt52"; # updated by ./update-rt.sh
branch = lib.versions.majorMinor version;
kversion = builtins.elemAt (lib.splitString "-" version) 0;
in buildLinux (args // {
@@ -18,14 +18,14 @@ in buildLinux (args // {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
- sha256 = "0szcj0lbs33wmphxzvcc8jzfdvzncgxy2q8b1s4l9yjhkighssjd";
+ sha256 = "107anv16khx055rpkvfd532rdcfg4ffbs7bhp45hdqi3bz0ssg1k";
};
kernelPatches = let rt-patch = {
name = "rt";
patch = fetchurl {
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
- sha256 = "17r7d8xj5nph1j1fyjra887mqjlf6is9pgpw0jyhd46z1jy2bw3v";
+ sha256 = "0i66z1njppn9qvl8msarcgbvmgby6hv8w0k0rmlizwj09i1pmwdx";
};
}; in [ rt-patch ] ++ kernelPatches;
From ea89b8bc1f8a046edd5475471ba0ae8845adbf95 Mon Sep 17 00:00:00 2001
From: TredwellGit <tredwell@tutanota.com>
Date: Fri, 27 Aug 2021 01:14:34 +0000
Subject: [PATCH 30/37] linux_latest-libre: 18239 -> 18260
---
pkgs/os-specific/linux/kernel/linux-libre.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix
index 0e123e894184..a183b6859498 100644
--- a/pkgs/os-specific/linux/kernel/linux-libre.nix
+++ b/pkgs/os-specific/linux/kernel/linux-libre.nix
@@ -1,8 +1,8 @@
{ stdenv, lib, fetchsvn, linux
, scripts ? fetchsvn {
url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";
- rev = "18239";
- sha256 = "1nzxkc53jmsyaxnl5q9hmgrfd3c8sn2y0pcv7ng042bnvr8hhh82";
+ rev = "18260";
+ sha256 = "11mmdix0vq9yrivx300ay6np3xx1gdqdr4cqdxr1wa84dbl7c2dm";
}
, ...
}:
From fec4358b1ee9c19d0b6b4dc5df63eb81cb8d5af7 Mon Sep 17 00:00:00 2001
From: TredwellGit <tredwell@tutanota.com>
Date: Fri, 27 Aug 2021 01:14:50 +0000
Subject: [PATCH 31/37] linux/hardened/patches/4.14: 4.14.244-hardened1 ->
4.14.245-hardened1
---
pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index 5625cb6e0eb7..8520fc8c2894 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -1,9 +1,9 @@
{
"4.14": {
"extra": "-hardened1",
- "name": "linux-hardened-4.14.244-hardened1.patch",
- "sha256": "0cm5ylwxz2lzjx8c7z90h443sw7mjbr33cbrgfhaczvdzm6wxx0b",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.244-hardened1/linux-hardened-4.14.244-hardened1.patch"
+ "name": "linux-hardened-4.14.245-hardened1.patch",
+ "sha256": "035sq0l15afhyfivkavd08pyaywsrcl6f468gykmbq9j3i2swbb6",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.245-hardened1/linux-hardened-4.14.245-hardened1.patch"
},
"4.19": {
"extra": "-hardened1",
From 3e58b9716e563221fa66c1c17a16dd40adaca6a1 Mon Sep 17 00:00:00 2001
From: TredwellGit <tredwell@tutanota.com>
Date: Fri, 27 Aug 2021 01:14:51 +0000
Subject: [PATCH 32/37] linux/hardened/patches/4.19: 4.19.204-hardened1 ->
4.19.205-hardened1
---
pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index 8520fc8c2894..df809cf77231 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -7,9 +7,9 @@
},
"4.19": {
"extra": "-hardened1",
- "name": "linux-hardened-4.19.204-hardened1.patch",
- "sha256": "08i7985aqiiyi6h42rgf4hc09di3iy5p3i7iajzyfrzxfmgkdgdz",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.204-hardened1/linux-hardened-4.19.204-hardened1.patch"
+ "name": "linux-hardened-4.19.205-hardened1.patch",
+ "sha256": "14v3kwkkhyng0wfz4spca6z7wvsxj4kplj144qv1k3fm9yy2cy3h",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.205-hardened1/linux-hardened-4.19.205-hardened1.patch"
},
"5.10": {
"extra": "-hardened1",
From 2114075986ac3653d5a83e1c693b84d7197e7176 Mon Sep 17 00:00:00 2001
From: TredwellGit <tredwell@tutanota.com>
Date: Fri, 27 Aug 2021 01:14:52 +0000
Subject: [PATCH 33/37] linux/hardened/patches/5.10: 5.10.60-hardened1 ->
5.10.61-hardened1
---
pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index df809cf77231..5f550618f0b0 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -13,9 +13,9 @@
},
"5.10": {
"extra": "-hardened1",
- "name": "linux-hardened-5.10.60-hardened1.patch",
- "sha256": "0hnc12ypggwln4b5i1zqd9mmhdkcky24xj4jxqp23dwzp03pwfh8",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.60-hardened1/linux-hardened-5.10.60-hardened1.patch"
+ "name": "linux-hardened-5.10.61-hardened1.patch",
+ "sha256": "0hg67w9s6nzfmar8y01cnc46b2m2sa6s1xz85x1z1c46vw9558f0",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.61-hardened1/linux-hardened-5.10.61-hardened1.patch"
},
"5.4": {
"extra": "-hardened1",
From 2c9124efdba6769a0fa1285f046f7cb2d4e92c7c Mon Sep 17 00:00:00 2001
From: TredwellGit <tredwell@tutanota.com>
Date: Fri, 27 Aug 2021 01:14:53 +0000
Subject: [PATCH 34/37] linux/hardened/patches/5.13: init at 5.13.13-hardened1
---
pkgs/os-specific/linux/kernel/hardened/patches.json | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index 5f550618f0b0..57cd7198d98e 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -17,6 +17,12 @@
"sha256": "0hg67w9s6nzfmar8y01cnc46b2m2sa6s1xz85x1z1c46vw9558f0",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.61-hardened1/linux-hardened-5.10.61-hardened1.patch"
},
+ "5.13": {
+ "extra": "-hardened1",
+ "name": "linux-hardened-5.13.13-hardened1.patch",
+ "sha256": "1rb4jpz8zbpijybpm7dwxr05f9nmf6b9av2b651ffxg5vziw17l3",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.13.13-hardened1/linux-hardened-5.13.13-hardened1.patch"
+ },
"5.4": {
"extra": "-hardened1",
"name": "linux-hardened-5.4.142-hardened1.patch",
From 4d8a8abb33a5872c009246f86e3d8cbbdd8a9801 Mon Sep 17 00:00:00 2001
From: TredwellGit <tredwell@tutanota.com>
Date: Fri, 27 Aug 2021 01:14:54 +0000
Subject: [PATCH 35/37] linux/hardened/patches/5.4: 5.4.142-hardened1 ->
5.4.143-hardened1
---
pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index 57cd7198d98e..dc379de31612 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -25,8 +25,8 @@
},
"5.4": {
"extra": "-hardened1",
- "name": "linux-hardened-5.4.142-hardened1.patch",
- "sha256": "05195sxrs99gfwbb8icg8rzvqljhf1gpyhxr8da3qg6b4rvvnf0p",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.142-hardened1/linux-hardened-5.4.142-hardened1.patch"
+ "name": "linux-hardened-5.4.143-hardened1.patch",
+ "sha256": "0xv29cclypywq52908zppxpjrxllcdb67chw7lcia60y1aqsg83z",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.143-hardened1/linux-hardened-5.4.143-hardened1.patch"
}
}
From d90b2fc264e4238eac6b8f2fe1e62c9f0759445e Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 19 Aug 2021 12:40:26 -0400
Subject: [PATCH 36/37] linux-hardened: Fix update script
---
pkgs/os-specific/linux/kernel/hardened/update.py | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/pkgs/os-specific/linux/kernel/hardened/update.py b/pkgs/os-specific/linux/kernel/hardened/update.py
index 8ff65107926f..f278b518c024 100755
--- a/pkgs/os-specific/linux/kernel/hardened/update.py
+++ b/pkgs/os-specific/linux/kernel/hardened/update.py
@@ -212,7 +212,11 @@ for release in repo.get_releases():
if len(version) < 4:
continue
+ if not (isinstance(version[-2], int)):
+ continue
+
kernel_version = version[:-1]
+
kernel_key = major_kernel_version_key(kernel_version)
try:
packaged_kernel_version = kernel_versions[kernel_key]
From c97d75e8e520a817dced6d5c569402315065b8ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 27 Aug 2021 18:47:14 +0200
Subject: [PATCH 37/37] openipmi: fix collectd assertion
---
pkgs/tools/system/openipmi/default.nix | 6 ++++++
.../tools/system/openipmi/fix-collectd-assertion.diff | 11 +++++++++++
2 files changed, 17 insertions(+)
create mode 100644 pkgs/tools/system/openipmi/fix-collectd-assertion.diff
diff --git a/pkgs/tools/system/openipmi/default.nix b/pkgs/tools/system/openipmi/default.nix
index c462c2457a9b..06df9afa8139 100644
--- a/pkgs/tools/system/openipmi/default.nix
+++ b/pkgs/tools/system/openipmi/default.nix
@@ -9,6 +9,12 @@ stdenv.mkDerivation rec {
sha256 = "05wpkn74nxqp5p6sa2yaf2ajrh8b0gfkb7y4r86lnigz4rvz6lkh";
};
+ patches = [
+ # fix assertion when used as a library in collectd
+ # taken from https://sourceforge.net/p/openipmi/code/ci/d613d279dbce2d5e4594f6fed39653d83af0d99b/
+ ./fix-collectd-assertion.diff
+ ];
+
buildInputs = [ ncurses popt python3 readline ];
outputs = [ "out" "lib" "dev" "man" ];
diff --git a/pkgs/tools/system/openipmi/fix-collectd-assertion.diff b/pkgs/tools/system/openipmi/fix-collectd-assertion.diff
new file mode 100644
index 000000000000..af39fcc05677
--- /dev/null
+++ b/pkgs/tools/system/openipmi/fix-collectd-assertion.diff
@@ -0,0 +1,11 @@
+--- a/unix/posix_thread_os_hnd.c
++++ b/unix/posix_thread_os_hnd.c
+@@ -140,8 +140,6 @@
+ fd_data->data_ready = data_ready;
+ fd_data->handler = handler;
+ fd_data->freed = freed;
+- sel_set_fd_write_handler(posix_sel, fd, SEL_FD_HANDLER_DISABLED);
+- sel_set_fd_except_handler(posix_sel, fd, SEL_FD_HANDLER_DISABLED);
+ rv = sel_set_fd_handlers(posix_sel, fd, fd_data, fd_handler, NULL, NULL,
+ free_fd_data);
+ if (rv) {