diff --git a/flake.lock b/flake.lock index 9dbb044b..787d8d4c 100644 --- a/flake.lock +++ b/flake.lock @@ -16,50 +16,6 @@ "type": "github" } }, - "flake-parts": { - "inputs": { - "nixpkgs-lib": [ - "nix-update", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1698882062, - "narHash": "sha256-HkhafUayIqxXyHH1X8d9RDl1M2CkFgZLjKD3MzabiEo=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "8c9fa2545007b49a5db5f650ae91f227672c3877", - "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": 1709726721, - "narHash": "sha256-N0KdNvaWZF2Wn/sQgIpXzXYaYiSQcVxi7P3H/uoSkcg=", - "owner": "lilyinstarlight", - "repo": "nix-update", - "rev": "816d30da62f6a04fcbde8312246204920f73e7ae", - "type": "github" - }, - "original": { - "owner": "lilyinstarlight", - "ref": "tmp/fixed", - "repo": "nix-update", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1711001935, @@ -79,30 +35,8 @@ "root": { "inputs": { "flake-compat": "flake-compat", - "nix-update": "nix-update", "nixpkgs": "nixpkgs" } - }, - "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "nix-update", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1698438538, - "narHash": "sha256-AWxaKTDL3MtxaVTVU5lYBvSnlspOS0Fjt8GxBgnU0Do=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "5deb8dc125a9f83b65ca86cf0c8167c46593e0b1", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index bbec6bc1..4479d651 100644 --- a/flake.nix +++ b/flake.nix @@ -2,19 +2,13 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - # TODO: switch to `github:Mic92/nix-update` once Mic92/nix-update#227, Mic92/nix-update#228, and Mic92/nix-update#229 are merged - nix-update = { - url = "github:lilyinstarlight/nix-update/tmp/fixed"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - flake-compat = { url = "github:nix-community/flake-compat"; flake = false; }; }; - outputs = { self, nixpkgs, nix-update, ... }: let + outputs = { self, nixpkgs, ... }: let forAllSystems = nixpkgs.lib.genAttrs [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; in { lib = { @@ -37,7 +31,7 @@ runtimeInputs = [ pkgs.coreutils - nix-update.packages.${system}.default + pkgs.nix-update ]; text = ''