From 1e12026447c3c3272ee19d8bb8fb8dcaf75c4e8a Mon Sep 17 00:00:00 2001
From: hqurve <hqurve@outlook.com>
Date: Fri, 31 Dec 2021 11:37:55 -0400
Subject: [PATCH 01/41] libreoffice: fix #152506 - add explicit dependencies on
 grep and coreutils to wrapper

---
 pkgs/applications/office/libreoffice/wrapper.nix | 4 ++--
 pkgs/applications/office/libreoffice/wrapper.sh  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/office/libreoffice/wrapper.nix b/pkgs/applications/office/libreoffice/wrapper.nix
index 08b01a4a051b..8287c51617f6 100644
--- a/pkgs/applications/office/libreoffice/wrapper.nix
+++ b/pkgs/applications/office/libreoffice/wrapper.nix
@@ -1,9 +1,9 @@
-{ libreoffice, runCommand, dbus, bash }:
+{ libreoffice, runCommand, coreutils, gnugrep, dbus, bash }:
 let
   jdk = libreoffice.jdk;
 in
 (runCommand libreoffice.name {
-  inherit dbus libreoffice jdk bash;
+  inherit coreutils dbus gnugrep libreoffice jdk bash;
 } ''
   mkdir -p "$out/bin"
   ln -s "${libreoffice}/share" "$out/share"
diff --git a/pkgs/applications/office/libreoffice/wrapper.sh b/pkgs/applications/office/libreoffice/wrapper.sh
index 9ab3a907a985..162bede3ec69 100644
--- a/pkgs/applications/office/libreoffice/wrapper.sh
+++ b/pkgs/applications/office/libreoffice/wrapper.sh
@@ -2,7 +2,7 @@
 export JAVA_HOME="${JAVA_HOME:-@jdk@}"
 #export SAL_USE_VCLPLUGIN="${SAL_USE_VCLPLUGIN:-gen}"
 
-if uname | grep Linux > /dev/null &&
+if "@coreutils@"/bin/uname | "@gnugrep@"/bin/grep Linux > /dev/null &&
        ! ( test -n "$DBUS_SESSION_BUS_ADDRESS" ); then
     dbus_tmp_dir="/run/user/$(id -u)/libreoffice-dbus"
     if ! test -d "$dbus_tmp_dir" && test -d "/run"; then
@@ -25,7 +25,7 @@ for PROFILE in $NIX_PROFILES; do
     fi
 done
 
-"@libreoffice@/bin/$(basename "$0")" "$@"
+"@libreoffice@/bin/$("@coreutils@"/bin/basename "$0")" "$@"
 code="$?"
 
 test -n "$dbus_socket_dir" && { rm -rf "$dbus_socket_dir"; kill $dbus_pid; }

From 57b727fb4a3aaff31b61eb244f7350c3affceaf0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 9 Sep 2022 02:07:40 +0000
Subject: [PATCH 02/41] thc-hydra: 9.3 -> 9.4

---
 pkgs/tools/security/thc-hydra/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/thc-hydra/default.nix b/pkgs/tools/security/thc-hydra/default.nix
index b6e3056e0232..63df6a144bc1 100644
--- a/pkgs/tools/security/thc-hydra/default.nix
+++ b/pkgs/tools/security/thc-hydra/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   pname = "thc-hydra";
-  version = "9.3";
+  version = "9.4";
 
   src = fetchFromGitHub {
     owner = "vanhauser-thc";
     repo = "thc-hydra";
     rev = "v${version}";
-    sha256 = "sha256-SzbaU52IXw5+ztN/GKD6Ki6/cx2icoZEzLHBu/J8sk0=";
+    sha256 = "sha256-+UkMJmIUIt/yTGY07Q4nu1zbWQq5chTvMNQSh5U/fTU=";
   };
 
   postPatch = let
@@ -45,6 +45,6 @@ stdenv.mkDerivation rec {
     license = licenses.agpl3Plus;
     maintainers = with maintainers; [ offline ];
     platforms = platforms.unix;
-    badPlatforms = platforms.darwin; # fails to build since v9.3
+    badPlatforms = platforms.darwin; # fails to build since v9.4
   };
 }

From 953a99b5084c6af1202f2f7885e4d76a8b525d5d Mon Sep 17 00:00:00 2001
From: Mostly Void <7rat13@gmail.com>
Date: Wed, 5 Oct 2022 14:00:50 +0530
Subject: [PATCH 03/41] cotton: init at unstable-2022-10-04

---
 pkgs/development/tools/cotton/default.nix | 25 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/tools/cotton/default.nix

diff --git a/pkgs/development/tools/cotton/default.nix b/pkgs/development/tools/cotton/default.nix
new file mode 100644
index 000000000000..34cf19d40fdd
--- /dev/null
+++ b/pkgs/development/tools/cotton/default.nix
@@ -0,0 +1,25 @@
+{ lib
+, rustPlatform
+, fetchFromGitHub
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "cotton";
+  version = "unstable-2022-10-04";
+
+  src = fetchFromGitHub {
+    owner = "danielhuang";
+    repo = pname;
+    rev = "30f3aa7ec6792f3e2dbafc9f4b009b1a6eadc755";
+    sha256 = "sha256-jq5aW6dViHTxh2btP5smtcyUSZ1EoMrQVN7K8zs1jJM=";
+  };
+
+  cargoSha256 = "sha256-qpV3UriOidIk/0di9d8RjXvjcjgD6dXqg7wLAywI66o=";
+
+  meta = with lib; {
+    description = "A package manager for JavaScript projects";
+    homepage = "https://github.com/danielhuang/cotton";
+    license = licenses.gpl3Only;
+    maintainers = with maintainers; [ dit7ya ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d58ecb7625b5..9b06555a5896 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13336,6 +13336,8 @@ with pkgs;
 
   copper = callPackage ../development/compilers/copper {};
 
+  cotton = callPackage ../development/tools/cotton { };
+
   inherit (callPackages ../development/compilers/crystal {
     llvmPackages = if stdenv.system == "aarch64-darwin" then llvmPackages_11 else llvmPackages_10;
   })

From 3abbce5848bd3da6b626b4b4635612cd339c5026 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Mon, 3 Oct 2022 21:59:27 +0800
Subject: [PATCH 04/41] python3Packages.mautrix: 0.17.8 -> 0.18.4

---
 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 a17c2c9c079a..8171688b0176 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.17.8";
+  version = "0.18.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-DFajAD5mnXLQmJGRv4j2mWhtIj77nZNSQhbesX4qMys=";
+    sha256 = "sha256-ymSnGgcy1sW7HlWsSbSRty+60MtChzpF56eH7wrdfh8=";
   };
 
   propagatedBuildInputs = [

From c3cd97ded667fd362577d54ce48256c156af6467 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Mon, 3 Oct 2022 21:59:52 +0800
Subject: [PATCH 05/41] mautrix-telegram: 0.12.0 -> 0.12.1

---
 pkgs/servers/mautrix-telegram/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/mautrix-telegram/default.nix b/pkgs/servers/mautrix-telegram/default.nix
index 98f1d5ec562a..1458a20f12f3 100644
--- a/pkgs/servers/mautrix-telegram/default.nix
+++ b/pkgs/servers/mautrix-telegram/default.nix
@@ -9,11 +9,11 @@ let
   python = python3.override {
     packageOverrides = self: super: {
       tulir-telethon = self.telethon.overridePythonAttrs (oldAttrs: rec {
-        version = "1.25.0a20";
+        version = "1.26.0a5";
         pname = "tulir-telethon";
         src = super.fetchPypi {
           inherit pname version;
-          sha256 = "sha256-X9oo+YCNMqQrJvQa/PIi9dFgaeQxbrlnwUJnwjRb6Jc=";
+          sha256 = "sha256-s6pj9kHqcl6XU1KQ/aOw1XWQ3CyDotaDl0m7aj9SbW4=";
         };
         doCheck = false;
       });
@@ -21,14 +21,14 @@ let
   };
 in python.pkgs.buildPythonPackage rec {
   pname = "mautrix-telegram";
-  version = "0.12.0";
+  version = "0.12.1";
   disabled = python.pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "mautrix";
     repo = "telegram";
     rev = "v${version}";
-    sha256 = "sha256-SUwiRrTY8NgOGQ643prsm3ZklOlwX/59m/u1aewFuik=";
+    sha256 = "sha256-ecNcoNz++HtuDZnDLsXfPL0MRF+XMQ1BU/NFkKPbD5U=";
   };
 
   patches = [ ./0001-Re-add-entrypoint.patch ];

From a247c127855d5f6fcce251a1fc96a615686ece37 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 17 Oct 2022 12:34:54 +0000
Subject: [PATCH 06/41] catch2: 2.13.9 -> 2.13.10

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

diff --git a/pkgs/development/libraries/catch2/default.nix b/pkgs/development/libraries/catch2/default.nix
index 111f1054f368..3c51fa9371d9 100644
--- a/pkgs/development/libraries/catch2/default.nix
+++ b/pkgs/development/libraries/catch2/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "catch2";
-  version = "2.13.9";
+  version = "2.13.10";
 
   src = fetchFromGitHub {
     owner = "catchorg";
     repo = "Catch2";
     rev = "v${version}";
-    sha256="sha256-G6rMTHvrBJbUaTNkR738YClAn2v2xVBr+tXLjpNzVZg=";
+    sha256="sha256-XnT2ziES94Y4uzWmaxSw7nWegJFQjAqFUG8PkwK5nLU=";
   };
 
   nativeBuildInputs = [ cmake ];

From 59c528f187a99fd3b1fa4115730179606a813f37 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Wed, 19 Oct 2022 11:31:37 +0800
Subject: [PATCH 07/41] rustup: build with openssl 3.0

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 29ec62363efb..35e1486026e1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14993,7 +14993,6 @@ with pkgs;
   };
   rust-script = callPackage ../development/tools/rust/rust-script { };
   rustup = callPackage ../development/tools/rust/rustup {
-    openssl = openssl_1_1;
     inherit (darwin.apple_sdk.frameworks) CoreServices Security;
   };
   rustup-toolchain-install-master = callPackage ../development/tools/rust/rustup-toolchain-install-master {

From 35370b7fefb5bf88afea5e307751142b277b0a1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Maret?=
 <sebastien.maret@univ-grenoble-alpes.fr>
Date: Wed, 19 Oct 2022 22:12:52 +0200
Subject: [PATCH 08/41] gildas: restore Python support

---
 .../science/astronomy/gildas/default.nix            |  4 ++--
 .../science/astronomy/gildas/python-ldflags.patch   | 13 +++++++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/applications/science/astronomy/gildas/python-ldflags.patch

diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/applications/science/astronomy/gildas/default.nix
index 0a98c1b7a03b..703416f074aa 100644
--- a/pkgs/applications/science/astronomy/gildas/default.nix
+++ b/pkgs/applications/science/astronomy/gildas/default.nix
@@ -3,7 +3,7 @@
 }:
 
 let
-  python3Env = python3.withPackages(ps: with ps; [ numpy ]);
+  python3Env = python3.withPackages(ps: with ps; [ numpy setuptools ]);
 in
 
 stdenv.mkDerivation rec {
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ gtk2-x11 lesstif cfitsio python3Env ncurses ]
     ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation ]);
 
-  patches = [ ./wrapper.patch ./clang.patch ./aarch64.patch ];
+  patches = [ ./wrapper.patch ./clang.patch ./aarch64.patch ./python-ldflags.patch ];
 
   NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument";
 
diff --git a/pkgs/applications/science/astronomy/gildas/python-ldflags.patch b/pkgs/applications/science/astronomy/gildas/python-ldflags.patch
new file mode 100644
index 000000000000..3bbcb9f36e99
--- /dev/null
+++ b/pkgs/applications/science/astronomy/gildas/python-ldflags.patch
@@ -0,0 +1,13 @@
+diff -ruN gildas-src-oct22b/admin/python-config-ldflags.py gildas-src-oct22b.patched/admin/python-config-ldflags.py
+--- gildas-src-oct22b/admin/python-config-ldflags.py	2022-10-03 14:16:33.000000000 +0200
++++ gildas-src-oct22b.patched/admin/python-config-ldflags.py	2022-10-19 22:03:53.000000000 +0200
+@@ -32,7 +32,7 @@
+   libs.insert(0, '-L' + getvar('LIBDIR'))
+ 
+ # Framework (specific for Mac)
+-if not getvar('PYTHONFRAMEWORK'):
+-    libs.extend(getvar('LINKFORSHARED').split())
++#if not getvar('PYTHONFRAMEWORK'):
++#    libs.extend(getvar('LINKFORSHARED').split())
+ 
+ print(' '.join(libs))

From 90804938df88ecc3cb9931273aa3cd79f4164469 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 20 Oct 2022 13:45:35 +0000
Subject: [PATCH 09/41] minio: 2022-10-15T19-57-03Z -> 2022-10-20T00-55-09Z

---
 pkgs/servers/minio/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix
index ff87083c49e1..8e772ca8893c 100644
--- a/pkgs/servers/minio/default.nix
+++ b/pkgs/servers/minio/default.nix
@@ -15,16 +15,16 @@ let
 in
 buildGoModule rec {
   pname = "minio";
-  version = "2022-10-15T19-57-03Z";
+  version = "2022-10-20T00-55-09Z";
 
   src = fetchFromGitHub {
     owner = "minio";
     repo = "minio";
     rev = "RELEASE.${version}";
-    sha256 = "sha256-EqEvLhqgvX+2MO+9HQaEURHknWYBSqYtzuSfqa6pZ4I=";
+    sha256 = "sha256-O3+2FKAiprFucx05T9lYcA30yr9KSlDF9VEbAgH4B0E=";
   };
 
-  vendorSha256 = "sha256-3XRdqk8SVW1TlOgm5E1b1p25UjrGK9mvAT8GFR5ZjGc=";
+  vendorSha256 = "sha256-dl+7K/Vd1ybCc1IHwITaHroeLymyk5kWqqIwmLgYYA8=";
 
   doCheck = false;
 

From ae70aa30c0033dce2ae9ac32fff0c0cba9182fa7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 21 Oct 2022 16:28:21 +0000
Subject: [PATCH 10/41] fvwm: 2.6.9 -> 2.7.0

---
 pkgs/applications/window-managers/fvwm/2.6.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/window-managers/fvwm/2.6.nix b/pkgs/applications/window-managers/fvwm/2.6.nix
index 44dde60ac05d..e771a170c489 100644
--- a/pkgs/applications/window-managers/fvwm/2.6.nix
+++ b/pkgs/applications/window-managers/fvwm/2.6.nix
@@ -24,13 +24,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fvwm";
-  version = "2.6.9";
+  version = "2.7.0";
 
   src = fetchFromGitHub {
     owner = "fvwmorg";
     repo = pname;
     rev = version;
-    hash = "sha256-sBVOrrl2WrZ2wWN/r1kDUtR+tPwXgDoSJDaxGeFkXJI=";
+    hash = "sha256-KcuX8las1n8UUE/BOHj7WOeZjva5hxgpFHtATMUk3bg=";
   };
 
   nativeBuildInputs = [

From 511fdd09d2c210af296ef423f32651516300a7a3 Mon Sep 17 00:00:00 2001
From: Michael Maurer <mjmaurer777@gmail.com>
Date: Fri, 21 Oct 2022 12:45:03 -0400
Subject: [PATCH 11/41] python3Packages.poetry: fix thread crashes in tests on
 aarch64-darwin

---
 pkgs/development/python-modules/poetry/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/poetry/default.nix b/pkgs/development/python-modules/poetry/default.nix
index 3105187c98a7..7d51941cd88c 100644
--- a/pkgs/development/python-modules/poetry/default.nix
+++ b/pkgs/development/python-modules/poetry/default.nix
@@ -106,8 +106,15 @@ buildPythonPackage rec {
     pytest-xdist
   ];
 
-  preCheck = ''
+  preCheck = (''
     export HOME=$TMPDIR
+  '' + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) ''
+    # https://github.com/python/cpython/issues/74570#issuecomment-1093748531
+    export no_proxy='*';
+  '');
+
+  postCheck = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) ''
+    unset no_proxy
   '';
 
   disabledTests = [

From c0b8f2f5327c881c8733acc8560d3f883fe16f39 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 21 Oct 2022 22:11:00 +0000
Subject: [PATCH 12/41] minio-client: 2022-10-12T18-12-50Z ->
 2022-10-20T23-26-33Z

---
 pkgs/tools/networking/minio-client/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix
index fcd1c25c3fd0..8635bdf4f673 100644
--- a/pkgs/tools/networking/minio-client/default.nix
+++ b/pkgs/tools/networking/minio-client/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "minio-client";
-  version = "2022-10-12T18-12-50Z";
+  version = "2022-10-20T23-26-33Z";
 
   src = fetchFromGitHub {
     owner = "minio";
     repo = "mc";
     rev = "RELEASE.${version}";
-    sha256 = "sha256-kzIJL3cB/zifu5H1OT0/4luMNHa6XuHVdsUcAh2sY0c=";
+    sha256 = "sha256-XsZMnrZzsjS11rZkD7hiLqq20FOD/DnrYf+fLvvVqQw=";
   };
 
-  vendorSha256 = "sha256-DA1EpLmr0/+QEDRHW8nzF1myuZd5IZ7WHG5rrFrb/kE=";
+  vendorSha256 = "sha256-vW/hGvzAtd/q9Fbjr19TvpSZzFVX9HSGGSPWErw+v0A=";
 
   subPackages = [ "." ];
 

From 2af607dbf8027a1f31eb6051bfac2ab038eb5aef Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 22 Oct 2022 04:20:00 +0000
Subject: [PATCH 13/41] millet: 0.4.2 -> 0.5.6

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

diff --git a/pkgs/development/tools/millet/default.nix b/pkgs/development/tools/millet/default.nix
index aab15d2a9681..b7f9d0e50e50 100644
--- a/pkgs/development/tools/millet/default.nix
+++ b/pkgs/development/tools/millet/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "millet";
-  version = "0.4.2";
+  version = "0.5.6";
 
   src = fetchFromGitHub {
     owner = "azdavis";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-WWZi943PyWnm5TrFIWk/Lg/uQPWdfMuTQTxgNM9lF5w=";
+    sha256 = "sha256-figP1PgM84jIbjuYzcklzYshedO5UXbxm9sbEXWkLzs=";
   };
 
-  cargoSha256 = "sha256-bHGDbHaMdQG+T1kA/clxDmnJblRYn2X7uVVF+MpvEGE=";
+  cargoSha256 = "sha256-PF1NxUypOBevGwj5bFySQluhNh7PD1NFXfJvYuKHixQ=";
 
   postPatch = ''
     rm .cargo/config.toml

From 56423fd97b6a753c593694b04fd3a575298dcbc4 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Sat, 22 Oct 2022 02:55:35 -0300
Subject: [PATCH 14/41] arcanPackages.cat9: init at unstable-2018-09-13

---
 pkgs/desktops/arcan/cat9/default.nix | 37 ++++++++++++++++++++++++++++
 pkgs/desktops/arcan/default.nix      |  8 +++++-
 2 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/desktops/arcan/cat9/default.nix

diff --git a/pkgs/desktops/arcan/cat9/default.nix b/pkgs/desktops/arcan/cat9/default.nix
new file mode 100644
index 000000000000..909f4d57993b
--- /dev/null
+++ b/pkgs/desktops/arcan/cat9/default.nix
@@ -0,0 +1,37 @@
+{ lib
+, stdenvNoCC
+, fetchFromGitHub
+}:
+
+stdenvNoCC.mkDerivation (finalPackages: {
+  pname = "cat9";
+  version = "unstable-2018-09-13";
+
+  src = fetchFromGitHub {
+    owner = "letoram";
+    repo = finalPackages.pname;
+    rev = "754d9d2900d647a0fa264720528117471a32f295";
+    hash = "sha256-UmbynVOJYvHz+deA99lj/BBFOauZzwSNs+qR28pASPY=";
+  };
+
+  dontConfigure = true;
+
+  dontBuild = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p ${placeholder "out"}/share/arcan/appl/cat9
+    cp -a ./* ${placeholder "out"}/share/arcan/appl/cat9
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    homepage = "https://github.com/letoram/cat9";
+    description = "A User shell for LASH";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ AndersonTorres ];
+    platforms = platforms.all;
+  };
+})
diff --git a/pkgs/desktops/arcan/default.nix b/pkgs/desktops/arcan/default.nix
index 3db4d4eb819c..76cc6a2a4a03 100644
--- a/pkgs/desktops/arcan/default.nix
+++ b/pkgs/desktops/arcan/default.nix
@@ -15,6 +15,12 @@ lib.makeScope pkgs.newScope (self: with self; {
 
   # Appls
 
+  cat9 = callPackage ./cat9 { };
+  cat9-wrapped = callPackage ./wrapper.nix {
+    name = "cat9-wrapped";
+    appls = [ cat9 ];
+  };
+
   durden = callPackage ./durden { };
   durden-wrapped = callPackage ./wrapper.nix {
     name = "durden-wrapped";
@@ -38,6 +44,6 @@ lib.makeScope pkgs.newScope (self: with self; {
 
   all-wrapped = callPackage ./wrapper.nix {
     name = "all-wrapped";
-    appls = [ durden pipeworld ];
+    appls = [ durden cat9 pipeworld ];
   };
 })

From bb9bc68e2bb8622bf58a74cee24ff3248490868a Mon Sep 17 00:00:00 2001
From: Evils <evils.devils@protonmail.com>
Date: Sat, 22 Oct 2022 08:44:59 +0200
Subject: [PATCH 15/41] f3: fix linux build

---
 pkgs/tools/filesystems/f3/default.nix | 30 ++++++++++++++-------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/pkgs/tools/filesystems/f3/default.nix b/pkgs/tools/filesystems/f3/default.nix
index e11fad78d9f1..ebdedd5b4aa3 100644
--- a/pkgs/tools/filesystems/f3/default.nix
+++ b/pkgs/tools/filesystems/f3/default.nix
@@ -1,5 +1,9 @@
-{ stdenv, lib, fetchFromGitHub
-, parted, systemd, argp-standalone
+{ stdenv
+, lib
+, fetchFromGitHub
+, parted
+, systemd
+, argp-standalone
 }:
 
 stdenv.mkDerivation rec {
@@ -14,20 +18,18 @@ stdenv.mkDerivation rec {
   };
 
   postPatch = ''
-     sed -i 's/-oroot -groot//' Makefile
+    sed -i 's/-oroot -groot//' Makefile
 
-     for f in f3write.h2w log-f3wr; do
-      substituteInPlace $f \
-        --replace '$(dirname $0)' $out/bin
-     done
+    for f in f3write.h2w log-f3wr; do
+     substituteInPlace $f \
+       --replace '$(dirname $0)' $out/bin
+    done
   '';
 
-  buildInputs = lib.optional stdenv.isLinux [ systemd parted ]
-  ++ lib.optional stdenv.isDarwin [ argp-standalone ];
+  buildInputs = lib.optionals stdenv.isLinux [ systemd parted ]
+    ++ lib.optionals stdenv.isDarwin [ argp-standalone ];
 
-  enableParallelBuilding = true;
-
-  buildFlags   = [
+  buildFlags = [
     "all" # f3read, f3write
   ]
   ++ lib.optional stdenv.isLinux "extra"; # f3brew, f3fix, f3probe
@@ -48,8 +50,8 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "Fight Flash Fraud";
-    homepage = "http://oss.digirati.com.br/f3/";
+    homepage = "https://fight-flash-fraud.readthedocs.io/en/stable/";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ makefu ];
+    maintainers = with maintainers; [ makefu evils ];
   };
 }

From d1e33a752ce80985ab8b746a295f153bc77e7d4f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 22 Oct 2022 07:36:15 +0000
Subject: [PATCH 16/41] infracost: 0.10.12 -> 0.10.13

---
 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 32f311c6ee7c..f160b4d25097 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.10.12";
+  version = "0.10.13";
 
   src = fetchFromGitHub {
     owner = "infracost";
     rev = "v${version}";
     repo = "infracost";
-    sha256 = "sha256-sobIgUiFMLZ2/vkKO2DIQfEM92eRK1PV+oKaWfwk/nE=";
+    sha256 = "sha256-zxVFF+2KKBGtgnA3YNMZdhG3jDylgMjaiGUPbtg5Dss=";
   };
-  vendorSha256 = "sha256-QowKhRakXkkmKDI0vbSjWdftz4nXnjKNpdD4gscR3dM=";
+  vendorSha256 = "sha256-3WUU9Yid9PxqzHg+QBVkqxNxnRKU0zzcBYcpSslFzyM=";
 
   ldflags = [ "-s" "-w" "-X github.com/infracost/infracost/internal/version.Version=v${version}" ];
 

From 5ce44c3c7e8575054474692acc1784428c3dfbf9 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 22 Oct 2022 07:37:00 +0000
Subject: [PATCH 17/41] infracost: unbreak on x86_64

---
 pkgs/tools/misc/infracost/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/infracost/default.nix b/pkgs/tools/misc/infracost/default.nix
index f160b4d25097..dd0aafbae84d 100644
--- a/pkgs/tools/misc/infracost/default.nix
+++ b/pkgs/tools/misc/infracost/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoModule, fetchFromGitHub, installShellFiles, stdenv }:
+{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
 
 buildGoModule rec {
   pname = "infracost";
@@ -63,6 +63,5 @@ buildGoModule rec {
     '';
     license = licenses.asl20;
     maintainers = with maintainers; [ davegallant jk ];
-    broken = stdenv.isx86_64; # https://hydra.nixos.org/build/193087915
   };
 }

From 98428f66c8499bd3e71c51df4c658feffe21dba3 Mon Sep 17 00:00:00 2001
From: Bernardo Meurer <bernardo@meurer.org>
Date: Sat, 22 Oct 2022 11:43:50 +0200
Subject: [PATCH 18/41] linux: 5.10.148 -> 5.10.149

---
 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 be2e09bc6a3d..68515e2e84c3 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.148";
+  version = "5.10.149";
 
   # 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 = "0mp9qs8f50hxf72b6cgh8izkyjbhrrmij6slxja701i1w9mkylhj";
+    sha256 = "1lv5q0m24ccbiqywy03s9s3wyxzm0v7f691rag89qfsn6z2k8q8g";
   };
 } // (args.argsOverride or {}))

From 558536850faa5911d9ac78490070451ec3da0374 Mon Sep 17 00:00:00 2001
From: Bernardo Meurer <bernardo@meurer.org>
Date: Sat, 22 Oct 2022 11:43:55 +0200
Subject: [PATCH 19/41] linux: 5.4.218 -> 5.4.219

---
 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 a39e28bfc91f..57d4d41add94 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.218";
+  version = "5.4.219";
 
   # 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 = "0f7lm5qq763zrnwwq9jmfpgvskhzi3gwy5rbq2q7gmiphl179p9x";
+    sha256 = "0qd2a0cx6bq11qq2513xmm5jxzfrq6axvsc0pjbvdpv9fa9av4sj";
   };
 } // (args.argsOverride or {}))

From 1f7e118c3f94a9c4b41308ad531b50654d34cc76 Mon Sep 17 00:00:00 2001
From: Bernardo Meurer <bernardo@meurer.org>
Date: Sat, 22 Oct 2022 11:43:58 +0200
Subject: [PATCH 20/41] linux: 6.0.2 -> 6.0.3

---
 pkgs/os-specific/linux/kernel/linux-6.0.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-6.0.nix b/pkgs/os-specific/linux/kernel/linux-6.0.nix
index 27f8166ecefc..574f04c386c4 100644
--- a/pkgs/os-specific/linux/kernel/linux-6.0.nix
+++ b/pkgs/os-specific/linux/kernel/linux-6.0.nix
@@ -3,7 +3,7 @@
 with lib;
 
 buildLinux (args // rec {
-  version = "6.0.2";
+  version = "6.0.3";
 
   # 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/v6.x/linux-${version}.tar.xz";
-    sha256 = "17awx4c5fz7f656ig5bydccci052jsai0lczrn2bdk5cihw2cg51";
+    sha256 = "1krx3kp7ivgp91fkcvgvqsb698b3l0dk6zd6yf54sy8530j25mdh";
   };
 } // (args.argsOverride or { }))

From 0292ed799da2be242981aaedde7acb277ee40b4d Mon Sep 17 00:00:00 2001
From: Bernardo Meurer <bernardo@meurer.org>
Date: Sat, 22 Oct 2022 11:44:49 +0200
Subject: [PATCH 21/41] linux/hardened/patches/5.10: 5.10.147-hardened2 ->
 5.10.148-hardened1

---
 pkgs/os-specific/linux/kernel/hardened/patches.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index 34d6a3874801..44dbeb86580a 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -21,13 +21,13 @@
     },
     "5.10": {
         "patch": {
-            "extra": "-hardened2",
-            "name": "linux-hardened-5.10.147-hardened2.patch",
-            "sha256": "0j44mfyc66vq6hncc5w3mxxw8jcpa66w4w40d3wm7ka6yr6p34sh",
-            "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.147-hardened2/linux-hardened-5.10.147-hardened2.patch"
+            "extra": "-hardened1",
+            "name": "linux-hardened-5.10.148-hardened1.patch",
+            "sha256": "1r4s7qpwjhhbp1phkk2dd8rbm3x9l3i3g10jz865l1vp253pmb65",
+            "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.148-hardened1/linux-hardened-5.10.148-hardened1.patch"
         },
-        "sha256": "16pdpjmvrdml7am7s2kydrif1l7f4aq0wh4ak0xh3dby16zkl9c5",
-        "version": "5.10.147"
+        "sha256": "0mp9qs8f50hxf72b6cgh8izkyjbhrrmij6slxja701i1w9mkylhj",
+        "version": "5.10.148"
     },
     "5.15": {
         "patch": {

From e164607345bea2343bdcac2565dc3faa4fbe1356 Mon Sep 17 00:00:00 2001
From: Bernardo Meurer <bernardo@meurer.org>
Date: Sat, 22 Oct 2022 11:44:55 +0200
Subject: [PATCH 22/41] linux/hardened/patches/5.15: 5.15.73-hardened3 ->
 5.15.74-hardened1

---
 pkgs/os-specific/linux/kernel/hardened/patches.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index 44dbeb86580a..66d0e90bb5ae 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -31,13 +31,13 @@
     },
     "5.15": {
         "patch": {
-            "extra": "-hardened3",
-            "name": "linux-hardened-5.15.73-hardened3.patch",
-            "sha256": "1p4cm1viyryf4npbfvg72a4kpqs22vqvfqj2hl6pq5wrpgg677g0",
-            "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.73-hardened3/linux-hardened-5.15.73-hardened3.patch"
+            "extra": "-hardened1",
+            "name": "linux-hardened-5.15.74-hardened1.patch",
+            "sha256": "0ygfz210zz0k5fza2530vwayjz3r32973lbhfsyyc0fq6vghqhn2",
+            "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.74-hardened1/linux-hardened-5.15.74-hardened1.patch"
         },
-        "sha256": "0pbi640llcdbx57vwwzc5axa75w0y5rixa9r752h725f4naz08m8",
-        "version": "5.15.73"
+        "sha256": "0ra2ijpw7w07gm3kjwyszlwfq2rbnmq84z50qhv5r0svz2i3j59c",
+        "version": "5.15.74"
     },
     "5.19": {
         "patch": {

From b0f1947ea86c09f477435642b6e78557f2910224 Mon Sep 17 00:00:00 2001
From: Bernardo Meurer <bernardo@meurer.org>
Date: Sat, 22 Oct 2022 11:45:03 +0200
Subject: [PATCH 23/41] linux/hardened/patches/5.19: 5.19.15-hardened2 ->
 5.19.16-hardened1

---
 pkgs/os-specific/linux/kernel/hardened/patches.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index 66d0e90bb5ae..9b901dae8d54 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -41,13 +41,13 @@
     },
     "5.19": {
         "patch": {
-            "extra": "-hardened2",
-            "name": "linux-hardened-5.19.15-hardened2.patch",
-            "sha256": "12si2gy6maxbvf252ircp94ci0ihqlxv3l9sf4xwxrs66gn3z2fa",
-            "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.19.15-hardened2/linux-hardened-5.19.15-hardened2.patch"
+            "extra": "-hardened1",
+            "name": "linux-hardened-5.19.16-hardened1.patch",
+            "sha256": "1y9c26pyyvifkza7anl9gphnn3jpw7jwiqwjw6i748wwxynhx596",
+            "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.19.16-hardened1/linux-hardened-5.19.16-hardened1.patch"
         },
-        "sha256": "06zband5q6m9imyvn4y4naafdakjcj00rg23227cagnv8wwf71j6",
-        "version": "5.19.15"
+        "sha256": "13g0c6ljxk3sd0ja39ndih5vrzp2ssj78qxaf8nswn8hgrkazsx1",
+        "version": "5.19.16"
     },
     "5.4": {
         "patch": {

From 59efe413b2b1af40f20a696356cdd380f9dd9414 Mon Sep 17 00:00:00 2001
From: Bernardo Meurer <bernardo@meurer.org>
Date: Sat, 22 Oct 2022 11:45:09 +0200
Subject: [PATCH 24/41] linux/hardened/patches/5.4: 5.4.217-hardened2 ->
 5.4.218-hardened1

---
 pkgs/os-specific/linux/kernel/hardened/patches.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index 9b901dae8d54..95ef57ece2d9 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -51,12 +51,12 @@
     },
     "5.4": {
         "patch": {
-            "extra": "-hardened2",
-            "name": "linux-hardened-5.4.217-hardened2.patch",
-            "sha256": "16hcwjll5dkfc8sb81w3dipqx9j1np91f5gad45b0xfcnqcn70ab",
-            "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.217-hardened2/linux-hardened-5.4.217-hardened2.patch"
+            "extra": "-hardened1",
+            "name": "linux-hardened-5.4.218-hardened1.patch",
+            "sha256": "1ylhkhkm4vamdap0kb6vnw9w0rjaacdfgly1yin75dxxymy0x026",
+            "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.218-hardened1/linux-hardened-5.4.218-hardened1.patch"
         },
-        "sha256": "0qrfrk0g1dky5apg8gdxczj2ir0g0z41zmdmbwwcxkxjz76jdf1b",
-        "version": "5.4.217"
+        "sha256": "0f7lm5qq763zrnwwq9jmfpgvskhzi3gwy5rbq2q7gmiphl179p9x",
+        "version": "5.4.218"
     }
 }

From 3c5502e8d91ba16a18491f0781c244a28b2466b5 Mon Sep 17 00:00:00 2001
From: Gabriel Arazas <foo.dogsquared@gmail.com>
Date: Sat, 22 Oct 2022 17:47:17 +0800
Subject: [PATCH 25/41] eyedropper: 0.3.1 -> 0.4.0

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

diff --git a/pkgs/applications/graphics/eyedropper/default.nix b/pkgs/applications/graphics/eyedropper/default.nix
index fdb56440ed13..32098c977044 100644
--- a/pkgs/applications/graphics/eyedropper/default.nix
+++ b/pkgs/applications/graphics/eyedropper/default.nix
@@ -15,19 +15,19 @@
 
 stdenv.mkDerivation rec {
   pname = "eyedropper";
-  version = "0.3.1";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "FineFindus";
     repo = pname;
     rev = version;
-    hash = "sha256-dOB274OA7h1vwCuapzivHnMLLw/NTzsmOfFtHHaca1I=";
+    hash = "sha256-bOpwHaFOoUlh+yyC1go6BeFxfJhUmwZPi6kYAqCagEI=";
   };
 
   cargoDeps = rustPlatform.fetchCargoTarball {
     inherit src;
     name = "${pname}-${version}";
-    hash = "sha256-ymRl/nIUuT1BXa1dF5CMemBI8aYrdqeoVtghm6NF8cs=";
+    hash = "sha256-TkdOq+icU2zNbXzN6nbkXjL1o/Lfumqr/5S0pQaxY5Q=";
   };
 
   nativeBuildInputs = [

From bf657d266c5c87e07566205082ad16843dc1319f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 22 Oct 2022 10:16:30 +0000
Subject: [PATCH 26/41] changie: 1.9.1 -> 1.10.0

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

diff --git a/pkgs/development/tools/changie/default.nix b/pkgs/development/tools/changie/default.nix
index e2a9bed25099..0f5fccd797a8 100644
--- a/pkgs/development/tools/changie/default.nix
+++ b/pkgs/development/tools/changie/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "changie";
-  version = "1.9.1";
+  version = "1.10.0";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "miniscruff";
     repo = pname;
-    sha256 = "sha256-3AGz84z0YmDiLxlbDO0f9ny75hyLB4fnYQSICElJVK4=";
+    sha256 = "sha256-8wcnbmS3T/rPKEN3zpo9ysaEIjgbPN50Jp9URpkRaUI=";
   };
 
-  vendorSha256 = "sha256-9Cpyemq/f62rVMvGwOtgDGd9XllvICXL2dqNwUoFQmg=";
+  vendorSha256 = "sha256-Ddw4YnOFURZxwqRBX9e1YGMO9E3hUNAoLTVcSJuaCU0=";
 
   patches = [ ./skip-flaky-test.patch ];
 

From d72352e04a1e27a90d17b0fee9ff0b4d09760e61 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 22 Oct 2022 12:18:33 +0200
Subject: [PATCH 27/41] python310Packages.cdcs: 0.1.8 -> 0.1.9

- enable tests
---
 .../python-modules/cdcs/default.nix           | 23 +++++++++++++++----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/cdcs/default.nix b/pkgs/development/python-modules/cdcs/default.nix
index 748d0ff623fd..2c608c06251e 100644
--- a/pkgs/development/python-modules/cdcs/default.nix
+++ b/pkgs/development/python-modules/cdcs/default.nix
@@ -1,16 +1,20 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
+, ipython
 , numpy
 , pandas
 , pytestCheckHook
 , pythonOlder
 , requests
+, responses
+, setuptools
+, tqdm
 }:
 
 buildPythonPackage rec {
-  version = "0.1.8";
   pname = "cdcs";
+  version = "0.1.9";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -18,18 +22,27 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "usnistgov";
     repo = "pycdcs";
-    rev = "v${version}";
-    sha256 = "sha256-s+COE7hus1J5I8PTdagl7KEK5QFoidjQ3ee46kOWmkE=";
+    # https://github.com/usnistgov/pycdcs/issues/1
+    rev = "0a770b752301c27e227ca40a4752f305b55dee20";
+    sha256 = "sha256-AUrVEFea4VtBJXWWgECqdBFCqKuHWAlh07Dljp+HBa0=";
   };
 
+  nativeBuildInputs = [
+    setuptools
+  ];
+
   propagatedBuildInputs = [
+    ipython
     numpy
     pandas
     requests
+    tqdm
   ];
 
-  # Project has no tests
-  doCheck = false;
+  checkInputs = [
+    pytestCheckHook
+    responses
+  ];
 
   pythonImportsCheck = [
     "cdcs"

From a863ccbf669525ae0386ed889c7d996ac1247cd2 Mon Sep 17 00:00:00 2001
From: Azat Bahawi <azat@bahawi.net>
Date: Sat, 22 Oct 2022 14:22:15 +0300
Subject: [PATCH 28/41] seaweedfs: 3.27 -> 3.32

---
 .../networking/seaweedfs/default.nix          | 35 +++++++++++++++----
 1 file changed, 29 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/seaweedfs/default.nix b/pkgs/applications/networking/seaweedfs/default.nix
index 8c87d0ed4c2e..6ff9b6bd26fd 100644
--- a/pkgs/applications/networking/seaweedfs/default.nix
+++ b/pkgs/applications/networking/seaweedfs/default.nix
@@ -7,26 +7,49 @@
 
 buildGoModule rec {
   pname = "seaweedfs";
-  version = "3.27";
+  version = "3.32";
 
   src = fetchFromGitHub {
     owner = "chrislusf";
     repo = "seaweedfs";
     rev = version;
-    sha256 = "sha256-kvKUgw6A4UHOuDmKuOv+XS/0XiOf2ENWxl2WmJ4cVTE=";
+    hash = "sha256-GMOLlkBfY3ShVojdRrmpMYgoea52kq4aXr/oZj5bJWo=";
   };
 
-  vendorSha256 = "sha256-sgLHRDdi9gkcSzeBaDCxtbvWSzjTshb2WbmMyRepUKA=";
+  vendorHash = "sha256-cEzPKx54rssyAytYenIcud3K0f7xuO8WzE8wdMqZipE=";
 
   subPackages = [ "weed" ];
 
-  passthru.tests.version =
-    testers.testVersion { package = seaweedfs; command = "weed version"; };
+  ldflags = [
+    "-w"
+    "-s"
+    "-X github.com/seaweedfs/seaweedfs/weed/util.COMMIT=N/A"
+  ];
+
+  tags = [
+    "elastic"
+    "gocdk"
+    "sqlite"
+    "ydb"
+    "tikv"
+  ];
+
+  preBuild = ''
+    export GODEBUG=http2client=0
+  '';
+
+  # There are no tests.
+  doCheck = false;
+
+  passthru.tests.version = testers.testVersion {
+    package = seaweedfs;
+    command = "weed version";
+  };
 
   meta = with lib; {
     description = "Simple and highly scalable distributed file system";
     homepage = "https://github.com/chrislusf/seaweedfs";
-    maintainers = with maintainers; [ cmacrae ];
+    maintainers = with maintainers; [ azahi cmacrae ];
     mainProgram = "weed";
     license = licenses.asl20;
   };

From c5db584ec79dbc40f56076278302a2388cb8bcbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= <root@pedrohlc.com>
Date: Sat, 22 Oct 2022 09:09:02 -0300
Subject: [PATCH 29/41] linux-lqx: 5.19.16-lqx2 -> 5.19.16-lqx4

---
 pkgs/os-specific/linux/kernel/zen-kernels.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix
index 370952054736..34b21f1b6949 100644
--- a/pkgs/os-specific/linux/kernel/zen-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix
@@ -12,8 +12,8 @@ let
   # ./update-zen.py lqx
   lqxVariant = {
     version = "5.19.16"; #lqx
-    suffix = "lqx2"; #lqx
-    sha256 = "1n4hbkb1af9gzdvk7cp73i004j2slb0im9yk1b869h27pxs4il6s"; #lqx
+    suffix = "lqx4"; #lqx
+    sha256 = "0mzrgy2kq0i26vgcdfc7nz7m6rw17s0lr9idwy71iz1f8i1pz82w"; #lqx
     isLqx = true;
   };
   zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // {

From d3d997df27f29eff295ba259acdb06e2589a6eca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= <root@pedrohlc.com>
Date: Sat, 22 Oct 2022 09:12:15 -0300
Subject: [PATCH 30/41] linux-zen: 6.0.2-zen1 -> 6.0.3-zen2

---
 pkgs/os-specific/linux/kernel/zen-kernels.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix
index 34b21f1b6949..99980b46e08b 100644
--- a/pkgs/os-specific/linux/kernel/zen-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix
@@ -4,9 +4,9 @@ let
   # comments with variant added for update script
   # ./update-zen.py zen
   zenVariant = {
-    version = "6.0.2"; #zen
-    suffix = "zen1"; #zen
-    sha256 = "1x80ah2cszj3fbxfpdnlr30r1fblgrhydslfh9vrk48l0z3z80a7"; #zen
+    version = "6.0.3"; #zen
+    suffix = "zen2"; #zen
+    sha256 = "1paywv7y4jizlq092irjcn9r62npzglrf5s008l6129b9q5ib0v8"; #zen
     isLqx = false;
   };
   # ./update-zen.py lqx

From e00a2c85690c2c2c9879f00072a974e4dfa2fded Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 22 Oct 2022 13:19:05 +0000
Subject: [PATCH 31/41] ferretdb: 0.5.2 -> 0.5.4

---
 pkgs/servers/nosql/ferretdb/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/nosql/ferretdb/default.nix b/pkgs/servers/nosql/ferretdb/default.nix
index 01105ffd0b19..0769e70974de 100644
--- a/pkgs/servers/nosql/ferretdb/default.nix
+++ b/pkgs/servers/nosql/ferretdb/default.nix
@@ -5,20 +5,20 @@
 
 buildGoModule rec {
   pname = "ferretdb";
-  version = "0.5.2";
+  version = "0.5.4";
 
   src = fetchFromGitHub {
     owner = "FerretDB";
     repo = "FerretDB";
     rev = "v${version}";
-    sha256 = "sha256-WSdscZ1/Dix83RE95Iv61rdaSBWx1GMi6qOIPNus+ZI=";
+    sha256 = "sha256-GRxs+MTF+ZhZH2yGMY3+2ZCRmVZ7m8uYlqNXASEiS+8=";
   };
 
   postPatch = ''
     echo ${version} > internal/util/version/gen/version.txt
   '';
 
-  vendorSha256 = "sha256-fGmGE08w9w2QnBVdMZ2IKo8Zq3euJGCBVTTHNKYFY3U=";
+  vendorSha256 = "sha256-MSIU99IOpCU3g5GASCKc6mqghnkFXXpan9PyI6L5+dI=";
 
   CGO_ENABLED = 0;
 

From edd71e12ac46bfb6801fdb760f1abe6f00b95c30 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 22 Oct 2022 13:25:37 +0000
Subject: [PATCH 32/41] flyctl: 0.0.415 -> 0.0.417

---
 pkgs/development/web/flyctl/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix
index 99dcd9909649..38864995297a 100644
--- a/pkgs/development/web/flyctl/default.nix
+++ b/pkgs/development/web/flyctl/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "flyctl";
-  version = "0.0.415";
+  version = "0.0.417";
 
   src = fetchFromGitHub {
     owner = "superfly";
     repo = "flyctl";
     rev = "v${version}";
-    sha256 = "sha256-pw8LDp4uuU0J1HFEBdntROcyJUR8mBId5Xwm/5w9F04=";
+    sha256 = "sha256-Bxe0YzSHF7ziCLiyxb1inWbwZAqRO6/qFxWsllbjXK4=";
   };
 
-  vendorSha256 = "sha256-AlPdKUNscp71GttiLfPJf8rs/72Ff0CELDSSHcfY/4g=";
+  vendorSha256 = "sha256-a0ZnZlKB/Uotrm4npXB1dd1+oWHRhJVW7ofMSKlqcvM=";
 
   subPackages = [ "." ];
 

From 061659268e0dc138860e068f34760d28fb8e1b08 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 22 Oct 2022 13:30:55 +0000
Subject: [PATCH 33/41] flow: 0.190.0 -> 0.190.1

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

diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix
index 4cf5bc4b93f6..147fb131b185 100644
--- a/pkgs/development/tools/analysis/flow/default.nix
+++ b/pkgs/development/tools/analysis/flow/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "flow";
-  version = "0.190.0";
+  version = "0.190.1";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "flow";
     rev = "v${version}";
-    sha256 = "sha256-/MxV1nbOwqW1SKaKhWFpdg6PuQflmqRgF76/JPuegRg=";
+    sha256 = "sha256-mDNzqNKXQ3H25y+T/E3yooPPhgA5Pz1q/Tm24l5bWK8=";
   };
 
   makeFlags = [ "FLOW_RELEASE=1" ];

From 95aeaf83c247b8f5aa561684317ecd860476fcd6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Oct 2022 05:04:51 +0000
Subject: [PATCH 34/41] wrangler_1: 1.19.12 -> 1.20.0

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

diff --git a/pkgs/development/tools/wrangler_1/default.nix b/pkgs/development/tools/wrangler_1/default.nix
index 66ad89100908..986be513ca76 100644
--- a/pkgs/development/tools/wrangler_1/default.nix
+++ b/pkgs/development/tools/wrangler_1/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "wrangler";
-  version = "1.19.12";
+  version = "1.20.0";
 
   src = fetchFromGitHub {
     owner = "cloudflare";
     repo = "wrangler";
     rev = "v${version}";
-    sha256 = "sha256-HnenF3X/6tvzwlbuOiQAvB76GrdRsqETG+3fp1fx334=";
+    sha256 = "sha256-miXgzBaqCcFHRlot2uUKyH+GP2JTMOhFrReXZUl0ms0=";
   };
 
-  cargoSha256 = "sha256-mJyuqVSiuBKI/x3P865W1/ei5Ya2mV5LVXzaL3peocE=";
+  cargoSha256 = "sha256-DJefvaUc1quh43q1eZ5B76V3TEv9vNsxuUKaABWiTCo=";
 
   nativeBuildInputs = [ pkg-config ];
 

From a2d5dc2c46558c8890d61294a0bb3116a99a2191 Mon Sep 17 00:00:00 2001
From: Yuriy Taraday <yuriy.taraday@tweag.io>
Date: Sat, 22 Oct 2022 18:32:19 +0400
Subject: [PATCH 35/41] pythonPackages.passlib: disable native support test on
 darwin (#197077)

Several instances of this test fail with error like:

  AssertionError: did not expect 'darwin' platform would have native support for '...'

It looks like passlib's tests erroneously assume that some methods
should not have support on Darwin while current nixpkgs does
support it through libxcrypt.
---
 pkgs/development/python-modules/passlib/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/passlib/default.nix b/pkgs/development/python-modules/passlib/default.nix
index 0ced7c057545..72892a109539 100644
--- a/pkgs/development/python-modules/passlib/default.nix
+++ b/pkgs/development/python-modules/passlib/default.nix
@@ -1,4 +1,5 @@
 { lib
+, stdenv
 , buildPythonPackage
 , fetchPypi
 , argon2-cffi
@@ -25,12 +26,16 @@ buildPythonPackage rec {
   checkInputs = [
     pytestCheckHook
   ] ++ passthru.optional-dependencies.argon2
-    ++ passthru.optional-dependencies.bcrypt
-    ++ passthru.optional-dependencies.totp;
+  ++ passthru.optional-dependencies.bcrypt
+  ++ passthru.optional-dependencies.totp;
 
   disabledTests = [
     # timming sensitive
     "test_dummy_verify"
+  ]
+  # These tests fail because they don't expect support for algorithms provided through libxcrypt
+  ++ lib.optionals stdenv.isDarwin [
+    "test_82_crypt_support"
   ];
 
   meta = with lib; {

From c96a0248ca3889f4a8a82872dda78413377745c8 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 15 Oct 2022 19:33:52 +0200
Subject: [PATCH 36/41] =?UTF-8?q?ocamlPackages.react:=201.2.1=20=E2=86=92?=
 =?UTF-8?q?=201.2.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/ocaml-modules/react/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/react/default.nix b/pkgs/development/ocaml-modules/react/default.nix
index 4e07a2021e32..753a3e82c0de 100644
--- a/pkgs/development/ocaml-modules/react/default.nix
+++ b/pkgs/development/ocaml-modules/react/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "ocaml-react";
-  version = "1.2.1";
+  version = "1.2.2";
 
   src = fetchurl {
     url = "https://erratique.ch/software/react/releases/react-${version}.tbz";
-    sha256 = "1aj8w79gdd9xnrbz7s5p8glcb4pmimi8jp9f439dqnf6ih3mqb3v";
+    sha256 = "sha256-xK3TFdbx8VPRFe58qN1gwSZf9NQIwmYSX8tRJP0ij5k=";
   };
 
   nativeBuildInputs = [ ocaml findlib ocamlbuild ];
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     homepage = "https://erratique.ch/software/react";
     description = "Applicative events and signals for OCaml";
     license = licenses.bsd3;
-    platforms = ocaml.meta.platforms or [ ];
+    inherit (ocaml.meta) platforms;
     maintainers = with maintainers; [ maggesi vbmithr gal_bolle ];
   };
 }

From d64ced2189af416c2209fdd7ba09a7084c8450e9 Mon Sep 17 00:00:00 2001
From: Yuriy Taraday <yuriy.taraday@tweag.io>
Date: Fri, 21 Oct 2022 19:09:09 +0400
Subject: [PATCH 37/41] pythonPackages.mocket: disable test_gethostbyname

This test requires network access and breaks in Darwin sandbox.
---
 pkgs/development/python-modules/mocket/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/mocket/default.nix b/pkgs/development/python-modules/mocket/default.nix
index b79673e2b240..7e5d62454c6b 100644
--- a/pkgs/development/python-modules/mocket/default.nix
+++ b/pkgs/development/python-modules/mocket/default.nix
@@ -71,6 +71,7 @@ buildPythonPackage rec {
     "test_truesendall_after_mocket_session"
     "test_real_request_session"
     "test_asyncio_record_replay"
+    "test_gethostbyname"
   ];
 
   pythonImportsCheck = [ "mocket" ];

From 1dba4f7694d4a4c57503f7b852e365c36abe11db Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 22 Oct 2022 15:38:46 +0000
Subject: [PATCH 38/41] infra: 0.15.1 -> 0.15.2

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

diff --git a/pkgs/tools/admin/infra/default.nix b/pkgs/tools/admin/infra/default.nix
index bb6def108078..fa00ef9098ab 100644
--- a/pkgs/tools/admin/infra/default.nix
+++ b/pkgs/tools/admin/infra/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "infra";
-  version = "0.15.1";
+  version = "0.15.2";
 
   src = fetchFromGitHub {
     owner = "infrahq";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-4JygXCn+2FACflheiddLZhw53XANdvdzPeFw1YysmKI=";
+    sha256 = "sha256-luwswGFI+ygLWp8Yi0PuZpkjQiPiF7bCv0kc8DNYxkw=";
   };
 
-  vendorSha256 = "sha256-Z+x1QStDfFkHoh2cWK2vk3whItpBVgqRdk3utp26BJc=";
+  vendorSha256 = "sha256-j+ZtBqAIeI25qRKu6RvW79Ug/lUGreC06qXL5dgchHc=";
 
   subPackages = [ "." ];
 

From 5df9122095024c61153d24f798926aab6ad0f375 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 22 Oct 2022 15:49:04 +0000
Subject: [PATCH 39/41] istioctl: 1.15.0 -> 1.15.2

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

diff --git a/pkgs/applications/networking/cluster/istioctl/default.nix b/pkgs/applications/networking/cluster/istioctl/default.nix
index e469562bff2b..d98a09439fe7 100644
--- a/pkgs/applications/networking/cluster/istioctl/default.nix
+++ b/pkgs/applications/networking/cluster/istioctl/default.nix
@@ -2,15 +2,15 @@
 
 buildGoModule rec {
   pname = "istioctl";
-  version = "1.15.0";
+  version = "1.15.2";
 
   src = fetchFromGitHub {
     owner = "istio";
     repo = "istio";
     rev = version;
-    sha256 = "sha256-exLLmrHHXAp/S7z4JwIr8umwxZkmV6/kp/4fd8ODh1I=";
+    sha256 = "sha256-ZbOh0BMvYnJQD0WjZcKKiG4ECn1Lbr9760Hn2ecdPH8=";
   };
-  vendorSha256 = "sha256-A0Haf18ot3WckibSmZe5INjMr7zTrMB6xqqnqpUKV34=";
+  vendorSha256 = "sha256-RgxGPPNBYXe1/gFNKeM+huPCD6EGBPea5EtciSA9o58=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 0c60d6c5d5ab9e5676726199ac6f4ec2a5134b75 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Mon, 17 Oct 2022 10:23:29 +0200
Subject: [PATCH 40/41] comical: add darwin support

---
 .../applications/graphics/comical/default.nix |  24 ++-
 .../graphics/comical/wxgtk-2.8.patch          |  36 -----
 .../graphics/comical/wxgtk-3.2.patch          | 139 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   4 +-
 4 files changed, 160 insertions(+), 43 deletions(-)
 delete mode 100644 pkgs/applications/graphics/comical/wxgtk-2.8.patch
 create mode 100644 pkgs/applications/graphics/comical/wxgtk-3.2.patch

diff --git a/pkgs/applications/graphics/comical/default.nix b/pkgs/applications/graphics/comical/default.nix
index 36da9d26410e..095905ff06d8 100644
--- a/pkgs/applications/graphics/comical/default.nix
+++ b/pkgs/applications/graphics/comical/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, wxGTK, util-linux, zlib }:
+{ lib, stdenv, fetchurl, wxGTK32, util-linux, zlib, Cocoa }:
 
 stdenv.mkDerivation rec {
   pname = "comical";
@@ -9,10 +9,21 @@ stdenv.mkDerivation rec {
     sha256 = "0b6527cc06b25a937041f1eb248d0fd881cf055362097036b939817f785ab85e";
   };
 
-  buildInputs = [ wxGTK util-linux zlib ];
-  makeFlags = [ "prefix=${placeholder "out"}" ];
+  patches = [ ./wxgtk-3.2.patch ];
 
-  patches = [ ./wxgtk-2.8.patch ];
+  buildInputs = [
+    wxGTK32
+    util-linux
+    zlib
+  ] ++ lib.optionals stdenv.isDarwin [
+    Cocoa
+  ];
+
+  makeFlags = [
+    "prefix=${placeholder "out"}"
+    "CC=${stdenv.cc.targetPrefix}cc"
+    "CXX=${stdenv.cc.targetPrefix}c++"
+  ];
 
   preInstall = "mkdir -pv $out/bin";
 
@@ -20,7 +31,8 @@ stdenv.mkDerivation rec {
     description = "Viewer of CBR and CBZ files, often used to store scanned comics";
     homepage = "http://comical.sourceforge.net/";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ viric ];
-    platforms = with lib.platforms; linux;
+    maintainers = with lib.maintainers; [ viric wegank ];
+    platforms = with lib.platforms; unix;
+    mainProgram = "comical";
   };
 }
diff --git a/pkgs/applications/graphics/comical/wxgtk-2.8.patch b/pkgs/applications/graphics/comical/wxgtk-2.8.patch
deleted file mode 100644
index db7626074a0f..000000000000
--- a/pkgs/applications/graphics/comical/wxgtk-2.8.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/Makefile b/Makefile
-index a648e72..181c47f 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,5 +1,5 @@
- CC = `wx-config --cxx`
--LDFLAGS = `wx-config --libs` -Lunrar -lunrar -Lunzip -lminiunzip
-+LDFLAGS = `wx-config --libs` -Lunrar -lunrar -Lunzip -lminiunzip -lz
- INSTALL = install
- INSTALL_PROGRAM = $(INSTALL)
- prefix = /usr/local
-diff --git a/src/ComicalApp.cpp b/src/ComicalApp.cpp
-index 0c004cd..667e75e 100644
---- a/src/ComicalApp.cpp
-+++ b/src/ComicalApp.cpp
-@@ -28,6 +28,7 @@
- #include "ComicalApp.h"
- #include "ComicalFrame.h"
- #include <wx/log.h>
-+#include <wx/icon.h>
- 
- #if !defined(__WXMAC__) && !defined(__WXCOCOA__) && !defined(__WXMSW__) && !defined(__WXPM__)
- #include "../Comical Icons/comical.xpm"
-diff --git a/unzip/unzip.h b/unzip/unzip.h
-index b247937..5bb6a69 100644
---- a/unzip/unzip.h
-+++ b/unzip/unzip.h
-@@ -50,7 +50,7 @@ extern "C" {
- #endif
- 
- #ifndef _ZLIB_H
--#include "zlib.h"
-+#include <zlib.h>
- #endif
- 
- #ifndef _ZLIBIOAPI_H
diff --git a/pkgs/applications/graphics/comical/wxgtk-3.2.patch b/pkgs/applications/graphics/comical/wxgtk-3.2.patch
new file mode 100644
index 000000000000..72bafd733ce3
--- /dev/null
+++ b/pkgs/applications/graphics/comical/wxgtk-3.2.patch
@@ -0,0 +1,139 @@
+diff --git a/Makefile b/Makefile
+index a648e72..0387ac1 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,5 +1,5 @@
+-CC = `wx-config --cxx`
+-LDFLAGS = `wx-config --libs` -Lunrar -lunrar -Lunzip -lminiunzip
++WX_CC = `wx-config --cxx`
++LDFLAGS = `wx-config --libs` -Lunrar -lunrar -Lunzip -lminiunzip -lz
+ INSTALL = install
+ INSTALL_PROGRAM = $(INSTALL)
+ prefix = /usr/local
+@@ -13,7 +13,7 @@ OBJS = $(patsubst %.cpp,%.o,$(wildcard src/*.cpp))
+ all: comical
+ 
+ comical: $(OBJS) unrar/libunrar.a unzip/libminiunzip.a
+-	$(CC) -o $@ $(OBJS) $(LDFLAGS)
++	$(WX_CC) -o $@ $(OBJS) $(LDFLAGS)
+ 
+ $(OBJS):
+ 	$(MAKE) -C src
+diff --git a/src/ComicalApp.cpp b/src/ComicalApp.cpp
+index 0c004cd..667e75e 100644
+--- a/src/ComicalApp.cpp
++++ b/src/ComicalApp.cpp
+@@ -28,6 +28,7 @@
+ #include "ComicalApp.h"
+ #include "ComicalFrame.h"
+ #include <wx/log.h>
++#include <wx/icon.h>
+ 
+ #if !defined(__WXMAC__) && !defined(__WXCOCOA__) && !defined(__WXMSW__) && !defined(__WXPM__)
+ #include "../Comical Icons/comical.xpm"
+diff --git a/src/ComicalCanvas.cpp b/src/ComicalCanvas.cpp
+index 75da72f..febce50 100644
+--- a/src/ComicalCanvas.cpp
++++ b/src/ComicalCanvas.cpp
+@@ -792,11 +792,11 @@ void ComicalCanvas::OnKeyDown(wxKeyEvent& event)
+ 	
+ 	switch(event.GetKeyCode()) {
+ 
+-	case WXK_PRIOR:
++	case WXK_PAGEUP:
+ 		PrevPageTurn();
+ 		break;
+ 
+-	case WXK_NEXT:
++	case WXK_PAGEDOWN:
+ 		NextPageTurn();
+ 		break;
+ 
+diff --git a/src/ComicalFrame.cpp b/src/ComicalFrame.cpp
+index 2256be8..154fd6d 100644
+--- a/src/ComicalFrame.cpp
++++ b/src/ComicalFrame.cpp
+@@ -240,7 +240,7 @@ ComicalFrame::ComicalFrame(const wxString& title, const wxPoint& pos, const wxSi
+ 	toolbarSizer->AddSpacer(10);
+ 	toolbarSizer->Add(toolBarNav, 0, wxALIGN_CENTER, 0);
+ 	toolbarSizer->AddSpacer(10);
+-	toolbarSizer->Add(labelRight, 1, wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL, 0);
++	toolbarSizer->Add(labelRight, 1, wxALIGN_CENTER_VERTICAL, 0);
+ 	toolbarSizer->Layout();
+ 	bookPanelSizer->Add(toolbarSizer, 0, wxEXPAND, 0);
+ 	frameSizer->Add(bookPanelSizer, 1, wxEXPAND);
+@@ -279,12 +279,12 @@ void ComicalFrame::OnClose(wxCloseEvent& event)
+ 
+ 	wxRect frameDim = GetRect();
+ 	config->Write(wxT("CacheLength"), (int) cacheLen);
+-	config->Write(wxT("Zoom"), zoom);
++	config->Write(wxT("Zoom"), (int) zoom);
+ 	config->Write(wxT("ZoomLevel"), zoomLevel);
+ 	config->Write(wxT("FitOnlyOversize"), fitOnlyOversize);
+-	config->Write(wxT("Filter"), filter);
+-	config->Write(wxT("Mode"), mode);
+-	config->Write(wxT("Direction"), direction);
++	config->Write(wxT("Filter"), (int) filter);
++	config->Write(wxT("Mode"), (int) mode);
++	config->Write(wxT("Direction"), (int) direction);
+ 	config->Write(wxT("FrameWidth"), frameDim.width);
+ 	config->Write(wxT("FrameHeight"), frameDim.height);
+ 	config->Write(wxT("FrameX"), frameDim.x);
+@@ -309,7 +309,7 @@ void ComicalFrame::OnOpen(wxCommandEvent& event)
+ {
+ 	wxString cwd;
+ 	config->Read(wxT("CWD"), &cwd);
+-	wxString filename = wxFileSelector(wxT("Open a Comic Book"), cwd, wxT(""), wxT(""), wxT("Comic Books (*.cbr,*.cbz,*.rar,*.zip)|*.cbr;*.CBR;*.cbz;*.CBZ;*.rar;*.RAR;*.zip;*.ZIP"), wxOPEN | wxCHANGE_DIR | wxFILE_MUST_EXIST, this);
++	wxString filename = wxFileSelector(wxT("Open a Comic Book"), cwd, wxT(""), wxT(""), wxT("Comic Books (*.cbr,*.cbz,*.rar,*.zip)|*.cbr;*.CBR;*.cbz;*.CBZ;*.rar;*.RAR;*.zip;*.ZIP"), wxFD_OPEN | wxFD_CHANGE_DIR | wxFD_FILE_MUST_EXIST, this);
+ 
+ 	if (!filename.empty())
+ 		OpenFile(filename);
+diff --git a/src/ComicalManager.cpp b/src/ComicalManager.cpp
+index 12d8334..b10d8fa 100644
+--- a/src/ComicalManager.cpp
++++ b/src/ComicalManager.cpp
+@@ -27,7 +27,7 @@
+ 
+ #include "ComicalManager.h"
+ 
+-ComicalManager::ComicalManager(ComicalFrame *_frame) : wxDocManager(wxDEFAULT_DOCMAN_FLAGS, false), frame(_frame)
++ComicalManager::ComicalManager(ComicalFrame *_frame) : wxDocManager(0, false), frame(_frame)
+ {
+ }
+ 
+diff --git a/src/Makefile b/src/Makefile
+index 2a7dc3b..e0a9874 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -1,3 +1,4 @@
++WX_CC = `wx-config --cxx`
+ INCLUDE = -I../unrar -I../unzip
+ CFLAGS = -O2 -Wall -pipe
+ CPPFLAGS = `wx-config --cxxflags` $(CFLAGS) -D_UNIX $(INCLUDE)
+@@ -21,11 +22,11 @@ all: $(OBJS)
+ 	@echo -e "};\n\n#endif" >> $@
+ 
+ %.o : %.cpp
+-	$(CC) $(CPPFLAGS) -c -o $*.o $<
++	$(WX_CC) $(CPPFLAGS) -c -o $*.o $<
+ 
+ %.d : %.cpp
+ 	@set -e; rm -f $@; \
+-	 $(CC) -MM -MG $(CPPFLAGS) -MT '$*.o' $< > $@.$$$$; \
++	 $(WX_CC) -MM -MG $(CPPFLAGS) -MT '$*.o' $< > $@.$$$$; \
+ 	 sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
+ 	 rm -f $@.$$$$
+ 
+diff --git a/unzip/unzip.h b/unzip/unzip.h
+index b247937..5bb6a69 100644
+--- a/unzip/unzip.h
++++ b/unzip/unzip.h
+@@ -50,7 +50,7 @@ extern "C" {
+ #endif
+ 
+ #ifndef _ZLIB_H
+-#include "zlib.h"
++#include <zlib.h>
+ #endif
+ 
+ #ifndef _ZLIBIOAPI_H
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 791d48213915..cb90e03af6ec 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -27601,7 +27601,9 @@ with pkgs;
 
   convos = callPackage ../applications/networking/irc/convos { };
 
-  comical = callPackage ../applications/graphics/comical { };
+  comical = callPackage ../applications/graphics/comical {
+    inherit (darwin.apple_sdk.frameworks) Cocoa;
+  };
 
   containerd = callPackage ../applications/virtualization/containerd { };
 

From a3bca5ea5a86b30a9bd5231dfaf32da8659eeae8 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Fri, 21 Oct 2022 00:09:07 +0100
Subject: [PATCH 41/41] shapelib: enable tests

---
 pkgs/development/libraries/shapelib/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/libraries/shapelib/default.nix b/pkgs/development/libraries/shapelib/default.nix
index c9793d5440b3..f0afda7a9001 100644
--- a/pkgs/development/libraries/shapelib/default.nix
+++ b/pkgs/development/libraries/shapelib/default.nix
@@ -21,6 +21,11 @@ stdenv.mkDerivation rec {
     })
   ];
 
+  doCheck = true;
+  preCheck = ''
+    patchShebangs tests contrib/tests
+  '';
+
   meta = with lib; {
     description = "C Library for reading, writing and updating ESRI Shapefiles";
     homepage = "http://shapelib.maptools.org/";