From c5ef1bbc54913d3a868da15c809c3a7c2a30c1be Mon Sep 17 00:00:00 2001
From: Lily Foster <lily@lily.flowers>
Date: Tue, 24 Sep 2024 15:42:22 -0400
Subject: [PATCH] flake: remove now-unnecessary nix-update hack

---
 flake.lock | 65 ------------------------------------------------------
 flake.nix  | 10 +--------
 2 files changed, 1 insertion(+), 74 deletions(-)

diff --git a/flake.lock b/flake.lock
index 6f91b2e1..cb627abc 100644
--- a/flake.lock
+++ b/flake.lock
@@ -16,49 +16,6 @@
         "type": "github"
       }
     },
-    "flake-parts": {
-      "inputs": {
-        "nixpkgs-lib": [
-          "nix-update",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1719994518,
-        "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
-    "nix-update": {
-      "inputs": {
-        "flake-parts": "flake-parts",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "treefmt-nix": "treefmt-nix"
-      },
-      "locked": {
-        "lastModified": 1726651036,
-        "narHash": "sha256-6kR4UEBZvbQNoR3l8/It5ZTCC+mB14jzj7MNnFoQJwE=",
-        "owner": "Mic92",
-        "repo": "nix-update",
-        "rev": "7dd0e4467c571ebb7e53d9e3d40c49f75473efdf",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Mic92",
-        "repo": "nix-update",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1726937504,
@@ -94,7 +51,6 @@
     "root": {
       "inputs": {
         "flake-compat": "flake-compat",
-        "nix-update": "nix-update",
         "nixpkgs": "nixpkgs",
         "nixpkgs-stable": "nixpkgs-stable",
         "rust-overlay": "rust-overlay"
@@ -119,27 +75,6 @@
         "repo": "rust-overlay",
         "type": "github"
       }
-    },
-    "treefmt-nix": {
-      "inputs": {
-        "nixpkgs": [
-          "nix-update",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1719887753,
-        "narHash": "sha256-p0B2r98UtZzRDM5miGRafL4h7TwGRC4DII+XXHDHqek=",
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "rev": "bdb6355009562d8f9313d9460c0d3860f525bc6c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "type": "github"
-      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index b44f2efb..bd2e0ca8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -13,12 +13,6 @@
       url = "github:nix-community/flake-compat";
       flake = false;
     };
-
-    # TODO: remove when nix-update is bumped in nixpkgs for a version addressing <https://github.com/Mic92/nix-update/pull/246#issuecomment-2323018854>
-    nix-update = {
-      url = "github:Mic92/nix-update";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
   };
 
   outputs = { self, nixpkgs, nixpkgs-stable, rust-overlay, ... }: let
@@ -52,9 +46,7 @@
 
     legacyPackages = forAllSystems (system: let
       lib = nixpkgs.lib;
-      # TODO: revert when nix-update is bumped in nixpkgs for a version addressing <https://github.com/Mic92/nix-update/pull/246#issuecomment-2323018854>
-      #pkgs = nixpkgs.legacyPackages.${system};
-      pkgs = nixpkgs.legacyPackages.${system}.extend (final: prev: { nix-update = self.inputs.nix-update.packages.${system}.default // { nix-update-script = prev.nix-update.nix-update-script.override { inherit (final) nix-update; }; meta = prev.nix-update.meta; }; });
+      pkgs = nixpkgs.legacyPackages.${system};
     in {
       update = pkgs.writeShellApplication {
         name = "cosmic-unstable-update";