Unverified Commit 761426d3 authored by Adam C. Stephens's avatar Adam C. Stephens Committed by GitHub
Browse files

Merge pull request #297452 from adamcstephens/slimserver/8.5.0 

slimserver: 8.4.0 -> 8.5.0
parents 562f67be b2f79605

pkgs/servers/slimserver/default.nix→pkgs/by-name/sl/slimserver/package.nix

+14 −12
Original line number Diff line number Diff line
@@ -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 = {

  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 ];

pkgs/by-name/sl/slimserver/update.nu

0 → 100755
+14 −0
Original line number Diff line number Diff line 
#!/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"

}

pkgs/top-level/all-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -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 {