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

Commits on Apr 23, 2019

  1. coqPackages.mathcomp: 1.7.0 -> 1.8.0 

    coqPackages.mathcomp-finmap: 1.1.0 -> 1.2.0
coqPackages.mathcomp-analysis: 0.1.0 -> 0.2.0
    @vbgl
    vbgl committed Apr 23, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    WilliButz
    GPG key ID: 92582A10F1179CB2
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f09a138 View commit details
4 changes: 2 additions & 2 deletions pkgs/development/coq-modules/mathcomp-analysis/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, coq, mathcomp-bigenough, mathcomp-finmap }:

stdenv.mkDerivation rec {
version = "0.1.0";
version = "0.2.0";
name = "coq${coq.coq-version}-mathcomp-analysis-${version}";

src = fetchFromGitHub {
owner = "math-comp";
repo = "analysis";
rev = version;
sha256 = "0hwkr2wzy710pcyh274fcarzdx8sv8myp16pv0vq5978nmih46al";
sha256 = "1186xjxgns4ns1szyi931964bjm0mp126qzlv10mkqqgfw07nhrd";
};

buildInputs = [ coq ];
15 changes: 13 additions & 2 deletions pkgs/development/coq-modules/mathcomp-finmap/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,25 @@
{ stdenv, fetchFromGitHub, coq, mathcomp }:

let param =
if stdenv.lib.versionAtLeast mathcomp.version "1.8.0"
then {
version = "1.2.0";
sha256 = "0b6wrdr0d7rcnv86s37zm80540jl2wmiyf39ih7mw3dlwli2cyj4";
} else {
version = "1.1.0";
sha256 = "05df59v3na8jhpsfp7hq3niam6asgcaipg2wngnzxzqnl86srp2a";
}
; in

stdenv.mkDerivation rec {
version = "1.1.0";
inherit (param) version;
name = "coq${coq.coq-version}-mathcomp-finmap-${version}";

src = fetchFromGitHub {
owner = "math-comp";
repo = "finmap";
rev = version;
sha256 = "05df59v3na8jhpsfp7hq3niam6asgcaipg2wngnzxzqnl86srp2a";
inherit (param) sha256;
};

buildInputs = [ coq ];
7 changes: 6 additions & 1 deletion pkgs/development/coq-modules/mathcomp/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,12 @@

let param =

if stdenv.lib.versionAtLeast coq.coq-version "8.6" then
if stdenv.lib.versionAtLeast coq.coq-version "8.7" then
{
version = "1.8.0";
sha256 = "07l40is389ih8bi525gpqs3qp4yb2kl11r9c8ynk1ifpjzpnabwp";
}
else if stdenv.lib.versionAtLeast coq.coq-version "8.6" then
{
version = "1.7.0";
sha256 = "0wnhj9nqpx2bw6n1l4i8jgrw3pjajvckvj3lr4vzjb3my2lbxdd1";