diff options
author | sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> | 2021-05-05 21:52:20 +0200 |
---|---|---|
committer | sterni <sternenseemann@systemli.org> | 2021-05-06 11:43:59 +0200 |
commit | 73c2dd4aa67cf9ef970554b45c39e7756bd1e92d (patch) | |
tree | 755451c107b2ee87d10c3aba8078dab986deaa82 /pkgs/applications/science | |
parent | abf5583c5a964f62142025c6c350842041791183 (diff) |
petrinizer: fix build
* take z3 haskell package from haskellPackages * take sbv 7.13 from haskellPackages, apply patch fixing build with GHC >= 8.8.8
Diffstat (limited to 'pkgs/applications/science')
-rw-r--r-- | pkgs/applications/science/logic/petrinizer/default.nix | 12 | ||||
-rw-r--r-- | pkgs/applications/science/logic/petrinizer/sbv-7.13.nix | 26 | ||||
-rw-r--r-- | pkgs/applications/science/logic/petrinizer/z3.nix | 24 |
3 files changed, 4 insertions, 58 deletions
diff --git a/pkgs/applications/science/logic/petrinizer/default.nix b/pkgs/applications/science/logic/petrinizer/default.nix index 38039f61fda62..3977eb6a4eda0 100644 --- a/pkgs/applications/science/logic/petrinizer/default.nix +++ b/pkgs/applications/science/logic/petrinizer/default.nix @@ -1,12 +1,8 @@ -{ mkDerivation, callPackage, buildPackages +{ mkDerivation , async, base, bytestring, containers, fetchFromGitLab, mtl -, parallel-io, parsec, lib, stm, transformers +, parallel-io, parsec, lib, stm, transformers, sbv_7_13, z3 }: -let - z3 = callPackage ./z3.nix { gomp = null; z3 = buildPackages.z3; }; -in let - sbv = callPackage ./sbv-7.13.nix { inherit z3; }; -in + mkDerivation rec { pname = "petrinizer"; version = "0.9.1.1"; @@ -22,7 +18,7 @@ mkDerivation rec { isLibrary = false; isExecutable = true; executableHaskellDepends = [ - async base bytestring containers mtl parallel-io parsec sbv stm + async base bytestring containers mtl parallel-io parsec sbv_7_13 stm transformers ]; description = "Safety and Liveness Analysis of Petri Nets with SMT solvers"; diff --git a/pkgs/applications/science/logic/petrinizer/sbv-7.13.nix b/pkgs/applications/science/logic/petrinizer/sbv-7.13.nix deleted file mode 100644 index f0c8dd2490482..0000000000000 --- a/pkgs/applications/science/logic/petrinizer/sbv-7.13.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ mkDerivation, array, async, base, bytestring, containers -, crackNum, deepseq, directory, doctest, filepath, generic-deriving -, ghc, Glob, hlint, mtl, pretty, process, QuickCheck, random -, lib, syb, tasty, tasty-golden, tasty-hunit, tasty-quickcheck -, template-haskell, time, z3 -}: -mkDerivation { - pname = "sbv"; - version = "7.13"; - sha256 = "0bk400swnb4s98c5p71ml1px6jndaiqhf5dj7zmnliyplqcgpfik"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - array async base containers crackNum deepseq directory filepath - generic-deriving ghc mtl pretty process QuickCheck random syb - template-haskell time - ]; - testHaskellDepends = [ - base bytestring containers crackNum directory doctest filepath Glob - hlint mtl QuickCheck random syb tasty tasty-golden tasty-hunit - tasty-quickcheck template-haskell - ]; - testSystemDepends = [ z3 ]; - homepage = "http://leventerkok.github.com/sbv/"; - description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving"; - license = lib.licenses.bsd3; -} diff --git a/pkgs/applications/science/logic/petrinizer/z3.nix b/pkgs/applications/science/logic/petrinizer/z3.nix deleted file mode 100644 index a20ccea16dc7b..0000000000000 --- a/pkgs/applications/science/logic/petrinizer/z3.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ mkDerivation, fetchpatch -, base, containers, gomp, hspec, QuickCheck, lib -, transformers, z3 -}: -mkDerivation { - pname = "z3"; - version = "408.0"; - sha256 = "13qkzy9wc17rm60i24fa9sx15ywbxq4a80g33w20887gvqyc0q53"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base containers transformers ]; - librarySystemDepends = [ gomp z3 ]; - testHaskellDepends = [ base hspec QuickCheck ]; - homepage = "https://github.com/IagoAbal/haskell-z3"; - description = "Bindings for the Z3 Theorem Prover"; - license = lib.licenses.bsd3; - doCheck = false; - patches = [ - (fetchpatch { - url = "https://github.com/IagoAbal/haskell-z3/commit/b10e09b8a809fb5bbbb1ef86aeb62109ece99cae.patch"; - sha256 = "13fnrs27mg3985r3lwks8fxfxr5inrayy2cyx2867d92pnl3yry4"; - }) - ]; -} |