From 8b5bf34be4f6ba3bc3c8f123ec1a24144172eaf8 Mon Sep 17 00:00:00 2001 From: Samuel Leathers Date: Thu, 20 Jun 2024 16:21:00 -0400 Subject: [PATCH] remove cabalProjectRegenerate --- .github/workflows/check-nix-config.yml | 38 -------------------------- flake.nix | 2 +- nix/regenerate.sh | 5 ---- 3 files changed, 1 insertion(+), 44 deletions(-) delete mode 100644 .github/workflows/check-nix-config.yml delete mode 100755 nix/regenerate.sh diff --git a/.github/workflows/check-nix-config.yml b/.github/workflows/check-nix-config.yml deleted file mode 100644 index f0cd7a486f6..00000000000 --- a/.github/workflows/check-nix-config.yml +++ /dev/null @@ -1,38 +0,0 @@ -name: Check nix configuration - -on: - pull_request: # Required for workflows to be able to be approved from forks - merge_group: - -jobs: - build: - runs-on: ubuntu-latest - - defaults: - run: - shell: bash - - steps: - - - name: Install Nix - uses: cachix/install-nix-action@v18 - with: - # Use last stable nixos channel and the same nix as in channel: - nix_path: nixpkgs=channel:nixos-24.05 - github_access_token: ${{ secrets.GITHUB_TOKEN }} - extra_nix_config: | - access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} - experimental-features = nix-command flakes - allow-import-from-derivation = true - substituters = https://cache.nixos.org https://cache.iog.io - trusted-public-keys = hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= - - - uses: actions/checkout@v3 - - - name: Regenerate nix files - run: | - ./nix/regenerate.sh - - - name: Check nix configuration differences - run: | - git diff --exit-code diff --git a/flake.nix b/flake.nix index fc99e82b7de..ff0d3a20273 100644 --- a/flake.nix +++ b/flake.nix @@ -175,7 +175,7 @@ }); exes = (collectExes project) // { - inherit (pkgs) cabalProjectRegenerate checkCabalProject; + inherit (pkgs) checkCabalProject; } // flattenTree (pkgs.scripts // { # `tests` are the test suites which have been built. inherit (project) tests; diff --git a/nix/regenerate.sh b/nix/regenerate.sh deleted file mode 100755 index f8d78cc02c7..00000000000 --- a/nix/regenerate.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash -set -euo pipefail -cd $(git rev-parse --show-toplevel) - -nix run .#cabalProjectRegenerate