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: 4beb7d11969e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4dbde1f10e11
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Sep 29, 2017

  1. pythonPackages.pyalgotrade: incompatible with python3 

    (cherry picked from commit 538b016)
    @fpletz @globin
    fpletz authored and globin committed Sep 29, 2017
    Copy the full SHA
    b772ca9 View commit details

  2. pythonPackages.pyalgotrade: fix typo 

    (cherry picked from commit e68e149)
    @fpletz @globin
    fpletz authored and globin committed Sep 29, 2017
    Copy the full SHA
    7255058 View commit details

  3. spotify: 1.0.49.125.g72ee7853-111 -> 1.0.64.401.g9d720389-21 

    (cherry picked from commit ee6b48c)
    @WilliButz @globin
    WilliButz authored and globin committed Sep 29, 2017
    Copy the full SHA
    4dbde1f View commit details
Showing with 2 additions and 4 deletions.
  1. +2 −2 pkgs/applications/audio/spotify/default.nix
  2. +0 −2 pkgs/top-level/python-packages.nix
4 changes: 2 additions & 2 deletions pkgs/applications/audio/spotify/default.nix
View file
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ let
# Latest version number can be found at:
# http://repository-origin.spotify.com/pool/non-free/s/spotify-client/
# Be careful not to pick the testing version.
version = "1.0.49.125.g72ee7853-111";
version = "1.0.64.401.g9d720389-21";

deps = [
alsaLib
@@ -54,7 +54,7 @@ stdenv.mkDerivation {

src = fetchurl {
url = "https://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb";
sha256 = "0l008x06d257vcw6gq3q90hvv93cq6mxpj11by1np6bzzg61qv8x";
sha256 = "026khnz7n66mj94yr33690pmjm3pz1nsy38xggsyr5gldf1chsfc";
};

buildInputs = [ dpkg makeWrapper ];
2 changes: 0 additions & 2 deletions pkgs/top-level/python-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -16143,8 +16143,6 @@ in {

propagatedBuildInputs = with self; [ numpy scipy pytz ];

disable = isPy3k;

meta = {
description = "Python Algorithmic Trading";
homepage = http://gbeced.github.io/pyalgotrade/;