From 8a4ec953b41339f8df5f82de9b270d97ad74124a Mon Sep 17 00:00:00 2001 From: Steffen Beyer Date: Thu, 26 Mar 2026 13:02:08 +0100 Subject: [PATCH] dev: devenv update, fix legacy pre-commit hooks --- devenv.lock | 32 ++++++++++++++++++++++++++------ devenv.nix | 15 +++++++++++++++ 2 files changed, 41 insertions(+), 6 deletions(-) diff --git a/devenv.lock b/devenv.lock index cb997ad..eb0acc5 100644 --- a/devenv.lock +++ b/devenv.lock @@ -3,10 +3,10 @@ "devenv": { "locked": { "dir": "src/modules", - "lastModified": 1768736080, + "lastModified": 1774475276, "owner": "cachix", "repo": "devenv", - "rev": "efa86311444852d24137d14964b449075522d489", + "rev": "f8ca2c061ec2feceee1cf1c5e52c92f58b6aec9c", "type": "github" }, "original": { @@ -40,10 +40,10 @@ ] }, "locked": { - "lastModified": 1767281941, + "lastModified": 1774104215, "owner": "cachix", "repo": "git-hooks.nix", - "rev": "f0927703b7b1c8d97511c4116eb9b4ec6645a0fa", + "rev": "f799ae951fde0627157f40aec28dec27b22076d0", "type": "github" }, "original": { @@ -73,11 +73,14 @@ } }, "nixpkgs": { + "inputs": { + "nixpkgs-src": "nixpkgs-src" + }, "locked": { - "lastModified": 1767052823, + "lastModified": 1774287239, "owner": "cachix", "repo": "devenv-nixpkgs", - "rev": "538a5124359f0b3d466e1160378c87887e3b51a4", + "rev": "fa7125ea7f1ae5430010a6e071f68375a39bd24c", "type": "github" }, "original": { @@ -87,6 +90,23 @@ "type": "github" } }, + "nixpkgs-src": { + "flake": false, + "locked": { + "lastModified": 1769922788, + "narHash": "sha256-H3AfG4ObMDTkTJYkd8cz1/RbY9LatN5Mk4UF48VuSXc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "207d15f1a6603226e1e223dc79ac29c7846da32e", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nostr-bench-src": { "flake": false, "locked": { diff --git a/devenv.nix b/devenv.nix index a278764..0357f6e 100644 --- a/devenv.nix +++ b/devenv.nix @@ -189,6 +189,21 @@ in { # https://devenv.sh/scripts/ enterShell = '' + cleanup_stale_git_hook_legacy() { + hooks_dir="$(git rev-parse --git-path hooks 2>/dev/null)" || return 0 + + for legacy_hook in "$hooks_dir"/*.legacy; do + [ -e "$legacy_hook" ] || continue + + if grep -Fq "File generated by pre-commit: https://pre-commit.com" "$legacy_hook"; then + rm -f "$legacy_hook" + echo "Removed stale legacy git hook: $legacy_hook" + fi + done + } + + cleanup_stale_git_hook_legacy + echo elixir --version echo