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.

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

patchutils: add 0.4.2 variant + remove meta.executable + enable tests + fix inter-dependencies by wrapping #141567

Merged
merged 6 commits into from Oct 25, 2021

Conversation

Artturin
Copy link
Member

@Artturin Artturin commented Oct 13, 2021

Motivation for this change
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 via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all packages 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/)
  • 21.11 Release Notes (or backporting 21.05 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
  • Fits CONTRIBUTING.md.

@Artturin Artturin changed the title patchutils: add 0.4.2 variant patchutils: add 0.4.2 variant + remove meta.executable + enable tests Oct 13, 2021
@Artturin Artturin mentioned this pull request Oct 13, 2021
10 tasks
@Artturin Artturin changed the title patchutils: add 0.4.2 variant + remove meta.executable + enable tests patchutils: add 0.4.2 variant + remove meta.executable + enable tests + fix inter-dependencies by wrapping Oct 13, 2021
@r-rmcgibbo
Copy link

r-rmcgibbo commented Oct 13, 2021

Result of nixpkgs-review pr 141567 at a55acc9 run on aarch64-linux 1

7 packages built successfully:
  • patchutils
  • patchutils_0_3_3
  • patchutils_0_4_2
  • pokerth
  • pokerth-server
  • python38Packages.ydiff
  • ydiff (python39Packages.ydiff)

Result of nixpkgs-review pr 141567 at a55acc9 run on x86_64-linux 1

2 packages marked as broken and skipped:
  • linuxKernel.packages.hardkernel_4_14.tbs
  • linuxPackages_hardkernel_latest.tbs
17 packages failed to build:
1 package skipped due to time constraints:
  • linuxPackages_latest-libre.tbs (linuxKernel.packages.linux_latest_libre.tbs)
7 packages built successfully:
  • patchutils
  • patchutils_0_3_3
  • patchutils_0_4_2
  • pokerth
  • pokerth-server
  • python38Packages.ydiff
  • ydiff (python39Packages.ydiff)

Note that build failures may predate this PR, and could be nondeterministic or hardware dependent.
Please exercise your independent judgement. Does something look off? Please file an issue or reach out on IRC.

@Artturin Artturin requested review from bobvanderlinden, edef1c, timokau, vcunat and ajs124 and removed request for bobvanderlinden October 14, 2021 21:21
@Artturin
Copy link
Member Author

the packages which failed to build are pre-existing

Copy link
Member

@bobvanderlinden bobvanderlinden left a comment

Choose a reason for hiding this comment

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

Ran the following which all succeeded. Confirmed that the verifyPhase also ran:

nix build .#patchutils
nix build .#patchutils_0_3_3
nix build .#patchutils_0_4_2

gitdiff of patchutils_0_4_2 ran succesfully:

result/bin/gitdiff 36802be8b12 bfe02b23205
File #1  	a/pkgs/tools/text/patchutils/generic.nix

Confirmed that 0.4.2 is the latest version of patchutils.

pkgs/tools/text/patchutils/generic.nix Show resolved Hide resolved
@Artturin Artturin merged commit 44403b7 into NixOS:master Oct 25, 2021
@Artturin Artturin deleted the patchutilsbump branch October 25, 2021 10:13
Comment on lines +503 to +506
fetchpatch = callPackage ../build-support/fetchpatch { }
// {
tests = callPackages ../build-support/fetchpatch/tests.nix { };
};
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
fetchpatch = callPackage ../build-support/fetchpatch { }
// {
tests = callPackages ../build-support/fetchpatch/tests.nix { };
};
fetchpatch = callPackage ../build-support/fetchpatch { } // {
tests = callPackages ../build-support/fetchpatch/tests.nix { };
};

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants