diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-04-28 14:39:00 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-06-10 08:52:36 +0000 |
commit | 693e64ef7421374338ddb1dc12b9573feec75972 (patch) | |
tree | 2526ac075d248699c35d63e04499890ee4381f5f /nixpkgs/pkgs/development/libraries/openimagedenoise | |
parent | 7014df2256694d97093d6f2bb1db340d346dea88 (diff) | |
parent | 8e4fe32876ca15e3d5eb3ecd3ca0b224417f5f17 (diff) | |
download | nixlib-693e64ef7421374338ddb1dc12b9573feec75972.tar nixlib-693e64ef7421374338ddb1dc12b9573feec75972.tar.gz nixlib-693e64ef7421374338ddb1dc12b9573feec75972.tar.bz2 nixlib-693e64ef7421374338ddb1dc12b9573feec75972.tar.lz nixlib-693e64ef7421374338ddb1dc12b9573feec75972.tar.xz nixlib-693e64ef7421374338ddb1dc12b9573feec75972.tar.zst nixlib-693e64ef7421374338ddb1dc12b9573feec75972.zip |
Merge commit '8e4fe32876ca15e3d5eb3ecd3ca0b224417f5f17'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/openimagedenoise')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/openimagedenoise/1_2_x.nix | 23 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/libraries/openimagedenoise/default.nix | 8 |
2 files changed, 27 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/development/libraries/openimagedenoise/1_2_x.nix b/nixpkgs/pkgs/development/libraries/openimagedenoise/1_2_x.nix new file mode 100644 index 000000000000..10f6abd79ef8 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/openimagedenoise/1_2_x.nix @@ -0,0 +1,23 @@ +{ lib, stdenv, fetchzip, cmake, tbb, python3, ispc }: + +stdenv.mkDerivation rec { + pname = "openimagedenoise"; + version = "1.2.2"; + + # The release tarballs include pretrained weights, which would otherwise need to be fetched with git-lfs + src = fetchzip { + url = "https://github.com/OpenImageDenoise/oidn/releases/download/v${version}/oidn-${version}.src.tar.gz"; + sha256 = "0wyaarjxkzlvljmpnr7qm06ma2wl1aik3z664gwpzhizswygk6yp"; + }; + + nativeBuildInputs = [ cmake python3 ispc ]; + buildInputs = [ tbb ]; + + meta = with lib; { + homepage = "https://openimagedenoise.github.io"; + description = "High-Performance Denoising Library for Ray Tracing"; + license = licenses.asl20; + maintainers = [ maintainers.leshainc ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/openimagedenoise/default.nix b/nixpkgs/pkgs/development/libraries/openimagedenoise/default.nix index 03f9118ef7c0..61ffdcbb5cac 100644 --- a/nixpkgs/pkgs/development/libraries/openimagedenoise/default.nix +++ b/nixpkgs/pkgs/development/libraries/openimagedenoise/default.nix @@ -1,16 +1,16 @@ -{ lib, stdenv, fetchzip, cmake, tbb, python, ispc }: +{ lib, stdenv, fetchzip, cmake, tbb, python3, ispc }: stdenv.mkDerivation rec { pname = "openimagedenoise"; - version = "1.2.2"; + version = "1.3.0"; # The release tarballs include pretrained weights, which would otherwise need to be fetched with git-lfs src = fetchzip { url = "https://github.com/OpenImageDenoise/oidn/releases/download/v${version}/oidn-${version}.src.tar.gz"; - sha256 = "0wyaarjxkzlvljmpnr7qm06ma2wl1aik3z664gwpzhizswygk6yp"; + sha256 = "sha256-ls0F2D5pC+wqhQn1Zh8m8Q/KoK7rAkhKatTY9k+letQ="; }; - nativeBuildInputs = [ cmake python ispc ]; + nativeBuildInputs = [ cmake python3 ispc ]; buildInputs = [ tbb ]; meta = with lib; { |