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

soulseekqt: init at 2016-1-17 (last official stable) #36343

Merged
merged 1 commit into from Mar 6, 2018
Merged

soulseekqt: init at 2016-1-17 (last official stable) #36343

merged 1 commit into from Mar 6, 2018

Conversation

bignaux
Copy link
Contributor

@bignaux bignaux commented Mar 5, 2018

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • 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.

nlewo
nlewo requested changes Mar 5, 2018
View reviewed changes
pkgs/applications/networking/p2p/soulseekqt/default.nix Outdated
name = "soulseekqt-${version}";
version = "2016-1-17";

mainbin = "SoulseekQt-" + (version) +"-"+ (if stdenv.is64bit then "64bit" else "32bit");
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you move this attribute out of the derivation attributes (by using let ... in mkDerivation ...) since it is not used by the builder.

pkgs/applications/networking/p2p/soulseekqt/default.nix Outdated
version = "2016-1-17";

mainbin = "SoulseekQt-" + (version) +"-"+ (if stdenv.is64bit then "64bit" else "32bit");
src = fetchurl ({
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think readability could be improved by moving some parts of this in the let block.

pkgs/applications/networking/p2p/soulseekqt/default.nix Outdated

setSourceRoot = "sourceRoot=`pwd`";

libPath = stdenv.lib.makeLibraryPath
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not required by the builder also.

@nlewo
Copy link
Member

nlewo commented Mar 6, 2018

Thanks for these improvments:)

@GrahamcOfBorg build soulseekqt

@GrahamcOfBorg
Copy link

Failure on x86_64-linux (full log)

Partial log (click to expand)

Package ‘soulseekqt-2016-1-17’ in /var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/builder-0-gustav.ewr1.nix.ci/pkgs/applications/networking/p2p/soulseekqt/default.nix:50 has an unfree license (‘unfree’), refusing to evaluate.

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

Failure on aarch64-linux (full log)

Partial log (click to expand)

Package ‘soulseekqt-2016-1-17’ in /var/lib/gc-of-borg/nix-test-rs-5/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-5/pkgs/applications/networking/p2p/soulseekqt/default.nix:50 has an unfree license (‘unfree’), refusing to evaluate.

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.

@nlewo
Copy link
Member

nlewo commented Mar 6, 2018

Could you squash your commits and rewrite the first commit since it is no longer a "wip" commit.

@bignaux
Copy link
Contributor Author

bignaux commented Mar 6, 2018

sorry i was trying to squash commit and look for some deeper test since i don't see any Qt in ldd, i fear it call it dynamically from my non-nixos path.

@bignaux
Copy link
Contributor Author

bignaux commented Mar 6, 2018

qt is hardlinked, so i think we are good now. Thanks for review.

@nlewo
Copy link
Member

nlewo commented Mar 6, 2018

Ok. It've tryied and it works well on my NixOS machine. Indeed, it can't use libraries from your host since it doen't use the ld program of your host.
@bignaux one last thing, can you just clean the commit message (just keep the first line)?

@bignaux
Copy link
Contributor Author

bignaux commented Mar 6, 2018

@nlewo : done. I use rebase + "push -f", i'm not very satisfied with this workflow.

@nlewo
Copy link
Member

nlewo commented Mar 6, 2018

@bignaux since it's nice to have a clean history for public branches, you need to rewrite the history of your private branch and then you must push --force.

Thanks for your contribution.

@nlewo nlewo merged commit 9cfeabb into NixOS:master Mar 6, 2018
@bignaux bignaux deleted the soulseekqt branch March 6, 2018 18:06
vcunat pushed a commit that referenced this pull request Mar 7, 2018
@nlewo @vcunat
Merge pull request #36343 from bignaux/soulseekqt
1bebf7a 
soulseekqt: init at 2016-1-17 (last official stable)
(cherry picked from commit 9cfeabb)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nlewo nlewo nlewo requested changes

Assignees
No one assigned
Labels
8.has: package (new) 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
@bignaux @nlewo @GrahamcOfBorg