From 0ad185694c0b70d1f779c7ac357a8af86a46a6d6 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Tue, 3 May 2022 13:14:11 -0700 Subject: [PATCH 1/3] opencpn: unstable-2019-11-21 -> 5.6.2 --- pkgs/applications/misc/opencpn/default.nix | 101 +++++++++++++++++---- 1 file changed, 85 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/misc/opencpn/default.nix b/pkgs/applications/misc/opencpn/default.nix index 522c5739a882..1e726f81bfb1 100644 --- a/pkgs/applications/misc/opencpn/default.nix +++ b/pkgs/applications/misc/opencpn/default.nix @@ -1,31 +1,100 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, gtk2, wxGTK30, libpulseaudio, curl, - gettext, glib, portaudio }: +{ stdenv, lib +, alsa-utils +, at-spi2-core +, cmake +, curl +, dbus +, epoxy +, fetchFromGitHub +, flac +, gtk3 +, jasper +, libGLU +, libarchive +, libdatrie +, libelf +, libexif +, libogg +, libopus +, libselinux +, libsepol +, libsndfile +, libthai +, libunarr +, libusb +, libvorbis +, libxkbcommon +, lsb-release +, lz4 +, pcre +, pkg-config +, portaudio +, sqlite +, tinyxml +, udev +, util-linux +, wxGTK31-gtk3 +, xorg +}: stdenv.mkDerivation rec { - pname = "opencpn-unstable"; - version = "2019-11-21"; + pname = "opencpn"; + version = "5.6.2"; src = fetchFromGitHub { owner = "OpenCPN"; repo = "OpenCPN"; - rev = "e73dc935545b2bbcf193cc61d987a0178c52d7a7"; - sha256 = "0yiqahkzwcbzgabc5xgxmwlngapkfiaqyva3mwz29xj0c5lg2bdk"; + rev = "Release_${version}"; + hash = "sha256-sNZYf/2gtjRrrGPuazVnKTgcuIQpKPazhexqlK21T4g="; }; - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ gtk2 wxGTK30 libpulseaudio curl gettext - glib portaudio ]; - - cmakeFlags = [ - "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include" - "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include" + nativeBuildInputs = [ cmake lsb-release pkg-config ]; + buildInputs = [ + alsa-utils + at-spi2-core + curl + dbus + epoxy + flac + gtk3 + jasper + libGLU + libarchive + libdatrie + libelf + libexif + libogg + libopus + libselinux + libsepol + libsndfile + libthai + libunarr + libusb + libvorbis + libxkbcommon + lz4 + pcre + portaudio + sqlite + tinyxml + udev + util-linux + wxGTK31-gtk3 + xorg.libXdmcp + xorg.libXtst ]; - meta = { + + cmakeFlags = [ "-DOCPN_BUNDLE_DOCS=true" ]; + + doCheck = true; + + meta = with lib; { description = "A concise ChartPlotter/Navigator"; - maintainers = [ lib.maintainers.kragniz ]; + maintainers = with maintainers; [ kragniz lovesegfault ]; platforms = [ "x86_64-linux" ]; - license = lib.licenses.gpl2; + license = licenses.gpl2; homepage = "https://opencpn.org/"; }; } From 23fbc0816c62f4a95f28e0cd9520f2bcff4d452a Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Tue, 3 May 2022 16:21:57 -0700 Subject: [PATCH 2/3] hqplayerd: 4.30.3-87 -> 4.31.0-89 --- pkgs/servers/hqplayerd/default.nix | 61 ++++++++++++++++-------------- 1 file changed, 32 insertions(+), 29 deletions(-) diff --git a/pkgs/servers/hqplayerd/default.nix b/pkgs/servers/hqplayerd/default.nix index e2b3abc6c0a6..fb6194eaab3d 100644 --- a/pkgs/servers/hqplayerd/default.nix +++ b/pkgs/servers/hqplayerd/default.nix @@ -1,6 +1,6 @@ -{ stdenv -, alsa-lib +{ stdenv, lib , addOpenGLRunpath +, alsa-lib , autoPatchelfHook , cairo , fetchurl @@ -8,26 +8,25 @@ , gcc11 , gnome , gssdp -, lame -, lib -, libgmpris -, llvmPackages_10 -, mpg123 -, rpmextract -, wavpack - , gupnp , gupnp-av +, lame +, libgmpris +, libusb-compat-0_1 +, llvmPackages_10 , meson +, mpg123 , ninja +, rpmextract +, wavpack }: stdenv.mkDerivation rec { pname = "hqplayerd"; - version = "4.30.3-87"; + version = "4.31.0-89"; src = fetchurl { url = "https://www.signalyst.eu/bins/${pname}/fc35/${pname}-${version}.fc35.x86_64.rpm"; - hash = "sha256-fEze4aScWDwHDTXU0GatdopQf6FWcywWCGhR/7zXK7A="; + hash = "sha256-L9S3MIbvvBViKSxu0x/GkE/pa61NETtw4vA8xM4rJEg="; }; unpackPhase = '' @@ -47,6 +46,7 @@ stdenv.mkDerivation rec { gupnp-av lame libgmpris + libusb-compat-0_1 llvmPackages_10.openmp mpg123 wavpack @@ -58,34 +58,37 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - # main executable - mkdir -p $out/bin - cp ./usr/bin/hqplayerd $out/bin + # executables + mkdir -p $out + cp -rv ./usr/bin $out/bin - # main configuration - mkdir -p $out/etc/hqplayer - cp ./etc/hqplayer/hqplayerd.xml $out/etc/hqplayer/ + # libs + mkdir -p $out + cp -rv ./opt/hqplayerd/lib $out + + # configuration + mkdir -p $out/etc + cp -rv ./etc/hqplayer $out/etc/ # udev rules - mkdir -p $out/etc/udev/rules.d - cp ./etc/udev/rules.d/50-taudio2.rules $out/etc/udev/rules.d/ + mkdir -p $out/etc/udev + cp -rv ./etc/udev/rules.d $out/etc/udev/ # kernel module cfgs - mkdir -p $out/etc/modules-load.d - cp ./etc/modules-load.d/taudio2.conf $out/etc/modules-load.d/ + mkdir -p $out/etc + cp -rv ./etc/modules-load.d $out/etc/ # systemd service file - mkdir -p $out/lib/systemd/system - cp ./usr/lib/systemd/system/hqplayerd.service $out/lib/systemd/system/ + mkdir -p $out/lib/systemd + cp -rv ./usr/lib/systemd/system $out/lib/systemd/ # documentation - mkdir -p $out/share/doc/hqplayerd - cp ./usr/share/doc/hqplayerd/* $out/share/doc/hqplayerd/ + mkdir -p $out/share/doc + cp -rv ./usr/share/doc/hqplayerd $out/share/doc/ # misc service support files - mkdir -p $out/var/lib/hqplayer - cp -r ./var/lib/hqplayer/web $out/var/lib/hqplayer - + mkdir -p $out/var/lib + cp -rv ./var/lib/hqplayer $out/var/lib/ runHook postInstall ''; From c15cf25d3d8af5db8bd090d41a639bc912c39543 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Tue, 3 May 2022 16:28:46 -0700 Subject: [PATCH 3/3] roon-server: 1.8-933 -> 1.8-935 --- pkgs/servers/roon-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/roon-server/default.nix b/pkgs/servers/roon-server/default.nix index a9166985ead2..9e8c0254fca9 100644 --- a/pkgs/servers/roon-server/default.nix +++ b/pkgs/servers/roon-server/default.nix @@ -16,7 +16,7 @@ }: stdenv.mkDerivation rec { pname = "roon-server"; - version = "1.8-933"; + version = "1.8-935"; src = let @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { in fetchurl { url = "http://download.roonlabs.com/builds/RoonServer_linuxx64_${urlVersion}.tar.bz2"; - hash = "sha256-9vAp60hck1Zys0Yv4uibLp7GUAoPvkE9AxNp9DXsQfE="; + hash = "sha256-6I612imOCqxVlNu6zCXWS/Yy8bnot+0723t3Se4DjLg="; }; dontConfigure = true;