From 6f5a8d1f7edf2a25a4d6dc02c5a60071779de8d7 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 13 Sep 2024 23:50:29 +0200
Subject: [PATCH] auto-upgrade: `--update-input` -> `--override-input`

---
 base/services/auto-upgrade.nix |  7 +++++--
 flake.lock                     | 10 ++++++----
 flake.nix                      |  4 ++--
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/base/services/auto-upgrade.nix b/base/services/auto-upgrade.nix
index eb0de6e..7bfe0ab 100644
--- a/base/services/auto-upgrade.nix
+++ b/base/services/auto-upgrade.nix
@@ -4,8 +4,11 @@
     enable = true;
     flake = "git+https://git.pvv.ntnu.no/Drift/pvv-nixos-config.git";
     flags = [
-      "--update-input" "nixpkgs"
-      "--update-input" "nixpkgs-unstable"
+      # --update-input is deprecated since nix 2.22, and removed in lix 2.90
+      # https://git.lix.systems/lix-project/lix/issues/400
+      "--refresh"
+      "--override-input" "nixpkgs" "github:nixos/nixpkgs/nixos-24.05-small"
+      "--override-input" "nixpkgs-unstable" "github:nixos/nixpkgs/nixos-unstable-small"
       "--no-write-lock-file"
     ];
   };
diff --git a/flake.lock b/flake.lock
index 80305ab..477cf28 100644
--- a/flake.lock
+++ b/flake.lock
@@ -166,9 +166,10 @@
         "type": "github"
       },
       "original": {
-        "id": "nixpkgs",
+        "owner": "NixOS",
         "ref": "nixos-24.05-small",
-        "type": "indirect"
+        "repo": "nixpkgs",
+        "type": "github"
       }
     },
     "nixpkgs-stable": {
@@ -197,9 +198,10 @@
         "type": "github"
       },
       "original": {
-        "id": "nixpkgs",
+        "owner": "NixOS",
         "ref": "nixos-unstable-small",
-        "type": "indirect"
+        "repo": "nixpkgs",
+        "type": "github"
       }
     },
     "pvv-calendar-bot": {
diff --git a/flake.nix b/flake.nix
index 0286fdf..6d146bf 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,8 +2,8 @@
   description = "PVV System flake";
 
   inputs = {
-    nixpkgs.url = "nixpkgs/nixos-24.05-small";
-    nixpkgs-unstable.url = "nixpkgs/nixos-unstable-small";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05-small"; # remember to also update the url in base/services/auto-upgrade.nix
+    nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable-small";
 
     sops-nix.url = "github:Mic92/sops-nix";
     sops-nix.inputs.nixpkgs.follows = "nixpkgs";