From 87b42fea6702040aae6df95ae753a662a31d3ec2 Mon Sep 17 00:00:00 2001 From: jecaro Date: Tue, 21 Mar 2023 15:21:42 +0100 Subject: [PATCH 1/3] slimserver: 7.9.2 -> 8.3.1 now use the CPAN modules shipped with slimserver, this should ease the maintainability of the package also fix #178494 --- pkgs/servers/slimserver/default.nix | 90 +++++------------------------ 1 file changed, 14 insertions(+), 76 deletions(-) diff --git a/pkgs/servers/slimserver/default.nix b/pkgs/servers/slimserver/default.nix index 5576eb75ef35..d08f2cd117f1 100644 --- a/pkgs/servers/slimserver/default.nix +++ b/pkgs/servers/slimserver/default.nix @@ -1,98 +1,35 @@ -{ lib +{ faad2 , fetchFromGitHub -, makeWrapper -, perlPackages , flac -, faad2 -, sox , lame +, lib +, makeWrapper , monkeysAudio +, perl534Packages +, sox +, stdenv , wavpack +, zlib }: -perlPackages.buildPerlPackage rec { +perl534Packages.buildPerlPackage rec { pname = "slimserver"; - version = "7.9.2"; + version = "8.3.1"; src = fetchFromGitHub { owner = "Logitech"; repo = "slimserver"; rev = version; - hash = "sha256-P4CSu/ff6i48uWV5gXsJgayZ1S1s0RAqa5O5y3Y0g9Y="; + hash = "sha256-yMFOwh/oPiJnUsKWBGvd/GZLjkWocMAUK0r+Hx/SUPo="; }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ - perlPackages.perl - perlPackages.AnyEvent - perlPackages.ArchiveZip - perlPackages.AudioScan - perlPackages.CarpClan - perlPackages.CGI - perlPackages.ClassXSAccessor - perlPackages.DataDump - perlPackages.DataURIEncode - perlPackages.DBDSQLite - perlPackages.DBI - perlPackages.DBIxClass - perlPackages.DigestSHA1 - perlPackages.EV - perlPackages.ExporterLite - perlPackages.FileBOM - perlPackages.FileCopyRecursive - perlPackages.FileNext - perlPackages.FileReadBackwards - perlPackages.FileSlurp - perlPackages.FileWhich - perlPackages.HTMLParser - perlPackages.HTTPCookies - perlPackages.HTTPDaemon - perlPackages.HTTPMessage - perlPackages.ImageScale - perlPackages.IOSocketSSL - perlPackages.IOString - perlPackages.JSONXSVersionOneAndTwo - perlPackages.LogLog4perl - perlPackages.LWP - perlPackages.NetHTTP - perlPackages.NetHTTPSNB - perlPackages.ProcBackground - perlPackages.SubName - perlPackages.TemplateToolkit - perlPackages.TextUnidecode - perlPackages.TieCacheLRU - perlPackages.TieCacheLRUExpires - perlPackages.TieRegexpHash - perlPackages.TimeDate - perlPackages.URI - perlPackages.URIFind - perlPackages.UUIDTiny - perlPackages.XMLParser - perlPackages.XMLSimple - perlPackages.YAMLLibYAML - ]; + buildInputs = [ perl534Packages.IOSocketSSL ]; prePatch = '' - mkdir CPAN_used - # slimserver doesn't work with current DBIx/SQL versions, use bundled copies - mv CPAN/DBIx CPAN/SQL CPAN_used - rm -rf CPAN rm -rf Bin touch Makefile.PL - - # relax audio scan version constraints - substituteInPlace lib/Audio/Scan.pm --replace "0.93" "1.01" - substituteInPlace modules.conf --replace "Audio::Scan 0.93 0.95" "Audio::Scan 0.93" - ''; - - preConfigurePhase = ""; - - buildPhase = '' - mv lib tmp - mkdir -p ${perlPackages.perl.libPrefix} - mv CPAN_used/* ${perlPackages.perl.libPrefix} - cp -rf tmp/* ${perlPackages.perl.libPrefix} ''; doCheck = false; @@ -100,6 +37,7 @@ perlPackages.buildPerlPackage rec { installPhase = '' cp -r . $out wrapProgram $out/slimserver.pl \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ zlib stdenv.cc.cc.lib ]}" \ --prefix PATH : "${lib.makeBinPath [ lame flac faad2 sox monkeysAudio wavpack ]}" ''; @@ -109,9 +47,9 @@ perlPackages.buildPerlPackage rec { homepage = "https://github.com/Logitech/slimserver"; description = "Server for Logitech Squeezebox players. This server is also called Logitech Media Server"; # the firmware is not under a free license! - # https://github.com/Logitech/slimserver/blob/public/7.9/License.txt + # https://github.com/Logitech/slimserver/blob/public/8.3/License.txt license = licenses.unfree; - maintainers = [ ]; + maintainers = with maintainers; [ jecaro ]; platforms = platforms.unix; }; } From b64535747889e2913a203df0f6e05393409ef971 Mon Sep 17 00:00:00 2001 From: jecaro Date: Fri, 24 Mar 2023 10:49:12 +0100 Subject: [PATCH 2/3] slimserver: fix load of plugin ShairTunes2 --- pkgs/servers/slimserver/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/slimserver/default.nix b/pkgs/servers/slimserver/default.nix index d08f2cd117f1..54f0eaef9814 100644 --- a/pkgs/servers/slimserver/default.nix +++ b/pkgs/servers/slimserver/default.nix @@ -25,7 +25,7 @@ perl534Packages.buildPerlPackage rec { nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ perl534Packages.IOSocketSSL ]; + buildInputs = [ perl534Packages.CryptOpenSSLRSA perl534Packages.IOSocketSSL ]; prePatch = '' rm -rf Bin From 196a95c01eacf8dbd4e6d615f02f3cdbf49b011c Mon Sep 17 00:00:00 2001 From: jecaro Date: Fri, 24 Mar 2023 13:56:10 +0100 Subject: [PATCH 3/3] slimserver: add adamcstephens as a maintainer --- pkgs/servers/slimserver/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/slimserver/default.nix b/pkgs/servers/slimserver/default.nix index 54f0eaef9814..4a98e2a436e1 100644 --- a/pkgs/servers/slimserver/default.nix +++ b/pkgs/servers/slimserver/default.nix @@ -49,7 +49,7 @@ perl534Packages.buildPerlPackage rec { # the firmware is not under a free license! # https://github.com/Logitech/slimserver/blob/public/8.3/License.txt license = licenses.unfree; - maintainers = with maintainers; [ jecaro ]; + maintainers = with maintainers; [ adamcstephens jecaro ]; platforms = platforms.unix; }; }