nur-packages

My NUR packages
git clone git://git.sikmir.ru/nur-packages
Log | Files | Refs | README | LICENSE

commit 5a300fd37a2abc432c3bd2d21ddb116f43dd6870
parent ddb147b8154839628706b7f81ea54f04bc5356a9
Author: Nikolay Korotkiy <sikmir@gmail.com>
Date:   Fri, 22 Oct 2021 13:11:43 +0300

Up

Diffstat:
Mflake.lock | 6+++---
Mpkgs/data/maps/maptourist/default.nix | 4++--
Mpkgs/gemini/gmid/default.nix | 4++--
Mpkgs/gpx/garta/default.nix | 6++----
Mpkgs/radio/sdrpp/default.nix | 37++++++++++++++++++++++++++-----------
Mpkgs/suckless/imscript/default.nix | 6+++---
6 files changed, 38 insertions(+), 25 deletions(-)

diff --git a/flake.lock b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1633329294, - "narHash": "sha256-0LpQLS4KMgxslMgmDHmxG/5twFlXDBW9z4Or1iOrCvU=", + "lastModified": 1633422745, + "narHash": "sha256-gA6Ok64nPbkjHk3Oanq4641EeYkjcKhisDF9wBjLxEk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ee084c02040e864eeeb4cf4f8538d92f7c675671", + "rev": "8e1eab9eae4278c9bb1dcae426848a581943db5a", "type": "github" }, "original": { diff --git a/pkgs/data/maps/maptourist/default.nix b/pkgs/data/maps/maptourist/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "maptourist"; - version = "2021-10-14"; + version = "2021-10-22"; src = fetchurl { url = "https://maptourist.org/osm-garmin/archive/OSM-MapTourist-szfo-RU_${version}.zip"; - hash = "sha256-DAt4EHeCSX5OysDpf1UHHra20skUXfiuW2kJtvn79I4="; + hash = "sha256-wGy4floOFuLJb2eRljd4dUIezsX3AkujOgSu0sqeHic="; }; sourceRoot = "."; diff --git a/pkgs/gemini/gmid/default.nix b/pkgs/gemini/gmid/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gmid"; - version = "1.7.4"; + version = "1.7.5"; src = fetchFromGitHub { owner = "omar-polo"; repo = pname; rev = version; - hash = "sha256-yjbuLlcacV/NQE4UgywczXDkkqHMoIsHhdHAus0zw/0="; + hash = "sha256-BBd0AL5jRRslxzDnxcTZRR+8J5D23NAQ7mp9K+leXAQ="; }; nativeBuildInputs = [ bison ]; diff --git a/pkgs/gpx/garta/default.nix b/pkgs/gpx/garta/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, rust, fetchFromGitLab, pkg-config, firejail +{ lib, stdenv, rustPlatform, rust, fetchFromGitLab, pkg-config , atk, cairo, gdk-pixbuf, glib, gtk3, harfbuzz, openssl, pango, zlib }: @@ -37,9 +37,6 @@ rustPlatform.buildRustPackage rec { substituteInPlace install.sh \ --replace "/etc/firejail" "$out/etc/firejail" - substituteInPlace garta.profile \ - --replace "/etc/firejail" "${firejail}/etc/firejail" - patchShebangs install.sh ''; @@ -48,6 +45,7 @@ rustPlatform.buildRustPackage rec { installPhase = '' ./install.sh install -Dm644 ${./inkatlas.json} $out/share/garta/maps/inkatlas.json + rm -fr $out/etc ''; enableParallelBuilding = true; diff --git a/pkgs/radio/sdrpp/default.nix b/pkgs/radio/sdrpp/default.nix @@ -1,30 +1,34 @@ { stdenv, lib, fetchFromGitHub, cmake, pkg-config , libX11, glfw, glew, fftwFloat, volk # Sources -, airspy_source ? false, airspy +, airspy_source ? true, airspy , airspyhf_source ? true, airspyhf -, bladerf_source ? true, libbladeRF +, bladerf_source ? false, libbladeRF , file_source ? true , hackrf_source ? true, hackrf -, limesdr_source ? true, limesuite +, limesdr_source ? false, limesuite , sddc_source ? false -, rtl_sdr_source ? true, librtlsdr, libusb +, rtl_sdr_source ? true, librtlsdr, libusb1 , rtl_tcp_source ? true , sdrplay_source ? false, sdrplay , soapy_source ? true, soapysdr -, spyserver_source ? false +, spyserver_source ? true , plutosdr_source ? true, libiio, libad9361 # Sinks , audio_sink ? true, rtaudio +, portaudio_sink ? false, portaudio +, network_sink ? true # Decoders -, falcon9_decoder ? false, ffmpeg-full +, falcon9_decoder ? false +, m17_decoder ? false, codec2 , meteor_demodulator ? true , radio ? true -, weather_sat_decoder ? false +, weather_sat_decoder ? true # Misc -, discord_integration ? true +, discord_presence ? true , frequency_manager ? true , recorder ? true +, rigctl_server ? true }: stdenv.mkDerivation rec { @@ -41,6 +45,8 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace CMakeLists.txt \ --replace "/usr" $out + substituteInPlace decoder_modules/m17_decoder/src/m17dsp.h \ + --replace "codec2.h" "codec2/codec2.h" ''; nativeBuildInputs = [ cmake pkg-config ]; @@ -52,11 +58,13 @@ stdenv.mkDerivation rec { ++ lib.optional bladerf_source libbladeRF ++ lib.optional hackrf_source hackrf ++ lib.optional limesdr_source limesuite - ++ lib.optionals rtl_sdr_source [ librtlsdr libusb ] + ++ lib.optionals rtl_sdr_source [ librtlsdr libusb1 ] ++ lib.optional sdrplay_source sdrplay ++ lib.optional soapy_source soapysdr ++ lib.optionals plutosdr_source [ libiio libad9361 ] - ++ lib.optional audio_sink rtaudio; + ++ lib.optional audio_sink rtaudio + ++ lib.optional portaudio_sink portaudio + ++ lib.optional m17_decoder codec2; cmakeFlags = lib.mapAttrsToList (k: v: "-D${k}=${if v then "ON" else "OFF"}") { OPT_BUILD_AIRSPY_SOURCE = airspy_source; @@ -73,15 +81,22 @@ stdenv.mkDerivation rec { OPT_BUILD_SPYSERVER_SOURCE = spyserver_source; OPT_BUILD_PLUTOSDR_SOURCE = plutosdr_source; OPT_BUILD_AUDIO_SINK = audio_sink; + OPT_BUILD_PORTAUDIO_SINK = portaudio_sink; + OPT_BUILD_NETWORK_SINK = network_sink; + OPT_BUILD_NEW_PORTAUDIO_SINK = portaudio_sink; OPT_BUILD_FALCON9_DECODER = falcon9_decoder; + OPT_BUILD_M17_DECODER = m17_decoder; OPT_BUILD_METEOR_DEMODULATOR = meteor_demodulator; OPT_BUILD_RADIO = radio; OPT_BUILD_WEATHER_SAT_DECODER = weather_sat_decoder; - OPT_BUILD_DISCORD_PRESENCE = discord_integration; + OPT_BUILD_DISCORD_PRESENCE = discord_presence; OPT_BUILD_FREQUENCY_MANAGER = frequency_manager; OPT_BUILD_RECORDER = recorder; + OPT_BUILD_RIGCTL_SERVER = rigctl_server; }; + NIX_CFLAGS_COMPILE = "-fpermissive"; + meta = with lib; { description = "Cross-Platform SDR Software"; inherit (src.meta) homepage; diff --git a/pkgs/suckless/imscript/default.nix b/pkgs/suckless/imscript/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "imscript"; - version = "2021-10-12"; + version = "2021-10-20"; src = fetchFromSourcehut { owner = "~coco"; repo = pname; - rev = "f500690dbdf46aa693132c20dd09b5e538ce193e"; - hash = "sha256-EnYpOmkkZW6cnUjcwgRw6v+/BcptSkaE/BwGjOOAVU8="; + rev = "3619d8e0d3b273d1f912a038e52a88c30c05c5a1"; + hash = "sha256-3S3I+ttsF4IAO095r1eodhOaCWxPU6N2h5KzPc9pev0="; }; buildInputs = [ libpng libjpeg libtiff libwebp fftwFloat libX11 gsl ];