mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-06 17:13:24 -05:00
prooftree: refactor
Move to pkgs/by-name/
Build with default version of OCaml
Use finalAttrs pattern
Remove unused dependencies
(cherry picked from commit 23bee868d9)
This commit is contained in:
parent
42312874ce
commit
a06bebb644
2 changed files with 7 additions and 17 deletions
|
|
@ -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;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
@ -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;
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue