From b22dfd6f96f449e4d5fa3f2715a0f899f9672c1c Mon Sep 17 00:00:00 2001
From: Greg Hellings <greg.hellings@gmail.com>
Date: Mon, 22 Jan 2024 18:37:41 +0000
Subject: [PATCH] Fix recursion and coiper builds

---
 home/home.nix        | 3 ++-
 modules/default.nix  | 7 ++-----
 overlays/default.nix | 8 +++++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/home/home.nix b/home/home.nix
index 1c34309..cc236e2 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -35,6 +35,7 @@
 	home.stateVersion = "23.05";
 	home.packages = with pkgs; [
 		bitwarden-cli
+		copier
 		diffutils
 		findutils
 		gh
@@ -53,5 +54,5 @@
 		tree
 		unzip
 		wget
-	] ++ (if (pkgs.copier.version == "9.1.0") then [ pkgs.copier ] else []);
+	];
 }
diff --git a/modules/default.nix b/modules/default.nix
index 7ac1448..1841394 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -1,13 +1,10 @@
 { pkgs, lib, ... }:
 
 let
-	inherit (lib.strings) hasSuffix;
-	system = pkgs.system;
-	inherit (pkgs.stdenv) isDarwin isLinux;
 in {
 	imports = [
-	]
-	++ (if (isLinux) then [./linux] else []);
+		./linux
+	];
 
 	# Enable flakes
 	nix = {
diff --git a/overlays/default.nix b/overlays/default.nix
index 951b9f1..511f4f2 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -26,6 +26,8 @@ let
 
 	buildFirefoxXpiAddon = final.nur.repos.rycee.lib.buildFirefoxXpiAddon;
 
+	is2405 = prev.lib.versionAtLeast prev.lib.version "24.05";
+
 in rec {
 	gregpy = myPython;
 
@@ -44,8 +46,8 @@ in rec {
 	aacs = prev.callPackage ./aacs.nix {};
 	brew = prev.callPackage ./homebrew.nix {};
 	configure_aws_creds = prev.callPackage ./configure_aws_creds.nix {};
-	copier = prev.copier.overridePythonAttrs (old: {
-		version = "9.1.1";
+	copier = (if is2405 then prev.copier.overridePythonAttrs (old: {
+		version = "9.1.0";
 		src = final.fetchFromGitHub {
 			owner = "copier-org";
 			repo = "copier";
@@ -53,7 +55,7 @@ in rec {
 			hash = "sha256-x5r7Xv4lAOMkR+UIEeSY7LvbYMLpTWYuICYe9ygz1tA=";
 			postFetch = "rm $out/tests/demo/doc/ma*ana.txt";
 		};
-	});
+	}) else prev.copier);
 	enwiki-dump = prev.callPackage ./enwiki-dump.nix {};
 	hms = prev.callPackage ./hms {
 		pkgs = final.pkgs;