From b22383a415d9c5d3ddd64a245eda8333c5eb2576 Mon Sep 17 00:00:00 2001 From: Luiz Ribeiro Date: Sun, 24 Jul 2022 19:02:57 -0500 Subject: [PATCH 1/5] soapyrtlsdr: 0.3.0 -> 0.3.3 --- pkgs/applications/radio/soapyrtlsdr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/radio/soapyrtlsdr/default.nix b/pkgs/applications/radio/soapyrtlsdr/default.nix index 5adf07053ab3..5761741234a7 100644 --- a/pkgs/applications/radio/soapyrtlsdr/default.nix +++ b/pkgs/applications/radio/soapyrtlsdr/default.nix @@ -3,7 +3,7 @@ } : let - version = "0.3.0"; + version = "0.3.3"; in stdenv.mkDerivation { pname = "soapyrtlsdr"; @@ -12,8 +12,8 @@ in stdenv.mkDerivation { src = fetchFromGitHub { owner = "pothosware"; repo = "SoapyRTLSDR"; - rev = "soapy-rtlsdr-${version}"; - sha256 = "15j0s7apbg9cjr6rcbr058kl0r3szwzf00ixcbykxb77fh7c6r9w"; + rev = "soapy-rtl-sdr-${version}"; + sha256 = "sha256-IapdrBE8HhibY52Anm76/mVAoA0GghwnRCxxfGkyLTw="; }; nativeBuildInputs = [ cmake pkg-config ]; From b4e5d045184f7bcac6260fbea51606d5c39b7dec Mon Sep 17 00:00:00 2001 From: Winter Date: Sun, 24 Jul 2022 22:04:35 -0400 Subject: [PATCH 2/5] soapyrtlsdr: use overlay-style mkDerivation --- .../radio/soapyrtlsdr/default.nix | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/radio/soapyrtlsdr/default.nix b/pkgs/applications/radio/soapyrtlsdr/default.nix index 5761741234a7..fe055b808a38 100644 --- a/pkgs/applications/radio/soapyrtlsdr/default.nix +++ b/pkgs/applications/radio/soapyrtlsdr/default.nix @@ -1,18 +1,20 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config -, rtl-sdr, soapysdr -} : +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, rtl-sdr +, soapysdr +}: -let - version = "0.3.3"; - -in stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "soapyrtlsdr"; - inherit version; + version = "0.3.3"; src = fetchFromGitHub { owner = "pothosware"; repo = "SoapyRTLSDR"; - rev = "soapy-rtl-sdr-${version}"; + rev = "soapy-rtl-sdr-${finalAttrs.version}"; sha256 = "sha256-IapdrBE8HhibY52Anm76/mVAoA0GghwnRCxxfGkyLTw="; }; @@ -28,4 +30,4 @@ in stdenv.mkDerivation { maintainers = with maintainers; [ ragge ]; platforms = platforms.unix; }; -} +}) From b03edd851cff4c7d47023ad1757b674b0f492ddc Mon Sep 17 00:00:00 2001 From: Luiz Ribeiro Date: Sun, 24 Jul 2022 20:40:22 -0500 Subject: [PATCH 3/5] soapyrtlsdr: fix build on Darwin --- pkgs/applications/radio/soapyrtlsdr/default.nix | 6 +++++- pkgs/top-level/all-packages.nix | 5 ++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/soapyrtlsdr/default.nix b/pkgs/applications/radio/soapyrtlsdr/default.nix index fe055b808a38..d93bb02632ff 100644 --- a/pkgs/applications/radio/soapyrtlsdr/default.nix +++ b/pkgs/applications/radio/soapyrtlsdr/default.nix @@ -5,6 +5,9 @@ , pkg-config , rtl-sdr , soapysdr +, libobjc +, IOKit +, Security }: stdenv.mkDerivation (finalAttrs: { @@ -19,7 +22,8 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ rtl-sdr soapysdr ]; + buildInputs = [ rtl-sdr soapysdr ] + ++ lib.optionals stdenv.isDarwin [ libobjc IOKit Security ]; cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4b46e3945855..de0ab6bb02cc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21100,7 +21100,10 @@ with pkgs; ]; }; - soapyrtlsdr = callPackage ../applications/radio/soapyrtlsdr { }; + soapyrtlsdr = callPackage ../applications/radio/soapyrtlsdr { + inherit (darwin) libobjc; + inherit (darwin.apple_sdk.frameworks) IOKit Security; + }; soapyuhd = callPackage ../applications/radio/soapyuhd { }; From 55fdc0ce3c933a1115e6c627f8883fe0baf3e5ad Mon Sep 17 00:00:00 2001 From: Luiz Ribeiro Date: Sun, 24 Jul 2022 21:37:24 -0500 Subject: [PATCH 4/5] maintainers: add luizribeiro --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a51210390853..56dd587f9c42 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7495,6 +7495,16 @@ githubId = 22085373; name = "Luis Hebendanz"; }; + luizribeiro = { + email = "nixpkgs@l9o.dev"; + matrix = "@luizribeiro:matrix.org"; + name = "Luiz Ribeiro"; + github = "luizribeiro"; + githubId = 112069; + keys = [{ + fingerprint = "97A0 AE5E 03F3 499B 7D7A 65C6 76A4 1432 37EF 5817"; + }]; + }; lunarequest = { email = "nullarequest@vivlaid.net"; github = "Lunarequest"; From c51440bf8bd7e45b245f9220c690c98fd6ebcfe8 Mon Sep 17 00:00:00 2001 From: Luiz Ribeiro Date: Sun, 24 Jul 2022 21:57:11 -0500 Subject: [PATCH 5/5] soapyrtlsdr: add luizribeiro as maintainer --- pkgs/applications/radio/soapyrtlsdr/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/radio/soapyrtlsdr/default.nix b/pkgs/applications/radio/soapyrtlsdr/default.nix index d93bb02632ff..80ea41e4f950 100644 --- a/pkgs/applications/radio/soapyrtlsdr/default.nix +++ b/pkgs/applications/radio/soapyrtlsdr/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/pothosware/SoapyRTLSDR"; description = "SoapySDR plugin for RTL-SDR devices"; license = licenses.mit; - maintainers = with maintainers; [ ragge ]; + maintainers = with maintainers; [ ragge luizribeiro ]; platforms = platforms.unix; }; })