Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 26d250d4b3d2
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 141f9ce8073a
Choose a head ref
  • 4 commits
  • 1 file changed
  • 3 contributors

Commits on Jul 8, 2020

  1. cryptominisat: 5.7.1 -> 5.8.0

    @r-ryantm
    r-ryantm committed Jul 8, 2020
    Copy the full SHA
    3628d0d View commit details

Commits on Jul 9, 2020

  1. cryptominisat: fix build on darwin

    @Mic92
    Mic92 committed Jul 9, 2020
    Copy the full SHA
    e3d703b View commit details

  2. cryptominisat: use fetchpatch

    @Mic92
    Mic92 committed Jul 9, 2020
    Copy the full SHA
    223c91d View commit details

  3. cryptominisat: 5.7.1 -> 5.8.0 (#92681) 

    Co-authored-by: Jörg Thalheim <joerg@thalheim.io>
    @Mic92
    Mic92 and Mic92 authored Jul 9, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    141f9ce View commit details
Showing with 11 additions and 3 deletions.
  1. +11 −3 pkgs/applications/science/logic/cryptominisat/default.nix
14 changes: 11 additions & 3 deletions pkgs/applications/science/logic/cryptominisat/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,24 @@
{ stdenv, fetchFromGitHub, cmake, python3, xxd, boost }:
{ stdenv, fetchFromGitHub, cmake, python3, xxd, boost, fetchpatch }:

stdenv.mkDerivation rec {
pname = "cryptominisat";
version = "5.7.1";
version = "5.8.0";

src = fetchFromGitHub {
owner = "msoos";
repo = "cryptominisat";
rev = version;
sha256 = "16lydnbd4rxfyabvvw7l4hbbby3yprcqqzrydd3n8rjbxibi4xyf";
sha256 = "00hmxdlyhn7pwk9jlvc5g0l5z5xqfchjzf5jgn3pkj9xhl8yqq50";
};

patches = [
(fetchpatch {
# https://github.com/msoos/cryptominisat/pull/621
url = "https://github.com/msoos/cryptominisat/commit/11a97003b0bfbfb61ed6c4e640212110d390c28c.patch";
sha256 = "0hdy345bwcbxz0jl1jdxfa6mmfh77s2pz9rnncsr0jzk11b3j0cw";
})
];

buildInputs = [ python3 boost ];
nativeBuildInputs = [ cmake xxd ];