From 1cdd9a3fe67b77a2cd23f4bc363cb019e966af71 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sun, 4 Sep 2022 13:49:26 +0000
Subject: [PATCH 01/43] nixos/mailman: add serve.virtualRoot option

On spectrum-os.org, mailman-web is run at /lists.  With this change,
it's possible for us to switch from a custom uWSGI configuration to
the one now built in to the Mailman module.
---
 nixos/modules/services/mail/mailman.nix | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/mail/mailman.nix b/nixos/modules/services/mail/mailman.nix
index 7ae0a33332e..198c2f3280f 100644
--- a/nixos/modules/services/mail/mailman.nix
+++ b/nixos/modules/services/mail/mailman.nix
@@ -263,6 +263,15 @@ in {
 
       serve = {
         enable = mkEnableOption (lib.mdDoc "Automatic nginx and uwsgi setup for mailman-web");
+
+        virtualRoot = mkOption {
+          default = "/";
+          example = lib.literalExpression "/lists";
+          type = types.str;
+          description = lib.mdDoc ''
+            Path to mount the mailman-web django application on.
+          '';
+        };
       };
 
       extraPythonPackages = mkOption {
@@ -433,8 +442,8 @@ in {
       enable = mkDefault true;
       virtualHosts = lib.genAttrs cfg.webHosts (webHost: {
         locations = {
-          "/".extraConfig = "uwsgi_pass unix:/run/mailman-web.socket;";
-          "/static/".alias = webSettings.STATIC_ROOT + "/";
+          ${cfg.serve.virtualRoot}.extraConfig = "uwsgi_pass unix:/run/mailman-web.socket;";
+          "${cfg.serve.virtualRoot}/static/".alias = webSettings.STATIC_ROOT + "/";
         };
       });
     };
@@ -561,7 +570,8 @@ in {
           type = "normal";
           plugins = ["python3"];
           home = webEnv;
-          module = "mailman_web.wsgi";
+          manage-script-name = true;
+          mount = "${cfg.serve.virtualRoot}=mailman_web.wsgi:application";
           http = "127.0.0.1:18507";
         };
         uwsgiConfigFile = pkgs.writeText "uwsgi-mailman.json" (builtins.toJSON uwsgiConfig);

From 1e64a24e64897ae12a037b5a9c5df770aefbe69c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 19 Oct 2022 16:28:20 +0000
Subject: [PATCH 02/43] python310Packages.django-oauth-toolkit: 2.1.0 -> 2.2.0

---
 .../python-modules/django-oauth-toolkit/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django-oauth-toolkit/default.nix b/pkgs/development/python-modules/django-oauth-toolkit/default.nix
index 7905c1c985f..e98ff368a5b 100644
--- a/pkgs/development/python-modules/django-oauth-toolkit/default.nix
+++ b/pkgs/development/python-modules/django-oauth-toolkit/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "django-oauth-toolkit";
-  version = "2.1.0";
+  version = "2.2.0";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "jazzband";
     repo = pname;
     rev = "refs/tags/${version}";
-    sha256 = "sha256-c78QYlU/gB4Lt04TlQFjtsS6pyjDm/fURBMa9hXLpLI=";
+    sha256 = "sha256-mynchdvrfBGKMeFFb2oDaANhtSCxq85Nibx7GfSY2nQ=";
   };
 
   postPatch = ''

From b9d9daf749415ad6afde02af75cfa2cd2dd896d6 Mon Sep 17 00:00:00 2001
From: LuoChen <luochen1990@gmail.com>
Date: Thu, 20 Oct 2022 12:34:08 +0800
Subject: [PATCH 03/43] synergy: fix services.synergy.server.tls.cert (#196867)

---
 nixos/modules/services/misc/synergy.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/misc/synergy.nix b/nixos/modules/services/misc/synergy.nix
index e630992f797..0cbdc7599c0 100644
--- a/nixos/modules/services/misc/synergy.nix
+++ b/nixos/modules/services/misc/synergy.nix
@@ -115,7 +115,7 @@ in
         description = "Synergy server";
         wantedBy = optional cfgS.autoStart "graphical-session.target";
         path = [ pkgs.synergy ];
-        serviceConfig.ExecStart = ''${pkgs.synergy}/bin/synergys -c ${cfgS.configFile} -f${optionalString (cfgS.address != "") " -a ${cfgS.address}"}${optionalString (cfgS.screenName != "") " -n ${cfgS.screenName}"}${optionalString cfgS.tls.enable " --enable-crypto"}${optionalString (cfgS.tls.cert != null) (" --tls-cert=${cfgS.tls.cert}")}'';
+        serviceConfig.ExecStart = ''${pkgs.synergy}/bin/synergys -c ${cfgS.configFile} -f${optionalString (cfgS.address != "") " -a ${cfgS.address}"}${optionalString (cfgS.screenName != "") " -n ${cfgS.screenName}"}${optionalString cfgS.tls.enable " --enable-crypto"}${optionalString (cfgS.tls.cert != null) (" --tls-cert ${cfgS.tls.cert}")}'';
         serviceConfig.Restart = "on-failure";
       };
     })

From b3782f29ff392796bf7502d53e956eefb97c001c Mon Sep 17 00:00:00 2001
From: KFears <kfearsoff@gmail.com>
Date: Sun, 30 Oct 2022 14:59:05 +0400
Subject: [PATCH 04/43] nixos/prometheus-node-exporter: fix netdev collect

Netdev collector needs AF_NETLINK permissions to work. It will fail with
the message "couldn't get netstats: socket: address family is not
supported by protocol" otherwise.
---
 .../services/monitoring/prometheus/exporters/node.nix     | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/monitoring/prometheus/exporters/node.nix b/nixos/modules/services/monitoring/prometheus/exporters/node.nix
index ae69c29d0a5..dd8602e2c63 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/node.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/node.nix
@@ -4,6 +4,8 @@ with lib;
 
 let
   cfg = config.services.prometheus.exporters.node;
+  collectorIsEnabled = final: any (collector: (final == collector)) cfg.enabledCollectors;
+  collectorIsDisabled = final: any (collector: (final == collector)) cfg.disabledCollectors;
 in
 {
   port = 9100;
@@ -35,15 +37,15 @@ in
           ${concatMapStringsSep " " (x: "--no-collector." + x) cfg.disabledCollectors} \
           --web.listen-address ${cfg.listenAddress}:${toString cfg.port} ${concatStringsSep " " cfg.extraFlags}
       '';
-      RestrictAddressFamilies = optionals (any (collector: (collector == "logind" || collector == "systemd")) cfg.enabledCollectors) [
+      RestrictAddressFamilies = optionals (collectorIsEnabled "logind" || collectorIsEnabled "systemd") [
         # needs access to dbus via unix sockets (logind/systemd)
         "AF_UNIX"
-      ] ++ optionals (any (collector: (collector == "network_route" || collector == "wifi")) cfg.enabledCollectors) [
+      ] ++ optionals (collectorIsEnabled "network_route" || collectorIsEnabled "wifi" || ! collectorIsDisabled "netdev") [
         # needs netlink sockets for wireless collector
         "AF_NETLINK"
       ];
       # The timex collector needs to access clock APIs
-      ProtectClock = any (collector: collector == "timex") cfg.disabledCollectors;
+      ProtectClock = collectorIsDisabled "timex";
       # Allow space monitoring under /home
       ProtectHome = true;
     };

From 9f2fe862966918f9e8c1b2d032cafe196235a34c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@sap.com>
Date: Tue, 1 Nov 2022 15:34:27 +0100
Subject: [PATCH 05/43] python310Packages.types-typed-ast: 1.5.8 -> 1.5.8.1

---
 pkgs/development/python-modules/types-typed-ast/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/types-typed-ast/default.nix b/pkgs/development/python-modules/types-typed-ast/default.nix
index 485c6b0d5af..f9bc60a8b92 100644
--- a/pkgs/development/python-modules/types-typed-ast/default.nix
+++ b/pkgs/development/python-modules/types-typed-ast/default.nix
@@ -5,12 +5,12 @@
 
 buildPythonPackage rec {
   pname = "types-typed-ast";
-  version = "1.5.8";
+  version = "1.5.8.1";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-FW+6ypA+hXH+cLsLVi/7qSp8vbe6yacTNRyifYgYO6c=";
+    hash = "sha256-9kwV7ATAkRgZrEwP0AUnlRMgAfv16iPR1+T+rX3km/w=";
   };
 
   # Module doesn't have tests

From 6f95836eda35a70c6c656494ef6e6421a47a7f45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@sap.com>
Date: Tue, 1 Nov 2022 15:39:06 +0100
Subject: [PATCH 06/43] python310Packages.oslo-log: 5.0.0 -> 5.0.1

---
 pkgs/development/python-modules/oslo-log/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/oslo-log/default.nix b/pkgs/development/python-modules/oslo-log/default.nix
index 4b9920c577d..0e5850da05a 100644
--- a/pkgs/development/python-modules/oslo-log/default.nix
+++ b/pkgs/development/python-modules/oslo-log/default.nix
@@ -2,6 +2,7 @@
 , stdenv
 , buildPythonPackage
 , fetchPypi
+, eventlet
 , oslo-config
 , oslo-context
 , oslo-serialization
@@ -16,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "oslo-log";
-  version = "5.0.0";
+  version = "5.0.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -24,7 +25,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "oslo.log";
     inherit version;
-    hash = "sha256-c6tyNKii1QvfUmyHTfocsrEIO6+a2VvC64r1YkidTQE=";
+    hash = "sha256-+2Xy+dJEI/pt1urY7NIfZlxi4P2fkL8xHkwVO1+Kt+o=";
   };
 
   propagatedBuildInputs = [
@@ -39,6 +40,7 @@ buildPythonPackage rec {
   ];
 
   checkInputs = [
+    eventlet
     oslotest
     pytestCheckHook
   ];

From 46de984616e3b1411d23373f7ae90c63becd7127 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@sap.com>
Date: Tue, 1 Nov 2022 15:40:12 +0100
Subject: [PATCH 07/43] python310Packages.openstackdocstheme: 3.0.0 -> 3.0.1

---
 .../development/python-modules/openstackdocstheme/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/openstackdocstheme/default.nix b/pkgs/development/python-modules/openstackdocstheme/default.nix
index b2d1a028b95..79d1a50996b 100644
--- a/pkgs/development/python-modules/openstackdocstheme/default.nix
+++ b/pkgs/development/python-modules/openstackdocstheme/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "openstackdocstheme";
-  version = "3.0.0";
+  version = "3.0.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-csbU+am2OXp4xJ60P4Cp2i7TCz+PnRg3BCcc9+PyPM8=";
+    sha256 = "sha256-yB1CdOqWV7hEfUYdtqQ/fd4sNfy7Sp7YJbRQhK5egLk=";
   };
 
   postPatch = ''

From 2ee49ec297890a0ca0f08f068fc9d6301a2fe484 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@sap.com>
Date: Tue, 1 Nov 2022 15:44:24 +0100
Subject: [PATCH 08/43] python310Packages.google-cloud-kms: 2.12.1 -> 2.12.3

---
 pkgs/development/python-modules/google-cloud-kms/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-kms/default.nix b/pkgs/development/python-modules/google-cloud-kms/default.nix
index 8569e78818f..0173f38c184 100644
--- a/pkgs/development/python-modules/google-cloud-kms/default.nix
+++ b/pkgs/development/python-modules/google-cloud-kms/default.nix
@@ -12,11 +12,11 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-kms";
-  version = "2.12.1";
+  version = "2.12.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-A1sIdkNdK4L6gb3VBApuKJ71J5N2Jq43kcD8DpHU99E=";
+    sha256 = "sha256-ooWxYH4B8HY9ybWj0GQqUnfiFXzLCqyXGGZsocV9Od0=";
   };
 
   propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core libcst proto-plus ];

From af055e5fcaec02934dd22b4e8d36d50a8c5c134a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@sap.com>
Date: Tue, 1 Nov 2022 15:48:27 +0100
Subject: [PATCH 09/43] python310Packages.google-api-core: 2.10.1 -> 2.10.2

---
 pkgs/development/python-modules/google-api-core/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-api-core/default.nix b/pkgs/development/python-modules/google-api-core/default.nix
index 89139485ca3..c92eb490df0 100644
--- a/pkgs/development/python-modules/google-api-core/default.nix
+++ b/pkgs/development/python-modules/google-api-core/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "google-api-core";
-  version = "2.10.1";
+  version = "2.10.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-4WwVoReJvFo0V6+ygYo1QKA/NB5ucQ1/m79s3i70p8g=";
+    sha256 = "sha256-EMBvdzn+V3gfh1Izdejho6RnS/Y5LNYTGjIiGCuXEyA=";
   };
 
   propagatedBuildInputs = [

From 933fadd0185ad3b3eb68202569262114091b0586 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@sap.com>
Date: Tue, 1 Nov 2022 15:51:26 +0100
Subject: [PATCH 10/43] python310Packages.drf-spectacular-sidecar: 2022.6.1 ->
 2022.11.1

---
 .../python-modules/drf-spectacular-sidecar/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/drf-spectacular-sidecar/default.nix b/pkgs/development/python-modules/drf-spectacular-sidecar/default.nix
index e2413df85d4..311f272e4b5 100644
--- a/pkgs/development/python-modules/drf-spectacular-sidecar/default.nix
+++ b/pkgs/development/python-modules/drf-spectacular-sidecar/default.nix
@@ -6,13 +6,13 @@
 
 buildPythonPackage rec {
   pname = "drf-spectacular-sidecar";
-  version = "2022.6.1";
+  version = "2022.11.1";
 
   src = fetchFromGitHub {
     owner = "tfranzel";
     repo = "drf-spectacular-sidecar";
     rev = version;
-    sha256 = "sha256-SKMAA8tcvWUF7EARq9vN8C0DWcQFRX5j/tfgHF5TUWs=";
+    sha256 = "sha256-ztUdV+Bhi3zx5UiwnpiQM/RglUH1n9J48Beuq2GPWdg=";
   };
 
   propagatedBuildInputs = [

From b22aa806052def5f5dd09bb630534bbdd7fdb5df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@sap.com>
Date: Tue, 1 Nov 2022 15:58:42 +0100
Subject: [PATCH 11/43] python310Packages.drf-spectacular: 0.22.1 -> 0.24.2

---
 .../python-modules/drf-spectacular/default.nix           | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/drf-spectacular/default.nix b/pkgs/development/python-modules/drf-spectacular/default.nix
index 8e41d24c9e1..0941c2ab309 100644
--- a/pkgs/development/python-modules/drf-spectacular/default.nix
+++ b/pkgs/development/python-modules/drf-spectacular/default.nix
@@ -28,13 +28,13 @@
 
 buildPythonPackage rec {
   pname = "drf-spectacular";
-  version = "0.22.1";
+  version = "0.24.2";
 
   src = fetchFromGitHub {
     owner = "tfranzel";
     repo = "drf-spectacular";
     rev = version;
-    sha256 = "sha256-SgzyIzgFBXsNHfY2OfCq0LhJyi/ZCOSA8QveKNduIBc=";
+    sha256 = "sha256-WE+iOD3OjDByisHI9GgvjUUSpvOz+IYi/3Y8AmR7Eps=";
   };
 
   propagatedBuildInputs = [
@@ -66,6 +66,11 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  disabledTests = [
+    # requires django with gdal
+    "test_rest_framework_gis"
+  ];
+
   pythonImportsCheck = [ "drf_spectacular" ];
 
   meta = with lib; {

From 1ea9874221a761be2ca5a31460b8f3e80f80e8e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@sap.com>
Date: Tue, 1 Nov 2022 16:05:11 +0100
Subject: [PATCH 12/43] python310Packages.django-rest-polymorphic: 0.1.9 ->
 0.1.10

---
 .../python-modules/django-rest-polymorphic/default.nix     | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/django-rest-polymorphic/default.nix b/pkgs/development/python-modules/django-rest-polymorphic/default.nix
index c53fd183db9..20a4f85a95f 100644
--- a/pkgs/development/python-modules/django-rest-polymorphic/default.nix
+++ b/pkgs/development/python-modules/django-rest-polymorphic/default.nix
@@ -12,13 +12,14 @@
 
 buildPythonPackage rec {
   pname = "django-rest-polymorphic";
-  version = "0.1.9";
+  version = "0.1.10";
 
   src = fetchFromGitHub {
     owner = "apirobot";
     repo = "django-rest-polymorphic";
-    rev = "v${version}";
-    sha256 = "sha256-p3ew2NONSyiGzDzxGTy/cx3fcQhhvnzqopJzgqhXadY=";
+     # https://github.com/denisorehovsky/django-rest-polymorphic/issues/42
+    rev = "9d920eb91ef13144094426f9ebc0ca80247c0fe3";
+    sha256 = "sha256-k7Cl2QYkaGOZaTo8v5Wg9Wqh8x0WC5i9Sggqj8eeECY=";
   };
 
   propagatedBuildInputs = [

From 1d58c3077eac453e4e5ef7c285b0229e75eaf3bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Wed, 2 Nov 2022 23:54:51 +0100
Subject: [PATCH 13/43] dnscontrol: 3.20.0 -> 3.21.0

---
 pkgs/applications/networking/dnscontrol/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/dnscontrol/default.nix b/pkgs/applications/networking/dnscontrol/default.nix
index 4493871a6ae..c4a981b6880 100644
--- a/pkgs/applications/networking/dnscontrol/default.nix
+++ b/pkgs/applications/networking/dnscontrol/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "dnscontrol";
-  version = "3.20.0";
+  version = "3.21.0";
 
   src = fetchFromGitHub {
     owner = "StackExchange";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-jBpapZIQGYC63SEc4kT6pEbNR3H1IQFM7P/wxMlrP8I=";
+    sha256 = "sha256-S07v9SATmE7gqM7+X/eWBG5A+h8lAKJ6mPvU7ImEfN4=";
   };
 
-  vendorSha256 = "sha256-iY4Q1P4Mir6idcv88Op5v0kQ7PkoOm85aCBb845xvGs=";
+  vendorSha256 = "sha256-h3UOFs7pxf9gwVAcjih8Kxr0b+68W1DanYoTpmeirg8=";
 
   ldflags = [ "-s" "-w" ];
 

From 0de458057929529c98890b056d41cefa9576815a Mon Sep 17 00:00:00 2001
From: Christian Kemper <christian.kemper@me.com>
Date: Fri, 4 Nov 2022 09:33:19 +0000
Subject: [PATCH 14/43] pulumi-bin: 3.44.3 -> 3.46.0

---
 pkgs/tools/admin/pulumi/data.nix  | 34 +++++++++++++++----------------
 pkgs/tools/admin/pulumi/update.sh |  2 +-
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/pkgs/tools/admin/pulumi/data.nix b/pkgs/tools/admin/pulumi/data.nix
index da597137f01..99b949ce062 100644
--- a/pkgs/tools/admin/pulumi/data.nix
+++ b/pkgs/tools/admin/pulumi/data.nix
@@ -1,20 +1,20 @@
 # DO NOT EDIT! This file is generated automatically by update.sh
 { }:
 {
-  version = "3.44.3";
+  version = "3.46.0";
   pulumiPkgs = {
     x86_64-linux = [
       {
-        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.44.3-linux-x64.tar.gz";
-        sha256 = "0mykgk7gkb0369i3a52jjcnwm87a8c8vfr92k9mca6hr6z79d9kp";
+        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.46.0-linux-x64.tar.gz";
+        sha256 = "1q80kp680ilvj9w51m90v6lzj11p3xvzvihf2g5c9lr5r0f4zkaz";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.4.0-linux-amd64.tar.gz";
         sha256 = "0g3s60yscxrwzbq40zii0mnh2z9yggz0wc2kg9yrfzybrmsmx8z3";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v3.1.0-linux-amd64.tar.gz";
-        sha256 = "1fak0izpaq13jsnab7y1c0vk95lja6w767gk0rp3mp76h6r0mxc8";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v3.1.1-linux-amd64.tar.gz";
+        sha256 = "0yprg3mgb7zik6s2hhh1jj7kyic9ihipr698vspgdjxa3ya4nvij";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.28.0-linux-amd64.tar.gz";
@@ -163,16 +163,16 @@
     ];
     x86_64-darwin = [
       {
-        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.44.3-darwin-x64.tar.gz";
-        sha256 = "0jjz3xwlqw62g8vzmc3pjpad9h6i81vfskxlwr88n1sgwsr6z6ml";
+        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.46.0-darwin-x64.tar.gz";
+        sha256 = "076bf9pj5k9n0gvyvms59x13dwdf9s0sqfmjrv3f3pq52676bycr";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.4.0-darwin-amd64.tar.gz";
         sha256 = "0f62xfma1d299625ydj3f95anz47l41dyasq9vpvsi1cqii6h4a1";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v3.1.0-darwin-amd64.tar.gz";
-        sha256 = "0zkg8iqd9n8hfaai0l5vcl6vgi1mh3ggs9bsszrcl7kyzkf3zyyy";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v3.1.1-darwin-amd64.tar.gz";
+        sha256 = "08d4d4rnqdx2c18ji6lm5bflskxfh7r918hickpyg3bvswgmg7kg";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.28.0-darwin-amd64.tar.gz";
@@ -321,16 +321,16 @@
     ];
     aarch64-linux = [
       {
-        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.44.3-linux-arm64.tar.gz";
-        sha256 = "1nqsvpms3l5vbcjcn8yhwia4li1v9hgnbc2mmb1ywmv2za7nbq2h";
+        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.46.0-linux-arm64.tar.gz";
+        sha256 = "137ngy26ag04yw1k3hzhmadqphw7ipfz1dcg2aal0vq8rk0xrfnb";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.4.0-linux-arm64.tar.gz";
         sha256 = "10gmwqfhvz1yp0ld69w01fmjnfw907pa0pmzjndm3p9fwqjrr2nd";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v3.1.0-linux-arm64.tar.gz";
-        sha256 = "1qf8v5qysxxlamz36z1pnjy5mqjn8dbf6aps52rbhyk2mi6v3k7c";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v3.1.1-linux-arm64.tar.gz";
+        sha256 = "014rlaw7acyz2rsmnv2mq9as6z9c9aa4s03qbfkk95sqyf6xvlqc";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.28.0-linux-arm64.tar.gz";
@@ -479,16 +479,16 @@
     ];
     aarch64-darwin = [
       {
-        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.44.3-darwin-arm64.tar.gz";
-        sha256 = "1nwgf0mg82vlc93adplw9c3x3fa3277ql8zbc8jqxbvm4l1hr4h2";
+        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.46.0-darwin-arm64.tar.gz";
+        sha256 = "1id3l0dycqf8rwxzf2nx11xg2qcvzgpp3373l4qfab68251cw15d";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.4.0-darwin-arm64.tar.gz";
         sha256 = "1v6dwsjbqmg9qnlhf5jl98r5c171xnsp3fnyfkg2h8874scg2gpp";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v3.1.0-darwin-arm64.tar.gz";
-        sha256 = "0a9lzmkc3c7pc6axbymnq7s9b9qwmrjndg6hspx705d1fx4vs28g";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v3.1.1-darwin-arm64.tar.gz";
+        sha256 = "19l5b3grxf0ckxpmjn7x8158bkzv8329adj7m4gi09d9sx6wwsxw";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.28.0-darwin-arm64.tar.gz";
diff --git a/pkgs/tools/admin/pulumi/update.sh b/pkgs/tools/admin/pulumi/update.sh
index 9e21d1c116a..1379d0ceaed 100755
--- a/pkgs/tools/admin/pulumi/update.sh
+++ b/pkgs/tools/admin/pulumi/update.sh
@@ -12,7 +12,7 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 
 # Version of Pulumi from
 # https://www.pulumi.com/docs/get-started/install/versions/
-VERSION="3.44.3"
+VERSION="3.46.0"
 
 # An array of plugin names. The respective repository inside Pulumi's
 # Github organization is called pulumi-$name by convention.

From c2d61db7246db35b0571d51b4c898f929f9f9e33 Mon Sep 17 00:00:00 2001
From: Hubert Jasudowicz <hubert.jasudowicz@gmail.com>
Date: Fri, 4 Nov 2022 14:09:52 +0100
Subject: [PATCH 15/43] dmenu-wayland: 2020-07-06 -> 2022-11-04

---
 pkgs/applications/misc/dmenu/wayland.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/dmenu/wayland.nix b/pkgs/applications/misc/dmenu/wayland.nix
index 8e4a98af138..2569300ccc3 100644
--- a/pkgs/applications/misc/dmenu/wayland.nix
+++ b/pkgs/applications/misc/dmenu/wayland.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   pname = "dmenu-wayland-unstable";
-  version = "2020-07-06";
+  version = "2022-11-04";
 
   src = fetchFromGitHub {
     owner = "nyyManni";
     repo = "dmenu-wayland";
-    rev = "304c8e917651ee02b16ebf0b7097a5c53fa2236b";
-    sha256 = "0rkpmpk7xkcfbnv9vpg8n65423z5xpgp0hm2vg0rxf9354bjin7k";
+    rev = "b60047236ef7a4e5dcde6c4ac0dcfaa070d90041";
+    sha256 = "sha256-CeJWLBPAzE3JITVuS6f4CQxLz9v09WvfG3O0wErJJS4=";
   };
 
   outputs = [ "out" "man" ];

From efa86fc3b0daa9782d7bd1a2e25d52206be94100 Mon Sep 17 00:00:00 2001
From: Claudio Bley <claudio.bley@gmail.com>
Date: Sat, 5 Nov 2022 00:56:56 +0100
Subject: [PATCH 16/43] mold: Unbreak on aarch64-linux

The default stdenv C++ compiler / library on this platform is too old to
support mold's C++20 code base.
---
 pkgs/development/tools/mold/default.nix | 2 --
 pkgs/top-level/all-packages.nix         | 5 ++++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/mold/default.nix b/pkgs/development/tools/mold/default.nix
index 76b0f919b6c..299c1204d1f 100644
--- a/pkgs/development/tools/mold/default.nix
+++ b/pkgs/development/tools/mold/default.nix
@@ -48,7 +48,5 @@ stdenv.mkDerivation rec {
     license = licenses.agpl3Plus;
     maintainers = with maintainers; [ azahi nitsky ];
     platforms = platforms.unix;
-    # https://github.com/NixOS/nixpkgs/pull/189712#issuecomment-1237791234
-    broken = (stdenv.isLinux && stdenv.isAarch64);
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bd331840e52..06e186c9a9f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16984,7 +16984,10 @@ with pkgs;
   modd = callPackage ../development/tools/modd { };
 
   mold = callPackage ../development/tools/mold {
-    inherit (llvmPackages) stdenv;
+    # C++20 is required, aarch64-linux has gcc 9 by default
+    stdenv = if stdenv.isLinux && stdenv.isAarch64
+      then llvmPackages_12.libcxxStdenv
+      else llvmPackages.stdenv;
   };
 
   msgpack-tools = callPackage ../development/tools/msgpack-tools { };

From f968b3da7386593e2ccb1ef6d8ff4e20a6408ffa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 5 Nov 2022 01:41:49 +0000
Subject: [PATCH 17/43] snipe-it: 6.0.12 -> 6.0.13

---
 pkgs/servers/web-apps/snipe-it/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/web-apps/snipe-it/default.nix b/pkgs/servers/web-apps/snipe-it/default.nix
index f87f9e43b15..cd42372c75c 100644
--- a/pkgs/servers/web-apps/snipe-it/default.nix
+++ b/pkgs/servers/web-apps/snipe-it/default.nix
@@ -27,13 +27,13 @@ let
 
 in package.override rec {
   pname = "snipe-it";
-  version = "6.0.12";
+  version = "6.0.13";
 
   src = fetchFromGitHub {
     owner = "snipe";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-1/v2kCXedhtiqyO6d7kpmAnWGidXM1djlpbBr7/AyQI=";
+    sha256 = "sha256-QwPl3JXB8gZS1/VyPBCc3PIQa+qtUNpuANSx4+oxWYg=";
   };
 
   meta = with lib; {

From 2435d48ae76113245325853a83bd70e849847a4a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 5 Nov 2022 08:36:19 +0000
Subject: [PATCH 18/43] python310Packages.pulp: 2.6.0 -> 2.7.0

---
 pkgs/development/python-modules/pulp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pulp/default.nix b/pkgs/development/python-modules/pulp/default.nix
index 65a179f59d6..a0fa64d8ada 100644
--- a/pkgs/development/python-modules/pulp/default.nix
+++ b/pkgs/development/python-modules/pulp/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "PuLP";
-  version = "2.6.0";
+  version = "2.7.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "4b4f7e1e954453e1b233720be23aea2f10ff068a835ac10c090a93d8e2eb2e8d";
+    sha256 = "sha256-5z7msy1jnJuM9LSt7TNLoVi+X4MTVE4Fb3lqzgoQrmM=";
   };
 
   propagatedBuildInputs = [ pyparsing amply ];

From 9402ab5a6530cf0c7063700402925074217e798c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 5 Nov 2022 10:14:44 +0100
Subject: [PATCH 19/43] python310Packages.python-lsp-server: 1.5.0 -> 1.6.0

---
 .../python-lsp-server/default.nix             | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/python-lsp-server/default.nix b/pkgs/development/python-modules/python-lsp-server/default.nix
index 72bfed33cdb..f9bddb009dc 100644
--- a/pkgs/development/python-modules/python-lsp-server/default.nix
+++ b/pkgs/development/python-modules/python-lsp-server/default.nix
@@ -2,6 +2,7 @@
 , stdenv
 , autopep8
 , buildPythonPackage
+, docstring-to-markdown
 , fetchFromGitHub
 , flake8
 , flaky
@@ -30,7 +31,7 @@
 
 buildPythonPackage rec {
   pname = "python-lsp-server";
-  version = "1.5.0";
+  version = "1.6.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -39,30 +40,32 @@ buildPythonPackage rec {
     owner = "python-lsp";
     repo = pname;
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-tW2w94HI6iy8vcDb5pIL79bAO6BJp9q6SMAXgiVobm0=";
+    sha256 = "sha256-1LV8FcwQqUg+FIkrorBYlxMl4F1PkrrOWjD5M0JSp3Q=";
   };
 
+  SETUPTOOLS_SCM_PRETEND_VERSION = version;
+
   postPatch = ''
     substituteInPlace pyproject.toml \
       --replace "--cov-report html --cov-report term --junitxml=pytest.xml" "" \
       --replace "--cov pylsp --cov test" "" \
       --replace "autopep8>=1.6.0,<1.7.0" "autopep8" \
-      --replace "flake8>=4.0.0,<4.1.0" "flake8" \
-      --replace "mccabe>=0.6.0,<0.7.0" "mccabe" \
-      --replace "pycodestyle>=2.8.0,<2.9.0" "pycodestyle" \
-      --replace "pyflakes>=2.4.0,<2.5.0" "pyflakes"
+      --replace "flake8>=5.0.0,<5.1.0" "flake8" \
+      --replace "mccabe>=0.7.0,<0.8.0" "mccabe" \
+      --replace "pycodestyle>=2.9.0,<2.10.0" "pycodestyle" \
+      --replace "pyflakes>=2.5.0,<2.6.0" "pyflakes"
   '';
 
-  preBuild = ''
-    export SETUPTOOLS_SCM_PRETEND_VERSION=${version}
-  '';
+  nativeBuildInputs = [
+    setuptools
+    setuptools-scm
+  ];
 
   propagatedBuildInputs = [
+    docstring-to-markdown
     jedi
     pluggy
     python-lsp-jsonrpc
-    setuptools
-    setuptools-scm
     ujson
   ];
 

From 9027598655757c3eefb8ebe1757797712821fff1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 5 Nov 2022 10:31:47 +0100
Subject: [PATCH 20/43] python310Packages.pulp: disable on older Python
 releases

- prepare to run the tests
---
 .../python-modules/pulp/default.nix           | 46 +++++++++++++------
 1 file changed, 33 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/python-modules/pulp/default.nix b/pkgs/development/python-modules/pulp/default.nix
index a0fa64d8ada..60fa54438f9 100644
--- a/pkgs/development/python-modules/pulp/default.nix
+++ b/pkgs/development/python-modules/pulp/default.nix
@@ -1,29 +1,49 @@
 { lib
-, fetchPypi
-, buildPythonPackage
-, pyparsing
 , amply
+, buildPythonPackage
+, fetchFromGitHub
+, pyparsing
+, pythonOlder
+, pytestCheckHook
 }:
 
 buildPythonPackage rec {
-  pname = "PuLP";
+  pname = "pulp";
   version = "2.7.0";
+  format = "setuptools";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-5z7msy1jnJuM9LSt7TNLoVi+X4MTVE4Fb3lqzgoQrmM=";
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "coin-or";
+    repo = pname;
+    rev = "refs/tags/${version}";
+    hash = "sha256-j0f6OiscJyTqPNyLp0qWRjCGLWuT3HdU1S/sxpnsiMo=";
   };
 
-  propagatedBuildInputs = [ pyparsing amply ];
+  propagatedBuildInputs = [
+    amply
+    pyparsing
+  ];
 
-  # only one test that requires an extra
-  doCheck = false;
-  pythonImportsCheck = [ "pulp" ];
+  checkInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "pulp"
+  ];
+
+  disabledTests = [
+    # The solver is not available
+    "PULP_CBC_CMDTest"
+    "test_examples"
+  ];
 
   meta = with lib; {
+    description = "Module to generate  generate MPS or LP files";
     homepage = "https://github.com/coin-or/pulp";
-    description = "PuLP is an LP modeler written in python";
-    maintainers = with maintainers; [ teto ];
     license = licenses.mit;
+    maintainers = with maintainers; [ teto ];
   };
 }

From dce91a7345ca8b6d9344ed4db95a0b4250939ac3 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 5 Nov 2022 19:57:47 +0100
Subject: [PATCH 21/43] element-{web,desktop}: 1.11.12 -> 1.11.13

ChangeLog: https://github.com/vector-im/element-web/releases/tag/v1.11.13
---
 .../element/element-web.nix                   | 14 +++-----
 .../instant-messengers/element/pin.json       |  8 ++---
 .../regenerate-element-web-yarn.lock.diff     | 32 -------------------
 3 files changed, 9 insertions(+), 45 deletions(-)
 delete mode 100644 pkgs/applications/networking/instant-messengers/element/regenerate-element-web-yarn.lock.diff

diff --git a/pkgs/applications/networking/instant-messengers/element/element-web.nix b/pkgs/applications/networking/instant-messengers/element/element-web.nix
index 3b30abbb3d6..92130d30990 100644
--- a/pkgs/applications/networking/instant-messengers/element/element-web.nix
+++ b/pkgs/applications/networking/instant-messengers/element/element-web.nix
@@ -9,7 +9,6 @@
 , fixup_yarn_lock
 , nodejs
 , jitsi-meet
-, applyPatches
 , conf ? { }
 }:
 
@@ -25,14 +24,11 @@ in stdenv.mkDerivation rec {
   pname = "element-web";
   inherit (pinData) version;
 
-  src = applyPatches {
-    src = fetchFromGitHub {
-      owner = "vector-im";
-      repo = pname;
-      rev = "v${version}";
-      sha256 = pinData.webSrcHash;
-    };
-    patches = [ ./regenerate-element-web-yarn.lock.diff ];
+  src = fetchFromGitHub {
+    owner = "vector-im";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = pinData.webSrcHash;
   };
 
   offlineCache = fetchYarnDeps {
diff --git a/pkgs/applications/networking/instant-messengers/element/pin.json b/pkgs/applications/networking/instant-messengers/element/pin.json
index 2ba1fbaf4f8..9e09fa6acbe 100644
--- a/pkgs/applications/networking/instant-messengers/element/pin.json
+++ b/pkgs/applications/networking/instant-messengers/element/pin.json
@@ -1,7 +1,7 @@
 {
-  "version": "1.11.12",
-  "desktopSrcHash": "85mH9y3/IlThrdZY4Nv6iZQ8SxVGoYcZ1bbkCuAAroU=",
+  "version": "1.11.13",
+  "desktopSrcHash": "E8jpv7cJf8qdR4I3n7id5hUysAiMVvwyqUqHzGnVUJE=",
   "desktopYarnHash": "1scp9y2lmah3n20f1kpc9paspd3qgslg129diis7g11cz4h0wyi5",
-  "webSrcHash": "MfiPrTw7BFLFPbm6xR5QbQHNPYpaJBtZES6KjISMTeE=",
-  "webYarnHash": "sha256-KZNBocVEs3wD5020h6C4n2jgp4shv4IgFENSi87rUFM="
+  "webSrcHash": "985nxLIOZvrUX11AJDXYRMwC76/aP9ruSCqL47c7ZRM=",
+  "webYarnHash": "0bmjg9qhd89bdnh398lp257mxdgdd88wj5g3fmc3cavyd6hmgzbn"
 }
diff --git a/pkgs/applications/networking/instant-messengers/element/regenerate-element-web-yarn.lock.diff b/pkgs/applications/networking/instant-messengers/element/regenerate-element-web-yarn.lock.diff
deleted file mode 100644
index 98a39f99247..00000000000
--- a/pkgs/applications/networking/instant-messengers/element/regenerate-element-web-yarn.lock.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/yarn.lock b/yarn.lock
-index 1581f599f..910764c86 100644
---- a/yarn.lock
-+++ b/yarn.lock
-@@ -3150,6 +3150,11 @@ brorand@^1.0.1, brorand@^1.1.0:
-   resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
-   integrity sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==
- 
-+browser-request@^0.3.3:
-+  version "0.3.3"
-+  resolved "https://registry.yarnpkg.com/browser-request/-/browser-request-0.3.3.tgz#9ece5b5aca89a29932242e18bf933def9876cc17"
-+  integrity sha512-YyNI4qJJ+piQG6MMEuo7J3Bzaqssufx04zpEKYfSrl/1Op59HWali9zMtBpXnkmqMcOuWJPZvudrm9wISmnCbg==
-+
- browserify-aes@^1.0.0, browserify-aes@^1.0.4:
-   version "1.2.0"
-   resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48"
-@@ -8177,7 +8182,6 @@ matrix-js-sdk@21.0.0:
-   dependencies:
-     "@babel/runtime" "^7.12.5"
-     another-json "^0.2.0"
--    browser-request "^0.3.3"
-     bs58 "^5.0.0"
-     content-type "^1.0.4"
-     loglevel "^1.7.1"
-@@ -8208,7 +8212,6 @@ matrix-react-sdk@3.59.0:
-     "@types/ua-parser-js" "^0.7.36"
-     await-lock "^2.1.0"
-     blurhash "^1.1.3"
--    browser-request "^0.3.3"
-     cheerio "^1.0.0-rc.9"
-     classnames "^2.2.6"
-     commonmark "^0.29.3"

From 01b794ca75db6a964201c92659f2c04d159cf4a7 Mon Sep 17 00:00:00 2001
From: hqurve <hqurve@outlook.com>
Date: Thu, 3 Nov 2022 20:30:31 -0400
Subject: [PATCH 22/43] junction: 1.5.0 -> 1.6

---
 pkgs/applications/misc/junction/default.nix | 24 +++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/junction/default.nix b/pkgs/applications/misc/junction/default.nix
index 34002c54716..c1d3ff263c0 100644
--- a/pkgs/applications/misc/junction/default.nix
+++ b/pkgs/applications/misc/junction/default.nix
@@ -2,6 +2,7 @@
 , stdenv
 , fetchFromGitHub
 , appstream-glib
+, blueprint-compiler
 , desktop-file-utils
 , gobject-introspection
 , meson
@@ -16,17 +17,19 @@
 
 stdenv.mkDerivation rec {
   pname = "junction";
-  version = "1.5.0";
+  version = "1.6";
 
   src = fetchFromGitHub {
     owner = "sonnyp";
     repo = "junction";
     rev = "v${version}";
-    sha256 = "sha256-jS4SHh1BB8jk/4EP070X44C4n3GjyCz8ozgK8v5lbqc=";
+    sha256 = "sha256-95lKap0VKLxX5Vax2tK0cAcJ/XgQddoN46tXHo+MtYc=";
+    fetchSubmodules = true;
   };
 
   nativeBuildInputs = [
     appstream-glib
+    blueprint-compiler
     desktop-file-utils
     gobject-introspection
     meson
@@ -42,12 +45,25 @@ stdenv.mkDerivation rec {
     libportal-gtk4
   ];
 
+  postPatch = ''
+    # gjs uses the invocation name to add gresource files
+    # - https://gitlab.gnome.org/GNOME/gjs/-/blob/6aca7b50785fa1638f144b17060870d721e3f65a/modules/script/package.js#L159
+    # - https://gitlab.gnome.org/GNOME/gjs/-/blob/6aca7b50785fa1638f144b17060870d721e3f65a/modules/script/package.js#L37
+    # To work around this, we manually set the the name as done in foliate
+    # - https://github.com/NixOS/nixpkgs/blob/3bacde6273b09a21a8ccfba15586fb165078fb62/pkgs/applications/office/foliate/default.nix#L23
+    sed -i "1 a imports.package._findEffectiveEntryPointName = () => 're.sonny.Junction';" src/bin.js
+
+    # /usr/bin/env is not accessible in build environment
+    substituteInPlace troll/gjspack/bin/gjspack --replace "/usr/bin/env -S gjs" "${gjs}/bin/gjs"
+  '';
+
   postInstall = ''
-    # autoPatchShebangs does not like "/usr/bin/env -S gjs"
-    substituteInPlace $out/bin/re.sonny.Junction --replace "/usr/bin/env -S gjs" "/usr/bin/gjs"
+    # autoPatchShebangs does not like "/usr/bin/env -S <environment-setting> gjs -m"
+    sed -i "1s|.*|#!/usr/bin/gjs -m|" $out/bin/re.sonny.Junction
   '';
 
   meta = with lib; {
+    mainProgram = "re.sonny.Junction";
     description = "Choose the application to open files and links";
     homepage = "https://apps.gnome.org/en/app/re.sonny.Junction/";
     license = licenses.gpl3Plus;

From d858f8d546c122456d393a684880ae868fe96132 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 5 Nov 2022 20:42:26 +0000
Subject: [PATCH 23/43] python310Packages.hg-git: 1.0.0 -> 1.0.1

---
 pkgs/development/python-modules/hg-git/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/hg-git/default.nix b/pkgs/development/python-modules/hg-git/default.nix
index 6ccde29313b..0be08bedff7 100644
--- a/pkgs/development/python-modules/hg-git/default.nix
+++ b/pkgs/development/python-modules/hg-git/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "hg-git";
-  version = "1.0.0";
+  version = "1.0.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-ORGDOWLrnImca+qPtJZmyC8hGxJNCEC+tq2V4jpGIbY=";
+    hash = "sha256-P3Ng9bD16AX7DJac/Y168GSWLTIAD3I1aLblYIDQiyk=";
   };
 
   propagatedBuildInputs = [

From 89a8b7beb45e31de1977b0a81ab48b00b2cdefae Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 5 Nov 2022 21:25:55 +0000
Subject: [PATCH 24/43] python310Packages.aiohomekit: 2.2.14 -> 2.2.16

---
 pkgs/development/python-modules/aiohomekit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aiohomekit/default.nix b/pkgs/development/python-modules/aiohomekit/default.nix
index 794879d4b47..61f31f62004 100644
--- a/pkgs/development/python-modules/aiohomekit/default.nix
+++ b/pkgs/development/python-modules/aiohomekit/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "aiohomekit";
-  version = "2.2.14";
+  version = "2.2.16";
   format = "pyproject";
 
   disabled = pythonOlder "3.9";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "Jc2k";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-0O8fax25vabItFnUD9N7C4gyMSKPHqHSgzJXJjp5dGw=";
+    hash = "sha256-Dr7K71wEk46UPyNp3FRuRVqfOn40X059lf3yojM57cc=";
   };
 
   nativeBuildInputs = [

From de4601c37ef5005ca9ff3553eb9c0804f058ad0e Mon Sep 17 00:00:00 2001
From: xeals <dev@xeal.me>
Date: Sun, 6 Nov 2022 10:58:46 +1100
Subject: [PATCH 25/43] nixos/influxdb2: set timezone data environment variable

Go reads the timezone database from ZONEINFO instead of TZDIR, which is otherwise
unset.
---
 nixos/modules/services/databases/influxdb2.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/databases/influxdb2.nix b/nixos/modules/services/databases/influxdb2.nix
index 92c5a5d7a40..e74de66ddc2 100644
--- a/nixos/modules/services/databases/influxdb2.nix
+++ b/nixos/modules/services/databases/influxdb2.nix
@@ -40,6 +40,7 @@ in
       after = [ "network.target" ];
       environment = {
         INFLUXD_CONFIG_PATH = configFile;
+        ZONEINFO = "${pkgs.tzdata}/share/zoneinfo";
       };
       serviceConfig = {
         ExecStart = "${cfg.package}/bin/influxd --bolt-path \${STATE_DIRECTORY}/influxd.bolt --engine-path \${STATE_DIRECTORY}/engine";

From 76df7b5d94ed67710389953d92e1fa7ddeccff43 Mon Sep 17 00:00:00 2001
From: Nicholas Sielicki <git@opensource.nslick.com>
Date: Sat, 5 Nov 2022 19:30:16 -0500
Subject: [PATCH 26/43] bat-extras: add batpipe

---
 pkgs/tools/misc/bat-extras/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/misc/bat-extras/default.nix b/pkgs/tools/misc/bat-extras/default.nix
index 76e2906a942..c586e514a71 100644
--- a/pkgs/tools/misc/bat-extras/default.nix
+++ b/pkgs/tools/misc/bat-extras/default.nix
@@ -139,6 +139,7 @@ in
   batdiff = script "batdiff" ([ less coreutils gitMinimal ] ++ optionalDep withDelta delta);
   batgrep = script "batgrep" [ less coreutils ripgrep ];
   batman = script "batman" [ util-linux ];
+  batpipe = script "batpipe" [ less ];
   batwatch = script "batwatch" ([ less coreutils ] ++ optionalDep withEntr entr);
   prettybat = script "prettybat" ([]
     ++ optionalDep withShFmt shfmt

From dba57a03626c9d33ad423de73afddadfcb742549 Mon Sep 17 00:00:00 2001
From: Nicholas Sielicki <git@opensource.nslick.com>
Date: Sat, 5 Nov 2022 19:42:05 -0500
Subject: [PATCH 27/43] pkgs/tools/misc/bat-extras: fix tests

Add bash/fish/zsh to checkInputs
---
 pkgs/tools/misc/bat-extras/default.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/bat-extras/default.nix b/pkgs/tools/misc/bat-extras/default.nix
index c586e514a71..d076cd1026f 100644
--- a/pkgs/tools/misc/bat-extras/default.nix
+++ b/pkgs/tools/misc/bat-extras/default.nix
@@ -3,6 +3,10 @@
 , coreutils
 , getconf
 , less
+# tests
+, bash
+, zsh
+, fish
 # batgrep
 , ripgrep
 # prettybat
@@ -51,7 +55,7 @@ let
 
     # Run the library tests as they don't have external dependencies
     doCheck = true;
-    checkInputs = lib.optionals stdenv.isDarwin [ getconf ];
+    checkInputs = [ bash fish zsh ] ++ (lib.optionals stdenv.isDarwin [ getconf ]);
     checkPhase = ''
       runHook preCheck
       # test list repeats suites. Unique them
@@ -59,12 +63,12 @@ let
       while read -r action arg _; do
         [[ "$action" == "test_suite" && "$arg" == lib_* ]] &&
         test_suites+=(["$arg"]=1)
-      done <<<"$(bash ./test.sh --compiled --list --porcelain)"
+      done <<<"$(./test.sh --compiled --list --porcelain)"
       (( ''${#test_suites[@]} != 0 )) || {
         echo "Couldn't find any library test suites"
         exit 1
       }
-      bash ./test.sh --compiled $(printf -- "--suite %q\n" "''${!test_suites[@]}")
+      ./test.sh --compiled $(printf -- "--suite %q\n" "''${!test_suites[@]}")
       runHook postCheck
     '';
 
@@ -108,7 +112,7 @@ let
       dontBuild = true; # we've already built
 
       doCheck = true;
-      checkInputs = lib.optionals stdenv.isDarwin [ getconf ];
+      checkInputs = [ bash fish zsh ] ++ (lib.optionals stdenv.isDarwin [ getconf ]);
       checkPhase = ''
         runHook preCheck
         bash ./test.sh --compiled --suite ${name}

From 503864768b60de4b0c932b856ecd38072cea0dde Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <andersk@mit.edu>
Date: Mon, 3 Oct 2022 14:50:42 -0700
Subject: [PATCH 28/43] =?UTF-8?q?or-tools:=209.1=20=E2=86=92=209.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
---
 .../science/math/or-tools/default.nix         | 143 ++++++++----------
 pkgs/top-level/all-packages.nix               |   6 +-
 2 files changed, 70 insertions(+), 79 deletions(-)

diff --git a/pkgs/development/libraries/science/math/or-tools/default.nix b/pkgs/development/libraries/science/math/or-tools/default.nix
index 20978e31cff..30feab0c9bf 100644
--- a/pkgs/development/libraries/science/math/or-tools/default.nix
+++ b/pkgs/development/libraries/science/math/or-tools/default.nix
@@ -1,108 +1,99 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, cmake
-, abseil-cpp
+{ abseil-cpp
 , bzip2
-, zlib
-, lsb-release
-, which
-, protobuf
 , cbc
+, cmake
+, eigen
 , ensureNewerSourcesForZipFilesHook
+, fetchFromGitHub
+, fetchpatch
+, glpk
+, lib
+, pkg-config
+, protobuf
 , python
+, re2
+, stdenv
 , swig4
+, unzip
+, zlib
 }:
 
 stdenv.mkDerivation rec {
   pname = "or-tools";
-  version = "9.1";
-  disabled = python.pythonOlder "3.6";  # not supported upstream
+  version = "9.4";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "or-tools";
     rev = "v${version}";
-    sha256 = "sha256-dEYMPWpa3J9EqtCq3kubdUYJivNRTOKUpNDx3UC1IcQ=";
+    sha256 = "sha256-joWonJGuxlgHhXLznRhC1MDltQulXzpo4Do9dec1bLY=";
   };
-
-  # The original build system uses cmake which does things like pull
-  # in dependencies through git and Makefile creation time. We
-  # obviously don't want to do this so instead we provide the
-  # dependencies straight from nixpkgs and use the make build method.
-
-  # Cbc is linked against bzip2 and declares this in its pkgs-config file,
-  # but this makefile doesn't use pkgs-config, so we also have to add lbz2
-  configurePhase = ''
-    substituteInPlace makefiles/Makefile.third_party.unix.mk \
-      --replace 'COINUTILS_LNK = $(STATIC_COINUTILS_LNK)' \
-                'COINUTILS_LNK = $(STATIC_COINUTILS_LNK) -lbz2'
-
-    cat <<EOF > Makefile.local
-      UNIX_ABSL_DIR=${abseil-cpp}
-      UNIX_PROTOBUF_DIR=${protobuf}
-      UNIX_CBC_DIR=${cbc}
-      USE_SCIP=OFF
-    EOF
-  '';
-
-  # Many of these 'samples' (which are really the tests) require using SCIP, and or-tools 8.1
-  # will just crash if SCIP is not found because it doesn't fall back to using one of
-  # the available solvers: https://github.com/google/or-tools/blob/b77bd3ac69b7f3bb02f55b7bab6cbb4bab3917f2/ortools/linear_solver/linear_solver.cc#L427
-  # We don't compile with SCIP because it does not have an open source license.
-  # See https://github.com/google/or-tools/issues/2395
-  preBuild = ''
-    for file in ortools/linear_solver/samples/*.cc; do
-      if grep -q SCIP_MIXED_INTEGER_PROGRAMMING $file; then
-        substituteInPlace $file --replace SCIP_MIXED_INTEGER_PROGRAMMING CBC_MIXED_INTEGER_PROGRAMMING
-      fi;
-    done
-
-    substituteInPlace ortools/linear_solver/samples/simple_mip_program.cc \
-      --replace 'SCIP' 'CBC'
-  '';
-  makeFlags = [
-    "prefix=${placeholder "out"}"
-    "PROTOBUF_PYTHON_DESC=${python.pkgs.protobuf}/${python.sitePackages}/google/protobuf/descriptor_pb2.py"
+  patches = [
+    # Disable test that requires external input: https://github.com/google/or-tools/issues/3429
+    (fetchpatch {
+      url = "https://github.com/google/or-tools/commit/7072ae92ec204afcbfce17d5360a5884c136ce90.patch";
+      hash = "sha256-iWE+atp308q7pC1L1FD6sK8LvWchZ3ofxvXssguozbM=";
+    })
+    # Fix test that broke in parallel builds: https://github.com/google/or-tools/issues/3461
+    (fetchpatch {
+      url = "https://github.com/google/or-tools/commit/a26602f24781e7bfcc39612568aa9f4010bb9736.patch";
+      hash = "sha256-gM0rW0xRXMYaCwltPK0ih5mdo3HtX6mKltJDHe4gbLc=";
+    })
   ];
-  buildFlags = [ "cc" "pypi_archive" ];
-
-  doCheck = true;
-  checkTarget = "test_cc";
-
-  installTargets = [ "install_cc" ];
-  # The upstream install_python target installs to $HOME.
-  postInstall = ''
-    mkdir -p "$python/${python.sitePackages}"
-    (cd temp_python/ortools; PYTHONPATH="$python/${python.sitePackages}:$PYTHONPATH" python setup.py install '--prefix=$python')
-  '';
-
-  # protobuf generation is not thread safe
-  enableParallelBuilding = false;
 
+  cmakeFlags = [
+    "-DBUILD_DEPS=OFF"
+    "-DBUILD_PYTHON=ON"
+    "-DBUILD_pybind11=OFF"
+    "-DFETCH_PYTHON_DEPS=OFF"
+    "-DUSE_GLPK=ON"
+    "-DUSE_SCIP=OFF"
+  ];
   nativeBuildInputs = [
     cmake
-    lsb-release
-    swig4
-    which
     ensureNewerSourcesForZipFilesHook
-    python.pkgs.setuptools
-    python.pkgs.wheel
+    pkg-config
+    python
+    python.pkgs.pip
+    swig4
+    unzip
   ];
   buildInputs = [
-    zlib
     bzip2
-    python
+    cbc
+    eigen
+    glpk
+    python.pkgs.absl-py
+    python.pkgs.mypy-protobuf
+    python.pkgs.pybind11
+    python.pkgs.setuptools
+    python.pkgs.wheel
+    re2
+    zlib
   ];
   propagatedBuildInputs = [
     abseil-cpp
     protobuf
-
     python.pkgs.protobuf
-    python.pkgs.six
-    python.pkgs.absl-py
-    python.pkgs.mypy-protobuf
+    python.pkgs.numpy
   ];
+  checkInputs = [
+    python.pkgs.matplotlib
+    python.pkgs.pandas
+    python.pkgs.virtualenv
+  ];
+
+  doCheck = true;
+
+  # This extra configure step prevents the installer from littering
+  # $out/bin with sample programs that only really function as tests,
+  # and disables the upstream installation of a zipped Python egg that
+  # can’t be imported with our Python setup.
+  installPhase = ''
+    cmake . -DBUILD_EXAMPLES=OFF -DBUILD_PYTHON=OFF -DBUILD_SAMPLES=OFF
+    cmake --install .
+    pip install --prefix="$python" python/
+  '';
 
   outputs = [ "out" "python" ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fff8023f2a2..da15f59bd55 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -34895,11 +34895,11 @@ with pkgs;
 
   or-tools = callPackage ../development/libraries/science/math/or-tools {
     python = python3;
-    # or-tools builds with -std=c++17, so abseil-cpp must
+    # or-tools builds with -std=c++20, so abseil-cpp must
     # also be built that way
-    abseil-cpp = abseil-cpp.override {
+    abseil-cpp = abseil-cpp_202111.override {
       static = true;
-      cxxStandard = "17";
+      cxxStandard = "20";
     };
   };
 

From b523abff50c8a8a9546863b0cad5b304cef0b380 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Sun, 6 Nov 2022 09:56:32 +0800
Subject: [PATCH 29/43] tdesktop: 4.2.4 -> 4.3.0

---
 .../instant-messengers/telegram/tdesktop/default.nix      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index 10f9ad7697d..0e76ef4eeaf 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -27,7 +27,7 @@
 , range-v3
 , tl-expected
 , hunspell
-, glibmm
+, glibmm_2_68
 , webkitgtk_4_1
 , jemalloc
 , rnnoise
@@ -74,7 +74,7 @@ let
 in
 env.mkDerivation rec {
   pname = "telegram-desktop";
-  version = "4.2.4";
+  version = "4.3.0";
   # Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py
 
   # Telegram-Desktop with submodules
@@ -83,7 +83,7 @@ env.mkDerivation rec {
     repo = "tdesktop";
     rev = "v${version}";
     fetchSubmodules = true;
-    sha256 = "sha256-X2ZbjlL3YbPdXSgS+wqZL3FUW2xQ0DhqiOO5MR1QyLY=";
+    sha256 = "1ji9351vcvydkcrdwqx22j1nhl9vysd6ajvghaqxdirvqypiygj0";
   };
 
   postPatch = ''
@@ -131,7 +131,7 @@ env.mkDerivation rec {
     range-v3
     tl-expected
     hunspell
-    glibmm
+    glibmm_2_68
     webkitgtk_4_1
     jemalloc
     rnnoise

From b44a7cb8b30cf00ff121f6594d3ba05b3fe07616 Mon Sep 17 00:00:00 2001
From: Icy-Thought <icy-thought@pm.me>
Date: Sun, 6 Nov 2022 04:46:20 +0100
Subject: [PATCH 30/43] fluent-icon-theme: 2022-09-20 -> 2022-11-05

---
 pkgs/data/icons/fluent-icon-theme/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/icons/fluent-icon-theme/default.nix b/pkgs/data/icons/fluent-icon-theme/default.nix
index 8898fb0e186..d4206ed58b4 100644
--- a/pkgs/data/icons/fluent-icon-theme/default.nix
+++ b/pkgs/data/icons/fluent-icon-theme/default.nix
@@ -16,13 +16,13 @@ lib.checkListOfEnum "${pname}: available color variants" [ "standard" "green" "g
 
 stdenvNoCC.mkDerivation rec {
   inherit pname;
-  version = "2022-09-20";
+  version = "2022-11-05";
 
   src = fetchFromGitHub {
     owner = "vinceliuice";
     repo = pname;
     rev = version;
-    sha256 = "Ce8LTIxKabeqV9QVK68DqUVwtwG5lyxDPDQx0mLIr5o=";
+    sha256 = "kKl/E2L1NL1U7PHbva+wUqQGbcHFbPgZBVhU/OgEuAE=";
   };
 
   nativeBuildInputs = [ gtk3 jdupes ];

From 877282ff49dd8867cc24ee91ec87230afc641fbb Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Sun, 6 Nov 2022 15:55:50 +0800
Subject: [PATCH 31/43] kanata: 1.0.7 -> 1.0.8

---
 pkgs/tools/system/kanata/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/system/kanata/default.nix b/pkgs/tools/system/kanata/default.nix
index e83542071e7..aced99ece95 100644
--- a/pkgs/tools/system/kanata/default.nix
+++ b/pkgs/tools/system/kanata/default.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "kanata";
-  version = "1.0.7";
+  version = "1.0.8";
 
   src = fetchFromGitHub {
     owner = "jtroo";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-2gGFAz0zXea+27T4ayDj6KdoI0ThwXV7U0CspHduTiQ=";
+    sha256 = "sha256-9x0ELoYCwfE0N7CuxZYMPBmX8A5Vh4pAtbcY6X6S9eQ=";
   };
 
-  cargoHash = "sha256-0NvZATdPABIboL5xvmBmDbqPPWvO4mM6wVB3FrOVHIQ=";
+  cargoHash = "sha256-e7yftR1mLMllBe0OIU5QWmGtQm+h30CbTInB6ojQk7M=";
 
   buildFeatures = lib.optional withCmd "cmd";
 

From ce616942474745fe21825b3da76855ce84a38ace Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Sun, 6 Nov 2022 16:42:23 +0800
Subject: [PATCH 32/43] kanata: override kanata to generate kanata-with-cmd

---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 16f9bb8781b..e05effff03e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1357,7 +1357,7 @@ with pkgs;
 
   kanata = callPackage ../tools/system/kanata { };
 
-  kanata-with-cmd = callPackage ../tools/system/kanata { withCmd = true; };
+  kanata-with-cmd = kanata.override { withCmd = true; };
 
   ksmbd-tools = callPackage ../os-specific/linux/ksmbd-tools { };
 

From 163a3544a85894795befeca22531456635966dd0 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 27 Oct 2022 16:32:42 +0200
Subject: [PATCH 33/43] =?UTF-8?q?ocamlPackages.lablgtk3:=203.1.2=20?=
 =?UTF-8?q?=E2=86=92=203.1.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ocaml-modules/lablgtk3/default.nix         | 18 +++++++-----------
 .../ocaml-modules/lablgtk3/gtkspell3.nix       |  2 +-
 .../ocaml-modules/lablgtk3/sourceview3.nix     |  2 +-
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/ocaml-modules/lablgtk3/default.nix b/pkgs/development/ocaml-modules/lablgtk3/default.nix
index 81fb51d1f1e..bd820e8042a 100644
--- a/pkgs/development/ocaml-modules/lablgtk3/default.nix
+++ b/pkgs/development/ocaml-modules/lablgtk3/default.nix
@@ -1,27 +1,23 @@
-{ lib, fetchFromGitHub, fetchpatch, pkg-config, buildDunePackage, dune-configurator, gtk3, cairo2 }:
+{ lib, fetchFromGitHub, pkg-config, buildDunePackage, dune-configurator
+, gtk3, cairo2
+, camlp-streams
+}:
 
 buildDunePackage rec {
-  version = "3.1.2";
+  version = "3.1.3";
   pname = "lablgtk3";
 
-  useDune2 = true;
-
   minimalOCamlVersion = "4.05";
 
   src = fetchFromGitHub {
     owner = "garrigue";
     repo = "lablgtk";
     rev = version;
-    sha256 = "sha256:0b17w9qb1f02h3313cm62mrqlhwxficppzm72n7sf8mmwrylxbm7";
+    sha256 = "sha256-1kXJP+tKudP3qfosTgZAQueNK46H9aLevEj6wxPKDWY=";
   };
 
-  patches = [ (fetchpatch {
-    name = "dune-project.patch";
-    url = "https://raw.githubusercontent.com/ocaml/opam-repository/10a48cb9fab88f67f6cb70280e0fec035c32d41c/packages/lablgtk3/lablgtk3.3.1.2/files/dune-project.patch";
-    sha256 = "03jf5hclqdq7iq84djaqcnfnnnd7z3hb48rr8n1gyxzjyx86b3fh";
-  }) ];
   nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ dune-configurator ];
+  buildInputs = [ dune-configurator camlp-streams ];
   propagatedBuildInputs = [ gtk3 cairo2 ];
 
   meta = {
diff --git a/pkgs/development/ocaml-modules/lablgtk3/gtkspell3.nix b/pkgs/development/ocaml-modules/lablgtk3/gtkspell3.nix
index b037f7d989f..be57c7e7146 100644
--- a/pkgs/development/ocaml-modules/lablgtk3/gtkspell3.nix
+++ b/pkgs/development/ocaml-modules/lablgtk3/gtkspell3.nix
@@ -4,5 +4,5 @@ buildDunePackage {
   pname = "lablgtk3-gtkspell3";
   buildInputs = [ gtkspell3 ] ++ lablgtk3.buildInputs;
   propagatedBuildInputs = [ lablgtk3 ];
-  inherit (lablgtk3) src version useDune2 meta nativeBuildInputs;
+  inherit (lablgtk3) src version meta nativeBuildInputs;
 }
diff --git a/pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix b/pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix
index a0560029880..0e8ba3ef3ff 100644
--- a/pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix
+++ b/pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix
@@ -4,5 +4,5 @@ buildDunePackage {
   pname = "lablgtk3-sourceview3";
   buildInputs = lablgtk3.buildInputs ++ [ gtksourceview ];
   propagatedBuildInputs = [ lablgtk3 ];
-  inherit (lablgtk3) src version useDune2 meta nativeBuildInputs;
+  inherit (lablgtk3) src version meta nativeBuildInputs;
 }

From 7b4d4010c1a98d86d3095ae9fecbd6d430818b2a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 2 Nov 2022 10:25:56 +0000
Subject: [PATCH 34/43] vgmtools: unstable-2022-08-03 -> unstable-2022-10-31

---
 pkgs/tools/audio/vgmtools/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/audio/vgmtools/default.nix b/pkgs/tools/audio/vgmtools/default.nix
index f4855302595..862b8a80bc9 100644
--- a/pkgs/tools/audio/vgmtools/default.nix
+++ b/pkgs/tools/audio/vgmtools/default.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "vgmtools";
-  version = "unstable-2022-08-03";
+  version = "unstable-2022-10-31";
 
   src = fetchFromGitHub {
     owner = "vgmrips";
     repo = "vgmtools";
-    rev = "a33c7b9d7c7608a3cfebbee4467c6909b42077d6";
-    sha256 = "oVasSToGp2APfaD/xCt/3SwvGq7JtpP8VVDRPznYDH4=";
+    rev = "9d7a9f4b1c40d26949fa730987f6c3eb9cf3e3ec";
+    sha256 = "Joxlu+k8xaF90u+ydHhu6NpqGQAKL8r5u4qAsfVfOz8=";
   };
 
   nativeBuildInputs = [

From 8102e1547d1511df14875f987f3158f9f074e161 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 3 Nov 2022 05:28:56 +0000
Subject: [PATCH 35/43] foxotron: 2022-08-06 -> 2022-11-02

---
 pkgs/applications/graphics/foxotron/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/foxotron/default.nix b/pkgs/applications/graphics/foxotron/default.nix
index a51edc39556..a16f408fb13 100644
--- a/pkgs/applications/graphics/foxotron/default.nix
+++ b/pkgs/applications/graphics/foxotron/default.nix
@@ -25,14 +25,14 @@
 
 stdenv.mkDerivation rec {
   pname = "foxotron";
-  version = "2022-08-06";
+  version = "2022-11-02";
 
   src = fetchFromGitHub {
     owner = "Gargaj";
     repo = "Foxotron";
     rev = version;
     fetchSubmodules = true;
-    sha256 = "sha256-IGLoiUeHcTlQ+WJTot3o5/Q+jRJcY52I3xHDAT0zuIU=";
+    sha256 = "sha256-WjsVvFhwVCzclHxA+Gu2YtR2yK0Opqhncwlg9FEhOLk=";
   };
 
   nativeBuildInputs = [ cmake pkg-config makeWrapper ];

From 5e50487731a164712a0bc1524ca13764e195216c Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 28 Oct 2022 11:28:08 +0200
Subject: [PATCH 36/43] =?UTF-8?q?ocamlPackages.sexplib0:=200.15.0=20?=
 =?UTF-8?q?=E2=86=92=200.15.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/ocaml-modules/janestreet/0.15.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/ocaml-modules/janestreet/0.15.nix b/pkgs/development/ocaml-modules/janestreet/0.15.nix
index 1ef9f72bb74..522d08c1b19 100644
--- a/pkgs/development/ocaml-modules/janestreet/0.15.nix
+++ b/pkgs/development/ocaml-modules/janestreet/0.15.nix
@@ -912,7 +912,8 @@ with self;
 
   sexplib0 = janePackage {
     pname = "sexplib0";
-    hash = "0jag0bz2173b0n7hx013fhghydhh92arqjlrcnf5x025bw8nz66v";
+    version = "0.15.1";
+    hash = "sha256-6K0yrCbVFcUalN4cQuDI1TvWvNDjfXXRDhJKUskbqRY=";
     minimumOCamlVersion = "4.04.2";
     meta.description = "Library containing the definition of S-expressions and some base converters";
   };

From 3f60403fe13f79421cdba4998394184194921fd9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 2 Nov 2022 21:09:59 +0000
Subject: [PATCH 37/43] classicube: 1.3.3 -> 1.3.4

---
 pkgs/games/classicube/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/classicube/default.nix b/pkgs/games/classicube/default.nix
index 84ce22a51a0..05a5fa11931 100644
--- a/pkgs/games/classicube/default.nix
+++ b/pkgs/games/classicube/default.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ClassiCube";
-  version = "1.3.3";
+  version = "1.3.4";
 
   src = fetchFromGitHub {
     owner = "UnknownShadow200";
     repo = "ClassiCube";
     rev = version;
-    sha256 = "a31e95a7f49e58aaf4271015dd60730fc74d9776dfac425a8f14eb64cdcd9944";
+    sha256 = "sha256-m7pg9OL2RuCVKgFD3hMtIeY0XdJ1YviXBFVJH8/T5gI=";
   };
 
   nativeBuildInputs = [ dos2unix makeWrapper ];

From fdce357748f9d947bdd8d1b97e484c82391a7962 Mon Sep 17 00:00:00 2001
From: Caleb Maclennan <caleb@alerque.com>
Date: Sun, 6 Nov 2022 11:29:17 +0300
Subject: [PATCH 38/43] =?UTF-8?q?sile:=200.14.3=20=E2=86=92=200.14.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://github.com/sile-typesetter/sile/releases/tag/v0.14.4
---
 pkgs/tools/typesetting/sile/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/typesetting/sile/default.nix b/pkgs/tools/typesetting/sile/default.nix
index e883ac46005..92baf044d3c 100644
--- a/pkgs/tools/typesetting/sile/default.nix
+++ b/pkgs/tools/typesetting/sile/default.nix
@@ -43,11 +43,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "sile";
-  version = "0.14.3";
+  version = "0.14.4";
 
   src = fetchurl {
     url = "https://github.com/sile-typesetter/sile/releases/download/v${version}/${pname}-${version}.tar.xz";
-    sha256 = "1n7nlrvhdp6ilpx6agb5w6flss5vbflbldv0495h19fy5fxkb5vz";
+    sha256 = "091sy3k29q15ksqr650qmf9lz8j9lqbabfph4cf63plg4dnf9m98";
   };
 
   configureFlags = [

From e23da83661695dcbbdb9d3217ae947e132d8677b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 6 Nov 2022 10:03:42 +0000
Subject: [PATCH 39/43] json-schema-for-humans: 0.41.8 -> 0.42.1

---
 .../python-modules/json-schema-for-humans/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/json-schema-for-humans/default.nix b/pkgs/development/python-modules/json-schema-for-humans/default.nix
index da52d12ef08..f420aefd7df 100644
--- a/pkgs/development/python-modules/json-schema-for-humans/default.nix
+++ b/pkgs/development/python-modules/json-schema-for-humans/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "json-schema-for-humans";
-  version = "0.41.8";
+  version = "0.42.1";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "coveooss";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-lz08+T8ITsCI0qjcd/JcgXG4o87UjoP1NQa01FJ7fO0=";
+    hash = "sha256-WVLIx85ivHz5b6C1AfgMAApngeFCuWwWhaBWNcfOvXA=";
   };
 
   postPatch = ''

From 696449dedb246f42dc2c24ca42f95492e83b608a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sun, 6 Nov 2022 00:28:41 +0100
Subject: [PATCH 40/43] spotify: consolidate wrapper

---
 pkgs/applications/audio/spotify/default.nix |  8 +++++-
 pkgs/applications/audio/spotify/wrapper.nix | 31 ---------------------
 pkgs/top-level/aliases.nix                  |  1 +
 pkgs/top-level/all-packages.nix             |  4 +--
 4 files changed, 9 insertions(+), 35 deletions(-)
 delete mode 100644 pkgs/applications/audio/spotify/wrapper.nix

diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index ecbdaec7f28..2c821ec6b4c 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -2,6 +2,9 @@
 , glib, pango, cairo, atk, gdk-pixbuf, gtk3, cups, nspr, nss, libpng, libnotify
 , libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg, curlWithGnuTls, zlib, gnome
 , at-spi2-atk, at-spi2-core, libpulseaudio, libdrm, mesa, libxkbcommon
+  # High-DPI support: Spotify's --force-device-scale-factor argument
+  # not added if `null`, otherwise, should be a number.
+, deviceScaleFactor ? null
 }:
 
 let
@@ -67,7 +70,7 @@ let
 in
 
 stdenv.mkDerivation {
-  pname = "spotify-unwrapped";
+  pname = "spotify";
   inherit version;
 
   # fetch from snapcraft instead of the debian repository most repos fetch from.
@@ -143,6 +146,9 @@ stdenv.mkDerivation {
       librarypath="${lib.makeLibraryPath deps}:$libdir"
       wrapProgram $out/share/spotify/spotify \
         ''${gappsWrapperArgs[@]} \
+        ${lib.optionalString (deviceScaleFactor != null) ''
+          --add-flags "--force-device-scale-factor=${toString deviceScaleFactor}" \
+        ''} \
         --prefix LD_LIBRARY_PATH : "$librarypath" \
         --prefix PATH : "${gnome.zenity}/bin"
 
diff --git a/pkgs/applications/audio/spotify/wrapper.nix b/pkgs/applications/audio/spotify/wrapper.nix
deleted file mode 100644
index 418ef3cbc03..00000000000
--- a/pkgs/applications/audio/spotify/wrapper.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ symlinkJoin
-, lib
-, spotify-unwrapped
-, makeWrapper
-
-  # High-DPI support: Spotify's --force-device-scale-factor argument; not added
-  # if `null`, otherwise, should be a number.
-, deviceScaleFactor ? null
-}:
-
-symlinkJoin {
-  name = "spotify-${spotify-unwrapped.version}";
-
-  paths = [ spotify-unwrapped.out ];
-
-  nativeBuildInputs = [ makeWrapper ];
-  preferLocalBuild = true;
-  passthru.unwrapped = spotify-unwrapped;
-  postBuild = ''
-    wrapProgram $out/bin/spotify \
-        ${lib.optionalString (deviceScaleFactor != null) ''
-            --add-flags ${lib.escapeShellArg "--force-device-scale-factor=${
-                builtins.toString deviceScaleFactor
-              }"}
-        ''}
-  '';
-
-  meta = spotify-unwrapped.meta // {
-    priority = (spotify-unwrapped.meta.priority or 0) - 1;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 5813052acd6..0783e9bba8d 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1393,6 +1393,7 @@ mapAliases ({
   # spidermonkey is not ABI upwards-compatible, so only allow this for nix-shell
   spidermonkey = spidermonkey_78; # Added 2020-10-09
   split2flac = throw "split2flac has been removed. Consider using the shnsplit command from shntool package or help packaging unflac."; # added 2022-01-13
+  spotify-unwrapped = spotify; # added 2022-11-06
   spring-boot = spring-boot-cli; # added 2020-04-24
   sqlite3_analyzer = throw "'sqlite3_analyzer' has been renamed to/replaced by 'sqlite-analyzer'"; # Converted to throw 2022-02-22
   sqliteInteractive = throw "'sqliteInteractive' has been renamed to/replaced by 'sqlite-interactive'"; # Converted to throw 2022-02-22
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 11591c09582..57a6108c969 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -31936,9 +31936,7 @@ with pkgs;
     autoreconfHook = buildPackages.autoreconfHook269;
   };
 
-  spotify-unwrapped = callPackage ../applications/audio/spotify { };
-
-  spotify = callPackage ../applications/audio/spotify/wrapper.nix { };
+  spotify = callPackage ../applications/audio/spotify { };
 
   spotifywm = callPackage ../applications/audio/spotifywm { };
 

From 26232043e26292dd8173179c63582b3aa256ab46 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 3 Nov 2022 14:56:07 +0000
Subject: [PATCH 41/43] karate: 1.2.0 -> 1.3.0

---
 pkgs/development/tools/karate/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/karate/default.nix b/pkgs/development/tools/karate/default.nix
index 2dd40967401..cda508c9df3 100644
--- a/pkgs/development/tools/karate/default.nix
+++ b/pkgs/development/tools/karate/default.nix
@@ -2,11 +2,11 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "karate";
-  version = "1.2.0";
+  version = "1.3.0";
 
   src = fetchurl {
     url = "https://github.com/karatelabs/karate/releases/download/v${version}/karate-${version}.jar";
-    sha256 = "69b9ba1cd9563cbad802471e7250dd46828df7ad176706577389dfe6e604e5ec";
+    sha256 = "sha256-uQHE8Mf70t7gtALdxO1tltUkwEKx0emWWliZEzwGW+Q=";
   };
   dontUnpack = true;
 

From fbf5d54f181c46e045bde3fbe8efe1b07b2cd095 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 3 Nov 2022 11:46:18 +0000
Subject: [PATCH 42/43] doctl: 1.84.1 -> 1.85.0

---
 pkgs/development/tools/doctl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix
index 22b60c5e8e6..ab83d20b5a7 100644
--- a/pkgs/development/tools/doctl/default.nix
+++ b/pkgs/development/tools/doctl/default.nix
@@ -2,7 +2,7 @@
 
 buildGoModule rec {
   pname = "doctl";
-  version = "1.84.1";
+  version = "1.85.0";
 
   vendorSha256 = null;
 
@@ -31,7 +31,7 @@ buildGoModule rec {
     owner = "digitalocean";
     repo = "doctl";
     rev = "v${version}";
-    sha256 = "sha256-F1vavqdBeKVWKWQTrgqT6NIGduAcFc42rl0rG8SEdLs=";
+    sha256 = "sha256-zA+9RpGGiRlu/xQoKjkI5zg6d2fPR7WKW0Sj2ggSypA=";
   };
 
   meta = with lib; {

From fd70c59577924b00bf1337402909e02275e8603d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 6 Nov 2022 07:39:46 +0000
Subject: [PATCH 43/43] plantuml-server: 1.2022.7 -> 1.2022.12

---
 pkgs/tools/misc/plantuml-server/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/plantuml-server/default.nix b/pkgs/tools/misc/plantuml-server/default.nix
index cf04887f743..a7cd57e3c00 100644
--- a/pkgs/tools/misc/plantuml-server/default.nix
+++ b/pkgs/tools/misc/plantuml-server/default.nix
@@ -1,14 +1,14 @@
 { lib, stdenv, fetchurl }:
 
 let
-  version = "1.2022.7";
+  version = "1.2022.12";
 in
 stdenv.mkDerivation rec {
   pname = "plantuml-server";
   inherit version;
   src = fetchurl {
     url = "https://github.com/plantuml/plantuml-server/releases/download/v${version}/plantuml-v${version}.war";
-    sha256 = "sha256-QX4eZStNXBHy44hKV1GnTDpumq65OsGYR0VmXyF7DVg=";
+    sha256 = "sha256-H05/1Em9aTRLhI5vo119JLnuKJlK6/ZLu0v/wU0fPLQ=";
   };
 
   dontUnpack = true;