Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump to NixOS 24.05 #219

Merged
merged 2 commits into from
Jun 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
};

outputs = { self, nixpkgs, ... }@inputs:
Expand Down
7 changes: 3 additions & 4 deletions pkgs/samples/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
, dpkg
, pkg-config
, autoAddOpenGLRunpathHook
, freeimage
, cmake
, opencv
, opencv2
Expand Down Expand Up @@ -86,7 +85,7 @@ let
sourceRoot = "source/usr/src/cudnn_samples_v8";

nativeBuildInputs = [ dpkg autoAddOpenGLRunpathHook ];
buildInputs = with cudaPackages; [ cudatoolkit cudnn freeimage ];
buildInputs = with cudaPackages; [ cudatoolkit cudnn ];

buildFlags = [
"CUDA_PATH=${cudaPackages.cudatoolkit}"
Expand All @@ -96,10 +95,11 @@ let

enableParallelBuilding = true;

# Disabled mnistCUDNN since it requires freeimage which is marked vulnerable in upstream as of 24.05
buildPhase = ''
runHook preBuild

for dirname in conv_sample mnistCUDNN multiHeadAttention RNN_v8.0; do
for dirname in conv_sample multiHeadAttention RNN_v8.0; do
pushd "$dirname"
make $buildFlags
popd 2>/dev/null
Expand All @@ -113,7 +113,6 @@ let

install -Dm755 -t $out/bin \
conv_sample/conv_sample \
mnistCUDNN/mnistCUDNN \
multiHeadAttention/multiHeadAttention \
RNN_v8.0/RNN

Expand Down
Loading