BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge #170108: libraw: switch the default back to 0.20

Browse source
This commit is contained in:
Vladimír Čunát 2022-04-24 21:53:17 +02:00
commit 268163a63a
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
4 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/development/libraries/libraw/0_20.nix
View file

@ -1,12 +0,0 @@
{ libraw, fetchFromGitHub }:
libraw.overrideAttrs (_: rec {
version = "0.20.2";
src = fetchFromGitHub {
owner = "LibRaw";
repo = "LibRaw";
rev = version;
sha256 = "16nm4r2l5501c9zvz25pzajq5id592jhn068scjxhr8np2cblybc";
};
})

6
pkgs/development/libraries/libraw/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation {
pname = "libraw";
version = "unstable-2021-12-03";
version = "0.20.2.p2";
src = fetchFromGitHub {
owner = "LibRaw";
repo = "LibRaw";
rev = "52b2fc52e93a566e7e05eaa44cada58e3360b6ad";
sha256 = "kW0R4iPuqnFuWYDrl46ok3kaPcGgY2MqZT7mqVX+BDQ=";
rev = "fedad11e87daad7b7d389a3ef84ccf10b5e84710"; # current 0.20-stable branch
sha256 = "1mklf8lzybzyg75ja34822xlv6h9nw93griyrjjna7darl1dyvja";
};
outputs = [ "out" "lib" "dev" "doc" ];

12
pkgs/development/libraries/libraw/unstable.nix Normal file
View file

@ -0,0 +1,12 @@
{ libraw, fetchFromGitHub }:
libraw.overrideAttrs (_: rec {
version = "unstable-2021-12-03";
src = fetchFromGitHub {
owner = "LibRaw";
repo = "LibRaw";
rev = "52b2fc52e93a566e7e05eaa44cada58e3360b6ad";
sha256 = "kW0R4iPuqnFuWYDrl46ok3kaPcGgY2MqZT7mqVX+BDQ=";
};
})

7
pkgs/top-level/all-packages.nix
View file

@ -17087,7 +17087,9 @@ with pkgs;
fplll = callPackage ../development/libraries/fplll {};
fplll_20160331 = callPackage ../development/libraries/fplll/20160331.nix {};
freeimage = callPackage ../development/libraries/freeimage { };
freeimage = callPackage ../development/libraries/freeimage {
libraw = libraw_unstable;
};
freetts = callPackage ../development/libraries/freetts {
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
@ -17170,7 +17172,6 @@ with pkgs;
gegl = callPackage ../development/libraries/gegl {
inherit (darwin.apple_sdk.frameworks) OpenCL;
libraw = libraw_0_20;
};
gensio = callPackage ../development/libraries/gensio {};
@ -23160,7 +23161,7 @@ with pkgs;
};
libraw = callPackage ../development/libraries/libraw { };
libraw_0_20 = callPackage ../development/libraries/libraw/0_20.nix { };
libraw_unstable = callPackage ../development/libraries/libraw/unstable.nix { };
libraw1394 = callPackage ../development/libraries/libraw1394 { };