Merge branch 'main' into improve-parsing

input-output-hk · Sep 5, 2023 · b364ec4 · b364ec4
2 parents c5d918c + 1a307b9
commit b364ec4
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 31 deletions.
diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml
@@ -24,4 +24,6 @@ jobs:
            name: foliage
            authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
 
+      - uses: DeterminateSystems/magic-nix-cache-action@v2
+
       - run: nix build --accept-flake-config
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
diff --git a/app/Foliage/HackageSecurity.hs b/app/Foliage/HackageSecurity.hs
@@ -32,10 +32,14 @@ readJSONSimple fp = do
   p <- makeAbsolute (fromFilePath fp)
   readJSON_NoKeys_NoLayout p
 
+forceFileInfo :: FileInfo -> ()
+forceFileInfo (FileInfo a b) = a `seq` b `seq` ()
+
 computeFileInfoSimple :: FilePath -> IO FileInfo
 computeFileInfoSimple fp = do
   p <- makeAbsolute (fromFilePath fp)
-  computeFileInfo p
+  fi <- computeFileInfo p
+  return $! forceFileInfo fi `seq` fi
 
 createKeys :: FilePath -> IO ()
 createKeys base = do

diff --git a/flake.nix b/flake.nix
@@ -35,6 +35,18 @@
           lib.attrsets.optionalAttrs (system == "x86_64-linux")
             { crossPlatforms = p: [ p.musl64 ]; }
         );
+
+        # Wrap the foliage executable with the needed dependencies in PATH.
+        # See #71.
+        wrapExe = drv:
+          pkgs.runCommand "foliage" {
+            nativeBuildInputs = [ pkgs.makeWrapper ];
+          } ''
+            mkdir -p $out/bin
+            makeWrapper ${drv}/bin/foliage $out/bin/foliage \
+                --prefix PATH : ${with pkgs; lib.makeBinPath [ curl patch ]}:$out/bin
+          '';
+
       in
 
       flake // {
@@ -46,9 +58,9 @@
 
         apps = { default = flake.apps."foliage:exe:foliage"; }
         // lib.attrsets.optionalAttrs (system == "x86_64-linux")
-          { static = flake.apps."x86_64-unknown-linux-musl:foliage:exe:foliage"; }
+          { static = wrapExe flake.apps."x86_64-unknown-linux-musl:foliage:exe:foliage"; }
         // lib.attrsets.optionalAttrs (system == "aarch64-linux")
-          { static = flake.apps."aarch64-multiplatform-musl:foliage:exe:foliage"; };
+          { static = wrapExe flake.apps."aarch64-multiplatform-musl:foliage:exe:foliage"; };
 
         packages = { default = flake.packages."foliage:exe:foliage"; }
         // lib.attrsets.optionalAttrs (system == "x86_64-linux")