Unverified Commit b49255b8 authored by Yohann Boniface's avatar Yohann Boniface Committed by GitHub
Browse files

sdrpp: 1.2.1 -> 1.3.0 (#503148)

parents 1c824330 4a3e7f80

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

0 → 100644
+44 −0
Original line number Diff line number Diff line 
{

  stdenv,

  lib,

  fetchzip,

  cmake,

  pkg-config,

  libusb1,

}:



stdenv.mkDerivation (finalAttrs: {

  pname = "libdlcr";

  version = "0.3.0";



  src = fetchzip {

    url = "https://dragnlabs.com/host-tools/dlcr_host_v${finalAttrs.version}.zip";

    hash = "sha256-DOoc02woE10tU+8CDaYC0Xezvma06+UbhVuGFEiG67c=";

    stripRoot = false;

  };



  strictDeps = true;

  __structuredAttrs = true;



  nativeBuildInputs = [

    cmake

    pkg-config

  ];



  buildInputs = [ libusb1 ];



  postPatch = ''

    # Workaround based on

    # https://github.com/NixOS/nixpkgs/issues/144170



    substituteInPlace libdlcr.pc.in --replace-fail "\''${prefix}/" ""

  '';



  meta = {

    description = "Dragon Labs CR-8 Host Driver and Utilities";

    homepage = "https://dragnlabs.com/";

    license = lib.licenses.lgpl3;

    platforms = lib.platforms.unix;

    maintainers = with lib.maintainers; [ noderyos ];

  };

})

pkgs/by-name/sd/sdrpp/cmake4.patch

deleted100644 → 0
+0 −27
Original line number Diff line number Diff line 
diff --git a/core/libcorrect/CMakeLists.txt b/core/libcorrect/CMakeLists.txt

index 7fce281d..b709255f 100644

--- a/core/libcorrect/CMakeLists.txt

+++ b/core/libcorrect/CMakeLists.txt

@@ -1,4 +1,4 @@

-cmake_minimum_required(VERSION 2.8)

+cmake_minimum_required(VERSION 3.13)

 project(Correct C)

 include(CheckLibraryExists)

 include(CheckIncludeFiles)

diff --git a/misc_modules/discord_integration/discord-rpc/CMakeLists.txt b/misc_modules/discord_integration/discord-rpc/CMakeLists.txt

index 1dc1c913..e9924677 100644

--- a/misc_modules/discord_integration/discord-rpc/CMakeLists.txt

+++ b/misc_modules/discord_integration/discord-rpc/CMakeLists.txt

@@ -1,4 +1,4 @@

-cmake_minimum_required (VERSION 3.2.0)

+cmake_minimum_required (VERSION 3.13)

 project (DiscordRPC)

 

 include(GNUInstallDirs)

@@ -11,4 +11,4 @@ file(GLOB_RECURSE ALL_SOURCE_FILES

 

 # add subdirs

 

-add_subdirectory(src)

\ No newline at end of file

+add_subdirectory(src)

pkgs/by-name/sd/sdrpp/package.nix

+8 −7
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ 
  audio_source ? true,

  bladerf_source ? stdenv.hostPlatform.isLinux,

  libbladeRF,

  dragonlabs_source ? true,

  libdlcr,

  file_source ? true,

  hackrf_source ? true,

  hackrf,
@@ -81,21 +83,18 @@ 
stdenv.mkDerivation (finalAttrs: {

  pname = "sdrpp";



  upstreamVersion = "1.2.1";

  version = "${finalAttrs.upstreamVersion}-unstable-2025-10-09";

  upstreamVersion = "1.3.0";

  version = "${finalAttrs.upstreamVersion}-unstable-2026-03-24";



  src = fetchFromGitHub {

    owner = "AlexandreRouma";

    repo = "SDRPlusPlus";

    rev = "4658a1ade6707dee6f2ae09ba9eb71097223ea93";

    hash = "sha256-UxYAcqOMPQYdUbL2636LpOGbCaxHjLiJhsH62s+0AZU=";

    rev = "a6df4d58e5f6b3045883a70aeb8fb41fd5dbf1d9";

    hash = "sha256-VzeLGQTnRur5vB+M5TovpLhI2QYKvpZjZjthuGyjcm0=";

  };



  patches = [

    ./0001-Allow-management-of-resources-and-modules-paths.patch

    # CMake 4 dropped support of versions lower than 3.5,

    # versions lower than 3.10 are deprecated.

    ./cmake4.patch

  ];



  postPatch = ''
@@ -122,6 +121,7 @@ stdenv.mkDerivation (finalAttrs: { 
  ++ lib.optional airspy_source airspy

  ++ lib.optional airspyhf_source airspyhf

  ++ lib.optional bladerf_source libbladeRF

  ++ lib.optional dragonlabs_source libdlcr

  ++ lib.optional hackrf_source hackrf

  ++ lib.optional limesdr_source limesuite

  ++ lib.optionals rtl_sdr_source [
@@ -148,6 +148,7 @@ stdenv.mkDerivation (finalAttrs: { 
    (lib.cmakeBool "OPT_BUILD_AIRSPY_SOURCE" airspy_source)

    (lib.cmakeBool "OPT_BUILD_AUDIO_SOURCE" audio_source)

    (lib.cmakeBool "OPT_BUILD_BLADERF_SOURCE" bladerf_source)

    (lib.cmakeBool "OPT_BUILD_DRAGONLABS_SOURCE" dragonlabs_source)

    (lib.cmakeBool "OPT_BUILD_FILE_SOURCE" file_source)

    (lib.cmakeBool "OPT_BUILD_HACKRF_SOURCE" hackrf_source)

    (lib.cmakeBool "OPT_BUILD_HERMES_SOURCE" hermes_source)