From 6eac9547ea10f2540e17b6c74e67ac99aeac19a6 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Mon, 20 May 2024 19:00:05 +0300
Subject: [PATCH 1/3] Ship Plasma 6 ISOs

---
 mirror-nixos-branch.pl | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/mirror-nixos-branch.pl b/mirror-nixos-branch.pl
index b483428..e860928 100755
--- a/mirror-nixos-branch.pl
+++ b/mirror-nixos-branch.pl
@@ -219,8 +219,13 @@ if ($bucketReleases && $bucketReleases->head_key("$releasePrefix")) {
 
         # 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 @@ if ($channelName =~ /nixos/) {
 
         for my $artifact ("nixos-graphical",
                           "nixos-plasma5",
+                          "nixos-plasma6",
                           "nixos-gnome",
                           "nixos-minimal",
             )

From 3f573cb3b6b61d8b3bc57699d962ded82228b9ea Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 21 May 2024 21:42:43 +0300
Subject: [PATCH 2/3] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/526d051b128b82ae045a70e5ff1adf8e6dafa560' (2024-02-20)
  → 'github:NixOS/nixpkgs/f88df4bf25b729d78712c441fb0910f7085e9395' (2024-05-20)
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 5916bb8..1d27749 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1708440434,
-        "narHash": "sha256-XY+B9mbhL/i+Q6fP6gBQ6P76rv9rWtpjQiUJ+DGtaUg=",
+        "lastModified": 1716239187,
+        "narHash": "sha256-5oyOV5ZlqXYQ8RB6lvVrKxVBeBPE/ZsLY+qQKqSJLZM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "526d051b128b82ae045a70e5ff1adf8e6dafa560",
+        "rev": "f88df4bf25b729d78712c441fb0910f7085e9395",
         "type": "github"
       },
       "original": {

From e42797287537ca3ea11603a09bc77c0c32103512 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 21 May 2024 21:46:24 +0300
Subject: [PATCH 3/3] Update nix-index to latest git to fix https shenanigans

---
 flake.nix | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/flake.nix b/flake.nix
index f412f80..dab85cf 100644
--- a/flake.nix
+++ b/flake.nix
@@ -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 {