From b5e4a59d179ccd0bdcdebca604c837b908f101e9 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 8 Apr 2023 23:14:22 +0200 Subject: [PATCH] nix: fix `fullname` variable (#313) This should fix #312 --- .github/workflows/nix-flake-check.yaml | 4 ++-- .github/workflows/release.yaml | 7 +++---- flake.lock | 18 +++++++++--------- flake.nix | 10 +++++++++- 4 files changed, 23 insertions(+), 16 deletions(-) diff --git a/.github/workflows/nix-flake-check.yaml b/.github/workflows/nix-flake-check.yaml index 37465b1..eb51b23 100644 --- a/.github/workflows/nix-flake-check.yaml +++ b/.github/workflows/nix-flake-check.yaml @@ -34,7 +34,7 @@ jobs: uses: actions/checkout@v3 - name: Install the Nix package manager - uses: cachix/install-nix-action@v18 + uses: cachix/install-nix-action@v20 - id: set-matrix run: | @@ -55,7 +55,7 @@ jobs: uses: actions/checkout@v3 - name: Install Nix - uses: cachix/install-nix-action@v18 + uses: cachix/install-nix-action@v20 - name: Nix flake check run: nix flake check diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 37b6b1f..439002f 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -18,13 +18,12 @@ jobs: uses: actions/checkout@v3 - name: Install the Nix package manager - uses: cachix/install-nix-action@v18 + uses: cachix/install-nix-action@v20 - id: set-matrix run: | echo "matrix=$( - nix eval --json --impure \ - --expr 'builtins.filter (x: (null == builtins.match "(.*)-nts" x)) (builtins.attrNames (import ./.).packages.x86_64-linux)' + nix eval --json .#packages.x86_64-linux --apply builtins.attrNames )" >> $GITHUB_OUTPUT build: @@ -40,7 +39,7 @@ jobs: uses: actions/checkout@v3 - name: Install Nix - uses: cachix/install-nix-action@v18 + uses: cachix/install-nix-action@v20 - name: Build ${{ matrix.packages }}.pdf run: | diff --git a/flake.lock b/flake.lock index dda1c6c..094a7fe 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1675295133, - "narHash": "sha256-dU8fuLL98WFXG0VnRgM00bqKX6CEPBLybhiIDIgO45o=", + "lastModified": 1680392223, + "narHash": "sha256-n3g7QFr85lDODKt250rkZj2IFS3i4/8HBU2yKHO3tqw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "bf53492df08f3178ce85e0c9df8ed8d03c030c9f", + "rev": "dcc36e45d054d7bb554c9cdab69093debd91a0b5", "type": "github" }, "original": { @@ -19,11 +19,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1675309347, - "narHash": "sha256-D3CQ6HRDT2m3XJlrzb5jKq4vNFR5xFTEFKC7iSjlFpM=", + "lastModified": 1680942619, + "narHash": "sha256-kpCW1IegAZfEjCVJW7IPN/hEtRL/9dxaFFYiHS5qVAk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "006c3bd4dd2f5d1d2094047f307cbf9e2b73d9c5", + "rev": "6f95dd4fd050daf017cae2dfeb1cea1ec0e4c1a1", "type": "github" }, "original": { @@ -36,11 +36,11 @@ "nixpkgs-lib": { "locked": { "dir": "lib", - "lastModified": 1675183161, - "narHash": "sha256-Zq8sNgAxDckpn7tJo7V1afRSk2eoVbu3OjI1QklGLNg=", + "lastModified": 1680213900, + "narHash": "sha256-cIDr5WZIj3EkKyCgj/6j3HBH4Jj1W296z7HTcWj1aMA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e1e1b192c1a5aab2960bf0a0bd53a2e8124fa18e", + "rev": "e3652e0735fbec227f342712f180f4f21f0594f2", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index d359a2c..fb016d5 100644 --- a/flake.nix +++ b/flake.nix @@ -143,17 +143,25 @@ src = "${self}/src"; configurePhase = '' + runHook preConfigure + substituteInPlace "version.tex" --replace "dev" "${version}" + + runHook postConfigure ''; buildPhase = '' + runHook preBuild + latexmk -file-line-error -shell-escape -logfilewarninglist \ -interaction=nonstopmode -halt-on-error -norc \ -jobname=ctfp -pdflatex="xelatex %O %S" -pdfxe \ "$basename.tex" + + runHook postBuild ''; - installPhase = "install -m 0644 -vD ctfp.pdf \"$out/$fullname.pdf\""; + installPhase = "install -m 0644 -vD ctfp.pdf \"$out/${fullname}.pdf\""; passthru.packageName = fullname; });