Merge pull request #1 from hariamoor-mlabs/impl-flake

Add flake and formatting
Plutonomicon · Jun 24, 2022 · b2eafac · b2eafac
2 parents 25dc6ab + 5aa0d92
commit b2eafac
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 8 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -0,0 +1,12 @@
+{
+  description = "Plutarch 2.0 (WIP)";
+  inputs = {
+    flake-utils.url = "github:numtide/flake-utils";
+  };
+  outputs = { self, nixpkgs, flake-utils }:
+    flake-utils.lib.simpleFlake {
+      inherit self nixpkgs;
+      name = "plutarch-core";
+      shell = ./shell.nix;
+    };
+}
diff --git a/plutarch-core.nix b/plutarch-core.nix
@@ -5,9 +5,10 @@ mkDerivation {
   src = ./.;
   isLibrary = true;
   libraryHaskellDepends = [
-    base generics-sop
+    base
+    generics-sop
   ];
-  testHaskellDepends = [];
+  testHaskellDepends = [ ];
   license = lib.licenses.mit;
   hydraPlatforms = lib.platforms.none;
   doHaddock = false;

diff --git a/shell.nix b/shell.nix
@@ -1,11 +1,9 @@
-{ pkgs ? import <nixpkgs> {} }:
+{ pkgs ? import <nixpkgs> { } }:
 with pkgs;
-let
-  #mkDerivation = p: old: arg: old (arg // {libraryHaskellDepends = arg.libraryHaskellDepends ++ arg.testHaskellDepends;});
-in haskell.packages.ghc922.shellFor {
+haskell.packages.ghc923.shellFor {
   packages = p: [
-    (p.callPackage ./plutarch-core.nix {})
+    (p.callPackage ./plutarch-core.nix { })
   ];
   buildHoogle = false;
-  buildInputs = [ cabal-install cabal2nix curl ];
+  buildInputs = [ cabal-install cabal2nix curl nixpkgs-fmt ];
 }