treewide: remove redundant quotes

This commit is contained in:
volth
2019-08-13 21:52:01 +00:00
parent fe9c9f719d
commit 35d68ef143
293 changed files with 860 additions and 860 deletions

View File

@@ -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";

View File

@@ -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
{