Commit Graph

850 Commits

Author SHA1 Message Date
Arthur Noel
a45fa0648d prune redundant after 1133b15 2023-12-03 11:04:14 +00:00
mergify[bot]
e8acd40bee
Merge pull request #429 from kingarrrt/bash
simplify required version checks and bring back support for bash 3
2023-12-03 10:20:40 +00:00
mergify[bot]
cd7520545e
Merge branch 'master' into bash 2023-12-03 10:17:23 +00:00
Arthur Noel
30e02c2a10 version check: clearer language 2023-12-03 10:05:23 +00:00
mergify[bot]
531c01265d
Merge pull request #432 from nix-community/joerg-ci
fix template after treefmt
2023-12-03 09:22:37 +00:00
mergify[bot]
158ee6592d
Merge branch 'master' into joerg-ci 2023-12-03 09:19:27 +00:00
mergify[bot]
6cbfffccc1
Merge pull request #428 from nix-community/update_flake_lock_action
flake.lock: Update
2023-12-03 09:14:58 +00:00
Jörg Thalheim
5752ec0958 fix template after treefmt
fixes https://github.com/nix-community/nix-direnv/issues/431

It's probably for the best if it's also deadnix-safe for other users
2023-12-03 10:12:31 +01:00
mergify[bot]
bb6de83b59
Merge branch 'master' into update_flake_lock_action 2023-12-03 09:11:46 +00:00
Jörg Thalheim
8d6fbc4b1c
Merge pull request #430 from nix-community/rm-garnix
flake: remove garnix nixConfig
2023-12-03 10:11:09 +01:00
Arthur Noel
31984f6083 set minimum bash version 5.2 2023-12-03 08:48:12 +00:00
Arthur Noel
04b2367f01 simplify required version checks using sort --version-sort 2023-12-03 08:47:20 +00:00
zowoq
6955d6e735 flake: remove garnix nixConfig 2023-12-03 10:15:26 +10:00
github-actions[bot]
b94c45100d flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/0bd59c54ef06bc34eca01e37d689f5e46b3fe2f1' (2023-11-24)
  → 'github:NixOS/nixpkgs/010c7296f3b19a58b206fdf7d68d75a5b0a09e9e' (2023-11-28)
2023-11-30 01:18:18 +00:00
mergify[bot]
adeced7980
Merge pull request #420 from nix-community/delay_invalidating_cache
Delay invalidating cache and gcroots until print-dev-env call succeeds
2023-11-29 22:03:24 +00:00
mergify[bot]
261c5f4f26
Merge branch 'master' into delay_invalidating_cache 2023-11-29 22:00:07 +00:00
Jörg Thalheim
1f34145be9
Merge pull request #427 from kingarrrt/fixes
a  small cleanup
2023-11-29 22:59:30 +01:00
Bryan Bennett
c22289449d
Rename tmp_profile to avoid cleanup as a gcroot 2023-11-29 15:47:13 -05:00
Bryan Bennett
0c03af5544
Delay invalidating cache and gcroots until print-dev-env call succeeds
We currently eagerly invalidate the gcroots and old profile rc,
assuming that the devshell is in a usable state.
If this assumption does not hold,
we can invalidate a working state for a broken one.

Here we just delay calling _nix_clean_old_gcroots
until we know that we're in a usable state.

In the case that the flake is in an unusable state,
this simply reuses the newest working state.

This should address #412.
2023-11-29 13:58:27 -05:00
Arthur Noel
f33c17faff flake: rename deprecated overlay to overlays.default 2023-11-29 13:30:44 +00:00
Arthur Noel
bebb554ad7 test-runner: use lib.getExe' for pytest to fix warning 2023-11-29 13:30:44 +00:00
Arthur Noel
e450871ff3 idiomatic test usage 2023-11-29 13:30:44 +00:00
Arthur Noel
aecb03f77a remove gnugrep reference following bcba983 2023-11-29 13:30:44 +00:00
Arthur Noel
653f9e7217 drop _nix_direnv_realpath
its not necessary - nix-store dereferences, and its use with the path
returned by nix-instantiate does nothing
2023-11-29 13:30:44 +00:00
Arthur Noel
7f41803e52 define nix flakes command as function and consistently use it
also tidy NIX_BIN_PREFIX usage
2023-11-29 13:30:44 +00:00
Arthur Noel
d1e5ab0e02 _nix_add_gcroot: remove redundant symlink 2023-11-29 13:30:44 +00:00
Arthur Noel
57d2738ded remove doubled watches 2023-11-29 13:30:44 +00:00
Arthur Noel
a6b4125c93 bad flake expr is fatal 2023-11-29 13:30:44 +00:00
Arthur Noel
26d7044cd7 refactor logging
use functions wrapping direnv log_status and log_error
2023-11-29 13:28:03 +00:00
Jörg Thalheim
fdbd3fc59f
Merge pull request #425 from nix-community/more-ruff-lints
More ruff lints
2023-11-29 13:25:18 +01:00
mergify[bot]
37148e01db
Merge pull request #426 from kingarrrt/dogfood
dogfooding: use direnv
2023-11-29 11:20:27 +00:00
Arthur Noel
5fd43d84f1 dogfooding: use direnv 2023-11-29 11:16:27 +00:00
Jörg Thalheim
4dbf3db600 disable remaining failing ruff lints 2023-11-29 08:32:42 +01:00
Jörg Thalheim
d5a10dc6d5 test: other random ruff lints 2023-11-29 08:32:38 +01:00
Jörg Thalheim
8c46f6e97d tests: don't use print in favour of logger 2023-11-29 08:28:52 +01:00
Jörg Thalheim
9ac34be48f test: use builtins for type annotations instead of List / Optional 2023-11-29 08:28:52 +01:00
Jörg Thalheim
26b7fce564 tests: avoid shadowing dir builtin 2023-11-29 08:15:20 +01:00
Jörg Thalheim
ae4a4e8e7c make tests directory a proper python module 2023-11-29 08:14:14 +01:00
Jörg Thalheim
b029dbf2df expand ruff checks to test all 2023-11-29 08:13:31 +01:00
Jörg Thalheim
c748c82c89 drop obsolete setup.cfg 2023-11-29 08:12:48 +01:00
Jörg Thalheim
bf686af698
Merge pull request #424 from nix-community/treefmt
replace lint with treefmt
2023-11-29 07:53:04 +01:00
Jörg Thalheim
ca8df23667 simplify mergify 2023-11-29 07:36:48 +01:00
Jörg Thalheim
037cc9cc25 format with treefmt 2023-11-29 07:34:23 +01:00
Jörg Thalheim
1133b15e75 add treefmt 2023-11-29 07:34:23 +01:00
Jörg Thalheim
6f38bdb647 update fetchurl checksum 2023-11-27 21:22:22 +01:00
Jörg Thalheim
511f6554b3 bump version 2.5.1 2023-11-27 21:22:13 +01:00
mergify[bot]
1e3bd2942e
Merge pull request #421 from nix-community/revert-deprecation
do not deprecate nix_direnv_watch_file yet (2.5.1)
2023-11-27 20:19:33 +00:00
Jörg Thalheim
a59d64917e do not deprecate nix_direnv_watch_file yet
we do this in 3.0.0
2023-11-27 20:19:21 +01:00
mergify[bot]
b2c8ff560e
Merge pull request #418 from nix-community/update_flake_lock_action
flake.lock: Update
2023-11-27 13:41:13 +00:00
mergify[bot]
c5b6ca3a13
Merge branch 'master' into update_flake_lock_action 2023-11-27 13:37:51 +00:00