From bfbf5b92191ded4ff672d55a0e0fbf917228b1de Mon Sep 17 00:00:00 2001 From: Akira Komamura Date: Sun, 24 Sep 2023 13:36:21 +0900 Subject: [PATCH] Run a remote flake to make it independent from the updated source --- .github/workflows/merge-upstream.yml | 3 ++- flake.nix | 20 -------------------- 2 files changed, 2 insertions(+), 21 deletions(-) delete mode 100644 flake.nix diff --git a/.github/workflows/merge-upstream.yml b/.github/workflows/merge-upstream.yml index f593b4179a4..fb4a3080cc6 100644 --- a/.github/workflows/merge-upstream.yml +++ b/.github/workflows/merge-upstream.yml @@ -35,7 +35,8 @@ jobs: # unused git config --add user.name 'github-actions[bot]' git config --add user.email '6270544+github-actions[bot]@users.noreply.github.com' - nix run .#update-recipes --no-write-lock-file -- upstream/master + nix run github:emacs-twist/recipes-updater#forceUpdate \ + --no-write-lock-file -- upstream/master # A workaround to prevent peter-evans/create-pull-request from resetting the # head here: diff --git a/flake.nix b/flake.nix deleted file mode 100644 index 04989f7f8ca..00000000000 --- a/flake.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ - inputs = { - systems.url = "github:nix-systems/default"; - recipes-updater.url = "github:emacs-twist/recipes-updater"; - }; - - outputs = { - systems, - nixpkgs, - ... - } @ inputs: let - eachSystem = nixpkgs.lib.genAttrs (import systems); - in { - packages = eachSystem (system: { - update-recipes = inputs.recipes-updater.packages.${system}.default.override { - force = true; - }; - }); - }; -}