diff options
| author | Marco Maggesi <1809783+maggesi@users.noreply.github.com> | 2019-10-13 18:06:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-13 18:06:23 +0200 |
| commit | 24d0bd37b5ad2307f4f3f22c797d2123a9e143a9 (patch) | |
| tree | dd6d8371bcc83b446f4d1e2b41fab1d92ceb072a /pkgs/applications/science/logic | |
| parent | ff1ed720e280f2e4ff57dd869e93dbc9eb034040 (diff) | |
| parent | 4fb9a75fc85f82f2bb186d23b89190b53ad3ec1b (diff) | |
| download | nixlib-24d0bd37b5ad2307f4f3f22c797d2123a9e143a9.tar nixlib-24d0bd37b5ad2307f4f3f22c797d2123a9e143a9.tar.gz nixlib-24d0bd37b5ad2307f4f3f22c797d2123a9e143a9.tar.bz2 nixlib-24d0bd37b5ad2307f4f3f22c797d2123a9e143a9.tar.lz nixlib-24d0bd37b5ad2307f4f3f22c797d2123a9e143a9.tar.xz nixlib-24d0bd37b5ad2307f4f3f22c797d2123a9e143a9.tar.zst nixlib-24d0bd37b5ad2307f4f3f22c797d2123a9e143a9.zip | |
Merge branch 'master' into rename-z77z-into-maggesi
Diffstat (limited to 'pkgs/applications/science/logic')
4 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix index dc08b59bc911..d799b52d115e 100644 --- a/pkgs/applications/science/logic/hol_light/default.nix +++ b/pkgs/applications/science/logic/hol_light/default.nix @@ -21,13 +21,13 @@ let in stdenv.mkDerivation { - name = "hol_light-2019-03-27"; + name = "hol_light-2019-10-06"; src = fetchFromGitHub { owner = "jrh13"; repo = "hol-light"; - rev = "a2b487b38d9da47350f1b4316e34a8fa4cf7a40a"; - sha256 = "1qlidl15qi8w4si8wxcmj8yg2srsb0q4k1ad9yd91sgx9h9aq8fk"; + rev = "5c91b2ded8a66db571824ecfc18b4536c103b23e"; + sha256 = "0sxsk8z08ba0q5aixdyczcx5l29lb51ba4ip3d2fry7y604kjsx6"; }; buildInputs = [ ocaml camlp5 ]; diff --git a/pkgs/applications/science/logic/jonprl/default.nix b/pkgs/applications/science/logic/jonprl/default.nix index 61ca78d85ed1..e503836098f1 100644 --- a/pkgs/applications/science/logic/jonprl/default.nix +++ b/pkgs/applications/science/logic/jonprl/default.nix @@ -30,5 +30,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ puffnfresh ]; platforms = stdenv.lib.platforms.linux; + broken = true; }; } diff --git a/pkgs/applications/science/logic/lean2/default.nix b/pkgs/applications/science/logic/lean2/default.nix index 8cc50bb5e295..612c9d6f92a2 100644 --- a/pkgs/applications/science/logic/lean2/default.nix +++ b/pkgs/applications/science/logic/lean2/default.nix @@ -32,5 +32,6 @@ stdenv.mkDerivation { license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice gebner ]; + broken = true; }; } diff --git a/pkgs/applications/science/logic/monosat/default.nix b/pkgs/applications/science/logic/monosat/default.nix index 30d47687a3eb..fba3bc479060 100644 --- a/pkgs/applications/science/logic/monosat/default.nix +++ b/pkgs/applications/science/logic/monosat/default.nix @@ -39,6 +39,7 @@ let platforms = platforms.unix; license = if includeGplCode then licenses.gpl2 else licenses.mit; homepage = https://github.com/sambayless/monosat; + broken = true; }; }; @@ -64,4 +65,4 @@ let --replace '../../../../libmonosat.so' '${core}/lib/libmonosat.so' ''; }; -in core \ No newline at end of file +in core |