diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2018-08-12 10:33:41 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2018-08-12 10:33:41 +0200 |
commit | 00df25ee57fcc2227ffdbbff2280b13d898bfd7d (patch) | |
tree | a2cdc854489799c6d7900b0e5ac215b7b95d762a /pkgs/applications/science/logic | |
parent | 580cab57e4f188d25144e398d7b8e3d5085299a9 (diff) | |
parent | bb3f7d14a17e88e4341872c55d8b32127c6f8101 (diff) | |
download | nixlib-00df25ee57fcc2227ffdbbff2280b13d898bfd7d.tar nixlib-00df25ee57fcc2227ffdbbff2280b13d898bfd7d.tar.gz nixlib-00df25ee57fcc2227ffdbbff2280b13d898bfd7d.tar.bz2 nixlib-00df25ee57fcc2227ffdbbff2280b13d898bfd7d.tar.lz nixlib-00df25ee57fcc2227ffdbbff2280b13d898bfd7d.tar.xz nixlib-00df25ee57fcc2227ffdbbff2280b13d898bfd7d.tar.zst nixlib-00df25ee57fcc2227ffdbbff2280b13d898bfd7d.zip |
Merge branch 'master' into staging-next
Hydra: ?compare=1472947
Diffstat (limited to 'pkgs/applications/science/logic')
-rw-r--r-- | pkgs/applications/science/logic/sad/default.nix | 9 | ||||
-rw-r--r-- | pkgs/applications/science/logic/sad/monoid.patch | 51 |
2 files changed, 58 insertions, 2 deletions
diff --git a/pkgs/applications/science/logic/sad/default.nix b/pkgs/applications/science/logic/sad/default.nix index 51ea9b9c0e76..426f1928938c 100644 --- a/pkgs/applications/science/logic/sad/default.nix +++ b/pkgs/applications/science/logic/sad/default.nix @@ -7,7 +7,12 @@ stdenv.mkDerivation { sha256 = "10jd93xgarik7xwys5lq7fx4vqp7c0yg1gfin9cqfch1k1v8ap4b"; }; buildInputs = [ ghc spass ]; - patches = [ ./patch ]; + patches = [ + ./patch + # Since the LTS 12.0 update, <> is an operator in Prelude, colliding with + # the <> operator with a different meaning defined by this package + ./monoid.patch + ]; postPatch = '' substituteInPlace Alice/Main.hs --replace init.opt $out/init.opt ''; @@ -23,7 +28,7 @@ stdenv.mkDerivation { meta = { description = "A program for automated proving of mathematical texts"; longDescription = '' - The system for automated deduction is intended for automated processing of formal mathematical texts + The system for automated deduction is intended for automated processing of formal mathematical texts written in a special language called ForTheL (FORmal THEory Language) or in a traditional first-order language ''; license = stdenv.lib.licenses.gpl3Plus; diff --git a/pkgs/applications/science/logic/sad/monoid.patch b/pkgs/applications/science/logic/sad/monoid.patch new file mode 100644 index 000000000000..da9c21bcae91 --- /dev/null +++ b/pkgs/applications/science/logic/sad/monoid.patch @@ -0,0 +1,51 @@ +diff --git a/Alice/Core/Check.hs b/Alice/Core/Check.hs +index 0700fa0388f..69815864710 100644 +--- a/Alice/Core/Check.hs ++++ b/Alice/Core/Check.hs +@@ -18,8 +18,12 @@ + - along with this program. If not, see <http://www.gnu.org/licenses/>. + -} + ++{-# LANGUAGE NoImplicitPrelude #-} ++ + module Alice.Core.Check (fillDef) where + ++import Prelude hiding ((<>)) ++ + import Control.Monad + import Data.Maybe + +diff --git a/Alice/Core/Reason.hs b/Alice/Core/Reason.hs +index c361bcf220d..4e493d8c91b 100644 +--- a/Alice/Core/Reason.hs ++++ b/Alice/Core/Reason.hs +@@ -17,9 +17,12 @@ + - You should have received a copy of the GNU General Public License + - along with this program. If not, see <http://www.gnu.org/licenses/>. + -} ++{-# LANGUAGE NoImplicitPrelude #-} + + module Alice.Core.Reason where + ++import Prelude hiding ((<>)) ++ + import Control.Monad + + import Alice.Core.Base +diff --git a/Alice/Core/Verify.hs b/Alice/Core/Verify.hs +index 4f8550bdf11..0f59d135b16 100644 +--- a/Alice/Core/Verify.hs ++++ b/Alice/Core/Verify.hs +@@ -18,8 +18,12 @@ + - along with this program. If not, see <http://www.gnu.org/licenses/>. + -} + ++{-# LANGUAGE NoImplicitPrelude #-} ++ + module Alice.Core.Verify (verify) where + ++import Prelude hiding ((<>)) ++ + import Control.Monad + import Data.IORef + import Data.Maybe |