diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 884c37a2..bcec7d72 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,13 +15,9 @@ build-nixos-configurations: - lasting-integrity - urithiru script: - - cat /etc/nix/nix.conf - nix-env --quiet -j8 -iA cachix -f https://cachix.org/api/v1/install - cachix --version - cachix authtoken $CACHIX_AUTH_TOKEN - - cachix use chvp - - cachix use accentor - - cachix use nix-community - nix build -L --no-link .#nixosConfigurations.${HOST_TO_BUILD}.config.system.build.toplevel - nix eval --json .#nixosConfigurations.${HOST_TO_BUILD}.config.system.build.toplevel | sed 's/"\(.*\)"/\1/' | cachix push chvp diff --git a/modules/services/git/runner.nix b/modules/services/git/runner.nix index ef88a787..a550a188 100644 --- a/modules/services/git/runner.nix +++ b/modules/services/git/runner.nix @@ -17,6 +17,7 @@ "/nix/store:/nix/store:ro" "/nix/var/nix/db:/nix/var/nix/db:ro" "/nix/var/nix/daemon-socket:/nix/var/nix/daemon-socket:ro" + "/etc/nix/nix.conf:/etc/nix/nix.conf:ro" ]; dockerDisableCache = true; preBuildScript = pkgs.writeScript "setup-container" '' @@ -33,9 +34,6 @@ . ${pkgs.nix}/etc/profile.d/nix.sh ${pkgs.nix}/bin/nix-env -i ${lib.concatStringsSep " " (with pkgs; [ nix cacert git openssh ])} - - ${pkgs.nix}/bin/nix-channel --add https://nixos.org/channels/nixpkgs-unstable - ${pkgs.nix}/bin/nix-channel --update nixpkgs ''; environmentVariables = { ENV = "/etc/profile";