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

pythonPackages.sip: rename to sip_4, pythonPackages.sip_5: rename to sip #121588

Merged
merged 3 commits into from
May 16, 2021
Merged

pythonPackages.sip: rename to sip_4, pythonPackages.sip_5: rename to sip #121588

merged 3 commits into from
May 16, 2021

Conversation

eduardosm
Copy link
Contributor

@eduardosm eduardosm commented May 3, 2021 •
edited
Loading

Motivation for this change

sip 4 is the old and unmaintained version

It is easier to review this PR commit-by-commit

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.

@eduardosm eduardosm requested review from FRidh and jonringer as code owners May 3, 2021 11:49
@eduardosm eduardosm changed the title Sip renamepythonPackages.sip: rename to sip_4, @eduardosm pythonPackages.sip_5: rename to sip pythonPackages.sip: rename to sip_4, @eduardosm pythonPackages.sip_5: rename to sip May 3, 2021
@eduardosm eduardosm changed the title pythonPackages.sip: rename to sip_4, @eduardosm pythonPackages.sip_5: rename to sip pythonPackages.sip: rename to sip_4, pythonPackages.sip_5: rename to sip May 3, 2021
@eduardosm
Copy link
Contributor Author

Result of nixpkgs-review pr 121588 run on x86_64-linux 1

2 packages failed to build:
  • appleseed
  • seexpr
43 packages built:
  • calibre
  • cura
  • curaLulzbot
  • curaengine
  • flatcam
  • frescobaldi
  • git-cola
  • gmic-qt-krita (gmic_krita_qt)
  • gns3-gui
  • hplip
  • hplipWithPlugin
  • inkcut
  • inkscape-extensions.inkcut
  • krita
  • labelImg
  • openlp
  • openlpFull
  • openshot-qt
  • python38Packages.enaml
  • python38Packages.enamlx
  • python38Packages.libarcus
  • python38Packages.libsavitar
  • python38Packages.pykdl
  • python38Packages.pynest2d
  • python38Packages.pyqt4
  • python38Packages.qscintilla-qt5
  • python38Packages.sip
  • python38Packages.sip_4
  • python38Packages.uranium
  • python39Packages.enaml
  • python39Packages.enamlx
  • python39Packages.libarcus
  • python39Packages.libsavitar
  • python39Packages.pykdl
  • python39Packages.pynest2d
  • python39Packages.pyqt4
  • python39Packages.qscintilla-qt5
  • python39Packages.sip
  • python39Packages.sip_4
  • python39Packages.uranium
  • qgis
  • qgis-unwrapped
  • tortoisehg

@eduardosm
Copy link
Contributor Author

2 packages failed to build:

Broken packages are also broken on master

@r-rmcgibbo
Copy link

r-rmcgibbo commented May 3, 2021 •
edited
Loading

Result of nixpkgs-review pr 121588 at 9cd019eb run on aarch64-linux 1

12 packages marked as broken and skipped:
  • gnuradio3_7
  • gnuradio3_7Packages.ais
  • gnuradio3_7Packages.gnuradio
  • gnuradio3_7Packages.gsm
  • gnuradio3_7Packages.limesdr
  • gnuradio3_7Packages.nacl
  • gnuradio3_7Packages.osmosdr
  • gnuradio3_7Packages.rds
  • hplipWithPlugin_3_16_11
  • hplipWithPlugin_3_18_5
  • ...
1 package failed to build:
6 packages skipped due to time constraints:
  • appleseed
  • gmic-qt-krita
  • krita
  • qgis
  • qgis-unwrapped
  • seexpr
35 packages built successfully:
  • calibre
  • cura
  • curaLulzbot
  • curaengine
  • flatcam
  • frescobaldi
  • git-cola
  • gns3-gui
  • hplip
  • inkcut
  • labelImg
  • openshot-qt
  • python38Packages.enaml
  • python38Packages.enamlx
  • python38Packages.libarcus
  • python38Packages.libsavitar
  • python38Packages.pykdl
  • python38Packages.pynest2d
  • python38Packages.pyqt4
  • python38Packages.qscintilla-qt5
  • python38Packages.sip
  • python38Packages.sip_4
  • python38Packages.uranium
  • python39Packages.enaml
  • python39Packages.enamlx
  • python39Packages.libarcus
  • python39Packages.libsavitar
  • python39Packages.pykdl
  • python39Packages.pynest2d
  • python39Packages.pyqt4
  • python39Packages.qscintilla-qt5
  • python39Packages.sip
  • python39Packages.sip_4
  • python39Packages.uranium
  • tortoisehg

Note that build failures may predate this PR, and could be nondeterministic or hardware dependent.
Please exercise your independent judgement.

Result of nixpkgs-review pr 121588 at 9cd019eb run on x86_64-linux 1

12 packages marked as broken and skipped:
  • gnuradio3_7
  • gnuradio3_7Packages.ais
  • gnuradio3_7Packages.gnuradio
  • gnuradio3_7Packages.gsm
  • gnuradio3_7Packages.limesdr
  • gnuradio3_7Packages.nacl
  • gnuradio3_7Packages.osmosdr
  • gnuradio3_7Packages.rds
  • hplipWithPlugin_3_16_11
  • hplipWithPlugin_3_18_5
  • ...
6 packages skipped due to time constraints:
  • appleseed
  • gmic-qt-krita
  • krita
  • qgis
  • qgis-unwrapped
  • seexpr
37 packages built successfully:
  • calibre
  • cura
  • curaLulzbot
  • curaengine
  • flatcam
  • frescobaldi
  • git-cola
  • gns3-gui
  • hplip
  • hplipWithPlugin
  • inkcut
  • inkscape-extensions.inkcut
  • labelImg
  • openshot-qt
  • python38Packages.enaml
  • python38Packages.enamlx
  • python38Packages.libarcus
  • python38Packages.libsavitar
  • python38Packages.pykdl
  • python38Packages.pynest2d
  • python38Packages.pyqt4
  • python38Packages.qscintilla-qt5
  • python38Packages.sip
  • python38Packages.sip_4
  • python38Packages.uranium
  • python39Packages.enaml
  • python39Packages.enamlx
  • python39Packages.libarcus
  • python39Packages.libsavitar
  • python39Packages.pykdl
  • python39Packages.pynest2d
  • python39Packages.pyqt4
  • python39Packages.qscintilla-qt5
  • python39Packages.sip
  • python39Packages.sip_4
  • python39Packages.uranium
  • tortoisehg

@fogti
Copy link
Contributor

fogti commented May 15, 2021 •
edited
Loading

the hplipWithPlugins stuff looks like hplipWithPlugins just doesn't support aarch64...

@eduardosm eduardosm mentioned this pull request May 16, 2021
Closed
AndersonTorres
AndersonTorres suggested changes May 16, 2021
View reviewed changes
Copy link
Member

@AndersonTorres AndersonTorres left a comment

Choose a reason for hiding this comment

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

Move the modifications to all-packages.nix. It makes them more amenable to future updates.

pkgs/applications/gis/qgis/unwrapped.nix
@@ -19,7 +19,7 @@ let
urllib3
pygments
pyqt5
sip
sip_4
Copy link
Member

Choose a reason for hiding this comment

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

What about setting this in all-packages.nix?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Do you mean doing something like this?

package = callPackage ../path/to/package { sip = sip_4; };

I'm not sure how to do that because sip is part of pythonPackages

Copy link
Member

Choose a reason for hiding this comment

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

Yes, that is the idea.

On the other hand, in pythonPackages the default sip is still the 4.x version. It needs to be investigated!

Well, ignore it for now.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

On the other hand, in pythonPackages the default sip is still the 4.x version. It needs to be investigated!

With this PR the default version will be 5.x (and, in the future, it should be updated to 6.x).

@AndersonTorres
Copy link
Member

@eduardosm would be difficult to you to split each file in a commit of its own?

@eduardosm
Copy link
Contributor Author

@eduardosm would be difficult to you to split each file in a commit of its own?

I could try to, but is it really necessary? Most packages are not really modified, they are just adapted to the renaming of the sip attribute.

@AndersonTorres
Copy link
Member

This is most for tracking modifications in a more granulated way.

@AndersonTorres AndersonTorres merged commit cf45c45 into NixOS:master May 16, 2021
@eduardosm eduardosm deleted the sip-rename branch May 16, 2021 16:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AndersonTorres AndersonTorres AndersonTorres approved these changes

@FRidh FRidh Awaiting requested review from FRidh

@jonringer jonringer Awaiting requested review from jonringer

Assignees
No one assigned
Labels
6.topic: python 8.has: clean-up 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@eduardosm @r-rmcgibbo @fogti @AndersonTorres