Compare commits
2 Commits
47acfb12ff
...
a7392b3c30
| Author | SHA1 | Date | |
|---|---|---|---|
| a7392b3c30 | |||
| e72154ab65 |
@@ -1,28 +0,0 @@
|
|||||||
{ ... }:
|
|
||||||
|
|
||||||
final: prev:
|
|
||||||
let
|
|
||||||
python313ForCeph =
|
|
||||||
let
|
|
||||||
base = final.python313;
|
|
||||||
in
|
|
||||||
base
|
|
||||||
// {
|
|
||||||
override = args:
|
|
||||||
base.override (args // {
|
|
||||||
packageOverrides = self: super:
|
|
||||||
(if args ? packageOverrides then args.packageOverrides self super else { })
|
|
||||||
// {
|
|
||||||
# Ceph still references cython_0 in nixpkgs; map it to modern cython on py3.13.
|
|
||||||
cython_0 = super.cython;
|
|
||||||
};
|
|
||||||
});
|
|
||||||
};
|
|
||||||
in {
|
|
||||||
# Work around nixos-unstable eval failure:
|
|
||||||
# sphinx-9.1.0 not supported for interpreter python3.11
|
|
||||||
# (seen through libvirtd -> qemu_full -> ceph Python dependency chain).
|
|
||||||
ceph = prev.ceph.override {
|
|
||||||
python311 = python313ForCeph;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -33,8 +33,6 @@ final: prev: {
|
|||||||
) old.mesonFlags) ++ [
|
) old.mesonFlags) ++ [
|
||||||
"-Dsysconfdir=${placeholder "out"}/etc"
|
"-Dsysconfdir=${placeholder "out"}/etc"
|
||||||
] ++ (if prev.stdenv.hostPlatform.is64bit then [ "-Dintel-rt=enabled" ] else [ "-Dintel-rt=disabled" ]);
|
] ++ (if prev.stdenv.hostPlatform.is64bit then [ "-Dintel-rt=enabled" ] else [ "-Dintel-rt=disabled" ]);
|
||||||
})).override {
|
}));
|
||||||
stdenv = prev.gcc14Stdenv;
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -171,9 +171,7 @@
|
|||||||
virtualisation.libvirtd = {
|
virtualisation.libvirtd = {
|
||||||
enable = true;
|
enable = true;
|
||||||
qemu = {
|
qemu = {
|
||||||
package = pkgs.qemu_full.override {
|
package = pkgs.qemu;
|
||||||
cephSupport = false;
|
|
||||||
};
|
|
||||||
runAsRoot = true;
|
runAsRoot = true;
|
||||||
swtpm.enable = true;
|
swtpm.enable = true;
|
||||||
vhostUserPackages = [ pkgs.virtiofsd ];
|
vhostUserPackages = [ pkgs.virtiofsd ];
|
||||||
|
|||||||
Reference in New Issue
Block a user