Merge pull request #201979 from LibreCybernetics/update-exempi

Sandro a800d262 11956c2e

Changed files
+8 -10
pkgs
development
libraries
exempi
python-modules
python-xmp-toolkit
top-level
+3 -2
pkgs/development/libraries/exempi/default.nix
···
stdenv.mkDerivation rec {
pname = "exempi";
-
version = "2.5.1";
src = fetchurl {
url = "https://libopenraw.freedesktop.org/download/${pname}-${version}.tar.bz2";
-
sha256 = "07i29xmg8bqriviaf4vi1mwha4lrw85kfla29cfym14fp3z8aqa0";
};
configureFlags = [
···
++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.CoreServices ];
doCheck = stdenv.isLinux && stdenv.is64bit;
meta = with lib; {
description = "An implementation of XMP (Adobe's Extensible Metadata Platform)";
···
stdenv.mkDerivation rec {
pname = "exempi";
+
version = "2.6.2";
src = fetchurl {
url = "https://libopenraw.freedesktop.org/download/${pname}-${version}.tar.bz2";
+
sha256 = "sha256-TRfUyT3yqV2j4xcsRbelvzF90x2v0cejQBaXKMcInR0=";
};
configureFlags = [
···
++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.CoreServices ];
doCheck = stdenv.isLinux && stdenv.is64bit;
+
dontDisableStatic = doCheck;
meta = with lib; {
description = "An implementation of XMP (Adobe's Extensible Metadata Platform)";
+4 -3
pkgs/development/python-modules/python-xmp-toolkit/default.nix
···
, exempi
, fetchFromGitHub
, mock
-
, pythonOlder
, pytz
, lib, stdenv
}:
···
buildInputs = [ exempi ];
-
checkInputs = lib.optionals (pythonOlder "3.3") [ mock ];
-
propagatedBuildInputs = [ pytz ];
postPatch = ''
···
# hangs on darwin + sandbox
doCheck = !stdenv.isDarwin;
meta = with lib; {
homepage = "https://github.com/python-xmp-toolkit/python-xmp-toolkit";
···
, exempi
, fetchFromGitHub
, mock
, pytz
, lib, stdenv
}:
···
buildInputs = [ exempi ];
propagatedBuildInputs = [ pytz ];
postPatch = ''
···
# hangs on darwin + sandbox
doCheck = !stdenv.isDarwin;
+
+
preCheck = ''
+
rm test/{test_exempi,test_files}.py
+
'';
meta = with lib; {
homepage = "https://github.com/python-xmp-toolkit/python-xmp-toolkit";
+1 -5
pkgs/top-level/all-packages.nix
···
exactaudiocopy = callPackage ../applications/audio/exact-audio-copy { };
-
exempi = callPackage ../development/libraries/exempi {
-
stdenv = if stdenv.isDarwin then stdenv
-
else gcc9Stdenv;
-
boost = if stdenv.isDarwin then boost else boost15x;
-
};
executor = with python3Packages; toPythonApplication executor;
···
exactaudiocopy = callPackage ../applications/audio/exact-audio-copy { };
+
exempi = callPackage ../development/libraries/exempi { };
executor = with python3Packages; toPythonApplication executor;