nix-community/nix-direnv
1
0
Fork 0
mirror of https://github.com/nix-community/nix-direnv.git synced 2025-12-09 18:41:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
372 commits 18 branches 38 tags 1.5 MiB
Commit graph

372 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bryan Bennett
c35f4f013c
Merge pull request #164 from bbenne10/GH-162 
Fix path and package handling in use_nix arg parsing
 2022-04-22 08:34:21 -04:00
Bryan Bennett
f464d90b80
Fix path and package handling in use_nix arg parsing 
Fixes #162
 2022-04-19 14:54:28 -04:00
Jörg Thalheim
2398a5c52a
Merge pull request #161 from nix-community/update_flake_lock_action 
flake.lock: Update
 2022-04-18 05:56:55 +01:00
github-actions[bot]
02873b5880 flake.lock: Update 
Flake lock file updates:

• Updated input 'flake-utils':
    'github:numtide/flake-utils/0f8662f1319ad6abf89b3380dd2722369fc51ade' (2022-03-26)
  → 'github:numtide/flake-utils/a4b154ebbdc88c8498a5c7b01589addc9e9cb678' (2022-04-11)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/30d3d79b7d3607d56546dd2a6b49e156ba0ec634' (2022-03-25)
  → 'github:NixOS/nixpkgs/faad370edcb37162401be50d45526f52bb16a713' (2022-04-16)
 2022-04-17 10:17:59 +00:00
Jörg Thalheim
f8ae7be11f
Merge pull request #160 from bbenne10/fix_nix_direnv_version 
Fix nix_direnv_version to properly handle major version bumps
 2022-04-14 18:49:50 +01:00
Bryan Bennett
804418f97f
Fix nix_direnv_version to properly handle major version bumps 
Closes #159
 2022-04-14 08:40:37 -04:00
Jörg Thalheim
c44fd24a25
Merge pull request #158 from nix-community/dependabot/github_actions/cachix/install-nix-action-17 
Bump cachix/install-nix-action from 16 to 17
 2022-04-11 08:05:12 +01:00
dependabot[bot]
d203f36f90
Bump cachix/install-nix-action from 16 to 17 
Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from 16 to 17.
- [Release notes](https://github.com/cachix/install-nix-action/releases)
- [Commits](https://github.com/cachix/install-nix-action/compare/v16...v17)

---
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>
 2022-04-11 04:01:05 +00:00
Jörg Thalheim
1d57b1c740
Merge pull request #157 from nix-community/doc_updates 
Doc updates
 2022-04-09 20:35:52 +01:00
Bryan Bennett
09ae467f76
README: Re-add Split shell itegration (but point at wiki) 
Co-authored-by: Jörg Thalheim <Mic92@users.noreply.github.com>
 2022-04-09 09:08:59 -04:00
Bryan Bennett
d8cff55741
README: Update flake support section 
The wording is now a bit more clear
and directly related to our repository and project.
 2022-04-07 10:04:28 -04:00
Bryan Bennett
d3651bdd23
README: Clarify a stance on git-tracking the direnv layout directory. 
Also took the liberty to update the wording in a way that I felt read a bit more smoothly.

closes #138
 2022-04-07 10:03:43 -04:00
Bryan Bennett
1741888b4c
README: Move explanation of direnv_layout_dir into example implementation 
It reads much more clearly in this manner,
as the documentation is presented alongside the thing it is documenting
 2022-04-07 09:57:44 -04:00
Bryan Bennett
e1df1d7484
README: Remove "Shell Integration" section 
This is better encapsulated as a recommendation in, say, `direnv`'s readme.
Our repo has arguably too much documentation already
and this is only somewhat related to our domain.

We may want to re-instantiate this as a "TIPS.md" or something,
but I don't feel that this belongs in the top-level rendered README.
 2022-04-07 09:55:40 -04:00
Jörg Thalheim
b2db5be94c
fix checksums 2022-04-07 09:05:08 +02:00
Jörg Thalheim
caaa2b6d75
update fetchurl checksum 2022-04-07 09:03:06 +02:00
Jörg Thalheim
d677f78787
bump version 2.0.0 2022-04-07 09:02:29 +02:00
Jörg Thalheim
3f8ca46903
Merge pull request #156 from nix-community/update_flake_lock_action 
flake.lock: Update
 2022-04-07 07:53:53 +01:00
github-actions[bot]
306561f4e9
flake.lock: Update 
Flake lock file updates:

• Updated input 'flake-utils':
    'github:numtide/flake-utils/b543720b25df6ffdfcf9227afafc5b8c1fabfae8' (2021-05-11)
  → 'github:numtide/flake-utils/0f8662f1319ad6abf89b3380dd2722369fc51ade' (2022-03-26)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/84aa23742f6c72501f9cc209f29c438766f5352d' (2021-05-26)
  → 'github:NixOS/nixpkgs/30d3d79b7d3607d56546dd2a6b49e156ba0ec634' (2022-03-25)
 2022-04-07 08:51:14 +02:00
Jörg Thalheim
88a7026b13
update flake every month 2022-04-07 08:49:18 +02:00
Bryan Bennett
f33d643d2f
Merge pull request #154 from typetetris/tests-as-flake-app 
Convert ci tests to nix flake app test-runner
 2022-04-04 08:04:23 -04:00
Bryan Bennett
2dfdd127bd
Make test messages consts rather than class state 2022-04-03 20:45:35 -04:00
Eric Wolf
d0c7bc5d90
nix channel path might be a link to a store path 
Use `_nix_direnv_realpath` to resolve it, that way
the store path gets noticed and "borrow some bits from ..."
succeeds.
 2022-04-03 20:45:31 -04:00
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