From 34c71b76c746b272f84c5924ea64c57c36421f30 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Wed, 17 Jan 2024 09:37:32 +0100 Subject: [PATCH] chore(gitlab-ci): use stdenv make --- .gitlab-ci.yml | 2 +- flake.nix | 2 +- shell.nix | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 02475780b..138a4cb1e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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 diff --git a/flake.nix b/flake.nix index 40a088c4c..cfcf1dce4 100644 --- a/flake.nix +++ b/flake.nix @@ -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]; diff --git a/shell.nix b/shell.nix index 3598f9094..fd9b6935e 100644 --- a/shell.nix +++ b/shell.nix @@ -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