diff --git a/flake.lock b/flake.lock index 4e1e77d..f92b563 100755 --- a/flake.lock +++ b/flake.lock @@ -79,7 +79,6 @@ "elm-spa_2": { "inputs": { "nixpkgs": [ - "upRootNutrition", "mkElmDerivation", "nixpkgs" ] @@ -125,7 +124,6 @@ "elm-watch_2": { "inputs": { "nixpkgs": [ - "upRootNutrition", "mkElmDerivation", "nixpkgs" ], @@ -362,42 +360,6 @@ "type": "github" } }, - "flake-parts_7": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib_4" - }, - "locked": { - "lastModified": 1759362264, - "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "758cf7296bee11f1706a574c77d072b8a7baa881", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_8": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib_5" - }, - "locked": { - "lastModified": 1759362264, - "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "758cf7296bee11f1706a574c77d072b8a7baa881", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "flake-root": { "locked": { "lastModified": 1723604017, @@ -1085,14 +1047,16 @@ "inputs": { "elm-spa": "elm-spa_2", "elm-watch": "elm-watch_2", - "nixpkgs": "nixpkgs_6" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { - "lastModified": 1759023814, - "narHash": "sha256-uBmxzIRNLyW69/mOkSkbSTmuQG/zu68dNEnt0xTiYzs=", + "lastModified": 1763862901, + "narHash": "sha256-Ws6dceAR8Yr8EHwLBEcwZ4nD9kxACFurFO/UbCJor5g=", "owner": "jeslie0", "repo": "mkElmDerivation", - "rev": "f2b9966af4a7965cd47ac707ab81aeef9a8a3fa6", + "rev": "d91d3befe2292b42e1755407e08abc934269d8a1", "type": "github" }, "original": { @@ -1271,36 +1235,6 @@ "type": "github" } }, - "nixpkgs-lib_4": { - "locked": { - "lastModified": 1754788789, - "narHash": "sha256-x2rJ+Ovzq0sCMpgfgGaaqgBSwY+LST+WbZ6TytnT9Rk=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "a73b9c743612e4244d865a2fdee11865283c04e6", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, - "nixpkgs-lib_5": { - "locked": { - "lastModified": 1754788789, - "narHash": "sha256-x2rJ+Ovzq0sCMpgfgGaaqgBSwY+LST+WbZ6TytnT9Rk=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "a73b9c743612e4244d865a2fdee11865283c04e6", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, "nixpkgs-stable": { "locked": { "lastModified": 1762756533, @@ -1349,22 +1283,6 @@ "type": "github" } }, - "nixpkgs-stable_4": { - "locked": { - "lastModified": 1759281824, - "narHash": "sha256-FIBE1qXv9TKvSNwst6FumyHwCRH3BlWDpfsnqRDCll0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "5b5be50345d4113d04ba58c444348849f5585b4a", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-25.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1696757521, @@ -1429,70 +1347,6 @@ "type": "github" } }, - "nixpkgs_6": { - "locked": { - "lastModified": 1696757521, - "narHash": "sha256-cfgtLNCBLFx2qOzRLI6DHfqTdfWI+UbvsKYa3b3fvaA=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "2646b294a146df2781b1ca49092450e8a32814e1", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_7": { - "locked": { - "lastModified": 1759036355, - "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_8": { - "locked": { - "lastModified": 1754340878, - "narHash": "sha256-lgmUyVQL9tSnvvIvBp7x1euhkkCho7n3TMzgjdvgPoU=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "cab778239e705082fe97bb4990e0d24c50924c04", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_9": { - "locked": { - "lastModified": 1754340878, - "narHash": "sha256-lgmUyVQL9tSnvvIvBp7x1euhkkCho7n3TMzgjdvgPoU=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "cab778239e705082fe97bb4990e0d24c50924c04", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "npm-fix": { "inputs": { "nixpkgs": [ @@ -1519,7 +1373,6 @@ "npm-fix_2": { "inputs": { "nixpkgs": [ - "upRootNutrition", "mkElmDerivation", "elm-watch", "nixpkgs" @@ -1672,6 +1525,7 @@ "lix": "lix", "lix-module": "lix-module", "microvm": "microvm", + "mkElmDerivation": "mkElmDerivation_2", "niri": "niri", "nixcord": "nixcord", "nixpkgs": "nixpkgs_5", @@ -1683,10 +1537,8 @@ "systems": "systems_5", "treefmt-nix": "treefmt-nix_3", "tuios": "tuios", - "upRootNutrition": "upRootNutrition", "waybar": "waybar", - "wpaperd": "wpaperd", - "zookeeper": "zookeeper" + "wpaperd": "wpaperd" } }, "rust-overlay": { @@ -1913,42 +1765,6 @@ "type": "github" } }, - "treefmt-nix_5": { - "inputs": { - "nixpkgs": "nixpkgs_8" - }, - "locked": { - "lastModified": 1758728421, - "narHash": "sha256-ySNJ008muQAds2JemiyrWYbwbG+V7S5wg3ZVKGHSFu8=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "5eda4ee8121f97b218f7cc73f5172098d458f1d1", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, - "treefmt-nix_6": { - "inputs": { - "nixpkgs": "nixpkgs_9" - }, - "locked": { - "lastModified": 1760120816, - "narHash": "sha256-gq9rdocpmRZCwLS5vsHozwB6b5nrOBDNc2kkEaTXHfg=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "761ae7aff00907b607125b2f57338b74177697ed", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, "tuios": { "inputs": { "devshell": "devshell", @@ -1976,28 +1792,6 @@ "type": "github" } }, - "upRootNutrition": { - "inputs": { - "flake-parts": "flake-parts_7", - "mkElmDerivation": "mkElmDerivation_2", - "nixpkgs": "nixpkgs_7", - "nixpkgs-stable": "nixpkgs-stable_4", - "treefmt-nix": "treefmt-nix_5" - }, - "locked": { - "lastModified": 1761538643, - "narHash": "sha256-467x2JQVdMGnCuAn0Ci2MnRMYg7UwGtYywdI4Tyz4A8=", - "ref": "refs/heads/main", - "rev": "ab8a9b6ed63be60c3fd2f49ea2add13a40790c51", - "revCount": 255, - "type": "git", - "url": "ssh://git@gitlab.com/uprootnutrition/website.git" - }, - "original": { - "type": "git", - "url": "ssh://git@gitlab.com/uprootnutrition/website.git" - } - }, "waybar": { "inputs": { "flake-compat": "flake-compat_5", @@ -2114,28 +1908,6 @@ "repo": "xwayland-satellite", "type": "github" } - }, - "zookeeper": { - "inputs": { - "flake-parts": "flake-parts_8", - "nixpkgs": [ - "nixpkgs" - ], - "treefmt-nix": "treefmt-nix_6" - }, - "locked": { - "lastModified": 1763275059, - "narHash": "sha256-ovKjevjjHhWqkq8iP3nvnoRwOQGX2hVGthykrDwR7LY=", - "ref": "refs/heads/main", - "rev": "940000066b81f4c7cb277f4f23ab4a0e32b8ce77", - "revCount": 9, - "type": "git", - "url": "ssh://git@gitlab.com/uprootnutrition/zookeeper.git" - }, - "original": { - "type": "git", - "url": "ssh://git@gitlab.com/uprootnutrition/zookeeper.git" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 4c4d320..fa3799c 100755 --- a/flake.nix +++ b/flake.nix @@ -76,9 +76,6 @@ url = "github:microvm-nix/microvm.nix"; inputs.nixpkgs.follows = "nixpkgs"; }; - upRootNutrition = { - url = "git+ssh://git@gitlab.com/uprootnutrition/website.git"; - }; linkpage = { url = "git+ssh://git@gitlab.com/uprootnutrition/linkpage.git"; }; @@ -86,8 +83,8 @@ url = "git+ssh://git@gitlab.com/uprootnutrition/filesorter.git"; inputs.nixpkgs.follows = "nixpkgs"; }; - zookeeper = { - url = "git+ssh://git@gitlab.com/uprootnutrition/zookeeper.git"; + mkElmDerivation = { + url = "github:jeslie0/mkElmDerivation"; inputs.nixpkgs.follows = "nixpkgs"; }; }; @@ -99,6 +96,7 @@ inputs.treefmt-nix.flakeModule ./lib ./modules + ./packages ./parts ];