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

Commits on Jan 31, 2020

  1. Copy the full SHA
    fa70992 View commit details
  2. Copy the full SHA
    659a7ae View commit details
  3. Copy the full SHA
    13dd584 View commit details
Showing with 4 additions and 4 deletions.
  1. +2 −2 pkgs/applications/science/logic/coq/default.nix
  2. +1 −1 pkgs/development/coq-modules/tlc/default.nix
  3. +1 −1 pkgs/top-level/coq-packages.nix
4 changes: 2 additions & 2 deletions pkgs/applications/science/logic/coq/default.nix
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@

{ stdenv, fetchFromGitHub, writeText, pkgconfig
, ocamlPackages, ncurses
, buildIde ? true
, buildIde ? !(stdenv.isDarwin && stdenv.lib.versionAtLeast version "8.10")
, glib, gnome3, wrapGAppsHook
, darwin
, csdp ? null
@@ -32,7 +32,7 @@ let
"8.10.0" = "138jw94wp4mg5dgjc2asn8ng09ayz1mxdznq342n0m469j803gzg";
"8.10.1" = "072v2zkjzf7gj48137wpr3c9j0hg9pdhlr5l8jrgrwynld8fp7i4";
"8.10.2" = "0znxmpy71bfw0p6x47i82jf5k7v41zbz9bdpn901ysn3ir8l3wrz";
"8.11+beta1" = "06dlxj6v7gd51dh6ir121z7lgqdagkq717xxxrc8bdqhz7d2z7qj";
"8.11.0" = "1rfdic6mp7acx2zfwz7ziqk12g95bl9nyj68z4n20a5bcjv2pxpn";
}.${version};
coq-version = stdenv.lib.versions.majorMinor version;
versionAtLeast = stdenv.lib.versionAtLeast coq-version;
2 changes: 1 addition & 1 deletion pkgs/development/coq-modules/tlc/default.nix
Original file line number Diff line number Diff line change
@@ -22,6 +22,6 @@ stdenv.mkDerivation rec {
};

passthru = {
compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.6";
compatibleCoqVersions = stdenv.lib.flip builtins.elem [ "8.6" "8.7" "8.8" "8.9" "8.10" ];
};
}
2 changes: 1 addition & 1 deletion pkgs/top-level/coq-packages.nix
Original file line number Diff line number Diff line change
@@ -131,7 +131,7 @@ in rec {
version = "8.10.2";
};
coq_8_11 = callPackage ../applications/science/logic/coq {
version = "8.11+beta1";
version = "8.11.0";
};

coqPackages_8_5 = mkCoqPackages coq_8_5;