From 1c9263c763b990215118758902ec95f41a904aa8 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 26 Sep 2024 20:44:24 +0200 Subject: [PATCH 1/2] abracadabra: 2.5.1 -> 2.6.0 --- pkgs/applications/radio/abracadabra/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/radio/abracadabra/default.nix b/pkgs/applications/radio/abracadabra/default.nix index f1177fe5419ef..6bae50f427178 100644 --- a/pkgs/applications/radio/abracadabra/default.nix +++ b/pkgs/applications/radio/abracadabra/default.nix @@ -1,18 +1,18 @@ { lib, stdenv, fetchFromGitHub, cmake, wrapQtAppsHook -, qtbase, qtmultimedia, qttools +, qtbase, qtmultimedia, qttools, qtpositioning, qtlocation , faad2, mpg123, portaudio , libusb1, rtl-sdr, airspy, soapysdr-with-plugins } : stdenv.mkDerivation rec { pname = "abracadabra"; - version = "2.5.1"; + version = "2.6.0"; src = fetchFromGitHub { owner = "KejPi"; repo = "AbracaDABra"; rev = "v${version}"; - hash = "sha256-EaHVHfyhQTxxLtb3wsJV7Fea2jyENnfn6Lv/3GwAKdk="; + hash = "sha256-oO8ef2VTw/gVNNU2JRXtEHEkJm7X7dypjZr0vZXCfH8="; }; nativeBuildInputs = [ @@ -24,6 +24,8 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase qtmultimedia + qtlocation + qtpositioning faad2 mpg123 portaudio From b86a96d1747dc4c580e002c8e433666aa490adbd Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 26 Sep 2024 20:48:45 +0200 Subject: [PATCH 2/2] abracadabra: apply nixfmt --- .../radio/abracadabra/default.nix | 25 ++++++++++++++----- 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/radio/abracadabra/default.nix b/pkgs/applications/radio/abracadabra/default.nix index 6bae50f427178..faede7f8d7f6d 100644 --- a/pkgs/applications/radio/abracadabra/default.nix +++ b/pkgs/applications/radio/abracadabra/default.nix @@ -1,8 +1,22 @@ -{ lib, stdenv, fetchFromGitHub, cmake, wrapQtAppsHook -, qtbase, qtmultimedia, qttools, qtpositioning, qtlocation -, faad2, mpg123, portaudio -, libusb1, rtl-sdr, airspy, soapysdr-with-plugins -} : +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + wrapQtAppsHook, + qtbase, + qtmultimedia, + qttools, + qtpositioning, + qtlocation, + faad2, + mpg123, + portaudio, + libusb1, + rtl-sdr, + airspy, + soapysdr-with-plugins, +}: stdenv.mkDerivation rec { pname = "abracadabra"; @@ -49,4 +63,3 @@ stdenv.mkDerivation rec { mainProgram = "AbracaDABra"; }; } -