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: 8c07f5310879
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0e906e20b332
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Mar 30, 2019

  1. python.pkgs.pylast: no longer supports python2 

    (cherry picked from commit a376d3e)
    @worldofpeace
    Robert Schütz authored and worldofpeace committed Mar 30, 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
    1487745 View commit details

  2. mopidy-iris: 3.32.5 -> 3.33.0 

    The removed dependencies were dropped in the following commits:
jaedb/Iris@0c13445
jaedb/Iris@4d64980
jaedb/Iris@c9861bc

Requests was added in:
jaedb/Iris@28b5f69

(cherry picked from commit 11f0d36)
Fixed build.

ZHF: #56826
    @worldofpeace
    Robert Schütz authored and worldofpeace committed Mar 30, 2019
    Copy the full SHA
    0e906e2 View commit details
Showing with 6 additions and 8 deletions.
  1. +3 −7 pkgs/applications/audio/mopidy/iris.nix
  2. +3 −1 pkgs/development/python-modules/pylast/default.nix
10 changes: 3 additions & 7 deletions pkgs/applications/audio/mopidy/iris.nix
View file
Original file line number Diff line number Diff line change
@@ -2,26 +2,22 @@

pythonPackages.buildPythonApplication rec {
pname = "Mopidy-Iris";
version = "3.32.5";
version = "3.33.0";

src = pythonPackages.fetchPypi {
inherit pname version;
sha256 = "0vs8x26zcakk6c31sc774h2lcdw3syp236vyymmx1jnfsh1jaqpn";
sha256 = "0g00rjkmsnza4gjjdm0cwrpw3gqvmjj58157dvrh7f8k7j0gdvdm";
};

propagatedBuildInputs = [
mopidy
mopidy-local-images
] ++ (with pythonPackages; [
configobj
pylast
spotipy
raven
requests
tornado_4
]);

postPatch = "sed -i /tornado/d setup.py";

# no tests implemented
doCheck = false;

4 changes: 3 additions & 1 deletion pkgs/development/python-modules/pylast/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
{ stdenv, buildPythonPackage, fetchPypi, certifi, six }:
{ stdenv, buildPythonPackage, fetchPypi, isPy3k, certifi, six }:

buildPythonPackage rec {
pname = "pylast";
version = "3.0.0";

disabled = !isPy3k;

src = fetchPypi {
inherit pname version;
sha256 = "24051c52011ff18bdeaee9df084ecc90da6c627da86f3cdcfec4af2928e9bc56";