Skip to content

Commit

Permalink
coqPackages.mathcomp-analysis: rename altreals to experimental-reals
Browse files Browse the repository at this point in the history
  • Loading branch information
proux01 committed Nov 4, 2024
1 parent 132c62a commit cfdff84
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
7 changes: 4 additions & 3 deletions pkgs/development/coq-modules/mathcomp-analysis/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -54,20 +54,21 @@ let
packages = {
"classical" = [];
"reals" = [ "classical" ];
"altreals" = [ "reals" ];
"experimental-reals" = [ "reals" ];
"analysis" = [ "reals" ];
"reals-stdlib" = [ "reals" ];
"analysis-stdlib" = [ "analysis" "reals-stdlib" ];
};

mathcomp_ = package: let
classical-deps = [ mathcomp.algebra mathcomp-finmap ];
altreals-deps = [ mathcomp-bigenough ];
experimental-reals-deps = [ mathcomp-bigenough ];
analysis-deps = [ mathcomp.field mathcomp-bigenough ];
intra-deps = lib.optionals (package != "single") (map mathcomp_ packages.${package});
pkgpath = lib.switch package [
{ case = "single"; out = "."; }
{ case = "analysis"; out = "theories"; }
{ case = "experimental-reals"; out = "experimental_reals"; }
{ case = "reals-stdlib"; out = "reals_stdlib"; }
{ case = "analysis-stdlib"; out = "analysis_stdlib"; }
] package;
Expand All @@ -81,7 +82,7 @@ let
propagatedBuildInputs =
intra-deps
++ lib.optionals (lib.elem package [ "classical" "single" ]) classical-deps
++ lib.optionals (lib.elem package [ "altreals" "single" ]) altreals-deps
++ lib.optionals (lib.elem package [ "experimental-reals" "single" ]) experimental-reals-deps
++ lib.optionals (lib.elem package [ "analysis" "single" ]) analysis-deps;

preBuild = ''
Expand Down
2 changes: 1 addition & 1 deletion pkgs/top-level/coq-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -99,12 +99,12 @@ let
mathcomp-character = self.mathcomp.character;
mathcomp-abel = callPackage ../development/coq-modules/mathcomp-abel {};
mathcomp-algebra-tactics = callPackage ../development/coq-modules/mathcomp-algebra-tactics {};
mathcomp-altreals = self.mathcomp-analysis.altreals;
mathcomp-analysis = callPackage ../development/coq-modules/mathcomp-analysis {};
mathcomp-analysis-stdlib = self.mathcomp-analysis.analysis-stdlib;
mathcomp-apery = callPackage ../development/coq-modules/mathcomp-apery {};
mathcomp-bigenough = callPackage ../development/coq-modules/mathcomp-bigenough {};
mathcomp-classical = self.mathcomp-analysis.classical;
mathcomp-experimental-reals = self.mathcomp-analysis.experimental-reals;
mathcomp-finmap = callPackage ../development/coq-modules/mathcomp-finmap {};
mathcomp-infotheo = callPackage ../development/coq-modules/mathcomp-infotheo {};
mathcomp-real-closed = callPackage ../development/coq-modules/mathcomp-real-closed {};
Expand Down

0 comments on commit cfdff84

Please sign in to comment.