From 64252b8996aecc51f0059aa35420ec676e8602e7 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Sun, 18 Apr 2021 22:25:39 -0700 Subject: [PATCH 1/4] beets: unstable-2021-03-24 -> unstable-2021-04-17 --- pkgs/tools/audio/beets/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index ef47578ac57..b9ed3eca919 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -105,13 +105,13 @@ in pythonPackages.buildPythonApplication rec { # unstable does not require bs1770gain[2]. # [1]: https://discourse.beets.io/t/forming-a-beets-core-team/639 # [2]: https://github.com/NixOS/nixpkgs/pull/90504 - version = "unstable-2021-03-24"; + version = "unstable-2021-04-17"; src = fetchFromGitHub { owner = "beetbox"; repo = "beets"; - rev = "854b4ab48324afe8884fcd11fa47bd6258d2f4f7"; - sha256 = "sha256-y5EWVNF4bd9fNvU6VkucMpenyFZuqdPkrqQDgG9ZPJY="; + rev = "50163b373f527d1b1f8b2442240ca547e846744e"; + sha256 = "sha256-l7drav4Qx2JCF+F5OA0s641idcKM3S4Yx2lM2evJQWE="; }; propagatedBuildInputs = [ From d79b8ade649685b9b13d6a7246067b1bd72d9000 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Sun, 18 Apr 2021 22:29:37 -0700 Subject: [PATCH 2/4] beetsExternalPlugins.alternatives: 0.10.2 -> unstable-2021-02-01 --- pkgs/tools/audio/beets/plugins/alternatives.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/audio/beets/plugins/alternatives.nix b/pkgs/tools/audio/beets/plugins/alternatives.nix index c0b9123d96a..146e9f50664 100644 --- a/pkgs/tools/audio/beets/plugins/alternatives.nix +++ b/pkgs/tools/audio/beets/plugins/alternatives.nix @@ -2,13 +2,13 @@ pythonPackages.buildPythonApplication rec { pname = "beets-alternatives"; - version = "0.10.2"; + version = "unstable-2021-02-01"; src = fetchFromGitHub { repo = "beets-alternatives"; owner = "geigerzaehler"; - rev = "v${version}"; - sha256 = "1dsz94fb29wra1f9580w20bz2f1bgkj4xnsjgwgbv14flbfw4bp0"; + rev = "288299e3aa9a1602717b04c28696fce5ce4259bf"; + sha256 = "sha256-Xl7AHr33hXQqQDuFbWuj8HrIugeipJFPmvNXpCkU/mI="; }; postPatch = '' @@ -23,10 +23,10 @@ pythonPackages.buildPythonApplication rec { mock ]; - meta = { + meta = with lib; { description = "Beets plugin to manage external files"; homepage = "https://github.com/geigerzaehler/beets-alternatives"; - maintainers = [ lib.maintainers.aszlig ]; - license = lib.licenses.mit; + maintainers = with maintainers; [ aszlig lovesegfault ]; + license = licenses.mit; }; } From d1e9d296c9e832ff8f0c10374c8de7ac8c1b64c4 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Sun, 18 Apr 2021 22:33:57 -0700 Subject: [PATCH 3/4] beetsExternalPlugins.copyartifacts: unstable-2020-02-15 --- pkgs/tools/audio/beets/plugins/copyartifacts.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/audio/beets/plugins/copyartifacts.nix b/pkgs/tools/audio/beets/plugins/copyartifacts.nix index b8a17a7d13e..2f1ecdfc369 100644 --- a/pkgs/tools/audio/beets/plugins/copyartifacts.nix +++ b/pkgs/tools/audio/beets/plugins/copyartifacts.nix @@ -1,13 +1,14 @@ { lib, fetchFromGitHub, beets, pythonPackages, glibcLocales }: pythonPackages.buildPythonApplication { - name = "beets-copyartifacts"; + pname = "beets-copyartifacts"; + version = "unstable-2020-02-15"; src = fetchFromGitHub { repo = "beets-copyartifacts"; - owner = "sbarakat"; - rev = "d0bb75c8fc8fe125e8191d73de7ade6212aec0fd"; - sha256 = "19b4lqq1p45n348ssmql60jylw2fw7vfj9j22nly5qj5qx51j3g5"; + owner = "adammillerio"; + rev = "85eefaebf893cb673fa98bfde48406ec99fd1e4b"; + sha256 = "sha256-bkT2BZZ2gdcacgvyrVe2vMrOMV8iMAm8Q5xyrZzyqU0="; }; postPatch = '' From 0abef5982171c6fe688685e37b5744581fdfb775 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Sun, 18 Apr 2021 22:37:20 -0700 Subject: [PATCH 4/4] beetsExternalPlugins.extrafiles: 0.0.7 -> unstable-2020-12-13 --- pkgs/tools/audio/beets/plugins/extrafiles.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/audio/beets/plugins/extrafiles.nix b/pkgs/tools/audio/beets/plugins/extrafiles.nix index 0ab6b3e5414..9118765cc1b 100644 --- a/pkgs/tools/audio/beets/plugins/extrafiles.nix +++ b/pkgs/tools/audio/beets/plugins/extrafiles.nix @@ -2,13 +2,13 @@ pythonPackages.buildPythonApplication rec { pname = "beets-extrafiles"; - version = "0.0.7"; + version = "unstable-2020-12-13"; src = fetchFromGitHub { repo = "beets-extrafiles"; owner = "Holzhaus"; - rev = "v${version}"; - sha256 = "0ah7mgax9zrhvvd5scf2z0v0bhd6xmmv5sdb6av840ixpl6vlvm6"; + rev = "a1d6ef9a9682b6bf7af9483541e56a3ff12247b8"; + sha256 = "sha256-ajuEbieWjTCNjdRZuGUwvStZwjx260jmY0m+ZqNd7ec="; }; postPatch = '' @@ -18,6 +18,8 @@ pythonPackages.buildPythonApplication rec { nativeBuildInputs = [ beets ]; + propagatedBuildInputs = with pythonPackages; [ mediafile ]; + preCheck = '' HOME=$TEMPDIR '';