From 7d66c8629cd2143e6eff2bc0cafb830f8d8cd853 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Tue, 14 Sep 2021 12:45:02 +0200 Subject: [PATCH] chore(gitlab-ci): ... --- .gitlab-ci.yml | 9 +++++---- .gitlab-ci/nix-bootstrap.conf | 1 - 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 65929f501..b5a8f5468 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,7 +6,10 @@ workflow: default: image: - name: nixos/nix:2.3.12 + name: nixpkgs/nix-flakes:nixos-21.05 + +variables: + NIX_PATH: "nixpkgs=http://nixos.org/channels/nixos-21.05/nixexprs.tar.xz" stages: - setup @@ -16,9 +19,7 @@ node dependencies: script: - nix build -o node-dependencies .#uniworxNodeDependencies before_script: - - install -m 0644 .gitlab-ci/nix-bootstrap.conf /etc/nix/nix.conf - - nix-channel --update - - nix-env -f '' -riA envsubst nixUnstable git coreutils + - nix-env -f '' -riA envsubst - envsubst -i .gitlab-ci/nix.conf -o /etc/nix/nix.conf - git config --global init.defaultBranch master - install -v -m 0700 -d ~/.ssh diff --git a/.gitlab-ci/nix-bootstrap.conf b/.gitlab-ci/nix-bootstrap.conf index 036c2fc5e..b35f18d99 100644 --- a/.gitlab-ci/nix-bootstrap.conf +++ b/.gitlab-ci/nix-bootstrap.conf @@ -1,5 +1,4 @@ sandbox = true -experimental-features = nix-command flakes ca-references substituters = https://hydra.iohk.io https://cache.nixos.org/ trusted-public-keys = hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= require-sigs = true \ No newline at end of file