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

flacon: improvements #76592

Merged
merged 2 commits into from Jan 10, 2020
Merged

flacon: improvements #76592

merged 2 commits into from Jan 10, 2020

Conversation

@snglth
Copy link
Member

@snglth snglth commented Dec 27, 2019

  1. Use libsForQt5.callPackage instead of raw callPackage` (this adds
    ability to import qtbase and qttools directly instead of importing whole
    qt5)
  2. Include wrapQtAppsHook in nativeBuildInputs

Closes #76588

Motivation for this change

The major point of this changes is to provide support for running
support of running flacon under wayland session, but it may help in some
other use cases.

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.
Notify maintainers

cc @nico202

@snglth snglth force-pushed the snglth:master branch from 71e2bb9 to 00d471d Dec 27, 2019
@nico202
Copy link
Contributor

@nico202 nico202 commented Dec 27, 2019

Hi, I'm using nixos on an headless server only now, so I can't maintain flacon or even test it. Would you mind becoming the maintainer (removing me)? Except for this, thanks for your contribution :)

@snglth
Copy link
Member Author

@snglth snglth commented Dec 27, 2019

Okay, since I'll gotta stick with NixOS on my laptops for a while, I can do that. All I need to do is to add myself to maintainers/maintainer-list.nix and put myself into meta.maintainers?

@teto
Copy link
Contributor

@teto teto commented Dec 28, 2019

yes but do it in separate commits

@snglth
Copy link
Member Author

@snglth snglth commented Dec 28, 2019

Done

@veprbl
Copy link
Member

@veprbl veprbl commented Dec 29, 2019

There are some minor problems with commits.
The first one is authored with different email (might want to change that).
The second commit message should read "flacon: change maintainer to snglth".

commit 8d808f1bf92165153367b25adae46e0a296e719f
Author:     Illia Shestakov <illia@ishestakov.com>
AuthorDate: Sat Dec 28 17:17:08 2019 +0200
Commit:     Illia Shestakov <illia@ishestakov.com>
CommitDate: Sat Dec 28 17:17:08 2019 +0200

    Take over flacon maintainership

commit 00d471dea60bc236d6f1b76d5d3fc8b0ba0c5647
Author:     Illia Shestakov <ishestakov@airmail.cc>
AuthorDate: Sat Dec 28 00:28:36 2019 +0200
Commit:     Illia Shestakov <illia@ishestakov.com>
CommitDate: Sat Dec 28 00:48:17 2019 +0200

    flacon: improvements
snglth added 2 commits Dec 30, 2019
1. Use libsForQt5.callPackage instead of raw callPackage` (this adds
ability to import qtbase and qttools directly instead of importing whole
qt5)
2. Include wrapQtAppsHook in nativeBuildInputs

The major point of this changes is to provide support for running
support flacon under wayland session, but it may help in some other use
cases

Closes #76588
@snglth snglth force-pushed the snglth:master branch from 8d808f1 to 07d0acf Dec 30, 2019
@snglth
Copy link
Member Author

@snglth snglth commented Jan 10, 2020

Is it OK now?

@veprbl
Copy link
Member

@veprbl veprbl commented Jan 10, 2020

@snglth Thanks for the ping. Yes, this looks good now.

@veprbl
veprbl approved these changes Jan 10, 2020
@veprbl veprbl merged commit f1d3df9 into NixOS:master Jan 10, 2020
15 checks passed
15 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
flacon on aarch64-linux Success
Details
flacon on x86_64-linux Success
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="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
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
@veprbl
Copy link
Member

@veprbl veprbl commented Jan 10, 2020

Thank you!

dtzWill added a commit to dtzWill/nixpkgs that referenced this pull request Jan 10, 2020
flacon: improvements
(cherry picked from commit f1d3df9)
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.

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