Skip to content

Commit d9de57e

Browse files
committed
Do not create dynamic packages
1 parent b1eb5bc commit d9de57e

File tree

1 file changed

+45
-34
lines changed

1 file changed

+45
-34
lines changed

flake.nix

Lines changed: 45 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -30,47 +30,58 @@
3030
builtins.fromJSON (builtins.readFile ./nix/openpfc/versions.json);
3131
openpfcVersion = openpfcVersions.current;
3232

33-
# Debugging: Print the versions being processed.
34-
# builtins.trace ("Processing versions: ")
35-
# + builtins.concatStringsSep ", " (builtins.attrNames openpfcVersions.versions);
33+
heffte = pkgs.callPackage hefftePath {
34+
version = heffteVersion;
35+
src = pkgs.fetchFromGitHub {
36+
owner = "icl-utk-edu";
37+
repo = "heffte";
38+
inherit (heffteVersions.versions.${heffteVersion}) rev sha256;
39+
};
40+
};
3641

37-
# versionedPackages: Dynamically generates OpenPFC packages for specific versions.
38-
versionedPackages = builtins.listToAttrs (map (version: {
39-
name = "openpfc-${version}";
40-
value = pkgs.callPackage ./nix/openpfc/default.nix {
41-
version = version;
42-
buildType = if version == "dev" then "Debug" else "Release";
43-
src = if version == "dev" then
44-
./.
45-
else if version == "master" then
46-
builtins.fetchGit {
47-
url = "https://github.com/VTT-ProperTune/OpenPFC.git";
48-
ref = "master";
49-
}
50-
else
51-
pkgs.fetchFromGitHub {
52-
owner = "VTT-ProperTune";
53-
repo = "OpenPFC";
54-
inherit (openpfcVersions.versions.${version}) rev sha256;
55-
};
42+
in {
43+
# Combine dynamically generated OpenPFC packages with their dependencies.
44+
packages = {
45+
# openpfc: Fetches the current version of OpenPFC.
46+
openpfc = pkgs.callPackage openpfcPath {
47+
version = openpfcVersion;
48+
buildType = "Release";
49+
src = pkgs.fetchFromGitHub {
50+
owner = "VTT-ProperTune";
51+
repo = "OpenPFC";
52+
inherit (openpfcVersions.versions.${openpfcVersion}) rev sha256;
53+
};
5654
enableTests = true;
55+
enableDocs = true;
5756
enableExamples = true;
5857
enableApps = true;
58+
heffte = heffte;
59+
};
60+
61+
# openpfc-dev: Uses the local source directory (./).
62+
openpfc-dev = pkgs.callPackage openpfcPath {
63+
version = "dev";
64+
buildType = "Debug";
65+
src = ./.;
66+
enableTests = true;
5967
enableDocs = true;
60-
heffte = pkgs.callPackage ./nix/heffte/default.nix {
61-
version = heffteVersion;
62-
src = pkgs.fetchFromGitHub {
63-
owner = "icl-utk-edu";
64-
repo = "heffte";
65-
inherit (heffteVersions.versions.${heffteVersion}) rev sha256;
66-
};
67-
};
68+
enableExamples = true;
69+
enableApps = true;
70+
heffte = heffte;
6871
};
69-
}) ([ "dev" "master" ] ++ builtins.attrNames openpfcVersions.versions));
7072

71-
in {
72-
# Combine dynamically generated OpenPFC packages with their dependencies.
73-
packages = versionedPackages;
73+
# openpfc-tests: Uses the local source directory (./).
74+
openpfc-tests = pkgs.callPackage openpfcPath {
75+
version = "dev";
76+
buildType = "Debug";
77+
src = ./.;
78+
enableTests = true;
79+
enableDocs = false;
80+
enableExamples = false;
81+
enableApps = false;
82+
heffte = heffte;
83+
};
84+
};
7485

7586
# Development shell configuration.
7687
devShells.default = pkgs.mkShell {

0 commit comments

Comments
 (0)