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

Update metadata to reflect uncompyle6 and xdis relicensing to GPL (v3 and v2 respectively) #47578

Merged
merged 1 commit into from
Nov 17, 2018
Merged

Update metadata to reflect uncompyle6 and xdis relicensing to GPL (v3 and v2 respectively) #47578

merged 1 commit into from
Nov 17, 2018
+2 −2

Conversation

charles-dyfis-net
Copy link
Contributor

Motivation for this change

Significant bugfixes to uncompyle6 between 2.8 and 3.2; able to correctly handle a wider range of bytecode.

xdis and spark_parser are part of the dependency chain; analysis via nox appears to indicate that they aren't used elsewhere.

Note that upstream moved to GPLv3 for uncompyle6 and GPLv2 for xdis within this span of releases.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-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)
  • Fits CONTRIBUTING.md.

Sorry, something went wrong.

@samueldr samueldr added the 2.status: merge conflict This PR has merge conflicts with the target branch label Nov 14, 2018
@samueldr
Copy link
Member

👋 Hi! Sorry it took so long until someone looked at your PR.

During this time, the packages all ended up being updated to at least the same version.

Though, I am selfish, and I see some good work in there:

Note that upstream moved to GPLv3 for uncompyle6 and GPLv2 for xdis within this span of releases.

Could you either open a new PR, or update this one with that change? (And anything else of worth I could have missed from your PR.)

Thanks for your contribution, even though it slipped behind a bit.

FRidh
FRidh requested changes Nov 14, 2018
View reviewed changes
Copy link
Member

@FRidh FRidh left a comment

Choose a reason for hiding this comment

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

Rebase onto staging-next because there are changes in these expressions there.

@charles-dyfis-net charles-dyfis-net changed the base branch from master to staging-next November 16, 2018 17:01
@charles-dyfis-net
Copy link
Contributor Author

@FRidh, done -- we now only update the license metadata (since the versions were updated without those fixes in the interim), and are based on staging-next. Is a separate PR for master needed?

@GrahamcOfBorg GrahamcOfBorg added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: stdenv Standard environment 6.topic: xfce The Xfce Desktop Environment 8.has: changelog 8.has: documentation This PR adds or changes documentation and removed 2.status: merge conflict This PR has merge conflicts with the target branch 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: stdenv Standard environment 6.topic: xfce The Xfce Desktop Environment 8.has: changelog 8.has: documentation This PR adds or changes documentation labels Nov 16, 2018
@charles-dyfis-net charles-dyfis-net changed the title uncompyle6 2.8.3 -> 3.2.2; xdis 3.2.4 -> 3.8.7; spark_parser 1.4.0 -> 1.8.7 Update metadata to reflect uncompyle6 and xdis relicensing to GPL (v3 and v2 respectively) Nov 16, 2018
@GrahamcOfBorg GrahamcOfBorg added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild and removed 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 labels Nov 16, 2018
@GrahamcOfBorg GrahamcOfBorg added 10.rebuild-linux-stdenv This PR causes stdenv to rebuild 8.has: clean-up 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 501+ 10.rebuild-linux: 501+ and removed 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Nov 16, 2018
@charles-dyfis-net
Copy link
Contributor Author

I'm a bit surprised re: the rebuild-stdenv flag -- this is literally nothing but a metadata change. Perhaps the rebase onto staging-next is at fault?

@samueldr
Copy link
Member

@GrahamcOfBorg eval

Could it be that you pushed and then changed the target branch? In any case, let's re-eval with ofborg, more of a curiosity than a necessity.

@GrahamcOfBorg GrahamcOfBorg added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux and removed 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild 10.rebuild-linux-stdenv This PR causes stdenv to rebuild 10.rebuild-darwin: 501+ 10.rebuild-linux: 501+ labels Nov 17, 2018
@Mic92 Mic92 merged commit 327ecf8 into NixOS:staging-next Nov 17, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@FRidh FRidh

@Ericson2314 Ericson2314

@matthewbauer matthewbauer

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: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@charles-dyfis-net @samueldr @FRidh @Mic92 @GrahamcOfBorg