diff options
author | Adam C. Stephens <2071575+adamcstephens@users.noreply.github.com> | 2024-03-20 13:59:31 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-03-20 13:59:31 -0400 |
commit | 761426d33e10ee8972e3482aa0bcf634605c96b2 (patch) | |
tree | f10f5e99eb54b6119727e4f23af0cf9079efbfe4 | |
parent | 562f67be788650a9068f8be2f568b90b014a0c67 (diff) | |
parent | b2f79605c3ca8298697d191d29729bc060a774c6 (diff) | |
download | nixlib-761426d33e10ee8972e3482aa0bcf634605c96b2.tar nixlib-761426d33e10ee8972e3482aa0bcf634605c96b2.tar.gz nixlib-761426d33e10ee8972e3482aa0bcf634605c96b2.tar.bz2 nixlib-761426d33e10ee8972e3482aa0bcf634605c96b2.tar.lz nixlib-761426d33e10ee8972e3482aa0bcf634605c96b2.tar.xz nixlib-761426d33e10ee8972e3482aa0bcf634605c96b2.tar.zst nixlib-761426d33e10ee8972e3482aa0bcf634605c96b2.zip |
Merge pull request #297452 from adamcstephens/slimserver/8.5.0
slimserver: 8.4.0 -> 8.5.0
-rw-r--r-- | pkgs/by-name/sl/slimserver/package.nix (renamed from pkgs/servers/slimserver/default.nix) | 26 | ||||
-rwxr-xr-x | pkgs/by-name/sl/slimserver/update.nu | 14 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 28 insertions, 14 deletions
diff --git a/pkgs/servers/slimserver/default.nix b/pkgs/by-name/sl/slimserver/package.nix index 1703c03dee26..94b13c99e9dc 100644 --- a/pkgs/servers/slimserver/default.nix +++ b/pkgs/by-name/sl/slimserver/package.nix @@ -6,7 +6,7 @@ , makeWrapper , monkeysAudio , nixosTests -, perl538Packages +, perlPackages , sox , stdenv , wavpack @@ -15,20 +15,18 @@ }: let - perlPackages = perl538Packages; - binPath = lib.makeBinPath ([ lame flac faad2 sox wavpack ] ++ (lib.optional stdenv.isLinux monkeysAudio)); libPath = lib.makeLibraryPath [ zlib stdenv.cc.cc.lib ]; in perlPackages.buildPerlPackage rec { pname = "slimserver"; - version = "8.4.0"; + version = "8.5.0"; src = fetchFromGitHub { - owner = "Logitech"; + owner = "LMS-Community"; repo = "slimserver"; rev = version; - hash = "sha256-92mKchgAWRIrNOeK/zXUYRqIAk6THdtz1zQe3fg2kE0="; + hash = "sha256-yDJVqZ0+qVm4r/wmQK/hf9uRJaN56WQMO28RE59mNNI="; }; nativeBuildInputs = [ makeWrapper ]; @@ -58,7 +56,7 @@ perlPackages.buildPerlPackage rec { DataURIEncode DBDSQLite DBI - # DBIxClass # https://github.com/Logitech/slimserver/issues/138 + # DBIxClass # https://github.com/LMS-Community/slimserver/issues/138 DigestSHA1 EncodeDetect EV @@ -144,16 +142,20 @@ perlPackages.buildPerlPackage rec { outputs = [ "out" ]; - passthru.tests = { - inherit (nixosTests) slimserver; + passthru = { + tests = { + inherit (nixosTests) slimserver; + }; + + updateScript = ./update.nu; }; meta = with lib; { - homepage = "https://github.com/Logitech/slimserver"; - changelog = "https://github.com/Logitech/slimserver/blob/${version}/Changelog${lib.versions.major version}.html"; + homepage = "https://github.com/LMS-Community/slimserver"; + changelog = "https://github.com/LMS-Community/slimserver/blob/${version}/Changelog${lib.versions.major version}.html"; description = "Server for Logitech Squeezebox players. This server is also called Logitech Media Server"; # the firmware is not under a free license, so we do not include firmware in the default package - # https://github.com/Logitech/slimserver/blob/public/8.3/License.txt + # https://github.com/LMS-Community/slimserver/blob/public/8.3/License.txt license = if enableUnfreeFirmware then licenses.unfree else licenses.gpl2Only; mainProgram = "slimserver"; maintainers = with maintainers; [ adamcstephens jecaro ]; diff --git a/pkgs/by-name/sl/slimserver/update.nu b/pkgs/by-name/sl/slimserver/update.nu new file mode 100755 index 000000000000..556ed236bb68 --- /dev/null +++ b/pkgs/by-name/sl/slimserver/update.nu @@ -0,0 +1,14 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i nu -p nushell common-updater-scripts + +# get latest tag, but drop versions 10.0 tags since they are 10+ years old +let latest_tag = list-git-tags --url=https://github.com/LMS-Community/slimserver | lines | find --invert 10.0 | sort --natural | last + +let current_version = nix eval --raw -f default.nix slimserver | str trim + +if $latest_tag != $current_version { + update-source-version slimserver $latest_tag $"--file=(pwd)/pkgs/by-name/sl/slimserver/package.nix" + {before: $current_version, after: $latest_tag} +} else { + "No new version" +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 29567e51e7f8..5719b064e9eb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26949,8 +26949,6 @@ with pkgs; sipwitch = callPackage ../servers/sip/sipwitch { }; - slimserver = callPackage ../servers/slimserver { }; - smcroute = callPackage ../servers/smcroute { }; snipe-it = callPackage ../by-name/sn/snipe-it/package.nix { |