diff --git a/pkgs/applications/science/logic/sapic/default.nix b/pkgs/applications/science/logic/sapic/default.nix deleted file mode 100644 index 27efe865a9d9..000000000000 --- a/pkgs/applications/science/logic/sapic/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchurl, unzip, ocaml }: - -stdenv.mkDerivation rec { - name = "sapic-${version}"; - version = "0.9"; - - src = fetchurl { - url = "http://sapic.gforge.inria.fr/${name}.zip"; - sha256 = "1ckl090lpyfh90mkjhnpcys5grs3nrl9wlbn9nfkxxnaivn2yx9y"; - }; - - nativeBuildInputs = [ unzip ]; - buildInputs = [ ocaml ]; - patches = [ ./native.patch ]; # create a native binary, not a bytecode one - - buildPhase = "make depend && make"; - installPhase = '' - mkdir -p $out/bin - cp ./sapic $out/bin - ''; - - meta = { - description = "Stateful applied Pi Calculus for protocol verification"; - homepage = http://sapic.gforge.inria.fr/; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; - }; -} diff --git a/pkgs/applications/science/logic/sapic/native.patch b/pkgs/applications/science/logic/sapic/native.patch deleted file mode 100644 index 6e0b98113df2..000000000000 --- a/pkgs/applications/science/logic/sapic/native.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/Makefile b/Makefile -index a1de94d..f9e2eb8 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,8 +1,8 @@ - TARGET = sapic --OBJS=lexer.cmo apip.cmo firsttranslation.cmo main.cmo #secondtranslation.cmo thirdtranslation.cmo main.cmo -+OBJS=lexer.cmx apip.cmx firsttranslation.cmx main.cmx - - sapic: $(OBJS) -- ocamlc -o $@ $(OBJS) -+ ocamlopt.opt -o $@ $(OBJS) - - depend: - ocamldep *.ml *.mli > .depend -@@ -13,17 +13,17 @@ clean: - rm -rf *.cmi *.cmo $(TARGET) - rm -rf apip.ml apip.mli lexer.ml lexer.mli - --.SUFFIXES: .ml .mli .mll .mly .cmo .cmi -+.SUFFIXES: .ml .mli .mll .mly .cmo .cmi .cmx - --.ml.cmo: -- ocamlc -c $< -+.ml.cmx: -+ ocamlopt.opt -c $< - .mli.cmi: -- ocamlc -c $< -+ ocamlopt.opt -c $< - .mll.ml: - ocamllex $< - .mly.ml: - ocamlyacc $< - .ml.mli: -- ocamlc -i $< > $@ -+ ocamlopt.opt -i $< > $@ - - -include .depend diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f9e645c0793e..e13e9adfa165 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -271,6 +271,7 @@ mapAliases ({ saneBackends = sane-backends; # added 2016-01-02 saneBackendsGit = sane-backends-git; # added 2016-01-02 saneFrontends = sane-frontends; # added 2016-01-02 + sapic = throw "deprecated 2019-1-19: sapic is bundled with 'tamarin-prover' now"; scim = sc-im; # added 2016-01-22 scollector = bosun; # added 2018-04-25 shared_mime_info = shared-mime-info; # added 2018-02-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1da47294d08b..8fd86f6d4411 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21855,10 +21855,6 @@ in proverif = callPackage ../applications/science/logic/proverif { }; - sapic = callPackage ../applications/science/logic/sapic { - inherit (ocaml-ng.ocamlPackages_4_05) ocaml; - }; - satallax = callPackage ../applications/science/logic/satallax { ocaml = ocaml-ng.ocamlPackages_4_01_0.ocaml; };