Better cache file naming

2024-06-26 20:57:47 -05:00
parent 31f14a5e8f
commit bc1f23a47b
6 changed files with 48 additions and 47 deletions
@@ -108,15 +108,7 @@
 					(builtins.replaceStrings ["QEMU_MATRIX" "VBOX_MATRIX" "HYPERV_MATRIX"] [qemu_list vbox_list hyperv_list]
 						(builtins.readFile ./.gitlab-ci-build.yml.in)
 					);
-				cache = pkgs.writeShellApplication {
-					name = "cache-isos";
-					runtimeInputs = with pkgs; [
-						curl
-						minio-client
-						packer
-					];
-					text = builtins.readFile ./cache.sh;
-				};
+				cache = pkgs.callPackage (import ./nix/cache.nix) { inherit active distroFile; };
 				cache-restore = pkgs.writeShellApplication {
 					name = "cache-restore";
 					runtimeInputs = with pkgs; [