diff --git a/flake.lock b/flake.lock index ad4903f..207a0b0 100644 --- a/flake.lock +++ b/flake.lock @@ -10,17 +10,21 @@ "sonnenshift", "crate2nix" ], - "git-hooks": "git-hooks", "nixpkgs": [ + "sonnenshift", "nixpkgs" + ], + "pre-commit-hooks": [ + "sonnenshift", + "crate2nix" ] }, "locked": { - "lastModified": 1760971495, - "narHash": "sha256-IwnNtbNVrlZIHh7h4Wz6VP0Furxg9Hh0ycighvL5cZc=", + "lastModified": 1709700175, + "narHash": "sha256-A0/6ZjLmT9qdYzKHmevnEIC7G+GiZ4UCr8v0poRPzds=", "owner": "cachix", "repo": "cachix", - "rev": "c5bfd933d1033672f51a863c47303fc0e093c2d2", + "rev": "be97b37989f11b724197b5f4c7ffd78f12c8c4bf", "type": "github" }, "original": { @@ -45,6 +49,7 @@ "flake-parts": "flake-parts", "nix-test-runner": "nix-test-runner", "nixpkgs": [ + "sonnenshift", "nixpkgs" ], "pre-commit-hooks": "pre-commit-hooks" @@ -87,6 +92,10 @@ }, "devshell": { "inputs": { + "flake-utils": [ + "deploy-rs", + "utils" + ], "nixpkgs": [ "sonnenshift", "crate2nix", @@ -94,11 +103,11 @@ ] }, "locked": { - "lastModified": 1762521437, - "narHash": "sha256-RXN+lcx4DEn3ZS+LqEJSUu/HH+dwGvy0syN7hTo/Chg=", + "lastModified": 1711099426, + "narHash": "sha256-HzpgM/wc3aqpnHJJ2oDqPBkNsqWbW0WfWUO8lKu8nGk=", "owner": "numtide", "repo": "devshell", - "rev": "07bacc9531f5f4df6657c0a02a806443685f384a", + "rev": "2d45b54ca4a183f2fdcf4b19c895b64fbf620ee8", "type": "github" }, "original": { @@ -249,43 +258,12 @@ "type": "github" } }, - "git-hooks": { - "inputs": { - "flake-compat": [ - "sonnenshift", - "crate2nix", - "cachix", - "flake-compat" - ], - "gitignore": "gitignore", - "nixpkgs": [ - "sonnenshift", - "crate2nix", - "cachix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1762868777, - "narHash": "sha256-QqS72GvguP56oKDNUckWUPNJHjsdeuXh5RyoKz0wJ+E=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "c5c3147730384576196fb5da048a6e45dee10d56", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, "gitignore": { "inputs": { "nixpkgs": [ "sonnenshift", "crate2nix", - "cachix", - "git-hooks", + "pre-commit-hooks", "nixpkgs" ] }, @@ -342,25 +320,30 @@ "crate2nix", "flake-compat" ], - "gitignore": [ + "flake-utils": [ "sonnenshift", "crate2nix", - "cachix", - "git-hooks", - "gitignore" + "devshell", + "flake-utils" ], + "gitignore": "gitignore", "nixpkgs": [ "sonnenshift", "crate2nix", "nixpkgs" + ], + "nixpkgs-stable": [ + "sonnenshift", + "crate2nix", + "nixpkgs" ] }, "locked": { - "lastModified": 1763319842, - "narHash": "sha256-YG19IyrTdnVn0l3DvcUYm85u3PaqBt6tI6VvolcuHnA=", + "lastModified": 1712055707, + "narHash": "sha256-4XLvuSIDZJGS17xEwSrNuJLL7UjDYKGJSbK1WWX2AK8=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "7275fa67fbbb75891c16d9dee7d88e58aea2d761", + "rev": "e35aed5fda3cc79f88ed7f1795021e559582093a", "type": "github" }, "original": { @@ -478,11 +461,11 @@ ] }, "locked": { - "lastModified": 1748144928, - "narHash": "sha256-OPdi6AjrWWwZlukNwDHDWAf1CCFkHsf8JbA3rJoibXM=", + "lastModified": 1763619077, + "narHash": "sha256-dlfamaoIzFEgwgtzPJuw5Tl5SqjbWcV8CsbP2hVBeuI=", "ref": "refs/heads/main", - "rev": "429036aa8630d2325f8a9f067cc041d628279a8e", - "revCount": 24, + "rev": "64a2c8a3743ea6897ecac6692fba8aebc3389fca", + "revCount": 26, "type": "git", "url": "ssh://git@github.com/sonnenshift/battery-manager" }, diff --git a/flake.nix b/flake.nix index 386de98..334f73c 100644 --- a/flake.nix +++ b/flake.nix @@ -50,16 +50,9 @@ url = "git+ssh://git@github.com/sonnenshift/battery-manager"; inputs = { nixpkgs.follows = "nixpkgs"; - crate2nix.inputs = { - nixpkgs.follows = "nixpkgs"; flake-compat.follows = "deploy-rs/flake-compat"; - cachix.inputs.nixpkgs.follows = "nixpkgs"; - pre-commit-hooks.inputs.gitignore.follows = "sonnenshift/crate2nix/cachix/git-hooks/gitignore"; - - # Yes, they do this insanity: - # https://github.com/nix-community/crate2nix/issues/371 - crate2nix_stable.follows = "sonnenshift/crate2nix"; + devshell.inputs.flake-utils.follows = "deploy-rs/utils"; }; }; };