Skip to content

Commit

Permalink
abella-master: fix build
Browse files Browse the repository at this point in the history
  • Loading branch information
cu1ch3n committed Nov 28, 2024
1 parent 82a23ce commit fda40b2
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 4 deletions.
10 changes: 6 additions & 4 deletions pkgs/abella-master/default.nix
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{ lib, stdenv, fetchFromGitHub, rsync, ocamlPackages, nodejs }:
{ lib, stdenv, fetchFromGitHub, rsync, ocamlPackages }:

stdenv.mkDerivation (finalAttrs: {
pname = "abella-master";
version = "0-unstable-2024-11-27";
version = "2.0.8";

src = fetchFromGitHub {
owner = "abella-prover";
Expand All @@ -13,8 +13,10 @@ stdenv.mkDerivation (finalAttrs: {

strictDeps = true;

nativeBuildInputs = [ nodejs rsync ] ++ (with ocamlPackages; [ ocaml dune_3 menhir findlib ]);
buildInputs = with ocamlPackages; [ cmdliner yojson ];
nativeBuildInputs = [ rsync ] ++ (with ocamlPackages; [ ocaml dune_3 menhir findlib ]);
buildInputs = with ocamlPackages; [ cmdliner yojson re base64 ocurl ];

patches = [ ./no-npm.patch ];

installPhase = ''
mkdir -p $out/bin
Expand Down
29 changes: 29 additions & 0 deletions pkgs/abella-master/no-npm.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
diff --git a/Makefile b/Makefile
index 0701405..7d8a244 100644
--- a/Makefile
+++ b/Makefile
@@ -7,18 +7,18 @@ EXTN := $(if $(strip $(BYTECODE)),bc,exe)
BINS := $(patsubst %,%.$(EXTN),src/abella src/abella_doc src/abella_dep)

.PHONY: all
-all: support/.stamp
+all: # support/.stamp
$(DUNE) build $(BINS)

.PHONY: all-release
all-release: # support/.stamp
$(DUNE) build --release $(BINS)

-support/.stamp: $(wildcard support/ts/*.ts support/css/*.css)
- ( cd support && \
- npm install --no-save && \
- npm run build && \
- touch .stamp )
+# support/.stamp: $(wildcard support/ts/*.ts support/css/*.css)
+# ( cd support && \
+# npm install --no-save && \
+# npm run build && \
+# touch .stamp )

AIN := abella.install

0 comments on commit fda40b2

Please sign in to comment.