Commit Graph

843 Commits

Author SHA1 Message Date
mergify[bot]
e42b6ce275
Merge pull request #416 from nix-community/joerg-ci
drop nix_direnv_watch_file - instead parse DIRENV_WATCHES
2023-11-26 13:28:56 +00:00
mergify[bot]
f559646857
Merge branch 'master' into joerg-ci 2023-11-26 13:25:42 +00:00
Jörg Thalheim
24913b3169
Merge pull request #413 from nix-community/update_flake_lock_action
flake.lock: Update
2023-11-26 14:25:06 +01:00
Jörg Thalheim
946b84daed fix crash if DIRENV_WATCHES is not set
This shouldn't happen in our current usage but better safe than sorry.
2023-11-26 14:19:24 +01:00
Jörg Thalheim
a20b32d9cd drop dependency on jq 2023-11-26 14:03:35 +01:00
Jörg Thalheim
4248f7735b use direnv show_dump to extract direnv watches 2023-11-26 13:15:37 +01:00
Jörg Thalheim
bcba9830e4 drop dependency on gnugrep 2023-11-26 12:32:12 +01:00
Arthur Noel
433948e9ad fix typos 2023-11-25 22:27:58 +00:00
Arthur Noel
6997988d1b drop nix_direnv_watch_file - instead parse DIRENV_WATCHES
fixes #408
2023-11-25 22:27:58 +00:00
github-actions[bot]
6a63fd9c57 flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/0bf3f5cf6a98b5d077cdcdb00a6d4b3d92bc78b5' (2023-11-19)
  → 'github:NixOS/nixpkgs/51a01a7e5515b469886c120e38db325c96694c2f' (2023-11-21)
2023-11-23 01:17:48 +00:00
mergify[bot]
7a472ecec6
Merge pull request #411 from nix-community/update_flake_lock_action
flake.lock: Update
2023-11-21 09:24:02 +00:00
mergify[bot]
3ba3ce9bec
Merge branch 'master' into update_flake_lock_action 2023-11-21 09:20:41 +00:00
Jörg Thalheim
9971ece8d9
Merge pull request #410 from nix-community/update-watches
use_nix: watch for both shell.nix and default.nix
2023-11-21 10:20:05 +01:00
github-actions[bot]
6ad5eea7af flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/592047fc9e4f7b74a4dc85d1b9f5243dfe4899e3' (2023-11-15)
  → 'github:NixOS/nixpkgs/0bf3f5cf6a98b5d077cdcdb00a6d4b3d92bc78b5' (2023-11-19)
2023-11-20 01:18:58 +00:00
Jörg Thalheim
da593f3b5e use_nix: watch for both shell.nix and default.nix
In many cases they will shell.nix will depend on default.nix and when a user switches from default.nix to shell.nix we also want to invalidate the cache.

fixes https://github.com/nix-community/nix-direnv/issues/409
2023-11-19 10:45:04 +01:00
Jörg Thalheim
708fe849a8
Merge pull request #404 from nix-community/update_flake_lock_action
flake.lock: Update
2023-11-18 08:50:40 +01:00
mergify[bot]
0a85369dfc
Merge branch 'master' into update_flake_lock_action 2023-11-18 07:49:57 +00:00
Jörg Thalheim
5c941b903e
Merge pull request #407 from infinisil/patch-1
Fix Nix file order docs
2023-11-18 08:49:16 +01:00
Silvan Mosberger
f578994b13
Fix Nix file order
shell.nix file is used first if it exists
2023-11-18 00:19:32 +01:00
github-actions[bot]
01a802c5b7 flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/ec750fd01963ab6b20ee1f0cb488754e8036d89d' (2023-11-07)
  → 'github:NixOS/nixpkgs/592047fc9e4f7b74a4dc85d1b9f5243dfe4899e3' (2023-11-15)
2023-11-16 01:18:36 +00:00
Jörg Thalheim
9178f71653
Merge pull request #402 from nix-community/update_flake_lock_action
flake.lock: Update
2023-11-11 16:22:52 +01:00
github-actions[bot]
b939c1e2cc flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/90e85bc7c1a6fc0760a94ace129d3a1c61c3d035' (2023-10-29)
  → 'github:NixOS/nixpkgs/ec750fd01963ab6b20ee1f0cb488754e8036d89d' (2023-11-07)
2023-11-09 01:16:30 +00:00
mergify[bot]
28c130b483
Merge pull request #399 from nix-community/update_flake_lock_action
flake.lock: Update
2023-11-01 15:14:50 +00:00
mergify[bot]
b195e828d7
Merge branch 'master' into update_flake_lock_action 2023-11-01 15:11:20 +00:00
Bryan Bennett
0c68782285
Merge pull request #401 from nix-community/manual_reload_fix
Fix Manual Reload script with non-standard layout dir
2023-11-01 11:10:43 -04:00
Bryan Bennett
da6f18f71b
Quote layout_dir during script write
Co-authored-by: Jörg Thalheim <Mic92@users.noreply.github.com>
2023-11-01 09:25:35 -04:00
Bryan Bennett
4bf5d40290
Fix local flakes when prefixed with "path:"
As mentioned in #347
2023-10-31 15:04:54 -04:00
Bryan Bennett
999093c7e6
Promote Out of date cache messages to error
This provides color so that the user can see them in the possible wall
of text that direnv sometimes spits out.
2023-10-31 15:04:51 -04:00
Bryan Bennett
f452533db5
Fix nix-direnv-reload
No longer assumes location of layout directory relative to code.
2023-10-31 15:04:43 -04:00
github-actions[bot]
ed81f8c228 flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/51d906d2341c9e866e48c2efcaac0f2d70bfd43e' (2023-10-21)
  → 'github:NixOS/nixpkgs/90e85bc7c1a6fc0760a94ace129d3a1c61c3d035' (2023-10-29)
2023-10-30 01:15:03 +00:00
Jörg Thalheim
62921f8e95
Merge pull request #398 from gepbird/fix-typo
Fix typo
2023-10-26 18:20:03 +02:00
Gutyina Gergő
2d5602c101
Fix typo 2023-10-26 10:33:39 +02:00
Jörg Thalheim
b9daefb1a7 update fetchurl checksum 2023-10-24 09:37:04 +02:00
mergify[bot]
e7b44b46b0
Merge pull request #395 from nix-community/update_flake_lock_action
flake.lock: Update
2023-10-23 20:58:30 +00:00
mergify[bot]
5f16fbcfbd
Merge branch 'master' into update_flake_lock_action 2023-10-23 20:55:03 +00:00
Bryan Bennett
2200f89ff9
Merge pull request #397 from NilsIrl/patch-1
Update nix-direnv version in nix_direnv_version
2023-10-23 16:54:28 -04:00
Nils
c61fca1ed0
Update nix-direnv version in nix_direnv_version 2023-10-23 11:46:14 -07:00
github-actions[bot]
15df4d6eaa flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/0396d3b0fb7f62ddc79a506ad3e6124f01d2ed0a' (2023-10-01)
  → 'github:NixOS/nixpkgs/51d906d2341c9e866e48c2efcaac0f2d70bfd43e' (2023-10-21)
2023-10-23 01:14:59 +00:00
mergify[bot]
169115475c
Merge pull request #394 from nix-community/fix-unbound-variable
fix _nix_direnv_force_reload not beeing bound
2023-10-09 11:51:28 +00:00
Jörg Thalheim
ac9cd95422 fix _nix_direnv_force_reload not beeing bound
fixes https://github.com/nix-community/nix-direnv/issues/393
2023-10-09 13:46:55 +02:00
mergify[bot]
a929b6bede
Merge pull request #390 from nix-community/update_flake_lock_action
flake.lock: Update
2023-10-03 07:31:28 +00:00
github-actions[bot]
baae952739 flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/e12483116b3b51a185a33a272bf351e357ba9a99' (2023-09-21)
  → 'github:NixOS/nixpkgs/0396d3b0fb7f62ddc79a506ad3e6124f01d2ed0a' (2023-10-01)
2023-10-03 09:27:35 +02:00
Jörg Thalheim
6c78033b96
Merge pull request #389 from nix-community/update_flake_lock_action
flake.lock: Update
2023-09-25 13:17:21 +02:00
github-actions[bot]
bab7a69da7 flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/5148520bfab61f99fd25fb9ff7bfbb50dad3c9db' (2023-09-17)
  → 'github:NixOS/nixpkgs/e12483116b3b51a185a33a272bf351e357ba9a99' (2023-09-21)
2023-09-25 01:14:37 +00:00
mergify[bot]
d593e427bd
Merge pull request #385 from nix-community/update_flake_lock_action
flake.lock: Update
2023-09-23 15:39:53 +00:00
mergify[bot]
116f7c09c5
Merge branch 'master' into update_flake_lock_action 2023-09-23 15:36:33 +00:00
Jörg Thalheim
a806994872
Merge pull request #388 from Gerg-L/master
update README... again
2023-09-23 17:35:53 +02:00
Gerg-L
c963692166
update README 2023-09-23 11:18:53 -04:00
github-actions[bot]
edac1a6a28 flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/1697b7d480449b01111e352021f46e5879e47643' (2023-09-13)
  → 'github:NixOS/nixpkgs/5148520bfab61f99fd25fb9ff7bfbb50dad3c9db' (2023-09-17)
2023-09-18 01:13:43 +00:00
Jörg Thalheim
4132068df5
Merge pull request #383 from nix-community/update_flake_lock_action
flake.lock: Update
2023-09-14 21:17:00 +02:00