From d0126c0508e46fff6b7560f60f2d9e9f1067b096 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 12 Jun 2024 08:15:16 +0200
Subject: [PATCH 01/25] make-disk-image: fix build for systems that use
 boot.loader.grub.devices

config.boot.loader.grub.device is just an alias that gets assigned to config.boot.loader.grub.devices.
If config.boot.loader.grub.device is set to null, it will fail with the following error
as described in https://github.com/nix-community/nixos-generators/issues/339
---
 nixos/lib/make-disk-image.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix
index 9bdbf4e0713d..1220bbfd5ed7 100644
--- a/nixos/lib/make-disk-image.nix
+++ b/nixos/lib/make-disk-image.nix
@@ -603,10 +603,11 @@ let format' = format; in let
       ${lib.optionalString installBootLoader ''
         # In this throwaway resource, we only have /dev/vda, but the actual VM may refer to another disk for bootloader, e.g. /dev/vdb
         # Use this option to create a symlink from vda to any arbitrary device you want.
-        ${optionalString (config.boot.loader.grub.enable && config.boot.loader.grub.device != "/dev/vda") ''
-            mkdir -p $(dirname ${config.boot.loader.grub.device})
-            ln -s /dev/vda ${config.boot.loader.grub.device}
-        ''}
+        ${optionalString (config.boot.loader.grub.enable) (lib.concatMapStringsSep " " (device:
+          lib.optionalString (device != "/dev/vda") ''
+            mkdir -p "$(dirname ${device})"
+            ln -s /dev/vda ${device}
+          '') config.boot.loader.grub.devices)}
 
         # Set up core system link, bootloader (sd-boot, GRUB, uboot, etc.), etc.
 

From 6ffd76f0801fbcc2c1891a2640619f174f06aa6d Mon Sep 17 00:00:00 2001
From: aleksana <me@aleksana.moe>
Date: Mon, 17 Jun 2024 21:48:35 +0800
Subject: [PATCH 02/25] python3Packages.f3d: add python module

---
 pkgs/applications/graphics/f3d/default.nix | 17 ++++++++++++++---
 pkgs/top-level/python-packages.nix         |  5 +++++
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/graphics/f3d/default.nix b/pkgs/applications/graphics/f3d/default.nix
index dd893ba9a976..ef0ee16e4ed6 100644
--- a/pkgs/applications/graphics/f3d/default.nix
+++ b/pkgs/applications/graphics/f3d/default.nix
@@ -6,11 +6,11 @@
 , gzip
 , vtk_9
 , autoPatchelfHook
-, libX11
-, libGL
 , Cocoa
 , OpenGL
+, python3Packages
 , withManual ? !stdenv.isDarwin
+, withPythonBinding ? false
 }:
 
 stdenv.mkDerivation rec {
@@ -37,7 +37,16 @@ stdenv.mkDerivation rec {
     autoPatchelfHook
   ];
 
-  buildInputs = [ vtk_9 ] ++ lib.optionals stdenv.isDarwin [ Cocoa OpenGL ];
+  buildInputs = [
+    vtk_9
+  ] ++ lib.optionals stdenv.isDarwin [
+    Cocoa
+    OpenGL
+  ] ++ lib.optionals withPythonBinding [
+    python3Packages.python
+    # Using C++ header files, not Python import
+    python3Packages.pybind11
+  ];
 
   cmakeFlags = [
     # conflict between VTK and Nixpkgs;
@@ -47,6 +56,8 @@ stdenv.mkDerivation rec {
     "-DCMAKE_INSTALL_BINDIR=bin"
   ] ++ lib.optionals withManual [
     "-DF3D_LINUX_GENERATE_MAN=ON"
+  ] ++ lib.optionals withPythonBinding [
+    "-DF3D_BINDINGS_PYTHON=ON"
   ];
 
   meta = with lib; {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 483cb05e6996..b7f038b4217a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4052,6 +4052,11 @@ self: super: with self; {
 
   ezyrb = callPackage ../development/python-modules/ezyrb { };
 
+  f3d = toPythonModule (pkgs.f3d.override {
+    withPythonBinding = true;
+    python3Packages = self;
+  });
+
   f5-icontrol-rest = callPackage ../development/python-modules/f5-icontrol-rest { };
 
   f5-sdk = callPackage ../development/python-modules/f5-sdk { };

From 99fecbbe2fce07d839c1dc209bc0dc0967e7405a Mon Sep 17 00:00:00 2001
From: aleksana <me@aleksana.moe>
Date: Mon, 17 Jun 2024 22:59:25 +0800
Subject: [PATCH 03/25] vtk: enable egl and external rendering

---
 pkgs/development/libraries/vtk/generic.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/vtk/generic.nix b/pkgs/development/libraries/vtk/generic.nix
index 73fc650844db..18e182d3a44e 100644
--- a/pkgs/development/libraries/vtk/generic.nix
+++ b/pkgs/development/libraries/vtk/generic.nix
@@ -79,8 +79,10 @@ in stdenv.mkDerivation {
     "-DCMAKE_CXX_FLAGS=-fPIC"
     "-DVTK_MODULE_USE_EXTERNAL_vtkpng=ON"
     "-DVTK_MODULE_USE_EXTERNAL_vtktiff=1"
+    "-DVTK_MODULE_ENABLE_VTK_RenderingExternal=YES"
   ] ++ lib.optionals (!stdenv.isDarwin) [
     "-DOPENGL_INCLUDE_DIR=${libGL}/include"
+    "-DVTK_OPENGL_HAS_EGL=ON"
   ] ++ [
     "-DCMAKE_INSTALL_LIBDIR=lib"
     "-DCMAKE_INSTALL_INCLUDEDIR=include"

From 7bd1f036c48fde5c3bfea4bc8e46e1f7906487eb Mon Sep 17 00:00:00 2001
From: aleksana <me@aleksana.moe>
Date: Mon, 17 Jun 2024 22:59:34 +0800
Subject: [PATCH 04/25] f3d: enable external rendering

---
 pkgs/applications/graphics/f3d/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/graphics/f3d/default.nix b/pkgs/applications/graphics/f3d/default.nix
index ef0ee16e4ed6..dc3b9e4b3a61 100644
--- a/pkgs/applications/graphics/f3d/default.nix
+++ b/pkgs/applications/graphics/f3d/default.nix
@@ -54,6 +54,7 @@ stdenv.mkDerivation rec {
     "-DCMAKE_INSTALL_LIBDIR=lib"
     "-DCMAKE_INSTALL_INCLUDEDIR=include"
     "-DCMAKE_INSTALL_BINDIR=bin"
+    "-DF3D_MODULE_EXTERNAL_RENDERING=ON"
   ] ++ lib.optionals withManual [
     "-DF3D_LINUX_GENERATE_MAN=ON"
   ] ++ lib.optionals withPythonBinding [

From 504a78dcc7900aaf43aaf1c8930d468baad21874 Mon Sep 17 00:00:00 2001
From: aleksana <me@aleksana.moe>
Date: Mon, 17 Jun 2024 23:03:13 +0800
Subject: [PATCH 05/25] exhibit: init at 1.2.0

---
 pkgs/by-name/ex/exhibit/package.nix | 59 +++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 pkgs/by-name/ex/exhibit/package.nix

diff --git a/pkgs/by-name/ex/exhibit/package.nix b/pkgs/by-name/ex/exhibit/package.nix
new file mode 100644
index 000000000000..79b0f4742ea4
--- /dev/null
+++ b/pkgs/by-name/ex/exhibit/package.nix
@@ -0,0 +1,59 @@
+{
+  lib,
+  python3Packages,
+  fetchFromGitHub,
+  meson,
+  ninja,
+  pkg-config,
+  gobject-introspection,
+  wrapGAppsHook4,
+  desktop-file-utils,
+  libadwaita,
+}:
+
+python3Packages.buildPythonApplication rec {
+  pname = "exhibit";
+  version = "1.2.0";
+  pyproject = false; # Built with meson
+
+  src = fetchFromGitHub {
+    owner = "Nokse22";
+    repo = "Exhibit";
+    rev = "v${version}";
+    hash = "sha256-yNS6q7XbWda2+so9QRS/c4uYaVPo7b4JCite5nzc3Eo=";
+  };
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    gobject-introspection
+    wrapGAppsHook4
+    desktop-file-utils
+  ];
+
+  buildInputs = [ libadwaita ];
+
+  dependencies = with python3Packages; [
+    pygobject3
+    f3d
+  ];
+
+  dontWrapGApps = true;
+
+  preFixup = ''
+    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
+  '';
+
+  meta = {
+    description = "3D model viewer for the GNOME desktop powered by f3d";
+    homepage = "https://github.com/Nokse22/Exhibit";
+    license = with lib.licenses; [
+      gpl3Plus
+      cc0
+    ];
+    mainProgram = "exhibit";
+    maintainers = with lib.maintainers; [ aleksana ];
+    platforms = lib.platforms.linux;
+  };
+}

From 1d2f333662e161d37f6f522e14aeac80e0c89de9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 21 Jun 2024 23:35:03 +0000
Subject: [PATCH 06/25] yamlscript: 0.1.61 -> 0.1.63

---
 pkgs/by-name/ya/yamlscript/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ya/yamlscript/package.nix b/pkgs/by-name/ya/yamlscript/package.nix
index 1ae39b8e636c..73f8e884c91b 100644
--- a/pkgs/by-name/ya/yamlscript/package.nix
+++ b/pkgs/by-name/ya/yamlscript/package.nix
@@ -2,11 +2,11 @@
 
 buildGraalvmNativeImage rec {
   pname = "yamlscript";
-  version = "0.1.61";
+  version = "0.1.63";
 
   src = fetchurl {
     url = "https://github.com/yaml/yamlscript/releases/download/${version}/yamlscript.cli-${version}-standalone.jar";
-    hash = "sha256-NuZxIuj7N7zKBOaBPn8g/cKoRmNMkpH75YMHBjFFM8g=";
+    hash = "sha256-BxLFWIbRNYSGWVoPyOH2VaudVQQ/PCloBqQZM9MYg2s=";
   };
 
   executable = "ys";

From e485289dc18659fb5732d487ebd3fe8a587a0d75 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 22 Jun 2024 10:45:02 +0000
Subject: [PATCH 07/25] python311Packages.aioquic: 1.0.0 -> 1.1.0

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

diff --git a/pkgs/development/python-modules/aioquic/default.nix b/pkgs/development/python-modules/aioquic/default.nix
index f3191a7f8ddf..0b3bc5464ce1 100644
--- a/pkgs/development/python-modules/aioquic/default.nix
+++ b/pkgs/development/python-modules/aioquic/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "aioquic";
-  version = "1.0.0";
+  version = "1.1.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-7THCta+pjFtsr6TzYUnerx3/bFppcB6t0nFnQV+fFmA=";
+    hash = "sha256-p5HFeYuutCoS+ij9Mn2gTQjxh5XpOIkXi0svSf6Lv0M=";
   };
 
   build-system = [ setuptools ];

From 37a14c2e4338963241d1ca4b3650bee57275e650 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 22 Jun 2024 15:29:51 +0200
Subject: [PATCH 08/25] cdncheck: init at 1.1.0

Tool to detect various technology for a given IP address

https://github.com/projectdiscovery/cdncheck
---
 pkgs/by-name/cd/cdncheck/package.nix | 43 ++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 pkgs/by-name/cd/cdncheck/package.nix

diff --git a/pkgs/by-name/cd/cdncheck/package.nix b/pkgs/by-name/cd/cdncheck/package.nix
new file mode 100644
index 000000000000..52f28bf9a851
--- /dev/null
+++ b/pkgs/by-name/cd/cdncheck/package.nix
@@ -0,0 +1,43 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+}:
+
+buildGoModule rec {
+  pname = "cdncheck";
+  version = "1.1.0";
+
+  src = fetchFromGitHub {
+    owner = "projectdiscovery";
+    repo = "cdncheck";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-1TYUSWbcWnRsOM8ctY1g9CmFSAXiK9NmN5ZDaKeJIgw=";
+  };
+
+  vendorHash = "sha256-0fiZJeBvxUib8a9CeTmYottOp+15YEdTVYhdzKSSCrk=";
+
+  subPackages = [ "cmd/cdncheck/" ];
+
+
+  ldflags = [
+    "-s"
+    "-w"
+  ];
+
+  preCheck = ''
+    # Tests require network access
+    substituteInPlace other_test.go \
+      --replace-fail "TestCheckDomainWithFallback" "SkipTestCheckDomainWithFallback" \
+      --replace-fail "TestCheckDNSResponse" "SkipTestCheckDNSResponse"
+  '';
+
+  meta = with lib; {
+    description = "Tool to detect various technology for a given IP address";
+    homepage = "https://github.com/projectdiscovery/cdncheck";
+    changelog = "https://github.com/projectdiscovery/cdncheck/releases/tag/v${version}";
+    license = licenses.mit;
+    maintainers = with maintainers; [ fab ];
+    mainProgram = "cdncheck";
+  };
+}

From 42b430a343c097a57a612173d14194010ed6e6e6 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 22 Jun 2024 15:43:23 +0200
Subject: [PATCH 09/25] mitm6: refactor

- add myself as maintainer
---
 pkgs/tools/security/mitm6/default.nix | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/pkgs/tools/security/mitm6/default.nix b/pkgs/tools/security/mitm6/default.nix
index 518b61fd8d4b..980bc703f4ab 100644
--- a/pkgs/tools/security/mitm6/default.nix
+++ b/pkgs/tools/security/mitm6/default.nix
@@ -1,37 +1,38 @@
-{ lib
-, fetchPypi
-, python3
+{
+  lib,
+  fetchPypi,
+  python3,
 }:
 
 python3.pkgs.buildPythonApplication rec {
   pname = "mitm6";
   version = "0.3.0";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-g+eFcJdgP7CQ6ntN17guJa4LdkGIb91mr/NKRPIukP8=";
   };
 
-  propagatedBuildInputs = with python3.pkgs; [
-    scapy
+  build-system = with python3.pkgs; [ setuptools ];
+
+  dependencies = with python3.pkgs; [
     future
-    twisted
     netifaces
+    scapy
+    twisted
   ];
 
   # No tests exist for mitm6.
   doCheck = false;
 
-  pythonImportsCheck = [
-    "mitm6"
-  ];
+  pythonImportsCheck = [ "mitm6" ];
 
   meta = {
     description = "DHCPv6 network spoofing application";
-    mainProgram = "mitm6";
     homepage = "https://github.com/dirkjanm/mitm6";
     license = lib.licenses.gpl2Only;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = with lib.maintainers; [ fab ];
+    mainProgram = "mitm6";
   };
 }

From 6c35d0373340d2517c31882ca7bdbf5e1f122b89 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 22 Jun 2024 14:00:44 +0000
Subject: [PATCH 10/25] libzim: 9.2.1 -> 9.2.2

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

diff --git a/pkgs/development/libraries/libzim/default.nix b/pkgs/development/libraries/libzim/default.nix
index 83f15fcc678c..bf3a640bd821 100644
--- a/pkgs/development/libraries/libzim/default.nix
+++ b/pkgs/development/libraries/libzim/default.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libzim";
-  version = "9.2.1";
+  version = "9.2.2";
 
   src = fetchFromGitHub {
     owner = "openzim";
     repo = "libzim";
     rev = "refs/tags/${version}";
-    hash = "sha256-yxEtFsdLTcHFyoIX21nWo6gI7ERDN2/hsUHS/2mTFR4=";
+    hash = "sha256-V81TzoYUFiI+07ooDQtG7ahxQFEh/6Y8IgoceHMSgOk=";
   };
 
   nativeBuildInputs = [

From 934501361453189ef7e090d48a790a1d269c465e Mon Sep 17 00:00:00 2001
From: "Camille M. (genesis)" <camillemondon@free.fr>
Date: Fri, 31 May 2024 13:22:48 +0200
Subject: [PATCH 11/25] tzupdate: 2.1.0 -> 3.1.0

---
 pkgs/applications/misc/tzupdate/default.nix | 32 ++++++++++++---------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/misc/tzupdate/default.nix b/pkgs/applications/misc/tzupdate/default.nix
index 1bd2eece184c..c991a71e9c0a 100644
--- a/pkgs/applications/misc/tzupdate/default.nix
+++ b/pkgs/applications/misc/tzupdate/default.nix
@@ -1,24 +1,28 @@
-{ lib, python3, fetchPypi }:
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+}:
 
-let
-  inherit (python3.pkgs) buildPythonApplication requests;
-in
-buildPythonApplication rec {
+rustPlatform.buildRustPackage rec {
   pname = "tzupdate";
-  version = "2.1.0";
+  version = "3.1.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "5b55795c390e4ccc90e649c8cc387447daaf30a21d68f7196b49824cbcba8adc";
+  src = fetchFromGitHub {
+    owner = "cdown";
+    repo = "tzupdate";
+    rev = version;
+    hash = "sha256-eod4yFzX7pATNQmG7jU+r9mnC9nprJ55ufMXpKjw/YI=";
   };
 
-  propagatedBuildInputs = [ requests ];
+  cargoHash = "sha256-5+lp5xlwJxFDqzVxptJPX7z0iLoMkgdwHxvRVIXHF7Y=";
 
   meta = with lib; {
-    description = "Update timezone information based on geoip";
-    mainProgram = "tzupdate";
+    description = "Set the system timezone based on IP geolocation";
     homepage = "https://github.com/cdown/tzupdate";
-    maintainers = [ ];
-    license = licenses.unlicense;
+    license = licenses.mit;
+    maintainers = with maintainers; [ camillemndn ];
+    platforms = platforms.linux;
+    mainProgram = "tzupdate";
   };
 }

From 42c70e29232b56c4a67df6fd69dbd4a33eb9d169 Mon Sep 17 00:00:00 2001
From: abysssol <abysssol@pm.me>
Date: Sat, 22 Jun 2024 13:13:08 -0400
Subject: [PATCH 12/25] nixos/ollama: add option for `HSA_OVERRIDE_GFX_VERSION`

There are several GPUs that ROCm doesn't officially support but
will work correctly if ROCm is directed to treat the GPU as a different
one that is supported and has a similar architecture.
This can be done by setting `HSA_OVERRIDE_GFX_VERSION`.
Ollama has documentation on this topic: https://github.com/ollama/ollama/blob/main/docs/gpu.md#amd-radeon
---
 nixos/modules/services/misc/ollama.nix | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/nixos/modules/services/misc/ollama.nix b/nixos/modules/services/misc/ollama.nix
index 886eaa180b9e..1467c3f93bc8 100644
--- a/nixos/modules/services/misc/ollama.nix
+++ b/nixos/modules/services/misc/ollama.nix
@@ -98,9 +98,25 @@ in
             - otherwise defaults to `false`
           - `false`: disable GPU, only use CPU
           - `"rocm"`: supported by most modern AMD GPUs
+            - may require overriding gpu type with `services.ollama.rocmOverrideGfx`
+              if rocm doesn't detect your AMD gpu
           - `"cuda"`: supported by most modern NVIDIA GPUs
         '';
       };
+      rocmOverrideGfx = lib.mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        example = "10.3.0";
+        description = ''
+          Override what rocm will detect your gpu model as.
+          For example, make rocm treat your RX 5700 XT (or any other model)
+          as an RX 6900 XT using a value of `"10.3.0"` (gfx 1030).
+
+          This sets the value of `HSA_OVERRIDE_GFX_VERSION`. See [ollama's docs](
+          https://github.com/ollama/ollama/blob/main/docs/gpu.md#amd-radeon
+          ) for details.
+        '';
+      };
       environmentVariables = lib.mkOption {
         type = types.attrsOf types.str;
         default = { };
@@ -136,6 +152,7 @@ in
         HOME = cfg.home;
         OLLAMA_MODELS = cfg.models;
         OLLAMA_HOST = "${cfg.host}:${toString cfg.port}";
+        HSA_OVERRIDE_GFX_VERSION = lib.mkIf (cfg.rocmOverrideGfx != null) cfg.rocmOverrideGfx;
       };
       serviceConfig = {
         ExecStart = "${lib.getExe ollamaPackage} serve";

From 00c876544e1e18b4e7a7e0c645a113be95e3e430 Mon Sep 17 00:00:00 2001
From: abysssol <abysssol@pm.me>
Date: Sat, 22 Jun 2024 13:14:04 -0400
Subject: [PATCH 13/25] ollama: refactor wrapper options

---
 pkgs/by-name/ol/ollama/package.nix | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix
index f727c43e52ae..2bfb8eb97c3c 100644
--- a/pkgs/by-name/ol/ollama/package.nix
+++ b/pkgs/by-name/ol/ollama/package.nix
@@ -109,12 +109,6 @@ let
     ];
   };
 
-  runtimeLibs = lib.optionals enableRocm [
-    rocmPath
-  ] ++ lib.optionals enableCuda [
-    linuxPackages.nvidia_x11
-  ];
-
   appleFrameworks = darwin.apple_sdk_11_0.frameworks;
   metalFrameworks = [
     appleFrameworks.Accelerate
@@ -123,6 +117,17 @@ let
     appleFrameworks.MetalPerformanceShaders
   ];
 
+  runtimeLibs = lib.optionals enableRocm [
+    rocmPath
+  ] ++ lib.optionals enableCuda [
+    linuxPackages.nvidia_x11
+  ];
+  wrapperOptions = builtins.concatStringsSep " " ([
+    "--suffix LD_LIBRARY_PATH : '/run/opengl-driver/lib:${lib.makeLibraryPath runtimeLibs}'"
+  ] ++ lib.optionals enableRocm [
+    "--set-default HIP_PATH '${rocmPath}'"
+  ]);
+
 
   goBuild =
     if enableCuda then
@@ -183,10 +188,7 @@ goBuild ((lib.optionalAttrs enableRocm {
   '' + lib.optionalString (enableRocm || enableCuda) ''
     # expose runtime libraries necessary to use the gpu
     mv "$out/bin/ollama" "$out/bin/.ollama-unwrapped"
-    makeWrapper "$out/bin/.ollama-unwrapped" "$out/bin/ollama" ${
-      lib.optionalString enableRocm
-        ''--set-default HIP_PATH '${rocmPath}' ''} \
-      --suffix LD_LIBRARY_PATH : '/run/opengl-driver/lib:${lib.makeLibraryPath runtimeLibs}'
+    makeWrapper "$out/bin/.ollama-unwrapped" "$out/bin/ollama" ${wrapperOptions}
   '';
 
   ldflags = [

From 65c94bc0ba3d7929bf8def9a8beb1c30f32b755c Mon Sep 17 00:00:00 2001
From: Alexis Hildebrandt <afh@surryhill.net>
Date: Sat, 22 Jun 2024 19:57:44 +0200
Subject: [PATCH 14/25] weechat: 4.3.2 -> 4.3.3

Release notes: https://github.com/weechat/weechat/releases/tag/v4.3.3
---
 pkgs/applications/networking/irc/weechat/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix
index fe3ee483ae57..b31ae22fd33b 100644
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@@ -36,14 +36,14 @@ let
   in
     assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins;
     stdenv.mkDerivation rec {
-      version = "4.3.2";
+      version = "4.3.3";
       pname = "weechat";
 
       hardeningEnable = [ "pie" ];
 
       src = fetchurl {
         url = "https://weechat.org/files/src/weechat-${version}.tar.xz";
-        hash = "sha256-4fMd490+4ZiRVvTATp9L9hOdpq1Qwk9pH8EFfkz8N8Y=";
+        hash = "sha256-VYfbbOoziVvaEBxGptCen8COD8p2/4rDsUTasysQXtg=";
       };
 
       # Why is this needed? https://github.com/weechat/weechat/issues/2031

From 64279c3ec0a26baa362cfac438ddd4f792c8db58 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 22 Jun 2024 20:11:39 +0200
Subject: [PATCH 15/25] burpsuite: 2024.1.1.4 -> 2024.5.3

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

diff --git a/pkgs/tools/networking/burpsuite/default.nix b/pkgs/tools/networking/burpsuite/default.nix
index a234ad577d84..8f22d042b8d8 100644
--- a/pkgs/tools/networking/burpsuite/default.nix
+++ b/pkgs/tools/networking/burpsuite/default.nix
@@ -1,15 +1,23 @@
-{ lib, fetchurl, jdk, buildFHSEnv, unzip, makeDesktopItem, proEdition ? false }:
+{ lib
+, buildFHSEnv
+, fetchurl
+, jdk
+, makeDesktopItem
+, proEdition ? false
+, unzip
+}:
+
 let
-  version = "2024.1.1.4";
+  version = "2024.5.3";
 
   product = if proEdition then {
     productName = "pro";
     productDesktop = "Burp Suite Professional Edition";
-    hash = "sha256-jJUTsNF7Jy2VbFBIW7ha/ty9ZwVyVX1cTKNZJgD7zg4=";
+    hash = "sha256-1+IAlm4irUVqGFHlL+vNZNdDJrq3ZpJdUJYGrUN2cuY=";
   } else {
     productName = "community";
     productDesktop = "Burp Suite Community Edition";
-    hash = "sha256-VkrI1M4lCdCuQypHSd2W5X6LyqLUhnbKZKMVj0w4THE=";
+    hash = "sha256-+YgRKYF9NPAAfuy97nmAVeI8fCvwjvHn7hHtBUjUoXk=";
   };
 
   src = fetchurl {
@@ -48,6 +56,8 @@ buildFHSEnv {
     expat
     glib
     gtk3
+    gtk3-x11
+    jython
     libcanberra-gtk3
     libdrm
     libudev0-shim
@@ -56,7 +66,6 @@ buildFHSEnv {
     nspr
     nss
     pango
-    gtk3-x11
     xorg.libX11
     xorg.libxcb
     xorg.libXcomposite

From abdeb43baf6a2ecf34e8143622765ce2e94a630d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 22 Jun 2024 19:55:44 +0000
Subject: [PATCH 16/25] ad-miner: 1.4.0 -> 1.5.0

---
 pkgs/by-name/ad/ad-miner/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ad/ad-miner/package.nix b/pkgs/by-name/ad/ad-miner/package.nix
index 4a6d93c2d91c..d5d224957a94 100644
--- a/pkgs/by-name/ad/ad-miner/package.nix
+++ b/pkgs/by-name/ad/ad-miner/package.nix
@@ -5,14 +5,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "ad-miner";
-  version = "1.4.0";
+  version = "1.5.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Mazars-Tech";
     repo = "AD_Miner";
     rev = "refs/tags/v${version}";
-    hash = "sha256-SBFPGlP5hDKNuE5sYGL6PE1nYMmOCmMZji0AtNEBkAQ=";
+    hash = "sha256-BSUMNVHhclHzQf3Z0p2ZZjfQIZQyc2ZeQ67PXRz1RBk=";
   };
 
   # All requirements are pinned

From 429e84cd05af588024eeca6ac51aa8944949c10b Mon Sep 17 00:00:00 2001
From: Ryan Hendrickson <ryan.hendrickson@alum.mit.edu>
Date: Sat, 22 Jun 2024 16:23:54 -0400
Subject: [PATCH 17/25] imagemagick: 7.1.1-32 -> 7.1.1-33

---
 pkgs/applications/graphics/ImageMagick/default.nix | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index 491ef7c1f538..4b941b4d043b 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -34,6 +34,7 @@
 , nixos-icons
 , perlPackages
 , python3
+, fetchpatch
 }:
 
 assert libXtSupport -> libX11Support;
@@ -50,15 +51,24 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "imagemagick";
-  version = "7.1.1-32";
+  version = "7.1.1-33";
 
   src = fetchFromGitHub {
     owner = "ImageMagick";
     repo = "ImageMagick";
     rev = finalAttrs.version;
-    hash = "sha256-9pDxnUNMmrwnP4rrR41OSZOJZjQnlVvedpLvMZJJnJo=";
+    hash = "sha256-URGcJDgvRdpYZoECyVeSd0ut1Nkl0Sx2pDhYpi8Yf6o=";
   };
 
+  patches = [
+    # Fixes 7.1.1-32 -> 7.1.1-33 regression that, notably, affects
+    # perlPackages.ImageMagick tests. Should be in the next release.
+    (fetchpatch {
+      url = "https://github.com/ImageMagick/ImageMagick/commit/bdc6c09cec64fd8e1570ee3edf5647acde336272.patch";
+      hash = "sha256-cfmti9DXFhvn0UasmW0vwrNp+Lfepyrnp6ijk+1sJo8=";
+    })
+  ];
+
   outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big
   outputMan = "out"; # it's tiny
 

From e2b12ee607912f80ff3983684b5cb61866072ee8 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Sat, 22 Jun 2024 23:58:06 +0200
Subject: [PATCH 18/25] element-desktop: 1.11.68 -> 1.11.69

https://github.com/element-hq/element-desktop/releases/tag/v1.11.69
---
 .../networking/instant-messengers/element/pin.nix         | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/element/pin.nix b/pkgs/applications/networking/instant-messengers/element/pin.nix
index b3b722e67529..4dfc4b97494a 100644
--- a/pkgs/applications/networking/instant-messengers/element/pin.nix
+++ b/pkgs/applications/networking/instant-messengers/element/pin.nix
@@ -1,9 +1,9 @@
 {
-  "version" = "1.11.68";
+  "version" = "1.11.69";
   "hashes" = {
-    "desktopSrcHash" = "sha256-L3rto0V0RIf5ILWYGFnuGpwciwc55rR2+Zqj/azuWlo=";
+    "desktopSrcHash" = "sha256-sSEWnvWZ6sfrHL3mqbq3T90At131C1W7N72Hb/BHKCk=";
     "desktopYarnHash" = "0awz1dscksx4zvp99p08mdl2h6i7gbwjddanl3bhxkysxqdnwqb1";
-    "webSrcHash" = "sha256-IRgEV4H0fYo0ijLWF8ICdewqencgTJlqstzsGzlJI0k=";
-    "webYarnHash" = "092m0bhc3pp9dpaz6kri3hi723kqq1pbja4vf2xbxyx4x4yf0vlz";
+    "webSrcHash" = "sha256-oFSaKtig1z3jepLpwJW4i5VskMBhKUIbPsCfLQuCgMY=";
+    "webYarnHash" = "1rzq05dnkwjglira52wllsl5nqw1g8whvamjfxzgvp0nyby46nha";
   };
 }

From dae938a1bb57ea14bb9d54eb12104fcab1810fee Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 23 Jun 2024 01:57:17 +0000
Subject: [PATCH 19/25] iosevka: 30.2.0 -> 30.3.0

---
 pkgs/data/fonts/iosevka/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix
index 2377636d7741..7d4bae07081f 100644
--- a/pkgs/data/fonts/iosevka/default.nix
+++ b/pkgs/data/fonts/iosevka/default.nix
@@ -55,16 +55,16 @@ assert (extraParameters != null) -> set != null;
 
 buildNpmPackage rec {
   pname = "Iosevka${toString set}";
-  version = "30.2.0";
+  version = "30.3.0";
 
   src = fetchFromGitHub {
     owner = "be5invis";
     repo = "iosevka";
     rev = "v${version}";
-    hash = "sha256-L08xBKZHFFByemEa4GgwQRr+wRCocuT/RO+hV/S+hFA=";
+    hash = "sha256-GzIyDQchi8o4CGQexkQez2sqqI0IEBy/nppqyXlad8U=";
   };
 
-  npmDepsHash = "sha256-oRV6QVcJiVKvUtfrewTtnmlIMDaGknn0lEHdcNM3V2g=";
+  npmDepsHash = "sha256-SKYxEilEvNu+Tc6ytEjjfE5gl1hFiIoE9YP7IwaDzKg=";
 
   nativeBuildInputs = [
     remarshal

From d442d689b323559a9f2b31c08f64d26386ae2ca8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 23 Jun 2024 01:57:27 +0000
Subject: [PATCH 20/25] httpx: 1.6.3 -> 1.6.4

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

diff --git a/pkgs/tools/security/httpx/default.nix b/pkgs/tools/security/httpx/default.nix
index d0d78c3047fa..cfc44441820c 100644
--- a/pkgs/tools/security/httpx/default.nix
+++ b/pkgs/tools/security/httpx/default.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "httpx";
-  version = "1.6.3";
+  version = "1.6.4";
 
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = "httpx";
     rev = "refs/tags/v${version}";
-    hash = "sha256-N2Fym3OwTHjdaJ1fzGWL+BoUYsQ5216d3Ohz5Yrf558=";
+    hash = "sha256-EvpCJx5OtWOM/TIz45+8lvkphnyGiI7P7hvFeuNmGfM=";
   };
 
-  vendorHash = "sha256-jD5LQ9HZbWpoXgnyA7RacaDdyBPMbK02PhKQT+1il4Q=";
+  vendorHash = "sha256-0e8P6pMvtEj28j7BQlNPkW/XpjSVBnKP/Dli+oU+J10=";
 
   subPackages = [ "cmd/httpx" ];
 

From c712bc2c3d4036d09ebbe03d318cce84eed122f6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 23 Jun 2024 04:28:15 +0000
Subject: [PATCH 21/25] mawk: 1.3.4-20240123 -> 1.3.4-20240622

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

diff --git a/pkgs/tools/text/mawk/default.nix b/pkgs/tools/text/mawk/default.nix
index 7af363405102..700b20c2178c 100644
--- a/pkgs/tools/text/mawk/default.nix
+++ b/pkgs/tools/text/mawk/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   pname = "mawk";
-  version = "1.3.4-20240123";
+  version = "1.3.4-20240622";
 
   src = fetchurl {
     urls = [
       "ftp://ftp.invisible-island.net/mawk/mawk-${version}.tgz"
       "https://invisible-mirror.net/archives/mawk/mawk-${version}.tgz"
     ];
-    sha256 = "sha256-qOMZqDdEsfH7aYjfoYnWGIf4ZukUDMmknrADsrBlXog=";
+    sha256 = "sha256-TpF+h6ep+692mVeEpLC13A3ZVLl30JgwMPePagexp2U=";
   };
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];

From d3140c11a5ff0c44b68f2651a93ba293bc25271d Mon Sep 17 00:00:00 2001
From: Gooxey <dennis.tiderko@gmail.com>
Date: Tue, 7 May 2024 20:36:12 +0200
Subject: [PATCH 22/25] nixos/antennas: removed WorkingDirectory setting

Antennas could not start because the specifed directory did not exist
---
 nixos/modules/services/networking/antennas.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/nixos/modules/services/networking/antennas.nix b/nixos/modules/services/networking/antennas.nix
index ef98af22f20f..a37df953fc92 100644
--- a/nixos/modules/services/networking/antennas.nix
+++ b/nixos/modules/services/networking/antennas.nix
@@ -50,10 +50,7 @@ in
       };
 
       serviceConfig = {
-         ExecStart = "${pkgs.antennas}/bin/antennas";
-
-        # Antennas expects all resources like html and config to be relative to it's working directory
-        WorkingDirectory = "${pkgs.antennas}/libexec/antennas/deps/antennas/";
+        ExecStart = "${pkgs.antennas}/bin/antennas";
 
         # Hardening
         CapabilityBoundingSet = [ "" ];

From 99b94acbf05790842dcd8f594641a16979565efa Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Thu, 13 Jun 2024 21:59:42 +0200
Subject: [PATCH 23/25] dsview: 1.3.1 -> 1.3.2

Use Qt5 for now as Qt6 is not properly supported yet
https://github.com/DreamSourceLab/DSView/issues/777#issuecomment-2144118728
---
 pkgs/applications/science/electronics/dsview/default.nix | 6 +++---
 pkgs/top-level/all-packages.nix                          | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/science/electronics/dsview/default.nix b/pkgs/applications/science/electronics/dsview/default.nix
index b7950bfbb8d9..5d6c83f5dfaa 100644
--- a/pkgs/applications/science/electronics/dsview/default.nix
+++ b/pkgs/applications/science/electronics/dsview/default.nix
@@ -1,18 +1,18 @@
 { stdenv, lib, fetchFromGitHub, pkg-config, cmake, wrapQtAppsHook
-, libzip, boost, fftw, qtbase, qtwayland, qtsvg, libusb1
+, libzip, boost, fftw, libusb1, qtbase, qtsvg, qtwayland
 , python3, desktopToDarwinBundle
 }:
 
 stdenv.mkDerivation rec {
   pname = "dsview";
 
-  version = "1.3.1";
+  version = "1.3.2";
 
   src = fetchFromGitHub {
       owner = "DreamSourceLab";
       repo = "DSView";
       rev = "v${version}";
-      sha256 = "sha256-LwrlB+Nwq34YjwGmnbUWS3W//ZHr8Do2Wf2te+2oBeI=";
+      sha256 = "sha256-d/TfCuJzAM0WObOiBhgfsTirlvdROrlCm+oL1cqUrIs=";
   };
 
   patches = [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 894cc0d9c239..662a2db14264 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7391,7 +7391,7 @@ with pkgs;
 
   dropbear = callPackage ../tools/networking/dropbear { };
 
-  dsview = qt6Packages.callPackage ../applications/science/electronics/dsview { };
+  dsview = libsForQt5.callPackage ../applications/science/electronics/dsview { };
 
   dtach = callPackage ../tools/misc/dtach { };
 

From 8daa31600aa913217fc747c832b8b94a1f9f2719 Mon Sep 17 00:00:00 2001
From: euxane <euxane.trangirard@pacien.net>
Date: Sun, 23 Jun 2024 11:47:12 +0200
Subject: [PATCH 24/25] nixos/stalwart-mail: remove deprecated
 {queue,report}.path settings

Since stalwart-mail 0.6.0, queue and report files are located in
the shared `storage.{data,blob}` stores. The `{queue,report}.path`
settings no longer had any effect since then.

I'm also removing the creation of the associated extra directories
in the `preStart` script. This should not cause any issue with old
setups since 0.6.0 was already packaged when 24.05 was released.
---
 nixos/modules/services/mail/stalwart-mail.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/mail/stalwart-mail.nix b/nixos/modules/services/mail/stalwart-mail.nix
index ed3c5389354c..29f1a01522b4 100644
--- a/nixos/modules/services/mail/stalwart-mail.nix
+++ b/nixos/modules/services/mail/stalwart-mail.nix
@@ -37,8 +37,6 @@ in {
         ansi = mkDefault false;  # no colour markers to journald
         enable = mkDefault true;
       };
-      queue.path = mkDefault "${dataDir}/queue";
-      report.path = mkDefault "${dataDir}/reports";
       store = if useLegacyStorage then {
         # structured data in SQLite, blobs on filesystem
         db.type = mkDefault "sqlite";
@@ -83,9 +81,9 @@ in {
         after = [ "local-fs.target" "network.target" ];
 
         preStart = if useLegacyStorage then ''
-          mkdir -p ${dataDir}/{queue,reports,data/blobs}
+          mkdir -p ${dataDir}/data/blobs
         '' else ''
-          mkdir -p ${dataDir}/{queue,reports,db}
+          mkdir -p ${dataDir}/db
         '';
 
         serviceConfig = {

From 03f1d515cdd614c9d83179dfd76d8eabb25cf5f8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 22 Jun 2024 19:05:43 +0000
Subject: [PATCH 25/25] snipe-it: 6.4.2 -> 7.0.4

---
 pkgs/by-name/sn/snipe-it/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sn/snipe-it/package.nix b/pkgs/by-name/sn/snipe-it/package.nix
index ac24c711b6bb..35aa50865d41 100644
--- a/pkgs/by-name/sn/snipe-it/package.nix
+++ b/pkgs/by-name/sn/snipe-it/package.nix
@@ -8,16 +8,16 @@
 
 php.buildComposerProject (finalAttrs: {
   pname = "snipe-it";
-  version = "6.4.2";
+  version = "7.0.4";
 
   src = fetchFromGitHub {
     owner = "snipe";
     repo = "snipe-it";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-wNHFFqi1WNTzI3xv1/aXTPpVXe7oxiTqWMEYhplNM9A=";
+    hash = "sha256-yu0f2NyHj+5UR1YKD+eZIksBWtykTN6/Pcam1pfyQTM=";
   };
 
-  vendorHash = "sha256-KkFoc/fqYVgA5Vv6oEk+1/Rcj9VA52ZnH5O5qmLhmE4=";
+  vendorHash = "sha256-+h4jj8VBDQ76V3udrr4e54jhRwjsbxqgAtntILCAHy8=";
 
   postInstall = ''
     snipe_it_out="$out/share/php/snipe-it"