Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7b9448665e4b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 79218383b793
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jun 21, 2020

  1. openimagedenoise: 1.1.0 -> 1.2.1

    @tilpner
    tilpner committed Jun 21, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    87c11dd View commit details

Commits on Jun 22, 2020

  1. Merge pull request #91236 from tilpner/openimagedenoise-update 

    openimagedenoise: 1.1.0 -> 1.2.1
    @danieldk
    danieldk authored Jun 22, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    7921838 View commit details
Showing with 7 additions and 9 deletions.
  1. +7 −9 pkgs/development/libraries/openimagedenoise/default.nix
16 changes: 7 additions & 9 deletions pkgs/development/libraries/openimagedenoise/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
{ stdenv, fetchFromGitHub, cmake, tbb, python }:
{ stdenv, fetchzip, cmake, tbb, python, ispc }:

stdenv.mkDerivation rec {
pname = "openimagedenoise";
version = "1.1.0";
version = "1.2.1";

src = fetchFromGitHub {
owner = "OpenImageDenoise";
repo = "oidn";
rev = "v${version}";
sha256 = "032s7vablqnmrcc4xf2c94kwj0kbcd64bram10g0yc42fg0a3r9m";
fetchSubmodules = true;
# 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 = "1f8s69ixv7nsdap9hc2njli2x75zmlrfq8cy79772gz83kph8s25";
};

nativeBuildInputs = [ cmake python ];
nativeBuildInputs = [ cmake python ispc ];
buildInputs = [ tbb ];

meta = with stdenv.lib; {