Commit graph

1049 commits

Author SHA1 Message Date
Eric Wolf
8ce0765b55
use_nix: file was used in two places and values got confused
Using `file` in the for loop over the `nix_watches` entries
left a value in `file`, so the check '[[ "$file" == ""]]'
always failed.

Found by adding `set -x` to `direnvrc` temporarily and staring
hard at the output.
2022-04-03 20:45:27 -04:00
Eric Wolf
a18e37535d
Fix tests
- `renewed_message` is now the same for `use nix` and `use flake`.
- we now expect `shellHook` to run, whether the environment is cached
  or not
2022-04-03 20:45:23 -04:00
Bryan Bennett
3cca1afdec
Start work of integrating nix 24 features 2022-04-03 20:45:19 -04:00
Bryan Bennett
deb345be82
Move realpath into a function
Using ls to resolve the path does not work if the next level is also a symlink
2022-04-03 20:45:15 -04:00
Bryan Bennett
7133709885
create a function for all pre-flight checks 2022-04-03 20:45:11 -04:00
Bryan Bennett
fef7340826
Use ls to resolve symlink 2022-04-03 20:45:07 -04:00
Bryan Bennett
c1df7c3c15
Don't track flake.{nix,lock} for remote flakes 2022-04-03 20:45:02 -04:00
Eric Wolf
76eba564f7 Convert ci tests to nix flake app test-runner 2022-04-03 13:30:25 +02:00
Jörg Thalheim
7c41549bd4 update fetchurl checksum 2022-03-22 11:40:52 +01:00
Jörg Thalheim
1d5a3788b8
Merge pull request #152 from PetarKirov/release/1.6.1
Release version 1.6.1
2022-03-22 10:37:38 +00:00
Petar Kirov
d7ddae4be8 Release version 1.6.1
* Update hashes
  * Hash obtained via:
    ```sh
    direnv fetchurl 'https://raw.githubusercontent.com/nix-community/nix-direnv/master/direnvrc' \
      | grep -m1 -o 'sha256-.*'
    ```
* Bump tag to 1.6.1 in:
  * README.md
  * direnvrc
  * template/.envrc

This release includes the following changes:

* Allow watching of arbitrary files for nix flake updates ([#148][1])

[1]: https://github.com/nix-community/nix-direnv/pull/148
2022-03-22 11:56:16 +02:00
Jörg Thalheim
b4cdd0c3be
Merge pull request #151 from nix-community/dependabot/github_actions/actions/checkout-3
Bump actions/checkout from 2 to 3
2022-03-07 10:33:22 +00:00
dependabot[bot]
3722e2edb1
Bump actions/checkout from 2 to 3
Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v2...v3)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-07 04:01:13 +00:00
Jörg Thalheim
363835438f
Merge pull request #148 from polygon/allow_watching_arbitrary_files
Allow watching of arbitrary files for nix flake updates
2022-02-26 16:03:43 +00:00
polygon
1241f1115e Add nix_direnv_watch_file command
Used to watch files that, when changed, trigger an update of the
cached nix environment.
2022-02-25 21:09:10 +01:00
Jörg Thalheim
60a6964eae
bump hashes for 1.6.0 2022-02-07 21:23:01 +01:00
Jörg Thalheim
69d7012535
bump template 2022-02-07 21:21:12 +01:00
Jörg Thalheim
1257fd47e4
bump version 1.6.0 2022-02-07 21:20:54 +01:00
Jörg Thalheim
69a0a648bc
Merge pull request #141 from bbenne10/master
Declare (and enforce) a minimum direnv version
2022-02-05 07:20:28 +00:00
Bryan Bennett
c6db289e0f
Print a more useful error on old direnv versions 2022-02-02 14:23:59 -05:00
Bryan Bennett
effc976ce7
Use non-zero exit code for error status 2022-01-31 13:26:21 -05:00
Bryan Bennett
6d6f0d85a3
Declare (and enforce) a minimum direnv version
2.21.3 introduces extglob to direnv's stdlib.
This means we need at least 2.21.3 to execute nix_direnv_version.
This just enforces a previously unstated dependency.
2022-01-31 13:24:02 -05:00
Jörg Thalheim
f860b9dbb6
Merge pull request #136 from bbenne10/flake_args_fix
Allow passing arguments to print-dev-env invocation
2022-01-02 16:40:39 +00:00
Bryan Bennett
6733511573
Update documentation to showcase argument passing 2021-12-22 08:12:10 -05:00
Bryan Bennett
2a99301bbc
Quote argument expansion
Co-authored-by: Jörg Thalheim <Mic92@users.noreply.github.com>
2021-12-22 07:59:20 -05:00
Bryan Bennett
0eef85db95
Allow passing arguments to print-dev-env invocation 2021-12-21 10:05:44 -05:00
Jörg Thalheim
b6af475b05
Merge pull request #134 from johnae/master
invalidate cache on changes to devshell.toml
2021-12-17 11:07:30 +00:00
John Axel Eriksson
7b801eaaec invalidate cache on changes to devshell.toml 2021-12-17 11:16:29 +01:00
Jörg Thalheim
b61138e130 scripts/update-checksums.sh: also update template 2021-12-16 10:14:51 +01:00
Jörg Thalheim
72f9111d49 update fetchurl checksum 2021-12-16 10:14:29 +01:00
Jörg Thalheim
9c611e219a README: update fetchurl checksum 2021-12-16 10:11:57 +01:00
Jörg Thalheim
57235bb89e bump version 1.5.1 2021-12-16 10:07:14 +01:00
Jörg Thalheim
c94c2376da
Merge pull request #132 from aaqaishtyaq/aaqaishtyaq-patch-1
remove enableFlake from the doc for home-manager
2021-12-16 09:05:22 +00:00
Aaqa Ishtyaq
99b6b226e0 remove enableFlake from the doc for home-manager
Remove `nix-direnv.enableFlake` option from the doc as Flake support is now always enabled.

Fixes https://github.com/nix-community/nix-direnv/issues/131
2021-12-15 16:20:21 +00:00
Jörg Thalheim
f8b9d349a7
Merge pull request #130 from Enzime/add/devShell
flake.nix: Import `shell.nix` as `devShell`
2021-12-06 08:44:11 +00:00
Jörg Thalheim
6c14010466
Merge pull request #129 from Enzime/doc/README
README: Rename `flakifiy` to `flakify`
2021-12-06 08:34:36 +00:00
Michael Hoang
7c9a7b7595 flake.nix: Import shell.nix as devShell 2021-12-06 15:19:49 +11:00
Michael Hoang
6d69d5bf82 README: Rename flakifiy to flakify 2021-12-06 15:15:38 +11:00
Jörg Thalheim
69bec056fb
Merge pull request #127 from nix-community/dependabot/github_actions/cachix/install-nix-action-16
Bump cachix/install-nix-action from 15 to 16
2021-11-22 07:01:51 +00:00
dependabot[bot]
dc7a92a692
Bump cachix/install-nix-action from 15 to 16
Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from 15 to 16.
- [Release notes](https://github.com/cachix/install-nix-action/releases)
- [Commits](https://github.com/cachix/install-nix-action/compare/v15...v16)

---
updated-dependencies:
- dependency-name: cachix/install-nix-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-22 04:01:00 +00:00
Jörg Thalheim
c17645e939
Merge pull request #124 from nix-community/ci
Upgrade ci
2021-11-15 14:22:48 +00:00
Jörg Thalheim
01b5bf6eb6 test: remove nix flake check 2021-11-15 14:35:49 +01:00
Jörg Thalheim
27ab2f270a nix-direnv: install flake by default 2021-11-15 14:34:27 +01:00
Jörg Thalheim
e01b0cdedb
Merge pull request #121 from nix-community/sed-fix
useFlake(): fix sed invocation on legacy operating systems
2021-11-13 06:18:01 +00:00
Jörg Thalheim
76f26b2692 useFlake(): fix sed invocation on legacy operating systems
macOS has `-i` but it insists on writing backup files.
2021-11-13 06:45:46 +01:00
Jörg Thalheim
a3d08b6c8f also update template checksum 2021-10-21 07:54:36 +02:00
Jörg Thalheim
63fcfa1d48 README: update fetchurl checksum 2021-10-21 07:53:13 +02:00
Jörg Thalheim
e3378c4cae README: update fetchurl checksum 2021-10-21 07:52:13 +02:00
Jörg Thalheim
083ac16bf5 bump version 1.5.0 2021-10-21 07:50:57 +02:00
Jörg Thalheim
32dd9403c7 fix checksum script 2021-10-21 07:48:02 +02:00