From 42bd693d280ea730ee5b010c97117c4b2dbe21ca Mon Sep 17 00:00:00 2001 From: "Narazaki, Shuji" Date: Sat, 28 Mar 2020 22:53:09 +0900 Subject: [PATCH 1/2] maintainers: add shnarazk --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b59199bc767c..21f335d8b30c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6736,6 +6736,11 @@ github = "shmish111"; name = "David Smith"; }; + shnarazk = { + email = "shujinarazaki@protonmail.com"; + github = "shnarazk"; + name = "Narazaki Shuji"; + }; shou = { email = "x+g@shou.io"; github = "Shou"; From c5a12e33d29e5a420f6c8ddd77738504085e7645 Mon Sep 17 00:00:00 2001 From: "Narazaki, Shuji" Date: Sun, 5 Apr 2020 00:22:36 +0900 Subject: [PATCH 2/2] cadical: init at 1.2.1 --- .../science/logic/cadical/default.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/applications/science/logic/cadical/default.nix diff --git a/pkgs/applications/science/logic/cadical/default.nix b/pkgs/applications/science/logic/cadical/default.nix new file mode 100644 index 000000000000..5e6c0d55b7dd --- /dev/null +++ b/pkgs/applications/science/logic/cadical/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "cadical"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "arminbiere"; + repo = "cadical"; + rev = "rel-${version}"; + hash = "sha256:1a66xkw42ad330fvw8i0sawrmg913m8wrq5c85lw5qandkwvxdi6"; + }; + + dontAddPrefix = true; + installPhase = '' + install -Dm0755 build/cadical "$out/bin/cadical" + install -Dm0755 build/mobical "$out/bin/mobical" + mkdir -p "$out/share/doc/${pname}-${version}/" + install -Dm0755 {LICEN?E,README*,VERSION} "$out/share/doc/${pname}-${version}/" + ''; + + meta = with stdenv.lib; { + description = "Simplified Satisfiability Solver"; + maintainers = with maintainers; [ shnarazk ]; + platforms = platforms.unix; + license = licenses.mit; + homepage = "http://fmv.jku.at/cadical"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 32571ec83361..64dae17c5218 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24555,6 +24555,8 @@ in boogie = dotnetPackages.Boogie; + cadical = callPackage ../applications/science/logic/cadical {}; + inherit (callPackage ./coq-packages.nix { inherit (ocaml-ng) ocamlPackages_4_05; }) mkCoqPackages