Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c1f0b9bb3331
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: fc433ae9ff7e
Choose a head ref
  • 5 commits
  • 5 files changed
  • 1 contributor

Commits on Mar 15, 2019

  1. python.pkgs.click-default-group: use pytest_3 

    (cherry picked from commit 7b045cd)
    Robert Schütz committed Mar 15, 2019
    Copy the full SHA
    6758025 View commit details

  2. python3.pkgs.audio-metadata: fix build 

    (cherry picked from commit 2f3edc1)
    Robert Schütz committed Mar 15, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c5e98b6 View commit details

  3. python3.pkgs.google-music: fix build 

    (cherry picked from commit f06bec0)
    Robert Schütz committed Mar 15, 2019
    Copy the full SHA
    d2aff54 View commit details

  4. python3.pkgs.google-music-utils: 2.0.0 -> 2.1.0 

    (cherry picked from commit b1ad192)
    Robert Schütz committed Mar 15, 2019
    Copy the full SHA
    3494a89 View commit details

  5. google-music-scripts: 3.0.0 -> 4.0.1 

    (cherry picked from commit 12d625f)
    Robert Schütz committed Mar 15, 2019
    Copy the full SHA
    fc433ae View commit details
6 changes: 6 additions & 0 deletions pkgs/development/python-modules/audio-metadata/default.nix
View file
Original file line number Diff line number Diff line change
@@ -15,6 +15,12 @@ buildPythonPackage rec {
sha256 = "a881f0f3b82752d306ac0a7850ed0e31bad275a399f63097733b4890986084b2";
};

postPatch = ''
substituteInPlace setup.py \
--replace "bidict>=0.17,<0.18" "bidict" \
--replace "more-itertools>=4.0,<5.0" "more-itertools"
'';

propagatedBuildInputs = [
attrs
bidict
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/click-default-group/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, buildPythonPackage, fetchFromGitHub, click, pytest }:
{ lib, buildPythonPackage, fetchFromGitHub, click, pytest_3 }:

buildPythonPackage rec {
pname = "click-default-group";
@@ -14,7 +14,7 @@ buildPythonPackage rec {

propagatedBuildInputs = [ click ];

checkInputs = [ pytest ];
checkInputs = [ pytest_3 ];

meta = with lib; {
homepage = https://github.com/click-contrib/click-default-group;
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/google-music-utils/default.nix
View file
Original file line number Diff line number Diff line change
@@ -5,14 +5,14 @@

buildPythonPackage rec {
pname = "google-music-utils";
version = "2.0.0";
version = "2.1.0";

# Pypi tarball doesn't contain tests
src = fetchFromGitHub {
owner = "thebigmunch";
repo = "google-music-utils";
rev = version;
sha256 = "0i5zcr1ypnxizi41s3lrplz9m9rmb56s5iihjx61kbybxcq2b6gk";
sha256 = "0fn4zp0gf1wx2x06dbc840qcq21j4p3ajghxp7646w2n6n9gxhh7";
};

propagatedBuildInputs = [
5 changes: 5 additions & 0 deletions pkgs/development/python-modules/google-music/default.nix
View file
Original file line number Diff line number Diff line change
@@ -16,6 +16,11 @@ buildPythonPackage rec {
sha256 = "13i9nd62wqfg0f5r7ykr15q83397vdpw0js50fy5nbgs33sbf6b7";
};

postPatch = ''
substituteInPlace setup.py \
--replace "audio-metadata>=0.3,<0.4" "audio-metadata"
'';

propagatedBuildInputs = [
appdirs
audio-metadata
12 changes: 7 additions & 5 deletions pkgs/tools/audio/google-music-scripts/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,21 +2,22 @@

python3.pkgs.buildPythonApplication rec {
pname = "google-music-scripts";
version = "3.0.0";
version = "4.0.1";

src = python3.pkgs.fetchPypi {
inherit pname version;
sha256 = "12risivi11z3shrgs1kpi7x6lvk113cbp3dnczw9mmqhb4mmwviy";
sha256 = "5b2e9fdde8781a6d226984f0b61add2415a3804123ceeecb20fcc8527de9389d";
};

propagatedBuildInputs = with python3.pkgs; [
appdirs
audio-metadata
click
click-default-group
google-music
google-music-proto
google-music-utils
logzero
#loguru
pendulum
natsort
tomlkit
];

@@ -28,5 +29,6 @@ python3.pkgs.buildPythonApplication rec {
description = "A CLI utility for interacting with Google Music";
license = licenses.mit;
maintainers = with maintainers; [ jakewaksbaum ];
broken = true; # 2019-03-15, missing dependency loguru
};
}