shells: adopt packages from other devshells if applicable

This commit is contained in:
Gabriel Arazas 2024-11-27 17:24:39 +08:00
parent 9e6fbafa6a
commit 14bdbae603
No known key found for this signature in database
GPG Key ID: 62104B43D00AA360
2 changed files with 12 additions and 3 deletions

View File

@ -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 ];
} }

View File

@ -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
]; ];
} }