Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7743e5b6c79c
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 03ba84eb5655
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jun 2, 2018

  1. spotify: 1.0.79.223.g92622cc2-21 -> 1.0.80.480.g51b03ac3-13 (#41356) 

    Version 1.0.79.223.g92622cc2-21 doesn't exists in [spotify](https://repository-origin.spotify.com/pool/non-free/s/spotify-client/) repository, so i updated it to exists version

(cherry picked from commit 44b52c1)
    @xeji
    Adel Prokurov authored and xeji committed Jun 2, 2018
    Copy the full SHA
    59a56cd View commit details

  2. nixos/release-combined: remove keymap tests from tested job 

    .. temporarily as non-deterministic failures blocked the release channel
    @xeji
    xeji committed Jun 2, 2018
    Copy the full SHA
    03ba84e View commit details
Showing with 10 additions and 8 deletions.
  1. +8 −6 nixos/release-combined.nix
  2. +2 −2 pkgs/applications/audio/spotify/default.nix
14 changes: 8 additions & 6 deletions nixos/release-combined.nix
View file
Original file line number Diff line number Diff line change
@@ -88,12 +88,14 @@ in rec {
(all nixos.tests.env)
(all nixos.tests.ipv6)
(all nixos.tests.i3wm)
(all nixos.tests.keymap.azerty)
(all nixos.tests.keymap.colemak)
(all nixos.tests.keymap.dvorak)
(all nixos.tests.keymap.dvp)
(all nixos.tests.keymap.neo)
(all nixos.tests.keymap.qwertz)
# 2018-06-02: keymap tests temporarily removed from tested job
# because of non-deterministic failures blocking the channel.
#(all nixos.tests.keymap.azerty)
#(all nixos.tests.keymap.colemak)
#(all nixos.tests.keymap.dvorak)
#(all nixos.tests.keymap.dvp)
#(all nixos.tests.keymap.neo)
#(all nixos.tests.keymap.qwertz)
(all nixos.tests.plasma5)
#(all nixos.tests.lightdm)
(all nixos.tests.login)
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.79.223.g92622cc2-21";
version = "1.0.80.480.g51b03ac3-13";

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 = "1x1rpprzin4cmz1spzw036b4phd0yk1v7idlrcy4pkv97b4g5dw6";
sha256 = "e32f4816ae79dbfa0c14086e76df3bc83d526402aac1dbba534127fc00fe50ea";
};

buildInputs = [ dpkg makeWrapper ];