From 8afb4d7ce8a6ad5c4ceef9f530d7afac609a4ff4 Mon Sep 17 00:00:00 2001 From: Pierre Roux Date: Fri, 21 Jun 2024 09:59:05 +0200 Subject: [PATCH 1/2] Update nixpkgs --- dev/nixpkgs.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev/nixpkgs.nix b/dev/nixpkgs.nix index 346b3a61e298..20282d25d944 100644 --- a/dev/nixpkgs.nix +++ b/dev/nixpkgs.nix @@ -1,4 +1,4 @@ import (fetchTarball { - url = "https://github.com/NixOS/nixpkgs/archive/a565059a348422af5af9026b5174dc5c0dcefdae.tar.gz"; - sha256 = "1spgz981x8p2ix9nsrkfw7a4n5wx35mf4v0bsjqfpjy360jb5rix"; + url = "https://github.com/NixOS/nixpkgs/archive/1c0bec249943cd3e03f876554b8af7d1e32a09e1.tar.gz"; + sha256 = "06wpxiykzrwqsham8v8kzd79nyh0qb707r0svycz32w8j0x6b1mq"; }) From aec779858988373339d91928b1dae5bf63f9ede7 Mon Sep 17 00:00:00 2001 From: Pierre Roux Date: Fri, 21 Jun 2024 14:51:25 +0200 Subject: [PATCH 2/2] Install cachix from nixpkgs --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9ab4a0fde079..25fe65d0b525 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -251,8 +251,8 @@ before_script: - cat /proc/{cpu,mem}info || true # Use current worktree as tmpdir to allow exporting artifacts in case of failure - export TMPDIR=$PWD - # Install Cachix as documented at https://github.com/cachix/cachix - - nix-env -iA cachix -f https://cachix.org/api/v1/install + # Install Cachix + - nix-env -iA nixpkgs.cachix - cachix use coq artifacts: name: "$CI_JOB_NAME.logs"