From b9e28ae03b8a7e0a48aa7fbbe8d86a2f29a7eb5a Mon Sep 17 00:00:00 2001
From: Alexander Nortung <alex_nortung@live.dk>
Date: Tue, 20 Sep 2022 12:37:09 +0200
Subject: [PATCH 01/18] session-desktop: 1.10.0 -> 1.10.1

---
 .../networking/instant-messengers/session-desktop/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/session-desktop/default.nix b/pkgs/applications/networking/instant-messengers/session-desktop/default.nix
index 182fcc1e766b..23f74d6c5932 100644
--- a/pkgs/applications/networking/instant-messengers/session-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/session-desktop/default.nix
@@ -8,12 +8,12 @@
 }:
 
 let
-  version = "1.10.0";
+  version = "1.10.1";
   pname = "session-desktop";
 
   src = fetchurl {
     url = "https://github.com/oxen-io/session-desktop/releases/download/v${version}/session-desktop-linux-x86_64-${version}.AppImage";
-    sha256 = "sha256-oqwEXwlxyoYBQpVp9SdV5q+GrM0N9TIfu01HHIm9mUw=";
+    sha256 = "sha256-DArIq5bxyeHy45ZkE+FIpxBl4P6jiHTCN1lVCuF81O8=";
   };
   appimage = appimageTools.wrapType2 {
     inherit version pname src;

From 0ba507689d6d614ba79c2562dbaa21b19f4626b0 Mon Sep 17 00:00:00 2001
From: Kenji Maillard <kenji@maillard.blue>
Date: Tue, 20 Sep 2022 14:41:04 +0200
Subject: [PATCH 02/18] fix dev metacoq builds for coq >= 8.16

---
 pkgs/development/coq-modules/metacoq/default.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/coq-modules/metacoq/default.nix b/pkgs/development/coq-modules/metacoq/default.nix
index 268ce247c7d3..9eca682b9f91 100644
--- a/pkgs/development/coq-modules/metacoq/default.nix
+++ b/pkgs/development/coq-modules/metacoq/default.nix
@@ -75,10 +75,13 @@ let
         };
       } // optionalAttrs (package != "single")
         { passthru = genAttrs packages metacoq_; })
-      ).overrideAttrs (o: {
-        propagatedBuildInputs = o.propagatedBuildInputs ++
-          optional (versionAtLeast o.version "1.0-8.16") coq.ocamlPackages.stdlib-shims;
-      });
-    in derivation;
+      ).overrideAttrs (o:
+        let requiresOcamlStdlibShims = versionAtLeast o.version "1.0-8.16" ||
+                                       (o.version == "dev" && (versionAtLeast coq.coq-version "8.16" || coq.coq-version == "dev")) ;
+        in
+          {
+            propagatedBuildInputs = o.propagatedBuildInputs ++ optional requiresOcamlStdlibShims coq.ocamlPackages.stdlib-shims;
+          });
+  in derivation;
 in
 metacoq_ (if single then "single" else "all")

From 73f09f2145b4d57380ab6313a3b6e1dfb3f33af8 Mon Sep 17 00:00:00 2001
From: Florian Brandes <florian.brandes@posteo.de>
Date: Sat, 27 Aug 2022 23:37:28 +0200
Subject: [PATCH 03/18] pgadmin4: 6.12 -> 6.13

- Add update script
- Add email options to pgadmin4 nixOS module
- Add override for flask 2.2

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
---
 nixos/modules/services/admin/pgadmin.nix | 72 ++++++++++++++++++++++--
 nixos/tests/pgadmin4.nix                 | 19 +++----
 pkgs/tools/admin/pgadmin/default.nix     | 19 ++++---
 pkgs/tools/admin/pgadmin/update.sh       | 27 +++++++++
 4 files changed, 113 insertions(+), 24 deletions(-)
 create mode 100755 pkgs/tools/admin/pgadmin/update.sh

diff --git a/nixos/modules/services/admin/pgadmin.nix b/nixos/modules/services/admin/pgadmin.nix
index 439f8f0d0fd2..390c80d1a2d4 100644
--- a/nixos/modules/services/admin/pgadmin.nix
+++ b/nixos/modules/services/admin/pgadmin.nix
@@ -37,27 +37,76 @@ in
     };
 
     initialEmail = mkOption {
-      description = lib.mdDoc "Initial email for the pgAdmin account.";
+      description = lib.mdDoc "Initial email for the pgAdmin account";
       type = types.str;
     };
 
     initialPasswordFile = mkOption {
       description = lib.mdDoc ''
         Initial password file for the pgAdmin account.
-        NOTE: Should be string not a store path, to prevent the password from being world readable.
+        NOTE: Should be string not a store path, to prevent the password from being world readable
       '';
       type = types.path;
     };
 
+    emailServer = {
+      enable = mkOption {
+        description = lib.mdDoc ''
+          Enable SMTP email server. This is necessary, if you want to use password recovery or change your own password
+        '';
+        type = types.bool;
+        default = false;
+      };
+      address = mkOption {
+        description = lib.mdDoc "SMTP server for email delivery";
+        type = types.str;
+        default = "localhost";
+      };
+      port = mkOption {
+        description = lib.mdDoc "SMTP server port for email delivery";
+        type = types.port;
+        default = 25;
+      };
+      useSSL = mkOption {
+        description = lib.mdDoc "SMTP server should use SSL";
+        type = types.bool;
+        default = false;
+      };
+      useTLS = mkOption {
+        description = lib.mdDoc "SMTP server should use TLS";
+        type = types.bool;
+        default = false;
+      };
+      username = mkOption {
+        description = lib.mdDoc "SMTP server username for email delivery";
+        type = types.nullOr types.str;
+        default = null;
+      };
+      sender = mkOption {
+        description = lib.mdDoc ''
+          SMTP server sender email for email delivery. Some servers require this to be a valid email address from that server
+        '';
+        type = types.str;
+        example = "noreply@example.com";
+      };
+      passwordFile = mkOption {
+        description = lib.mdDoc ''
+          Password for SMTP email account.
+          NOTE: Should be string not a store path, to prevent the password from being world readable
+        '';
+        type = types.path;
+      };
+    };
+
     openFirewall = mkEnableOption (lib.mdDoc "firewall passthrough for pgadmin4");
 
     settings = mkOption {
       description = lib.mdDoc ''
         Settings for pgadmin4.
-        [Documentation](https://www.pgadmin.org/docs/pgadmin4/development/config_py.html).
+        [Documentation](https://www.pgadmin.org/docs/pgadmin4/development/config_py.html)
       '';
       type = pyType;
-      default= {};
+      default = { };
     };
   };
 
@@ -69,6 +118,13 @@ in
       SERVER_MODE = true;
     } // (optionalAttrs cfg.openFirewall {
       DEFAULT_SERVER = mkDefault "::";
+    }) // (optionalAttrs cfg.emailServer.enable {
+      MAIL_SERVER = cfg.emailServer.address;
+      MAIL_PORT = cfg.emailServer.port;
+      MAIL_USE_SSL = cfg.emailServer.useSSL;
+      MAIL_USE_TLS = cfg.emailServer.useTLS;
+      MAIL_USERNAME = cfg.emailServer.username;
+      SECURITY_EMAIL_SENDER = cfg.emailServer.sender;
     });
 
     systemd.services.pgadmin = {
@@ -115,10 +171,14 @@ in
       group = "pgadmin";
     };
 
-    users.groups.pgadmin = {};
+    users.groups.pgadmin = { };
 
     environment.etc."pgadmin/config_system.py" = {
-      text = formatPy cfg.settings;
+      text = lib.optionalString cfg.emailServer.enable ''
+        with open("${cfg.emailServer.passwordFile}") as f:
+          pw = f.read()
+        MAIL_PASSWORD = pw
+      '' + formatPy cfg.settings;
       mode = "0600";
       user = "pgadmin";
       group = "pgadmin";
diff --git a/nixos/tests/pgadmin4.nix b/nixos/tests/pgadmin4.nix
index 9f5ac3d8d922..f28099659772 100644
--- a/nixos/tests/pgadmin4.nix
+++ b/nixos/tests/pgadmin4.nix
@@ -106,15 +106,15 @@ import ./make-test-python.nix ({ pkgs, lib, buildDeps ? [ ], pythonEnv ? [ ], ..
            && sed -i 's|driver_local.maximize_window()||' web/regression/runtests.py"
       )
 
-      # don't bother to test LDAP authentification
-      # exclude resql test due to recent postgres 14.4 update
-      # see bugreport here https://redmine.postgresql.org/issues/7527
+      # Don't bother to test LDAP or kerberos authentification
+      # For now deactivate change_password API test. Current bug report at https://redmine.postgresql.org/issues/7648
+      # Password change works from the UI, if email SMTP is configured.
       with subtest("run browser test"):
           machine.succeed(
                'cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version}/web \
                && python regression/runtests.py \
                --pkg browser \
-               --exclude browser.tests.test_ldap_login.LDAPLoginTestCase,browser.tests.test_ldap_login,resql'
+               --exclude browser.tests.test_ldap_login.LDAPLoginTestCase,browser.tests.test_ldap_login,browser.tests.test_kerberos_with_mocking,browser.tests.test_change_password'
           )
 
       # fontconfig is necessary for chromium to run
@@ -126,11 +126,10 @@ import ./make-test-python.nix ({ pkgs, lib, buildDeps ? [ ], pythonEnv ? [ ], ..
                && python regression/runtests.py --pkg feature_tests'
           )
 
-      # reactivate this test again, when the postgres 14.4 test has been fixed
-      # with subtest("run resql test"):
-      #    machine.succeed(
-      #         'cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version}/web \
-      #         && python regression/runtests.py --pkg resql'
-      #    )
+      with subtest("run resql test"):
+         machine.succeed(
+              'cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version}/web \
+              && python regression/runtests.py --pkg resql'
+         )
     '';
   })
diff --git a/pkgs/tools/admin/pgadmin/default.nix b/pkgs/tools/admin/pgadmin/default.nix
index dadd79824927..8dfcf078dbc9 100644
--- a/pkgs/tools/admin/pgadmin/default.nix
+++ b/pkgs/tools/admin/pgadmin/default.nix
@@ -10,11 +10,11 @@
 
 let
   pname = "pgadmin";
-  version = "6.12";
+  version = "6.13";
 
   src = fetchurl {
     url = "https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v${version}/source/pgadmin4-${version}.tar.gz";
-    sha256 = "sha256-cO7GdZDfJ0pq1jpMyrVy0UM49WhrKOIJOmMJauSkbyo=";
+    sha256 = "sha256-vLItmE76R1IzgMYEGEvIeOmbfQQac5WK12AkkZknTFU=";
   };
 
   yarnDeps = mkYarnModules {
@@ -72,13 +72,16 @@ let
     azure-identity
   ];
 
-  # override necessary on pgadmin4 6.12
+  # keep the scope, as it is used throughout the derivation and tests
+  # this also makes potential future overrides easier
   pythonPackages = python3.pkgs.overrideScope (final: prev: rec {
-    werkzeug = prev.werkzeug.overridePythonAttrs (oldAttrs: rec {
-      version = "2.0.3";
+    # flask 2.2 is incompatible with pgadmin 6.13
+    # https://redmine.postgresql.org/issues/7651
+    flask = prev.flask.overridePythonAttrs (oldAttrs: rec {
+      version = "2.1.3";
       src = oldAttrs.src.override {
         inherit version;
-        sha256 = "sha256-uGP4/wV8UiFktgZ8niiwQRYbS+W6TQ2s7qpQoWOCLTw=";
+        sha256 = "sha256-FZcuUBffBXXD1sCQuhaLbbkCWeYgrI1+qBOjlrrVtss=";
       };
     });
   });
@@ -124,7 +127,7 @@ pythonPackages.buildPythonApplication rec {
 
     # build the documentation
     cd docs/en_US
-    ${sphinx}/bin/sphinx-build -W -b html -d _build/doctrees . _build/html
+    sphinx-build -W -b html -d _build/doctrees . _build/html
 
     # Build the clean tree
     cd ../../web
@@ -156,7 +159,7 @@ pythonPackages.buildPythonApplication rec {
     cp -v ../pkg/pip/setup_pip.py setup.py
   '';
 
-  nativeBuildInputs = with pythonPackages; [ cython pip ];
+  nativeBuildInputs = with pythonPackages; [ cython pip sphinx ];
   buildInputs = [
     zlib
     pythonPackages.wheel
diff --git a/pkgs/tools/admin/pgadmin/update.sh b/pkgs/tools/admin/pgadmin/update.sh
new file mode 100755
index 000000000000..d7ca19bbddd8
--- /dev/null
+++ b/pkgs/tools/admin/pgadmin/update.sh
@@ -0,0 +1,27 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl wget jq yarn2nix yarn common-updater-scripts
+
+set -eu -o pipefail
+
+scriptDir=$(cd "${BASH_SOURCE[0]%/*}" && pwd)
+nixpkgs=$(realpath "$scriptDir"/../../../..)
+
+newest_version="$(curl -s https://www.pgadmin.org/versions.json | jq -r .pgadmin4.version)"
+old_version=$(nix-instantiate --eval -E "(import \"$nixpkgs\" { config = {}; overlays = []; }).pgadmin4.version" | tr -d '"')
+url="https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v${newest_version}/source/pgadmin4-${newest_version}.tar.gz"
+
+if [[ $newest_version == $old_version ]]; then
+  echo "Already at latest version $newest_version"
+  exit 0
+fi
+echo "New version: $newest_version"
+
+pushd $(mktemp -d --suffix=-pgadmin4-updater)
+wget $url
+tar -xzf "pgadmin4-$newest_version.tar.gz"
+cd "pgadmin4-$newest_version/web"
+yarn2nix > yarn.nix
+cp yarn.nix yarn.lock package.json "$nixpkgs/pkgs/tools/admin/pgadmin/"
+popd
+
+update-source-version pgadmin4 "$newest_version" --print-changes

From d3feb91912419b47d124e72c93d816208790a452 Mon Sep 17 00:00:00 2001
From: harvidsen <hakon.arvidsen@eviny.no>
Date: Mon, 5 Sep 2022 15:15:26 +0200
Subject: [PATCH 04/18] maintainers: add harvidsen

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 33e9787a2ab5..4def507aa4ac 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5223,6 +5223,12 @@
       fingerprint = "3F35 E4CA CBF4 2DE1 2E90  53E5 03A6 E6F7 8693 6619";
     }];
   };
+  harvidsen = {
+    email = "harvidsen@gmail.com";
+    github = "harvidsen";
+    githubId = 62279738;
+    name = "Håkon Arvidsen";
+  };
   haslersn = {
     email = "haslersn@fius.informatik.uni-stuttgart.de";
     github = "haslersn";

From d240bf08af8ce1e888f54ca851086529e68dca6f Mon Sep 17 00:00:00 2001
From: harvidsen <hakon.arvidsen@eviny.no>
Date: Mon, 5 Sep 2022 15:26:30 +0200
Subject: [PATCH 05/18] python3Packages.databricks-sql-connector: init at 2.0.5

---
 .../databricks-sql-connector/default.nix      | 50 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 52 insertions(+)
 create mode 100644 pkgs/development/python-modules/databricks-sql-connector/default.nix

diff --git a/pkgs/development/python-modules/databricks-sql-connector/default.nix b/pkgs/development/python-modules/databricks-sql-connector/default.nix
new file mode 100644
index 000000000000..9c16f6267d79
--- /dev/null
+++ b/pkgs/development/python-modules/databricks-sql-connector/default.nix
@@ -0,0 +1,50 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, thrift
+, pandas
+, pyarrow
+, poetry-core
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "databricks-sql-connector";
+  version = "2.0.5";
+  format = "pyproject";
+
+  src = fetchFromGitHub {
+    owner = "databricks";
+    repo = "databricks-sql-python";
+    rev = "v${version}";
+    sha256 = "sha256-Qpdyn6z1mbO4bzyUZ2eYdd9pfIkIP/Aj4YgNXaYwxpE=";
+  };
+
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace 'thrift = "^0.13.0"' 'thrift = ">=0.13.0,<1.0.0"'
+  '';
+
+  nativeBuildInputs = [
+    poetry-core
+  ];
+
+  propagatedBuildInputs = [
+    thrift
+    pandas
+    pyarrow
+  ];
+
+  checkInputs = [
+    pytestCheckHook
+  ];
+
+  pytestFlagsArray = [ "tests/unit" ];
+
+  meta = with lib; {
+    description = "Databricks SQL Connector for Python";
+    homepage = https://docs.databricks.com/dev-tools/python-sql-connector.html;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ harvidsen ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index eb4600bcaaec..efd711b980a1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2254,6 +2254,8 @@ in {
 
   databricks-connect = callPackage ../development/python-modules/databricks-connect { };
 
+  databricks-sql-connector = callPackage ../development/python-modules/databricks-sql-connector { };
+
   dataclasses = callPackage ../development/python-modules/dataclasses { };
 
   dataclasses-json = callPackage ../development/python-modules/dataclasses-json { };

From 11a11704bc2344ff1dd7b1098b7282377d7ff144 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristoffer=20K=2E=20F=C3=B8llesdal?=
 <kristoffer.follesdal@eviny.no>
Date: Wed, 7 Sep 2022 15:30:40 +0200
Subject: [PATCH 06/18] databricks-sql-cli: init at 0.1.4

---
 .../misc/databricks-sql-cli/default.nix       | 64 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 66 insertions(+)
 create mode 100644 pkgs/applications/misc/databricks-sql-cli/default.nix

diff --git a/pkgs/applications/misc/databricks-sql-cli/default.nix b/pkgs/applications/misc/databricks-sql-cli/default.nix
new file mode 100644
index 000000000000..61191374b6ea
--- /dev/null
+++ b/pkgs/applications/misc/databricks-sql-cli/default.nix
@@ -0,0 +1,64 @@
+{ lib
+, buildPythonApplication
+, fetchFromGitHub
+, fetchpatch
+, poetry-core
+, pandas
+, prompt-toolkit
+, databricks-sql-connector
+, pygments
+, configobj
+, sqlparse
+, cli-helpers
+, click
+, pytestCheckHook
+}:
+
+buildPythonApplication rec {
+  pname = "databricks-sql-cli";
+  version = "0.1.4";
+  format = "pyproject";
+
+  src = fetchFromGitHub {
+    owner = "databricks";
+    repo = "databricks-sql-cli";
+    rev = "v${version}";
+    sha256 = "sha256-gr7LJfnvIu2Jf1XgILqfZoi8CbXeQyq0g1wLEBa5TPM=";
+  };
+
+  patches = [
+    # https://github.com/databricks/databricks-sql-cli/pull/38
+    (fetchpatch {
+      url = "https://github.com/databricks/databricks-sql-cli/commit/fc294e00819b6966f1605e5c1ce654473510aefe.patch";
+      sha256 = "sha256-QVrb7mD0fVbHrbrDywI6tsFNYM19x74LY8rhqqC8szE=";
+    })
+  ];
+
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace 'python = ">=3.7.1,<4.0"' 'python = ">=3.8,<4.0"' \
+      --replace 'pandas = "1.3.4"' 'pandas = "~1.4"'
+  '';
+
+  nativeBuildInputs = [ poetry-core ];
+
+  propagatedBuildInputs = [
+    prompt-toolkit
+    pandas
+    databricks-sql-connector
+    pygments
+    configobj
+    sqlparse
+    cli-helpers
+    click
+  ];
+
+  checkInputs = [ pytestCheckHook ];
+
+  meta = with lib; {
+    description = "CLI for querying Databricks SQL";
+    homepage = "https://github.com/databricks/databricks-sql-cli";
+    license = licenses.databricks;
+    maintainers = with maintainers; [ kfollesdal ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ff3535c7c78d..dbd3e959f836 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -430,6 +430,8 @@ with pkgs;
 
   cryptowatch-desktop = callPackage ../applications/finance/cryptowatch { };
 
+  databricks-sql-cli = python3Packages.callPackage ../applications/misc/databricks-sql-cli { };
+
   datalad = callPackage ../applications/version-management/datalad {
     python3 = python39;  # `boto` currently broken with Python3.10
   };

From 394521c7808098787fefd93102d60196ca9f8366 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sun, 25 Sep 2022 16:29:34 +0100
Subject: [PATCH 07/18] chkservice: pull fix for gcc-11

Without the change build fails on gcc-11 as:

    src/chk-systemd.cpp: In member function 'const char* ChkBus::getState(const char*)':
    src/chk-systemd.cpp:120:15: error: ordered comparison of pointer with integer zero ('const char*' and 'int')
      120 |     if (state < 0) {
          |         ~~~~~~^~~
---
 pkgs/tools/admin/chkservice/default.nix | 23 +++++++++++++++++++++--
 pkgs/top-level/all-packages.nix         |  4 +---
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/admin/chkservice/default.nix b/pkgs/tools/admin/chkservice/default.nix
index 949a65290d22..9e2965a0db2a 100644
--- a/pkgs/tools/admin/chkservice/default.nix
+++ b/pkgs/tools/admin/chkservice/default.nix
@@ -1,4 +1,13 @@
-{ stdenv, fetchFromGitHub, cmake, ninja, pkg-config, systemd, ncurses, lib }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, fetchpatch
+, cmake
+, ninja
+, pkg-config
+, systemd
+, ncurses
+}:
 
 stdenv.mkDerivation rec {
   pname = "chkservice";
@@ -8,9 +17,19 @@ stdenv.mkDerivation rec {
     owner = "linuxenko";
     repo = "chkservice";
     rev = version;
-    hash = "sha256:0dfvm62h6dwg18f17fn58nr09mfh6kylm8wy88j00fiy13l4wnb6";
+    hash = "sha256-ZllO6Ag+OgAkQp6jSv000NUEskXFuhMcCo83A4Wp2zU=";
   };
 
+  patches = [
+    # Pull fix pending upstream inclusion for gcc-11 support:
+    #   https://github.com/linuxenko/chkservice/pull/38
+    (fetchpatch {
+      name = "gcc-11.patch";
+      url = "https://github.com/linuxenko/chkservice/commit/26b12a7918c8a3bc449c92b458e6cd5c2d7b2e05.patch";
+      hash = "sha256-LaJLlqRyn1eoahbW2X+hDSt8iV4lhNRn0j0kLHB+RhM=";
+    })
+  ];
+
   # Tools needed during build time
   nativeBuildInputs = [
     cmake
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a47449477019..bf1fffe2058b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -208,9 +208,7 @@ with pkgs;
       }
     '');
 
-  chkservice = callPackage ../tools/admin/chkservice {
-    stdenv = gcc10StdenvCompat;
-  };
+  chkservice = callPackage ../tools/admin/chkservice { };
 
   addOpenGLRunpath = callPackage ../build-support/add-opengl-runpath { };
 

From a75a508c782de39e455348efee0472820ff0452c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Sep 2022 20:53:31 +0000
Subject: [PATCH 08/18] klaus: 2.0.0 -> 2.0.1

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

diff --git a/pkgs/development/python-modules/klaus/default.nix b/pkgs/development/python-modules/klaus/default.nix
index c0f077a283c4..ef5a5a7832e0 100644
--- a/pkgs/development/python-modules/klaus/default.nix
+++ b/pkgs/development/python-modules/klaus/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "klaus";
-  version = "2.0.0";
+  version = "2.0.1";
 
   src = fetchFromGitHub {
     owner = "jonashaag";
     repo = pname;
     rev = version;
-    sha256 = "sha256-GyWlIFmP78t+cyPWjjB/EgA/L+2QqHPnmfJ64W5gsf8=";
+    sha256 = "sha256-a0MbKjDqPSMakjmGS5gfaDaPegQpK4QA+ZdG7skd9QU=";
   };
 
   prePatch = ''

From ae361224cd17ea961840362fb5e98afc7da4c88d Mon Sep 17 00:00:00 2001
From: Aaron Jheng <wentworth@outlook.com>
Date: Mon, 26 Sep 2022 12:29:05 +0000
Subject: [PATCH 09/18] libtorrentRasterbar-1_1_x: remove

---
 .../libraries/libtorrent-rasterbar/1.1.nix    | 52 -------------------
 pkgs/top-level/aliases.nix                    |  1 -
 pkgs/top-level/all-packages.nix               |  4 --
 3 files changed, 57 deletions(-)
 delete mode 100644 pkgs/development/libraries/libtorrent-rasterbar/1.1.nix

diff --git a/pkgs/development/libraries/libtorrent-rasterbar/1.1.nix b/pkgs/development/libraries/libtorrent-rasterbar/1.1.nix
deleted file mode 100644
index 6f63ebce165d..000000000000
--- a/pkgs/development/libraries/libtorrent-rasterbar/1.1.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{ stdenv, lib, fetchFromGitHub, pkg-config, automake, autoconf
-, zlib, boost, openssl, libtool, python, libiconv, ncurses
-}:
-
-let
-  version = "1.1.11";
-  formattedVersion = lib.replaceChars ["."] ["_"] version;
-
-  # Make sure we override python, so the correct version is chosen
-  # for the bindings, if overridden
-  boostPython = boost.override { enablePython = true; inherit python; };
-
-in stdenv.mkDerivation {
-  pname = "libtorrent-rasterbar";
-  inherit version;
-
-  src = fetchFromGitHub {
-    owner = "arvidn";
-    repo = "libtorrent";
-    rev = "libtorrent_${formattedVersion}";
-    sha256 = "0nwdsv6d2gkdsh7l5a46g6cqx27xwh3msify5paf02l1qzjy4s5l";
-  };
-
-  enableParallelBuilding = true;
-  nativeBuildInputs = [ automake autoconf libtool pkg-config ];
-  buildInputs = [ boostPython openssl zlib python libiconv ncurses ];
-  preConfigure = "./autotool.sh";
-
-  postInstall = ''
-    moveToOutput "include" "$dev"
-    moveToOutput "lib/${python.libPrefix}" "$python"
-  '';
-
-  outputs = [ "out" "dev" "python" ];
-
-  configureFlags = [
-    "--enable-python-binding"
-    "--with-libiconv=yes"
-    "--with-boost=${boostPython.dev}"
-    "--with-boost-libdir=${boostPython.out}/lib"
-  ];
-
-  meta = with lib; {
-    # darwin: never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/libtorrent-rasterbar-1_1_x.x86_64-darwin
-    broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin;
-    homepage = "https://libtorrent.org/";
-    description = "A C++ BitTorrent implementation focusing on efficiency and scalability";
-    license = licenses.bsd3;
-    maintainers = [ ];
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 2b9d3fd202d1..b4f1034387db 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -615,7 +615,6 @@ mapAliases ({
   libtensorflow-bin = libtensorflow; # Added 2022-09-25
   libtidy = throw "'libtidy' has been renamed to/replaced by 'html-tidy'"; # Converted to throw 2022-02-22
   libtorrentRasterbar = throw "'libtorrentRasterbar' has been renamed to/replaced by 'libtorrent-rasterbar'"; # Converted to throw 2022-09-24
-  libtorrentRasterbar-1_1_x = throw "'libtorrentRasterbar-1_1_x' has been renamed to/replaced by 'libtorrent-rasterbar-1_1_x'"; # Converted to throw 2022-09-24
   libtorrentRasterbar-1_2_x = throw "'libtorrentRasterbar-1_2_x' has been renamed to/replaced by 'libtorrent-rasterbar-1_2_x'"; # Converted to throw 2022-09-24
   libtorrentRasterbar-2_0_x = throw "'libtorrentRasterbar-2_0_x' has been renamed to/replaced by 'libtorrent-rasterbar-2_0_x'"; # Converted to throw 2022-09-24
   libudev = throw "'libudev' has been renamed to/replaced by 'udev'"; # Converted to throw 2022-02-22
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1cfba9daf290..09ca7a99ddca 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20402,10 +20402,6 @@ with pkgs;
     python = python2;
   };
 
-  libtorrent-rasterbar-1_1_x = callPackage ../development/libraries/libtorrent-rasterbar/1.1.nix {
-    python = python2;
-  };
-
   libtorrent-rasterbar = libtorrent-rasterbar-2_0_x;
 
   # this is still the new version of the old API

From c2dcb02daee9d18353358db5fd4288e41630adae Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 27 Sep 2022 01:41:05 +0200
Subject: [PATCH 10/18] python310Packages.minikerberos: 0.3.1 -> 0.3.2

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

diff --git a/pkgs/development/python-modules/minikerberos/default.nix b/pkgs/development/python-modules/minikerberos/default.nix
index ee9c657fe056..5670663960c8 100644
--- a/pkgs/development/python-modules/minikerberos/default.nix
+++ b/pkgs/development/python-modules/minikerberos/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "minikerberos";
-  version = "0.3.1";
+  version = "0.3.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-wFz82EaxlzsrDVAenp+iomNUPXdisFL8gD/B3oSShqM=";
+    hash = "sha256-6nsc/LVyzjXCtX7GhWbOVc98hPbJZOWAOuys3WPTfYw=";
   };
 
   propagatedBuildInputs = [

From 731cbbbbfa5ec85307545dab5fb276f159611815 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 27 Sep 2022 01:42:33 +0200
Subject: [PATCH 11/18] python310Packages.pypykatz: 0.6.1 -> 0.6.2

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

diff --git a/pkgs/development/python-modules/pypykatz/default.nix b/pkgs/development/python-modules/pypykatz/default.nix
index 5a3137063afa..b926da1236cc 100644
--- a/pkgs/development/python-modules/pypykatz/default.nix
+++ b/pkgs/development/python-modules/pypykatz/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "pypykatz";
-  version = "0.6.1";
+  version = "0.6.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-GbIWxYCVmNXUwn6W4a/cl1XOTbWkpBemKcmjOvnXER4=";
+    hash = "sha256-djk8b7/H23aDmyGaM60goAcpfZQrpftOIIRKnJjFz50=";
   };
 
   propagatedBuildInputs = [

From 5de59d21c90a5454eccf9eea75208049d8314246 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Mon, 26 Sep 2022 21:33:47 -0400
Subject: [PATCH 12/18] onetun: fix build on darwin

---
 pkgs/tools/networking/onetun/default.nix | 11 ++++++++---
 pkgs/top-level/all-packages.nix          |  4 +++-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/networking/onetun/default.nix b/pkgs/tools/networking/onetun/default.nix
index 77b6a7dedf0e..9fe30faaf5ca 100644
--- a/pkgs/tools/networking/onetun/default.nix
+++ b/pkgs/tools/networking/onetun/default.nix
@@ -1,8 +1,10 @@
 { lib
-, stdenv
-, fetchFromGitHub
 , rustPlatform
+, fetchFromGitHub
+, stdenv
+, Security
 }:
+
 rustPlatform.buildRustPackage rec {
   pname = "onetun";
   version = "0.3.4";
@@ -11,12 +13,15 @@ rustPlatform.buildRustPackage rec {
     owner = "aramperes";
     repo = pname;
     rev = "v${version}";
-
     sha256 = "sha256-gVw1aVbYjDPYTtMYIXq3k+LN0gUBAbQm275sxzwoYw8=";
   };
 
   cargoSha256 = "sha256-/sOjd0JKk3MNNXYpTEXteFYtqDWYfyVItZrkX4uzjtc=";
 
+  buildInputs = lib.optionals stdenv.isDarwin [
+    Security
+  ];
+
   meta = with lib; {
     description = "A cross-platform, user-space WireGuard port-forwarder that requires no root-access or system network configurations";
     homepage = "https://github.com/aramperes/onetun";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 873581e37c8e..48e0e0d196c6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9535,7 +9535,9 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  onetun = callPackage ../tools/networking/onetun { };
+  onetun = callPackage ../tools/networking/onetun {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   opencorsairlink = callPackage ../tools/misc/opencorsairlink { };
 

From 48a3044d8dc5eeda5fcfad1be58e48d025f9fef0 Mon Sep 17 00:00:00 2001
From: superherointj <5861043+superherointj@users.noreply.github.com>
Date: Fri, 23 Sep 2022 13:14:23 -0300
Subject: [PATCH 13/18] rtabmap: unstable-2022-02-07 -> unstable-2022-09-24

---
 pkgs/applications/video/rtabmap/default.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/video/rtabmap/default.nix b/pkgs/applications/video/rtabmap/default.nix
index 3dce0123d1be..60e5924b5f34 100644
--- a/pkgs/applications/video/rtabmap/default.nix
+++ b/pkgs/applications/video/rtabmap/default.nix
@@ -1,16 +1,17 @@
 { lib, stdenv, fetchFromGitHub, pkg-config, cmake, opencv, pcl, libusb1, eigen
 , wrapQtAppsHook, qtbase, g2o, ceres-solver, libpointmatcher, octomap, freenect
-, libdc1394, librealsense, libGL, libGLU, vtkWithQt5, wrapGAppsHook }:
+, libdc1394, librealsense, libGL, libGLU, vtkWithQt5, wrapGAppsHook, liblapack
+, xorg }:
 
 stdenv.mkDerivation rec {
   pname = "rtabmap";
-  version = "unstable-2022-02-07";
+  version = "unstable-2022-09-24";
 
   src = fetchFromGitHub {
     owner = "introlab";
     repo = "rtabmap";
-    rev = "f584f42ea423c44138aa0668b5c8eb18f2978fe2";
-    sha256 = "sha256-xotOcaz5XrmzwEKuVEQZoeq6fEVbACK7PSUW9kULH40=";
+    rev = "fa31affea0f0bd54edf1097b8289209c7ac0548e";
+    sha256 = "sha256-kcY+o31fSmwxBcvF/e+Wu6OIqiQzLKgEJJxcj+g3qDM=";
   };
 
   patches = [
@@ -23,6 +24,10 @@ stdenv.mkDerivation rec {
     ## Required
     opencv
     pcl
+    liblapack
+    xorg.libSM
+    xorg.libICE
+    xorg.libXt
     ## Optional
     libusb1
     eigen

From 1c66e614500d53185711f283ca43fb8fc2afae0f Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Tue, 27 Sep 2022 12:25:09 +0800
Subject: [PATCH 14/18] pantheon.gala: Fix multitasking view allocation
 assertions

---
 pkgs/desktops/pantheon/desktop/gala/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix
index acb4e7838570..6c7713098822 100644
--- a/pkgs/desktops/pantheon/desktop/gala/default.nix
+++ b/pkgs/desktops/pantheon/desktop/gala/default.nix
@@ -53,6 +53,13 @@ stdenv.mkDerivation rec {
       url = "https://github.com/elementary/gala/commit/e0095415cdbfc369e6482e84b8aaffc6a04cafe7.patch";
       sha256 = "sha256-n/BJPIrUaCQtBgDotOLq/bCAAccdbL6OwciXY115HsM=";
     })
+
+    # MultitaskingView: fix allocation assertions
+    # https://github.com/elementary/gala/pull/1463
+    (fetchpatch {
+      url = "https://github.com/elementary/gala/commit/23c7edeb0ee9b0ff0aa48c1d19fbd1739df7af78.patch";
+      sha256 = "sha256-OfIDBfVEZoY8vMu9F8gtfRg4TYA1MUAG94BSOBKVGcI=";
+    })
   ];
 
   nativeBuildInputs = [

From f27822dc425f13cb6390dce652763d39a0cbce21 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 26 Sep 2022 14:40:34 +0000
Subject: [PATCH 15/18] famistudio: 4.0.1 -> 4.0.4

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

diff --git a/pkgs/applications/audio/famistudio/default.nix b/pkgs/applications/audio/famistudio/default.nix
index b90bc3f13341..1ff08bd06b93 100644
--- a/pkgs/applications/audio/famistudio/default.nix
+++ b/pkgs/applications/audio/famistudio/default.nix
@@ -10,12 +10,12 @@
 
 stdenv.mkDerivation rec {
   pname = "famistudio";
-  version = "4.0.1";
+  version = "4.0.4";
 
   src = fetchzip {
     url = "https://github.com/BleuBleu/FamiStudio/releases/download/${version}/FamiStudio${lib.strings.concatStrings (lib.splitVersion version)}-LinuxAMD64.zip";
     stripRoot = false;
-    sha256 = "sha256-pAULW2aIaKiA61rARpL+hSoffnQO6hfqVpOcEMwD7oo=";
+    sha256 = "sha256-qdSldObfwC5J1b4tpHT9S/xxJ2StBTsPA80QS7bs2vo=";
   };
 
   nativeBuildInputs = [

From 48dd2ed61adbffd1ade4a1af83e4e6e67192b13c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 27 Sep 2022 10:16:22 +0200
Subject: [PATCH 16/18] python310Packages.sentry-sdk: 1.9.8 -> 1.9.9

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

diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix
index 8899f574de03..70635de5e4f7 100644
--- a/pkgs/development/python-modules/sentry-sdk/default.nix
+++ b/pkgs/development/python-modules/sentry-sdk/default.nix
@@ -46,7 +46,7 @@
 
 buildPythonPackage rec {
   pname = "sentry-sdk";
-  version = "1.9.8";
+  version = "1.9.9";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -55,7 +55,7 @@ buildPythonPackage rec {
     owner = "getsentry";
     repo = "sentry-python";
     rev = version;
-    hash = "sha256-x320F7URZTKcCNdhjiR7hMEUSgbFMhv8e5Csl+IxWt0=";
+    hash = "sha256-DIiShIiTHmJdOtf1WYi4ofJdZnsg13VczVvGW+ngE+I=";
   };
 
   propagatedBuildInputs = [

From f7de39c6aead868dd8dfb85eb74064053c296762 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 27 Sep 2022 07:00:46 +0000
Subject: [PATCH 17/18] fcitx5-gtk: 5.0.18 -> 5.0.19

---
 pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix
index 43905dfac913..3285c18b9dbb 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix
@@ -26,13 +26,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fcitx5-gtk";
-  version = "5.0.18";
+  version = "5.0.19";
 
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = pname;
     rev = version;
-    sha256 = "sha256-rQ2HLiI0dIerxRV+fbHpTJy4aGmFKmGd6YckKxXmp4s=";
+    sha256 = "sha256-sD6FN8Ql+OhaQuHLCYreoiqSDC+Xf6OlFWUxg7k9SIk=";
   };
 
   cmakeFlags = [

From fb3c48614fe70a547f2a87ac797657768c56ff9c Mon Sep 17 00:00:00 2001
From: Kenji Maillard <kenji@maillard.blue>
Date: Thu, 22 Sep 2022 15:47:09 +0200
Subject: [PATCH 18/18] Add metacoq 1.1 release

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

diff --git a/pkgs/development/coq-modules/metacoq/default.nix b/pkgs/development/coq-modules/metacoq/default.nix
index 9eca682b9f91..ab036add60bb 100644
--- a/pkgs/development/coq-modules/metacoq/default.nix
+++ b/pkgs/development/coq-modules/metacoq/default.nix
@@ -10,9 +10,9 @@ let
       { case = "8.12"; out = "1.0-beta2-8.12"; }
       # Do not provide 8.13 because it does not compile with equations 1.3 provided by default (only 1.2.3)
       # { case = "8.13"; out = "1.0-beta2-8.13"; }
-      { case = "8.14"; out = "1.0-8.14"; }
-      { case = "8.15"; out = "1.0-8.15"; }
-      { case = "8.16"; out = "1.0-8.16"; }
+      { case = "8.14"; out = "1.1-8.14"; }
+      { case = "8.15"; out = "1.1-8.15"; }
+      { case = "8.16"; out = "1.1-8.16"; }
     ] null;
   release = {
     "1.0-beta2-8.11".sha256 = "sha256-I9YNk5Di6Udvq5/xpLSNflfjRyRH8fMnRzbo3uhpXNs=";
@@ -21,6 +21,9 @@ let
     "1.0-8.14".sha256 = "sha256-iRnaNeHt22JqxMNxOGPPycrO9EoCVjusR2s0GfON1y0=";
     "1.0-8.15".sha256 = "sha256-8RUC5dHNfLJtJh+IZG4nPTAVC8ZKVh2BHedkzjwLf/k=";
     "1.0-8.16".sha256 = "sha256-7rkCAN4PNnMgsgUiiLe2TnAliknN75s2SfjzyKCib/o=";
+    "1.1-8.14".sha256 = "sha256-6vViCNQl6BnGgOHX3P/OLfFXN4aUfv4RbDokfz2BgQI=";
+    "1.1-8.15".sha256 = "sha256-qCD3wFW4E+8vSVk4XoZ0EU4PVya0al+JorzS9nzmR/0=";
+    "1.1-8.16".sha256 = "sha256-cTK4ptxpPPlqxAhasZFX3RpSlsoTZwhTqs2A3BZy9sA=";
   };
   releaseRev = v: "v${v}";