Fix hashes from update + use determinate nix + caching (#2)

Author: thatliuser

.github/workflows/test-build.yml

@@ -1,3 +1,4 @@
+# Adapted from https://github.com/brianmay/penguin_memories/blob/main/.github/workflows/update_hashes.yml
 name: Test building Nix packages
 on:
   workflow_dispatch:
@@ -9,6 +10,7 @@ on:
 jobs:
   build:
     strategy:
+      fail-fast: false
       matrix:
         target:
           - os: Linux x86_64
@@ -23,9 +25,19 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Setup Nix
-        uses: cachix/install-nix-action@v31
+        uses: DeterminateSystems/determinate-nix-action@v3.13.2
         with:
-          github_access_token: ${{ secrets.GITHUB_TOKEN }}
-      - run: nix build --impure
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Nix binary cache
+        uses: nix-community/cache-nix-action@v6.1.3
+        with:
+          primary-key: nix-${{ matrix.target.os }}-${{ hashFiles('**/*.nix', 'flake.lock') }}
+          restore-prefixes-first-match: nix-${{ matrix.target.os }}-
+      - name: Check Nix flake
+        run: nix flake check -L --impure
+        env:
+          NIXPKGS_ALLOW_UNFREE: 1
+      - name: Build Nix flake
+        run: nix build --impure
         env:
           NIXPKGS_ALLOW_UNFREE: 1

default.nix

@@ -1,5 +1,5 @@
 # Overlay.
 
-self: super: {
-  formal = super.callPackage ./pkgs/formal.nix { };
+final: prev: {
+  formal = prev.callPackage ./pkgs/formal.nix { };
 }

pkgs/darwin.nix

@@ -10,17 +10,15 @@
 
 let
   inherit (stdenv.hostPlatform) system;
-  fetch = hash: fetchurl {
-    url = "https://static-assets.formalcloud.net/desktop-app/darwin/formal-${version}.pkg";
-    inherit hash;
-  };
 
   platforms = [ "aarch64-darwin" "x86_64-darwin" ];
 in
 stdenv.mkDerivation {
   inherit pname version meta;
-
-  src = fetch "sha256-OnR3t+/Et9CWuomWZl+KyL/vdO+MOZyhJnyM6WkIVZY=";
+  src = fetchurl {
+    url = "https://static-assets.formalcloud.net/desktop-app/darwin/formal-${version}.pkg";
+    hash = "sha256-Qia9kOzQAWo6fLJHJmVz+aBZqYXnJLDV8ypfb5izNJk=";
+  };
 
   nativeBuildInputs = [
     cpio

pkgs/formal.nix

@@ -13,7 +13,7 @@
 
 let
   pname = "formal";
-  version = "0.4.1";
+  version = "0.4.3";
   meta = {
     description = "Formal Desktop";
     homepage = "https://joinformal.com";

pkgs/linux.nix

@@ -18,8 +18,8 @@ let
   };
 
   sources = rec {
-    aarch64-linux = fetch "arm64" "sha256-GrHTSo0uIx6KzB3xO8tXKLNdBRVf71Awkgniwbvag1w=";
-    x86_64-linux = fetch "amd64" "sha256-9FwakjTp1MJDl7ioyobgf38ycdwmOYi+KThcD5ZOOhY=";
+    aarch64-linux = fetch "arm64" "sha256-cVZaIWLS+o+Z+/Wb1YfyIEZPowJaFMZIHTyPpYjguT8=";
+    x86_64-linux = fetch "amd64" "sha256-4KFugcLbd+jwTTJf2f6FPe/gMKXjcB3GiAODwxKYBqs=";
   };
   platforms = builtins.attrNames sources;
 in