Skip to content

Commit 79c4e47

Browse files
authored
fix: update rust/go toolchains and devenv to 1.10 (#17)
1 parent 2f256e0 commit 79c4e47

11 files changed

Lines changed: 356 additions & 216 deletions

File tree

src/generic/tools/nix/flake.lock

Lines changed: 47 additions & 44 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/generic/tools/nix/flake.nix.jinja

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,12 @@
6565
# The devenv module to create good development shells.
6666
# The `nixpkgs-devenv` must aligned with the pinned version.
6767
devenv = {
68-
url = "github:cachix/devenv?ref=v1.8.1";
68+
url = "github:cachix/devenv?ref=v1.10";
6969
inputs.nixpkgs.follows = "nixpkgs-devenv";
7070
};
7171
# This is the rolling nixpkgs with what devenv was tested.
7272
nixpkgs-devenv = {
73-
url = "github:cachix/devenv-nixpkgs?ref=0ceffe312871b443929ff3006960d29b120dc627";
73+
url = "github:cachix/devenv-nixpkgs?ref=207a4cb0e1253c7658c6736becc6eb9cace1f25f";
7474
};
7575

7676
# To build a base image with Nix.
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Devenv Modules
2+
3+
This folder contains all devenv modules which are loaded by default in
4+
`shell.nix`.

src/generic/tools/nix/lib/lib.parts.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ let
2121
libImport = import ./import.nix { inherit inputs self; };
2222

2323
# Lib shell.
24-
libShell = import ./shell.nix { inherit inputs lib; };
24+
libShell = import ./shell.nix { inherit inputs lib repoRoot; };
2525

2626
# Lib toolchains.
2727
libToolchain = import ./toolchains.nix {

src/generic/tools/nix/lib/shell.nix

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,19 @@
1-
{ inputs, lib, ... }:
1+
{
2+
inputs,
3+
lib,
4+
repoRoot,
5+
...
6+
}:
7+
let
8+
# List all devenv modules in `lib/devenv/...`.
9+
devenv-modules = lib.pipe inputs.import-tree [
10+
# NOTE: Uncomment the below to inspect what toolchains are loaded.
11+
# (i: i.map (x: lib.info "Importing toolchain :${x}" x))
12+
(i: i.match ".*/nix/lib/devenv/.*\.nix")
13+
(i: i.withLib lib)
14+
(i: i.leafs repoRoot)
15+
];
16+
in
217
{
318
# Make a devenv shell (from `inputs.devenv`) with the following features:
419
# - Using `pkgs` or imported from flake input `inputs.nixpkgs-devenv` for the `system` if not given.
@@ -66,6 +81,7 @@
6681
}
6782
)
6883
]
84+
++ devenv-modules
6985
++ modules;
7086
};
7187
}

0 commit comments

Comments
 (0)