Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 2 commits into from Jun 2, 2018
Merged

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

merged 2 commits into from Jun 2, 2018

Conversation

ghost
Copy link

@ghost ghost commented Jun 1, 2018

Motivation for this change

Version 1.0.79.223.g92622cc2-21 doesn't exists in spotify repository, so i decided to update it to exists version

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS(I don't have macOS on my PC)
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

Fixed version
5432de3 
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
@ghost ghost changed the title Fixed version Fixed Spotify version Jun 1, 2018
@etu
Copy link
Contributor

etu commented Jun 1, 2018

Are you sure that you don't need to update the sha256 of this? https://github.com/NixOS/nixpkgs/pull/41356/files#diff-ece7f62a737100ec76df43623faba00aR54

To get a sha256 hash of a new source, you can use the Trust On First Use model: use probably-wrong hash (for example: 0000000000000000000000000000000000000000000000000000) then replace it with the correct hash Nix expected.

If you have the old hash of the package in your store, nix will use that regardless if you change the version number.

And secondly it would be nice if you amended your commit to say: spotify: fromVersionNumber -> toVersionNumber as title in the commit message.

@ghost ghost changed the title Fixed Spotify version Spotify: 1.0.79.223.g92622cc2-21 -> 1.0.80.480.g51b03ac3-13 Jun 1, 2018
@etu
Copy link
Contributor

etu commented Jun 1, 2018

@aprokurov And then squash your two commits into one with the commit title spotify: 1.0.79.223.g92622cc2-21 -> 1.0.80.480.g51b03ac3-13

@ghost ghost changed the title Spotify: 1.0.79.223.g92622cc2-21 -> 1.0.80.480.g51b03ac3-13 spotify: 1.0.79.223.g92622cc2-21 -> 1.0.80.480.g51b03ac3-13 Jun 1, 2018
@etu
Copy link
Contributor

etu commented Jun 1, 2018

And just the squashing of the two commits to follow the guidelines of commit messages left: https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md#submitting-changes

@etu
Copy link
Contributor

etu commented Jun 1, 2018

@GrahamcOfBorg build spotify

@GrahamcOfBorg
Copy link

No attempt on aarch64-linux (full log)

The following builds were skipped because they don't evaluate on aarch64-linux: spotify

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnfree = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnfree = true; }
to ~/.config/nixpkgs/config.nix.

@GrahamcOfBorg
Copy link

No attempt on x86_64-linux (full log)

The following builds were skipped because they don't evaluate on x86_64-linux: spotify

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnfree = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnfree = true; }
to ~/.config/nixpkgs/config.nix.

@joachifm joachifm mentioned this pull request Jun 2, 2018
Closed
@xeji xeji merged commit 44b52c1 into NixOS:master Jun 2, 2018
xeji pushed a commit that referenced this pull request Jun 2, 2018
@xeji
spotify: 1.0.79.223.g92622cc2-21 -> 1.0.80.480.g51b03ac3-13 (#41356)
59a56cd 
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
Copy link
Contributor

xeji commented Jun 2, 2018

backported in 59a56cd

orivej added a commit that referenced this pull request Jun 3, 2018
@orivej
Merge branch 'master' into staging
4208271 
* master: (25 commits)
  prosody: 0.10.1 -> 0.10.2
  mpd: fix spelling in description
  pulseaudio-ctl: init at 1.66
  qt: remove install_name_tool stuff
  multimc: 0.6.1 -> 0.6.2
  lib: test for bitAnd, bitOr, bitXor
  pandas: fix check with the current pytest
  qt: fixup from c4cac55
  calibre: 2.24.1 -> 2.25.0
  spotify: 1.0.79.223.g92622cc2-21 -> 1.0.80.480.g51b03ac3-13 (#41356)
  libbsd-freedesktop: re-init at 0.9.1, use for samba
  sbt: 1.1.4 -> 1.1.6
  nixos/slurm: remove propagatedBuidInputs from slurmWrapped
  gitkraken: 3.6.1 -> 3.6.3
  pass-import: export PREFIX, set PASSWORD_STORE_BIN
  pass: Add pass-audit extension
  slurm: add maintainer
  nixos/slurm: update test, add test for enableStools
  slurm: add freeipmi, readline, libssh2, fix hwloc
  nixos/slurm: Add man pages to wrapedSlurm
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@etu @GrahamcOfBorg @xeji