3 files changed, 26 insertions, 21 deletions
diff --git a/pkgs/by-name/fu/fupdate-sys/package.nix b/pkgs/by-name/fu/fupdate-sys/package.nix
index 7fd4674b..6672c2f2 100644
--- a/pkgs/by-name/fu/fupdate-sys/package.nix
+++ b/pkgs/by-name/fu/fupdate-sys/package.nix
@@ -11,7 +11,7 @@
   writeShellApplication,
   # Dependencies
   git,
-  nixos-rebuild,
+  nixos-rebuild-ng,
   sudo,
   openssh,
   coreutils,
@@ -19,20 +19,25 @@
   gnugrep,
   gnused,
   systemd,
-}:
-writeShellApplication {
-  name = "fupdate-sys";
-  text = builtins.readFile ./fupdate-sys.sh;
-  inheritPath = false;
-  runtimeInputs = [
-    git
-    nixos-rebuild
-    sudo
-    openssh
-    coreutils
-    mktemp
-    gnugrep
-    gnused
-    systemd
-  ];
-}
+  lixPackageSets,
+}: let
+  nixos-rebuild-without-nix = nixos-rebuild-ng.override {
+    nix = lixPackageSets.latest.lix;
+  };
+in
+  writeShellApplication {
+    name = "fupdate-sys";
+    text = builtins.readFile ./fupdate-sys.sh;
+    inheritPath = false;
+    runtimeInputs = [
+      git
+      nixos-rebuild-without-nix
+      sudo
+      openssh
+      coreutils
+      mktemp
+      gnugrep
+      gnused
+      systemd
+    ];
+  }
diff --git a/pkgs/by-name/fu/fupdate/flake.nix b/pkgs/by-name/fu/fupdate/flake.nix
index cac507c8..22b0957f 100644
--- a/pkgs/by-name/fu/fupdate/flake.nix
+++ b/pkgs/by-name/fu/fupdate/flake.nix
@@ -16,7 +16,7 @@
     system = "x86_64-linux";
     sources = import ../../../../npins/full.nix {};
 
-    pkgs = sources.load "nixpkgs";
+    pkgs = (sources.loadFlake "nixpkgs").legacyPackages."${system}";
   in {
     devShells."${system}".default = pkgs.mkShell {
       packages = [
diff --git a/pkgs/by-name/fu/fupdate/update.sh b/pkgs/by-name/fu/fupdate/update.sh
index 8e36e13e..5ad524e8 100755
--- a/pkgs/by-name/fu/fupdate/update.sh
+++ b/pkgs/by-name/fu/fupdate/update.sh
@@ -10,5 +10,5 @@
 # You should have received a copy of the License along with this program.
 # If not, see <https://www.gnu.org/licenses/gpl-3.0.txt>.
 
-[ "$1" = "upgrade" ] && cargo upgrade
-cargo update
+[ "$1" = "upgrade" ] && cargo upgrade --incompatible allow --pinned allow --recursive true
+cargo update --recursive