treewide: remove redundant quotes
This commit is contained in:
@@ -26,7 +26,7 @@ let params =
|
||||
sha256 = "1c34v1k37rk7v0xk2czv5n79mbjxjrm6nh3llg2mpfmdsqi68wf3";
|
||||
};
|
||||
};
|
||||
param = params."${coq.coq-version}";
|
||||
param = params.${coq.coq-version};
|
||||
in
|
||||
|
||||
let recent = stdenv.lib.versionAtLeast coq.coq-version "8.8"; in
|
||||
|
||||
@@ -20,7 +20,7 @@ let params =
|
||||
sha256 = "0l9885nxy0n955fj1gnijlxl55lyxiv9yjfmz8hmfrn9hl8vv1m2";
|
||||
};
|
||||
};
|
||||
param = params."${coq.coq-version}";
|
||||
param = params.${coq.coq-version};
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
@@ -22,7 +22,7 @@ let params = {
|
||||
sha256 = "1slw227idwjw9a21vj3s6kal22mrmvvlpg8r7xk590ml99bn6404";
|
||||
};
|
||||
};
|
||||
param = params."${coq.coq-version}";
|
||||
param = params.${coq.coq-version};
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
@@ -19,7 +19,7 @@ let
|
||||
"8.8" = v20190414;
|
||||
"8.9" = v20190414;
|
||||
};
|
||||
param = params."${coq.coq-version}";
|
||||
param = params.${coq.coq-version};
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
@@ -34,7 +34,7 @@ let mkContrib = repo: revs: param:
|
||||
rev = "86ac28259030649ef51460e4de2441c8a1017751";
|
||||
sha256 = "09bbk2a7pn0j76mmapl583f8a20zqd3a1m9lkml8rpwml692bzi9";
|
||||
};
|
||||
}."${coq.coq-version}";
|
||||
}.${coq.coq-version};
|
||||
|
||||
abp = mkContrib "abp" [ "8.5" "8.6" "8.7" ] {
|
||||
version = "v8.6.0";
|
||||
@@ -219,7 +219,7 @@ let mkContrib = repo: revs: param:
|
||||
rev = "aa33052c1edfc5a65885942a67c2773b5d96f8cc";
|
||||
sha256 = "0mjgfdr9bzsch0dlk4vq1frkaig14dqh46r54cv0l15flxapg0iw";
|
||||
};
|
||||
}."${coq.coq-version}";
|
||||
}.${coq.coq-version};
|
||||
|
||||
continuations = mkContrib "continuations" [ ] {
|
||||
version = "v8.5.0-13-g6885310";
|
||||
|
||||
@@ -7,7 +7,7 @@ let params = {
|
||||
sha256 = "188avk9irwjsbs5ya4ka01mpk3vw4397kv2rmsncqrrrsa1pdddk";
|
||||
};
|
||||
};
|
||||
param = params."${coq.coq-version}";
|
||||
param = params.${coq.coq-version};
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
@@ -8,7 +8,7 @@ let params =
|
||||
"8.8" = { version = "0.9.8"; sha256 = "0z1ix855kdjl7zw5ca664h5njd1x8mmvf5wi37fck4dj9dgamwlz"; };
|
||||
"8.9" = { version = "0.10.1"; sha256 = "0r1vspad8fb8bry3zliiz4hfj4w1iib1l2gm115a94m6zbiksd95"; };
|
||||
};
|
||||
param = params."${coq.coq-version}";
|
||||
param = params.${coq.coq-version};
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
@@ -26,7 +26,7 @@ let params =
|
||||
sha256 = "09dq1vvshhlhgjccrhqgbhnq2hrys15xryfszqq11rzpgvl2zgdv";
|
||||
};
|
||||
};
|
||||
param = params."${coq.coq-version}";
|
||||
param = params.${coq.coq-version};
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
@@ -9,7 +9,7 @@ let
|
||||
sha256 = "0hmqwsry8ldg4g4hhwg4b84dgzibpdrg1wwsajhlyqfx3fb3n3b5";
|
||||
};
|
||||
};
|
||||
param = params."${coq.coq-version}";
|
||||
param = params.${coq.coq-version};
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
@@ -15,7 +15,7 @@ let params =
|
||||
"8.9" = v_8_8;
|
||||
"8.10" = v_8_8;
|
||||
};
|
||||
param = params."${coq.coq-version}"
|
||||
param = params.${coq.coq-version}
|
||||
; in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
@@ -22,7 +22,7 @@ let params = {
|
||||
sha256 = "0qvar8gfbrcs9fmvkph5asqz4l5fi63caykx3bsn8zf0xllkwv0n";
|
||||
};
|
||||
};
|
||||
param = params."${coq.coq-version}";
|
||||
param = params.${coq.coq-version};
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
|
||||
@@ -32,7 +32,7 @@ let
|
||||
sha256 = "1v5kx0xzxzsbs5r4w08rm1lrmjjggnd3ap0sd1my88ds17jzyasd";
|
||||
};
|
||||
};
|
||||
param = params."${coq.coq-version}";
|
||||
param = params.${coq.coq-version};
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
@@ -17,7 +17,7 @@ let params = {
|
||||
sha256 = "0xby1kb26r9gcvk5511wqj05fqm9paynwfxlfqkmwkgnfmzk0x73";
|
||||
};
|
||||
};
|
||||
param = params."${coq.coq-version}";
|
||||
param = params.${coq.coq-version};
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
@@ -30,7 +30,7 @@ let
|
||||
# COMPUTED using the configuration above (edit with caution) #
|
||||
##############################################################
|
||||
default-mathcomp-version = let v = head (
|
||||
filter (mc: mathcomp-coq-versions."${mc}" coq.coq-version)
|
||||
filter (mc: mathcomp-coq-versions.${mc} coq.coq-version)
|
||||
mathcomp-version-preference ++ ["0.0.0"]);
|
||||
in if v == "0.0.0" then max-mathcomp-version else v;
|
||||
|
||||
@@ -126,9 +126,9 @@ let
|
||||
};
|
||||
};
|
||||
in
|
||||
{"${mathcomp-pkg}" = stdenv.mkDerivation (attrs // overrides attrs);};
|
||||
{${mathcomp-pkg} = stdenv.mkDerivation (attrs // overrides attrs);};
|
||||
|
||||
getAttrOr = a: n: a."${n}" or (throw a.error);
|
||||
getAttrOr = a: n: a.${n} or (throw a.error);
|
||||
|
||||
mathcompCorePkgs_1_7 = mathcompGen "1.7.0";
|
||||
mathcompCorePkgs_1_8 = mathcompGen "1.8.0";
|
||||
|
||||
@@ -139,7 +139,7 @@ packageGen = {
|
||||
else compatibleCoqVersions;
|
||||
mc-core-deps = if builtins.isNull core-deps then [ssreflect] else core-deps;
|
||||
in
|
||||
{ "${package}" = let from = src; in
|
||||
{ ${package} = let from = src; in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
inherit version;
|
||||
@@ -149,7 +149,7 @@ packageGen = {
|
||||
owner = owner;
|
||||
repo = package;
|
||||
rev = version;
|
||||
sha256 = version-sha256."${version}";
|
||||
sha256 = version-sha256.${version};
|
||||
} else from;
|
||||
|
||||
propagatedBuildInputs = [ coq ] ++ mc-core-deps ++ extra-deps;
|
||||
@@ -173,7 +173,7 @@ packageGen = {
|
||||
};
|
||||
};
|
||||
|
||||
current-versions = versions."${current-ssreflect.version}" or {};
|
||||
current-versions = versions.${current-ssreflect.version} or {};
|
||||
|
||||
select = x: mapAttrs (n: pkg: {package = n;} // pkg) (recursiveUpdate param x);
|
||||
|
||||
@@ -181,14 +181,14 @@ for-version = v: suffix: (mapAttrs' (n: pkg:
|
||||
{name = "mathcomp_${suffix}-${n}";
|
||||
value = (packageGen ({
|
||||
ssreflect = coqPackages."mathcomp-ssreflect_${suffix}";
|
||||
} // pkg))."${n}";})
|
||||
(select versions."${v}"));
|
||||
} // pkg)).${n};})
|
||||
(select versions.${v}));
|
||||
|
||||
all = (for-version "1.7.0" "1_7") //
|
||||
(for-version "1.8.0" "1_8") //
|
||||
(for-version "1.9.0" "1_9") //
|
||||
(recurseIntoAttrs (mapDerivationAttrset dontDistribute (
|
||||
mapAttrs' (n: pkg: {name = "mathcomp-${n}"; value = (packageGen pkg)."${n}";})
|
||||
mapAttrs' (n: pkg: {name = "mathcomp-${n}"; value = (packageGen pkg).${n};})
|
||||
(select current-versions))));
|
||||
in
|
||||
{
|
||||
|
||||
@@ -15,7 +15,7 @@ let params =
|
||||
sha256 = "002xabhjlph394vydw3dx8ipv5ry2nq3py4440bk9a18ljx0w6ll";
|
||||
};
|
||||
};
|
||||
param = params."${coq.coq-version}";
|
||||
param = params.${coq.coq-version};
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
Reference in New Issue
Block a user