Merge pull request #71 from K900/plasma-6-isos

Ship Plasma 6 ISOs

Author: mweinelt

flake.lock

@@ -6,8 +6,24 @@
   outputs = { self, nixpkgs }:
     {
       overlays.default = final: prev: {
-        nix-index-unwrapped = prev.nix-index-unwrapped.overrideAttrs(old: {
-          patches = [ ./nix-index-https.patch ];
+        nix-index-unwrapped = (prev.nix-index-unwrapped.override {
+          rustPlatform = final.rustPackages_1_76.rustPlatform;
+        }).overrideAttrs(old: rec {
+          version = "0.1.7-unstable-2024-05-11";
+          
+          # commit with proper HTTPS fixes
+          # FIXME: unpin after next release 
+          src = final.fetchFromGitHub {
+            owner = "nix-community";
+            repo = "nix-index";
+            rev = "195fb3525038e40836b8d286371365f5e7857c0c";
+            hash = "sha256-Cw6Q9rHcLjPKzab5O4G7cetFAaTZCex2VLvYIhJCbpg=";
+          };
+
+          cargoDeps = final.rustPlatform.fetchCargoTarball {
+            inherit src;
+            hash = "sha256-Pl56f8FU/U/x4gkTt5yXxE8FVQ/pGBDuxxP7HrfsaBc=";
+          };
         });
 
         nixos-channel-native-programs = with final; stdenv.mkDerivation {

flake.nix

@@ -219,8 +219,13 @@ sub fetch {
 
         # All of these jobs are not present in small channels
         if ($channelName !~ /-small/) {
-            downloadFile("nixos.iso_plasma5.aarch64-linux");
-            downloadFile("nixos.iso_plasma5.x86_64-linux");
+            if ($channelName =~ /nixos-2[0123]/) {
+                downloadFile("nixos.iso_plasma5.aarch64-linux");
+                downloadFile("nixos.iso_plasma5.x86_64-linux");
+            } else {
+                downloadFile("nixos.iso_plasma6.aarch64-linux");
+                downloadFile("nixos.iso_plasma6.x86_64-linux");
+            }
 
             downloadFile("nixos.iso_gnome.aarch64-linux");
             downloadFile("nixos.iso_gnome.x86_64-linux");
@@ -357,6 +362,7 @@ sub redirect {
 
         for my $artifact ("nixos-graphical",
                           "nixos-plasma5",
+                          "nixos-plasma6",
                           "nixos-gnome",
                           "nixos-minimal",
             )