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

Uptade pytest-timeout and x265 derivations #97527

Closed
wants to merge 2 commits into from
Closed

Uptade pytest-timeout and x265 derivations #97527

wants to merge 2 commits into from
+12 −27

Conversation

jpgu-epam
Copy link

Motivation for this change

Update the following derivations and remove old patches on those:

pytest-timeout: 1.3.3 -> 1.4.2
x265: 3.2 -> 3.4

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.

Sorry, something went wrong.

@jpgu-epam jpgu-epam changed the title Nixos 20.03 fixes Uptade pytest-timeout and x265 derivations Sep 9, 2020
@ofborg ofborg bot requested review from costrouc, makefu and codyopel September 9, 2020 11:35
@ajs124
Copy link
Member

ajs124 commented Sep 9, 2020

  1. nixos-20.03 is the wrong branch, even if this were a backport, it should be release-20.03
  2. is this a backport? does master have this? if so, please backport with git cherry-pick -x as outlined here.

drewrisinger added a commit to drewrisinger/nixpkgs that referenced this pull request Sep 10, 2020
@drewrisinger
python3Packages.pytest-timeout: 1.3.3 -> 1.4.2
eea9254 
* Update version
* switch to pytestCheckHook
* Update meta: hompage & changelog
* explicit runtime dependency on pytest

Based on work by @jpgu-epam in NixOS#97527.
@drewrisinger drewrisinger mentioned this pull request Sep 10, 2020
Merged
10 tasks
@jpgu-epam
Copy link
Author

  1. nixos-20.03 is the wrong branch, even if this were a backport, it should be release-20.03
  2. is this a backport? does master have this? if so, please backport with git cherry-pick -x as outlined here.

In master PR they told me these changes won't be backported. So, just need to change the target branch?

@ajs124
Copy link
Member

ajs124 commented Sep 28, 2020

backporting means that a change from the master branch gets cherry-picked into a stable release branch. It's documented here.

jonringer pushed a commit that referenced this pull request Oct 29, 2020
@drewrisinger
python3Packages.pytest-timeout: 1.3.3 -> 1.4.2
5f4c238 
* Update version
* switch to pytestCheckHook
* Update meta: hompage & changelog
* explicit runtime dependency on pytest

Based on work by @jpgu-epam in #97527.
@FRidh
Copy link
Member

FRidh commented Dec 2, 2020

Versions updates like these are not accepted on a stable branch. Note also that they would have to be cherry-picked from the master branch, and that the target branch would have to be release-20.03.

@FRidh FRidh closed this Dec 2, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@makefu makefu

@FRidh FRidh

@jonringer jonringer

@costrouc costrouc

@codyopel codyopel

Assignees
No one assigned
Labels
6.topic: python 10.rebuild-darwin: 501+ 10.rebuild-darwin: 1001-2500 10.rebuild-linux: 501+ 10.rebuild-linux: 1001-2500
Projects
Python batch upgrade
Status: Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@jpgu-epam @ajs124 @FRidh @makefu