openexr: switch default version to v3
This commit is contained in:
parent
0e018dfe43
commit
2ddb856be5
@ -45,7 +45,7 @@
|
||||
libheif,
|
||||
libxslt,
|
||||
libgudev,
|
||||
openexr_3,
|
||||
openexr,
|
||||
desktopToDarwinBundle,
|
||||
AppKit,
|
||||
Cocoa,
|
||||
@ -126,7 +126,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
poppler
|
||||
poppler_data
|
||||
libtiff
|
||||
openexr_3
|
||||
openexr
|
||||
libmng
|
||||
librsvg
|
||||
libwmf
|
||||
|
||||
@ -30,7 +30,7 @@
|
||||
libkdcraw,
|
||||
lcms2,
|
||||
gsl,
|
||||
openexr_3,
|
||||
openexr,
|
||||
giflib,
|
||||
libjxl,
|
||||
mlt,
|
||||
@ -105,7 +105,7 @@ mkDerivation rec {
|
||||
fribidi
|
||||
lcms2
|
||||
gsl
|
||||
openexr_3
|
||||
openexr
|
||||
lager
|
||||
libaom
|
||||
libheif
|
||||
|
||||
@ -24,7 +24,7 @@
|
||||
syntax-highlighting,
|
||||
libmtp,
|
||||
libssh,
|
||||
openexr_3,
|
||||
openexr,
|
||||
libtirpc,
|
||||
phonon,
|
||||
qtsvg,
|
||||
@ -71,7 +71,7 @@ mkDerivation {
|
||||
syntax-highlighting
|
||||
libmtp
|
||||
libssh
|
||||
openexr_3
|
||||
openexr
|
||||
libtirpc
|
||||
phonon
|
||||
qtsvg
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
cmake,
|
||||
wrapQtAppsHook,
|
||||
openimageio,
|
||||
openexr_3,
|
||||
openexr,
|
||||
portaudio,
|
||||
imath,
|
||||
qtwayland,
|
||||
@ -78,7 +78,7 @@ stdenv.mkDerivation {
|
||||
opencolorio
|
||||
openimageio'
|
||||
imath
|
||||
openexr_3
|
||||
openexr
|
||||
portaudio
|
||||
qtwayland
|
||||
qtmultimedia
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
libxml2,
|
||||
cmake,
|
||||
exiftool,
|
||||
openexr_3,
|
||||
openexr,
|
||||
glib,
|
||||
python3Packages,
|
||||
perlPackages,
|
||||
@ -147,7 +147,7 @@ stdenv.mkDerivation {
|
||||
libxkbcommon
|
||||
libxslt
|
||||
libXtst
|
||||
openexr_3
|
||||
openexr
|
||||
openjpeg
|
||||
osm-gps-map
|
||||
pcre
|
||||
|
||||
@ -32,7 +32,7 @@
|
||||
exiv2,
|
||||
exiftool,
|
||||
mimalloc,
|
||||
openexr_3,
|
||||
openexr,
|
||||
ilmbase,
|
||||
opencolorio,
|
||||
color-transformation-language,
|
||||
@ -83,7 +83,7 @@ stdenv.mkDerivation rec {
|
||||
exiftool
|
||||
libcanberra-gtk3
|
||||
mimalloc
|
||||
openexr_3
|
||||
openexr
|
||||
ilmbase
|
||||
opencolorio
|
||||
color-transformation-language
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
ilmbase,
|
||||
openexr_3,
|
||||
openexr,
|
||||
libtiff,
|
||||
aces-container,
|
||||
}:
|
||||
@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
ilmbase
|
||||
openexr_3
|
||||
openexr
|
||||
libtiff
|
||||
aces-container
|
||||
];
|
||||
|
||||
@ -55,7 +55,7 @@
|
||||
libxslt,
|
||||
lua,
|
||||
util-linux,
|
||||
openexr_3,
|
||||
openexr,
|
||||
openjpeg,
|
||||
osm-gps-map,
|
||||
pcre2,
|
||||
@ -140,7 +140,7 @@ stdenv.mkDerivation rec {
|
||||
libwebp
|
||||
libxslt
|
||||
lua
|
||||
openexr_3
|
||||
openexr
|
||||
openjpeg
|
||||
osm-gps-map
|
||||
pcre2
|
||||
|
||||
@ -3,16 +3,17 @@
|
||||
lib,
|
||||
buildPackages,
|
||||
cmake,
|
||||
openexr,
|
||||
# explicitely depending on openexr_2 because ilmbase doesn't exist for v3
|
||||
openexr_2,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "ilmbase";
|
||||
version = lib.getVersion openexr;
|
||||
version = lib.getVersion openexr_2;
|
||||
|
||||
# the project no longer provides separate tarballs. We may even want to merge
|
||||
# the ilmbase package into openexr in the future.
|
||||
inherit (openexr) src patches;
|
||||
inherit (openexr_2) src patches;
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@ -37,5 +38,6 @@ stdenv.mkDerivation {
|
||||
homepage = "https://www.openexr.com/";
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.all;
|
||||
insecure = true;
|
||||
};
|
||||
}
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
libpng,
|
||||
libwebp,
|
||||
gdk-pixbuf,
|
||||
openexr_3,
|
||||
openexr,
|
||||
pkg-config,
|
||||
makeWrapper,
|
||||
zlib,
|
||||
@ -87,7 +87,7 @@ stdenv.mkDerivation rec {
|
||||
libpng
|
||||
libwebp
|
||||
gdk-pixbuf
|
||||
openexr_3
|
||||
openexr
|
||||
zlib
|
||||
];
|
||||
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
libavif,
|
||||
libsixel,
|
||||
libraw,
|
||||
openexr_3,
|
||||
openexr,
|
||||
bash-completion,
|
||||
testers,
|
||||
nix-update-script,
|
||||
@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libavif
|
||||
libsixel
|
||||
libraw
|
||||
openexr_3
|
||||
openexr
|
||||
];
|
||||
|
||||
passthru = {
|
||||
|
||||
@ -38,7 +38,7 @@
|
||||
libtiff,
|
||||
libwebp,
|
||||
matio,
|
||||
openexr_3,
|
||||
openexr,
|
||||
openjpeg,
|
||||
openslide,
|
||||
pango,
|
||||
@ -112,7 +112,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libtiff
|
||||
libwebp
|
||||
matio
|
||||
openexr_3
|
||||
openexr
|
||||
openjpeg
|
||||
openslide
|
||||
pango
|
||||
|
||||
@ -62,7 +62,7 @@
|
||||
libxml2,
|
||||
lz4,
|
||||
netcdf,
|
||||
openexr_3,
|
||||
openexr,
|
||||
openjpeg,
|
||||
openssl,
|
||||
pcre2,
|
||||
@ -182,7 +182,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
nonDarwinDeps = lib.optionals (!stdenv.hostPlatform.isDarwin) (
|
||||
[
|
||||
# tests for formats enabled by these packages fail on macos
|
||||
openexr_3
|
||||
openexr
|
||||
xercesc
|
||||
]
|
||||
++ arrowDeps
|
||||
|
||||
@ -62,7 +62,7 @@
|
||||
libusb1,
|
||||
neon,
|
||||
openal,
|
||||
openexr_3,
|
||||
openexr,
|
||||
openh264Support ? lib.meta.availableOn stdenv.hostPlatform openh264,
|
||||
openh264,
|
||||
libopenmpt,
|
||||
@ -192,7 +192,7 @@ stdenv.mkDerivation rec {
|
||||
libusb1
|
||||
neon
|
||||
openal
|
||||
openexr_3
|
||||
openexr
|
||||
rtmpdump
|
||||
pango
|
||||
soundtouch
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
libmng,
|
||||
lcms1,
|
||||
libtiff,
|
||||
openexr_3,
|
||||
openexr,
|
||||
libGL,
|
||||
libX11,
|
||||
pkg-config,
|
||||
@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libmng
|
||||
lcms1
|
||||
libtiff
|
||||
openexr_3
|
||||
openexr
|
||||
]
|
||||
++ lib.optionals withXorg [
|
||||
libX11
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
# Build apps
|
||||
buildApps ? true, # Utility applications
|
||||
lcms2,
|
||||
openexr_3,
|
||||
openexr,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
|
||||
]
|
||||
++ lib.optionals buildApps [
|
||||
lcms2
|
||||
openexr_3
|
||||
openexr
|
||||
];
|
||||
|
||||
cmakeFlags =
|
||||
|
||||
@ -74,5 +74,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://www.openexr.com/";
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.all;
|
||||
insecure = true;
|
||||
};
|
||||
}
|
||||
@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
passthru.tests = {
|
||||
inherit libjxl;
|
||||
musl = pkgsCross.musl64.openexr_3;
|
||||
musl = pkgsCross.musl64.openexr;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -25,7 +25,7 @@
|
||||
jpegSupport ? true,
|
||||
libjpeg,
|
||||
exrSupport ? false,
|
||||
openexr_3,
|
||||
openexr,
|
||||
gifSupport ? true,
|
||||
giflib,
|
||||
pngSupport ? true,
|
||||
@ -97,7 +97,7 @@ stdenv.mkDerivation rec {
|
||||
zlib
|
||||
]
|
||||
++ lib.optional jpegSupport libjpeg
|
||||
++ lib.optional exrSupport openexr_3
|
||||
++ lib.optional exrSupport openexr
|
||||
++ lib.optional gifSupport giflib
|
||||
++ lib.optional pngSupport libpng
|
||||
++ lib.optional tiffSupport libtiff
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
libjxl,
|
||||
libavif,
|
||||
libraw,
|
||||
openexr_3,
|
||||
openexr,
|
||||
}:
|
||||
mkKdeDerivation {
|
||||
pname = "kimageformats";
|
||||
@ -17,6 +17,6 @@ mkKdeDerivation {
|
||||
libjxl
|
||||
libavif
|
||||
libraw
|
||||
openexr_3
|
||||
openexr
|
||||
];
|
||||
}
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
libimobiledevice,
|
||||
gperf,
|
||||
libtirpc,
|
||||
openexr_3,
|
||||
openexr,
|
||||
taglib,
|
||||
shared-mime-info,
|
||||
libappimage,
|
||||
@ -34,7 +34,7 @@ mkKdeDerivation {
|
||||
libimobiledevice
|
||||
gperf
|
||||
libtirpc
|
||||
openexr_3
|
||||
openexr
|
||||
taglib
|
||||
libappimage
|
||||
xorg.libXcursor
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
libimobiledevice,
|
||||
gperf,
|
||||
libtirpc,
|
||||
openexr_3,
|
||||
openexr,
|
||||
taglib,
|
||||
libappimage,
|
||||
}:
|
||||
@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
|
||||
libimobiledevice
|
||||
gperf
|
||||
libtirpc
|
||||
openexr_3
|
||||
openexr
|
||||
taglib
|
||||
libappimage
|
||||
];
|
||||
|
||||
@ -1269,6 +1269,7 @@ mapAliases {
|
||||
opendylan_bin = throw "opendylan_bin has been removed from nixpkgs as it was broken"; # Added 2024-07-15
|
||||
openelec-dvb-firmware = throw "'openelec-dvb-firmware' has been renamed to/replaced by 'libreelec-dvb-firmware'"; # Converted to throw 2024-10-17
|
||||
openethereum = throw "openethereum development has ceased by upstream. Use alternate clients such as go-ethereum, erigon, or nethermind"; # Added 2024-05-13
|
||||
openexr_3 = openexr; # Added 2025-03-12
|
||||
openimageio2 = openimageio; # Added 2023-01-05
|
||||
openisns = throw "'openisns' has been renamed to/replaced by 'open-isns'"; # Converted to throw 2024-10-17
|
||||
openjdk19 = throw "OpenJDK 19 was removed as it has reached its end of life"; # Added 2024-08-01
|
||||
|
||||
@ -361,10 +361,6 @@ with pkgs;
|
||||
|
||||
copilot-language-server-fhs = copilot-language-server.fhs;
|
||||
|
||||
curv = callPackage ../by-name/cu/curv/package.nix {
|
||||
openexr = openexr_3;
|
||||
};
|
||||
|
||||
databricks-sql-cli = callPackage ../applications/misc/databricks-sql-cli { };
|
||||
|
||||
deck = callPackage ../by-name/de/deck/package.nix {
|
||||
@ -4740,7 +4736,6 @@ with pkgs;
|
||||
libclang = llvmPackages_15.libclang;
|
||||
clang = clang_15;
|
||||
llvm = llvm_15;
|
||||
openexr = openexr_3;
|
||||
};
|
||||
|
||||
ossec-agent = callPackage ../tools/security/ossec/agent.nix { };
|
||||
@ -9358,6 +9353,10 @@ with pkgs;
|
||||
fplll = callPackage ../development/libraries/fplll { };
|
||||
fplll_20160331 = callPackage ../development/libraries/fplll/20160331.nix { };
|
||||
|
||||
freeimage = callPackage ../by-name/fr/freeimage/package.nix {
|
||||
openexr = openexr_2;
|
||||
};
|
||||
|
||||
freeipa = callPackage ../os-specific/linux/freeipa {
|
||||
# NOTE: freeipa and sssd need to be built with the same version of python
|
||||
kerberos = krb5.override {
|
||||
@ -9401,6 +9400,7 @@ with pkgs;
|
||||
|
||||
gegl = callPackage ../development/libraries/gegl {
|
||||
inherit (darwin.apple_sdk.frameworks) OpenCL;
|
||||
openexr = openexr_2;
|
||||
};
|
||||
|
||||
gensio = darwin.apple_sdk_11_0.callPackage ../development/libraries/gensio { };
|
||||
@ -10789,6 +10789,7 @@ with pkgs;
|
||||
# TODO: LTO does not work.
|
||||
# https://github.com/NixOS/nixpkgs/issues/343123
|
||||
enableLto = false;
|
||||
openexr = openexr_2;
|
||||
};
|
||||
|
||||
opencv4WithoutCuda = opencv4.override {
|
||||
@ -10797,9 +10798,8 @@ with pkgs;
|
||||
|
||||
opencv = opencv4;
|
||||
|
||||
openexr = openexr_2;
|
||||
openexr_2 = callPackage ../development/libraries/openexr { };
|
||||
openexr_3 = callPackage ../development/libraries/openexr/3.nix { };
|
||||
openexr = callPackage ../development/libraries/openexr/3.nix { };
|
||||
openexr_2 = callPackage ../development/libraries/openexr/2.nix { };
|
||||
|
||||
opencolorio = darwin.apple_sdk_11_0.callPackage ../development/libraries/opencolorio {
|
||||
inherit (darwin.apple_sdk_11_0.frameworks) Carbon GLUT Cocoa;
|
||||
@ -11438,7 +11438,6 @@ with pkgs;
|
||||
|
||||
vigra = callPackage ../development/libraries/vigra {
|
||||
hdf5 = hdf5.override { usev110Api = true; };
|
||||
openexr = openexr_3;
|
||||
};
|
||||
|
||||
vllm = with python3Packages; toPythonApplication vllm;
|
||||
@ -13800,9 +13799,7 @@ with pkgs;
|
||||
|
||||
airwave = libsForQt5.callPackage ../applications/audio/airwave { };
|
||||
|
||||
alembic = callPackage ../development/libraries/alembic {
|
||||
openexr = openexr_3;
|
||||
};
|
||||
alembic = callPackage ../development/libraries/alembic { };
|
||||
|
||||
amarok = libsForQt5.callPackage ../applications/audio/amarok { };
|
||||
amarok-kf5 = amarok; # for compatibility
|
||||
@ -13901,7 +13898,6 @@ with pkgs;
|
||||
};
|
||||
|
||||
blender = callPackage ../by-name/bl/blender/package.nix {
|
||||
openexr = openexr_3;
|
||||
python3Packages = python311Packages;
|
||||
inherit (darwin.apple_sdk.frameworks)
|
||||
Cocoa
|
||||
@ -14090,6 +14086,8 @@ with pkgs;
|
||||
hamlib = hamlib_4;
|
||||
};
|
||||
|
||||
djv = callPackage ../by-name/dj/djv/package.nix { openexr = openexr_2; };
|
||||
|
||||
djview = libsForQt5.callPackage ../applications/graphics/djview { };
|
||||
djview4 = djview;
|
||||
|
||||
@ -14728,7 +14726,6 @@ with pkgs;
|
||||
|
||||
hugin = callPackage ../applications/graphics/hugin {
|
||||
wxGTK = wxGTK32;
|
||||
openexr = openexr_3;
|
||||
};
|
||||
|
||||
huggle = libsForQt5.callPackage ../applications/misc/huggle { };
|
||||
@ -14937,7 +14934,6 @@ with pkgs;
|
||||
imagemagick = lowPrio (
|
||||
callPackage ../applications/graphics/ImageMagick {
|
||||
inherit (darwin.apple_sdk.frameworks) ApplicationServices Foundation;
|
||||
openexr = openexr_3;
|
||||
}
|
||||
);
|
||||
|
||||
@ -15255,7 +15251,9 @@ with pkgs;
|
||||
portaudio = null;
|
||||
};
|
||||
|
||||
luminanceHDR = libsForQt5.callPackage ../applications/graphics/luminance-hdr { };
|
||||
luminanceHDR = libsForQt5.callPackage ../applications/graphics/luminance-hdr {
|
||||
openexr = openexr_2;
|
||||
};
|
||||
|
||||
luddite = with python3Packages; toPythonApplication luddite;
|
||||
|
||||
@ -15691,7 +15689,6 @@ with pkgs;
|
||||
};
|
||||
|
||||
openimageio = darwin.apple_sdk_11_0.callPackage ../development/libraries/openimageio {
|
||||
openexr = openexr_3;
|
||||
};
|
||||
|
||||
open-music-kontrollers = lib.recurseIntoAttrs {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user