MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-20 01:16:57 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge #151592: freeimage: unstable-2020-07-04 -> unstable-2021-11-01

Browse source
This commit is contained in:
Vladimír Čunát 2022-04-23 17:11:26 +02:00
commit 3c0f57e36e
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
5 changed files with 61 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/development/libraries/freeimage/default.nix
View file

@ -5,14 +5,14 @@
stdenv.mkDerivation {
pname = "freeimage";
version = "unstable-2020-07-04";
version = "unstable-2021-11-01";
src = fetchsvn {
url = "svn://svn.code.sf.net/p/freeimage/svn/";
rev = "1859";
sha256 = "1d94935aqbkb994nqkw7m8xcynyz9rm6k7k59igrbjak8b63qpi6";
rev = "1900";
sha256 = "rWoNlU/BWKZBPzRb1HqU6T0sT7aK6dpqKPe88+o/4sA=";
};
sourceRoot = "svn-r1859/FreeImage/trunk";
sourceRoot = "svn-r1900/FreeImage/trunk";
# Ensure that the bundled libraries are not used at all
prePatch = "rm -rf Source/Lib* Source/OpenEXR Source/ZLib";

78
pkgs/development/libraries/freeimage/unbundle.diff
View file

File diff suppressed because one or more lines are too long

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

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

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

@ -1,14 +1,14 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, lcms2, pkg-config }:
stdenv.mkDerivation rec {
stdenv.mkDerivation {
pname = "libraw";
version = "0.20.2";
version = "unstable-2021-12-03";
src = fetchFromGitHub {
owner = "LibRaw";
repo = "LibRaw";
rev = version;
sha256 = "16nm4r2l5501c9zvz25pzajq5id592jhn068scjxhr8np2cblybc";
rev = "52b2fc52e93a566e7e05eaa44cada58e3360b6ad";
sha256 = "kW0R4iPuqnFuWYDrl46ok3kaPcGgY2MqZT7mqVX+BDQ=";
};
outputs = [ "out" "lib" "dev" "doc" ];

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

@ -17161,6 +17161,7 @@ with pkgs;
gegl = callPackage ../development/libraries/gegl {
inherit (darwin.apple_sdk.frameworks) OpenCL;
libraw = libraw_0_20;
};
gensio = callPackage ../development/libraries/gensio {};
@ -23146,6 +23147,7 @@ with pkgs;
};
libraw = callPackage ../development/libraries/libraw { };
libraw_0_20 = callPackage ../development/libraries/libraw/0_20.nix { };
libraw1394 = callPackage ../development/libraries/libraw1394 { };