Commit graph

563 commits

Author SHA1 Message Date
Jörg Thalheim
e3d41d9c39 also test nix-unstable 2023-05-23 17:22:04 +02:00
Jörg Thalheim
ba2b0a2b81 ci/test: only run on certain branches 2023-05-23 16:06:10 +02:00
Jörg Thalheim
1278fbd4cb update bors.toml 2023-05-23 16:03:04 +02:00
Jörg Thalheim
fd7dbd8e0d add garnix to flake.nix 2023-05-23 16:02:08 +02:00
Jörg Thalheim
2181e8c8e6 ci: accept binary cache 2023-05-23 16:02:08 +02:00
Jörg Thalheim
7f308330d5 split of linting from test 2023-05-23 16:02:08 +02:00
Jörg Thalheim
310012412a default.nix: allow to override packages 2023-05-23 15:40:13 +02:00
Jörg Thalheim
f59840c4c2 flake: drop legacy flake outputs 2023-05-23 15:40:13 +02:00
Jörg Thalheim
f48be552e6 README: escape _ for markdown 2023-05-23 15:40:13 +02:00
bors[bot]
d1fffeaa6d
Merge #339
339: flake.lock: Update r=Mic92 a=github-actions[bot]



Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2023-05-15 16:37:37 +00:00
github-actions[bot]
b31de7e9db flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/eb751d65225ec53de9cf3d88acbf08d275882389' (2023-05-07)
  → 'github:NixOS/nixpkgs/3007746b3f5bfcb49e102b517bca891822a41b31' (2023-05-14)
2023-05-15 01:34:41 +00:00
Jörg Thalheim
36db9e74e8
Merge pull request #338 from nix-community/update_flake_lock_action
flake.lock: Update
2023-05-08 06:23:56 +01:00
github-actions[bot]
77d72c895d flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/3056e9c39564559985ed9ed514f4789fb93a00ce' (2023-04-30)
  → 'github:NixOS/nixpkgs/eb751d65225ec53de9cf3d88acbf08d275882389' (2023-05-07)
2023-05-08 01:24:30 +00:00
Jörg Thalheim
ab8b896f83
Merge pull request #337 from nix-community/update_flake_lock_action
flake.lock: Update
2023-05-01 20:04:28 +01:00
github-actions[bot]
8e77b9fbfb flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/2362848adf8def2866fabbffc50462e929d7fffb' (2023-04-21)
  → 'github:NixOS/nixpkgs/3056e9c39564559985ed9ed514f4789fb93a00ce' (2023-04-30)
2023-05-01 01:35:07 +00:00
Jörg Thalheim
42b7ea431c
Merge pull request #335 from nix-community/update_flake_lock_action
flake.lock: Update
2023-04-24 10:23:17 +01:00
github-actions[bot]
bc4373a8d7 flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/0a4206a51b386e5cda731e8ac78d76ad924c7125' (2023-04-17)
  → 'github:NixOS/nixpkgs/2362848adf8def2866fabbffc50462e929d7fffb' (2023-04-21)
2023-04-24 01:27:09 +00:00
Bryan Bennett
0dbdee4679
Merge pull request #334 from nix-community/update_flake_lock_action
flake.lock: Update
2023-04-20 08:13:23 -04:00
github-actions[bot]
31a6d7d718 flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/b605a205390e53e18c03329ab3dba489970c1e0a' (2023-04-16)
  → 'github:NixOS/nixpkgs/0a4206a51b386e5cda731e8ac78d76ad924c7125' (2023-04-17)
2023-04-20 01:23:22 +00:00
Bryan Bennett
45bab4696d
Merge pull request #333 from nix-community/update_flake_lock_action
flake.lock: Update
2023-04-17 15:13:54 -04:00
github-actions[bot]
f9b2fdb6b5 flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/6b70761ea8c896aff8994eb367d9526686501860' (2023-04-12)
  → 'github:NixOS/nixpkgs/b605a205390e53e18c03329ab3dba489970c1e0a' (2023-04-16)
2023-04-17 01:25:40 +00:00
Jörg Thalheim
87c354518c script/create-release.sh: better flow 2023-04-15 17:45:38 +02:00
Jörg Thalheim
f61363612d scripts/create-release: update post-release instructions 2023-04-15 17:32:34 +02:00
Jörg Thalheim
100aad6040 update fetchurl checksum 2023-04-15 17:31:07 +02:00
Jörg Thalheim
2e583c8d42 bump version 2.3.0 2023-04-15 17:27:41 +02:00
Bryan Bennett
df59fb1a8a
Merge pull request #330 from nix-community/unpin_nix_in_ci
Unpin nix version used during CI
2023-04-14 13:04:35 -04:00
Bryan Bennett
68f5acc6e0
Unpin nix version used during CI 2023-04-14 12:54:36 -04:00
Bryan Bennett
e44ff86b6b
Merge pull request #332 from amarshall/strict-env-test
Run tests with and without direnv’s strict_env
2023-04-14 12:53:29 -04:00
Andrew Marshall
92eb25521e Run tests with and without direnv’s strict_env
It seems unlikely that the “without” case will have any errors that the
“with” case doesn’t, but it’s still a common use case and easy enough to
parametrize.
2023-04-14 12:43:34 -04:00
Andrew Marshall
857bcd5c4f Remove unneeded shebangs from test files
The files are not executable, tests should only be run via `pytest`, and
some of them were incorrectly python2.
2023-04-14 12:43:34 -04:00
Andrew Marshall
d16709a418 Add ruff to devshell
It’s used for linting, so should be available.
2023-04-14 12:43:34 -04:00
Bryan Bennett
f03b167b55
Merge pull request #331 from amarshall/fix-ci
Fix failing tests
2023-04-14 12:42:51 -04:00
Andrew Marshall
6bbfbf5af5 Fix failing tests
In 988193f812 a new input was added to the
flake, and thus broke this test.
2023-04-14 11:31:44 -04:00
Jörg Thalheim
9b4f81f967
Merge pull request #325 from nix-community/update_flake_lock_action
flake.lock: Update
2023-04-14 14:10:02 +01:00
Bryan Bennett
195959cda3
Merge pull request #329 from amarshall/fix-strict-env-use-nix
Fix use nix with no nixpkgs when strict_env
2023-04-14 08:32:05 -04:00
bors[bot]
b133a155f5
Merge #328
328: Bump DeterminateSystems/update-flake-lock from 18 to 19 r=bbenne10 a=dependabot[bot]



Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-04-14 12:24:20 +00:00
Bryan Bennett
4b63e2c1cb
Merge pull request #311 from amarshall/nix-2.14-state-dir
Use nix-store --add-root instead of hard-coding gcroot path (fix for Nix 2.14+)
2023-04-14 08:22:17 -04:00
Andrew Marshall
49de6ab18f Use nix-store --add-root instead of hard-coding gcroot path
The per-user gcroot path has changed in Nix 2.14, so this is broken with
that. Regardless, this is preferable since it decouples from the Nix
implementation.
2023-04-13 21:08:29 -04:00
Andrew Marshall
9d57d29192 Do not unnecessarily remove indirect gcroot links
These are linked to the paths removed in $layout_dir. Since the links
are thus broken, Nix will take care of removing these during GC. This
avoids depending on where Nix stores gcroots in this fn (but not
everywhere in nix-direnv…yet).
2023-04-13 21:07:54 -04:00
Andrew Marshall
784c9656b0 Fix use nix with no nixpkgs when strict_env
strict_env basically does `set -e`, and this fails in that case. We
handle it failing in the `if` on the subsequent line.
2023-04-13 15:24:01 -04:00
github-actions[bot]
988193f812 flake.lock: Update
Flake lock file updates:

• Updated input 'flake-utils':
    'github:numtide/flake-utils/93a2b84fc4b70d9e089d029deacc3583435c2ed6' (2023-03-15)
  → 'github:numtide/flake-utils/cfacdce06f30d2b68473a46042957675eebb3401' (2023-04-11)
• Added input 'flake-utils/systems':
    'github:nix-systems/default/da67096a3b9bf56a91d16901293e51ba5b49a27e' (2023-04-09)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/0cd51a933d91078775b300cf0f29aa3495231aa2' (2023-03-26)
  → 'github:NixOS/nixpkgs/6b70761ea8c896aff8994eb367d9526686501860' (2023-04-12)
2023-04-13 01:22:55 +00:00
dependabot[bot]
6322543cf0
Bump DeterminateSystems/update-flake-lock from 18 to 19
Bumps [DeterminateSystems/update-flake-lock](https://github.com/DeterminateSystems/update-flake-lock) from 18 to 19.
- [Release notes](https://github.com/DeterminateSystems/update-flake-lock/releases)
- [Commits](https://github.com/DeterminateSystems/update-flake-lock/compare/v18...v19)

---
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>
2023-04-10 04:56:27 +00:00
bors[bot]
2068621f3c
Merge #326
326: Bump DeterminateSystems/update-flake-lock from 17 to 18 r=Mic92 a=dependabot[bot]



Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-04-03 11:28:49 +00:00
dependabot[bot]
56a7e2d008
Bump DeterminateSystems/update-flake-lock from 17 to 18
Bumps [DeterminateSystems/update-flake-lock](https://github.com/DeterminateSystems/update-flake-lock) from 17 to 18.
- [Release notes](https://github.com/DeterminateSystems/update-flake-lock/releases)
- [Commits](https://github.com/DeterminateSystems/update-flake-lock/compare/v17...v18)

---
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>
2023-04-03 04:56:32 +00:00
Jörg Thalheim
18bcd10e2f
Merge pull request #323 from nix-community/update_flake_lock_action
flake.lock: Update
2023-03-27 20:08:47 +01:00
github-actions[bot]
b9eebc8987 flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/126f49a01de5b7e35a43fd43f891ecf6d3a51459' (2023-03-15)
  → 'github:NixOS/nixpkgs/0cd51a933d91078775b300cf0f29aa3495231aa2' (2023-03-26)
2023-03-27 01:26:18 +00:00
bors[bot]
17e2f04c4a
Merge #321
321: Suggest XDG_CONFIG_DIR rc file for direnv r=Mic92 a=smcgivern



Co-authored-by: Sean McGivern <sean@mcgivern.me.uk>
2023-03-16 07:34:07 +00:00
Jörg Thalheim
e056db1b57
Merge pull request #322 from nix-community/update_flake_lock_action
flake.lock: Update
2023-03-16 07:32:26 +00:00
github-actions[bot]
7593c23bf9 flake.lock: Update
Flake lock file updates:

• Updated input 'flake-utils':
    'github:numtide/flake-utils/3db36a8b464d0c4532ba1c7dda728f4576d6d073' (2023-02-13)
  → 'github:numtide/flake-utils/93a2b84fc4b70d9e089d029deacc3583435c2ed6' (2023-03-15)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/796b4a3c1d903c4b9270cd2548fe46f524eeb886' (2023-03-12)
  → 'github:NixOS/nixpkgs/126f49a01de5b7e35a43fd43f891ecf6d3a51459' (2023-03-15)
2023-03-16 01:39:14 +00:00
Sean McGivern
bca70b1479
Suggest XDG_CONFIG_DIR rc file for direnv
direnv itself suggests this path instead of ~/.direnvrc:
https://direnv.net/man/direnv.1.html#files
2023-03-15 20:06:18 +00:00