diff --git a/.github/workflows/nvfetcher.yaml b/.github/workflows/nvfetcher.yaml index ae1d930..441b620 100644 --- a/.github/workflows/nvfetcher.yaml +++ b/.github/workflows/nvfetcher.yaml @@ -15,8 +15,9 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: DeterminateSystems/nix-installer-action@main - - uses: DeterminateSystems/magic-nix-cache-action@main + - uses: cachix/install-nix-action@v27 + with: + nix_path: nixpkgs=channel:nixos-unstable - name: Set Git user info run: | @@ -25,13 +26,10 @@ jobs: - name: Update flake inputs run: | - nix flake update --commit-lock-file + nix develop -c nix flake update --commit-lock-file - name: Update upstream sources run: | - # HACK: nvfetcher doesn't delete old extracted files - # See https://github.com/berberman/nvfetcher/issues/111 - rm -rfv _sources/*/ nix develop -c nvfetcher --commit-changes - name: Create PR diff --git a/development.nix b/development.nix index a6342ec..4458a48 100644 --- a/development.nix +++ b/development.nix @@ -21,6 +21,7 @@ flake-utils.lib.eachDefaultSystem ( { devShells.default = pkgs.mkShellNoCC { packages = [ + pkgs.git pkgs.nvfetcher pkgs.reuse ];