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

Fixing/adding python27 derivations #93978

Closed
wants to merge 1 commit into from
Closed

Fixing/adding python27 derivations #93978

wants to merge 1 commit into from

Conversation

jpgu-epam
Copy link

Motivation for this change

As the channel keeps supporting python27 some derivations need to be fixed or added to still working is this python version.

Things done

  • Add python27 support for the following derivations:

    GitPython
    Venusian
    Uritools
    Sphinxcontrib-blockdiag

  • Adding Protobuf 3.3.0 derivation

  • Fix tremor repository which was moved to GitLab

  • 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.

@ofborg ofborg bot requested a review from domenkozar July 27, 2020 14:48
jonringer
jonringer reviewed Jul 31, 2020
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

cc @FRidh

pkgs/development/python-modules/sphinxcontrib-blockdiag/2.nix Outdated Show resolved Hide resolved
@jpgu-epam
- Add python27 support for the following derivations:
943c0d7 
    GitPython
    Venusian
    Uritools
    Sphinxcontrib-blockdiag

- Adding Protobuf 3.3.0 derivation

- Fix tremor repository which was moved to GitLab
@jpgu-epam jpgu-epam requested a review from jonringer July 31, 2020 11:21
jonringer
jonringer reviewed Jul 31, 2020
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

To comply with CONTRIBUTING.md please have the commit messages name be of the format

<pkg-name>: <subject-line>

for more examples, please look at https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md#submitting-changes

please split up the changes into a commit to package affected. having a single large commit makes it difficult to discern what change potentially caused a regression. Also makes cherry-picking between branches very difficult.

@jonringer
Copy link
Contributor

also:

When backporting changes, please follow https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md#backporting-changes.

Namely, you should be doing git cherry-pick -x <rev> from a commit that has already landed in master. If the branches have diverged, you may alter the commit or add another commit to ensure that the package is able to still evaluate and build

@jpgu-epam
Copy link
Author

also:

When backporting changes, please follow https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md#backporting-changes.

Namely, you should be doing git cherry-pick -x <rev> from a commit that has already landed in master. If the branches have diverged, you may alter the commit or add another commit to ensure that the package is able to still evaluate and build

I'm completely ignorant about this step. Could you give me more specific instructions pretty please?

  1. I checked out release-20.03
  2. Created backport branch
  3. Imported my changes.

From here I don't know what should I do. Any help is much appreciated, thanks so much!

@jonringer
Copy link
Contributor

backports are applied to master branch, then the release branch (you are going directly to release branch)

for backport PRs, you want to target release-YY-MM, not nixos-YY-MM

@jpgu-epam jpgu-epam closed this Aug 25, 2020
@jpgu-epam jpgu-epam deleted the nixos-20.03 branch August 25, 2020 10:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonringer jonringer jonringer left review comments

@FRidh FRidh Awaiting requested review from FRidh FRidh is a code owner

@domenkozar domenkozar Awaiting requested review from domenkozar

Assignees
No one assigned
Labels
6.topic: python 8.has: package (new) 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.

None yet
3 participants
@jpgu-epam @jonringer @FRidh