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

sc-controller: unbreak by restoring pygobject3 for python2 #103650

Merged
merged 3 commits into from Dec 7, 2020

Conversation

orivej
Copy link
Contributor

@orivej orivej commented Nov 13, 2020

Motivation for this change

Unbreak sc-controller.

Upstream issue re. python3: kozec/sc-controller#498.
pygobject maintainers recommend keeping 3.36 for python2: https://github.com/GNOME/pygobject/blob/3.38.0/NEWS#L7

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.

Comment on lines 5075 to +5160
pygobject2 = callPackage ../development/python-modules/pygobject { inherit (pkgs) pkgconfig; };

pygobject3 = callPackage ../development/python-modules/pygobject/3.nix { inherit (pkgs) meson pkgconfig; };
pygobject3 = if isPy3k then
callPackage ../development/python-modules/pygobject/3.nix { inherit (pkgs) meson pkgconfig; }
else
callPackage ../development/python-modules/pygobject/3.36.nix { inherit (pkgs) meson pkgconfig; };
Copy link
Contributor

Choose a reason for hiding this comment

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

not super related to your changes, but default.nix should be the one that can be updated to the latest, the "pinned" versions should be the ones that specify a version number.

Copy link
Contributor

@rnhmjoj rnhmjoj left a comment

Choose a reason for hiding this comment

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

Looks good to me. Hopefully upstream will merge the python3 patches sooner of later, so this won't be necessary anymore.

@ofborg ofborg bot requested a review from rnhmjoj December 7, 2020 00:01
@orivej-nixos orivej-nixos merged commit 486ddeb into NixOS:master Dec 7, 2020
@orivej orivej deleted the sc-controller branch December 7, 2020 00:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants