JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #236033 from tjni/libplist

Browse Source 
Update packages from libimobiledevice repository
This commit is contained in:
Weijia Wang 2023-06-29 09:46:23 +03:00 committed by GitHub
commit 32c86661b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 92 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/libraries/libgpod/default.nix
View File

@ -1,6 +1,7 @@
{ stdenv
, lib
, fetchurl
, fetchpatch
, perlPackages
, intltool
, autoreconfHook
@ -24,11 +25,19 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://sourceforge/gtkpod/libgpod-${version}.tar.bz2";
sha256 = "0pcmgv1ra0ymv73mlj4qxzgyir026z9jpl5s5bkg35afs1cpk2k3";
hash = "sha256-Y4p5WdBOlfHmKrrQK9M3AuTo3++YSFrH2dUDlcN+lV0=";
};
outputs = [ "out" "dev" ];
patches = [
(fetchpatch {
name = "libplist-2.3.0-compatibility.patch";
url = "https://sourceforge.net/p/gtkpod/patches/48/attachment/libplist-2.3.0-compatibility.patch";
hash = "sha256-aVkuYE1N/jdEhVhiXEVhApvOC+8csIMMpP20rAJwEVQ=";
})
];
postPatch = ''
# support libplist 2.2
substituteInPlace configure.ac --replace 'libplist >= 1.0' 'libplist-2.0 >= 2.2'

12
pkgs/development/libraries/libimobiledevice-glue/default.nix
View File

@ -8,15 +8,15 @@
stdenv.mkDerivation rec {
pname = "libimobiledevice-glue";
version = "0.pre+date=2022-05-22";
version = "1.0.0";
outputs = [ "out" "dev" ];
src = fetchFromGitHub {
owner = "libimobiledevice";
repo = pname;
rev = "d2ff7969dcd0a12e4f18f63dab03e6cd03054fcb";
hash = "sha256-BAdpJK6/iUKCNYLaCJQo0VK63AdIafO8wGbNhnvEc/o=";
rev = version;
hash = "sha256-9TjIYz6w61JaJgOJtWteIDk9bO3NnXp/2ZJwdirFcYM=";
};
nativeBuildInputs = [
@ -28,9 +28,13 @@ stdenv.mkDerivation rec {
libplist
];
preAutoreconf = ''
export RELEASE_VERSION=${version}
'';
meta = with lib; {
homepage = "https://github.com/libimobiledevice/libimobiledevice-glue";
description = "Library with common code used by the libraries and tools around the libimobiledevice project.";
description = "Library with common code used by the libraries and tools around the libimobiledevice project";
license = licenses.lgpl21Plus;
platforms = platforms.unix;
maintainers = with maintainers; [ infinisil ];

14
pkgs/development/libraries/libimobiledevice/default.nix
View File

@ -15,21 +15,17 @@
stdenv.mkDerivation rec {
pname = "libimobiledevice";
version = "1.3.0+date=2022-05-22";
version = "1.3.0+date=2023-04-30";
outputs = [ "out" "dev" ];
src = fetchFromGitHub {
owner = "libimobiledevice";
repo = pname;
rev = "12394bc7be588be83c352d7441102072a89dd193";
hash = "sha256-2K4gZrFnE4hlGlthcKB4n210bTK3+6NY4TYVIoghXJM=";
rev = "860ffb707af3af94467d2ece4ad258dda957c6cd";
hash = "sha256-mIsB+EaGJlGMOpz3OLrs0nAmhOY1BwMs83saFBaejwc=";
};
postPatch = ''
echo '${version}' > .tarball-version
'';
nativeBuildInputs = [
autoreconfHook
pkg-config
@ -47,6 +43,10 @@ stdenv.mkDerivation rec {
CoreFoundation
];
preAutoreconf = ''
export RELEASE_VERSION=${version}
'';
configureFlags = [ "--with-gnutls" "--without-cython" ];
meta = with lib; {

10
pkgs/development/libraries/libirecovery/default.nix
View File

@ -10,15 +10,15 @@
stdenv.mkDerivation rec {
pname = "libirecovery";
version = "1.0.0+date=2022-04-04";
version = "1.1.0";
outputs = [ "out" "dev" ];
src = fetchFromGitHub {
owner = "libimobiledevice";
repo = pname;
rev = "82d235703044c5af9da8ad8f77351fd2046dac47";
hash = "sha256-OESN9qme+TlSt+ZMbR4F3z/3RN0I12R7fcSyURBqUVk=";
rev = version;
hash = "sha256-84xwSOLwPU2Py6X2r6FYESxdc1EuuD6xHEXTUUEdvTE=";
};
nativeBuildInputs = [
@ -32,6 +32,10 @@ stdenv.mkDerivation rec {
libimobiledevice-glue
];
preAutoreconf = ''
export RELEASE_VERSION=${version}
'';
# Packager note: Not clear whether this needs a NixOS configuration,
# as only the `idevicerestore` binary was tested so far (which worked
# without further configuration).

21
pkgs/development/libraries/libplist/default.nix
View File

@ -10,21 +10,17 @@
stdenv.mkDerivation rec {
pname = "libplist";
version = "2.2.0+date=2022-04-05";
version = "2.3.0";
outputs = [ "bin" "dev" "out" ] ++ lib.optional enablePython "py";
src = fetchFromGitHub {
owner = "libimobiledevice";
repo = pname;
rev = "db93bae96d64140230ad050061632531644c46ad";
hash = "sha256-8e/PFDhsyrOgmI3vLT1YhcROmbJgArDAJSe8Z2bZafo=";
rev = version;
hash = "sha256-fZfDSWVRg73dN+WF6LbgRSj8vtyeKeyjC8pWXFxUmBg=";
};
postPatch = ''
echo '${version}' > .tarball-version
'';
nativeBuildInputs = [
autoreconfHook
pkg-config
@ -35,10 +31,18 @@ stdenv.mkDerivation rec {
python3.pkgs.cython
];
configureFlags = lib.optionals (!enablePython) [
preAutoreconf = ''
export RELEASE_VERSION=${version}
'';
configureFlags = [
"--enable-debug"
] ++ lib.optionals (!enablePython) [
"--without-cython"
];
doCheck = true;
postFixup = lib.optionalString enablePython ''
moveToOutput "lib/${python3.libPrefix}" "$py"
'';
@ -49,5 +53,6 @@ stdenv.mkDerivation rec {
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ infinisil ];
platforms = platforms.unix;
mainProgram = "plistutil";
};
}

14
pkgs/development/libraries/libusbmuxd/default.nix
View File

@ -9,19 +9,15 @@
stdenv.mkDerivation rec {
pname = "libusbmuxd";
version = "2.0.2+date=2022-05-04";
version = "2.0.2+date=2023-04-30";
src = fetchFromGitHub {
owner = "libimobiledevice";
repo = pname;
rev = "36ffb7ab6e2a7e33bd1b56398a88895b7b8c615a";
hash = "sha256-41N5cSLAiPJ9FjdnCQnMvPu9/qhI3Je/M1VmKY+yII4=";
rev = "f47c36f5bd2a653a3bd7fb1cf1d2c50b0e6193fb";
hash = "sha256-ojFnFD0lcdJLP27oFukwzkG5THx1QE+tRBsaMj4ZCc4=";
};
postPatch = ''
echo '${version}' > .tarball-version
'';
nativeBuildInputs = [
autoreconfHook
pkg-config
@ -32,6 +28,10 @@ stdenv.mkDerivation rec {
libimobiledevice-glue
];
preAutoreconf = ''
export RELEASE_VERSION=${version}
'';
meta = with lib; {
description = "A client library to multiplex connections from and to iOS devices";
homepage = "https://github.com/libimobiledevice/libusbmuxd";

12
pkgs/development/mobile/ios-webkit-debug-proxy/default.nix
View File

@ -20,14 +20,19 @@ stdenv.mkDerivation rec {
owner = "google";
repo = pname;
rev = "v${version}";
sha256 = "sha256-cZ/p/aWET/BXKDrD+qgR+rfTISd+4jPNQFuV8klSLUo=";
hash = "sha256-cZ/p/aWET/BXKDrD+qgR+rfTISd+4jPNQFuV8klSLUo=";
};
patches = [
# OpenSSL 3.0 compatibility
(fetchpatch {
url = "https://github.com/google/ios-webkit-debug-proxy/commit/5ba30a2a67f39d25025cadf37c0eafb2e2d2d0a8.patch";
sha256 = "sha256-2b9BjG9wkqO+ZfoBYYJvD2Db5Kr0F/MxKMTRsI0ea3s=";
hash = "sha256-2b9BjG9wkqO+ZfoBYYJvD2Db5Kr0F/MxKMTRsI0ea3s=";
})
(fetchpatch {
name = "libplist-2.3.0-compatibility.patch";
url = "https://github.com/google/ios-webkit-debug-proxy/commit/94e4625ea648ece730d33d13224881ab06ad0fce.patch";
hash = "sha256-2deFAKIcNPDd1loOSe8pWZWs9idIE5Q2+pLkoVQrTLg=";
})
# Examples compilation breaks with --disable-static, see https://github.com/google/ios-webkit-debug-proxy/issues/399
./0001-Don-t-compile-examples.patch
@ -41,10 +46,11 @@ stdenv.mkDerivation rec {
preConfigure = ''
NOCONFIGURE=1 ./autogen.sh
'';
enableParallelBuilding = true;
meta = with lib; {
description = "A DevTools proxy (Chrome Remote Debugging Protocol) for iOS devices (Safari Remote Web Inspector).";
description = "A DevTools proxy (Chrome Remote Debugging Protocol) for iOS devices (Safari Remote Web Inspector)";
longDescription = ''
The ios_webkit_debug_proxy (aka iwdp) proxies requests from usbmuxd
daemon over a websocket connection, allowing developers to send commands

10
pkgs/tools/misc/ideviceinstaller/default.nix
View File

@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "ideviceinstaller";
version = "1.1.1+date=2022-05-09";
version = "1.1.1+date=2023-04-30";
src = fetchFromGitHub {
owner = "libimobiledevice";
repo = pname;
rev = "3909271599917bc4a3a996f99bdd3f88c49577fa";
hash = "sha256-dw3nda2PNddSFPzcx2lv0Nh1KLFXwPBbDBhhwEaB6d0=";
rev = "71ec5eaa30d2780c2614b6b227a2229ea3aeb1e9";
hash = "sha256-YsQwAlt71vouYJzXl0P7b3fG/MfcwI947GtvN4g3/gM=";
};
nativeBuildInputs = [
@ -30,6 +30,10 @@ stdenv.mkDerivation rec {
libzip
];
preAutoreconf = ''
export RELEASE_VERSION=${version}
'';
meta = with lib; {
homepage = "https://github.com/libimobiledevice/ideviceinstaller";
description = "List/modify installed apps of iOS devices";

14
pkgs/tools/misc/idevicerestore/default.nix
View File

@ -12,19 +12,15 @@
stdenv.mkDerivation rec {
pname = "idevicerestore";
version = "1.0.0+date=2022-05-22";
version = "1.0.0+date=2023-05-23";
src = fetchFromGitHub {
owner = "libimobiledevice";
repo = pname;
rev = "f80a876b3598de4eb551bafcb279947c527fae33";
hash = "sha256-I9zZQcZFd0hfeEJM7jltJtVJ6V5C5rA/S8gINiCnJdY=";
rev = "609f7f058487596597e8e742088119fdd46729df";
hash = "sha256-VXtXAitPC1+pxZlkGBg+u6yYhyM/jVpSgDO/6dXh5V4=";
};
postPatch = ''
echo '${version}' > .tarball-version
'';
nativeBuildInputs = [
autoreconfHook
pkg-config
@ -41,6 +37,10 @@ stdenv.mkDerivation rec {
# because they are inherited `libimobiledevice`.
];
preAutoreconf = ''
export RELEASE_VERSION=${version}
'';
meta = with lib; {
homepage = "https://github.com/libimobiledevice/idevicerestore";
description = "Restore/upgrade firmware of iOS devices";

10
pkgs/tools/misc/usbmuxd/default.nix
View File

@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "usbmuxd";
version = "1.1.1+date=2022-04-04";
version = "1.1.1+date=2023-05-05";
src = fetchFromGitHub {
owner = "libimobiledevice";
repo = pname;
rev = "2839789bdb581ede7c331b9b4e07e0d5a89d7d18";
hash = "sha256-wYW6hI0Ti9gKtk/wxIbdY5KaPMs/p+Ve9ceeRqXihQI=";
rev = "01c94c77f59404924f1c46d99c4e5e0c7817281b";
hash = "sha256-WqbobkzlJ9g5fb9S2QPi3qdpCLx3pxtNlT7qDI63Zp4=";
};
nativeBuildInputs = [
@ -28,6 +28,10 @@ stdenv.mkDerivation rec {
libusb1
];
preAutoreconf = ''
export RELEASE_VERSION=${version}
'';
configureFlags = [
"--with-udevrulesdir=${placeholder "out"}/lib/udev/rules.d"
"--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"

11
pkgs/tools/misc/usbmuxd2/default.nix
View File

@ -1,6 +1,7 @@
{ lib
, clangStdenv
, fetchFromGitHub
, fetchpatch
, autoreconfHook
, pkg-config
, libimobiledevice
@ -16,7 +17,7 @@
owner = "tihmstar";
repo = pname;
rev = "017d71edb0a12ff4fa01a39d12cd297d8b3d8d34";
sha256 = "sha256-NrSl/BeKe3wahiYTHGRVSq3PLgQfu76kHCC5ziY7cgQ=";
hash = "sha256-NrSl/BeKe3wahiYTHGRVSq3PLgQfu76kHCC5ziY7cgQ=";
};
postPatch = ''
# Set package version so we don't require git
@ -46,6 +47,14 @@ clangStdenv.mkDerivation rec {
hash = "sha256-T9bt3KOJwFpdPeFuXfBhkBZNaNzix3Q3D47vASR+fVg=";
};
patches = [
(fetchpatch {
name = "libplist-2.3.0-compatibility.patch";
url = "https://github.com/tihmstar/usbmuxd2/commit/e527bce2360afc22c95542f1252f94c994f45c72.patch";
hash = "sha256-ig4j4z2HH8gitXxZYW9fm74Ix9XmJeX2Lz9HBCuDsuk=";
})
];
postPatch = ''
# Set package version so we don't require git
sed -i '/AC_INIT/s/m4_esyscmd.*/${version})/' configure.ac