diff --git a/pkgs/development/libraries/libraw/0_20.nix b/pkgs/development/libraries/libraw/0_20.nix deleted file mode 100644 index 9fa85e3ace27..000000000000 --- a/pkgs/development/libraries/libraw/0_20.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ libraw, fetchFromGitHub }: - -libraw.overrideAttrs (_: rec { - version = "0.20.2"; - - src = fetchFromGitHub { - owner = "LibRaw"; - repo = "LibRaw"; - rev = version; - sha256 = "16nm4r2l5501c9zvz25pzajq5id592jhn068scjxhr8np2cblybc"; - }; -}) diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix index 2dfadcdd4886..3ff7e725f3d8 100644 --- a/pkgs/development/libraries/libraw/default.nix +++ b/pkgs/development/libraries/libraw/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, lcms2, pkg-config }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "libraw"; - version = "unstable-2021-12-03"; + version = "0.20.2"; src = fetchFromGitHub { owner = "LibRaw"; repo = "LibRaw"; - rev = "52b2fc52e93a566e7e05eaa44cada58e3360b6ad"; - sha256 = "kW0R4iPuqnFuWYDrl46ok3kaPcGgY2MqZT7mqVX+BDQ="; + rev = version; + sha256 = "16nm4r2l5501c9zvz25pzajq5id592jhn068scjxhr8np2cblybc"; }; outputs = [ "out" "lib" "dev" "doc" ]; diff --git a/pkgs/development/libraries/libraw/unstable.nix b/pkgs/development/libraries/libraw/unstable.nix new file mode 100644 index 000000000000..3f19bb53c4e6 --- /dev/null +++ b/pkgs/development/libraries/libraw/unstable.nix @@ -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="; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 792b61ab0df2..4862e7fa5082 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 {}; @@ -23158,7 +23159,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 { };