nix-flakes

Author: d-xo

.envrc

@@ -0,0 +1 @@
+use_flake

.gitignore

@@ -1,3 +1,4 @@
 result
 result-*
 dist-newstyle/
+.direnv/

default.nix

@@ -1,16 +1,10 @@
-{ system ? builtins.currentSystem , ... }:
-
-let
-  rev = "fd364d268852561223a5ada15caad669fd72800e";
-  nixpkgs = builtins.fetchTarball {
-    name = "nixpkgs-unstable-22-04-11";
-    url = "https://github.com/nixos/nixpkgs/tarball/${rev}";
-    sha256 = "133i5fsx0gix37q4nxm1vfsl9hqbfzv458xykilqhgxmv45jmfl2";
-  };
-in
-  # Now return the Nixpkgs configured to use our overlay.
-  import nixpkgs {
-    inherit system;
-
-    overlays = [(import ./overlay.nix)];
-  }
+(import
+  (
+    let lock = builtins.fromJSON (builtins.readFile ./flake.lock); in
+    fetchTarball {
+      url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
+      sha256 = lock.nodes.flake-compat.locked.narHash;
+    }
+  )
+  { src = ./.; }
+).defaultNix

flake.lock

@@ -0,0 +1,84 @@
+{
+  description = "HEVM";
+
+  inputs = {
+    flake-utils.url = "github:numtide/flake-utils";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-22.05";
+    flake-compat = {
+      url = "github:edolstra/flake-compat";
+      flake = false;
+    };
+  };
+
+  outputs = { self, nixpkgs, flake-utils, ... }:
+    flake-utils.lib.eachDefaultSystem (system:
+      let
+        pkgs = nixpkgs.legacyPackages.${system};
+        dontCheck = x: y:
+          pkgs.haskell.lib.dontCheck
+            (pkgs.haskellPackages.callCabal2nix x y {});
+      in rec {
+
+        # --- packages ----
+
+        packages = flake-utils.lib.flattenTree {
+          libff = pkgs.callPackage (import ./nix/libff.nix) {};
+          hevm = pkgs.haskell.lib.dontHaddock ((
+            pkgs.haskellPackages.callCabal2nix "hevm" (./src/hevm) {
+              # Haskell libs with the same names as C libs...
+              # Depend on the C libs, not the Haskell libs.
+              # These are system deps, not Cabal deps.
+              inherit (pkgs) secp256k1;
+            }
+          ).overrideAttrs (attrs: {
+            hardeningDisable = ["pic"];
+            postInstall = ''
+                wrapProgram $out/bin/hevm --prefix PATH \
+                  : "${pkgs.lib.makeBinPath (with pkgs; [bash coreutils git solc])}"
+              '';
+
+            enableSeparateDataOutput = true;
+            buildInputs = attrs.buildInputs ++ [
+              pkgs.solc
+              pkgs.z3
+              pkgs.cvc4
+            ];
+            nativeBuildInputs = attrs.nativeBuildInputs ++ [pkgs.makeWrapper];
+            configureFlags = attrs.configureFlags ++ [
+                "--ghc-option=-O2"
+                "--enable-executable-static"
+                "--extra-lib-dirs=${pkgs.gmp.override { withStatic = true; }}/lib"
+                "--extra-lib-dirs=${pkgs.glibc.static}/lib"
+                "--extra-lib-dirs=${packages.libff.override { enableStatic = true; }}/lib"
+                "--extra-lib-dirs=${pkgs.ncurses.override {enableStatic = true; }}/lib"
+                "--extra-lib-dirs=${pkgs.zlib.static}/lib"
+                "--extra-lib-dirs=${pkgs.libffi.overrideAttrs (old: { dontDisableStatic = true; })}/lib"
+            ];
+          }));
+        };
+        defaultPackage = packages.hevm;
+
+        # --- apps ----
+
+        apps.hevm = flake-utils.lib.mkApp { drv = packages.hevm; };
+        defaultApp = apps.hevm;
+
+        # --- shell ---
+
+        devShell = (pkgs.haskellPackages.shellFor {
+          packages = _: [
+            packages.hevm
+          ];
+          buildInputs = with pkgs.haskellPackages; [
+            pkgs.z3
+            pkgs.cvc4
+            cabal-install
+            haskell-language-server
+          ];
+          withHoogle = true;
+        }).overrideAttrs (_: {
+          LD_LIBRARY_PATH = "${pkgs.secp256k1}/lib:${pkgs.libff}/lib";
+        });
+      }
+    );
+}

flake.nix

@@ -10,6 +10,6 @@ rm -rf dist/*.tar.gz dist/docs
 nix-shell --command "cabal haddock --builddir=dist/docs --haddock-for-hackage \
   --haddock-option=--hyperlinked-source"
 cabal sdist
-cabal upload $FLAGS dist-newstyle/sdist/*.tar.gz
-cabal upload $FLAGS -d dist/docs/*-docs.tar.gz
+cabal upload "$FLAGS" dist-newstyle/sdist/*.tar.gz
+cabal upload "$FLAGS" -d dist/docs/*-docs.tar.gz
 

src/upload-haskell-package scripts/upload-haskell-package

@@ -0,0 +1,10 @@
+(import
+  (
+    let lock = builtins.fromJSON (builtins.readFile ./flake.lock); in
+    fetchTarball {
+      url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
+      sha256 = lock.nodes.flake-compat.locked.narHash;
+    }
+  )
+  { src = ./.; }
+).shellNix