From df0cca66ae5bba2afc0f48d1894c6ffe622275bf Mon Sep 17 00:00:00 2001 From: winston Date: Thu, 19 Sep 2024 00:20:13 +0200 Subject: [PATCH] chore(nix): update lockfile --- flake.lock | 118 ++++++++++++++++++++++------------------------------- flake.nix | 8 ++-- 2 files changed, 52 insertions(+), 74 deletions(-) diff --git a/flake.lock b/flake.lock index bc6f9e6..b5122da 100644 --- a/flake.lock +++ b/flake.lock @@ -27,9 +27,8 @@ "inputs": { "crane": "crane", "flake-compat": [], - "flake-parts": "flake-parts", - "flake-utils": [ - "flake-utils" + "flake-parts": [ + "flake-parts" ], "nixpkgs": [ "nixpkgs-unstable" @@ -39,11 +38,11 @@ ] }, "locked": { - "lastModified": 1725300620, - "narHash": "sha256-IdM+pZ6BnmD3o1fTJZ2BD43k7dwi1BbVfLDLpM1nE5s=", + "lastModified": 1726069220, + "narHash": "sha256-dAUWlC8uMJX9iovycfvJcg5nm3PzqJIRAOwN4z322zM=", "owner": "zhaofengli", "repo": "attic", - "rev": "bea72d75b6165dfb529ba0c39cc6c7e9c7f0d234", + "rev": "416687e59c4f0b32742423458cab2c5ff8fe748a", "type": "github" }, "original": { @@ -100,36 +99,15 @@ "flake-parts": { "inputs": { "nixpkgs-lib": [ - "attic", "nixpkgs" ] }, "locked": { - "lastModified": 1722555600, - "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", + "lastModified": 1726153070, + "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_2": { - "inputs": { - "nixpkgs-lib": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1725234343, - "narHash": "sha256-+ebgonl3NbiKD2UD0x4BszCZQ6sTfL4xioaM49o5B3Y=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "567b938d64d4b4112ee253b9274472dc3a346eb6", + "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", "type": "github" }, "original": { @@ -143,11 +121,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -156,10 +134,35 @@ "type": "github" } }, + "git-hooks": { + "inputs": { + "flake-compat": [], + "gitignore": "gitignore", + "nixpkgs": [ + "nixpkgs-unstable" + ], + "nixpkgs-stable": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1725513492, + "narHash": "sha256-tyMUA6NgJSvvQuzB7A1Sf8+0XCHyfSPRx/b00o6K0uo=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "7570de7b9b504cfe92025dd1be797bf546f66528", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ - "pre-commit-hooks", + "git-hooks", "nixpkgs" ] }, @@ -184,11 +187,11 @@ ] }, "locked": { - "lastModified": 1720042825, - "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=", + "lastModified": 1726592409, + "narHash": "sha256-2Y6CDvD/BD43WLS77PHu6dUHbdUfFhuzkY8oJAecD/U=", "owner": "nix-community", "repo": "home-manager", - "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073", + "rev": "2ab00f89dd3ecf8012f5090e6d7ca1a7ea30f594", "type": "github" }, "original": { @@ -200,11 +203,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1725001927, - "narHash": "sha256-eV+63gK0Mp7ygCR0Oy4yIYSNcum2VQwnZamHxYTNi+M=", + "lastModified": 1726447378, + "narHash": "sha256-2yV8nmYE1p9lfmLHhOCbYwQC/W8WYfGQABoGzJOb1JQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6e99f2a27d600612004fbd2c3282d614bfee6421", + "rev": "086b448a5d54fd117f4dc2dee55c9f0ff461bdc1", "type": "github" }, "original": { @@ -216,11 +219,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1725103162, - "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=", + "lastModified": 1726463316, + "narHash": "sha256-gI9kkaH0ZjakJOKrdjaI/VbaMEo9qBbSUl93DnU7f4c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b", + "rev": "99dc8785f6a0adac95f5e2ab05cc2e1bf666d172", "type": "github" }, "original": { @@ -230,42 +233,17 @@ "type": "github" } }, - "pre-commit-hooks": { - "inputs": { - "flake-compat": [], - "gitignore": "gitignore", - "nixpkgs": [ - "nixpkgs-unstable" - ], - "nixpkgs-stable": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1724857454, - "narHash": "sha256-Qyl9Q4QMTLZnnBb/8OuQ9LSkzWjBU1T5l5zIzTxkkhk=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "4509ca64f1084e73bc7a721b20c669a8d4c5ebe6", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, "root": { "inputs": { "agenix": "agenix", "attic": "attic", "deploy-rs": "deploy-rs", - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts", "flake-utils": "flake-utils", + "git-hooks": "git-hooks", "home-manager": "home-manager", "nixpkgs": "nixpkgs", "nixpkgs-unstable": "nixpkgs-unstable", - "pre-commit-hooks": "pre-commit-hooks", "satisfactory-server": "satisfactory-server", "steam-fetcher": "steam-fetcher", "valheim-server": "valheim-server" diff --git a/flake.nix b/flake.nix index ad10c78..7e06a9c 100644 --- a/flake.nix +++ b/flake.nix @@ -95,7 +95,7 @@ }; }; - imports = [ inputs.pre-commit-hooks.flakeModule ]; + imports = [ inputs.git-hooks.flakeModule ]; systems = [ "aarch64-darwin" "aarch64-linux" @@ -129,7 +129,7 @@ inputs.nixpkgs.follows = "nixpkgs-unstable"; inputs.nixpkgs-stable.follows = "nixpkgs"; inputs.flake-compat.follows = ""; - inputs.flake-utils.follows = "flake-utils"; + inputs.flake-parts.follows = "flake-parts"; }; deploy-rs = { url = "github:serokell/deploy-rs"; @@ -137,8 +137,8 @@ inputs.nixpkgs.follows = "nixpkgs"; inputs.utils.follows = "flake-utils"; }; - pre-commit-hooks = { - url = "github:cachix/pre-commit-hooks.nix"; + git-hooks = { + url = "github:cachix/git-hooks.nix"; inputs.flake-compat.follows = ""; inputs.nixpkgs.follows = "nixpkgs-unstable"; inputs.nixpkgs-stable.follows = "nixpkgs";