From 5fc67c2ab7b68e9bc58e6feee6a941163471e2e2 Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Sat, 31 Aug 2024 21:43:40 +0200 Subject: [PATCH 1/3] libjaylink: Move package definition into by-name directory Signed-off-by: Felix Singer --- .../default.nix => by-name/li/libjaylink/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/libraries/libjaylink/default.nix => by-name/li/libjaylink/package.nix} (100%) diff --git a/pkgs/development/libraries/libjaylink/default.nix b/pkgs/by-name/li/libjaylink/package.nix similarity index 100% rename from pkgs/development/libraries/libjaylink/default.nix rename to pkgs/by-name/li/libjaylink/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b005d902b0968..3c5f0555f1454 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22227,8 +22227,6 @@ with pkgs; liburcu = callPackage ../development/libraries/liburcu { }; - libjaylink = callPackage ../development/libraries/libjaylink { }; - libusb-compat-0_1 = callPackage ../development/libraries/libusb-compat/0.1.nix { }; libusb1 = callPackage ../development/libraries/libusb1 { From 6423ae728c61ed65705d062c261aa1d4d949b592 Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Fri, 6 Sep 2024 22:04:01 +0200 Subject: [PATCH 2/3] libjaylink: Format package.nix Signed-off-by: Felix Singer --- pkgs/by-name/li/libjaylink/package.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/li/libjaylink/package.nix b/pkgs/by-name/li/libjaylink/package.nix index f313241d6d865..46d3ccefca170 100644 --- a/pkgs/by-name/li/libjaylink/package.nix +++ b/pkgs/by-name/li/libjaylink/package.nix @@ -1,6 +1,10 @@ -{ fetchFromGitLab, lib, stdenv -, autoreconfHook, pkg-config -, libusb1 +{ + fetchFromGitLab, + lib, + stdenv, + autoreconfHook, + pkg-config, + libusb1, }: stdenv.mkDerivation rec { @@ -15,7 +19,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-odJDE1A0WZ9vBXPxaUdthjTgmbmbdHjbyY1PkaM4+vI="; }; - nativeBuildInputs = [ autoreconfHook pkg-config ]; + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; buildInputs = [ libusb1 ]; postPatch = '' From 844c32097b6cec02f624fe43418894965c6e36e6 Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Fri, 6 Sep 2024 22:07:53 +0200 Subject: [PATCH 3/3] libjaylink: Use SRI hash for source Signed-off-by: Felix Singer --- pkgs/by-name/li/libjaylink/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/li/libjaylink/package.nix b/pkgs/by-name/li/libjaylink/package.nix index 46d3ccefca170..594726f6efe14 100644 --- a/pkgs/by-name/li/libjaylink/package.nix +++ b/pkgs/by-name/li/libjaylink/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { owner = "libjaylink"; repo = "libjaylink"; rev = version; - sha256 = "sha256-odJDE1A0WZ9vBXPxaUdthjTgmbmbdHjbyY1PkaM4+vI="; + hash = "sha256-odJDE1A0WZ9vBXPxaUdthjTgmbmbdHjbyY1PkaM4+vI="; }; nativeBuildInputs = [