libimobiledevice-drvs: update all with major rebuilds

pkgs/development/libraries/libimobiledevice-glue/default.nix → pkgs/by-name/li/libimobiledevice-glue/package.nix

@@ -1,26 +1,30 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, autoreconfHook
-, pkg-config
-, libplist
-, nix-update-script
-}:
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  unstableGitUpdater,
+
+  autoreconfHook,
+  pkg-config,
 
-stdenv.mkDerivation rec {
+  libplist,
+}:
+stdenv.mkDerivation (finalAttrs: {
   pname = "libimobiledevice-glue";
-  version = "1.3.0";
+  version = "1.3.0-unstable-2024-06-16";
 
   src = fetchFromGitHub {
     owner = "libimobiledevice";
-    repo = pname;
-    rev = version;
+    repo = "libimobiledevice-glue";
+    rev = "362f7848ac89b74d9dd113b38b51ecb601f76094";
     hash = "sha256-+poCrn2YHeH8RQCfWDdnlmJB4Nf+unWUVwn7YwILHIs=";
   };
 
-  preAutoreconf = ''
-    export RELEASE_VERSION=${version}
-  '';
+  outputs = [
+    "out"
+    "dev"
+  ];
+  passthru.updateScript = unstableGitUpdater { };
 
   nativeBuildInputs = [
     autoreconfHook
@@ -31,15 +35,15 @@ stdenv.mkDerivation rec {
     libplist
   ];
 
-  outputs = [ "out" "dev" ];
-
-  passthru.updateScript = nix-update-script { };
+  preAutoreconf = ''
+    export RELEASE_VERSION=${finalAttrs.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";
-    license = licenses.lgpl21Plus;
+    license = licenses.lgpl21Only;
     platforms = platforms.unix;
-    maintainers = [ ];
+    maintainers = with maintainers; [ frontear ];
   };
-}
+})

pkgs/development/libraries/libimobiledevice/default.nix → pkgs/by-name/li/libimobiledevice/package.nix

@@ -1,70 +1,66 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, fetchpatch
-, autoreconfHook
-, pkg-config
-, openssl
-, libgcrypt
-, libplist
-, libtasn1
-, libusbmuxd
-, libimobiledevice-glue
-, SystemConfiguration
-, CoreFoundation
-, unstableGitUpdater
-}:
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  unstableGitUpdater,
+
+  autoreconfHook,
+  pkg-config,
+
+  libgcrypt,
+  libimobiledevice-glue,
+  libplist,
+  libtasn1,
+  libtatsu,
+  libusbmuxd,
+  openssl,
 
-stdenv.mkDerivation rec {
+  CoreFoundation,
+  SystemConfiguration,
+}:
+stdenv.mkDerivation (finalAttrs: {
   pname = "libimobiledevice";
-  version = "1.3.0-unstable-2024-05-20";
+  version = "1.3.0-unstable-2024-09-16";
 
   src = fetchFromGitHub {
     owner = "libimobiledevice";
-    repo = pname;
-    rev = "9ccc52222c287b35e41625cc282fb882544676c6";
-    hash = "sha256-pNvtDGUlifp10V59Kah4q87TvLrcptrCJURHo+Y+hs4=";
+    repo = "libimobiledevice";
+    rev = "ed9703db1ee6d54e3801b618cee9524563d709e1";
+    hash = "sha256-fdUcEdqrZkiX1QEr9KdKAMJPzpJuboRRpXaQ3vYwspw=";
   };
 
-  patches = [
-    # Fix gcc-14 and clang-16 build:
-    #   https://github.com/libimobiledevice/libimobiledevice/pull/1569
-    (fetchpatch {
-      name = "fime.h.patch";
-      url = "https://github.com/libimobiledevice/libimobiledevice/commit/92256c2ae2422dac45d8648a63517598bdd89883.patch";
-      hash = "sha256-sB+wEFuXFoQnuf7ntWfvYuCgWfYbmlPL7EjW0L0F74o=";
-    })
+  enableParallelBuilding = true;
+  outputs = [
+    "out"
+    "dev"
   ];
-
-  preAutoreconf = ''
-    export RELEASE_VERSION=${version}
-  '';
-
-  configureFlags = [ "--without-cython" ];
+  passthru.updateScript = unstableGitUpdater { };
 
   nativeBuildInputs = [
     autoreconfHook
     pkg-config
   ];
 
-  propagatedBuildInputs = [
-    openssl
-    libgcrypt
-    libplist
-    libtasn1
-    libusbmuxd
-    libimobiledevice-glue
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    SystemConfiguration
-    CoreFoundation
-  ];
-
+  propagatedBuildInputs =
+    [
+      libgcrypt
+      libimobiledevice-glue
+      libplist
+      libtasn1
+      libtatsu
+      libusbmuxd
+      openssl
+    ]
+    ++ lib.optionals stdenv.isDarwin [
+      CoreFoundation
+      SystemConfiguration
+    ];
 
-  outputs = [ "out" "dev" ];
-
-  enableParallelBuilding = true;
+  configureFlags = [ "--without-cython" ];
 
-  passthru.updateScript = unstableGitUpdater { };
+  preAutoreconf = ''
+    export RELEASE_VERSION=${finalAttrs.version}
+  '';
 
   meta = with lib; {
     homepage = "https://github.com/libimobiledevice/libimobiledevice";
@@ -81,8 +77,14 @@ stdenv.mkDerivation rec {
       development since August 2007 with the goal to bring support for these
       devices to the Linux Desktop.
     '';
-    license = licenses.lgpl21Plus;
+    license = with licenses; [
+      gpl2Only
+      lgpl21Only
+    ];
     platforms = platforms.unix;
-    maintainers = with maintainers; [ RossComputerGuy ];
+    maintainers = with maintainers; [
+      RossComputerGuy
+      frontear
+    ];
   };
-}
+})

pkgs/by-name/li/libplist/package.nix

@@ -0,0 +1,68 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  unstableGitUpdater,
+
+  autoreconfHook,
+  pkg-config,
+
+  python3,
+  enablePython ? false,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libplist";
+  version = "2.6.0-unstable-2024-05-19";
+
+  src = fetchFromGitHub {
+    owner = "libimobiledevice";
+    repo = "libplist";
+    rev = "e8791e2d8b1d1672439b78d31271a8cf74d6a16d";
+    hash = "sha256-sKLFfv+B5UuYjMxG8a6GbP6BvohkhkqjS5+RBncHvxI=";
+  };
+
+  outputs = [
+    "bin"
+    "dev"
+    "out"
+  ] ++ lib.optional enablePython "py";
+  passthru.updateScript = unstableGitUpdater { };
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+  ];
+
+  buildInputs = lib.optionals enablePython [
+    python3
+    python3.pkgs.cython
+  ];
+
+  configureFlags =
+    [
+      "--enable-debug"
+    ]
+    ++ lib.optionals (!enablePython) [
+      "--without-cython"
+    ];
+
+  preAutoreconf = ''
+    export RELEASE_VERSION=${finalAttrs.version}
+  '';
+
+  postFixup = lib.optionalString enablePython ''
+    moveToOutput "lib/${python3.libPrefix}" "$py"
+  '';
+
+  meta = with lib; {
+    homepage = "https://github.com/libimobiledevice/libplist";
+    description = "Library to handle Apple Property List format in binary or XML";
+    license = with licenses; [
+      gpl2Only
+      lgpl21Only
+    ];
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ frontear ];
+    mainProgram = "plistutil";
+  };
+})

pkgs/by-name/li/libtatsu/package.nix

@@ -0,0 +1,47 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  unstableGitUpdater,
+
+  autoreconfHook,
+  pkg-config,
+
+  curl,
+  libplist,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libtatsu";
+  version = "1.0.3-unstable-2024-09-25";
+
+  src = fetchFromGitHub {
+    owner = "libimobiledevice";
+    repo = "libtatsu";
+    rev = "263f3b315d17cdd500b46bb122163df162f769e0";
+    hash = "sha256-LnjHAgzL+EsxLyRRkVP40Iuhsi/YO8HDwVd98eV7UEI=";
+  };
+
+  passthru.updateScript = unstableGitUpdater { };
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+  ];
+
+  buildInputs = [
+    curl
+    libplist
+  ];
+
+  preAutoreconf = ''
+    export RELEASE_VERSION=${finalAttrs.version}
+  '';
+
+  meta = with lib; {
+    homepage = "https://github.com/libimobiledevice/libtatsu";
+    description = "Library handling the communication with Apple's Tatsu Signing Server (TSS).";
+    license = licenses.lgpl21Only;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ frontear ];
+  };
+})

pkgs/by-name/li/libusbmuxd/package.nix

@@ -2,42 +2,49 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  unstableGitUpdater,
+
   autoreconfHook,
   pkg-config,
-  libplist,
+
   libimobiledevice-glue,
+  libplist,
 }:
-
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "libusbmuxd";
-  version = "2.1.0";
+  version = "2.1.0-unstable-2024-04-16";
 
   src = fetchFromGitHub {
     owner = "libimobiledevice";
-    repo = pname;
-    rev = version;
-    hash = "sha256-coQqNGPsqrOYbBjO0eQZQNK8ZTB+ZzfMWvQ6Z1by9PY=";
+    repo = "libusbmuxd";
+    rev = "a7f0543fb1ecb20ac7121c0fd77297200e0e43fc";
+    hash = "sha256-CETq4sguBwtIufwraMwMmzFcNm7MTkitvfM2jF2G02E=";
   };
 
+  passthru.updateScript = unstableGitUpdater { };
+
   nativeBuildInputs = [
     autoreconfHook
     pkg-config
   ];
 
   buildInputs = [
-    libplist
     libimobiledevice-glue
+    libplist
   ];
 
   preAutoreconf = ''
-    export RELEASE_VERSION=${version}
+    export RELEASE_VERSION=${finalAttrs.version}
   '';
 
-  meta = {
-    description = "Client library to multiplex connections from and to iOS devices";
+  meta = with lib; {
     homepage = "https://github.com/libimobiledevice/libusbmuxd";
-    license = lib.licenses.lgpl21Plus;
-    platforms = lib.platforms.unix;
-    maintainers = [ ];
+    description = "Client library to multiplex connections from and to iOS devices";
+    license = with licenses; [
+      gpl2Only
+      lgpl21Only
+    ];
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ frontear ];
   };
-}
+})