Commit graph

1030 commits

Author SHA1 Message Date
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
bors[bot]
7afcc5a6ce
Merge #318 #319
318: flake.lock: Update r=Mic92 a=github-actions[bot]



319: Bump DeterminateSystems/update-flake-lock from 16 to 17 r=Mic92 a=dependabot[bot]



Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-13 12:27:29 +00:00
dependabot[bot]
e3aeede19a
Bump DeterminateSystems/update-flake-lock from 16 to 17
Bumps [DeterminateSystems/update-flake-lock](https://github.com/DeterminateSystems/update-flake-lock) from 16 to 17.
- [Release notes](https://github.com/DeterminateSystems/update-flake-lock/releases)
- [Commits](https://github.com/DeterminateSystems/update-flake-lock/compare/v16...v17)

---
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-03-13 04:56:34 +00:00
github-actions[bot]
8009e57c30 flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/1e383aada51b416c6c27d4884d2e258df201bc11' (2023-03-08)
  → 'github:NixOS/nixpkgs/796b4a3c1d903c4b9270cd2548fe46f524eeb886' (2023-03-12)
2023-03-13 01:39:35 +00:00
bors[bot]
70eeeedbd4
Merge #317
317: flake.lock: Update r=Mic92 a=github-actions[bot]



Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2023-03-10 13:33:09 +00:00
github-actions[bot]
6a8d37f715 flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/9e56d6ec92c8fb4192f1392aa5c4101ad77f2070' (2023-02-28)
  → 'github:NixOS/nixpkgs/1e383aada51b416c6c27d4884d2e258df201bc11' (2023-03-08)
2023-03-09 09:26:25 +00:00
Jörg Thalheim
351e977bf4 try to fix update-flake-lock action not beeing able to trigger bors 2023-03-09 10:23:51 +01:00
bors[bot]
7e82aa8baa
Merge #310
310: flake.lock: Update r=Mic92 a=nix-direnv-bot



Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2023-03-06 08:29:51 +00:00
bors[bot]
a9831b36bc
Merge #314
314: Bump cachix/install-nix-action from 19 to 20 r=Mic92 a=dependabot[bot]



Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-06 08:27:55 +00:00
dependabot[bot]
6124eae598
Bump cachix/install-nix-action from 19 to 20
Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from 19 to 20.
- [Release notes](https://github.com/cachix/install-nix-action/releases)
- [Commits](https://github.com/cachix/install-nix-action/compare/v19...v20)

---
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>
2023-03-06 04:56:33 +00:00
bors[bot]
dd8abaacd6
Merge #313
313: drop mergify and replace with bors r=Mic92 a=Mic92



Co-authored-by: Jörg Thalheim <joerg@thalheim.io>
2023-03-03 08:53:49 +00:00
Jörg Thalheim
c70dcf0810 drop mergify and replace with bors 2023-03-03 09:52:09 +01:00
bors[bot]
7558ef7f4c
Merge #312
312: pin to nix-2.13.3 for now r=Mic92 a=Mic92



Co-authored-by: Jörg Thalheim <joerg@thalheim.io>
2023-03-03 08:48:13 +00:00
Jörg Thalheim
a1b62f8014 pin to nix-2.13.3 for now 2023-03-03 09:46:01 +01:00
Bryan Bennett
9eda67e796
Merge pull request #308 from pinselimo/check-nix-version-directly
Check nix version directly
2023-03-02 10:19:59 -05:00
github-actions[bot]
8e89434a1c flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/9952d6bc395f5841262b006fbace8dd7e143b634' (2023-02-26)
  → 'github:NixOS/nixpkgs/9e56d6ec92c8fb4192f1392aa5c4101ad77f2070' (2023-02-28)
2023-03-01 10:17:33 +00:00
mergify[bot]
d2ea3ba94f
Merge pull request #309 from nix-community/update_flake_lock_action
flake.lock: Update
2023-02-26 10:17:58 +00:00
github-actions[bot]
932bcc19d8 flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/06365ba4549654b7ce58c33365c1282800e83a9e' (2023-02-18)
  → 'github:NixOS/nixpkgs/9952d6bc395f5841262b006fbace8dd7e143b634' (2023-02-26)
2023-02-26 10:15:44 +00:00
Simon Plakolb
8d28c8f84e preflight: Report nix version if its test fails 2023-02-23 20:38:07 +01:00
Simon Plakolb
149b71860d preflight: Check nix version constraints directly 2023-02-23 20:38:06 +01:00
Bryan Bennett
ef0ef1a6e8
Merge pull request #307 from amarshall/fix-nix-version-read
Fix reading nixpkgs version without trailing newline
2023-02-23 08:04:27 -05:00
Andrew Marshall
e761ab128c Fix reading nixpkgs version without trailing newline
`read` fails if it encounters EOF before the delim, the `.version` file
does not always have a newline, so `read` fails in that case. If the
env has `set -e` then this will abort. So add a newline to the end
always. Doesn’t seem to matter if there is more than one.
2023-02-22 22:27:26 -05:00
mergify[bot]
67f1e03dde
Merge pull request #304 from nix-community/update_flake_lock_action
flake.lock: Update
2023-02-19 10:17:49 +00:00
github-actions[bot]
1f1c6212c1 flake.lock: Update
Flake lock file updates:

• Updated input 'flake-utils':
    'github:numtide/flake-utils/5aed5285a952e0b949eb3ba02c12fa4fcfef535f' (2022-11-02)
  → 'github:numtide/flake-utils/3db36a8b464d0c4532ba1c7dda728f4576d6d073' (2023-02-13)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/6ccc4a59c3f1b56d039d93da52696633e641bc71' (2023-02-09)
  → 'github:NixOS/nixpkgs/06365ba4549654b7ce58c33365c1282800e83a9e' (2023-02-18)
2023-02-19 10:15:36 +00:00
Bryan Bennett
f185f46fa4
Merge pull request #301 from nix-community/dependabot/github_actions/cachix/install-nix-action-19
Bump cachix/install-nix-action from 18 to 19
2023-02-13 08:06:57 -05:00
dependabot[bot]
d9f3681984
Bump cachix/install-nix-action from 18 to 19
Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from 18 to 19.
- [Release notes](https://github.com/cachix/install-nix-action/releases)
- [Commits](https://github.com/cachix/install-nix-action/compare/v18...v19)

---
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>
2023-02-13 04:56:30 +00:00
mergify[bot]
d428ad4429
Merge pull request #300 from nix-community/update_flake_lock_action
flake.lock: Update
2023-02-12 10:17:19 +00:00
github-actions[bot]
ca9e2cb0cd flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/19ad2a2b84a99b8025ace91ba7b80d12d8ae71db' (2023-02-04)
  → 'github:NixOS/nixpkgs/6ccc4a59c3f1b56d039d93da52696633e641bc71' (2023-02-09)
2023-02-12 10:15:06 +00:00
mergify[bot]
75c74a090b
Merge pull request #297 from nix-community/update_flake_lock_action
flake.lock: Update
2023-02-05 10:16:46 +00:00
github-actions[bot]
525891d514 flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/ea692c2ad1afd6384e171eabef4f0887d2b882d3' (2023-01-31)
  → 'github:NixOS/nixpkgs/19ad2a2b84a99b8025ace91ba7b80d12d8ae71db' (2023-02-04)
2023-02-05 10:14:34 +00:00
mergify[bot]
f0754c8808
Merge pull request #296 from nix-community/update_flake_lock_action
flake.lock: Update
2023-02-01 10:18:45 +00:00
github-actions[bot]
ede29f5b41 flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/6b9c27b4c9c1c329b27a44ed1fa8935df79f9a8b' (2023-01-28)
  → 'github:NixOS/nixpkgs/ea692c2ad1afd6384e171eabef4f0887d2b882d3' (2023-01-31)
2023-02-01 10:16:33 +00:00
Jörg Thalheim
068eb8d5ca
Merge pull request #294 from kubukoz/patch-1
Add `nix profile` installation guide
2023-01-31 17:00:25 +00:00
bors[bot]
27e57e5c81
Merge #295
295: fix error message if flake-inputs directory already exists r=Mic92 a=Mic92



Co-authored-by: Jörg Thalheim <joerg@thalheim.io>
2023-01-31 16:56:52 +00:00