chore(gitlab-ci): use stdenv make
This commit is contained in:
parent
31a192f707
commit
34c71b76c7
@ -42,7 +42,7 @@ node modules:
|
||||
- .npm
|
||||
- node_modules
|
||||
script:
|
||||
- "nix develop --command 'make node_modules'"
|
||||
- "nix shell .#gup .#nodejs_21 --command 'make node_modules'"
|
||||
before_script: &nix-before
|
||||
- git config --global init.defaultBranch master
|
||||
- install -v -m 0700 -d ~/.ssh
|
||||
|
||||
@ -107,7 +107,7 @@
|
||||
(final: prev: let
|
||||
pkgs = import nixpkgs { inherit system; };
|
||||
in {
|
||||
inherit (pkgs) dockerTools nodejs_21 glibcLocalesUtf8 tzdata chromium minio minio-client skopeo; inherit (pkgs.stdenv) fetchurlBoot;
|
||||
inherit (pkgs) gup dockerTools nodejs_21 glibcLocalesUtf8 tzdata exiftools chromium minio minio-client skopeo; inherit (pkgs.stdenv) fetchurlBoot make;
|
||||
stack = pkgs.symlinkJoin {
|
||||
inherit (pkgs.stack) name;
|
||||
paths = [pkgs.stack];
|
||||
|
||||
@ -275,8 +275,8 @@ in pkgs.mkShell {
|
||||
'';
|
||||
nativeBuildInputs = [develop inDevelop killallUni2work diffRunning]
|
||||
++ (with pkgs;
|
||||
[ stack nodejs_21 postgresql_12 openldap exiftool expat memcached minio minio-client
|
||||
gnumake gup reuse pre-commit
|
||||
[ stdenv stack nodejs_21 postgresql_12 openldap exiftool expat memcached minio minio-client
|
||||
gup reuse pre-commit
|
||||
# busybox # for print services, but interferes with build commands in develop-shell
|
||||
htop
|
||||
pdftk # pdftk just for testing pdf-passwords
|
||||
|
||||
Reference in New Issue
Block a user