use the same perl in shell and build

This commit is contained in:
Aaron Bieber 2024-08-01 19:56:27 -06:00
parent 34bfacbaa5
commit 29c85a6e8e
No known key found for this signature in database

View File

@ -17,16 +17,20 @@
nixosModule = import ./module.nix; nixosModule = import ./module.nix;
packages = forAllSystems (system: packages = forAllSystems (system:
let pkgs = nixpkgsFor.${system}; let pkgs = nixpkgsFor.${system};
perl' = pkgs.perl.withPackages (pp:
[
pp.Mojolicious
pp.JSON
pp.Git
]);
in { in {
pr-status = pkgs.perlPackages.buildPerlPackage { pr-status = pkgs.perlPackages.buildPerlPackage {
pname = "pr-status"; pname = "pr-status";
version = "v0.0.4"; version = "v0.0.4";
src = ./.; src = ./.;
buildInputs = with pkgs; [ makeWrapper ]; buildInputs = with pkgs; [ makeWrapper ];
propagatedBuildInputs = with pkgs.perlPackages; [ propagatedBuildInputs = [
Mojolicious perl'
JSON
Git
]; ];
postInstall = '' postInstall = ''
@ -43,11 +47,17 @@
forAllSystems (system: self.packages.${system}.pr-status); forAllSystems (system: self.packages.${system}.pr-status);
devShells = forAllSystems (system: devShells = forAllSystems (system:
let pkgs = nixpkgsFor.${system}; let pkgs = nixpkgsFor.${system};
perl' = pkgs.perl.withPackages (pp: with pp; [
Git
JSON
Mojolicious
]);
npPackages = with pkgs; [ npPackages = with pkgs; [
elmPackages.elm elmPackages.elm
elmPackages.elm-test elmPackages.elm-test
elmPackages.elm-live elmPackages.elm-live
elmPackages.elm-json elmPackages.elm-json
perl'
]; ];
in { in {
default = pkgs.mkShell { default = pkgs.mkShell {
@ -56,13 +66,7 @@
nix run github:qbit/xin#flake-warn nix run github:qbit/xin#flake-warn
echo "Perl `${pkgs.perl}/bin/perl --version`" echo "Perl `${pkgs.perl}/bin/perl --version`"
''; '';
buildInputs = with pkgs.perlPackages; [ buildInputs = [
Git
JSON
Mojolicious
perl
PerlCritic
PerlTidy
] ++ npPackages; ] ++ npPackages;
}; };
}); });