From 4a4d1d64979e3ad80aaa03a2b2a526e50cead3a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 4 Jan 2019 11:40:39 +0100 Subject: [PATCH 1/2] cryptominisat: 5.0.1 -> 5.6.6 --- .../science/logic/cryptominisat/default.nix | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/science/logic/cryptominisat/default.nix b/pkgs/applications/science/logic/cryptominisat/default.nix index 4d96339149a..25027841ab8 100644 --- a/pkgs/applications/science/logic/cryptominisat/default.nix +++ b/pkgs/applications/science/logic/cryptominisat/default.nix @@ -1,24 +1,18 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, python, xxd }: +{ stdenv, fetchFromGitHub, fetchpatch, cmake, python, xxd, boost }: stdenv.mkDerivation rec { name = "cryptominisat-${version}"; - version = "5.0.1"; + version = "5.6.6"; src = fetchFromGitHub { owner = "msoos"; repo = "cryptominisat"; rev = version; - sha256 = "0cpw5d9vplxvv3aaplhnga55gz1hy29p7s4pkw1306knkbhlzvkb"; + sha256 = "1a1494gj4j73yij0hjbzsn2hglk9zy5c5wfwgig3j67cis28saf5"; }; - buildInputs = [ python xxd ]; - nativeBuildInputs = [ cmake ]; - - patches = [(fetchpatch rec { - name = "fix-exported-library-name.patch"; - url = "https://github.com/msoos/cryptominisat/commit/7a47795cbe5ad5a899731102d297f234bcade077.patch"; - sha256 = "11hf3cfqs4cykn7rlgjglq29lzqfxvlm0f20qasi0kdrz01cr30f"; - })]; + buildInputs = [ python boost ]; + nativeBuildInputs = [ cmake xxd ]; meta = with stdenv.lib; { description = "An advanced SAT Solver"; From 37fe593d486f006173e91df2cfc1429db7fb06e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 5 Jan 2019 16:38:10 +0100 Subject: [PATCH 2/2] cryptominisat: switch to python3 --- pkgs/applications/science/logic/cryptominisat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/cryptominisat/default.nix b/pkgs/applications/science/logic/cryptominisat/default.nix index 25027841ab8..18af6f0a618 100644 --- a/pkgs/applications/science/logic/cryptominisat/default.nix +++ b/pkgs/applications/science/logic/cryptominisat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, python, xxd, boost }: +{ stdenv, fetchFromGitHub, fetchpatch, cmake, python3, xxd, boost }: stdenv.mkDerivation rec { name = "cryptominisat-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1a1494gj4j73yij0hjbzsn2hglk9zy5c5wfwgig3j67cis28saf5"; }; - buildInputs = [ python boost ]; + buildInputs = [ python3 boost ]; nativeBuildInputs = [ cmake xxd ]; meta = with stdenv.lib; {