From b3bcfbbf45a93f53a04dcab2e9a17cf9e7ba48af Mon Sep 17 00:00:00 2001 From: Andrei Pampu Date: Thu, 11 Mar 2021 15:59:39 +0200 Subject: [PATCH 1/5] sonarr: 2.0.0.5344 -> 3.0.5.1144 --- pkgs/servers/sonarr/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/sonarr/default.nix b/pkgs/servers/sonarr/default.nix index a1803abe6a8c0a..161d0652c4a303 100644 --- a/pkgs/servers/sonarr/default.nix +++ b/pkgs/servers/sonarr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "sonarr"; - version = "2.0.0.5344"; + version = "3.0.5.1144"; src = fetchurl { - url = "https://download.sonarr.tv/v2/master/mono/NzbDrone.master.${version}.mono.tar.gz"; - sha256 = "0bsxf7m2dir7gi0cfn8vdasr11q224b9mp6cixak9ss5zafwn59a"; + url = "https://download.sonarr.tv/v3/main/${version}/Sonarr.main.${version}.linux.tar.gz"; + sha256 = "1ajqh3hvjfsbs6rb2f8dnndxsycmlzamp0cwjwkh1j2dinbzdbvp"; }; nativeBuildInputs = [ makeWrapper ]; @@ -14,9 +14,8 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin cp -r * $out/bin/ - makeWrapper "${mono}/bin/mono" $out/bin/NzbDrone \ - --add-flags "$out/bin/NzbDrone.exe" \ + --add-flags "$out/bin/Sonarr.exe" \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ curl sqlite libmediainfo ]} ''; From e4fb35b116f81913b468a40d1d58ae57aa4702f3 Mon Sep 17 00:00:00 2001 From: Andrei Pampu Date: Thu, 11 Mar 2021 15:59:57 +0200 Subject: [PATCH 2/5] sonarr: change license to gpl3Only --- pkgs/servers/sonarr/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/sonarr/default.nix b/pkgs/servers/sonarr/default.nix index 161d0652c4a303..2a7c6feb5c3665 100644 --- a/pkgs/servers/sonarr/default.nix +++ b/pkgs/servers/sonarr/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Smart PVR for newsgroup and bittorrent users"; homepage = "https://sonarr.tv/"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ fadenb purcell ]; platforms = lib.platforms.all; }; From 9c6e61ab4eae2e4fabd7b357bf47e53860bc6ff0 Mon Sep 17 00:00:00 2001 From: Andrei Pampu Date: Thu, 11 Mar 2021 16:39:03 +0200 Subject: [PATCH 3/5] sonarr: add test passthru --- pkgs/servers/sonarr/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/sonarr/default.nix b/pkgs/servers/sonarr/default.nix index 2a7c6feb5c3665..e695962a987ca3 100644 --- a/pkgs/servers/sonarr/default.nix +++ b/pkgs/servers/sonarr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, mono, libmediainfo, sqlite, curl, makeWrapper, ... }: +{ lib, stdenv, fetchurl, mono, libmediainfo, sqlite, curl, makeWrapper, nixosTests, ... }: stdenv.mkDerivation rec { pname = "sonarr"; @@ -20,6 +20,10 @@ stdenv.mkDerivation rec { curl sqlite libmediainfo ]} ''; + passthru.tests = { + smoke-test = nixosTests.sonarr; + }; + meta = { description = "Smart PVR for newsgroup and bittorrent users"; homepage = "https://sonarr.tv/"; From 65e68dc7e76aa330b467acee05f22dcf52d23f24 Mon Sep 17 00:00:00 2001 From: Woky Date: Fri, 12 Mar 2021 11:40:29 +0200 Subject: [PATCH 4/5] sonarr: remove ellipses from arguments Co-authored-by: Sandro --- pkgs/servers/sonarr/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/sonarr/default.nix b/pkgs/servers/sonarr/default.nix index e695962a987ca3..b1a8bbaac7dce8 100644 --- a/pkgs/servers/sonarr/default.nix +++ b/pkgs/servers/sonarr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, mono, libmediainfo, sqlite, curl, makeWrapper, nixosTests, ... }: +{ lib, stdenv, fetchurl, mono, libmediainfo, sqlite, curl, makeWrapper, nixosTests }: stdenv.mkDerivation rec { pname = "sonarr"; From bdbb07ad6b31daaa804ee9df8a8346b1f4122de8 Mon Sep 17 00:00:00 2001 From: Andrei Pampu Date: Wed, 24 Mar 2021 17:23:12 +0200 Subject: [PATCH 5/5] sonarr: create update script --- pkgs/servers/sonarr/default.nix | 5 +++-- pkgs/servers/sonarr/update.sh | 7 +++++++ 2 files changed, 10 insertions(+), 2 deletions(-) create mode 100755 pkgs/servers/sonarr/update.sh diff --git a/pkgs/servers/sonarr/default.nix b/pkgs/servers/sonarr/default.nix index b1a8bbaac7dce8..cdaa96464e7b15 100644 --- a/pkgs/servers/sonarr/default.nix +++ b/pkgs/servers/sonarr/default.nix @@ -20,8 +20,9 @@ stdenv.mkDerivation rec { curl sqlite libmediainfo ]} ''; - passthru.tests = { - smoke-test = nixosTests.sonarr; + passthru = { + updateScript = "./update.sh"; + tests.smoke-test = nixosTests.sonarr; }; meta = { diff --git a/pkgs/servers/sonarr/update.sh b/pkgs/servers/sonarr/update.sh new file mode 100755 index 00000000000000..faa4f65cfc8f70 --- /dev/null +++ b/pkgs/servers/sonarr/update.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl jq common-updater-scripts + +latestTag=$(curl https://api.github.com/repos/Sonarr/Sonarr/tags | jq -r '.[] | .name' | sort --version-sort | tail -1) +version="$(expr $latestTag : 'v\(.*\)')" + +update-source-version sonarr "$version"