Commit graph

1018 commits

Author SHA1 Message Date
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
Jörg Thalheim
8110535675 README: update fetchurl checksum 2021-10-21 07:47:48 +02:00
Jörg Thalheim
dbf5e87258 README: update fetchurl checksum 2021-10-21 07:47:14 +02:00
Jörg Thalheim
d26fc52f8d
Merge pull request #116 from sir4ur0n/patch-1
Explain customizing the nix file name
2021-10-20 09:43:18 +01:00
Jörg Thalheim
4740a1ee7e
Merge pull request #118 from nix-community/install-fix
don't make direnvrc exectuable
2021-10-20 09:43:01 +01:00
Jörg Thalheim
819bec88c3 don't make direnvrc exectuable
fixes https://github.com/nix-community/nix-direnv/issues/117
2021-10-20 10:14:51 +02:00
Julien Debon
09f97b357c
Explain customizing the nix file name 2021-10-19 13:47:02 +02:00
Jörg Thalheim
53c44ae33a
Merge pull request #111 from nix-community/dependabot/github_actions/cachix/install-nix-action-14
Bump cachix/install-nix-action from 13 to 14
2021-09-13 10:26:56 +01:00
dependabot[bot]
c44fab22b0
Bump cachix/install-nix-action from 13 to 14
Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from 13 to 14.
- [Release notes](https://github.com/cachix/install-nix-action/releases)
- [Commits](https://github.com/cachix/install-nix-action/compare/v13...v14)

---
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-09-13 04:00:59 +00:00
Jörg Thalheim
8729f1740c
Merge pull request #106 from immae/add_argsum
Add a suffix to cache file to allow multiple calls to use_nix
2021-09-12 05:32:00 +01:00
Jörg Thalheim
77418af186 make shellcheck happy 2021-09-12 06:29:45 +02:00
Jörg Thalheim
ceb91896cd prefer sha1sum over shasum
sha1sum is written in C, while shasum requires perl interpreter
and has higher overhead.
2021-09-12 06:25:14 +02:00
Jörg Thalheim
97d73b892a remove dependency on external tools when computing cache key 2021-09-12 06:23:42 +02:00
Jörg Thalheim
759765644d
Merge pull request #107 from zakame/dont-override-tmpdir
direnvrc: don't override TMPDIR
2021-09-12 04:59:16 +01:00
Jörg Thalheim
45f3927ab5
Merge pull request #108 from hsek/master
Update `lorri` link in README
2021-08-30 07:27:59 +01:00
SEKUN
5dfd5220dc
Update lorri link in README 2021-08-29 23:14:51 +00:00
Zak B. Elep
37c36013b4 direnvrc: don't override TMPDIR
On macOS, `$TMPDIR` is usually a private temp dir separate from
`/tmp` - this trips up some programs like `emacsclient` when under
nix-shell.
2021-08-15 20:05:09 +08:00
Ismaël Bouya
9544919b4c
Add a suffix to allow multiple calls to use_nix
This change permits to make multiple calls to use_nix, with different
arguments passed to it. It will generate a cache file for each distinct
"argument list" rather than based solely on the nixpkgs version.
2021-08-12 12:08:18 +02:00
Jörg Thalheim
34613e1e10
Merge pull request #99 from Hoverbear/use-flake-overlay
chore: add overlay
2021-07-15 08:45:21 +01:00
Jörg Thalheim
6461344126
README: update nix-direnv 2021-07-01 10:47:57 +02:00
Jörg Thalheim
baea0fe141
Merge pull request #100 from thomasbach-dev/master
fix(doc): document how to enable flake support on NixOS
2021-07-01 09:45:18 +01:00
Thomas Bach
e890fb5ec0 fix(doc): document how to enable flake support on NixOS
Due to NixOS making nix-direnv use the stable version of nix by
default we get this error when using flakes:

direnv: using flake
error: 'print-dev-env' is not a recognised command
[…]
error: 'flake' is not a recognised command

This can be worked around by passing `enableFlakes = true` to the
package.

See also #92.
2021-06-29 14:36:07 +02:00
Ana Hobden
7f73bb6d9a chore: fix double import of nixpkgs
Signed-off-by: Ana Hobden <operator@hoverbear.org>
2021-06-28 19:18:55 -07:00
Jörg Thalheim
a11b96b557
Merge pull request #98 from Hoverbear/fix-stdenv-lib-missing
fix(warn): stdenv.lib missing
2021-06-26 11:46:39 +02:00
Ana Hobden
d9150502ad chore: add overlay
Signed-off-by: Ana Hobden <operator@hoverbear.org>
2021-06-25 09:02:01 -07:00
Ana Hobden
3868bd048a fix(warn): stdenv.lib missing
Signed-off-by: Ana Hobden <operator@hoverbear.org>
2021-06-25 08:56:58 -07:00
Jörg Thalheim
ccc2e4c5db
Merge pull request #95 from JesusMtnez/doc
Update installation via home-manager documentation
2021-06-16 22:32:35 +02:00
JesusMtnez
dcf67cd1b5
Update installation via home-manager documentation 2021-06-16 06:09:42 +02:00
Jörg Thalheim
4eab19bf22
Merge pull request #93 from ryneeverett/refactor-tests
test.py: isolate assertions; DRY data generation
2021-06-13 11:55:47 +02:00
ryneeverett
5c65694ea8 test.py: isolate assertions; DRY data generation
The majority of the test code is just creating the stdout data against
which to make assertions. Increasing the test cases will be more
manageable if the assertions are separate from this data generation.

It is also a generally preferred style to have one assertion per test,
because this way all assertions run even if others fail and each test
only fails for one reason. It also facilitates better test documentation
and adding additional tests without increasing complexity.
2021-06-11 15:13:57 -04:00
Jörg Thalheim
6c32d2d5ff
Merge pull request #91 from ryneeverett/shellhook-caching
flakes: Don't run shellHook on cached dev shells
2021-06-11 08:37:55 +02:00
ryneeverett
6e68ea7235 flakes: Don't run shellHook on cached dev shells
This makes the behavior of `use flake` consistent with that of `use
nix`.

Resolve #90.
2021-06-08 20:51:07 -04:00