Skip to content

qscintilla: cleanup#153744

Merged
prusnak merged 1 commit intoNixOS:masterfrom
prusnak:qscintilla-cleanup
Jan 6, 2022
Merged

qscintilla: cleanup#153744
prusnak merged 1 commit intoNixOS:masterfrom
prusnak:qscintilla-cleanup

Conversation

@prusnak
Copy link
Member

@prusnak prusnak commented Jan 6, 2022 •
edited
Loading

Motivation for this change
  • followup to qscintilla: fix build on darwin #150595
  • I noticed we forgot to drop pkgs/development/python-modules/qscintilla/default.nix + I did other small refactoring
  • file pkgs/development/python-modules/qscintilla-qt4/default.nix should be reviewed with whitespace changes hidden
Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 22.05 Release Notes (or backporting 21.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@prusnak prusnak mentioned this pull request Jan 6, 2022
Merged
13 tasks
@github-actions github-actions bot added the 6.topic: python Python is a high-level, general-purpose programming language. label Jan 6, 2022
@prusnak prusnak requested review from siraben and willcohen January 6, 2022 17:03
@willcohen
Copy link
Contributor

willcohen commented Jan 6, 2022

Looks good to me -- working on nixpkgs-review now.

Sorry for not catching most of this before -- it was my first PR and I'm still getting the hang of the idioms!

@ofborg ofborg bot requested a review from peterhoeg January 6, 2022 17:15
@ofborg ofborg bot added 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels Jan 6, 2022
@prusnak prusnak force-pushed the qscintilla-cleanup branch from 2951a45 to 6716fd2 Compare January 6, 2022 17:38
@prusnak
Copy link
Member Author

prusnak commented Jan 6, 2022 •
edited
Loading

I discovered more errors in pkgs/development/python-modules/qscintilla-qt4/default.nix - we need to use qscintilla-qt4, not qscintilla. Also python3Packages.qscintilla-qt4 builds just fine with Python3 so I removed isPy3k from disabled.

@prusnak
Copy link
Member Author

prusnak commented Jan 6, 2022

@GrahamcOfBorg build qscintilla qscintilla-qt4 qscintilla-qt5 python3Packages.qscintilla python3Packages.qscintilla-qt4 python3Packages.qscintilla-qt5

@prusnak prusnak force-pushed the qscintilla-cleanup branch from 6716fd2 to 17c0bbb Compare January 6, 2022 17:48
@ofborg ofborg bot added the 8.has: package (new) This PR adds a new package label Jan 6, 2022
@ofborg ofborg bot requested review from danbst and lsix January 6, 2022 17:51
@prusnak prusnak merged commit a523706 into NixOS:master Jan 6, 2022
@prusnak prusnak deleted the qscintilla-cleanup branch January 6, 2022 18:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@willcohen willcohen willcohen approved these changes

@FRidh FRidh Awaiting requested review from FRidh

@jonringer jonringer Awaiting requested review from jonringer

@siraben siraben Awaiting requested review from siraben

@peterhoeg peterhoeg Awaiting requested review from peterhoeg

@danbst danbst Awaiting requested review from danbst

@lsix lsix Awaiting requested review from lsix

Assignees

No one assigned

Labels

6.topic: python Python is a high-level, general-purpose programming language. 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@prusnak @willcohen