Commit graph

1029 commits

Author SHA1 Message Date
Jörg Thalheim
afe42485d0
re-tested lorri 2021-02-11 10:17:51 +01:00
Jörg Thalheim
d863a89c4d
Merge pull request #68 from nix-community/flake-fix-gc 2021-02-11 08:03:49 +00:00
Jörg Thalheim
763d572df3
properly register flake source gc root
Before it just add a gc root with to a symlink to the current directory.
2021-02-11 08:59:09 +01:00
Jörg Thalheim
1c8f93e60e
define nixpkgs input
otherwise it could be anything defined by the user
2021-02-11 08:41:45 +01:00
Jörg Thalheim
a1e488a260
upgrade nixUnstable 2021-02-11 08:26:17 +01:00
Jörg Thalheim
8361e7f4a4
Merge pull request #66 from nix-community/nix-store-cache
fallback to store path as nixpkgs cache key
2021-02-11 06:44:38 +00:00
Jörg Thalheim
3a6dfcede5
fallback to store path as nixpkgs cache key 2021-02-10 14:33:18 +01:00
Jörg Thalheim
5299609865
README: update source_url 2021-01-30 19:49:47 +01:00
Jörg Thalheim
52802adf85
Merge pull request #64 from nix-community/fixes 2021-01-30 18:42:50 +00:00
Jörg Thalheim
991ea66bb8
fix nix shells with different nix version
If shell.nix contains its own nix version,
our version check might no longer work.
2021-01-30 12:19:10 +01:00
Jörg Thalheim
5dc8842dbc
get rid of gnugrep dependency 2021-01-30 12:18:19 +01:00
Jörg Thalheim
dff7b0bfe9
bump version 1.2.1 2021-01-10 08:46:34 +01:00
Jörg Thalheim
1e3b9977a7
Merge pull request #60 from nix-community/nix_prefix
don't output nix version on stdout
2021-01-10 07:34:26 +00:00
Jörg Thalheim
246a0fbe3a
REAMDE: link to other projects, improve evaluation cache invalidation 2021-01-10 08:32:07 +01:00
Jörg Thalheim
14eec73a76
Merge pull request #61 from nix-community/ci 2021-01-09 10:15:54 +00:00
Jörg Thalheim
ba5ce883d5
switch to nixpkgs
channel has been broken
2021-01-09 08:49:26 +01:00
Jörg Thalheim
1322dc3dbe
don't print nix version 2021-01-09 08:49:15 +01:00
Jörg Thalheim
a7b2f70c14
don't output nix version on stdout 2021-01-02 17:46:06 +01:00
Jörg Thalheim
7cec473d58
Merge pull request #59 from nix-community/nix_prefix 2021-01-02 10:34:05 +00:00
Jörg Thalheim
7faa01070b
only set experimental features in old nix 2021-01-02 11:31:14 +01:00
Jörg Thalheim
944585ff46
fix shellcheck warnings 2021-01-02 11:22:19 +01:00
Jörg Thalheim
f289bce100
add NIX_BIN_PREFIX to hardcode nix 2021-01-02 11:06:53 +01:00
Jörg Thalheim
a5d469806c
add source_url installation 2020-12-31 07:55:12 +01:00
Jörg Thalheim
7e9ee77fca
Merge pull request #58 from bevuta/fix-nixpkgs-git-checkout-version
direnvrc: Fix reading of nixpkgs version from git checkout
2020-12-30 19:21:15 +00:00
Jörg Thalheim
fd48b56d0d
Merge pull request #57 from nix-community/fix-macos-ci-2 2020-12-25 18:22:48 +00:00
Jörg Thalheim
6833ac2172
fix path collision with multiple gcroots in same dir 2020-12-25 19:20:19 +01:00
Jörg Thalheim
f79469890a
use perl on macos to emulate realpath
readlink without -f breaks with use_flakes
2020-12-25 18:59:56 +01:00
Jörg Thalheim
4aad17c4a1
tests: extend use_flake tests 2020-12-25 18:30:52 +01:00
Jörg Thalheim
47da3c88c7
tests: fix flake feature check 2020-12-25 18:30:52 +01:00
Jörg Thalheim
5dd5a26ccf
direnv: fix updating gcroots if store path is a directory 2020-12-25 17:59:48 +01:00
Jörg Thalheim
e19d62fc02
use_flake: add gcroot for inputs 2020-12-25 17:29:44 +01:00
Jörg Thalheim
a42379edaa
Merge pull request #56 from nix-community/fix-macos-ci-2
update flakes installer
2020-12-25 16:27:00 +00:00
Jörg Thalheim
24f58e2ed7
update flakes installer 2020-12-25 15:44:58 +01:00
Moritz Heidkamp
19372436ef direnvrc: Fix reading of nixpkgs version from git checkout 2020-12-21 15:29:54 +01:00
Jörg Thalheim
003dd8b808
Merge pull request #55 from nix-community/fix-macos
use readlink instead of realpath
2020-12-09 16:38:59 +00:00
Jörg Thalheim
e5c4a4678a
use readlink instead of realpath
fixes #54

readpath is not available on macOS.
2020-12-09 17:38:37 +01:00
Jörg Thalheim
9b3e62f10f
Merge pull request #53 from nix-community/dependabot/github_actions/cachix/install-nix-action-v12
Bump cachix/install-nix-action from v11 to v12
2020-11-09 13:02:19 +01:00
dependabot[bot]
f6278e2a32
Bump cachix/install-nix-action from v11 to v12
Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from v11 to v12.
- [Release notes](https://github.com/cachix/install-nix-action/releases)
- [Commits](https://github.com/cachix/install-nix-action/compare/v11...07da2520eebede906fbeefa9dd0a2b635323909d)

Signed-off-by: dependabot[bot] <support@github.com>
2020-11-09 05:34:43 +00:00
Jörg Thalheim
b54e2f2c4b
README: fix usuage example 2020-10-25 20:08:08 +00:00
Jörg Thalheim
55cb247ab7
Merge pull request #49 from erikarvstedt/readme-fix
README: minor formatting/wording fixes
2020-10-24 15:54:30 +02:00
Erik Arvstedt
c9f9be0a46 README: minor formatting/wording fixes 2020-10-24 08:46:43 +02:00
Jörg Thalheim
c6be02bdf0
Merge pull request #48 from erikarvstedt/fix-layout-dirs
README: fix direnv_layout_dir setup
2020-10-24 08:25:06 +02:00
Erik Arvstedt
2aa433e90e README: fix direnv_layout_dir setup
The static setup of `direnv_layout_dir` in `direnvrc` leads to the
creation of separate layout dirs and nix shell caches for each
subdirectory of a project.
Reason: When `direnvrc` is evaluated, `PWD` has the value of the calling
user's shell, instead of pointing to the project directory (the dir containing `.envrc`).

Fix this by dynamically evaluating `$PWD` in a function.
Dynamic evaluation is also required when `.envrc` includes (via `source_*`) `.envrc`
files from other projects because `$PWD` changes in this case.

Cache the computed layout paths because `shasum` is
fairly expensive (13 ms on my desktop system).
2020-10-23 15:30:52 +02:00
Jörg Thalheim
a751ddd538
Merge pull request #47 from erikarvstedt/master
use mkdir -p for direnv_layout_dir
2020-10-16 20:17:31 +02:00
Erik Arvstedt
91f83adf52 use mkdir -p for direnv_layout_dir
This avoids a 'cannot create directory' error when a custom layout dir like
direnv_layout_dir=$HOME/.cache/nix-direnv/$pwdHash
is used and the cache dir doesn't exist. This may happen when nix-direnv is used
for the first time or when the cache has been cleared.
2020-10-15 21:38:04 +02:00
Jörg Thalheim
17f288b353
Merge pull request #46 from nix-community/shell 2020-10-15 02:08:48 +02:00
Jörg Thalheim
1ef31ac5ff
direnvrc: don't drop shellHook output 2020-10-15 01:58:54 +02:00
Jörg Thalheim
bb0fc5792f
don't override SHELL
this variable might be useful in direnv to expose different behavior
depending on calling shell.

fixes https://github.com/nix-community/nix-direnv/issues/45
2020-10-15 01:47:48 +02:00
Jörg Thalheim
94cc112118
Merge pull request #42 from nix-community/dependabot/github_actions/cachix/install-nix-action-v11 2020-09-28 09:57:13 +02:00
Jörg Thalheim
d6b414a912
githubactions: set nix_path 2020-09-28 09:51:43 +02:00