diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-12-13 11:43:39 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-12-13 11:43:39 +0100 |
commit | dfdf1597a7cc13c40653722a771be12afaa64edb (patch) | |
tree | 4d7cd3f21ba89453f23ea1addb55e00574a638bf /pkgs/applications/science/logic/boolector/default.nix | |
parent | d5d8b3514d64fcd4022186795f604ec3f360ae17 (diff) | |
parent | 418ad571c3ec856d49b65fa53ab99f185c2d9def (diff) | |
download | nixpkgs-dfdf1597a7cc13c40653722a771be12afaa64edb.tar nixpkgs-dfdf1597a7cc13c40653722a771be12afaa64edb.tar.gz nixpkgs-dfdf1597a7cc13c40653722a771be12afaa64edb.tar.bz2 nixpkgs-dfdf1597a7cc13c40653722a771be12afaa64edb.tar.lz nixpkgs-dfdf1597a7cc13c40653722a771be12afaa64edb.tar.xz nixpkgs-dfdf1597a7cc13c40653722a771be12afaa64edb.tar.zst nixpkgs-dfdf1597a7cc13c40653722a771be12afaa64edb.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/science/logic/boolector/default.nix')
-rw-r--r-- | pkgs/applications/science/logic/boolector/default.nix | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/applications/science/logic/boolector/default.nix b/pkgs/applications/science/logic/boolector/default.nix index f1f74bcb581..4cf0b0f1ea1 100644 --- a/pkgs/applications/science/logic/boolector/default.nix +++ b/pkgs/applications/science/logic/boolector/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ stdenv, fetchFromGitHub, fetchpatch , cmake, lingeling, btor2tools }: @@ -13,6 +13,14 @@ stdenv.mkDerivation rec { sha256 = "15i3ni5klss423m57wcy1gx0m5wfrjmglapwg85pm7fb3jj1y7sz"; }; + patches = [ + (fetchpatch { + name = "CVE-2019-7560.patch"; + url = "https://github.com/Boolector/boolector/commit/8d979d02e0482c7137c9f3a34e6d430dbfd1f5c5.patch"; + sha256 = "1a1g02mk8b0azzjcigdn5zpshn0dn05fciwi8sd5q38yxvnvpbbi"; + }) + ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ lingeling btor2tools ]; |