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

Commits on Nov 4, 2018

  1. coq_8_9: init at 8.9+beta1

    @Zimmi48 @vbgl
    Zimmi48 authored and vbgl committed Nov 4, 2018

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    dd21f83 View commit details
Showing with 13 additions and 11 deletions.
  1. +1 −0 pkgs/applications/science/logic/coq/default.nix
  2. +7 −6 pkgs/top-level/all-packages.nix
  3. +5 −5 pkgs/top-level/coq-packages.nix
1 change: 1 addition & 0 deletions pkgs/applications/science/logic/coq/default.nix
View file
Original file line number Diff line number Diff line change
@@ -25,6 +25,7 @@ let
"8.8.0" = "13a4fka22hdxsjk11mgjb9ffzplfxyxp1sg5v1c8nk1grxlscgw8";
"8.8.1" = "1hlf58gwazywbmfa48219amid38vqdl94yz21i11b4map6jfwhbk";
"8.8.2" = "1lip3xja924dm6qblisk1bk0x8ai24s5xxqxphbdxj6djglj68fd";
"8.9+beta1" = "1yxv2klqal3mh6symi3gc6gv3xm684zlld2c0b6ijhjmp865cin8";
}."${version}";
coq-version = builtins.substring 0 3 version;
ideFlags = if buildIde then "-lablgtkdir ${ocamlPackages.lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else "";
13 changes: 7 additions & 6 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -21364,13 +21364,14 @@ with pkgs;
boogie = dotnetPackages.Boogie;

inherit (callPackage ./coq-packages.nix {
inherit (ocaml-ng) ocamlPackages_4_02
ocamlPackages_4_05
;
inherit (ocaml-ng) ocamlPackages_4_05;
}) mkCoqPackages
coq_8_5 coq_8_6 coq_8_7 coq_8_8
coqPackages_8_5 coqPackages_8_6 coqPackages_8_7 coqPackages_8_8
coqPackages coq
coqPackages_8_5 coq_8_5
coqPackages_8_6 coq_8_6
coqPackages_8_7 coq_8_7
coqPackages_8_8 coq_8_8
coqPackages_8_9 coq_8_9
coqPackages coq
;

coq2html = callPackage ../applications/science/logic/coq2html {
10 changes: 5 additions & 5 deletions pkgs/top-level/coq-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
{ lib, callPackage, newScope, recurseIntoAttrs
, gnumake3
, ocamlPackages_4_02
, ocamlPackages_4_05
}:
{ lib, callPackage, newScope, recurseIntoAttrs, ocamlPackages_4_05 }:

let
mkCoqPackages' = self: coq:
@@ -70,11 +66,15 @@ in rec {
coq_8_8 = callPackage ../applications/science/logic/coq {
version = "8.8.2";
};
coq_8_9 = callPackage ../applications/science/logic/coq {
version = "8.9+beta1";
};

coqPackages_8_5 = mkCoqPackages coq_8_5;
coqPackages_8_6 = mkCoqPackages coq_8_6;
coqPackages_8_7 = mkCoqPackages coq_8_7;
coqPackages_8_8 = mkCoqPackages coq_8_8;
coqPackages_8_9 = mkCoqPackages coq_8_9;
coqPackages = coqPackages_8_8;
coq = coqPackages.coq;