treewide: remove redundant rec
This commit is contained in:
@@ -8,7 +8,7 @@ let param =
|
||||
};
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation {
|
||||
name = "coq${coq.coq-version}-Cheerios-${param.version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
||||
@@ -8,7 +8,7 @@ let param =
|
||||
};
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation {
|
||||
name = "coq${coq.coq-version}-InfSeqExt-${param.version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
||||
@@ -14,7 +14,7 @@ let params =
|
||||
sha256 = "0fri4nih40vfb0fbr82dsi631ydkw48xszinq43lyinpknf54y17";
|
||||
};
|
||||
|
||||
"8.8" = rec {
|
||||
"8.8" = {
|
||||
version = "20190311";
|
||||
rev = "22af9e9a223d0038f05638654422e637e863b355";
|
||||
sha256 = "00rnr19lg6lg0haq1sy4ld38p7imzand6fc52fvfq27gblxkp2aq";
|
||||
@@ -31,7 +31,7 @@ in
|
||||
|
||||
let recent = stdenv.lib.versionAtLeast coq.coq-version "8.8"; in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation {
|
||||
|
||||
name = "coq${coq.coq-version}-QuickChick-${param.version}";
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ let param =
|
||||
};
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation {
|
||||
name = "coq${coq.coq-version}-StructTact-${param.version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
||||
@@ -23,7 +23,7 @@ let params =
|
||||
param = params.${coq.coq-version};
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation {
|
||||
name = "coq${coq.coq-version}-Velisarios-${param.version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
||||
@@ -13,7 +13,7 @@ let param =
|
||||
};
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation {
|
||||
name = "coq${coq.coq-version}-verdi-${param.version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
||||
@@ -25,7 +25,7 @@ let params = {
|
||||
param = params.${coq.coq-version};
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation {
|
||||
|
||||
name = "coq${coq.coq-version}-bignums";
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@ let
|
||||
param = params.${coq.coq-version};
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation {
|
||||
|
||||
name = "coq${coq.coq-version}-category-theory-${param.version}";
|
||||
|
||||
|
||||
@@ -29,7 +29,7 @@ let params =
|
||||
param = params.${coq.coq-version};
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation {
|
||||
|
||||
name = "coq${coq.coq-version}-coq-haskell-${param.version}";
|
||||
|
||||
|
||||
@@ -73,7 +73,7 @@ let
|
||||
custom-version = if is-released then mathcomp-version else "custom";
|
||||
|
||||
# the base set of attributes for mathcomp
|
||||
attrs = rec {
|
||||
attrs = {
|
||||
name = "coq${coq.coq-version}-${pkgname}-${custom-version}";
|
||||
|
||||
# used in ssreflect
|
||||
@@ -136,7 +136,7 @@ mathcompCorePkgs_1_9 = mathcompGen "1.9.0";
|
||||
mathcompCorePkgs = recurseIntoAttrs
|
||||
(mapDerivationAttrset dontDistribute (mathcompGen default-mathcomp-version));
|
||||
|
||||
in rec {
|
||||
in {
|
||||
# mathcompGenSingle: given a version of mathcomp
|
||||
# generates an attribute set {single = <drv>;} with the single mathcomp derivation
|
||||
inherit mathcompGenSingle;
|
||||
|
||||
Reference in New Issue
Block a user