From dc57d69c0e01539029513b020e5d1386ece2fa53 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 21 Jul 2024 22:47:25 +0200 Subject: [PATCH 1/3] libusbmuxd: 2.0.2+date=2023-04-30 -> 2.1.0 --- pkgs/development/libraries/libusbmuxd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libusbmuxd/default.nix b/pkgs/development/libraries/libusbmuxd/default.nix index 33c821302cb2..f1b3c811f645 100644 --- a/pkgs/development/libraries/libusbmuxd/default.nix +++ b/pkgs/development/libraries/libusbmuxd/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "libusbmuxd"; - version = "2.0.2+date=2023-04-30"; + version = "2.1.0"; src = fetchFromGitHub { owner = "libimobiledevice"; repo = pname; - rev = "f47c36f5bd2a653a3bd7fb1cf1d2c50b0e6193fb"; - hash = "sha256-ojFnFD0lcdJLP27oFukwzkG5THx1QE+tRBsaMj4ZCc4="; + rev = version; + hash = "sha256-coQqNGPsqrOYbBjO0eQZQNK8ZTB+ZzfMWvQ6Z1by9PY="; }; nativeBuildInputs = [ From 94197a82bcbbced0528431b530a5be03eb04b7e7 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 21 Jul 2024 22:48:13 +0200 Subject: [PATCH 2/3] libusbmuxd: reformat --- .../libraries/libusbmuxd/default.nix | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/libusbmuxd/default.nix b/pkgs/development/libraries/libusbmuxd/default.nix index f1b3c811f645..cb77300acec0 100644 --- a/pkgs/development/libraries/libusbmuxd/default.nix +++ b/pkgs/development/libraries/libusbmuxd/default.nix @@ -1,10 +1,11 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoreconfHook -, pkg-config -, libplist -, libimobiledevice-glue +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + pkg-config, + libplist, + libimobiledevice-glue, }: stdenv.mkDerivation rec { @@ -32,11 +33,11 @@ stdenv.mkDerivation rec { export RELEASE_VERSION=${version} ''; - meta = with lib; { + meta = { description = "Client library to multiplex connections from and to iOS devices"; homepage = "https://github.com/libimobiledevice/libusbmuxd"; - license = licenses.lgpl21Plus; - platforms = platforms.unix; + license = lib.licenses.lgpl21Plus; + platforms = lib.platforms.unix; maintainers = [ ]; }; } From 62959e0bb9d47c260208b2ef23f1c4caf20a6e96 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 21 Jul 2024 22:49:26 +0200 Subject: [PATCH 3/3] libusbmuxd: move to by-name --- .../default.nix => by-name/li/libusbmuxd/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/libraries/libusbmuxd/default.nix => by-name/li/libusbmuxd/package.nix} (100%) diff --git a/pkgs/development/libraries/libusbmuxd/default.nix b/pkgs/by-name/li/libusbmuxd/package.nix similarity index 100% rename from pkgs/development/libraries/libusbmuxd/default.nix rename to pkgs/by-name/li/libusbmuxd/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 80d4b6cb5233..d1132524163e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22659,8 +22659,6 @@ with pkgs; libusbgx = callPackage ../development/libraries/libusbgx { }; - libusbmuxd = callPackage ../development/libraries/libusbmuxd { }; - libusbsio = callPackage ../development/libraries/libusbsio { }; libucontext = callPackage ../development/libraries/libucontext { };