diff --git a/pkgs/applications/science/logic/prooftree/default.nix b/pkgs/by-name/pr/prooftree/package.nix similarity index 83% rename from pkgs/applications/science/logic/prooftree/default.nix rename to pkgs/by-name/pr/prooftree/package.nix index e396aa977968..cd60f98d32be 100644 --- a/pkgs/applications/science/logic/prooftree/default.nix +++ b/pkgs/by-name/pr/prooftree/package.nix @@ -2,31 +2,25 @@ lib, stdenv, fetchurl, - pkg-config, - ncurses, ocamlPackages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "prooftree"; version = "0.14"; src = fetchurl { - url = "https://askra.de/software/prooftree/releases/prooftree-${version}.tar.gz"; - sha256 = "sha256-nekV2UnjibOk4h0jZ1jV7W5pE/hXWb3fUoLTJb3Jzc0="; + url = "https://askra.de/software/prooftree/releases/prooftree-${finalAttrs.version}.tar.gz"; + hash = "sha256-nekV2UnjibOk4h0jZ1jV7W5pE/hXWb3fUoLTJb3Jzc0="; }; strictDeps = true; - nativeBuildInputs = [ - pkg-config - ] - ++ (with ocamlPackages; [ + nativeBuildInputs = with ocamlPackages; [ ocaml findlib - camlp5 - ]); - buildInputs = [ ncurses ] ++ (with ocamlPackages; [ lablgtk ]); + ]; + buildInputs = with ocamlPackages; [ lablgtk ]; prefixKey = "--prefix "; @@ -55,4 +49,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.jwiegley ]; license = lib.licenses.gpl3; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ef878dc27493..f5386706df28 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11149,10 +11149,6 @@ with pkgs; inherit (ocaml-ng.ocamlPackages_4_14_unsafe_string) ocaml camlp4; }; - prooftree = callPackage ../applications/science/logic/prooftree { - ocamlPackages = ocaml-ng.ocamlPackages_4_12; - }; - satallax = callPackage ../applications/science/logic/satallax { inherit (ocaml-ng.ocamlPackages_4_14) ocaml; };