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: 639ca92236ed
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9db9719ea2bf
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Oct 25, 2019

  1. coq_8_10: 8.10.0 → 8.10.1

    @vbgl
    vbgl committed Oct 25, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    vbgl Vincent Laporte
    GPG key ID: EBD582ADDDB1F81F
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a8892b0 View commit details

  2. Merge pull request #71971 from vbgl/coq-8.10.1 

    coq_8_10: 8.10.0 → 8.10.1
    @globin
    globin authored Oct 25, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9db9719 View commit details
Showing with 2 additions and 1 deletion.
  1. +1 −0 pkgs/applications/science/logic/coq/default.nix
  2. +1 −1 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
@@ -30,6 +30,7 @@ let
"8.9.0" = "1dkgdjc4n1m15m1p724hhi5cyxpqbjw6rxc5na6fl3v4qjjfnizh";
"8.9.1" = "1xrq6mkhpq994bncmnijf8jwmwn961kkpl4mwwlv7j3dgnysrcv2";
"8.10.0" = "138jw94wp4mg5dgjc2asn8ng09ayz1mxdznq342n0m469j803gzg";
"8.10.1" = "072v2zkjzf7gj48137wpr3c9j0hg9pdhlr5l8jrgrwynld8fp7i4";
}.${version};
coq-version = stdenv.lib.versions.majorMinor version;
versionAtLeast = stdenv.lib.versionAtLeast 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
@@ -128,7 +128,7 @@ in rec {
version = "8.9.1";
};
coq_8_10 = callPackage ../applications/science/logic/coq {
version = "8.10.0";
version = "8.10.1";
};

coqPackages_8_5 = mkCoqPackages coq_8_5;