ok/jj
1
0
Fork 0
forked from mirrors/jj
Commit graph

11 commits

Author SHA1 Message Date
Austin Seipp
8b2801887e nix: 'nix flake update'
Signed-off-by: Austin Seipp <aseipp@pobox.com>
Change-Id: I164d8a6679516dbf1e5ef726d341ec41
2023-08-11 04:06:48 -05:00
Austin Seipp
154ab9e283 chore(nix): run 'nix flake update'
Summary: This is needed to pick up a bugfix to the 'mold' package in nixpkgs,
used in a follow up diff.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
Change-Id: I1128164faed93921f84c35189a012152
2023-07-14 20:29:16 -05:00
Austin Seipp
0184413a86 chore(nix): nix flake update
Summary: I need this for another change I'm playing around with, because the
newer nixpkgs snapshot has a newer version of a tool. Just do a quick update to
get it out of the way.

Maybe one day, Dependabot can help solve this issue...

Signed-off-by: Austin Seipp <aseipp@pobox.com>
Change-Id: I803f72da8666ed75018f51ebe511737d
2023-07-12 06:48:17 -05:00
Austin Seipp
d9f661eb8b chore(nix): run 'nix flake update'
While 'nix build .#jj' worked fine, it seems like 'nix develop .' did *not* work
fine, due to a bug in upstream nixpkgs when libgcc_s was linked against the MSRV
(1.64.0). A simple update seems to have fixed that.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
Change-Id: Iwqryoplqxzyxwymlsktxnqoqrwvrryln
2023-06-20 11:47:23 -05:00
Benjamin Saunders
f546899252 nix: update nixpkgs for libgit2 1.6 2023-05-05 10:53:20 -07:00
Michael Forster
29db607e10 nix: replace manual system iteration by flake-utils
Let's not reinvent the wheel. This makes the flake more readable, and also would
detect typos in the system list.
2023-01-28 07:10:12 +01:00
Michael Forster
27228ce292 Update MSRV to 1.61
This is needed for compatibility with the sapling dag crate.
2023-01-19 10:29:39 +01:00
Michael Forster
536ac87b11 Configure nix development shell environment
This gets used by `nix develop`, or automatically by `direnv` if you have it
installed.

The binary versions are pinned to the versions recommended by `contributing.md`.

```
>> cargo --version
cargo 1.60.0 (d1fd9fe 2022-03-01)

>> rustc --version
rustc 1.60.0 (7737e0b5c 2022-04-04)

>> cargo fmt --version
rustfmt 1.5.1-nightly (3984bc5 2023-01-17)

>> cargo clippy --version
clippy 0.1.60 (7737e0b 2022-04-04)
```
2023-01-19 06:45:50 +01:00
Martin von Zweigbergk
3cf1d629c8 nix: update lock file to nixpkgs with rust toolchain 1.60
Closes #299
2022-05-05 10:55:53 -07:00
Jelle Besseling
54a6adf47a
Remove rust nightly overlay 2022-02-21 18:14:48 +01:00
Jelle Besseling
50b8357234
Add flake.nix 2022-02-20 21:30:05 +01:00