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

Commits on May 26, 2017

  1. geolite-legacy: 2016-07-08 -> 2017-05-26 

    (cherry picked from commit 45372b1)
    @fpletz
    fpletz committed May 26, 2017
    Copy the full SHA
    5600895 View commit details

Commits on May 27, 2017

  1. spotify: 1.0.53.758 -> 1.0.55.487 

    (cherry picked from commit b7290d3)

Fixes #26141.
    @ttuegel @fpletz
    ttuegel authored and fpletz committed May 27, 2017
    Copy the full SHA
    9f4a102 View commit details
Showing with 9 additions and 9 deletions.
  1. +2 −2 pkgs/applications/audio/spotify/default.nix
  2. +7 −7 pkgs/data/misc/geolite-legacy/default.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
@@ -8,7 +8,7 @@ let
# Please update the stable branch!
# Latest version number can be found at:
# http://repository-origin.spotify.com/pool/non-free/s/spotify-client/
version = "1.0.53.758.gde3fc4b2-33";
version = "1.0.55.487.g256699aa-16";

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

src = fetchurl {
url = "https://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb";
sha256 = "1sh6bv23yx0fcbmf60c2yyi6411ij85k4jalpjlck2w26nfj1b3g";
sha256 = "09rhm0jp5prcvyf8zpw4pl422yiy8nkazcjc3lv61ngpznk3n1r0";
};

buildInputs = [ dpkg makeWrapper ];
14 changes: 7 additions & 7 deletions pkgs/data/misc/geolite-legacy/default.nix
View file
Original file line number Diff line number Diff line change
@@ -8,26 +8,26 @@ let
in
stdenv.mkDerivation rec {
name = "geolite-legacy-${version}";
version = "2016-07-08";
version = "2017-05-26";

srcGeoIP = fetchDB
"GeoLiteCountry/GeoIP.dat.gz" "GeoIP.dat.gz"
"03rp862snj4pxpz272az2mjp0vdw9a6rzbzcml9bzwvsi1ap5sl7";
"04akk0jczvki8rdvz6z6v5s26ds0m27953lzvp3v0fsg7rl08q5n";
srcGeoIPv6 = fetchDB
"GeoIPv6.dat.gz" "GeoIPv6.dat.gz"
"1s5y6r4ji1ljsl1d3w9mcqppxy2kvxjk5aq5lldbj616rbcp2v72";
"0i0885vvj0s5sysyafvk8pc8gr3znh7gmiy8rp4iiai7qnbylb7y";
srcGeoLiteCity = fetchDB
"GeoLiteCity.dat.xz" "GeoIPCity.dat.xz"
"07dp3wf5b6g62y6zgm9f1zfc7gn2wnss7fjdips879373kj3lgbr";
"0bgf4kfg4mmqvgmrff27lbiglnnb3pnd7f3i4fxzl68c33bizmbm";
srcGeoLiteCityv6 = fetchDB
"GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz" "GeoIPCityv6.dat.gz"
"1y7c8f84x99dbrqij124bylddc7bmcld1xp4h3qxvmmp8ch5hcxz";
"06slyw2644y2z5bgn4yl79aa4smf94mdcddybldh1glc3ay3p4iz";
srcGeoIPASNum = fetchDB
"asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz"
"168z6j6adrn80sl3ip41fa0jfv2p26lfa8qil6w17sqhg8f61rnp";
"1gpvsqvq9z9pg9zfn86i50fb481llfyn79r1jwddwfflp1qqfrrv";
srcGeoIPASNumv6 = fetchDB
"asnum/GeoIPASNumv6.dat.gz" "GeoIPASNumv6.dat.gz"
"0q0vgjgxixcq5qnl5d6hxg3bpsbylmmjkhdp308vbbd68q6fws22";
"0nmhz82dn9clm5w2y6z861ifj7i761spy1p1zcam93046cdpqqaa";

meta = with stdenv.lib; {
description = "GeoLite Legacy IP geolocation databases";