restructure & general cleanup

 - pkgs/ should now also contain all package overrides
 - pkgs/patches/ now contains all patches
 - nix flake info succeeds again
 - still not sure what to do about scripts
 - services which are not used should not be kept around this long

14 files changed, 28 insertions, 17 deletions

diff --git a/pkgs/crs-tools.nix b/pkgs/crs-tools.nix
index 4993b53..07032b8 100644
--- a/pkgs/crs-tools.nix
+++ b/pkgs/crs-tools.nix
@@ -27,7 +27,7 @@ rec {
     };
 
     patches = [
-      ./crs-tools-add-lockfile.patch
+      ./patches/crs-tools-add-lockfile.patch
     ];
 
     buildInputs = [ php php.packages.composer ];
diff --git a/pkgs/galmon.nix b/pkgs/galmon.nix
index 9331e37..be6b89e 100644
--- a/pkgs/galmon.nix
+++ b/pkgs/galmon.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
     fetchSubmodules = true;
   };
 
-  patches = [ ./galmon.patch ];
+  patches = [ ./patches/galmon-fix-linker.patch ];
 
   buildInputs = [
     protobuf pkg-config h2o openssl eigen ncurses5 zstd zlib curl gitMinimal abseil-cpp
diff --git a/pkgs/glitchtip.nix b/pkgs/glitchtip.nix
index dcecd0e..cdd832a 100644
--- a/pkgs/glitchtip.nix
+++ b/pkgs/glitchtip.nix
@@ -18,7 +18,7 @@ let
     projectDir = src;
 
     patches = [
-      ./glitchtip-fix-poetry-name.patch
+      ./patches/glitchtip-fix-poetry-name.patch
     ];
 
     # a bunch of python packages seem to misdeclare their dependencies
diff --git a/pkgs/overlay.nix b/pkgs/overlay.nix
index f38e7e0..ae1741b 100644
--- a/pkgs/overlay.nix
+++ b/pkgs/overlay.nix
@@ -12,12 +12,11 @@ let
 in
 {
   beamPackages = super.beam.packagesWith self.erlang;
-  elixir = self.beamPackages.elixir_1_14;
+  elixir = self.beamPackages.elixir;
   erlang = super.erlang_nox;
 
   inherit (unstable) lean4;
 
-
   #### packages which are actually in use somewhere ####
 
   galmon-core = self.callPackage ./galmon.nix {};
@@ -25,7 +24,19 @@ in
 
   hikari = super.hikari.overrideAttrs (old: {
     makeFlags = old.makeFlags ++ [ "DEBUG=YES" ];
-    patches = [ ./hikari-gtk4.patch ];
+    patches = [ ./patches/hikari-gtk4.patch ];
+  });
+
+  akkoma-fe = super.akkoma-frontends.akkoma-fe.overrideAttrs (old: {
+    patches = [ ./patches/akkoma-fe-toki-pona.patch ];
+  });
+
+  akkoma = super.akkoma.overrideAttrs (old: {
+    patches = [ ./patches/akkoma-toki-pona.patch ];
+  });
+
+  cgit = super.cgit.overrideAttrs (old: {
+    patches = [ ./patches/cgit-main-instead-of-master.patch ];
   });
 
   almanac = self.rustPlatform.buildRustPackage rec {
@@ -44,11 +55,10 @@ in
       rev = "74f9d13d4a88e32a32c5d8b10e5ae1a2442a7a92";
       sha256 = "sha256-SOnqb/ptMoPI+G96nI/dQHOsvjlaDa6YSBEjy77kRdY=";
     }}/rustex";
-    # patches = [ ./rustex.patch ];
     postPatch = ''
-      ln -s ${./rustex-cargo.lock} Cargo.lock
+      ln -s ${./patches/rustex-cargo.lock} Cargo.lock
     '';
-    cargoLock.lockFile = ./rustex-cargo.lock;
+    cargoLock.lockFile = ./patches/rustex-cargo.lock;
     doCheck = false;
   };
 
@@ -146,13 +156,14 @@ in
     });
   });
 
-  glitchtip = (self.callPackage ./glitchtip.nix {
-    python = super.python310.override ({
-      packageOverrides = self: super: {
-        django = super.django_4;
-      };
-    });
-  });
+  # currently broken because poetry2nix was moved out of nixpkgs
+  # glitchtip = (self.callPackage ./glitchtip.nix {
+  #   python = super.python310.override ({
+  #     packageOverrides = self: super: {
+  #       django = super.django_4;
+  #     };
+  #   });
+  # });
 
   crs-tracker = crs-tools.tracker;
   crs-php = crs-tools.php;
diff --git a/flora/services/akkoma-fe-toki-pona.patch b/pkgs/patches/akkoma-fe-toki-pona.patch
index 281fdfc..281fdfc 100644
--- a/flora/services/akkoma-fe-toki-pona.patch
+++ b/pkgs/patches/akkoma-fe-toki-pona.patch
diff --git a/flora/services/akkoma-toki-pona.patch b/pkgs/patches/akkoma-toki-pona.patch
index 4cff3fa..4cff3fa 100644
--- a/flora/services/akkoma-toki-pona.patch
+++ b/pkgs/patches/akkoma-toki-pona.patch
diff --git a/flora/services/0001-main-instead-of-master-branch.patch b/pkgs/patches/cgit-main-instead-of-master.patch
index 21f6b00..21f6b00 100644
--- a/flora/services/0001-main-instead-of-master-branch.patch
+++ b/pkgs/patches/cgit-main-instead-of-master.patch
diff --git a/pkgs/crs-tools-add-lockfile.patch b/pkgs/patches/crs-tools-add-lockfile.patch
index a8cd3ce..a8cd3ce 100644
--- a/pkgs/crs-tools-add-lockfile.patch
+++ b/pkgs/patches/crs-tools-add-lockfile.patch
diff --git a/pkgs/galmon.patch b/pkgs/patches/galmon-fix-linker.patch
index f53c504..f53c504 100644
--- a/pkgs/galmon.patch
+++ b/pkgs/patches/galmon-fix-linker.patch
diff --git a/pkgs/glitchtip-fix-poetry-name.patch b/pkgs/patches/glitchtip-fix-poetry-name.patch
index 9cc82bd..9cc82bd 100644
--- a/pkgs/glitchtip-fix-poetry-name.patch
+++ b/pkgs/patches/glitchtip-fix-poetry-name.patch
diff --git a/pkgs/hikari-gtk4.patch b/pkgs/patches/hikari-gtk4.patch
index 68d8cf1..68d8cf1 100644
--- a/pkgs/hikari-gtk4.patch
+++ b/pkgs/patches/hikari-gtk4.patch
diff --git a/pkgs/radicle-remove-curl-script.patch b/pkgs/patches/radicle-remove-curl-script.patch
index ea8905d..ea8905d 100644
--- a/pkgs/radicle-remove-curl-script.patch
+++ b/pkgs/patches/radicle-remove-curl-script.patch
diff --git a/pkgs/rustex-cargo.lock b/pkgs/patches/rustex-cargo.lock
index c26343b..c26343b 100644
--- a/pkgs/rustex-cargo.lock
+++ b/pkgs/patches/rustex-cargo.lock
diff --git a/pkgs/radicle.nix b/pkgs/radicle.nix
index ff2ed8b..6a3ad9d 100644
--- a/pkgs/radicle.nix
+++ b/pkgs/radicle.nix
@@ -8,7 +8,7 @@
       hash = "sha256-bdXsK01mLrz4g8rVlMQfZDB+p7ldMIsTJP7jfGeobkM=";
     };
 
-    patches = [ ./radicle-remove-curl-script.patch ];
+    patches = [ ./patches/radicle-remove-curl-script.patch ];
     postPatch = ''
       patchShebangs scripts/*
       ${if config == null then "" else ''