Merge branch 'master' into update_flake_lock_action

nix-community · Jan 2, 2024 · 78bf825 · 78bf825
2 parents 59c94e7 + e999115
commit 78bf825
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -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
 ```
 

diff --git a/default.nix b/default.nix
@@ -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 = ./.;

diff --git a/direnvrc b/direnvrc
@@ -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

diff --git a/templates/flake/.envrc b/templates/flake/.envrc
@@ -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