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: 2ddcec98856c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 37c89aaaa794
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on May 16, 2017

  1. coqPackages: default version 8.4pl6 -> 8.6 

    This fixes incomplete commit 83a50c2.
    @Zimmi48
    Zimmi48 authored May 16, 2017
    Copy the full SHA
    6b8da80 View commit details

  2. coq: default version is the one of coqPackages 

    This clean-up is supposed to avoid the mistake made in 83a50c2 and fixed in 6b8da80 in the future.
    @Zimmi48
    Zimmi48 committed May 16, 2017
    Copy the full SHA
    5f04a61 View commit details

Commits on May 22, 2017

  1. Merge pull request #25826 from Zimmi48/patch-1 

    coqPackages: default version 8.4pl6 -> 8.6
    @jagajaga
    jagajaga authored May 22, 2017
    Copy the full SHA
    37c89aa View commit details
Showing with 15 additions and 14 deletions.
  1. +15 −14 pkgs/top-level/all-packages.nix
29 changes: 15 additions & 14 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -17700,20 +17700,13 @@ with pkgs;
camlp5 = ocamlPackages_3_12_1.camlp5_transitional;
lablgtk = ocamlPackages_3_12_1.lablgtk_2_14;
};
coq_8_4 = callPackage ../applications/science/logic/coq/8.4.nix {
inherit (ocamlPackages_4_02) ocaml findlib lablgtk;
camlp5 = ocamlPackages_4_02.camlp5_transitional;
};
coq_8_5 = callPackage ../applications/science/logic/coq {
version = "8.5pl3";
};
coq_8_6 = callPackage ../applications/science/logic/coq {};
coq_HEAD = callPackage ../applications/science/logic/coq/HEAD.nix {};
coq = coq_8_6;

mkCoqPackages_8_4 = self: let callPackage = newScope self; in {
inherit callPackage;
coq = coq_8_4;
coq = callPackage ../applications/science/logic/coq/8.4.nix {
inherit (ocamlPackages_4_02) ocaml findlib lablgtk;
camlp5 = ocamlPackages_4_02.camlp5_transitional;
};
coqPackages = coqPackages_8_4;

contribs =
@@ -17745,7 +17738,9 @@ with pkgs;

mkCoqPackages_8_5 = self: let callPackage = newScope self; in rec {
inherit callPackage;
coq = coq_8_5;
coq = callPackage ../applications/science/logic/coq {
version = "8.5pl3";
};
coqPackages = coqPackages_8_5;

coq-ext-lib = callPackage ../development/coq-modules/coq-ext-lib {};
@@ -17762,7 +17757,7 @@ with pkgs;

mkCoqPackages_8_6 = self: let callPackage = newScope self; in rec {
inherit callPackage;
coq = coq_8_6;
coq = callPackage ../applications/science/logic/coq {};
coqPackages = coqPackages_8_6;

coq-ext-lib = callPackage ../development/coq-modules/coq-ext-lib {};
@@ -17779,7 +17774,13 @@ with pkgs;
coqPackages_8_4 = mkCoqPackages_8_4 coqPackages_8_4;
coqPackages_8_5 = mkCoqPackages_8_5 coqPackages_8_5;
coqPackages_8_6 = mkCoqPackages_8_6 coqPackages_8_6;
coqPackages = coqPackages_8_4;
coqPackages = coqPackages_8_6;

coq_8_4 = coqPackages_8_4.coq;
coq_8_5 = coqPackages_8_5.coq;
coq_8_6 = coqPackages_8_6.coq;
coq_HEAD = callPackage ../applications/science/logic/coq/HEAD.nix {};
coq = coqPackages.coq;

cryptoverif = callPackage ../applications/science/logic/cryptoverif { };