Remove Nix Plutarch wrapper

mlabs-haskell · Mar 6, 2024 · ed35645 · ed35645
1 parent 6349472
commit ed35645
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 75 deletions.
diff --git a/default.nix b/default.nix
@@ -1,9 +1,20 @@
 {
-  perSystem = { self', config, ... }:
+  perSystem = { self', pkgs, config, ... }:
     let
-      purus = config.libPlutarch.mkPackage {
+      cardanoPackages = pkgs.fetchFromGitHub {
+        owner = "input-output-hk";
+        repo = "cardano-haskell-packages";
+        rev = "3df392af2a61d61bdac1afd9c3674f27d6aa8efc"; # branch: repo
+        hash = "sha256-vvm56KzA6jEkG3mvwh1LEdK4H4FKxeoOJNz90H8l8dQ=";
+      };
+
+      purus = config.libHaskell.mkPackage {
         name = "purus";
         src = ./.;
+
+        externalRepositories = {
+          "https://input-output-hk.github.io/cardano-haskell-packages" = cardanoPackages;
+        };
       };
     in
     {

diff --git a/flake.nix b/flake.nix
@@ -24,7 +24,6 @@
     let
       flakeModules = {
         haskell = ./nix/haskell;
-        plutarch = ./nix/plutarch;
         utils = ./nix/utils;
       };
     in

diff --git a/nix/haskell/mk-hackage.nix b/nix/haskell/mk-hackage.nix
@@ -1,3 +1,5 @@
+# Adapted from https://github.com/mlabs-haskell/mlabs-tooling.nix/blob/cd0cf0d29f17980befe384248c16937589912c69/mk-hackage.nix
+
 { gzip
 , runCommand
 , lib

diff --git a/nix/plutarch/default.nix b/nix/plutarch/default.nix
diff --git a/nix/plutarch/lib.nix b/nix/plutarch/lib.nix