Merge branch 'master' into update_flake_lock_action

This commit is contained in:
mergify[bot] 2024-01-02 21:47:26 +00:00 committed by GitHub
commit 78bf825f3d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 6 deletions

View File

@ -70,8 +70,8 @@ for integration with shells other than Bash. Be sure to also allow
Put the following lines in your `.envrc`:
```bash
if ! has nix_direnv_version || ! nix_direnv_version 3.0.3; then
source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/3.0.3/direnvrc" "sha256-0EVQVNSRQWsln+rgPW3mXVmnF5sfcmKEYOmOSfLYxHg="
if ! has nix_direnv_version || ! nix_direnv_version 3.0.4; then
source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/3.0.4/direnvrc" "sha256-DzlYZ33mWF/Gs8DDeyjr8mnVmQGx7ASYqA5WlxwvBG4="
fi
```

View File

@ -4,7 +4,7 @@
# https://github.com/abathur/resholve/issues/107
resholve.mkDerivation rec {
pname = "nix-direnv";
version = "3.0.3";
version = "3.0.4";
src = builtins.path {
path = ./.;

View File

@ -1,6 +1,6 @@
# shellcheck shell=bash
NIX_DIRENV_VERSION=3.0.3
NIX_DIRENV_VERSION=3.0.4
# min required versions
BASH_MIN_VERSION=4.4

View File

@ -1,4 +1,4 @@
if ! has nix_direnv_version || ! nix_direnv_version 3.0.3; then
source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/3.0.3/direnvrc" "sha256-0EVQVNSRQWsln+rgPW3mXVmnF5sfcmKEYOmOSfLYxHg="
if ! has nix_direnv_version || ! nix_direnv_version 3.0.4; then
source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/3.0.4/direnvrc" "sha256-DzlYZ33mWF/Gs8DDeyjr8mnVmQGx7ASYqA5WlxwvBG4="
fi
use flake