mirror of
https://github.com/foo-dogsquared/nixos-config.git
synced 2025-01-30 22:57:55 +00:00
shells: adopt packages from other devshells if applicable
This commit is contained in:
parent
9e6fbafa6a
commit
14bdbae603
@ -2,8 +2,12 @@
|
|||||||
, go
|
, go
|
||||||
, gofumpt
|
, gofumpt
|
||||||
, gopls
|
, gopls
|
||||||
|
, callPackage
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
let
|
||||||
|
nodejsDevshell = callPackage ./nodejs.nix { };
|
||||||
|
in
|
||||||
mkShell {
|
mkShell {
|
||||||
packages = [
|
packages = [
|
||||||
go
|
go
|
||||||
@ -11,5 +15,5 @@ mkShell {
|
|||||||
gopls
|
gopls
|
||||||
];
|
];
|
||||||
|
|
||||||
inputsFrom = [ go ];
|
inputsFrom = [ go nodejsDevshell ];
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
# My usual toolchain for developing Hugo projects.
|
# My usual toolchain for developing Hugo projects.
|
||||||
{ mkShell
|
{ mkShell
|
||||||
|
, callPackage
|
||||||
, hugo
|
, hugo
|
||||||
, asciidoctor
|
, asciidoctor
|
||||||
, pandoc
|
, pandoc
|
||||||
@ -9,6 +10,10 @@
|
|||||||
, imagemagick
|
, imagemagick
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
let
|
||||||
|
nodejsDevshell = callPackage ./nodejs.nix { };
|
||||||
|
goDevshell = callPackage ./go.nix { };
|
||||||
|
in
|
||||||
mkShell {
|
mkShell {
|
||||||
packages = [
|
packages = [
|
||||||
asciidoctor # Some sites use this.
|
asciidoctor # Some sites use this.
|
||||||
@ -21,7 +26,7 @@ mkShell {
|
|||||||
];
|
];
|
||||||
|
|
||||||
inputsFrom = [
|
inputsFrom = [
|
||||||
go
|
nodejsDevshell
|
||||||
nodejs_latest
|
goDevshell
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user