lkjlkjdsalkj

This commit is contained in:
2025-12-09 11:40:25 +01:00
parent 2cbd7a452f
commit 170e1808c9
3 changed files with 22 additions and 15 deletions

View File

@@ -42,7 +42,7 @@
in [ "L+ /opt/rocm - - - - ${rocmEnv}" ];
nixpkgs.overlays = [
(prev: final: {
(final: prev: {
blender = prev.blender-hip;
})
];

View File

@@ -1,32 +1,32 @@
final: prev: # TODO: not prev: final: ?
prev: final:
let
inherit (final) lib;
inherit (prev) lib;
# TODO: get faketty to work, ${expect}/bin/unbuffer is bad
mkNomWrapper =
pkg:
final.writeScriptBin (pkg.meta.mainProgram or (lib.getName pkg)) ''
prev.writeScriptBin (pkg.meta.mainProgram or (lib.getName pkg)) ''
if test -t 1 && test -z "''${NIX_NO_NOM-}"; then
exec ${lib.getExe pkg} -L "$@" |& ${lib.getExe final.nix-output-monitor}
exec ${lib.getExe pkg} -L "$@" |& ${lib.getExe prev.nix-output-monitor}
else
exec ${lib.getExe pkg} -L "$@"
fi
'';
in
{
pbsds = lib.makeScope final.newScope (pbsds: {
nom-nixos-rebuild = mkNomWrapper final.nixos-rebuild;
nom-nixos-rebuild-ng = mkNomWrapper final.nixos-rebuild-ng;
nom-home-manager = mkNomWrapper final.home-manager;
nom-system-manager = mkNomWrapper final.system-manager;
pbsds = lib.makeScope prev.newScope (pbsds: {
nom-nixos-rebuild = mkNomWrapper prev.nixos-rebuild;
nom-nixos-rebuild-ng = mkNomWrapper prev.nixos-rebuild-ng;
nom-home-manager = mkNomWrapper prev.home-manager;
nom-system-manager = mkNomWrapper prev.system-manager;
# TODO: make these automatic, maybe use by-name?
v4l2-play = final.callPackage ./../pkgs/v4l2-play { };
device-mon = final.callPackage ./../pkgs/device-mon { };
zluda-run = final.callPackage ./../pkgs/zluda-run.nix { };
v4l2-play = prev.callPackage ./../pkgs/v4l2-play { };
device-mon = prev.callPackage ./../pkgs/device-mon { };
zluda-run = prev.callPackage ./../pkgs/zluda-run.nix { };
# TODO: move to separate flake, maintain with CI
#pdoc-docs = (final.callPackage ./../pkgs/pdocs.nix {}).pdocs;
#pdoc3-docs = (final.callPackage ./../pkgs/pdocs.nix {}).pdocs3;
#pdoc-docs = (prev.callPackage ./../pkgs/pdocs.nix {}).pdocs;
#pdoc3-docs = (prev.callPackage ./../pkgs/pdocs.nix {}).pdocs3;
});
}

View File

@@ -15,10 +15,17 @@
};
# pkgs/tools/package-management/lix/default.nix
# https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/package-management/lix/default.nix
nix-direnv = prev.nix-direnv.override {
nix = prev.lix;
};
nix-update = prev.nix-update.override {
nix = prev.lix;
inherit (prev) nixpkgs-review;
};
})
];
}