From 38202813ff04b88e7786d3737efef4cec1ec670a Mon Sep 17 00:00:00 2001 From: Charles Hall Date: Wed, 30 Jul 2025 11:06:58 -0700 Subject: [PATCH] remove nix-direnv It doesn't actually do anything unless more configuration is added, but it's not really necessary for this use case so removing it is easier. --- .gitlab-ci.yml | 4 ++-- bin/nix-build-and-cache | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9b116e81..0f93302e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -26,8 +26,8 @@ before_script: - if command -v nix > /dev/null; then echo "extra-substituters = https://nix-community.cachix.org" >> /etc/nix/nix.conf; fi - if command -v nix > /dev/null; then echo "extra-trusted-public-keys = nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" >> /etc/nix/nix.conf; fi - # Install direnv and nix-direnv - - if command -v nix > /dev/null; then nix profile install --impure --inputs-from . nixpkgs#direnv nixpkgs#nix-direnv; fi + # Install direnv + - if command -v nix > /dev/null; then nix profile install --impure --inputs-from . nixpkgs#direnv; fi # Allow .envrc - if command -v nix > /dev/null; then direnv allow; fi diff --git a/bin/nix-build-and-cache b/bin/nix-build-and-cache index f7f5223e..f9eaee1a 100755 --- a/bin/nix-build-and-cache +++ b/bin/nix-build-and-cache @@ -48,7 +48,6 @@ ci() { attic#default nixpkgs#direnv nixpkgs#jq - nixpkgs#nix-direnv ) just "${installables[@]}"