diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index c24e84749..a94e1ea36 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -17,11 +17,8 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Install Nix with cached packages - uses: rikhuijzer/cache-install@v1.1.4 - with: - key: nix-${{ hashFiles('.github/workflows/maven.yml', 'default.nix', 'nix/**', 'pom.xml', 'local-maven-repo') }} - nix_file: nix/github-workflow-dependencies.nix + - uses: cachix/install-nix-action@v31 + # The dependencies could be cached if necessary. See PR #156 and da11a13c1451f5a52672fe494ac6e20116346865 for additional information. - name: Build run: nix-build - name: Upload Javadoc artifact diff --git a/default.nix b/default.nix index cab1125a6..70e65df3e 100644 --- a/default.nix +++ b/default.nix @@ -3,7 +3,24 @@ system ? builtins.currentSystem, pkgs ? import sources.nixpkgs { - overlays = []; + overlays = [ + (final: previous: { + defaultGemConfig = previous.defaultGemConfig // { + jekyll-github-metadata = attrs: { + dontBuild = false; + patches = [ + (final.fetchpatch { + url = "https://github.com/jekyll/github-metadata/commit/17cc5af5e1fd95d98d43676610cc8a47969350ab.patch"; + hash = "sha256-dUqvnYsjfG5xQIYS48B3xz0GLVYo2BrDAnYUafmDFKw="; + relative = "lib"; + stripLen = 1; + extraPrefix = "lib/jekyll-github-metadata/"; + }) + ]; + }; + }; + }) + ]; config = {}; inherit system; }, @@ -93,7 +110,7 @@ pkgs.stdenvNoCC.mkDerivation rec { if buildGitHubPages then '' mvn javadoc:javadoc - JEKYLL_ENV=production PAGES_REPO_NWO=VariantSync/DiffDetective JEKYLL_BUILD_REVISION= github-pages build + JEKYLL_ENV=production PAGES_REPO_NWO=VariantSync/DiffDetective JEKYLL_BUILD_REVISION= PAGES_DISABLE_NETWORK=1 github-pages build rm -rf _site/target '' else "" diff --git a/nix/github-workflow-dependencies.nix b/nix/github-workflow-dependencies.nix deleted file mode 100644 index 72c9cc63e..000000000 --- a/nix/github-workflow-dependencies.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ - sources ? import ./sources.nix, - system ? builtins.currentSystem, - pkgs ? - import sources.nixpkgs { - overlays = []; - config = {}; - inherit system; - }, -}: let - DiffDetective = import ../default.nix {}; -in - pkgs.mkShell { - inputsFrom = [DiffDetective]; - pkgs = [DiffDetective.mavenRepo]; - }