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.

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

xwallpaper: remove libseccomp dependency #97364

Merged
merged 2 commits into from Sep 8, 2020

Conversation

@IvarWithoutBones
Copy link
Contributor

@IvarWithoutBones IvarWithoutBones commented Sep 7, 2020

Motivation for this change

libseccomp has been upgraded to 2.5.0, which xwallpaper currently does not support. Luckily this dependency is optional, so for now I've simply removed it, making the application usable again.

Also ran nixpkgs-fmt on the file, as this looks a lot nicer IMO.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
@fzakaria
Copy link
Contributor

@fzakaria fzakaria commented Sep 7, 2020

Result of nixpkgs-review pr 97364 1

1 package built:
- xwallpaper
@fzakaria
Copy link
Contributor

@fzakaria fzakaria commented Sep 7, 2020

Program can at least print out help message.

[nix-shell:~/.cache/nixpkgs-review/pr-97364]$ xwallpaper 
usage: xwallpaper [--screen <screen>] [--daemon] [--debug] [--no-randr]
  [--trim widthxheight[+x+y]] [--output <output>] [--center <file>]
  [--focus <file>] [--maximize <file>] [--stretch <file>] [--tile <file>]
  [--zoom <file>] [--version]
@fzakaria
Copy link
Contributor

@fzakaria fzakaria commented Sep 7, 2020

LGTM except that your code commit should follow the required convention for the naming.
You'll probably want to squash, reword & rebase.

https://nixos.org/manual/nixpkgs/stable/#submitting-changes-making-patches

@worldofpeace
Copy link
Member

@worldofpeace worldofpeace commented Sep 8, 2020

I think the commit messages are correct? It's just there's two, one to drop the dependency and one for formatting. Which is sometimes helpful if you want to review things clearly.

@worldofpeace worldofpeace merged commit 7e8cf69 into NixOS:master Sep 8, 2020
19 checks passed
19 checks passed
tests tests
Details
action
Details
Evaluation Performance Report Evaluator Performance Report
Details
Wait for ofborg
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="cff6e7b"; rev="cff6e7b161fd1cc4df9ba09374a0df0f23b34b69"; } ./pkgs/t
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="cff6e7b"; rev="cff6e7b161fd1cc4df9ba09374a0df0f23b34b69"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="cff6e7b"; rev="cff6e7b161fd1cc4df9ba09374a0df0f23b34b69"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="cff6e7b"; rev="cff6e7b161fd1cc4df9ba09374a0df0f23b34b69"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="cff6e7b"; rev="cff6e7b161fd1cc4df9ba09374a0df0f23b34b69"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="cff6e7b"; rev="cff6e7b161fd1cc4df9ba09374a0df0f23b34b69"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="cff6e7b"; rev="cff6e7b161fd1cc4df9ba09374a0df0f23b34b69"; } ./pkgs/t
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
xwallpaper, xwallpaper.passthru.tests on aarch64-linux Success
Details
xwallpaper, xwallpaper.passthru.tests on x86_64-linux Success
Details
@worldofpeace
Copy link
Member

@worldofpeace worldofpeace commented Sep 8, 2020

@IvarWithoutBones If you could also please open a backport PR to release-20.09 (I'm not sure if this is broken on 20.03 too?) it would be great https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md#backporting-changes.

@IvarWithoutBones IvarWithoutBones mentioned this pull request Sep 9, 2020
1 of 10 tasks complete
@IvarWithoutBones
Copy link
Contributor Author

@IvarWithoutBones IvarWithoutBones commented Sep 9, 2020

@IvarWithoutBones If you could also please open a backport PR to release-20.09 (I'm not sure if this is broken on 20.03 too?) it would be great https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md#backporting-changes.

Sure, PR for 20.09: #97547

This currently isnt needed for 20.03, as this still has a compatible version of libseccomp.

@IvarWithoutBones IvarWithoutBones deleted the IvarWithoutBones:xwallpaper-fix branch Sep 9, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.