From b6cb26876d8e9e9a02030568df827c3c9580e781 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Wed, 20 Mar 2024 08:50:47 -0400 Subject: [PATCH 1/3] slimserver: add updatescript, move to by-name --- .../sl/slimserver/package.nix} | 12 +++++++----- pkgs/by-name/sl/slimserver/update.nu | 14 ++++++++++++++ pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 21 insertions(+), 7 deletions(-) rename pkgs/{servers/slimserver/default.nix => by-name/sl/slimserver/package.nix} (97%) create mode 100755 pkgs/by-name/sl/slimserver/update.nu diff --git a/pkgs/servers/slimserver/default.nix b/pkgs/by-name/sl/slimserver/package.nix similarity index 97% rename from pkgs/servers/slimserver/default.nix rename to pkgs/by-name/sl/slimserver/package.nix index 1703c03dee26..1c7891dde38a 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,8 +15,6 @@ }: 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 @@ -144,8 +142,12 @@ perlPackages.buildPerlPackage rec { outputs = [ "out" ]; - passthru.tests = { - inherit (nixosTests) slimserver; + passthru = { + tests = { + inherit (nixosTests) slimserver; + }; + + updateScript = ./update.nu; }; meta = with lib; { diff --git a/pkgs/by-name/sl/slimserver/update.nu b/pkgs/by-name/sl/slimserver/update.nu new file mode 100755 index 000000000000..546363507e36 --- /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/logitech/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 bed6d9d7adab..a336121637f1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26953,8 +26953,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 { From e660562087ea3aae56b3b490f683d7a184be00a3 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Wed, 20 Mar 2024 12:56:10 +0000 Subject: [PATCH 2/3] slimserver: 8.4.0 -> 8.5.0 --- pkgs/by-name/sl/slimserver/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sl/slimserver/package.nix b/pkgs/by-name/sl/slimserver/package.nix index 1c7891dde38a..ce77c6b18725 100644 --- a/pkgs/by-name/sl/slimserver/package.nix +++ b/pkgs/by-name/sl/slimserver/package.nix @@ -20,13 +20,13 @@ let in perlPackages.buildPerlPackage rec { pname = "slimserver"; - version = "8.4.0"; + version = "8.5.0"; src = fetchFromGitHub { owner = "Logitech"; repo = "slimserver"; rev = version; - hash = "sha256-92mKchgAWRIrNOeK/zXUYRqIAk6THdtz1zQe3fg2kE0="; + hash = "sha256-yDJVqZ0+qVm4r/wmQK/hf9uRJaN56WQMO28RE59mNNI="; }; nativeBuildInputs = [ makeWrapper ]; From b2f79605c3ca8298697d191d29729bc060a774c6 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Wed, 20 Mar 2024 08:59:44 -0400 Subject: [PATCH 3/3] slimserver: Logitech -> LMS-Community --- pkgs/by-name/sl/slimserver/package.nix | 10 +++++----- pkgs/by-name/sl/slimserver/update.nu | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/sl/slimserver/package.nix b/pkgs/by-name/sl/slimserver/package.nix index ce77c6b18725..94b13c99e9dc 100644 --- a/pkgs/by-name/sl/slimserver/package.nix +++ b/pkgs/by-name/sl/slimserver/package.nix @@ -23,7 +23,7 @@ perlPackages.buildPerlPackage rec { version = "8.5.0"; src = fetchFromGitHub { - owner = "Logitech"; + owner = "LMS-Community"; repo = "slimserver"; rev = version; hash = "sha256-yDJVqZ0+qVm4r/wmQK/hf9uRJaN56WQMO28RE59mNNI="; @@ -56,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 @@ -151,11 +151,11 @@ perlPackages.buildPerlPackage rec { }; 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 index 546363507e36..556ed236bb68 100755 --- a/pkgs/by-name/sl/slimserver/update.nu +++ b/pkgs/by-name/sl/slimserver/update.nu @@ -2,7 +2,7 @@ #!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/logitech/slimserver | lines | find --invert 10.0 | sort --natural | last +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