Skip to content

Commit 7bec3d3

Browse files
committed
tpm2: move pytss overlay override into package files
Signed-off-by: vadik likholetov <vadikas@gmail.com>
1 parent 426c3c1 commit 7bec3d3

File tree

3 files changed

+41
-26
lines changed

3 files changed

+41
-26
lines changed

packages/own-pkgs-overlay.nix

Lines changed: 10 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,6 @@
11
# SPDX-FileCopyrightText: 2022-2026 TII (SSRC) and the Ghaf contributors
22
# SPDX-License-Identifier: Apache-2.0
33
#
4-
let
5-
patchedPython3Packages =
6-
final: prev:
7-
prev.python3Packages
8-
// {
9-
tpm2-pytss = prev.python3Packages.tpm2-pytss.overrideAttrs (old: {
10-
patches = map (
11-
p:
12-
if final.lib.hasSuffix "cross.patch" (toString p) then
13-
final.replaceVars ./patches/tpm2-pytss-cross-cpp.patch {
14-
crossPrefix = final.stdenv.hostPlatform.config;
15-
}
16-
else
17-
p
18-
) (old.patches or [ ]);
19-
});
20-
};
21-
in
224
{
235
# keep-sorted start skip_lines=1
246
flake.overlays.own-pkgs-overlay = final: prev: {
@@ -40,14 +22,16 @@ in
4022
make-checks = final.callPackage ./pkgs-by-name/make-checks/package.nix { };
4123
memsocket = final.callPackage ./pkgs-by-name/memsocket/package.nix { };
4224
pci-binder = final.callPackage ./pkgs-by-name/pci-binder/package.nix { };
43-
python3Packages = patchedPython3Packages final prev;
44-
rtl8126 = final.callPackage ./pkgs-by-name/rtl8126/package.nix { };
45-
tpm-endorsement-certs = final.callPackage ./pkgs-by-name/tpm-endorsement-certs/package.nix { };
46-
update-docs-depends = final.callPackage ./pkgs-by-name/update-docs-depends/package.nix { };
47-
user-provision = final.callPackage ./pkgs-by-name/user-provision/package.nix { };
48-
vtpm-abrmd-forwarder = final.callPackage ./pkgs-by-name/vtpm-abrmd-forwarder/package.nix { };
49-
wait-for-unit = final.callPackage ./pkgs-by-name/wait-for-unit/package.nix { };
50-
windows-launcher = final.callPackage ./pkgs-by-name/windows-launcher/package.nix { };
25+
python3Packages = final.callPackage ./pkgs-by-name/tpm2-pytss/python3-packages.nix {
26+
inherit (prev) python3Packages;
27+
rtl8126 = final.callPackage ./pkgs-by-name/rtl8126/package.nix { };
28+
tpm-endorsement-certs = final.callPackage ./pkgs-by-name/tpm-endorsement-certs/package.nix { };
29+
update-docs-depends = final.callPackage ./pkgs-by-name/update-docs-depends/package.nix { };
30+
user-provision = final.callPackage ./pkgs-by-name/user-provision/package.nix { };
31+
vtpm-abrmd-forwarder = final.callPackage ./pkgs-by-name/vtpm-abrmd-forwarder/package.nix { };
32+
wait-for-unit = final.callPackage ./pkgs-by-name/wait-for-unit/package.nix { };
33+
windows-launcher = final.callPackage ./pkgs-by-name/windows-launcher/package.nix { };
34+
};
5135
};
5236
# keep-sorted end
5337
}
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# SPDX-FileCopyrightText: 2026 TII (SSRC) and the Ghaf contributors
2+
# SPDX-License-Identifier: Apache-2.0
3+
{
4+
lib,
5+
python3Packages,
6+
replaceVars,
7+
stdenv,
8+
}:
9+
python3Packages.tpm2-pytss.overrideAttrs (old: {
10+
patches = map (
11+
p:
12+
if lib.hasSuffix "cross.patch" (toString p) then
13+
replaceVars ../../patches/tpm2-pytss-cross-cpp.patch {
14+
crossPrefix = stdenv.hostPlatform.config;
15+
}
16+
else
17+
p
18+
) (old.patches or [ ]);
19+
})
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# SPDX-FileCopyrightText: 2026 TII (SSRC) and the Ghaf contributors
2+
# SPDX-License-Identifier: Apache-2.0
3+
{
4+
callPackage,
5+
python3Packages,
6+
}:
7+
python3Packages
8+
// {
9+
tpm2-pytss = callPackage ./package.nix {
10+
inherit python3Packages;
11+
};
12+
}

0 commit comments

Comments
 (0)