From 39341af6b0e79563211d643ed388ea5e3d7587cd Mon Sep 17 00:00:00 2001
From: Majiir Paktu <majiir@nabaal.net>
Date: Mon, 16 Jan 2023 16:22:01 -0500
Subject: [PATCH 01/44] papermc: allow version override

---
 pkgs/games/papermc/default.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/games/papermc/default.nix b/pkgs/games/papermc/default.nix
index 66754073db5c..930b4462a7bd 100644
--- a/pkgs/games/papermc/default.nix
+++ b/pkgs/games/papermc/default.nix
@@ -1,14 +1,16 @@
 { lib, stdenv, fetchurl, bash, jre }:
-let
-  mcVersion = "1.19.3";
-  buildNum = "375";
-  jar = fetchurl {
+
+stdenv.mkDerivation rec {
+  pname = "papermc";
+  version = "1.19.3.375";
+
+  jar = let
+    mcVersion = lib.versions.pad 3 version;
+    buildNum = builtins.elemAt (lib.versions.splitVersion version) 3;
+  in fetchurl {
     url = "https://papermc.io/api/v2/projects/paper/versions/${mcVersion}/builds/${buildNum}/downloads/paper-${mcVersion}-${buildNum}.jar";
     sha256 = "sha256-NAl4+mCkO6xQQpIx2pd9tYX2N8VQa+2dmFwyBNbDa10=";
   };
-in stdenv.mkDerivation {
-  pname = "papermc";
-  version = "${mcVersion}r${buildNum}";
 
   preferLocalBuild = true;
 

From c10bdd233c4bc96b5232fabb8a79540563969d44 Mon Sep 17 00:00:00 2001
From: "Markus S. Wamser" <github-dev@mail2013.wamser.eu>
Date: Wed, 8 Mar 2023 14:54:08 +0100
Subject: [PATCH 02/44] notable: add seccomp-fix for AppImage

---
 pkgs/applications/misc/notable/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/notable/default.nix b/pkgs/applications/misc/notable/default.nix
index 9e701cdb33f6..e51e49fd8931 100644
--- a/pkgs/applications/misc/notable/default.nix
+++ b/pkgs/applications/misc/notable/default.nix
@@ -1,4 +1,4 @@
-{ appimageTools, fetchurl, lib }:
+{ appimageTools, makeWrapper, fetchurl, lib }:
 
 let
   pname = "notable";
@@ -16,10 +16,11 @@ let
     inherit name src;
   };
 
+  nativeBuildInputs = [ makeWrapper ];
 in
 appimageTools.wrapType2 rec {
 
-  inherit name src;
+  inherit pname version src;
 
   profile = ''
     export LC_ALL=C.UTF-8
@@ -34,6 +35,9 @@ appimageTools.wrapType2 rec {
       $out/share/icons/hicolor/1024x1024/apps/notable.png
     substituteInPlace $out/share/applications/notable.desktop \
       --replace 'Exec=AppRun' 'Exec=${pname}'
+    source "${makeWrapper}/nix-support/setup-hook"
+    wrapProgram "$out/bin/${pname}" \
+      --add-flags "--disable-seccomp-filter-sandbox"
   '';
 
   meta = with lib; {

From a5d95ac5fca37482f55feb0870c9ed6b1b9bb4b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sun, 4 Dec 2022 21:44:47 +0100
Subject: [PATCH 03/44] nixos/tmp: move /tmp options under boot.tmp

---
 .../installer/tools/nixos-generate-config.pl  |  2 +-
 nixos/modules/system/boot/tmp.nix             | 80 +++++++++----------
 nixos/modules/virtualisation/qemu-vm.nix      |  4 +-
 nixos/tests/ihatemoney/default.nix            |  2 +-
 4 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index db530533e428..c719cf49dcad 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -473,7 +473,7 @@ EOF
     }
 
     # Don't emit tmpfs entry for /tmp, because it most likely comes from the
-    # boot.tmpOnTmpfs option in configuration.nix (managed declaratively).
+    # boot.tmp.useTmpfs option in configuration.nix (managed declaratively).
     next if ($mountPoint eq "/tmp" && $fsType eq "tmpfs");
 
     # Emit the filesystem.
diff --git a/nixos/modules/system/boot/tmp.nix b/nixos/modules/system/boot/tmp.nix
index 1f9431710aec..3775f17d763a 100644
--- a/nixos/modules/system/boot/tmp.nix
+++ b/nixos/modules/system/boot/tmp.nix
@@ -3,62 +3,62 @@
 with lib;
 
 let
-  cfg = config.boot;
+  cfg = config.boot.tmp;
 in
 {
-
-  ###### interface
+  imports = [
+    (mkRenamedOptionModule [ "boot" "cleanTmpDir" ] [ "boot" "tmp" "cleanOnBoot" ])
+    (mkRenamedOptionModule [ "boot" "tmpOnTmpfs" ] [ "boot" "tmp" "useTmpfs" ])
+    (mkRenamedOptionModule [ "boot" "tmpOnTmpfsSize" ] [ "boot" "tmp" "tmpfsSize" ])
+  ];
 
   options = {
+    boot.tmp = {
+      cleanOnBoot = mkOption {
+        type = types.bool;
+        default = false;
+        description = lib.mdDoc ''
+          Whether to delete all files in {file}`/tmp` during boot.
+        '';
+      };
 
-    boot.cleanTmpDir = mkOption {
-      type = types.bool;
-      default = false;
-      description = lib.mdDoc ''
-        Whether to delete all files in {file}`/tmp` during boot.
-      '';
+      tmpfsSize = mkOption {
+        type = types.oneOf [ types.str types.types.ints.positive ];
+        default = "50%";
+        description = lib.mdDoc ''
+          Size of tmpfs in percentage.
+          Percentage is defined by systemd.
+        '';
+      };
+
+      useTmpfs = mkOption {
+        type = types.bool;
+        default = false;
+        description = lib.mdDoc ''
+           Whether to mount a tmpfs on {file}`/tmp` during boot.
+        '';
+      };
     };
-
-    boot.tmpOnTmpfs = mkOption {
-      type = types.bool;
-      default = false;
-      description = lib.mdDoc ''
-         Whether to mount a tmpfs on {file}`/tmp` during boot.
-      '';
-    };
-
-    boot.tmpOnTmpfsSize = mkOption {
-      type = types.oneOf [ types.str types.types.ints.positive ];
-      default = "50%";
-      description = lib.mdDoc ''
-        Size of tmpfs in percentage.
-        Percentage is defined by systemd.
-      '';
-    };
-
   };
 
-  ###### implementation
-
   config = {
-
     # When changing remember to update /tmp mount in virtualisation/qemu-vm.nix
-    systemd.mounts = mkIf cfg.tmpOnTmpfs [
+    systemd.mounts = mkIf cfg.useTmpfs [
       {
         what = "tmpfs";
         where = "/tmp";
         type = "tmpfs";
-        mountConfig.Options = concatStringsSep "," [ "mode=1777"
-                                                     "strictatime"
-                                                     "rw"
-                                                     "nosuid"
-                                                     "nodev"
-                                                     "size=${toString cfg.tmpOnTmpfsSize}" ];
+        mountConfig.Options = concatStringsSep "," [
+          "mode=1777"
+          "strictatime"
+          "rw"
+          "nosuid"
+          "nodev"
+          "size=${toString cfg.tmpfsSize}"
+        ];
       }
     ];
 
-    systemd.tmpfiles.rules = optional config.boot.cleanTmpDir "D! /tmp 1777 root root";
-
+    systemd.tmpfiles.rules = optional cfg.cleanOnBoot "D! /tmp 1777 root root";
   };
-
 }
diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index a55a21a46a53..89772019284c 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -1069,12 +1069,12 @@ in
           fsType = "ext4";
           autoFormat = true;
         });
-        "/tmp" = lib.mkIf config.boot.tmpOnTmpfs {
+        "/tmp" = lib.mkIf config.boot.tmp.useTmpfs {
           device = "tmpfs";
           fsType = "tmpfs";
           neededForBoot = true;
           # Sync with systemd's tmp.mount;
-          options = [ "mode=1777" "strictatime" "nosuid" "nodev" "size=${toString config.boot.tmpOnTmpfsSize}" ];
+          options = [ "mode=1777" "strictatime" "nosuid" "nodev" "size=${toString config.boot.tmp.tmpfsSize}" ];
         };
         "/nix/${if cfg.writableStore then ".ro-store" else "store"}" = lib.mkIf cfg.useNixStoreImage {
           device = "${lookupDriveDeviceName "nix-store" cfg.qemu.drives}";
diff --git a/nixos/tests/ihatemoney/default.nix b/nixos/tests/ihatemoney/default.nix
index 894a97d43d35..d172bf79b8c6 100644
--- a/nixos/tests/ihatemoney/default.nix
+++ b/nixos/tests/ihatemoney/default.nix
@@ -17,7 +17,7 @@ let
           http = ":8000";
         };
       };
-      boot.cleanTmpDir = true;
+      boot.tmp.cleanOnBoot = true;
       # for exchange rates
       security.pki.certificateFiles = [ ./server.crt ];
       networking.extraHosts = "127.0.0.1 api.exchangerate.host";

From 3a5de0e7258d249a36fc29f0bb2a55f40b211a45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@sap.com>
Date: Mon, 20 Mar 2023 17:27:06 +0100
Subject: [PATCH 04/44] nixos/tmp: add a note to useTmpfs on potential issues

---
 nixos/modules/system/boot/tmp.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/nixos/modules/system/boot/tmp.nix b/nixos/modules/system/boot/tmp.nix
index 3775f17d763a..fd16cd3fba42 100644
--- a/nixos/modules/system/boot/tmp.nix
+++ b/nixos/modules/system/boot/tmp.nix
@@ -36,6 +36,11 @@ in
         default = false;
         description = lib.mdDoc ''
            Whether to mount a tmpfs on {file}`/tmp` during boot.
+
+           ::: {.note}
+           Large Nix builds can fail if the mounted tmpfs is not large enough.
+           In such a case either increase the tmpfsSize or disable this option.
+           :::
         '';
       };
     };

From 5113be6584810b63ae9be37f3d887bc09e7c1334 Mon Sep 17 00:00:00 2001
From: Lily Foster <lily@lily.flowers>
Date: Tue, 21 Mar 2023 19:34:23 -0400
Subject: [PATCH 05/44] teams-for-linux: add updateScript

---
 .../teams-for-linux/default.nix               |  2 +
 .../teams-for-linux/update.sh                 | 50 +++++++++++++++++++
 2 files changed, 52 insertions(+)
 create mode 100755 pkgs/applications/networking/instant-messengers/teams-for-linux/update.sh

diff --git a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix
index 705f1ffe66b0..16887e900c0f 100644
--- a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix
+++ b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix
@@ -89,6 +89,8 @@ stdenv.mkDerivation rec {
     categories = [ "Network" "InstantMessaging" "Chat" ];
   })];
 
+  passthru.updateScript = ./update.sh;
+
   meta = with lib; {
     description = "Unofficial Microsoft Teams client for Linux";
     homepage = "https://github.com/IsmaelMartinez/teams-for-linux";
diff --git a/pkgs/applications/networking/instant-messengers/teams-for-linux/update.sh b/pkgs/applications/networking/instant-messengers/teams-for-linux/update.sh
new file mode 100755
index 000000000000..650edf188611
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/teams-for-linux/update.sh
@@ -0,0 +1,50 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p nix jq common-updater-scripts
+
+set -euo pipefail
+
+nixpkgs="$(git rev-parse --show-toplevel || (printf 'Could not find root of nixpkgs repo\nAre we running from within the nixpkgs git repo?\n' >&2; exit 1))"
+
+stripwhitespace() {
+    sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//'
+}
+
+nixeval() {
+    nix --extra-experimental-features nix-command eval --json --impure -f "$nixpkgs" "$1" | jq -r .
+}
+
+vendorhash() {
+    (nix --extra-experimental-features nix-command build --impure --argstr nixpkgs "$nixpkgs" --argstr attr "$1" --expr '{ nixpkgs, attr }: let pkgs = import nixpkgs {}; in with pkgs.lib; (getAttrFromPath (splitString "." attr) pkgs).overrideAttrs (attrs: { outputHash = fakeHash; })' --no-link 2>&1 >/dev/null | tail -n3 | grep -F got: | cut -d: -f2- | stripwhitespace) 2>/dev/null || true
+}
+
+findpath() {
+    path="$(nix --extra-experimental-features nix-command eval --json --impure -f "$nixpkgs" "$1.meta.position" | jq -r . | cut -d: -f1)"
+    outpath="$(nix --extra-experimental-features nix-command eval --json --impure --expr "builtins.fetchGit \"$nixpkgs\"")"
+
+    if [ -n "$outpath" ]; then
+        path="${path/$(echo "$outpath" | jq -r .)/$nixpkgs}"
+    fi
+
+    echo "$path"
+}
+
+attr="${UPDATE_NIX_ATTR_PATH:-teams-for-linux}"
+version="$(cd "$nixpkgs" && list-git-tags --pname="$(nixeval "$attr".pname)" --attr-path="$attr" | grep '^v' | sed -e 's|^v||' | sort -V | tail -n1)"
+
+pkgpath="$(findpath "$attr")"
+
+updated="$(cd "$nixpkgs" && update-source-version "$attr" "$version" --file="$pkgpath" --print-changes | jq -r length)"
+
+if [ "$updated" -eq 0 ]; then
+    echo 'update.sh: Package version not updated, nothing to do.'
+    exit 0
+fi
+
+curhash="$(nixeval "$attr.offlineCache.outputHash")"
+newhash="$(vendorhash "$attr.offlineCache")"
+
+if [ -n "$newhash" ] && [ "$curhash" != "$newhash" ]; then
+    sed -i -e "s|\"$curhash\"|\"$newhash\"|" "$pkgpath"
+else
+    echo 'update.sh: New vendorHash same as old vendorHash, nothing to do.'
+fi

From b44b55f80396562cb30e8ec4a57a33c0dd4f5fb0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 28 Mar 2023 14:16:18 +0200
Subject: [PATCH 06/44] esphome: 2023.3.1 -> 2023.3.2

https://github.com/esphome/esphome/releases/tag/2023.3.2
---
 pkgs/tools/misc/esphome/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix
index 97ab9718b885..783bf2b3f182 100644
--- a/pkgs/tools/misc/esphome/default.nix
+++ b/pkgs/tools/misc/esphome/default.nix
@@ -16,14 +16,14 @@ let
 in
 python.pkgs.buildPythonApplication rec {
   pname = "esphome";
-  version = "2023.3.1";
+  version = "2023.3.2";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-h35V6tg6TewqJiZ4T5t6RNNaT2JEzqhbnJgH6xqqqzs=";
+    hash = "sha256-MfipnmBxCz8R0bNyJDRBP2R8JeOtgIm6Mu6SFPGkDc0=";
   };
 
   postPatch = ''

From fce7bf97d85025d79c8b0c9cfe4931476958d1f3 Mon Sep 17 00:00:00 2001
From: Kyle Hendricks <kyle@hendricks.nu>
Date: Sat, 1 Apr 2023 20:28:44 -0400
Subject: [PATCH 07/44] maintainers: add kylehendricks

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 3215b639d174..f4b7f1d6f877 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -8344,6 +8344,12 @@
     githubId = 2422454;
     name = "Kai Wohlfahrt";
   };
+  kylehendricks = {
+    name = "Kyle Hendricks";
+    email = "kyle-github@mail.hendricks.nu";
+    github = "kylehendricks";
+    githubId = 981958;
+  };
   kyleondy = {
     email = "kyle@ondy.org";
     github = "KyleOndy";

From eb0f101b8aa0b704e103164699350fd3914c298c Mon Sep 17 00:00:00 2001
From: Kyle Hendricks <kyle@hendricks.nu>
Date: Sat, 1 Apr 2023 20:30:12 -0400
Subject: [PATCH 08/44] gasket: init at 1.0-18

Added this driver as it's needed to use the Google Coral EdgeTPU.
---
 pkgs/os-specific/linux/gasket/default.nix | 35 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  4 +++
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/os-specific/linux/gasket/default.nix

diff --git a/pkgs/os-specific/linux/gasket/default.nix b/pkgs/os-specific/linux/gasket/default.nix
new file mode 100644
index 000000000000..1f9d60ad7b60
--- /dev/null
+++ b/pkgs/os-specific/linux/gasket/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, lib, fetchFromGitHub, kernel }:
+
+stdenv.mkDerivation rec {
+  pname = "gasket";
+  version = "1.0-18";
+
+  src = fetchFromGitHub {
+    owner = "google";
+    repo = "gasket-driver";
+    rev = "97aeba584efd18983850c36dcf7384b0185284b3";
+    sha256 = "pJwrrI7jVKFts4+bl2xmPIAD01VKFta2SRuElerQnTo=";
+  };
+
+  makeFlags = [
+    "-C"
+    "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
+    "M=$(PWD)"
+  ];
+  buildFlags = [ "modules" ];
+
+  installFlags = [ "INSTALL_MOD_PATH=${placeholder "out"}" ];
+  installTargets = [ "modules_install" ];
+
+  sourceRoot = "source/src";
+  hardeningDisable = [ "pic" "format" ];
+  nativeBuildInputs = kernel.moduleBuildDependencies;
+
+  meta = with lib; {
+    description = "The Coral Gasket Driver allows usage of the Coral EdgeTPU on Linux systems.";
+    homepage = "https://github.com/google/gasket-driver";
+    license = licenses.gpl2;
+    maintainers = [ lib.maintainers.kylehendricks ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b3181f644ef6..cda6915853e7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -26204,6 +26204,10 @@ with pkgs;
 
   fwts = callPackage ../os-specific/linux/fwts { };
 
+  gasket = callPackage ../os-specific/linux/gasket {
+    inherit (linuxPackages) kernel;
+  };
+
   gobi_loader = callPackage ../os-specific/linux/gobi_loader { };
 
   libossp_uuid = callPackage ../development/libraries/libossp-uuid { };

From 42ca62eb014f3f55a5d3d23c73bacb1e79bad64e Mon Sep 17 00:00:00 2001
From: Morgan Helton <mhelton@gmail.com>
Date: Sun, 2 Apr 2023 19:01:56 -0500
Subject: [PATCH 09/44] sunshine: add updater script

---
 pkgs/servers/sunshine/default.nix |  2 ++
 pkgs/servers/sunshine/updater.sh  | 23 +++++++++++++++++++++++
 2 files changed, 25 insertions(+)
 create mode 100755 pkgs/servers/sunshine/updater.sh

diff --git a/pkgs/servers/sunshine/default.nix b/pkgs/servers/sunshine/default.nix
index 21ffb28a25ca..417cac9510f5 100644
--- a/pkgs/servers/sunshine/default.nix
+++ b/pkgs/servers/sunshine/default.nix
@@ -153,6 +153,8 @@ stdenv.mkDerivation rec {
       --set LD_LIBRARY_PATH ${lib.makeLibraryPath [ vulkan-loader ]}
   '';
 
+  passthru.updateScript = ./updater.sh;
+
   meta = with lib; {
     description = "Sunshine is a Game stream host for Moonlight.";
     homepage = "https://github.com/LizardByte/Sunshine";
diff --git a/pkgs/servers/sunshine/updater.sh b/pkgs/servers/sunshine/updater.sh
new file mode 100755
index 000000000000..43ae46ab6f2f
--- /dev/null
+++ b/pkgs/servers/sunshine/updater.sh
@@ -0,0 +1,23 @@
+#! /usr/bin/env nix-shell
+#! nix-shell -i bash -p gnugrep gnused coreutils curl wget jq nix-update prefetch-npm-deps nodejs
+
+set -euo pipefail
+pushd "$(dirname "${BASH_SOURCE[0]}")"
+
+version=$(curl -s "https://api.github.com/repos/LizardByte/sunshine/tags" | jq -r .[0].name | grep -oP "^v\K.*")
+url="https://raw.githubusercontent.com/LizardByte/sunshine/v$version/"
+
+if [[ "$UPDATE_NIX_OLD_VERSION" == "$version" ]]; then
+    echo "Already up to date!"
+    exit 0
+fi
+
+rm -f package-lock.json package.json
+wget "$url/package.json"
+npm i --package-lock-only
+npm_hash=$(prefetch-npm-deps package-lock.json)
+sed -i 's#npmDepsHash = "[^"]*"#npmDepsHash = "'"$npm_hash"'"#' default.nix
+rm -f package.json
+
+popd
+nix-update sunshine --version $version

From 34464d6044271c431133f0e9ce064b7bc79c9868 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 4 Apr 2023 01:01:49 +0200
Subject: [PATCH 10/44] nixos/go-neb: Replace PermissionsStartOnly with
 executable prefix

This should work as a drop-in replacement and satisfy #53852.
---
 nixos/modules/services/networking/go-neb.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nixos/modules/services/networking/go-neb.nix b/nixos/modules/services/networking/go-neb.nix
index 8c04542c47cc..b65bb5f548ee 100644
--- a/nixos/modules/services/networking/go-neb.nix
+++ b/nixos/modules/services/networking/go-neb.nix
@@ -60,13 +60,12 @@ in {
 
       serviceConfig = {
         ExecStartPre = lib.optional (cfg.secretFile != null)
-          (pkgs.writeShellScript "pre-start" ''
+          ("+" + pkgs.writeShellScript "pre-start" ''
             umask 077
             export $(xargs < ${cfg.secretFile})
             ${pkgs.envsubst}/bin/envsubst -i "${configFile}" > ${finalConfigFile}
             chown go-neb ${finalConfigFile}
           '');
-        PermissionsStartOnly = true;
         RuntimeDirectory = "go-neb";
         ExecStart = "${pkgs.go-neb}/bin/go-neb";
         User = "go-neb";

From 431ccf26e49eb66d0c229a0dd14d5b8f0f00f455 Mon Sep 17 00:00:00 2001
From: Kerstin Humm <kerstin@erictapen.name>
Date: Thu, 6 Apr 2023 16:12:51 +0200
Subject: [PATCH 11/44] nixos/mastodon: add assertion for only allowing one
 sidekiq scheduler queue

---
 nixos/modules/services/web-apps/mastodon.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/nixos/modules/services/web-apps/mastodon.nix b/nixos/modules/services/web-apps/mastodon.nix
index 1b6e1ac583af..73a9a664c090 100644
--- a/nixos/modules/services/web-apps/mastodon.nix
+++ b/nixos/modules/services/web-apps/mastodon.nix
@@ -513,6 +513,13 @@ in {
             <option>services.mastodon.smtp.authenticate</option> is enabled.
         '';
       }
+      {
+        assertion = 1 == builtins.length
+          (lib.mapAttrsToList
+            (_: v: builtins.elem "scheduler" v.jobClasses || v.jobClasses == [ ])
+            cfg.sidekiqProcesses);
+        message = "There must be one and only one Sidekiq queue in services.mastodon.sidekiqProcesses with jobClass \"scheduler\".";
+      }
     ];
 
     environment.systemPackages = [ mastodonTootctl ];

From 464df64c33a52c55c8e9a77e0a493297a1ed787e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 10 Apr 2023 00:05:18 +0000
Subject: [PATCH 12/44] vault: 1.13.0 -> 1.13.1

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

diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix
index 266ed3f5c883..42eca27fb594 100644
--- a/pkgs/tools/security/vault/default.nix
+++ b/pkgs/tools/security/vault/default.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "vault";
-  version = "1.13.0";
+  version = "1.13.1";
 
   src = fetchFromGitHub {
     owner = "hashicorp";
     repo = "vault";
     rev = "v${version}";
-    sha256 = "sha256-F9Ki+3jMkJ+CI2yQmrnqT98xJqSSKQTtYHxQTYdfNbQ=";
+    sha256 = "sha256-bYZghlQi2p3XnKWH3H2sehds/XSMW8pbzBophNMa5q4=";
   };
 
-  vendorHash = "sha256-Ny4TTa67x/mwTclZrtPoWU6nHu5q4KafP1s4rvk21Hs=";
+  vendorHash = "sha256-mNnStWxrSR455zGWkj4dLDFk/kdOXYgk8LKB0wy7K5M=";
 
   subPackages = [ "." ];
 

From 4ee56c1b35ec4b3613c9543e3a62991a7cecbf91 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 10 Apr 2023 03:06:17 +0200
Subject: [PATCH 13/44] python310Packages.pytest-describe: 2.0.1 -> 2.1.0

https://github.com/pytest-dev/pytest-describe/releases/tag/2.0.2
https://github.com/pytest-dev/pytest-describe/releases/tag/2.1.0
---
 pkgs/development/python-modules/pytest-describe/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-describe/default.nix b/pkgs/development/python-modules/pytest-describe/default.nix
index b659445267ca..a7c389202ee9 100644
--- a/pkgs/development/python-modules/pytest-describe/default.nix
+++ b/pkgs/development/python-modules/pytest-describe/default.nix
@@ -6,13 +6,12 @@
 , pytest
 
 # tests
-, py
 , pytestCheckHook
 }:
 
 let
   pname = "pytest-describe";
-  version = "2.0.1";
+  version = "2.1.0";
 in
 buildPythonPackage {
   inherit pname version;
@@ -20,7 +19,7 @@ buildPythonPackage {
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-5cuqMRafAGA0itXKAZECfl8fQfPyf97vIINl4JxV65o=";
+    hash = "sha256-BjDJWsSUKrjc2OdmI2+GQ2tJhIltsMBZ/CNP72b+lzI=";
   };
 
   buildInputs = [
@@ -28,7 +27,6 @@ buildPythonPackage {
   ];
 
   nativeCheckInputs = [
-    py
     pytestCheckHook
   ];
 

From 55d00b7d20f5ad644d6afd7eb8f6359e4ccc5b7b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 10 Apr 2023 03:13:42 +0200
Subject: [PATCH 14/44] python310Packages.espeak-phonemizer: 1.1.0 -> 1.2.0

https://github.com/rhasspy/espeak-phonemizer/releases/tag/v1.2.0
---
 .../python-modules/espeak-phonemizer/cdll.patch           | 8 ++------
 .../python-modules/espeak-phonemizer/default.nix          | 6 ++----
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/espeak-phonemizer/cdll.patch b/pkgs/development/python-modules/espeak-phonemizer/cdll.patch
index 3ce5df122d50..48207c3f95d0 100644
--- a/pkgs/development/python-modules/espeak-phonemizer/cdll.patch
+++ b/pkgs/development/python-modules/espeak-phonemizer/cdll.patch
@@ -1,15 +1,11 @@
 diff --git a/espeak_phonemizer/__init__.py b/espeak_phonemizer/__init__.py
-index a09472e..730a7f9 100644
+index 44cd943..adeaeba 100644
 --- a/espeak_phonemizer/__init__.py
 +++ b/espeak_phonemizer/__init__.py
-@@ -163,14 +163,10 @@ class Phonemizer:
+@@ -150,11 +150,7 @@ class Phonemizer:
              # Already initialized
              return
  
--        self.libc = ctypes.cdll.LoadLibrary("libc.so.6")
-+        self.libc = ctypes.cdll.LoadLibrary("@libc@")
-         self.libc.open_memstream.restype = ctypes.POINTER(ctypes.c_char)
- 
 -        try:
 -            self.lib_espeak = ctypes.cdll.LoadLibrary("libespeak-ng.so")
 -        except OSError:
diff --git a/pkgs/development/python-modules/espeak-phonemizer/default.nix b/pkgs/development/python-modules/espeak-phonemizer/default.nix
index d8c5ba1bb644..2398f421e0da 100644
--- a/pkgs/development/python-modules/espeak-phonemizer/default.nix
+++ b/pkgs/development/python-modules/espeak-phonemizer/default.nix
@@ -2,27 +2,25 @@
 , buildPythonPackage
 , fetchFromGitHub
 , substituteAll
-, glibc
 , espeak-ng
 , pytestCheckHook
 }:
 
 buildPythonPackage rec {
   pname = "espeak-phonemizer";
-  version = "1.1.0";
+  version = "1.2.0";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "rhasspy";
     repo = "espeak-phonemizer";
     rev = "refs/tags/v${version}";
-    hash = "sha256-qnJtS5iIARdg+umolzLHT3/nLon9syjxfTnMWHOmYPU=";
+    hash = "sha256-FiajWpxSDRxTiCj8xGHea4e0voqOvaX6oQYB72FkVbw=";
   };
 
   patches = [
     (substituteAll {
       src = ./cdll.patch;
-      libc = "${lib.getLib glibc}/lib/libc.so.6";
       libespeak_ng = "${lib.getLib espeak-ng}/lib/libespeak-ng.so";
     })
   ];

From 50424d0bd0c53640e971f89b24d407e3f9f91386 Mon Sep 17 00:00:00 2001
From: Morgan Helton <mhelton@gmail.com>
Date: Sun, 2 Apr 2023 19:02:22 -0500
Subject: [PATCH 15/44] sunshine: 0.18.4 -> 0.19.1

---
 pkgs/servers/sunshine/default.nix       | 40 ++++++++++++++---------
 pkgs/servers/sunshine/package-lock.json | 42 ++++++-------------------
 2 files changed, 35 insertions(+), 47 deletions(-)

diff --git a/pkgs/servers/sunshine/default.nix b/pkgs/servers/sunshine/default.nix
index 417cac9510f5..deb9e738b94b 100644
--- a/pkgs/servers/sunshine/default.nix
+++ b/pkgs/servers/sunshine/default.nix
@@ -3,6 +3,7 @@
 , callPackage
 , fetchFromGitHub
 , fetchurl
+, fetchpatch
 , autoPatchelfHook
 , makeWrapper
 , buildNpmPackage
@@ -29,6 +30,7 @@
 , amf-headers
 , svt-av1
 , vulkan-loader
+, libappindicator
 , cudaSupport ? false
 , cudaPackages ? {}
 }:
@@ -42,28 +44,35 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "sunshine";
-  version = "0.18.4";
+  version = "0.19.1";
 
   src = fetchFromGitHub {
     owner = "LizardByte";
     repo = "Sunshine";
     rev = "v${version}";
-    sha256 = "sha256-nPUWBka/fl1oTB0vTv6qyL7EHh7ptFnxwfV/jYtloTc=";
+    sha256 = "sha256-fifwctVrSkAcMK8juAirIbIP64H7GKEwC+sUR/U6Q3Y=";
     fetchSubmodules = true;
   };
 
   # remove pre-built ffmpeg; use ffmpeg from nixpkgs
-  patches = [ ./ffmpeg.diff ];
+  patches = [
+    ./ffmpeg.diff
+    # fix for X11 not being added to libraries unless prebuilt FFmpeg is used: https://github.com/LizardByte/Sunshine/pull/1166
+    (fetchpatch {
+      url = "https://github.com/LizardByte/Sunshine/commit/a067da6cae72cf36f76acc06fcf1e814032af886.patch";
+      sha256 = "sha256-HMxM7luiFBEmFkvQtkdAMMSjAaYPEFX3LL0T/ActUhM=";
+    })
+  ];
 
   # fetch node_modules needed for webui
   ui = buildNpmPackage {
     inherit src version;
     pname = "sunshine-ui";
-    npmDepsHash = "sha256-k8Vfi/57AbGxYFPYSNh8bv4KqHnZjk3BDp8SJQHzuR8=";
+    npmDepsHash = "sha256-sdwvM/Irejo8DgMHJWWCxwOykOK9foqLFFd/tuzrkxI=";
 
     dontNpmBuild = true;
 
-    # use generated package-lock.json upstream does not provide one
+    # use generated package-lock.json as upstream does not provide one
     postPatch = ''
       cp ${./package-lock.json} ./package-lock.json
     '';
@@ -94,6 +103,7 @@ stdenv.mkDerivation rec {
     xorg.libXfixes
     xorg.libXrandr
     xorg.libXtst
+    xorg.libXi
     openssl
     libopus
     boost
@@ -110,6 +120,7 @@ stdenv.mkDerivation rec {
     mesa
     amf-headers
     svt-av1
+    libappindicator
   ] ++ lib.optionals cudaSupport [
     cudaPackages.cudatoolkit
   ];
@@ -121,21 +132,18 @@ stdenv.mkDerivation rec {
     libxcb
   ];
 
-  CXXFLAGS = [
-    "-Wno-format-security"
-  ];
-  CFLAGS = [
-    "-Wno-format-security"
-  ];
-
   cmakeFlags = [
     "-Wno-dev"
   ];
 
   postPatch = ''
-    # fix hardcoded libevdev path
+    # fix hardcoded libevdev and icon path
     substituteInPlace CMakeLists.txt \
-      --replace '/usr/include/libevdev-1.0' '${libevdev}/include/libevdev-1.0'
+      --replace '/usr/include/libevdev-1.0' '${libevdev}/include/libevdev-1.0' \
+      --replace '/usr/share' "$out/share"
+
+    substituteInPlace packaging/linux/sunshine.desktop \
+      --replace '@PROJECT_NAME@' 'Sunshine'
 
     # add FindFFMPEG to source tree
     cp ${findFfmpeg} cmake/FindFFMPEG.cmake
@@ -153,6 +161,10 @@ stdenv.mkDerivation rec {
       --set LD_LIBRARY_PATH ${lib.makeLibraryPath [ vulkan-loader ]}
   '';
 
+  postInstall = ''
+    install -Dm644 ../packaging/linux/${pname}.desktop $out/share/applications/${pname}.desktop
+  '';
+
   passthru.updateScript = ./updater.sh;
 
   meta = with lib; {
diff --git a/pkgs/servers/sunshine/package-lock.json b/pkgs/servers/sunshine/package-lock.json
index 41f61a5f0abd..a4678e38f4cf 100644
--- a/pkgs/servers/sunshine/package-lock.json
+++ b/pkgs/servers/sunshine/package-lock.json
@@ -1,28 +1,28 @@
 {
-  "name": "Sunshine",
-  "lockfileVersion": 2,
+  "name": "sunshine",
+  "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "dependencies": {
-        "@fortawesome/fontawesome-free": "6.2.1",
+        "@fortawesome/fontawesome-free": "6.4.0",
         "bootstrap": "5.2.3",
         "vue": "2.6.12"
       }
     },
     "node_modules/@fortawesome/fontawesome-free": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.2.1.tgz",
-      "integrity": "sha512-viouXhegu/TjkvYQoiRZK3aax69dGXxgEjpvZW81wIJdxm5Fnvp3VVIP4VHKqX4SvFw6qpmkILkD4RJWAdrt7A==",
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.4.0.tgz",
+      "integrity": "sha512-0NyytTlPJwB/BF5LtRV8rrABDbe3TdTXqNB3PdZ+UUUZAEIrdOJdmABqKjt4AXwIoJNaRVVZEXxpNrqvE1GAYQ==",
       "hasInstallScript": true,
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/@popperjs/core": {
-      "version": "2.11.6",
-      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.6.tgz",
-      "integrity": "sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw==",
+      "version": "2.11.7",
+      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.7.tgz",
+      "integrity": "sha512-Cr4OjIkipTtcXKjAsm8agyleBuDHvxzeBoa1v543lbv1YaIwQjESsVcmjiWiPEbC1FIeHOG/Op9kdCmAmiS3Kw==",
       "peer": true,
       "funding": {
         "type": "opencollective",
@@ -52,29 +52,5 @@
       "resolved": "https://registry.npmjs.org/vue/-/vue-2.6.12.tgz",
       "integrity": "sha512-uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg=="
     }
-  },
-  "dependencies": {
-    "@fortawesome/fontawesome-free": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.2.1.tgz",
-      "integrity": "sha512-viouXhegu/TjkvYQoiRZK3aax69dGXxgEjpvZW81wIJdxm5Fnvp3VVIP4VHKqX4SvFw6qpmkILkD4RJWAdrt7A=="
-    },
-    "@popperjs/core": {
-      "version": "2.11.6",
-      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.6.tgz",
-      "integrity": "sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw==",
-      "peer": true
-    },
-    "bootstrap": {
-      "version": "5.2.3",
-      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.2.3.tgz",
-      "integrity": "sha512-cEKPM+fwb3cT8NzQZYEu4HilJ3anCrWqh3CHAok1p9jXqMPsPTBhU25fBckEJHJ/p+tTxTFTsFQGM+gaHpi3QQ==",
-      "requires": {}
-    },
-    "vue": {
-      "version": "2.6.12",
-      "resolved": "https://registry.npmjs.org/vue/-/vue-2.6.12.tgz",
-      "integrity": "sha512-uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg=="
-    }
   }
 }

From 0da597302cd18b88e9f6f8242a2c9dc6fa9891a5 Mon Sep 17 00:00:00 2001
From: Et7f3 <cadeaudeelie@gmail.com>
Date: Mon, 10 Apr 2023 02:02:21 +0200
Subject: [PATCH 16/44] python3Packages.pytorch: repair for darwin

---
 pkgs/development/python-modules/torch/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/python-modules/torch/default.nix b/pkgs/development/python-modules/torch/default.nix
index d9cf4e5760d8..576e6b1bfac9 100644
--- a/pkgs/development/python-modules/torch/default.nix
+++ b/pkgs/development/python-modules/torch/default.nix
@@ -182,6 +182,13 @@ in buildPythonPackage rec {
     substituteInPlace cmake/public/LoadHIP.cmake \
       --replace "set(ROCM_PATH \$ENV{ROCM_PATH})" \
         "set(ROCM_PATH \$ENV{ROCM_PATH})''\nset(ROCM_VERSION ${lib.concatStrings (lib.intersperse "0" (lib.splitString "." hip.version))})"
+  ''
+  # error: no member named 'aligned_alloc' in the global namespace; did you mean simply 'aligned_alloc'
+  # This lib overrided aligned_alloc hence the error message. Tltr: his function is linkable but not in header.
+  + lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.targetPlatform.darwinSdkVersion "11.0") ''
+    substituteInPlace third_party/pocketfft/pocketfft_hdronly.h --replace '#if __cplusplus >= 201703L
+    inline void *aligned_alloc(size_t align, size_t size)' '#if __cplusplus >= 201703L && 0
+    inline void *aligned_alloc(size_t align, size_t size)'
   '';
 
   preConfigure = lib.optionalString cudaSupport ''

From 729be44d98ef1237100300cc9fac0343e40b4195 Mon Sep 17 00:00:00 2001
From: linsui <linsui@inbox.lv>
Date: Mon, 10 Apr 2023 01:21:00 +0800
Subject: [PATCH 17/44] i2p: 2.1.0 -> 2.2.0

---
 pkgs/tools/networking/i2p/default.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/networking/i2p/default.nix b/pkgs/tools/networking/i2p/default.nix
index 6cc64a171d53..e1b73f1b3e69 100644
--- a/pkgs/tools/networking/i2p/default.nix
+++ b/pkgs/tools/networking/i2p/default.nix
@@ -11,13 +11,17 @@
 , java-service-wrapper
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "i2p";
-  version = "2.1.0";
+  version = "2.2.0";
 
   src = fetchurl {
-    url = "https://files.i2p-projekt.de/${version}/i2psource_${version}.tar.bz2";
-    sha256 = "sha256-gwmMEncgTFVpKEsys37xN2VrJ7/hXvkD7KLafCaSiNE=";
+    urls = map (mirror: "${mirror}/${finalAttrs.version}/i2psource_${finalAttrs.version}.tar.bz2") [
+      "https://download.i2p2.de/releases"
+      "https://files.i2p-projekt.de"
+      "https://download.i2p2.no/releases"
+    ];
+    sha256 = "sha256-5LoGpuKTWheZDwV6crjXnkUqJVamzv5QEtXdY0Zv7r8=";
   };
 
   buildInputs = [ jdk ant gettext which ];
@@ -64,4 +68,4 @@ stdenv.mkDerivation rec {
     platforms = [ "x86_64-linux" "i686-linux" ];
     maintainers = with maintainers; [ joelmo ];
   };
-}
+})

From 3db5dabdfd935fe044bcd21806579b90168f2ba2 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Wed, 12 Apr 2023 10:20:42 +0300
Subject: [PATCH 18/44] python310Packages.pyngrok: 5.2.1 -> 5.2.2

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

diff --git a/pkgs/development/python-modules/pyngrok/default.nix b/pkgs/development/python-modules/pyngrok/default.nix
index db4ec105d87c..4e99c7e62ff8 100644
--- a/pkgs/development/python-modules/pyngrok/default.nix
+++ b/pkgs/development/python-modules/pyngrok/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "pyngrok";
-  version = "5.2.1";
+  version = "5.2.2";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-dws4Z4LzgkkOGTS5LZn/MU8ZKr70n4PWocezsDhxeT4=";
+    hash = "sha256-MfpuafEUhFNtEegvihCLmsnHYFBu8kKghfPRp3oqlb8=";
   };
 
   propagatedBuildInputs = [

From e719b537730e47b8203aa8637c6336e814c66da7 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 12 Apr 2023 09:32:26 +0200
Subject: [PATCH 19/44] feroxbuster: 2.9.2 -> 2.9.3

Diff: https://github.com/epi052/feroxbuster/compare/refs/tags/v2.9.2...v2.9.3

Changelog: https://github.com/epi052/feroxbuster/releases/tag/v2.9.3
---
 pkgs/tools/security/feroxbuster/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/feroxbuster/default.nix b/pkgs/tools/security/feroxbuster/default.nix
index bc927a522aa7..8667064e153d 100644
--- a/pkgs/tools/security/feroxbuster/default.nix
+++ b/pkgs/tools/security/feroxbuster/default.nix
@@ -9,13 +9,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "feroxbuster";
-  version = "2.9.2";
+  version = "2.9.3";
 
   src = fetchFromGitHub {
     owner = "epi052";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-HSZqqZngXs5ACsk9xzaqBWK5mUxPyGx3qJOtTURXPgg=";
+    hash = "sha256-Z97CAfGnNTQmJd2zMlvGfk5jW9zHAB/efqYoYgVRfMc=";
   };
 
   # disable linker overrides on aarch64-linux
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
     rm .cargo/config
   '';
 
-  cargoHash = "sha256-pisMqSgW6uPlBXgTUqJBJya84dRmbOJbEYYezuut6Wo=";
+  cargoHash = "sha256-siLyPPSTBaZ4vpfzeKVlrqIdFMI5z3hRA8c2lRsBAGM=";
 
   OPENSSL_NO_VENDOR = true;
 

From e7c857571ab5b3450d8a0f7b52320f2c4a5f8374 Mon Sep 17 00:00:00 2001
From: Bruno Bzeznik <Bruno.Bzeznik@imag.fr>
Date: Wed, 12 Apr 2023 11:58:49 +0200
Subject: [PATCH 20/44] htslib: 1.16 -> 1.17

Changelog: https://github.com/samtools/htslib/releases/tag/1.17
---
 pkgs/development/libraries/science/biology/htslib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/science/biology/htslib/default.nix b/pkgs/development/libraries/science/biology/htslib/default.nix
index 219c06ce57ad..a3b35d55c9e8 100644
--- a/pkgs/development/libraries/science/biology/htslib/default.nix
+++ b/pkgs/development/libraries/science/biology/htslib/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "htslib";
-  version = "1.16";
+  version = "1.17";
 
   src = fetchurl {
     url = "https://github.com/samtools/htslib/releases/download/${version}/${pname}-${version}.tar.bz2";
-    sha256 = "sha256-YGt8ev9zc0zwM+zRVvQFKfpXkvVFJJUqKJOMoIkNeSQ=";
+    sha256 = "sha256-djd5KIxA8HZG7HrZi5bDeMc5Fx0WKtmDmIaHg7chg58";
   };
 
   # perl is only used during the check phase.

From d69d242b7bcaa8bbadc87a68be84eb5719e35585 Mon Sep 17 00:00:00 2001
From: Bruno Bzeznik <Bruno.Bzeznik@imag.fr>
Date: Wed, 12 Apr 2023 12:00:25 +0200
Subject: [PATCH 21/44] Samtools: 1.13 -> 1.17

Changelogs:
 - https://github.com/samtools/samtools/releases/tag/1.14
 - https://github.com/samtools/samtools/releases/tag/1.15
 - https://github.com/samtools/samtools/releases/tag/1.15.1
 - https://github.com/samtools/samtools/releases/tag/1.16
 - https://github.com/samtools/samtools/releases/tag/1.16.1
 - https://github.com/samtools/samtools/releases/tag/1.17
---
 .../science/biology/samtools/default.nix            | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/science/biology/samtools/default.nix b/pkgs/applications/science/biology/samtools/default.nix
index c72dd1b19077..5e18d5ead58a 100644
--- a/pkgs/applications/science/biology/samtools/default.nix
+++ b/pkgs/applications/science/biology/samtools/default.nix
@@ -2,22 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "samtools";
-  version = "1.13";
+  version = "1.17";
 
   src = fetchurl {
     url = "https://github.com/samtools/samtools/releases/download/${version}/${pname}-${version}.tar.bz2";
-    sha256 = "sha256-YWyi4FHMgAmh6cAc/Yx8r4twkW3f9m87dpFAeUZfjGA=";
+    sha256 = "sha256-Ot85C2KCGf1kCPFGAqTEqpDmPhizldrXIqtRlDiipyk";
   };
 
-  patches = [
-    # Pull upstream patch for ncurses-6.3 support
-    (fetchpatch {
-      name = "ncurses-6.3.patch";
-      url = "https://github.com/samtools/samtools/commit/396ef20eb0854d6b223c3223b60bb7efe42301f7.patch";
-      sha256 = "sha256-p0l9ymXK9nqL2w8EytbW+qeaI7dD86IQgIVxacBj838=";
-    })
-  ];
-
   # tests require `bgzip` from the htslib package
   nativeCheckInputs = [ htslib ];
 

From bcdc29d7ae75d9850c1b3c3be7e286903ea68afb Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Wed, 12 Apr 2023 23:55:10 +1200
Subject: [PATCH 22/44] emacs.pkgs.ement: remove manually packaged ement.el

It's better that we use the one from elpa that is auto-generated.
---
 .../emacs/elisp-packages/manual-packages.nix  |  2 -
 .../manual-packages/ement/default.nix         | 43 -------------------
 .../ement/handle-nil-images.patch             | 28 ------------
 3 files changed, 73 deletions(-)
 delete mode 100644 pkgs/applications/editors/emacs/elisp-packages/manual-packages/ement/default.nix
 delete mode 100644 pkgs/applications/editors/emacs/elisp-packages/manual-packages/ement/handle-nil-images.patch

diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
index b58465e20ec3..4a718dd96d85 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
@@ -25,8 +25,6 @@ in
 
   emacspeak = callPackage ./manual-packages/emacspeak { };
 
-  ement = callPackage ./manual-packages/ement { };
-
   ess-R-object-popup = callPackage ./manual-packages/ess-R-object-popup { };
 
   evil-markdown = callPackage ./manual-packages/evil-markdown { };
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ement/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ement/default.nix
deleted file mode 100644
index c43d0d776544..000000000000
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ement/default.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{ trivialBuild
-, lib
-, fetchFromGitHub
-, plz
-, cl-lib
-, ts
-, magit-section
-, taxy-magit-section
-, taxy
-, svg-lib
-}:
-
-trivialBuild {
-  pname = "ement";
-  version = "unstable-2022-09-01";
-
-  src = fetchFromGitHub {
-    owner = "alphapapa";
-    repo = "ement.el";
-    rev = "4ec2107e6a90ed962ddd3875d47caa523eb466b9";
-    sha256 = "sha256-zKkBpaOj3qb/Oy89rt7BxmWZDZzDzMIJjjOm+1rrnnc=";
-  };
-
-  packageRequires = [
-    plz
-    cl-lib
-    ts
-    magit-section
-    taxy-magit-section
-    taxy
-    svg-lib
-  ];
-
-  patches = [
-    ./handle-nil-images.patch
-  ];
-
-  meta = {
-    description = "Ement.el is a Matrix client for Emacs";
-    license = lib.licenses.gpl3Only;
-    platforms = lib.platforms.all;
-  };
-}
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ement/handle-nil-images.patch b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ement/handle-nil-images.patch
deleted file mode 100644
index 271e1cd2dbac..000000000000
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ement/handle-nil-images.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/ement-lib.el b/ement-lib.el
-index f0b2738..025a191 100644
---- a/ement-lib.el
-+++ b/ement-lib.el
-@@ -644,14 +644,15 @@ can cause undesirable underlining."
-   "Return a copy of IMAGE set to MAX-WIDTH and MAX-HEIGHT.
- IMAGE should be one as created by, e.g. `create-image'."
-   ;; It would be nice if the image library had some simple functions to do this sort of thing.
--  (let ((new-image (cl-copy-list image)))
--    (when (fboundp 'imagemagick-types)
--      ;; Only do this when ImageMagick is supported.
--      ;; FIXME: When requiring Emacs 27+, remove this (I guess?).
--      (setf (image-property new-image :type) 'imagemagick))
--    (setf (image-property new-image :max-width) max-width
--          (image-property new-image :max-height) max-height)
--    new-image))
-+  (when image
-+    (let ((new-image (cl-copy-list image)))
-+      (when (fboundp 'imagemagick-types)
-+        ;; Only do this when ImageMagick is supported.
-+        ;; FIXME: When requiring Emacs 27+, remove this (I guess?).
-+        (setf (image-property new-image :type) 'imagemagick))
-+      (setf (image-property new-image :max-width) max-width
-+            (image-property new-image :max-height) max-height)
-+      new-image)))
- 
- (defun ement--room-alias (room)
-   "Return latest m.room.canonical_alias event in ROOM."

From f9a12cd4dc4b279ffd624bfeff866c14849318e4 Mon Sep 17 00:00:00 2001
From: Max Hausch <max.hausch@helsinki-systems.de>
Date: Wed, 12 Apr 2023 14:07:46 +0200
Subject: [PATCH 23/44] anydesk: 6.2.0 -> 6.2.1

---
 pkgs/applications/networking/remote/anydesk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix
index 7d7009e02431..53457db2935f 100644
--- a/pkgs/applications/networking/remote/anydesk/default.nix
+++ b/pkgs/applications/networking/remote/anydesk/default.nix
@@ -18,14 +18,14 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "anydesk";
-  version = "6.2.0";
+  version = "6.2.1";
 
   src = fetchurl {
     urls = [
       "https://download.anydesk.com/linux/${pname}-${version}-amd64.tar.gz"
       "https://download.anydesk.com/linux/generic-linux/${pname}-${version}-amd64.tar.gz"
     ];
-    sha256 = "k85nQH2FWyEXDgB+Pd4yStfNCjkiIGE2vA/YTXLaK4o=";
+    hash = "sha256-lqfe0hROza/zgcNOSe7jJ1yqqsAIR+kav153g3BsmJw=";
   };
 
   passthru = {

From 262b22f0e23481b4f582d9cd69771c855df8e5a4 Mon Sep 17 00:00:00 2001
From: Max Hausch <max.hausch@helsinki-systems.de>
Date: Wed, 12 Apr 2023 14:08:12 +0200
Subject: [PATCH 24/44] anydesk: Fix url handler

---
 pkgs/applications/networking/remote/anydesk/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix
index 53457db2935f..8b6a694467f2 100644
--- a/pkgs/applications/networking/remote/anydesk/default.nix
+++ b/pkgs/applications/networking/remote/anydesk/default.nix
@@ -8,7 +8,7 @@ let
 
   desktopItem = makeDesktopItem {
     name = "AnyDesk";
-    exec = "@out@/bin/anydesk";
+    exec = "@out@/bin/anydesk %u";
     icon = "anydesk";
     desktopName = "AnyDesk";
     genericName = description;

From d57c60607ce687d392815e8b2f1c6213b42640f8 Mon Sep 17 00:00:00 2001
From: Max Hausch <max.hausch@helsinki-systems.de>
Date: Wed, 12 Apr 2023 14:10:40 +0200
Subject: [PATCH 25/44] anydesk: Add cherrimoya as maintainer

---
 pkgs/applications/networking/remote/anydesk/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix
index 8b6a694467f2..f9668a9eeaef 100644
--- a/pkgs/applications/networking/remote/anydesk/default.nix
+++ b/pkgs/applications/networking/remote/anydesk/default.nix
@@ -86,6 +86,6 @@ in stdenv.mkDerivation rec {
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
     license = licenses.unfree;
     platforms = [ "x86_64-linux" ];
-    maintainers = with maintainers; [ shyim ];
+    maintainers = with maintainers; [ shyim cheriimoya ];
   };
 }

From 8ca6b762bf60b0319a0c731f63297f5f9de02b37 Mon Sep 17 00:00:00 2001
From: Ag <aravindmallapureddy@juspay.in>
Date: Wed, 12 Apr 2023 20:04:11 +0530
Subject: [PATCH 26/44] luabind: Fix build on darwin.

---
 .../luabind/0.9.1_boost_1.57_fix.patch        | 23 --------
 .../luabind/0.9.1_discover_luajit.patch       | 22 -------
 .../luabind/0.9.1_modern_boost_fix.patch      | 59 -------------------
 .../development/libraries/luabind/default.nix | 18 +++---
 4 files changed, 7 insertions(+), 115 deletions(-)
 delete mode 100644 pkgs/development/libraries/luabind/0.9.1_boost_1.57_fix.patch
 delete mode 100644 pkgs/development/libraries/luabind/0.9.1_discover_luajit.patch
 delete mode 100644 pkgs/development/libraries/luabind/0.9.1_modern_boost_fix.patch

diff --git a/pkgs/development/libraries/luabind/0.9.1_boost_1.57_fix.patch b/pkgs/development/libraries/luabind/0.9.1_boost_1.57_fix.patch
deleted file mode 100644
index 7ac495777b54..000000000000
--- a/pkgs/development/libraries/luabind/0.9.1_boost_1.57_fix.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/luabind/object.hpp b/luabind/object.hpp
-index f7b7ca5..1c18e04 100644
---- a/luabind/object.hpp
-+++ b/luabind/object.hpp
-@@ -536,6 +536,8 @@ namespace detail
-       handle m_key;
-   };
- 
-+#if BOOST_VERSION < 105700
-+
- // Needed because of some strange ADL issues.
- 
- #define LUABIND_OPERATOR_ADL_WKND(op) \
-@@ -557,7 +559,8 @@ namespace detail
-   LUABIND_OPERATOR_ADL_WKND(!=)
- 
- #undef LUABIND_OPERATOR_ADL_WKND
-- 
-+
-+#endif // BOOST_VERSION < 105700 
- } // namespace detail
- 
- namespace adl
diff --git a/pkgs/development/libraries/luabind/0.9.1_discover_luajit.patch b/pkgs/development/libraries/luabind/0.9.1_discover_luajit.patch
deleted file mode 100644
index 6e5fe6aa6f82..000000000000
--- a/pkgs/development/libraries/luabind/0.9.1_discover_luajit.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/Jamroot b/Jamroot
-index 94494bf..83dfcbb 100755
---- a/Jamroot
-+++ b/Jamroot
-@@ -64,7 +64,7 @@ else if [ os.name ] in LINUX MACOSX FREEBSD
-         $(LUA_PATH) $(HOME)/Library/Frameworks /Library/Frameworks /usr /usr/local /opt/local /opt ;
- 
-     local possible-suffixes =
--        include/lua5.1 include/lua51 include/lua include ;
-+        include/lua5.1 include/lua51 include/lua include include/luajit-2.0 ;
- 
-     local includes = [ GLOB $(possible-prefixes)/$(possible-suffixes) : lua.h ] ;
- 
-@@ -83,7 +83,7 @@ else if [ os.name ] in LINUX MACOSX FREEBSD
- 
-     local lib = $(prefix)/lib ;
- 
--    local names = liblua5.1 liblua51 liblua ;
-+    local names = liblua5.1 liblua51 liblua libluajit-5.1 ;
-     local extensions = .a .so ;
- 
-     library = [ GLOB $(lib)/lua51 $(lib)/lua5.1 $(lib)/lua $(lib) :
diff --git a/pkgs/development/libraries/luabind/0.9.1_modern_boost_fix.patch b/pkgs/development/libraries/luabind/0.9.1_modern_boost_fix.patch
deleted file mode 100644
index 92e32828a03c..000000000000
--- a/pkgs/development/libraries/luabind/0.9.1_modern_boost_fix.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff --git luabind-0.9.1/luabind/detail/call_function.hpp luabind-0.9.1-fixed/luabind/detail/call_function.hpp
-index 1b45ec1..8f5afff 100644
---- luabind-0.9.1/luabind/detail/call_function.hpp
-+++ luabind-0.9.1-fixed/luabind/detail/call_function.hpp
-@@ -323,7 +323,8 @@ namespace luabind
- 
- #endif // LUABIND_CALL_FUNCTION_HPP_INCLUDED
- 
--#elif BOOST_PP_ITERATION_FLAGS() == 1
-+#else
-+#if BOOST_PP_ITERATION_FLAGS() == 1
- 
- #define LUABIND_TUPLE_PARAMS(z, n, data) const A##n *
- #define LUABIND_OPERATOR_PARAMS(z, n, data) const A##n & a##n
-@@ -440,4 +441,5 @@ namespace luabind
- 
- 
- #endif
-+#endif
- 
-diff --git luabind-0.9.1/luabind/detail/call_member.hpp luabind-0.9.1-fixed/luabind/detail/call_member.hpp
-index de8d563..e63555b 100644
---- luabind-0.9.1/luabind/detail/call_member.hpp
-+++ luabind-0.9.1-fixed/luabind/detail/call_member.hpp
-@@ -316,7 +316,8 @@ namespace luabind
- 
- #endif // LUABIND_CALL_MEMBER_HPP_INCLUDED
- 
--#elif BOOST_PP_ITERATION_FLAGS() == 1
-+#else
-+#if BOOST_PP_ITERATION_FLAGS() == 1
- 
- #define LUABIND_TUPLE_PARAMS(z, n, data) const A##n *
- #define LUABIND_OPERATOR_PARAMS(z, n, data) const A##n & a##n
-@@ -360,4 +361,5 @@ namespace luabind
- #undef LUABIND_TUPLE_PARAMS
- 
- #endif
-+#endif
- 
-diff --git luabind-0.9.1/luabind/wrapper_base.hpp luabind-0.9.1-fixed/luabind/wrapper_base.hpp
-index d54c668..0f88cc5 100755
---- luabind-0.9.1/luabind/wrapper_base.hpp
-+++ luabind-0.9.1-fixed/luabind/wrapper_base.hpp
-@@ -89,7 +89,8 @@ namespace luabind
- 
- #endif // LUABIND_WRAPPER_BASE_HPP_INCLUDED
- 
--#elif BOOST_PP_ITERATION_FLAGS() == 1
-+#else
-+#if BOOST_PP_ITERATION_FLAGS() == 1
- 
- #define LUABIND_TUPLE_PARAMS(z, n, data) const A##n *
- #define LUABIND_OPERATOR_PARAMS(z, n, data) const A##n & a##n
-@@ -188,3 +189,4 @@ namespace luabind
- #undef N
- 
- #endif
-+#endif
diff --git a/pkgs/development/libraries/luabind/default.nix b/pkgs/development/libraries/luabind/default.nix
index b36e6f34c826..069e13ddde11 100644
--- a/pkgs/development/libraries/luabind/default.nix
+++ b/pkgs/development/libraries/luabind/default.nix
@@ -1,26 +1,22 @@
-{ lib, stdenv, fetchFromGitHub, boost-build, lua, boost }:
+{ lib, stdenv, fetchFromGitHub, lua, boost, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "luabind";
   version = "0.9.1";
 
   src = fetchFromGitHub {
-    owner = "luabind";
+    owner = "Oberon00";
     repo = "luabind";
-    rev = "v${version}";
-    sha256 = "sha256-sK1ca2Oj9yXdmxyXeDO3k8YZ1g+HxIXLhvdTWdPDdag=";
+    rev = "49814f6b47ed99e273edc5198a6ebd7fa19e813a";
+    sha256 = "sha256-JcOsoQHRvdzF2rsZBW6egOwIy7+7C4wy0LiYmbV590Q";
   };
 
-  patches = [ ./0.9.1_modern_boost_fix.patch ./0.9.1_boost_1.57_fix.patch ./0.9.1_discover_luajit.patch ];
+  nativeBuildInputs = [ cmake ];
 
-  buildInputs = [ boost-build lua boost ];
+  buildInputs = [ boost ];
 
   propagatedBuildInputs = [ lua ];
 
-  buildPhase = "LUA_PATH=${lua} bjam release";
-
-  installPhase = "LUA_PATH=${lua} bjam --prefix=$out release install";
-
   passthru = {
     inherit lua;
   };
@@ -29,6 +25,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/luabind/luabind";
     description = "A library that helps you create bindings between C++ and Lua";
     license = lib.licenses.mit;
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.unix;
   };
 }

From 62618152d22963c5b6ad3439b70049c4b01e1b98 Mon Sep 17 00:00:00 2001
From: Ag <aravindmallapureddy@juspay.in>
Date: Wed, 12 Apr 2023 20:05:05 +0530
Subject: [PATCH 27/44] osrm-backend: Fix build on darwin.

---
 pkgs/servers/osrm-backend/darwin.patch | 30 ++++++++++++++++++++++++++
 pkgs/servers/osrm-backend/default.nix  |  4 +++-
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/servers/osrm-backend/darwin.patch

diff --git a/pkgs/servers/osrm-backend/darwin.patch b/pkgs/servers/osrm-backend/darwin.patch
new file mode 100644
index 000000000000..0aa57e4e1b81
--- /dev/null
+++ b/pkgs/servers/osrm-backend/darwin.patch
@@ -0,0 +1,30 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e49fac2..25e3302 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -34,6 +34,14 @@ option(ENABLE_GLIBC_WORKAROUND "Workaround GLIBC symbol exports" OFF)
+ 
+ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+ 
++IF(APPLE)
++    set(CMAKE_THREAD_LIBS_INIT "-lpthread")
++    set(CMAKE_HAVE_THREADS_LIBRARY 1)
++    set(CMAKE_USE_WIN32_THREADS_INIT 0)
++    set(CMAKE_USE_PTHREADS_INIT 1)
++    set(THREADS_PREFER_PTHREAD_FLAG ON)
++ENDIF()
++
+ if(ENABLE_MASON)
+   # versions in use
+   set(MASON_BOOST_VERSION "1.65.1")
+@@ -405,7 +413,8 @@ endif()
+ if(APPLE)
+   set(CMAKE_OSX_DEPLOYMENT_TARGET "10.10")
+   execute_process(COMMAND xcrun --sdk macosx --show-sdk-path OUTPUT_VARIABLE CMAKE_OSX_SYSROOT OUTPUT_STRIP_TRAILING_WHITESPACE)
++  execute_process(COMMAND uname -m OUTPUT_VARIABLE JAMBA_OSX_NATIVE_ARCHITECTURE OUTPUT_STRIP_TRAILING_WHITESPACE)
+-  set(CMAKE_OSX_ARCHITECTURES "x86_64")
++  set(CMAKE_OSX_ARCHITECTURES "${JAMBA_OSX_NATIVE_ARCHITECTURE}")
++  message(STATUS "Set Architecture to ${JAMBA_OSX_NATIVE_ARCHITECTURE} on OS X")
+-  message(STATUS "Set Architecture to x64 on OS X")
+   exec_program(uname ARGS -v  OUTPUT_VARIABLE DARWIN_VERSION)
+   string(REGEX MATCH "[0-9]+" DARWIN_VERSION ${DARWIN_VERSION})
diff --git a/pkgs/servers/osrm-backend/default.nix b/pkgs/servers/osrm-backend/default.nix
index 452163ee82cf..b76db692a783 100644
--- a/pkgs/servers/osrm-backend/default.nix
+++ b/pkgs/servers/osrm-backend/default.nix
@@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ bzip2 libxml2 libzip boost lua luabind tbb expat ];
 
+  patches = [ ./darwin.patch ];
+
   env.NIX_CFLAGS_COMPILE = toString [
     # Needed with GCC 12
     "-Wno-error=stringop-overflow"
@@ -28,6 +30,6 @@ stdenv.mkDerivation rec {
     description = "Open Source Routing Machine computes shortest paths in a graph. It was designed to run well with map data from the Openstreetmap Project";
     license = lib.licenses.bsd2;
     maintainers = with lib.maintainers;[ erictapen ];
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.unix;
   };
 }

From 89fe8a638c2a282d67cbe8839425679f76d7b3a3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 12 Apr 2023 17:28:52 +0200
Subject: [PATCH 28/44] matrix-appservice-irc: 0.37.1 -> 0.38.0

https://github.com/matrix-org/matrix-appservice-irc/releases/tag/0.38.0
---
 .../matrix-synapse/matrix-appservice-irc/default.nix        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix b/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix
index 8c6e8a1025ce..69696cbf9195 100644
--- a/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix
+++ b/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix
@@ -9,16 +9,16 @@
 
 buildNpmPackage rec {
   pname = "matrix-appservice-irc";
-  version = "0.37.1";
+  version = "0.38.0";
 
   src = fetchFromGitHub {
     owner = "matrix-org";
     repo = "matrix-appservice-irc";
     rev = "refs/tags/${version}";
-    hash = "sha256-d/CA27A0txnVnSCJeS/qeK90gOu1QjQaFBk+gblEdH8=";
+    hash = "sha256-rV4B9OQl1Ht26X4e7sqCe1PR5RpzIcjj4OvWG6udJWo=";
   };
 
-  npmDepsHash = "sha256-s/b/G49HlDbYsSmwRYrm4Bcv/81tHLC8Ac1IMEwGFW8=";
+  npmDepsHash = "sha256-iZuPr3a1BPtRfkEoxOs4oRL/nCfy3PLx5T9dX49/B0s=";
 
   nativeBuildInputs = [
     python3

From 2a2dfe539aa719cfd488710952dc3fed437c9db6 Mon Sep 17 00:00:00 2001
From: Lily Foster <lily@lily.flowers>
Date: Wed, 12 Apr 2023 11:42:03 -0400
Subject: [PATCH 29/44] =?UTF-8?q?teams-for-linux:=201.0.53=20=E2=86=92=201?=
 =?UTF-8?q?.0.59?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix
index 16887e900c0f..2ea2de235bb2 100644
--- a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix
+++ b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "teams-for-linux";
-  version = "1.0.53";
+  version = "1.0.59";
 
   src = fetchFromGitHub {
     owner = "IsmaelMartinez";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-zigcOshtRQuQxJBXPWVmTjj5+4AorR5WW8lHVInUKFg=";
+    sha256 = "sha256-82uRZEktKHMQhozG5Zpa2DFu1VZOEDBWpsbfgMzoXY8=";
   };
 
   offlineCache = fetchYarnDeps {

From a76b55eab5afa68d51fb455896f69cc3daee262f Mon Sep 17 00:00:00 2001
From: Dennis <52411861+DerDennisOP@users.noreply.github.com>
Date: Wed, 12 Apr 2023 18:46:45 +0200
Subject: [PATCH 30/44] python3.pkgs.django-allauth: 0.51.0 -> 0.54.0 (#225769)

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
 pkgs/development/python-modules/django-allauth/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/django-allauth/default.nix b/pkgs/development/python-modules/django-allauth/default.nix
index 0cc201169d80..439c4c2cb564 100644
--- a/pkgs/development/python-modules/django-allauth/default.nix
+++ b/pkgs/development/python-modules/django-allauth/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "django-allauth";
-  version = "0.51.0";
+  version = "0.54.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "pennersr";
     repo = pname;
     rev = version;
-    hash = "sha256-o8EoayMMwxoJTrUA3Jo1Dfu1XFgC+Mcpa8yMwXlKAKY=";
+    hash = "sha256-0yJsHJhYeiCHQg/QzFD/metb97rcUJ+LYlsl7fGYmuM=";
   };
 
   postPatch = ''
@@ -52,6 +52,6 @@ buildPythonPackage rec {
     description = "Integrated set of Django applications addressing authentication, registration, account management as well as 3rd party (social) account authentication";
     homepage = "https://www.intenct.nl/projects/django-allauth";
     license = licenses.mit;
-    maintainers = with maintainers; [ SuperSandro2000 ];
+    maintainers = with maintainers; [ derdennisop ];
   };
 }

From 116a0fb6c158c8b74306a11810bb2cc6b81dab7c Mon Sep 17 00:00:00 2001
From: traxys <quentin+dev@familleboyer.net>
Date: Wed, 12 Apr 2023 18:50:55 +0200
Subject: [PATCH 31/44] sca2d: init at 0.2.0 (#223097)

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
 pkgs/development/tools/sca2d/default.nix | 48 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 +
 2 files changed, 50 insertions(+)
 create mode 100644 pkgs/development/tools/sca2d/default.nix

diff --git a/pkgs/development/tools/sca2d/default.nix b/pkgs/development/tools/sca2d/default.nix
new file mode 100644
index 000000000000..eb28e7acb026
--- /dev/null
+++ b/pkgs/development/tools/sca2d/default.nix
@@ -0,0 +1,48 @@
+{ lib
+, python3
+, fetchFromGitLab
+, fetchFromGitHub
+}:
+let
+  python = python3.override {
+    packageOverrides = self: super: {
+      lark010 = super.lark.overridePythonAttrs (old: rec {
+        version = "0.10.0";
+
+        src = fetchFromGitHub {
+          owner = "lark-parser";
+          repo = "lark";
+          rev = "refs/tags/${version}";
+          sha256 = "sha256-ctdPPKPSD4weidyhyj7RCV89baIhmuxucF3/Ojx1Efo=";
+        };
+
+        disabledTestPaths = [ "tests/test_nearley/test_nearley.py" ];
+      });
+    };
+    self = python;
+  };
+in
+python.pkgs.buildPythonApplication rec {
+  pname = "sca2d";
+  version = "0.2.0";
+  format = "setuptools";
+
+  src = fetchFromGitLab {
+    owner = "bath_open_instrumentation_group";
+    repo = "sca2d";
+    rev = "v${version}";
+    hash = "sha256-P+7g57AH8H7q0hBE2I9w8A+bN5M6MPbc9gA0b889aoQ=";
+  };
+
+  propagatedBuildInputs = with python.pkgs; [ lark010 colorama ];
+
+  pythonImportsCheck = [ "sca2d" ];
+
+  meta = with lib; {
+    description = "An experimental static code analyser for OpenSCAD";
+    homepage = "https://gitlab.com/bath_open_instrumentation_group/sca2d";
+    changelog = "https://gitlab.com/bath_open_instrumentation_group/sca2d/-/blob/${src.rev}/CHANGELOG.md";
+    license = licenses.gpl3Only;
+    maintainers = with maintainers; [ traxys ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2ac264a61347..34235dea7ae3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18811,6 +18811,8 @@ with pkgs;
 
   semantik = libsForQt5.callPackage ../applications/office/semantik { };
 
+  sca2d = callPackage ../development/tools/sca2d {  };
+
   sconsPackages = dontRecurseIntoAttrs (callPackage ../development/tools/build-managers/scons { });
   scons = sconsPackages.scons_latest;
 

From 0ee82f8ab448cb53e5cfbb43c9ea9262ca4506a9 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 12 Apr 2023 12:36:36 +0000
Subject: [PATCH 32/44] linux_testing: 6.3-rc5 -> 6.3-rc6

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

diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index 7cb8108c4517..71a5d8135121 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -3,7 +3,7 @@
 with lib;
 
 buildLinux (args // rec {
-  version = "6.3-rc5";
+  version = "6.3-rc6";
   extraMeta.branch = lib.versions.majorMinor version;
 
   # modDirVersion needs to be x.y.z, will always add .0
@@ -11,7 +11,7 @@ buildLinux (args // rec {
 
   src = fetchzip {
     url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
-    hash = "sha256-HKKDSOK45jT5vUaE3xd7nlxRgy1fw9xXBhqrICy/12Y=";
+    hash = "sha256-AXgHjWuGt2XQHVS7d/o9IbohfxHp9grtuYp5+EumlH4=";
   };
 
   # Should the testing kernels ever be built on Hydra?

From 02c564de3c8efde82f0d2317ba499ae156e82783 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Wed, 12 Apr 2023 20:03:30 +0300
Subject: [PATCH 33/44] qt5.qtwebengine: fix build on aarch64-darwin

---
 pkgs/development/libraries/qt-5/5.15/default.nix        | 2 +-
 pkgs/development/libraries/qt-5/modules/qtwebengine.nix | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix
index 46a60f5403f4..3b2979d3abce 100644
--- a/pkgs/development/libraries/qt-5/5.15/default.nix
+++ b/pkgs/development/libraries/qt-5/5.15/default.nix
@@ -185,7 +185,7 @@ let
         inherit (darwin.apple_sdk_11_0.libs) sandbox;
         inherit (darwin.apple_sdk_11_0.frameworks) ApplicationServices AVFoundation Foundation ForceFeedback GameController AppKit
           ImageCaptureCore CoreBluetooth IOBluetooth CoreWLAN Quartz Cocoa LocalAuthentication
-          MediaPlayer MediaAccessibility SecurityInterface Vision CoreML;
+          MediaPlayer MediaAccessibility SecurityInterface Vision CoreML OpenDirectory Accelerate;
         libobjc = darwin.apple_sdk_11_0.objc4;
       };
       qtwebglplugin = callPackage ../modules/qtwebglplugin.nix {};
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
index 60899e50535f..d8d394444028 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
@@ -17,7 +17,7 @@
 , cctools, libobjc, libpm, libunwind, sandbox, xnu
 , ApplicationServices, AVFoundation, Foundation, ForceFeedback, GameController, AppKit
 , ImageCaptureCore, CoreBluetooth, IOBluetooth, CoreWLAN, Quartz, Cocoa, LocalAuthentication
-, MediaPlayer, MediaAccessibility, SecurityInterface, Vision, CoreML
+, MediaPlayer, MediaAccessibility, SecurityInterface, Vision, CoreML, OpenDirectory, Accelerate
 , cups, openbsm, runCommand, xcbuild, writeScriptBin
 , ffmpeg_4 ? null
 , lib, stdenv, fetchpatch
@@ -186,6 +186,8 @@ qtModule {
     SecurityInterface
     Vision
     CoreML
+    OpenDirectory
+    Accelerate
 
     openbsm
     libunwind

From 1501d6e0b9ba463ddad5569705d1ee50f83ca4af Mon Sep 17 00:00:00 2001
From: Richard Davis <davisrichard437@gmail.com>
Date: Tue, 24 Jan 2023 20:04:11 -0500
Subject: [PATCH 34/44] maintainers: add davisrichard437

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 05bb67937347..9f26de9db4b9 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3533,6 +3533,12 @@
       fingerprint = "5B08 313C 6853 E5BF FA91  A817 0176 0B4F 9F53 F154";
     }];
   };
+  davisrichard437 = {
+    email = "davisrichard437@gmail.com";
+    github = "davisrichard437";
+    githubId = 85075437;
+    name = "Richard Davis";
+  };
   davorb = {
     email = "davor@davor.se";
     github = "davorb";

From 5128a000ada7cf9425d8e62676796d9accc4ce76 Mon Sep 17 00:00:00 2001
From: Richard Davis <davisrichard437@gmail.com>
Date: Tue, 24 Jan 2023 20:30:46 -0500
Subject: [PATCH 35/44] gscreenshot: init at 3.4.0

https://github.com/thenaterhood/gscreenshot/releases/tag/v3.4.0
---
 ...-Changing-paths-to-be-nix-compatible.patch | 25 ++++++
 .../graphics/gscreenshot/default.nix          | 90 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 117 insertions(+)
 create mode 100644 pkgs/applications/graphics/gscreenshot/0001-Changing-paths-to-be-nix-compatible.patch
 create mode 100644 pkgs/applications/graphics/gscreenshot/default.nix

diff --git a/pkgs/applications/graphics/gscreenshot/0001-Changing-paths-to-be-nix-compatible.patch b/pkgs/applications/graphics/gscreenshot/0001-Changing-paths-to-be-nix-compatible.patch
new file mode 100644
index 000000000000..187d4a0154ba
--- /dev/null
+++ b/pkgs/applications/graphics/gscreenshot/0001-Changing-paths-to-be-nix-compatible.patch
@@ -0,0 +1,25 @@
+From a4822ee9e894f5f5b3110f41f65a698dd845a41d Mon Sep 17 00:00:00 2001
+From: Richard Davis <davisrichard437@gmail.com>
+Date: Fri, 24 Mar 2023 11:45:23 -0400
+Subject: [PATCH] Changing paths to be nix-compatible.
+
+---
+ dist/desktop/gscreenshot.desktop | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dist/desktop/gscreenshot.desktop b/dist/desktop/gscreenshot.desktop
+index a5d2bcd..9d289e2 100644
+--- a/dist/desktop/gscreenshot.desktop
++++ b/dist/desktop/gscreenshot.desktop
+@@ -2,7 +2,7 @@
+ Type=Application
+ Name=gscreenshot
+ Comment=A simple screenshot utility
+-TryExec=/usr/bin/gscreenshot
++TryExec=gscreenshot
+ Exec=gscreenshot
+ Icon=gscreenshot
+ Categories=Graphics;
+-- 
+2.39.2
+
diff --git a/pkgs/applications/graphics/gscreenshot/default.nix b/pkgs/applications/graphics/gscreenshot/default.nix
new file mode 100644
index 000000000000..0847bc87cfd3
--- /dev/null
+++ b/pkgs/applications/graphics/gscreenshot/default.nix
@@ -0,0 +1,90 @@
+{ lib
+, fetchFromGitHub
+, python3Packages
+, gettext
+, gobject-introspection
+, gtk3
+, wrapGAppsHook
+, xdg-utils
+, scrot
+, slop
+, xclip
+, grim
+, slurp
+, wl-clipboard
+, waylandSupport ? true
+, x11Support ? true
+}:
+
+python3Packages.buildPythonApplication rec {
+  pname = "gscreenshot";
+  version = "3.4.0";
+
+  src = fetchFromGitHub {
+    owner = "thenaterhood";
+    repo = "${pname}";
+    rev = "v${version}";
+    sha256 = "YuISiTUReX9IQpckIgbt03CY7klnog/IeOtfBoQ1DZM=";
+  };
+
+  # needed for wrapGAppsHook to function
+  strictDeps = false;
+  # tests require a display and fail
+  doCheck = false;
+
+  nativeBuildInputs = [ wrapGAppsHook ];
+  propagatedBuildInputs = [
+    gettext
+    gobject-introspection
+    gtk3
+    xdg-utils
+  ] ++ lib.optionals waylandSupport [
+    # wayland deps
+    grim
+    slurp
+    wl-clipboard
+  ] ++ lib.optionals x11Support [
+    # X11 deps
+    scrot
+    slop
+    xclip
+    python3Packages.xlib
+  ] ++ (with python3Packages; [
+    pillow
+    pygobject3
+    setuptools
+  ]);
+
+  patches = [ ./0001-Changing-paths-to-be-nix-compatible.patch ];
+
+  meta = {
+    description = "A screenshot frontend (CLI and GUI) for a variety of screenshot backends";
+
+    longDescription = ''
+      gscreenshot provides a common frontend and expanded functionality to a
+      number of X11 and Wayland screenshot and region selection utilties.
+
+      In a nutshell, gscreenshot supports the following:
+
+      - Capturing a full-screen screenshot
+      - Capturing a region of the screen interactively
+      - Capturing a window interactively
+      - Capturing the cursor
+      - Capturing the cursor, using an alternate cursor glyph
+      - Capturing a screenshot with a delay
+      - Showing a notification when a screenshot is taken
+      - Capturing a screenshot from the command line or a custom script
+      - Capturing a screenshot using a GUI
+      - Saving to a variety of image formats including 'bmp', 'eps', 'gif', 'jpeg', 'pcx', 'pdf', 'ppm', 'tiff', 'png', and 'webp'.
+      - Copying a screenshot to the system clipboard
+      - Opening a screenshot in the configured application after capture
+
+      Other than region selection, gscreenshot's CLI is non-interactive and is suitable for use in scripts.
+    '';
+
+    homepage = "https://github.com/thenaterhood/gscreenshot";
+    license = lib.licenses.gpl2Only;
+    platforms = lib.platforms.linux;
+    maintainers = [ lib.maintainers.davisrichard437 ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 34235dea7ae3..85c68885d771 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -30623,6 +30623,8 @@ with pkgs;
 
   grisbi = callPackage ../applications/office/grisbi { gtk = gtk3; };
 
+  gscreenshot = callPackage ../applications/graphics/gscreenshot { };
+
   gtkpod = callPackage ../applications/audio/gtkpod { };
 
   q4wine = libsForQt5.callPackage ../applications/misc/q4wine { };

From edd8b0812f01987ae5df1417c906775b7725ff1a Mon Sep 17 00:00:00 2001
From: Mathieu Fenniak <mathieu@fenniak.net>
Date: Wed, 12 Apr 2023 11:57:56 -0600
Subject: [PATCH 36/44] plasma-vault: add gocryptfs support (#205519)

---
 .../plasma-5/plasma-vault/0004-gocryptfs-path.patch | 13 +++++++++++++
 pkgs/desktops/plasma-5/plasma-vault/default.nix     |  5 +++--
 2 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/desktops/plasma-5/plasma-vault/0004-gocryptfs-path.patch

diff --git a/pkgs/desktops/plasma-5/plasma-vault/0004-gocryptfs-path.patch b/pkgs/desktops/plasma-5/plasma-vault/0004-gocryptfs-path.patch
new file mode 100644
index 000000000000..8790f877ff07
--- /dev/null
+++ b/pkgs/desktops/plasma-5/plasma-vault/0004-gocryptfs-path.patch
@@ -0,0 +1,13 @@
+diff --git a/kded/engine/backends/gocryptfs/gocryptfsbackend.cpp b/kded/engine/backends/gocryptfs/gocryptfsbackend.cpp
+index 2d6df94..3e8ec9a 100644
+--- a/kded/engine/backends/gocryptfs/gocryptfsbackend.cpp
++++ b/kded/engine/backends/gocryptfs/gocryptfsbackend.cpp
+@@ -202,7 +202,7 @@ QProcess *GocryptfsBackend::gocryptfs(const QStringList &arguments) const
+     auto config = KSharedConfig::openConfig(PLASMAVAULT_CONFIG_FILE);
+     KConfigGroup backendConfig(config, "GocryptfsBackend");
+ 
+-    return process("gocryptfs", arguments + backendConfig.readEntry("extraMountOptions", QStringList{}), {});
++    return process(NIXPKGS_GOCRYPTFS, arguments + backendConfig.readEntry("extraMountOptions", QStringList{}), {});
+ }
+ 
+ QString GocryptfsBackend::getConfigFilePath(const Device &device) const
diff --git a/pkgs/desktops/plasma-5/plasma-vault/default.nix b/pkgs/desktops/plasma-5/plasma-vault/default.nix
index ba1def530476..3bc432b0d509 100644
--- a/pkgs/desktops/plasma-5/plasma-vault/default.nix
+++ b/pkgs/desktops/plasma-5/plasma-vault/default.nix
@@ -9,6 +9,7 @@
 , encfs
 , cryfs
 , fuse
+, gocryptfs
 }:
 
 mkDerivation {
@@ -19,6 +20,7 @@ mkDerivation {
     ./0001-encfs-path.patch
     ./0002-cryfs-path.patch
     ./0003-fusermount-path.patch
+    ./0004-gocryptfs-path.patch
   ];
 
   buildInputs = [
@@ -32,10 +34,9 @@ mkDerivation {
   CXXFLAGS = [
     ''-DNIXPKGS_ENCFS=\"${lib.getBin encfs}/bin/encfs\"''
     ''-DNIXPKGS_ENCFSCTL=\"${lib.getBin encfs}/bin/encfsctl\"''
-
     ''-DNIXPKGS_CRYFS=\"${lib.getBin cryfs}/bin/cryfs\"''
-
     ''-DNIXPKGS_FUSERMOUNT=\"${lib.getBin fuse}/bin/fusermount\"''
+    ''-DNIXPKGS_GOCRYPTFS=\"${lib.getBin gocryptfs}/bin/gocryptfs\"''
   ];
 
 }

From 67a84d1428fa9917855a64cca92f5bd3fcc89290 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Wed, 12 Apr 2023 21:27:34 +0300
Subject: [PATCH 37/44] stdenvAdapters: fix preservation of
 env.NIX_CFLAGS_COMPILE

we have managed to migrate to NIX_CFLAGS_COMPILE to the env attrset well
enough that we don't need to support having it toplevel. mkDerivation
will throw if there's a attr in both env and toplevel so no need to
worry about that
---
 pkgs/stdenv/adapters.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix
index eaf497f335f5..0c5645e5a487 100644
--- a/pkgs/stdenv/adapters.nix
+++ b/pkgs/stdenv/adapters.nix
@@ -176,7 +176,7 @@ rec {
     stdenv.override (old: {
       mkDerivationFromStdenv = extendMkDerivationArgs old (args: {
         dontStrip = true;
-        env = (args.env or {}) // { NIX_CFLAGS_COMPILE = toString (args.NIX_CFLAGS_COMPILE or "") + " -ggdb -Og"; };
+        env = (args.env or {}) // { NIX_CFLAGS_COMPILE = toString (args.env.NIX_CFLAGS_COMPILE or "") + " -ggdb -Og"; };
       });
     });
 
@@ -219,7 +219,7 @@ rec {
   impureUseNativeOptimizations = stdenv:
     stdenv.override (old: {
       mkDerivationFromStdenv = extendMkDerivationArgs old (args: {
-        env = (args.env or {}) // { NIX_CFLAGS_COMPILE = toString (args.NIX_CFLAGS_COMPILE or "") + " -march=native"; };
+        env = (args.env or {}) // { NIX_CFLAGS_COMPILE = toString (args.env.NIX_CFLAGS_COMPILE or "") + " -march=native"; };
 
         NIX_ENFORCE_NO_NATIVE = false;
 
@@ -245,7 +245,7 @@ rec {
   withCFlags = compilerFlags: stdenv:
     stdenv.override (old: {
       mkDerivationFromStdenv = extendMkDerivationArgs old (args: {
-        env = (args.env or {}) // { NIX_CFLAGS_COMPILE = toString (args.NIX_CFLAGS_COMPILE or "") + " ${toString compilerFlags}"; };
+        env = (args.env or {}) // { NIX_CFLAGS_COMPILE = toString (args.env.NIX_CFLAGS_COMPILE or "") + " ${toString compilerFlags}"; };
       });
     });
 }

From ef47b9f8b6ce64fcc001b6546f757b3cff1869d9 Mon Sep 17 00:00:00 2001
From: MGlolenstine <mglolenstine@gmail.com>
Date: Wed, 12 Apr 2023 06:25:49 +0200
Subject: [PATCH 38/44] shell_gpt: 0.7.3 -> 0.8.8

---
 pkgs/tools/misc/shell_gpt/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/shell_gpt/default.nix b/pkgs/tools/misc/shell_gpt/default.nix
index b8b3fbb1af51..9e3000a3cf72 100644
--- a/pkgs/tools/misc/shell_gpt/default.nix
+++ b/pkgs/tools/misc/shell_gpt/default.nix
@@ -1,14 +1,15 @@
 { lib
 , python3
+, nix-update-script
 }:
 
 python3.pkgs.buildPythonApplication rec {
   pname = "shell_gpt";
-  version = "0.7.3";
+  version = "0.8.8";
 
   src = python3.pkgs.fetchPypi {
     inherit pname version;
-    sha256 = "sha256-lS8zLtsh8Uz782KJwHqifEQnWQswbCXRVIfXWAmWtvI=";
+    sha256 = "sha256-KuaSAiXlqWRhFtX4C6vibbUiq43L83pZX+yM9L7Ej68=";
   };
 
   nativeBuildInputs = with python3.pkgs; [
@@ -27,6 +28,8 @@ python3.pkgs.buildPythonApplication rec {
 
   pythonRelaxDeps = [ "requests" "rich" "distro" "typer" ];
 
+  passthru.updateScript = nix-update-script { };
+
   doCheck = false;
 
   meta = with lib; {

From 8c9384373d3ca32b8fb27d1037475a6a714c714e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 12 Apr 2023 03:11:44 +0000
Subject: [PATCH 39/44] redpanda: 23.1.3 -> 23.1.6

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

diff --git a/pkgs/servers/redpanda/default.nix b/pkgs/servers/redpanda/default.nix
index ef8335c56ccc..5292cfd71566 100644
--- a/pkgs/servers/redpanda/default.nix
+++ b/pkgs/servers/redpanda/default.nix
@@ -7,12 +7,12 @@
 , stdenv
 }:
 let
-  version = "23.1.3";
+  version = "23.1.6";
   src = fetchFromGitHub {
     owner = "redpanda-data";
     repo = "redpanda";
     rev = "v${version}";
-    sha256 = "sha256-tqQl7Elslcdw0hNjayYShj19KYmVskJG0qtaijGTzm0=";
+    sha256 = "sha256-ZZsZjOuHTwzhfKBd4VPNxfxrcvL6C5Uhv16xA0eUN60=";
   };
   server = callPackage ./server.nix { inherit src version; };
 in

From 42c8e4dd18002f20fc8a5507cdaea59ecc581072 Mon Sep 17 00:00:00 2001
From: Adam Joseph <adam@westernsemico.com>
Date: Sun, 15 Jan 2023 00:11:55 -0800
Subject: [PATCH 40/44] build-rust-crate: dontStrip=!release

Without this PR, unlike `RUST_LIB_BACKTRACE=1 cargo run` you won't
get line numbers in backtraces from binaries built with:

```
nix build -f Cargo.nix --arg release false
```

This PR fixes that.
---
 pkgs/build-support/rust/build-rust-crate/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/build-support/rust/build-rust-crate/default.nix b/pkgs/build-support/rust/build-rust-crate/default.nix
index c4d1ef7b209e..17ce3f75fb1b 100644
--- a/pkgs/build-support/rust/build-rust-crate/default.nix
+++ b/pkgs/build-support/rust/build-rust-crate/default.nix
@@ -352,6 +352,7 @@ crate_: lib.makeOverridable
           metadata hasCrateBin crateBin verbose colors
           extraRustcOpts buildTests codegenUnits;
       };
+      dontStrip = !release;
       installPhase = installCrate crateName metadata buildTests;
 
       # depending on the test setting we are either producing something with bins

From 2a37ccff8817c6ca0695aed8ac19321cf3b7829c Mon Sep 17 00:00:00 2001
From: zendo <linzway@qq.com>
Date: Wed, 12 Apr 2023 23:59:14 +0800
Subject: [PATCH 41/44] gnome-decoder: 0.3.1 -> 0.3.3

---
 .../graphics/gnome-decoder/default.nix            | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/graphics/gnome-decoder/default.nix b/pkgs/applications/graphics/gnome-decoder/default.nix
index 47cd856c79ba..f957a8c291e8 100644
--- a/pkgs/applications/graphics/gnome-decoder/default.nix
+++ b/pkgs/applications/graphics/gnome-decoder/default.nix
@@ -11,6 +11,7 @@
 , libadwaita
 , zbar
 , sqlite
+, openssl
 , pipewire
 , gstreamer
 , gst-plugins-base
@@ -22,20 +23,20 @@
 
 clangStdenv.mkDerivation rec {
   pname = "gnome-decoder";
-  version = "0.3.1";
+  version = "0.3.3";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
     owner = "World";
     repo = "decoder";
     rev = version;
-    hash = "sha256-WJIOaYSesvLmOzF1Q6o6aLr4KJanXVaNa+r+2LlpKHQ=";
+    hash = "sha256-eMyPN3UxptqavY9tEATW2AP+kpoWaLwUKCwhNQrarVc=";
   };
 
   cargoDeps = rustPlatform.fetchCargoTarball {
     inherit src;
     name = "${pname}-${version}";
-    hash = "sha256-RMHVrv/0q42qFUXyd5BSymzx+BxiyqTX0Jzmxnlhyr4=";
+    hash = "sha256-3j1hoFffQzWBy4IKtmoMkLBJmNbntpyn0sjv1K0MmDo=";
   };
 
   nativeBuildInputs = [
@@ -57,6 +58,7 @@ clangStdenv.mkDerivation rec {
     libadwaita
     zbar
     sqlite
+    openssl
     pipewire
     gstreamer
     gst-plugins-base
@@ -65,12 +67,6 @@ clangStdenv.mkDerivation rec {
 
   LIBCLANG_PATH = "${libclang.lib}/lib";
 
-  # FIXME: workaround for Pipewire 0.3.64 deprecated API change, remove when fixed upstream
-  # https://gitlab.freedesktop.org/pipewire/pipewire-rs/-/issues/55
-  preBuild = ''
-    export BINDGEN_EXTRA_CLANG_ARGS="$BINDGEN_EXTRA_CLANG_ARGS -DPW_ENABLE_DEPRECATED"
-  '';
-
   meta = with lib; {
     description = "Scan and Generate QR Codes";
     homepage = "https://gitlab.gnome.org/World/decoder";
@@ -78,6 +74,5 @@ clangStdenv.mkDerivation rec {
     platforms = platforms.linux;
     mainProgram = "decoder";
     maintainers = with maintainers; [ zendo ];
-    broken = true;
   };
 }

From 477067a5d0d4efe9c78077bc74cc95570e44052d Mon Sep 17 00:00:00 2001
From: Johan Thomsen <joho@nnit.com>
Date: Wed, 12 Apr 2023 20:00:02 +0200
Subject: [PATCH 42/44] kubernetes: 1.26.3 -> 1.27.0

---
 pkgs/applications/networking/cluster/kubernetes/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix
index da77a82bd845..dd71b53584fc 100644
--- a/pkgs/applications/networking/cluster/kubernetes/default.nix
+++ b/pkgs/applications/networking/cluster/kubernetes/default.nix
@@ -20,13 +20,13 @@
 
 buildGoModule rec {
   pname = "kubernetes";
-  version = "1.26.3";
+  version = "1.27.0";
 
   src = fetchFromGitHub {
     owner = "kubernetes";
     repo = "kubernetes";
     rev = "v${version}";
-    hash = "sha256-dJMfnd82JIPxyVisr5o9s/bC3ZDiolF841pmV4c9LN8=";
+    hash = "sha256-9xRsC6QghmoH/+K6Gs8k4BFHQ8ltCtG8TZpAJGRC2e4=";
   };
 
   vendorHash = null;

From 0b572401112cee6cb959692944ed2062e2d71fa8 Mon Sep 17 00:00:00 2001
From: Johan Thomsen <joho@nnit.com>
Date: Wed, 12 Apr 2023 20:00:38 +0200
Subject: [PATCH 43/44] nixos/kubernetes: kubelet --container-runtime flag has
 been removed

---
 nixos/modules/services/cluster/kubernetes/kubelet.nix | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/nixos/modules/services/cluster/kubernetes/kubelet.nix b/nixos/modules/services/cluster/kubernetes/kubelet.nix
index 8e935d621be4..eebacb3f3ef3 100644
--- a/nixos/modules/services/cluster/kubernetes/kubelet.nix
+++ b/nixos/modules/services/cluster/kubernetes/kubelet.nix
@@ -63,6 +63,7 @@ in
     (mkRemovedOptionModule [ "services" "kubernetes" "kubelet" "cadvisorPort" ] "")
     (mkRemovedOptionModule [ "services" "kubernetes" "kubelet" "allowPrivileged" ] "")
     (mkRemovedOptionModule [ "services" "kubernetes" "kubelet" "networkPlugin" ] "")
+    (mkRemovedOptionModule [ "services" "kubernetes" "kubelet" "containerRuntime" ] "")
   ];
 
   ###### interface
@@ -134,12 +135,6 @@ in
       };
     };
 
-    containerRuntime = mkOption {
-      description = lib.mdDoc "Which container runtime type to use";
-      type = enum ["docker" "remote"];
-      default = "remote";
-    };
-
     containerRuntimeEndpoint = mkOption {
       description = lib.mdDoc "Endpoint at which to find the container runtime api interface/socket";
       type = str;
@@ -331,7 +326,6 @@ in
             ${optionalString (cfg.tlsKeyFile != null)
               "--tls-private-key-file=${cfg.tlsKeyFile}"} \
             ${optionalString (cfg.verbosity != null) "--v=${toString cfg.verbosity}"} \
-            --container-runtime=${cfg.containerRuntime} \
             --container-runtime-endpoint=${cfg.containerRuntimeEndpoint} \
             --cgroup-driver=systemd \
             ${cfg.extraOpts}

From 1b631bcecb0ece9424b8d3e3736b3915832eecba Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 13 Apr 2023 06:56:33 +1000
Subject: [PATCH 44/44] terraform: 1.4.4 -> 1.4.5

Diff: https://github.com/hashicorp/terraform/compare/v1.4.4...v1.4.5

Changelog: https://github.com/hashicorp/terraform/blob/v1.4.5/CHANGELOG.md
---
 pkgs/applications/networking/cluster/terraform/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index 0182a4ce50de..a3d906cdf445 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -166,8 +166,8 @@ rec {
   mkTerraform = attrs: pluggable (generic attrs);
 
   terraform_1 = mkTerraform {
-    version = "1.4.4";
-    hash = "sha256-Fg9NDV063gWi9Na144jjkK7E8ysE2GR4IYT6qjTgnqw=";
+    version = "1.4.5";
+    hash = "sha256-mnJ9d3UHAZxmz0i7PH0JF5gA3m3nJxM2NyAn0J0L6u8=";
     vendorHash = "sha256-3ZQcWatJlQ6NVoPL/7cKQO6+YCSM3Ld77iLEQK3jBDE=";
     patches = [ ./provider-path-0_15.patch ];
     passthru = {