From 9c59ef26af2f66a1c3ab59d8fec9dbdd25358595 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Wed, 17 Jan 2024 10:13:24 +0100 Subject: [PATCH] chore(gitlab-ci): include stdenv contd --- .gitlab-ci.yml | 2 +- flake.nix | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 194eba129..7c5687c97 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -42,7 +42,7 @@ node modules: - .npm - node_modules script: - - "nix shell .#stdenv .#gup .#nodejs_21 --command make node_modules" + - "nix shell .#stdenv/make .#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 cfcf1dce4..4401fedde 100644 --- a/flake.nix +++ b/flake.nix @@ -107,7 +107,8 @@ (final: prev: let pkgs = import nixpkgs { inherit system; }; in { - inherit (pkgs) gup dockerTools nodejs_21 glibcLocalesUtf8 tzdata exiftools chromium minio minio-client skopeo; inherit (pkgs.stdenv) fetchurlBoot make; + inherit (pkgs) gup dockerTools nodejs_21 glibcLocalesUtf8 tzdata exiftools chromium minio minio-client skopeo; inherit (pkgs.stdenv) fetchurlBoot; + make = pkgs.stdenv; stack = pkgs.symlinkJoin { inherit (pkgs.stack) name; paths = [pkgs.stack];