Commit graph

983 commits

Author SHA1 Message Date
Bryan Bennett
75fd2d5e53 Remove non-strict versions of tests
If we pass with `strict_env` enabled, we should pass without it.
2025-08-29 12:11:22 -04:00
Bryan Bennett
c762c5cb28 Make test output less verbose 2025-08-29 12:11:22 -04:00
Bryan Bennett
94fc26eaa2 Allow users to opt out of devShell fallback 2025-08-29 12:11:22 -04:00
Bryan Bennett
c0270d9f3c
Merge pull request #598 from nix-community/bats_testing
Some checks failed
Test / tests (ubuntu-latest, latest) (push) Has been cancelled
Test / tests (ubuntu-latest, stable) (push) Has been cancelled
Switch to bats over pytest
2025-08-28 18:50:44 +00:00
nix-direnv-ci[bot]
9087701632
Merge pull request #604 from nix-community/update-treefmt-nix
Some checks failed
Test / tests (ubuntu-latest, latest) (push) Has been cancelled
Test / tests (ubuntu-latest, stable) (push) Has been cancelled
Update flake input: treefmt-nix
2025-08-24 02:41:21 +00:00
nix-direnv-ci[bot]
5b077a9e11
Merge pull request #603 from nix-community/update-nixpkgs
Update flake input: nixpkgs
2025-08-24 02:41:08 +00:00
github-actions[bot]
f476f2903d Update flake input: treefmt-nix
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2025-08-24 02:34:56 +00:00
github-actions[bot]
56be851cd2 Update flake input: nixpkgs
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2025-08-24 02:34:52 +00:00
Bryan Bennett
c59b60e747 Switch to bats over pytest
This removes python entirely from the stack.
Yet to run the tests on macOS, but they're buildable by way of nix
wrapping. Worst case scenario, you cannot run them from the devshell
but `nix run .#test-runner-<latest||stable>` should work okay.
2025-08-19 08:44:42 -04:00
Jörg Thalheim
1670544970
Merge pull request #602 from nix-community/merge-when-green-joerg-turingmachine
Some checks failed
Test / tests (ubuntu-latest, latest) (push) Has been cancelled
Test / tests (ubuntu-latest, stable) (push) Has been cancelled
switch to update-flake-inputs actions to get auto-merge
2025-08-18 06:55:27 +00:00
Jörg Thalheim
bea92d9270 switch to update-flake-inputs actions to get auto-merge 2025-08-18 08:48:31 +02:00
Jörg Thalheim
1962cfb724
Merge pull request #601 from nix-community/merge-when-green-joerg-turingmachine
auto-merge: add app token for automatic merge queues
2025-08-18 06:38:00 +00:00
Jörg Thalheim
e02da57293 auto-merge: add app token for automatic merge queues 2025-08-18 08:25:46 +02:00
Jörg Thalheim
c6e337280b
Merge pull request #600 from nix-community/dependabot/github_actions/actions/checkout-5
Bump actions/checkout from 4 to 5
2025-08-18 06:23:53 +00:00
dependabot[bot]
2f04e43658
Bump actions/checkout from 4 to 5
Bumps [actions/checkout](https://github.com/actions/checkout) from 4 to 5.
- [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/v4...v5)

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

Signed-off-by: dependabot[bot] <support@github.com>
2025-08-18 06:03:45 +00:00
Jörg Thalheim
5983e1de42
Merge pull request #591 from nix-community/update_flake_lock_action
Some checks are pending
Test / tests (ubuntu-latest, latest) (push) Waiting to run
Test / tests (ubuntu-latest, stable) (push) Waiting to run
flake.lock: Update
2025-08-17 13:01:37 +00:00
Jörg Thalheim
9ffd0b329e
Merge pull request #594 from nix-community/dependabot/github_actions/DeterminateSystems/update-flake-lock-27
Bump DeterminateSystems/update-flake-lock from 25 to 27
2025-08-17 13:01:28 +00:00
github-actions[bot]
6a11574e82 flake.lock: Update
Flake lock file updates:

• Updated input 'flake-parts':
    'github:hercules-ci/flake-parts/77826244401ea9de6e3bac47c2db46005e1f30b5?narHash=sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ%3D' (2025-07-01)
  → 'github:hercules-ci/flake-parts/af66ad14b28a127c5c0f3bbb298218fc63528a18?narHash=sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8%3D' (2025-08-06)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/d31a91c9b3bee464d054633d5f8b84e17a637862?narHash=sha256-p%2BUruOjULI5lV16FkBqkzqgFasLqfx0bihLBeFHiZAs%3D' (2025-07-01)
  → 'github:NixOS/nixpkgs/d74de548348c46cf25cb1fcc4b74f38103a4590d?narHash=sha256-Ix7ALeaxv9tW4uBKWeJnaKpYZtZiX4H4Q/MhEmj4XYA%3D' (2025-08-13)
• Updated input 'treefmt-nix':
    'github:numtide/treefmt-nix/ac8e6f32e11e9c7f153823abc3ab007f2a65d3e1?narHash=sha256-0IEdQB1nS%2BuViQw4k3VGUXntjkDp7aAlqcxdewb/hAc%3D' (2025-06-26)
  → 'github:numtide/treefmt-nix/7d81f6fb2e19bf84f1c65135d1060d829fae2408?narHash=sha256-2vX8QjO5lRsDbNYvN9hVHXLU6oMl%2BV/PsmIiJREG4rE%3D' (2025-08-10)
2025-08-14 00:34:13 +00:00
dependabot[bot]
09663a6363
Bump DeterminateSystems/update-flake-lock from 25 to 27
---
updated-dependencies:
- dependency-name: DeterminateSystems/update-flake-lock
  dependency-version: '27'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-07-21 05:00:56 +00:00
fidgetingbits
445dc9ffc6
Improve version testing logic and add relevant tests 2025-07-19 19:00:53 +08:00
Jörg Thalheim
add4b907c0
Merge pull request #586 from nix-community/update_flake_lock_action
Some checks failed
Test / tests (ubuntu-latest, latest) (push) Has been cancelled
Test / tests (ubuntu-latest, stable) (push) Has been cancelled
flake.lock: Update
2025-07-04 07:32:56 +00:00
github-actions[bot]
7abb53e4d1 flake.lock: Update
Flake lock file updates:

• Updated input 'flake-parts':
    'github:hercules-ci/flake-parts/c621e8422220273271f52058f618c94e405bb0f5?narHash=sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY%3D' (2025-04-01)
  → 'github:hercules-ci/flake-parts/77826244401ea9de6e3bac47c2db46005e1f30b5?narHash=sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ%3D' (2025-07-01)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/bdac72d387dca7f836f6ef1fe547755fb0e9df61?narHash=sha256-UQubDNIQ/Z42R8tPCIpY%2BBOhlxO8t8ZojwC9o2FW3c8%3D' (2025-05-25)
  → 'github:NixOS/nixpkgs/d31a91c9b3bee464d054633d5f8b84e17a637862?narHash=sha256-p%2BUruOjULI5lV16FkBqkzqgFasLqfx0bihLBeFHiZAs%3D' (2025-07-01)
• Updated input 'treefmt-nix':
    'github:numtide/treefmt-nix/020cb423808365fa3f10ff4cb8c0a25df35065a3?narHash=sha256-XgxghfND8TDypxsMTPU2GQdtBEsHTEc3qWE6RVEk8O0%3D' (2025-05-22)
  → 'github:numtide/treefmt-nix/ac8e6f32e11e9c7f153823abc3ab007f2a65d3e1?narHash=sha256-0IEdQB1nS%2BuViQw4k3VGUXntjkDp7aAlqcxdewb/hAc%3D' (2025-06-26)
2025-07-03 00:34:16 +00:00
Bryan Bennett
c3b16828a9
Merge pull request #587 from gravndal/realpath
Some checks failed
Test / tests (ubuntu-latest, latest) (push) Has been cancelled
Test / tests (ubuntu-latest, stable) (push) Has been cancelled
resolve symbolic links to nixpkgs
2025-06-17 14:00:06 +00:00
Gaute Ravndal
1425ff4592 resolve symbolic links to nixpkgs
Fixes version detection if nixpkgs is a symbolic link into the nix
store.
2025-06-15 20:04:05 +02:00
Jörg Thalheim
5e729f239f
Merge pull request #585 from nix-community/release-3.1.0
Update checksums for release 3.1.0 of nix-direnv
2025-05-28 22:27:54 +00:00
Jörg Thalheim
e9be444755 update fetchurl checksum 2025-05-29 00:22:22 +02:00
Jörg Thalheim
1f3349f604
Merge pull request #584 from nix-community/release-3.1.0
Release 3.1.0
2025-05-28 22:15:53 +00:00
Jörg Thalheim
ae9062da3a bump version 3.1.0 2025-05-29 00:10:24 +02:00
Jörg Thalheim
9bb2f9f0e8
Merge pull request #583 from nix-community/version-check
Drop nix version checks
2025-05-28 21:20:18 +00:00
Jörg Thalheim
03926f3864 README: document requirements 2025-05-27 09:48:07 +02:00
Jörg Thalheim
5a9e078e9e drop nix version checks
Fixes https://github.com/nix-community/nix-direnv/issues/582
Checks broke and we can simplify them by deleting.
People that still have nix older than 2.4 in their PATH have to now set
NIX_DIRENV_FALLBACK_NIX themselves.
2025-05-27 09:48:07 +02:00
Jörg Thalheim
ce19520ab7
Merge pull request #577 from nix-community/update_flake_lock_action
flake.lock: Update
2025-05-26 13:33:38 +00:00
Jörg Thalheim
725a9c701b
Merge pull request #580 from nix-community/merge-when-green-joerg
drop binary cache from flake
2025-05-26 12:51:19 +00:00
Jörg Thalheim
d41937d363 drop binary cache from flake
It's not really needed anymore and concerns user when instantiating
templates: https://github.com/nix-community/nix-direnv/issues/576
2025-05-26 14:44:50 +02:00
Jörg Thalheim
d5ea808597
Merge pull request #579 from nix-community/dependabot/github_actions/DeterminateSystems/update-flake-lock-25
Bump DeterminateSystems/update-flake-lock from 24 to 25
2025-05-26 12:44:10 +00:00
github-actions[bot]
43e278fc40 flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/b3582c75c7f21ce0b429898980eddbbf05c68e55?narHash=sha256-FshoQvr6Aor5SnORVvh/ZdJ1Sa2U4ZrIMwKBX5k2wu0%3D' (2025-05-07)
  → 'github:NixOS/nixpkgs/bdac72d387dca7f836f6ef1fe547755fb0e9df61?narHash=sha256-UQubDNIQ/Z42R8tPCIpY%2BBOhlxO8t8ZojwC9o2FW3c8%3D' (2025-05-25)
• Updated input 'treefmt-nix':
    'github:numtide/treefmt-nix/29ec5026372e0dec56f890e50dbe4f45930320fd?narHash=sha256-4h3s1L/kKqt3gMDcVfN8/4v2jqHrgLIe4qok4ApH5x4%3D' (2025-05-02)
  → 'github:numtide/treefmt-nix/020cb423808365fa3f10ff4cb8c0a25df35065a3?narHash=sha256-XgxghfND8TDypxsMTPU2GQdtBEsHTEc3qWE6RVEk8O0%3D' (2025-05-22)
2025-05-26 00:34:25 +00:00
dependabot[bot]
5073c3e559
Bump DeterminateSystems/update-flake-lock from 24 to 25
Bumps [DeterminateSystems/update-flake-lock](https://github.com/determinatesystems/update-flake-lock) from 24 to 25.
- [Release notes](https://github.com/determinatesystems/update-flake-lock/releases)
- [Commits](https://github.com/determinatesystems/update-flake-lock/compare/v24...v25)

---
updated-dependencies:
- dependency-name: DeterminateSystems/update-flake-lock
  dependency-version: '25'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-05-19 04:55:23 +00:00
Jörg Thalheim
f8316e92ea
Merge pull request #578 from nix-community/dependabot/github_actions/actions/create-github-app-token-2
Bump actions/create-github-app-token from 1 to 2
2025-05-12 14:22:25 +00:00
dependabot[bot]
22ee7d7d51
Bump actions/create-github-app-token from 1 to 2
Bumps [actions/create-github-app-token](https://github.com/actions/create-github-app-token) from 1 to 2.
- [Release notes](https://github.com/actions/create-github-app-token/releases)
- [Commits](https://github.com/actions/create-github-app-token/compare/v1...v2)

---
updated-dependencies:
- dependency-name: actions/create-github-app-token
  dependency-version: '2'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-05-12 04:26:27 +00:00
Jörg Thalheim
4c7a90ec01
Merge pull request #575 from nix-community/update-release-script
Rework release process to work with merge-queues
2025-05-09 15:27:38 +00:00
Jörg Thalheim
7e24237575 rework release process to work with merge-queues 2025-05-09 17:21:53 +02:00
Jörg Thalheim
d810a43b41
Merge pull request #574 from nix-community/release-3.0.7
Update checksums for release 3.0.7 of nix-direnv
2025-05-09 15:18:56 +00:00
Jörg Thalheim
70e533483b update fetchurl checksum 2025-05-09 17:13:38 +02:00
Jörg Thalheim
c6eb5a63d3
Merge pull request #573 from nix-community/release-3.0.7
Release 3.0.7
2025-05-09 14:25:56 +00:00
Jörg Thalheim
48ddf8e45e bump version 3.0.7 2025-05-09 16:20:44 +02:00
Jörg Thalheim
c43538a2a8
Merge pull request #572 from nix-community/bash4
drop bash4 from ci
2025-05-09 11:51:17 +00:00
Jörg Thalheim
2503b03950 reformat code after nixpkgs bump 2025-05-09 13:46:01 +02:00
Jörg Thalheim
edb55954a8 drop bash4 from ci
We are no longer able to compile bash4. Ideally we could upgrade to
bash5.0 but I also had issues to compile it. I do not want to drop bash5.0 just now because it
was released in 2019 and probably enough people are still using it.
Until we have a better solution, we no longer test this bash version and
support for this version becomes best effort.
For the most part we are not using many features and the code churn
these days is relative low.
2025-05-09 13:43:09 +02:00
Jörg Thalheim
220ef9595d
Merge pull request #571 from nix-community/merge-when-green-joerg
add auto-merge github action
2025-05-09 11:07:32 +00:00
Jörg Thalheim
38d1fdd077 add auto-merge github action
also use app token for update-flake-lock so that auto-merge actions can be triggered
2025-05-09 13:02:30 +02:00