summaryrefslogtreecommitdiffstats
path: root/pkgs/development
diff options
context:
space:
mode:
authorMichael Weiss <dev.primeos@gmail.com>2021-01-09 12:11:44 +0100
committerMichael Weiss <dev.primeos@gmail.com>2021-01-09 12:16:11 +0100
commit8ae8602bf7529fddeab29867329c21af96600a68 (patch)
tree6d2a2df12ee53fd7e9d94188654c3aad89cfabad /pkgs/development
parente251591528ebecb21626f098e6ce62562568489d (diff)
parent9ffd16b3850536094ca36bc31520bb15a6d5a9ef (diff)
Merge branch 'master' into staging-next
Manually resolved a conflict in pkgs/development/libraries/libbladeRF/default.nix.
Diffstat (limited to 'pkgs/development')
-rw-r--r--pkgs/development/compilers/rust/1_45.nix2
-rw-r--r--pkgs/development/compilers/rust/1_48.nix2
-rw-r--r--pkgs/development/coq-modules/Cheerios/default.nix35
-rw-r--r--pkgs/development/coq-modules/CoLoR/default.nix66
-rw-r--r--pkgs/development/coq-modules/HoTT/default.nix33
-rw-r--r--pkgs/development/coq-modules/InfSeqExt/default.nix38
-rw-r--r--pkgs/development/coq-modules/QuickChick/default.nix120
-rw-r--r--pkgs/development/coq-modules/StructTact/default.nix38
-rw-r--r--pkgs/development/coq-modules/VST/default.nix27
-rw-r--r--pkgs/development/coq-modules/Velisarios/default.nix49
-rw-r--r--pkgs/development/coq-modules/Verdi/default.nix48
-rw-r--r--pkgs/development/coq-modules/autosubst/default.nix33
-rw-r--r--pkgs/development/coq-modules/bignums/default.nix87
-rw-r--r--pkgs/development/coq-modules/category-theory/default.nix58
-rw-r--r--pkgs/development/coq-modules/contribs/default.nix48
-rw-r--r--pkgs/development/coq-modules/coq-bits/default.nix34
-rw-r--r--pkgs/development/coq-modules/coq-elpi/default.nix60
-rw-r--r--pkgs/development/coq-modules/coq-ext-lib/default.nix84
-rw-r--r--pkgs/development/coq-modules/coq-haskell/default.nix61
-rw-r--r--pkgs/development/coq-modules/coqeal/default.nix24
-rw-r--r--pkgs/development/coq-modules/coqhammer/default.nix81
-rw-r--r--pkgs/development/coq-modules/coqprime/default.nix77
-rw-r--r--pkgs/development/coq-modules/coquelicot/default.nix54
-rw-r--r--pkgs/development/coq-modules/corn/default.nix31
-rw-r--r--pkgs/development/coq-modules/dpdgraph/default.nix110
-rw-r--r--pkgs/development/coq-modules/equations/default.nix113
-rw-r--r--pkgs/development/coq-modules/fiat/HEAD.nix31
-rw-r--r--pkgs/development/coq-modules/flocq/default.nix65
-rw-r--r--pkgs/development/coq-modules/gappalib/default.nix38
-rw-r--r--pkgs/development/coq-modules/heq/default.nix35
-rw-r--r--pkgs/development/coq-modules/hierarchy-builder/default.nix49
-rw-r--r--pkgs/development/coq-modules/interval/default.nix79
-rw-r--r--pkgs/development/coq-modules/iris/default.nix36
-rw-r--r--pkgs/development/coq-modules/ltac2/default.nix69
-rw-r--r--pkgs/development/coq-modules/math-classes/default.nix29
-rw-r--r--pkgs/development/coq-modules/mathcomp-analysis/default.nix27
-rw-r--r--pkgs/development/coq-modules/mathcomp-bigenough/default.nix19
-rw-r--r--pkgs/development/coq-modules/mathcomp-finmap/default.nix36
-rw-r--r--pkgs/development/coq-modules/mathcomp-real-closed/default.nix33
-rw-r--r--pkgs/development/coq-modules/mathcomp/default.nix310
-rw-r--r--pkgs/development/coq-modules/mathcomp/extra.nix391
-rw-r--r--pkgs/development/coq-modules/metalib/default.nix33
-rw-r--r--pkgs/development/coq-modules/multinomials/default.nix34
-rw-r--r--pkgs/development/coq-modules/paco/default.nix60
-rw-r--r--pkgs/development/coq-modules/paramcoq/default.nix70
-rw-r--r--pkgs/development/coq-modules/simple-io/default.nix37
-rw-r--r--pkgs/development/coq-modules/stdpp/default.nix37
-rw-r--r--pkgs/development/coq-modules/tlc/default.nix46
-rw-r--r--pkgs/development/haskell-modules/configuration-common.nix5
-rw-r--r--pkgs/development/libraries/libbladeRF/default.nix11
-rw-r--r--pkgs/development/ocaml-modules/elpi/default.nix24
-rw-r--r--pkgs/development/python-modules/apprise/default.nix18
-rw-r--r--pkgs/development/python-modules/archinfo/default.nix32
-rw-r--r--pkgs/development/python-modules/minidump/default.nix25
54 files changed, 980 insertions, 2112 deletions
diff --git a/pkgs/development/compilers/rust/1_45.nix b/pkgs/development/compilers/rust/1_45.nix
index b4d887f2e964..25ecb1dc0010 100644
--- a/pkgs/development/compilers/rust/1_45.nix
+++ b/pkgs/development/compilers/rust/1_45.nix
@@ -33,7 +33,7 @@ import ./default.nix {
# building
bootstrapVersion = "1.44.1";
- # fetch hashes by running `print-hashes.sh 1.45.0`
+ # fetch hashes by running `print-hashes.sh ${bootstrapVersion}`
bootstrapHashes = {
i686-unknown-linux-gnu = "e69689b0a1b66599cf83e7dd54f839419007e44376195e93e301a3175da3d854";
x86_64-unknown-linux-gnu = "a41df89a461a580536aeb42755e43037556fba2e527dd13a1e1bb0749de28202";
diff --git a/pkgs/development/compilers/rust/1_48.nix b/pkgs/development/compilers/rust/1_48.nix
index 6b4b10f12d3e..fff02b9bf800 100644
--- a/pkgs/development/compilers/rust/1_48.nix
+++ b/pkgs/development/compilers/rust/1_48.nix
@@ -35,7 +35,7 @@ import ./default.nix {
# building
bootstrapVersion = "1.47.0";
- # fetch hashes by running `print-hashes.sh 1.45.2`
+ # fetch hashes by running `print-hashes.sh ${bootstrapVersion}`
bootstrapHashes = {
i686-unknown-linux-gnu = "84bf092130ea5216fc701871e633563fc1c01b6528f60cb0767e96cd8eec30bf";
x86_64-unknown-linux-gnu = "d0e11e1756a072e8e246b05d54593402813d047d12e44df281fbabda91035d96";
diff --git a/pkgs/development/coq-modules/Cheerios/default.nix b/pkgs/development/coq-modules/Cheerios/default.nix
index 3f9f3b1ac9cd..6c5216f0d018 100644
--- a/pkgs/development/coq-modules/Cheerios/default.nix
+++ b/pkgs/development/coq-modules/Cheerios/default.nix
@@ -1,32 +1,13 @@
-{ stdenv, fetchFromGitHub, coq, StructTact }:
+{ lib, mkCoqDerivation, coq, StructTact, version ? null }:
-let param =
- {
- version = "20200201";
- rev = "9c7f66e57b91f706d70afa8ed99d64ed98ab367d";
- sha256 = "1h55s6lk47bk0lv5ralh81z55h799jbl9mhizmqwqzy57y8wqgs1";
- };
-in
-
-stdenv.mkDerivation {
- name = "coq${coq.coq-version}-Cheerios-${param.version}";
-
- src = fetchFromGitHub {
- owner = "uwplse";
- repo = "cheerios";
- inherit (param) rev sha256;
- };
-
- buildInputs = [ coq ];
+with lib; mkCoqDerivation {
+ pname = "cheerios";
+ owner = "uwplse";
+ inherit version;
+ defaultVersion = if versions.isGe "8.6" coq.coq-version then "20200201" else null;
+ release."20200201".rev = "9c7f66e57b91f706d70afa8ed99d64ed98ab367d";
+ release."20200201".sha256 = "1h55s6lk47bk0lv5ralh81z55h799jbl9mhizmqwqzy57y8wqgs1";
propagatedBuildInputs = [ StructTact ];
- enableParallelBuilding = true;
-
preConfigure = "patchShebangs ./configure";
-
- installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ];
-
- passthru = {
- compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" "8.9" "8.10" "8.11" "8.12" ];
- };
}
diff --git a/pkgs/development/coq-modules/CoLoR/default.nix b/pkgs/development/coq-modules/CoLoR/default.nix
index 1d3e5a07b03d..4c5b6a4f6a9a 100644
--- a/pkgs/development/coq-modules/CoLoR/default.nix
+++ b/pkgs/development/coq-modules/CoLoR/default.nix
@@ -1,58 +1,28 @@
-{ stdenv, fetchFromGitHub, coq, bignums }:
+{ lib, mkCoqDerivation, coq, bignums, version ? null }:
-let
- coqVersions = {
- "8.6" = "1.4.0";
- "8.7" = "1.4.0";
- "8.8" = "1.6.0";
- "8.9" = "1.6.0";
- "8.10" = "1.7.0";
- "8.11" = "1.7.0";
- };
- params = {
- "1.4.0" = {
- version = "1.4.0";
- rev = "168c6b86c7d3f87ee51791f795a8828b1521589a";
- sha256 = "1d2whsgs3kcg5wgampd6yaqagcpmzhgb6a0hp6qn4lbimck5dfmm";
- };
- "1.6.0" = {
- version = "1.6.0";
- rev = "328aa06270584b578edc0d2925e773cced4f14c8";
- sha256 = "07sy9kw1qlynsqy251adgi8b3hghrc9xxl2rid6c82mxfsp329sd";
- };
- "1.7.0" = {
- version = "1.7.0";
- rev = "08b5481ed6ea1a5d2c4c068b62156f5be6d82b40";
- sha256 = "1w7fmcpf0691gcwq00lm788k4ijlwz3667zj40j5jjc8j8hj7cq3";
- };
- };
- param = params.${coqVersions.${coq.coq-version}};
-in
+with lib; mkCoqDerivation {
+ pname = "color";
+ owner = "fblanqui";
+ inherit version;
+ defaultVersion = with versions; switch coq.coq-version [
+ {case = range "8.10" "8.11"; out = "1.7.0"; }
+ {case = range "8.8" "8.9"; out = "1.6.0"; }
+ {case = range "8.6" "8.7"; out = "1.4.0"; }
+ ] null;
-stdenv.mkDerivation {
- name = "coq${coq.coq-version}-CoLoR-${param.version}";
-
- src = fetchFromGitHub {
- owner = "fblanqui";
- repo = "color";
- inherit (param) rev sha256;
- };
+ release."1.7.0".rev = "08b5481ed6ea1a5d2c4c068b62156f5be6d82b40";
+ release."1.7.0".sha256 = "1w7fmcpf0691gcwq00lm788k4ijlwz3667zj40j5jjc8j8hj7cq3";
+ release."1.6.0".rev = "328aa06270584b578edc0d2925e773cced4f14c8";
+ release."1.6.0".sha256 = "07sy9kw1qlynsqy251adgi8b3hghrc9xxl2rid6c82mxfsp329sd";
+ release."1.4.0".rev = "168c6b86c7d3f87ee51791f795a8828b1521589a";
+ release."1.4.0".sha256 = "1d2whsgs3kcg5wgampd6yaqagcpmzhgb6a0hp6qn4lbimck5dfmm";
- buildInputs = [ coq bignums ];
+ extraBuildInputs = [ bignums ];
enableParallelBuilding = false;
- installPhase = ''
- make -f Makefile.coq COQLIB=$out/lib/coq/${coq.coq-version}/ install
- '';
-
- meta = with stdenv.lib; {
+ meta = {
homepage = "http://color.inria.fr/";
description = "CoLoR is a library of formal mathematical definitions and proofs of theorems on rewriting theory and termination whose correctness has been mechanically checked by the Coq proof assistant.";
maintainers = with maintainers; [ jpas jwiegley ];
- platforms = coq.meta.platforms;
- };
-
- passthru = {
- compatibleCoqVersions = v: builtins.hasAttr v coqVersions;
};
}
diff --git a/pkgs/development/coq-modules/HoTT/default.nix b/pkgs/development/coq-modules/HoTT/default.nix
index 7b52838505e2..706943cf8d02 100644
--- a/pkgs/development/coq-modules/HoTT/default.nix
+++ b/pkgs/development/coq-modules/HoTT/default.nix
@@ -1,18 +1,14 @@
-{ stdenv, fetchFromGitHub, autoconf, automake, coq }:
+{ lib, mkCoqDerivation, autoconf, automake, coq, version ? null }:
-stdenv.mkDerivation rec {
- name = "coq${coq.coq-version}-HoTT-${version}";
- version = "20170921";
+with lib; mkCoqDerivation {
+ pname = "HoTT";
+ owner = "HoTT";
+ inherit version;
+ defaultVersion = if coq.coq-version == "8.6" then "20170921" else null;
+ release."20170921".rev = "e3557740a699167e6adb1a65855509d55a392fa1";
+ release."20170921".sha256 = "0zwfp8g62b50vmmbb2kmskj3v6w7qx1pbf43yw0hr7asdz2zbx5v";
- src = fetchFromGitHub {
- owner = "HoTT";
- repo = "HoTT";
- rev = "e3557740a699167e6adb1a65855509d55a392fa1";
- sha256 = "0zwfp8g62b50vmmbb2kmskj3v6w7qx1pbf43yw0hr7asdz2zbx5v";
- };
-
- buildInputs = [ autoconf automake coq ];
- enableParallelBuilding = true;
+ extraBuildInputs = [ autoconf automake ];
preConfigure = ''
patchShebangs ./autogen.sh
@@ -44,18 +40,9 @@ stdenv.mkDerivation rec {
rmdir $out/share
'';
- installFlags = [
- "COQBIN=${coq}/bin"
- ];
-
- meta = with stdenv.lib; {
+ meta = {
homepage = "http://homotopytypetheory.org/";
description = "Homotopy type theory";
maintainers = with maintainers; [ siddharthist ];
- platforms = coq.meta.platforms;
- };
-
- passthru = {
- compatibleCoqVersions = v: v == "8.6";
};
}
diff --git a/pkgs/development/coq-modules/InfSeqExt/default.nix b/pkgs/development/coq-modules/InfSeqExt/default.nix
index 387e41859039..8236705b58f2 100644
--- a/pkgs/development/coq-modules/InfSeqExt/default.nix
+++ b/pkgs/development/coq-modules/InfSeqExt/default.nix
@@ -1,31 +1,11 @@
-{ stdenv, fetchFromGitHub, coq }:
-
-let param =
- {
- version = "20200131";
- rev = "203d4c20211d6b17741f1fdca46dbc091f5e961a";
- sha256 = "0xylkdmb2dqnnqinf3pigz4mf4zmczcbpjnn59g5g76m7f2cqxl0";
- };
-in
-
-stdenv.mkDerivation {
- name = "coq${coq.coq-version}-InfSeqExt-${param.version}";
-
- src = fetchFromGitHub {
- owner = "DistributedComponents";
- repo = "InfSeqExt";
- inherit (param) rev sha256;
- };
-
- buildInputs = [ coq ];
-
- enableParallelBuilding = true;
-
+{ lib, mkCoqDerivation, coq, version ? null }:
+
+mkCoqDerivation {
+ pname = "InfSeqExt";
+ owner = "DistributedComponents";
+ inherit version;
+ defaultVersion = if lib.versions.isGe "8.5" coq.coq-version then "20200131" else null;
+ release."20200131".rev = "203d4c20211d6b17741f1fdca46dbc091f5e961a";
+ release."20200131".sha256 = "0xylkdmb2dqnnqinf3pigz4mf4zmczcbpjnn59g5g76m7f2cqxl0";
preConfigure = "patchShebangs ./configure";
-
- installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ];
-
- passthru = {
- compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" "8.9" "8.10" "8.11" "8.12" ];
- };
}
diff --git a/pkgs/development/coq-modules/QuickChick/default.nix b/pkgs/development/coq-modules/QuickChick/default.nix
index a167b7988dcd..32ef1ad633cf 100644
--- a/pkgs/development/coq-modules/QuickChick/default.nix
+++ b/pkgs/development/coq-modules/QuickChick/default.nix
@@ -1,96 +1,46 @@
-{ stdenv, fetchFromGitHub, coq, ssreflect, coq-ext-lib, simple-io }:
-
-let params =
- {
- "8.5" = {
- version = "20170512";
- rev = "31eb050ae5ce57ab402db9726fb7cd945a0b4d03";
- sha256 = "033ch10i5wmqyw8j6wnr0dlbnibgfpr1vr0c07q3yj6h23xkmqpg";
- };
-
- "8.6" = {
- version = "20171102";
- rev = "0fdb769e1dc87a278383b44a9f5102cc7ccbafcf";
- sha256 = "0fri4nih40vfb0fbr82dsi631ydkw48xszinq43lyinpknf54y17";
- };
-
- "8.8" = {
- version = "20190311";
- rev = "22af9e9a223d0038f05638654422e637e863b355";
- sha256 = "00rnr19lg6lg0haq1sy4ld38p7imzand6fc52fvfq27gblxkp2aq";
- };
-
- "8.9" = rec {
- version = "1.1.0";
- rev = "v${version}";
- sha256 = "1c34v1k37rk7v0xk2czv5n79mbjxjrm6nh3llg2mpfmdsqi68wf3";
- };
-
- "8.10" = rec {
- version = "1.2.1";
- rev = "v${version}";
- sha256 = "17vz88xjzxh3q7hs6hnndw61r3hdfawxp5awqpgfaxx4w6ni8z46";
- };
-
- "8.11" = rec {
- version = "1.3.2";
- rev = "v${version}";
- sha256 = "0lciwaqv288dh2f13xk2x0lrn6zyrkqy6g4yy927wwzag2gklfrs";
- };
-
- "8.12" = rec {
- version = "1.4.0";
- rev = "v${version}";
- sha256 = "068p48pm5yxjc3yv8qwzp25bp9kddvxj81l31mjkyx3sdrsw3kyc";
- };
- };
- param = params.${coq.coq-version};
-in
-
-let inherit (stdenv.lib) maintainers optional optionals versionAtLeast; in
-
-let recent = versionAtLeast coq.coq-version "8.8"; in
-
-stdenv.mkDerivation {
-
- name = "coq${coq.coq-version}-QuickChick-${param.version}";
-
- src = fetchFromGitHub {
- owner = "QuickChick";
- repo = "QuickChick";
- inherit (param) rev sha256;
- };
-
- preConfigure = stdenv.lib.optionalString recent
+{ lib, mkCoqDerivation, coq, ssreflect, coq-ext-lib, simple-io }:
+with lib;
+let recent = versions.isGe "8.7" coq.coq-version; in
+mkCoqDerivation {
+ pname = "QuickChick";
+ owner = "QuickChick";
+ defaultVersion = with versions; switch [ coq.coq-version ssreflect.version ] [
+ { cases = [ "8.12" pred.true ]; out = "1.4.0"; }
+ { cases = [ "8.11" pred.true ]; out = "1.3.2"; }
+ { cases = [ "8.10" pred.true ]; out = "1.2.1"; }
+ { cases = [ "8.9" pred.true ]; out = "1.1.0"; }
+ { cases = [ "8.8" pred.true ]; out = "20190311"; }
+ { cases = [ "8.7" isLe "1.8" ]; out = "1.0.0"; }
+ { cases = [ "8.6" pred.true ]; out = "20171102"; }
+ { cases = [ "8.5" pred.true ]; out = "20170512"; }
+ ] null;
+ release."1.4.0".sha256 = "068p48pm5yxjc3yv8qwzp25bp9kddvxj81l31mjkyx3sdrsw3kyc";
+ release."1.3.2".sha256 = "0lciwaqv288dh2f13xk2x0lrn6zyrkqy6g4yy927wwzag2gklfrs";
+ release."1.2.1".sha256 = "17vz88xjzxh3q7hs6hnndw61r3hdfawxp5awqpgfaxx4w6ni8z46";
+ release."1.1.0".sha256 = "1c34v1k37rk7v0xk2czv5n79mbjxjrm6nh3llg2mpfmdsqi68wf3";
+ release."1.0.0".sha256 = "1gqy9a4yavd0sa7kgysf9gf2lq4p8dmn4h89y8081f2j8zli0w5y";
+ release."20190311".rev = "22af9e9a223d0038f05638654422e637e863b355";
+ release."20190311".sha256 = "00rnr19lg6lg0haq1sy4ld38p7imzand6fc52fvfq27gblxkp2aq";
+ release."20171102".rev = "0fdb769e1dc87a278383b44a9f5102cc7ccbafcf";
+ release."20171102".sha256 = "0fri4nih40vfb0fbr82dsi631ydkw48xszinq43lyinpknf54y17";
+ release."20170512".rev = "31eb050ae5ce57ab402db9726fb7cd945a0b4d03";
+ release."20170512".sha256 = "033ch10i5wmqyw8j6wnr0dlbnibgfpr1vr0c07q3yj6h23xkmqpg";
+ releaseRev = v: "v${v}";
+
+ preConfigure = optionalString recent
"substituteInPlace Makefile --replace quickChickTool.byte quickChickTool.native";
- buildInputs = [ coq ]
- ++ (with coq.ocamlPackages; [ ocaml findlib ])
- ++ optionals (recent && !versionAtLeast coq.coq-version "8.10")
- (with coq.ocamlPackages; [ camlp5 ocamlbuild ])
- ++ optional recent coq.ocamlPackages.num
- ;
+ mlPlugin = true;
+ extraBuildInputs = optional recent coq.ocamlPackages.num;
propagatedBuildInputs = [ ssreflect ]
- ++ optionals recent [ coq-ext-lib simple-io ]
- ++ optional (versionAtLeast coq.coq-version "8.10")
- coq.ocamlPackages.ocamlbuild
- ;
+ ++ optionals recent [ coq-ext-lib simple-io ]
+ ++ optional recent coq.ocamlPackages.ocamlbuild;
+ extraInstallFlags = [ "-f Makefile.coq" ];
enableParallelBuilding = false;
- installPhase = ''
- make -f Makefile.coq COQLIB=$out/lib/coq/${coq.coq-version}/ install
- '';
-
meta = {
- homepage = "https://github.com/QuickChick/QuickChick";
description = "Randomized property-based testing plugin for Coq; a clone of Haskell QuickCheck";
maintainers = with maintainers; [ jwiegley ];
- platforms = coq.meta.platforms;
- };
-
- passthru = {
- compatibleCoqVersions = v: builtins.hasAttr v params;
};
-
}
diff --git a/pkgs/development/coq-modules/StructTact/default.nix b/pkgs/development/coq-modules/StructTact/default.nix
index 798aaabe6773..9770b9fb9c45 100644
--- a/pkgs/development/coq-modules/StructTact/default.nix
+++ b/pkgs/development/coq-modules/StructTact/default.nix
@@ -1,31 +1,11 @@
-{ stdenv, fetchFromGitHub, coq }:
-
-let param =
- {
- version = "20181102";
- rev = "82a85b7ec07e71fa6b30cfc05f6a7bfb09ef2510";
- sha256 = "08zry20flgj7qq37xk32kzmg4fg6d4wi9m7pf9aph8fd3j2a0b5v";
- };
-in
-
-stdenv.mkDerivation {
- name = "coq${coq.coq-version}-StructTact-${param.version}";
-
- src = fetchFromGitHub {
- owner = "uwplse";
- repo = "StructTact";
- inherit (param) rev sha256;
- };
-
- buildInputs = [ coq ];
-
- enableParallelBuilding = true;
-
+{ lib, mkCoqDerivation, coq, version ? null }:
+
+with lib; mkCoqDerivation {
+ pname = "StructTact";
+ owner = "uwplse";
+ inherit version;
+ defaultVersion = if versions.isGe "8.5" coq.coq-version then "20181102" else null;
+ release."20181102".rev = "82a85b7ec07e71fa6b30cfc05f6a7bfb09ef2510";
+ release."20181102".sha256 = "08zry20flgj7qq37xk32kzmg4fg6d4wi9m7pf9aph8fd3j2a0b5v";
preConfigure = "patchShebangs ./configure";
-
- installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ];
-
- passthru = {
- compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.5";
- };
}
diff --git a/pkgs/development/coq-modules/VST/default.nix b/pkgs/development/coq-modules/VST/default.nix
index a625aa54c148..af560ec49a0b 100644
--- a/pkgs/development/coq-modules/VST/default.nix
+++ b/pkgs/development/coq-modules/VST/default.nix
@@ -1,17 +1,15 @@
-{ stdenv, fetchFromGitHub, coq, compcert }:
+{ lib, mkCoqDerivation, coq, compcert, version ? null }:
-stdenv.mkDerivation rec {
+with lib; mkCoqDerivation {
pname = "coq${coq.coq-version}-VST";
- version = "2.6";
-
- src = fetchFromGitHub {
- owner = "PrincetonUniversity";
- repo = "VST";
- rev = "v${version}";
- sha256 = "00bf9hl4pvmsqa08lzjs1mrxyfgfxq4k6778pnldmc8ichm90jgk";
- };
-
- buildInputs = [ coq ];
+ namePrefix = [];
+ displayVersion = { coq = false; };
+ owner = "PrincetonUniversity";
+ repo = "VST";
+ inherit version;
+ defaultVersion = if coq.coq-version == "8.11" then "2.6" else null;
+ release."2.6".sha256 = "00bf9hl4pvmsqa08lzjs1mrxyfgfxq4k6778pnldmc8ichm90jgk";
+ releaseRev = v: "v${v}";
propagatedBuildInputs = [ compcert ];
preConfigure = "patchShebangs util";
@@ -30,14 +28,9 @@ stdenv.mkDerivation rec {
done
'';
- enableParallelBuilding = true;
-
- passthru.compatibleCoqVersions = stdenv.lib.flip builtins.elem [ "8.11" ];
-
meta = {
description = "Verified Software Toolchain";
homepage = "https://vst.cs.princeton.edu/";
inherit (compcert.meta) platforms;
};
-
}
diff --git a/pkgs/development/coq-modules/Velisarios/default.nix b/pkgs/development/coq-modules/Velisarios/default.nix
index 92c9b2569ca4..08322fb7fc40 100644
--- a/pkgs/development/coq-modules/Velisarios/default.nix
+++ b/pkgs/development/coq-modules/Velisarios/default.nix
@@ -1,41 +1,14 @@
-{ stdenv, fetchFromGitHub, coq }:
+{ lib, mkCoqDerivation, coq, version ? null }:
-let params =
- {
- "8.6" = {
- version = "20180221";
- rev = "e1eee1f10d5d46331a560bd8565ac101229d0d6b";
- sha256 = "0l9885nxy0n955fj1gnijlxl55lyxiv9yjfmz8hmfrn9hl8vv1m2";
- };
+with lib; mkCoqDerivation {
+ pname = "Velisarios";
+ owner = "vrahli";
+ inherit version;
+ defaultVersion = if versions.range "8.6" "8.8" coq.coq-version then "20180221" else null;
- "8.7" = {
- version = "20180221";
- rev = "e1eee1f10d5d46331a560bd8565ac101229d0d6b";
- sha256 = "0l9885nxy0n955fj1gnijlxl55lyxiv9yjfmz8hmfrn9hl8vv1m2";
- };
-
- "8.8" = {
- version = "20180221";
- rev = "e1eee1f10d5d46331a560bd8565ac101229d0d6b";
- sha256 = "0l9885nxy0n955fj1gnijlxl55lyxiv9yjfmz8hmfrn9hl8vv1m2";
- };
- };
- param = params.${coq.coq-version};
-in
-
-stdenv.mkDerivation {
- name = "coq${coq.coq-version}-Velisarios-${param.version}";
-
- src = fetchFromGitHub {
- owner = "vrahli";
- repo = "Velisarios";
- inherit (param) rev sha256;
- };
-
- buildInputs = [
- coq coq.ocaml coq.camlp5 coq.findlib
- ];
- enableParallelBuilding = true;
+ release."20180221".rev = "e1eee1f10d5d46331a560bd8565ac101229d0d6b";
+ release."20180221".sha256 = "0l9885nxy0n955fj1gnijlxl55lyxiv9yjfmz8hmfrn9hl8vv1m2";