erwin/nixos-config
1
0
Fork 0
Code Issues 1 Pull requests Projects 1 Releases Wiki Activity Actions

Compare commits

base: erwin:83c0196bf3007e111f920764caa2ae4ef8773916
Branches Tags
erwin:main
..
compare: erwin:871bef56c4b82f23599b1971e53f15081b4d7d80
Branches Tags
erwin:main

No commits in common. "83c0196bf3007e111f920764caa2ae4ef8773916" and "871bef56c4b82f23599b1971e53f15081b4d7d80" have entirely different histories.
83c0196bf3 ... 871bef56c4

4 changed files with 5 additions and 15 deletions
Show stats Expand all files Collapse all files

1
machines/mimir/configuration.nix
View file

@ -480,7 +480,6 @@
systemPackages = with pkgs; [ systemPackages = with pkgs; [
appimage-run appimage-run
iwgtk iwgtk
peakperf
]; ];
sessionVariables = { sessionVariables = {

3
overlays/default.nix
View file

@ -20,7 +20,4 @@ _final: prev: {
git-repo-go = prev.pkgs.callPackage ../pkgs/git-repo-go { }; git-repo-go = prev.pkgs.callPackage ../pkgs/git-repo-go { };
peakperf = prev.pkgs.callPackage ../pkgs/peakperf {
enableCuda = false; # peakperf needs cuda-samples, which is not available in current CUDA. CUDA 11 is broken due to CVEs in freeimage
};
} }

14
pkgs/peakperf/default.nix
View file

@ -24,18 +24,12 @@ effectiveStdenv.mkDerivation (finalAttrs: {
buildInputs = buildInputs =
[ ] [ ]
++ lib.optionals enableCuda [ ++ lib.optionals enableCuda [
cudaPackages.cuda_cudart cudaPackages.cudart
cudaPackages.cudatoolkit
cudaPackages.cuda-samples
]; ];
nativeBuildInputs = nativeBuildInputs = [
[ cmake
cmake ];
]
++ lib.optionals enableCuda [
cudaPackages.cuda_nvcc
];
meta = { meta = {
description = "Achieve peak performance on x86 CPUs and NVIDIA GPUs"; description = "Achieve peak performance on x86 CPUs and NVIDIA GPUs";

2
users/erwin/work.nix
View file

@ -233,7 +233,7 @@ in
doggo doggo
easyeffects easyeffects
fd fd
ffmpeg-full (ffmpeg-full.override { withFrei0r = false; })
icemon icemon
imagemagick imagemagick
(imv.override { (imv.override {