From 378fe484f9948364930aa31cfb6f560d0076648f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 18 Nov 2020 16:08:59 +0100 Subject: [PATCH 1/2] fix sops-install-secrets with nixpkgs unstable --- pkgs/sops-install-secrets/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/sops-install-secrets/default.nix b/pkgs/sops-install-secrets/default.nix index 16eb681c..1e7a0dc7 100644 --- a/pkgs/sops-install-secrets/default.nix +++ b/pkgs/sops-install-secrets/default.nix @@ -20,7 +20,10 @@ buildGoModule { postBuild = '' go test -c ./pkgs/sops-install-secrets install -D ./sops-install-secrets.test $unittest/bin/sops-install-secrets.test - remove-references-to -t ${go} $unittest/bin/sops-install-secrets.test + # newer versions of nixpkgs no longer require this step + if command -v remove-references-to; then + remove-references-to -t ${go} $unittest/bin/sops-install-secrets.test + fi ''; inherit vendorSha256; From 46cb2cf7f69016959174d7b54a6f020002a50cda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 18 Nov 2020 16:16:31 +0100 Subject: [PATCH 2/2] fix cachix --- .github/workflows/test.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 83ebbd0c..fc34d19b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,6 +12,8 @@ jobs: - nixpkgs=https://github.com/NixOS/nixpkgs/archive/nixpkgs-unstable.tar.gz os: [ ubuntu-latest, macos-latest ] runs-on: ${{ matrix.os }} + env: + ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true' steps: - uses: actions/checkout@v2 - uses: cachix/install-nix-action@v12