Commit graph

1024 commits

Author SHA1 Message Date
Jörg Thalheim
19278baf71
Merge pull request #550 from llakala/fix-lorri-mention
remove mention of lorri not supporting flakes
2025-02-17 16:04:44 +07:00
Eman Resu
e245b4f174 remove mention of lorri not supporting flakes
Lorri has supported flakes since 0.7, which came out several months ago.
2025-02-16 22:15:29 -05:00
Charles Hall
2e82170f06 rely on function autocalling
Instead of the current behavior of always trying to call the expression
as a function, or alternatively, trying to implement autocalling
manually with `builtins.isFunction`.
2025-02-15 01:44:21 +00:00
Jörg Thalheim
3888383341
Merge pull request #545 from nix-community/no-warn
don't warn about dirty trees
2025-01-17 11:05:29 +01:00
Jörg Thalheim
287f331749 don't warn about dirty trees
It's to be expected in a git repository that our environment will
contain non-committed code. No need to warn about that.
2025-01-16 20:43:32 +01:00
Jörg Thalheim
0357fa09ff
Merge pull request #536 from nicknovitski/patch-1
Always set nix-direnv-reload as executable
2024-11-27 07:45:32 +01:00
Nick Novitski
8a94275080 Always set nix-direnv-reload as executable
I am not sure why, but on docker bind mounts using virtiofs and gcsFuse,
`-x` is always true for a file which exists.  This means that, before
this commit was merged, when using nix-direnv in manual mode on a
devcontainer with docker desktop on mac, `nix-direnv-reload` would be
created and then not set as executable, and if they tried to run it
users would see an error like `bad interpreter: Permission denied`.
After this commit is merged, these scenarios work.
2024-11-26 20:39:33 -08:00
Jörg Thalheim
7789681eb2
Merge pull request #533 from britter/patch-1
Fix repository name in template description again.
2024-10-27 09:16:07 +01:00
Benedikt Ritter
3553f8fbfe
Fix repository name in template description again. 2024-10-26 15:20:12 +02:00
Benedikt Ritter
e0d71edd99 Update repository name in template description 2024-10-26 11:06:31 +00:00
ginkogruen
0d71ed4c4e Fix syntax for nix-systems input
Removed unsupported .com in nix-systems url input.
2024-10-08 09:03:54 +00:00
Peter A.
2154fdbb83 Added nix-systems input and made flake-utils.inputs.systems follow it. 2024-10-07 10:47:59 +00:00
dependabot[bot]
925084d860 Bump cachix/install-nix-action from 29 to 30
Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from 29 to 30.
- [Release notes](https://github.com/cachix/install-nix-action/releases)
- [Commits](https://github.com/cachix/install-nix-action/compare/v29...v30)

---
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>
2024-10-07 04:51:46 +00:00
dependabot[bot]
83366760e5 Bump cachix/install-nix-action from V28 to 29
Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from V28 to 29. This release includes the previously tagged commit.
- [Release notes](https://github.com/cachix/install-nix-action/releases)
- [Commits](https://github.com/cachix/install-nix-action/compare/V28...v29)

---
updated-dependencies:
- dependency-name: cachix/install-nix-action
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-09-30 04:55:09 +00:00
Jörg Thalheim
41d7d45cae
Merge pull request #522 from nix-community/update-mergify
ci(Mergify): configuration update
2024-09-20 09:32:20 +02:00
zowoq
c5f863e0be ci(Mergify): configuration update 2024-09-20 13:43:55 +10:00
Jörg Thalheim
6554cf8e54
Merge pull request #520 from nix-community/dependabot/github_actions/cachix/install-nix-action-V28
Bump cachix/install-nix-action from V27 to 28
2024-09-16 09:56:01 +02:00
Jörg Thalheim
ebc006d1cc
Merge pull request #519 from nix-community/dependabot/github_actions/DeterminateSystems/update-flake-lock-24
Bump DeterminateSystems/update-flake-lock from 23 to 24
2024-09-16 09:55:52 +02:00
dependabot[bot]
d1e02131bb
Bump cachix/install-nix-action from V27 to 28
Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from V27 to 28. This release includes the previously tagged commit.
- [Release notes](https://github.com/cachix/install-nix-action/releases)
- [Commits](https://github.com/cachix/install-nix-action/compare/V27...V28)

---
updated-dependencies:
- dependency-name: cachix/install-nix-action
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-09-16 04:30:11 +00:00
dependabot[bot]
d87219e5fe
Bump DeterminateSystems/update-flake-lock from 23 to 24
Bumps [DeterminateSystems/update-flake-lock](https://github.com/determinatesystems/update-flake-lock) from 23 to 24.
- [Release notes](https://github.com/determinatesystems/update-flake-lock/releases)
- [Commits](https://github.com/determinatesystems/update-flake-lock/compare/v23...v24)

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-09-16 04:30:07 +00:00
Jörg Thalheim
9048810b54
Merge pull request #515 from nix-community/update_flake_lock_action
flake.lock: Update
2024-09-03 21:32:55 +02:00
Jörg Thalheim
2f8c11b08b update fetchurl checksum 2024-09-03 20:51:16 +02:00
Jörg Thalheim
fed21f2dea bump version 3.0.6 2024-09-03 20:51:05 +02:00
Jörg Thalheim
e796476bc5
Merge pull request #516 from JoaquinTrinanes/fix/keep-manual-reload
Respect existing _nix_direnv_manual_reload
2024-09-03 20:50:07 +02:00
github-actions[bot]
f819a8836a flake.lock: Update
Flake lock file updates:

• Updated input 'flake-parts':
    'github:hercules-ci/flake-parts/8471fe90ad337a8074e957b69ca4d0089218391d?narHash=sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC%2Bx4%3D' (2024-08-01)
  → 'github:hercules-ci/flake-parts/567b938d64d4b4112ee253b9274472dc3a346eb6?narHash=sha256-%2Bebgonl3NbiKD2UD0x4BszCZQ6sTfL4xioaM49o5B3Y%3D' (2024-09-01)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/36a9aeaaa17a2d4348498275f9fe530cd4f9e519?narHash=sha256-z4nw9HxkaXEn%2B5OT8ljLVL2oataHvAzUQ1LEi8Fp%2BSY%3D' (2024-08-21)
  → 'github:NixOS/nixpkgs/b833ff01a0d694b910daca6e2ff4a3f26dee478c?narHash=sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w%2BROpMfuw%3D' (2024-09-01)
• Updated input 'treefmt-nix':
    'github:numtide/treefmt-nix/1d07739554fdc4f8481068f1b11d6ab4c1a4167a?narHash=sha256-rhis3qNuGmJmYC/okT7Dkc4M8CeUuRCSvW6kC2f3hBc%3D' (2024-08-16)
  → 'github:numtide/treefmt-nix/3ffd842a5f50f435d3e603312eefa4790db46af5?narHash=sha256-F4djBvyNRAXGusJiNYInqR6zIMI3rvlp6WiKwsRISos%3D' (2024-08-28)
2024-09-02 01:40:11 +00:00
Joaquín Triñanes
f88088b17b
Respect existing _nix_direnv_manual_reload 2024-08-28 19:23:35 +02:00
Jörg Thalheim
7272fa949e
Merge pull request #508 from nix-community/update_flake_lock_action
flake.lock: Update
2024-08-22 14:08:28 +02:00
Jörg Thalheim
aecd3b3871 mergify: fix test name 2024-08-22 14:08:12 +02:00
Jörg Thalheim
bd26bb8daf fix format 2024-08-22 13:02:22 +02:00
github-actions[bot]
8863fa0824 flake.lock: Update
Flake lock file updates:

• Updated input 'flake-parts':
    'github:hercules-ci/flake-parts/9227223f6d922fee3c7b190b2cc238a99527bbb7?narHash=sha256-pQMhCCHyQGRzdfAkdJ4cIWiw%2BJNuWsTX7f0ZYSyz0VY%3D' (2024-07-03)
  → 'github:hercules-ci/flake-parts/8471fe90ad337a8074e957b69ca4d0089218391d?narHash=sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC%2Bx4%3D' (2024-08-01)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/aa247c0c90ecf4ae7a032c54fdc21b91ca274062?narHash=sha256-GaliJqfFwyYxReFywxAa8orCO%2BEnDq2NK2F%2B5aSc8vo%3D' (2024-07-14)
  → 'github:NixOS/nixpkgs/36a9aeaaa17a2d4348498275f9fe530cd4f9e519?narHash=sha256-z4nw9HxkaXEn%2B5OT8ljLVL2oataHvAzUQ1LEi8Fp%2BSY%3D' (2024-08-21)
• Updated input 'treefmt-nix':
    'github:numtide/treefmt-nix/b92afa1501ac73f1d745526adc4f89b527595f14?narHash=sha256-VZK73b5hG5bSeAn97TTcnPjXUXtV7j/AtS4KN8ggCS0%3D' (2024-07-14)
  → 'github:numtide/treefmt-nix/1d07739554fdc4f8481068f1b11d6ab4c1a4167a?narHash=sha256-rhis3qNuGmJmYC/okT7Dkc4M8CeUuRCSvW6kC2f3hBc%3D' (2024-08-16)
2024-08-22 13:02:22 +02:00
Jörg Thalheim
3821242803 update mergify rules to include all tests
also fix deprecated rules and merge in batches when we are already at
it.
2024-08-22 13:00:47 +02:00
Jörg Thalheim
ab6a1b5341
Merge pull request #514 from nix-community/joerg-ci
ci: also run tests on master
2024-08-22 12:59:21 +02:00
Jörg Thalheim
ad3d664ee3 ci: also run tests on master 2024-08-22 12:58:30 +02:00
Jörg Thalheim
a3139c8f49
Merge pull request #513 from K900/ambient-nix-with-fallback
Use ambient Nix when available, with a two stage fallback
2024-08-22 12:43:03 +02:00
mergify[bot]
5bbcef53fa
Merge branch 'master' into ambient-nix-with-fallback 2024-08-21 19:16:33 +00:00
K900
94def84445 Use ambient Nix when available, with a two stage fallback
First, we try to use the ambient Nix version.
Then, we try to use $NIX_DIRENV_FALLBACK_NIX, which is set by default,
but can also be overridden by the user.
Only then, if neither is available, we fail.

Fixes #451.
2024-08-21 21:55:49 +03:00
Bryan Bennett
e29d46aee7
Merge pull request #512 from JoaquinTrinanes/fix/strict-mode
Fix unbound shell variable errors on strict mode
2024-08-21 14:05:26 -04:00
Joaquín Triñanes
aff76f86fe
Fix unbound shell variable errors on strict mode 2024-08-20 14:34:44 +02:00
Jörg Thalheim
cff4f3cb0f
Merge pull request #511 from nix-community/joerg-ci
replace nixpkgs-fmt with nixfmt-rfc-style
2024-08-15 15:10:35 +02:00
Jörg Thalheim
5f8bbf7681 replace nixpkgs-fmt with nixfmt-rfc-style 2024-08-15 14:50:28 +02:00
Jörg Thalheim
a51bd670d6 update treefmt configuration 2024-07-15 10:54:23 +02:00
Jörg Thalheim
9734eba858 add shellcheck directives for .envrc 2024-07-15 10:52:25 +02:00
github-actions[bot]
69e22fb903 flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/ab82a9612aa45284d4adf69ee81871a389669a9e?narHash=sha256-5r0pInVo5d6Enti0YwUSQK4TebITypB42bWy5su3MrQ%3D' (2024-07-07)
  → 'github:NixOS/nixpkgs/aa247c0c90ecf4ae7a032c54fdc21b91ca274062?narHash=sha256-GaliJqfFwyYxReFywxAa8orCO%2BEnDq2NK2F%2B5aSc8vo%3D' (2024-07-14)
• Updated input 'treefmt-nix':
    'github:numtide/treefmt-nix/e1d7bd5ec6fc389eb3a90e232c4150338bf6a508?narHash=sha256-ludjqxhR/5lXwJ1H6zHmZqp%2B4e8dFPHE9FIZ2eBh2G4%3D' (2024-07-07)
  → 'github:numtide/treefmt-nix/b92afa1501ac73f1d745526adc4f89b527595f14?narHash=sha256-VZK73b5hG5bSeAn97TTcnPjXUXtV7j/AtS4KN8ggCS0%3D' (2024-07-14)
2024-07-15 01:34:16 +00:00
Jörg Thalheim
104a5075a1
Merge pull request #507 from nix-community/joerg-ci
flake.lock: Update
2024-07-14 19:11:07 +02:00
mergify[bot]
ad378cf38e
Merge branch 'master' into joerg-ci 2024-07-08 11:11:23 +00:00
Jörg Thalheim
4fabc9b644
Merge pull request #505 from nix-community/dependabot/github_actions/DeterminateSystems/update-flake-lock-23
Bump DeterminateSystems/update-flake-lock from 22 to 23
2024-07-08 13:10:44 +02:00
Jörg Thalheim
c57fe2b791 modernize treefmt configuration 2024-07-08 13:02:03 +02:00
Jörg Thalheim
bd2255044c remove deprecated formatters 2024-07-08 12:53:36 +02:00
github-actions[bot]
3eda27f1ca flake.lock: Update
Flake lock file updates:

• Updated input 'flake-parts':
    'github:hercules-ci/flake-parts/c3c5ecc05edc7dafba779c6c1a61cd08ac6583e9?narHash=sha256-xwgjVUpqSviudEkpQnioeez1Uo2wzrsMaJKJClh%2BBls%3D' (2024-06-30)
  → 'github:hercules-ci/flake-parts/9227223f6d922fee3c7b190b2cc238a99527bbb7?narHash=sha256-pQMhCCHyQGRzdfAkdJ4cIWiw%2BJNuWsTX7f0ZYSyz0VY%3D' (2024-07-03)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/1e3deb3d8a86a870d925760db1a5adecc64d329d?narHash=sha256-vN5xJAZ4UGREEglh3lfbbkIj%2BMPEYMuqewMn4atZFaQ%3D' (2024-06-27)
  → 'github:NixOS/nixpkgs/b60793b86201040d9dee019a05089a9150d08b5b?narHash=sha256-PlL/yXNX/C87S2N8lF/HfOJhHForf/l7E6lVWZ4jMrw%3D' (2024-07-07)
• Updated input 'treefmt-nix':
    'github:numtide/treefmt-nix/8df5ff62195d4e67e2264df0b7f5e8c9995fd0bd?narHash=sha256-ddPKHcqaKCIFSFc/cvxS14goUhCOAwsM1PbMr0ZtHMg%3D' (2024-06-30)
  → 'github:numtide/treefmt-nix/e1d7bd5ec6fc389eb3a90e232c4150338bf6a508?narHash=sha256-ludjqxhR/5lXwJ1H6zHmZqp%2B4e8dFPHE9FIZ2eBh2G4%3D' (2024-07-07)
2024-07-08 12:50:48 +02:00
mergify[bot]
19cc6e515b
Merge branch 'master' into dependabot/github_actions/DeterminateSystems/update-flake-lock-23 2024-07-01 05:18:52 +00:00