From ab34686a5b93e4bb42860b22a06534881edf1e1a Mon Sep 17 00:00:00 2001
From: Jennifer Graul <me@netali.de>
Date: Wed, 27 Nov 2024 09:42:13 +0100
Subject: [PATCH 1/3] zammad: move to pkgs/by-name/

---
 .../misc => by-name/za}/zammad/fix-sendmail-location.diff       | 0
 .../networking/misc => by-name/za}/zammad/gemset.nix            | 0
 .../misc/zammad/default.nix => by-name/za/zammad/package.nix}   | 0
 .../networking/misc => by-name/za}/zammad/source.json           | 0
 .../networking/misc => by-name/za}/zammad/update.nix            | 0
 .../networking/misc => by-name/za}/zammad/update.sh             | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 7 files changed, 2 deletions(-)
 rename pkgs/{applications/networking/misc => by-name/za}/zammad/fix-sendmail-location.diff (100%)
 rename pkgs/{applications/networking/misc => by-name/za}/zammad/gemset.nix (100%)
 rename pkgs/{applications/networking/misc/zammad/default.nix => by-name/za/zammad/package.nix} (100%)
 rename pkgs/{applications/networking/misc => by-name/za}/zammad/source.json (100%)
 rename pkgs/{applications/networking/misc => by-name/za}/zammad/update.nix (100%)
 rename pkgs/{applications/networking/misc => by-name/za}/zammad/update.sh (100%)

diff --git a/pkgs/applications/networking/misc/zammad/fix-sendmail-location.diff b/pkgs/by-name/za/zammad/fix-sendmail-location.diff
similarity index 100%
rename from pkgs/applications/networking/misc/zammad/fix-sendmail-location.diff
rename to pkgs/by-name/za/zammad/fix-sendmail-location.diff
diff --git a/pkgs/applications/networking/misc/zammad/gemset.nix b/pkgs/by-name/za/zammad/gemset.nix
similarity index 100%
rename from pkgs/applications/networking/misc/zammad/gemset.nix
rename to pkgs/by-name/za/zammad/gemset.nix
diff --git a/pkgs/applications/networking/misc/zammad/default.nix b/pkgs/by-name/za/zammad/package.nix
similarity index 100%
rename from pkgs/applications/networking/misc/zammad/default.nix
rename to pkgs/by-name/za/zammad/package.nix
diff --git a/pkgs/applications/networking/misc/zammad/source.json b/pkgs/by-name/za/zammad/source.json
similarity index 100%
rename from pkgs/applications/networking/misc/zammad/source.json
rename to pkgs/by-name/za/zammad/source.json
diff --git a/pkgs/applications/networking/misc/zammad/update.nix b/pkgs/by-name/za/zammad/update.nix
similarity index 100%
rename from pkgs/applications/networking/misc/zammad/update.nix
rename to pkgs/by-name/za/zammad/update.nix
diff --git a/pkgs/applications/networking/misc/zammad/update.sh b/pkgs/by-name/za/zammad/update.sh
similarity index 100%
rename from pkgs/applications/networking/misc/zammad/update.sh
rename to pkgs/by-name/za/zammad/update.sh
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4b6419813241..a530f002a5cb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16450,8 +16450,6 @@ with pkgs;
 
   yuview = libsForQt5.yuview;
 
-  zammad = callPackage ../applications/networking/misc/zammad { };
-
   zathuraPkgs = callPackage ../applications/misc/zathura { };
   zathura = zathuraPkgs.zathuraWrapper;
 

From cdc7b2d51d0504dc133fce4efd67d27e8159d307 Mon Sep 17 00:00:00 2001
From: Jennifer Graul <me@netali.de>
Date: Wed, 27 Nov 2024 09:43:49 +0100
Subject: [PATCH 2/3] zammad: use stdenvNoCC

---
 pkgs/by-name/za/zammad/package.nix | 4 ++--
 pkgs/by-name/za/zammad/update.nix  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/za/zammad/package.nix b/pkgs/by-name/za/zammad/package.nix
index 8a053f403c16..45a450653f12 100644
--- a/pkgs/by-name/za/zammad/package.nix
+++ b/pkgs/by-name/za/zammad/package.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ stdenvNoCC
 , lib
 , nixosTests
 , fetchFromGitHub
@@ -78,7 +78,7 @@ let
   };
 
 in
-stdenv.mkDerivation {
+stdenvNoCC.mkDerivation {
   inherit pname version src;
 
   buildInputs = [
diff --git a/pkgs/by-name/za/zammad/update.nix b/pkgs/by-name/za/zammad/update.nix
index 090fe338941b..ae11e20f0757 100644
--- a/pkgs/by-name/za/zammad/update.nix
+++ b/pkgs/by-name/za/zammad/update.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ stdenvNoCC
 , lib
 , makeWrapper
 , bundix
@@ -10,7 +10,7 @@
 , yarn2nix
 }:
 
-stdenv.mkDerivation rec {
+stdenvNoCC.mkDerivation rec {
   name = "zammad-update-script";
   installPhase = ''
     mkdir -p $out/bin

From 07d95b3be7b209932d9ccf643af38c2fee2f6ee4 Mon Sep 17 00:00:00 2001
From: Jennifer Graul <me@netali.de>
Date: Wed, 27 Nov 2024 09:46:07 +0100
Subject: [PATCH 3/3] zammad: format with nixfmt-rfc-style

---
 pkgs/by-name/za/zammad/package.nix | 65 +++++++++++++++++++-----------
 pkgs/by-name/za/zammad/update.nix  | 21 +++++-----
 2 files changed, 52 insertions(+), 34 deletions(-)

diff --git a/pkgs/by-name/za/zammad/package.nix b/pkgs/by-name/za/zammad/package.nix
index 45a450653f12..bf22b4b631cd 100644
--- a/pkgs/by-name/za/zammad/package.nix
+++ b/pkgs/by-name/za/zammad/package.nix
@@ -1,22 +1,23 @@
-{ stdenvNoCC
-, lib
-, nixosTests
-, fetchFromGitHub
-, applyPatches
-, bundlerEnv
-, defaultGemConfig
-, callPackage
-, procps
-, ruby
-, postgresql
-, imlib2
-, jq
-, moreutils
-, nodejs
-, pnpm
-, cacert
-, redis
-, dataDir ? "/var/lib/zammad"
+{
+  stdenvNoCC,
+  lib,
+  nixosTests,
+  fetchFromGitHub,
+  applyPatches,
+  bundlerEnv,
+  defaultGemConfig,
+  callPackage,
+  procps,
+  ruby,
+  postgresql,
+  imlib2,
+  jq,
+  moreutils,
+  nodejs,
+  pnpm,
+  cacert,
+  redis,
+  dataDir ? "/var/lib/zammad",
 }:
 
 let
@@ -61,7 +62,10 @@ let
         buildFlags = [ "--with-pg-config=${lib.getDev postgresql}/bin/pg_config" ];
       };
       rszr = attrs: {
-        buildInputs = [ imlib2 imlib2.dev ];
+        buildInputs = [
+          imlib2
+          imlib2.dev
+        ];
         buildFlags = [ "--without-imlib2-config" ];
       };
       mini_racer = attrs: {
@@ -136,15 +140,28 @@ stdenvNoCC.mkDerivation {
 
   passthru = {
     inherit rubyEnv;
-    updateScript = [ "${callPackage ./update.nix {}}/bin/update.sh" pname (toString ./.) ];
-    tests = { inherit (nixosTests) zammad; };
+    updateScript = [
+      "${callPackage ./update.nix { }}/bin/update.sh"
+      pname
+      (toString ./.)
+    ];
+    tests = {
+      inherit (nixosTests) zammad;
+    };
   };
 
   meta = with lib; {
     description = "Zammad, a web-based, open source user support/ticketing solution";
     homepage = "https://zammad.org";
     license = licenses.agpl3Plus;
-    platforms = [ "x86_64-linux" "aarch64-linux" ];
-    maintainers = with maintainers; [ n0emis taeer netali ];
+    platforms = [
+      "x86_64-linux"
+      "aarch64-linux"
+    ];
+    maintainers = with maintainers; [
+      n0emis
+      taeer
+      netali
+    ];
   };
 }
diff --git a/pkgs/by-name/za/zammad/update.nix b/pkgs/by-name/za/zammad/update.nix
index ae11e20f0757..b6c0771596b6 100644
--- a/pkgs/by-name/za/zammad/update.nix
+++ b/pkgs/by-name/za/zammad/update.nix
@@ -1,13 +1,14 @@
-{ stdenvNoCC
-, lib
-, makeWrapper
-, bundix
-, common-updater-scripts
-, xidel
-, jq
-, nix-prefetch-github
-, yarn
-, yarn2nix
+{
+  stdenvNoCC,
+  lib,
+  makeWrapper,
+  bundix,
+  common-updater-scripts,
+  xidel,
+  jq,
+  nix-prefetch-github,
+  yarn,
+  yarn2nix,
 }:
 
 stdenvNoCC.mkDerivation rec {