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: 8dd417eed636
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b4db381443ed
Choose a head ref
  • 4 commits
  • 3 files changed
  • 1 contributor

Commits on Oct 16, 2019

  1. coq_8_10: fix CoqIDE on darwin

    @vbgl
    vbgl committed Oct 16, 2019
    Copy the full SHA
    325f89e View commit details

  2. coq_8_10: do not take “camlp5” as input

    @vbgl
    vbgl committed Oct 16, 2019
    Copy the full SHA
    1292f49 View commit details

  3. coq: do not build CoqIDE for Coq 8.10 

    GTK3 at version 3.24.11 has broken pkg-config files
    @vbgl
    vbgl committed Oct 16, 2019
    Copy the full SHA
    0cc70b5 View commit details

  4. coq_8_10: 8.10+β3 → 8.10.0 

    coqPackages.coq-elpi: master → 1.1.0
    @vbgl
    vbgl committed Oct 16, 2019
    Copy the full SHA
    b4db381 View commit details
Showing with 12 additions and 8 deletions.
  1. +7 −3 pkgs/applications/science/logic/coq/default.nix
  2. +4 −4 pkgs/development/coq-modules/coq-elpi/default.nix
  3. +1 −1 pkgs/top-level/coq-packages.nix
10 changes: 7 additions & 3 deletions pkgs/applications/science/logic/coq/default.nix
View file
Original file line number Diff line number Diff line change
@@ -7,8 +7,9 @@

{ stdenv, fetchFromGitHub, writeText, pkgconfig
, ocamlPackages, ncurses
, buildIde ? true
, buildIde ? !stdenv.lib.versionAtLeast version "8.10" # lablgtk3 cannot be built with GTK3 at version 3.24.11
, glib, gnome3, wrapGAppsHook
, darwin
, csdp ? null
, version
}:
@@ -28,7 +29,7 @@ let
"8.8.2" = "1lip3xja924dm6qblisk1bk0x8ai24s5xxqxphbdxj6djglj68fd";
"8.9.0" = "1dkgdjc4n1m15m1p724hhi5cyxpqbjw6rxc5na6fl3v4qjjfnizh";
"8.9.1" = "1xrq6mkhpq994bncmnijf8jwmwn961kkpl4mwwlv7j3dgnysrcv2";
"8.10+beta3" = "08c7q97jyblsf7dhk8jf1fx1cp9qr3dr5s42wigx10wh7i6j7pca";
"8.10.0" = "138jw94wp4mg5dgjc2asn8ng09ayz1mxdznq342n0m469j803gzg";
}.${version};
coq-version = stdenv.lib.versions.majorMinor version;
versionAtLeast = stdenv.lib.versionAtLeast coq-version;
@@ -101,10 +102,13 @@ self = stdenv.mkDerivation {
};

nativeBuildInputs = [ pkgconfig ];
buildInputs = [ ncurses ] ++ (with ocamlPackages; [ ocaml findlib camlp5 num ])
buildInputs = [ ncurses ocamlPackages.ocaml ocamlPackages.findlib ]
++ stdenv.lib.optional (!versionAtLeast "8.10") ocamlPackages.camlp5
++ [ ocamlPackages.num ]
++ stdenv.lib.optionals buildIde
(if versionAtLeast "8.10"
then [ ocamlPackages.lablgtk3-sourceview3 glib gnome3.defaultIconTheme wrapGAppsHook ]
++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa
else [ ocamlPackages.lablgtk ]);

postPatch = ''
8 changes: 4 additions & 4 deletions pkgs/development/coq-modules/coq-elpi/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{ stdenv, fetchFromGitHub, which, coq }:

let params = {
"8.10" = {
version = "master";
rev = "bc7134deba1aacc7ecd2f5d1032bdf05b125c568";
sha256 = "188avk9irwjsbs5ya4ka01mpk3vw4397kv2rmsncqrrrsa1pdddk";
"8.10" = rec {
version = "1.1.0";
rev = "v${version}";
sha256 = "06jyw7n27ylg02jvlaa3hs13hg8qgx47yn4dxhg9as1xri9a2rvm";
};
};
param = params.${coq.coq-version};
2 changes: 1 addition & 1 deletion pkgs/top-level/coq-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -127,7 +127,7 @@ in rec {
version = "8.9.1";
};
coq_8_10 = callPackage ../applications/science/logic/coq {
version = "8.10+beta3";
version = "8.10.0";
};

coqPackages_8_5 = mkCoqPackages coq_8_5;