From 69a56db22a89a4ee5803ad629993f3c388c8400d Mon Sep 17 00:00:00 2001 From: noe Date: Sat, 23 Mar 2024 16:58:17 -0400 Subject: [PATCH] fix flake stuff --- flake.lock | 66 +++++++++++++++++++++++++-- flake.nix | 4 ++ nixos/hosts/ingress-proxy/default.nix | 2 +- 3 files changed, 67 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index 20f95a6..33bac06 100644 --- a/flake.lock +++ b/flake.lock @@ -155,6 +155,27 @@ "type": "github" } }, + "doll-repair": { + "inputs": { + "flake-parts": "flake-parts", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1711225514, + "narHash": "sha256-bjYx6jdT9Xsq7/8/FUElYiMYEcXynrEf0HJLRNsDb70=", + "ref": "refs/heads/main", + "rev": "3ea8e0e7f321941a8219151a21b40cf91afa68a4", + "revCount": 1, + "type": "git", + "url": "https://codeberg.org/noe/doll.repair" + }, + "original": { + "type": "git", + "url": "https://codeberg.org/noe/doll.repair" + } + }, "fenix": { "inputs": { "nixpkgs": [ @@ -271,6 +292,24 @@ } }, "flake-parts": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1709336216, + "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_2": { "inputs": { "nixpkgs-lib": [ "nixvim", @@ -291,9 +330,9 @@ "type": "github" } }, - "flake-parts_2": { + "flake-parts_3": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib" + "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { "lastModified": 1709336216, @@ -605,6 +644,24 @@ "type": "github" } }, + "nixpkgs-lib_2": { + "locked": { + "dir": "lib", + "lastModified": 1709237383, + "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8", + "type": "github" + }, + "original": { + "dir": "lib", + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-master": { "locked": { "lastModified": 1711178010, @@ -785,7 +842,7 @@ "inputs": { "devshell": "devshell", "flake-compat": "flake-compat_5", - "flake-parts": "flake-parts", + "flake-parts": "flake-parts_2", "home-manager": "home-manager_2", "nix-darwin": "nix-darwin", "nixpkgs": [ @@ -809,7 +866,7 @@ }, "noe-sh": { "inputs": { - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts_3", "nixpkgs": [ "nixpkgs" ] @@ -889,6 +946,7 @@ "apple-silicon": "apple-silicon", "conduit": "conduit", "darwin": "darwin", + "doll-repair": "doll-repair", "home-manager": "home-manager", "kde2nix": "kde2nix", "nixos-generators": "nixos-generators", diff --git a/flake.nix b/flake.nix index c845368..fcac176 100644 --- a/flake.nix +++ b/flake.nix @@ -51,6 +51,10 @@ url = "git+https://codeberg.org/noe/personal-site"; inputs.nixpkgs.follows = "nixpkgs"; }; + doll-repair = { + url = "git+https://codeberg.org/noe/doll.repair"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; nixConfig = { diff --git a/nixos/hosts/ingress-proxy/default.nix b/nixos/hosts/ingress-proxy/default.nix index f20989b..7a19a84 100644 --- a/nixos/hosts/ingress-proxy/default.nix +++ b/nixos/hosts/ingress-proxy/default.nix @@ -124,7 +124,7 @@ in { }; "doll.repair" = static { - src = inputs.noe-sh.packages.${pkgs.system}.default; + src = inputs.doll-repair.packages.${pkgs.system}.default; }; "porcelain.doll.repair" = placeholder;