From b86b3de8bee5fd4a9694184a0ef2f26ab6a82cfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?m=C3=BCde?= Date: Sat, 4 Jul 2026 12:00:12 +0200 Subject: [PATCH] remove flake-parts indirection, nix flake update --- flake.lock | 64 +++++++++++++++++++++--------------------------------- flake.nix | 11 ++-------- 2 files changed, 27 insertions(+), 48 deletions(-) diff --git a/flake.lock b/flake.lock index 25afe99..c217ee8 100644 --- a/flake.lock +++ b/flake.lock @@ -274,14 +274,17 @@ }, "flake-parts": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib" + "nixpkgs-lib": [ + "nur", + "nixpkgs" + ] }, "locked": { - "lastModified": 1778716662, - "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=", + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { @@ -377,11 +380,11 @@ ] }, "locked": { - "lastModified": 1783024250, - "narHash": "sha256-Sz/AziSjRjYpKqDIU0Dtq2jidag+s7Cy+3yWFeL750E=", + "lastModified": 1783111238, + "narHash": "sha256-HvIW3WpBvkzi6BUMC1VHqYVnK5deQJcvB/m1bc6+pBc=", "ref": "refs/heads/main", - "rev": "7d8ca1f63a81b5adcb591ea6f6c78e490ecca533", - "revCount": 2290, + "rev": "5d597d92ea30e6e08fe555f197ded8a4cbc4aeb6", + "revCount": 2318, "type": "git", "url": "https://forge.darkest.space/hyperhive/hyperhive.git" }, @@ -543,11 +546,11 @@ ] }, "locked": { - "lastModified": 1782879771, - "narHash": "sha256-CEm+X6hosGyxp32UMt01xxa+Ei0c0NiIP2VqgxFDSwM=", + "lastModified": 1783050290, + "narHash": "sha256-4TYFxweErHBg/XvZJYGOxhTLGufuFGiHB5FGXo/r11E=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "956507929a1cc152ec509e91765efe77f54297b5", + "rev": "ca0203653d5e5c50e9e64c98d66a021b824a6da6", "type": "github" }, "original": { @@ -656,28 +659,13 @@ "type": "github" } }, - "nixpkgs-lib": { - "locked": { - "lastModified": 1777168982, - "narHash": "sha256-GOkGPcboWE9BmGCRMLX3worL4EMnsnG8MyKmXNeYuhQ=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "f5901329dade4a6ea039af1433fb087bd9c1fe14", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, "nixpkgs-unstable": { "locked": { - "lastModified": 1782821651, - "narHash": "sha256-D5jO0ME1lA9bDHnd5kVawBwItG/N4oZr3FlXmMzLec8=", + "lastModified": 1782918843, + "narHash": "sha256-ETYnV9U7Sr+A45dohzZdfCZKOss4qrTkO+wgNZNvEc0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e52c192be9d7b2c4bd4aed326c8731b35f8bb75c", + "rev": "e8273b29fe1390ec8d4603f2477357555291432e", "type": "github" }, "original": { @@ -728,19 +716,17 @@ }, "nur": { "inputs": { - "flake-parts": [ - "flake-parts" - ], + "flake-parts": "flake-parts", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1782918266, - "narHash": "sha256-EMBwRkkc1MRhP6PCkzt90uhXTBnnj9PrJWlfpNFAiJo=", + "lastModified": 1783111892, + "narHash": "sha256-6uH3J5ausCNpM0V497qDIEDHyoxDSuLynOY/2TyZlzU=", "owner": "nix-community", "repo": "NUR", - "rev": "6dbf53fb2804bff202858a38c062153eb7968ddf", + "rev": "e6fb590536afb1fe239931aceef5a113553d889a", "type": "github" }, "original": { @@ -795,7 +781,6 @@ }, "root": { "inputs": { - "flake-parts": "flake-parts", "home-manager": "home-manager", "hyperhive": "hyperhive", "hyperhive-website": "hyperhive-website", @@ -940,6 +925,7 @@ "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", "flake-parts": [ + "nur", "flake-parts" ], "gnome-shell": "gnome-shell", @@ -956,11 +942,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1782770679, - "narHash": "sha256-+8RpmHKn5n2tYmoRCwiKJ6PeU85q15qnXzGQ2WGMn9Q=", + "lastModified": 1782925252, + "narHash": "sha256-A/LK7mgBO+JwXP2464rlUnSxsgRFJTU7hkHFji0qU70=", "owner": "nix-community", "repo": "stylix", - "rev": "3ed763829fc06d32cab3c1f31672379a1f53450e", + "rev": "8d56f0f6e9fd75e056a773b5ce3fc1b073c37dce", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 2dca59f..7ef00c0 100644 --- a/flake.nix +++ b/flake.nix @@ -9,10 +9,6 @@ }; #keep-sorted start block=yes - flake-parts = { - url = "github:hercules-ci/flake-parts"; - #inputs.nixpkgs.follows = "nixpkgs"; - }; hyperhive = { url = "git+https://forge.darkest.space/hyperhive/hyperhive.git"; inputs = { @@ -61,10 +57,7 @@ }; nur = { url = "github:nix-community/NUR"; - inputs = { - nixpkgs.follows = "nixpkgs"; - flake-parts.follows = "flake-parts"; - }; + inputs.nixpkgs.follows = "nixpkgs"; }; servicepoint-cli = { url = "git+https://git.berlin.ccc.de/servicepoint/servicepoint-cli.git"; @@ -91,7 +84,7 @@ inputs = { nixpkgs.follows = "nixpkgs"; nur.follows = "nur"; - flake-parts.follows = "flake-parts"; + flake-parts.follows = "nur/flake-parts"; }; }; treefmt-nix = {