From c11127995defe25c8b4164389750672a25e61fc0 Mon Sep 17 00:00:00 2001
From: stuebinm
Date: Tue, 5 Mar 2024 03:05:17 +0100
Subject: 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
---
 pkgs/overlay.nix | 37 ++++++++++++++++++++++++-------------
 1 file changed, 24 insertions(+), 13 deletions(-)

(limited to 'pkgs/overlay.nix')

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;
-- 
cgit v1.2.3