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

Jump to bottom

fedpkg: remove unneeded patch #51229

Merged
merged 3 commits into from Dec 5, 2018
Merged

fedpkg: remove unneeded patch #51229

merged 3 commits into from Dec 5, 2018

Conversation

marsam
Copy link
Contributor

@marsam marsam commented Nov 29, 2018

Motivation for this change

This patch is no longer used

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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@marsam marsam requested a review from FRidh as a code owner November 29, 2018 13:25
@jtojnar
Copy link
Contributor

jtojnar commented Nov 29, 2018

@GrahamcOfBorg build python3.pkgs.fedpkg python2.pkgs.fedpkg

@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: python3.pkgs.fedpkg, python2.pkgs.fedpkg

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnsupportedSystem = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: python2.pkgs.fedpkg

The following builds were skipped because they don't evaluate on x86_64-linux: python3.pkgs.fedpkg

Partial log (click to expand)

/build/fedpkg-1.29
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/cyphpr9xrrzij259jb12s8as6bsi0h5r-python2.7-fedpkg-1.29
strip is /nix/store/n4hb93w6j076xcjw5pm09rdmc09s075b-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/cyphpr9xrrzij259jb12s8as6bsi0h5r-python2.7-fedpkg-1.29/lib  /nix/store/cyphpr9xrrzij259jb12s8as6bsi0h5r-python2.7-fedpkg-1.29/bin
patching script interpreter paths in /nix/store/cyphpr9xrrzij259jb12s8as6bsi0h5r-python2.7-fedpkg-1.29
checking for references to /build in /nix/store/cyphpr9xrrzij259jb12s8as6bsi0h5r-python2.7-fedpkg-1.29...
wrapping `/nix/store/cyphpr9xrrzij259jb12s8as6bsi0h5r-python2.7-fedpkg-1.29/bin/fedpkg'...
wrapping `/nix/store/cyphpr9xrrzij259jb12s8as6bsi0h5r-python2.7-fedpkg-1.29/bin/fedpkg-stage'...
/nix/store/cyphpr9xrrzij259jb12s8as6bsi0h5r-python2.7-fedpkg-1.29

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: python2.pkgs.fedpkg

The following builds were skipped because they don't evaluate on aarch64-linux: python3.pkgs.fedpkg

Partial log (click to expand)

post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/sy1gpmjq3apymrvraz42a29rpy9n46hm-python2.7-fedpkg-1.29
strip is /nix/store/qjrnv0qw44bw1hc23zhfh26xd1c25dfs-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/sy1gpmjq3apymrvraz42a29rpy9n46hm-python2.7-fedpkg-1.29/lib  /nix/store/sy1gpmjq3apymrvraz42a29rpy9n46hm-python2.7-fedpkg-1.29/bin
patching script interpreter paths in /nix/store/sy1gpmjq3apymrvraz42a29rpy9n46hm-python2.7-fedpkg-1.29
checking for references to /build in /nix/store/sy1gpmjq3apymrvraz42a29rpy9n46hm-python2.7-fedpkg-1.29...
wrapping `/nix/store/sy1gpmjq3apymrvraz42a29rpy9n46hm-python2.7-fedpkg-1.29/bin/fedpkg'...
wrapping `/nix/store/sy1gpmjq3apymrvraz42a29rpy9n46hm-python2.7-fedpkg-1.29/bin/fedpkg-stage'...
warning: SQLite database '/nix/var/nix/db/db.sqlite' is busy
/nix/store/sy1gpmjq3apymrvraz42a29rpy9n46hm-python2.7-fedpkg-1.29

@worldofpeace
Copy link
Contributor

@marsam Can you remove name = "${pname}-${version}";?
We don't need that in python packages anymore.

@jtojnar
Copy link
Contributor

jtojnar commented Nov 29, 2018 •
edited

The patch might still be needed:

$ exa -T result/
result
├── bin
│  ├── fedpkg
│  └── fedpkg-stage
├── lib
│  └── python2.7
│     └── site-packages
│        ├── etc
│        │  ├── bash_completion.d
│        │  │  └── fedpkg.bash
│        │  └── rpkg
│        │     ├── fedpkg-stage.conf
│        │     └── fedpkg.conf
│        ├── fedpkg
│        │  ├── __init__.py
│        │  ├── __init__.pyc
│        │  ├── __main__.py
│        │  ├── __main__.pyc
│        │  ├── cli.py
│        │  ├── cli.pyc
│        │  ├── lookaside.py
│        │  └── lookaside.pyc
│        ├── fedpkg-1.29.dist-info
│        │  ├── COPYING
│        │  ├── INSTALLER
│        │  ├── METADATA
│        │  ├── RECORD
│        │  ├── top_level.txt
│        │  └── WHEEL
│        └── usr
│           └── share
│              └── zsh
│                 └── site-functions
│                    └── _fedpkg
└── nix-support
   └── propagated-build-inputs

@worldofpeace
Copy link
Contributor

Perhaps an update and a slightly different patch would be preferable https://pagure.io/fedpkg/blob/master/f/setup.py#_51

@marsam
Copy link
Contributor Author

marsam commented Dec 1, 2018

I've updated the patch

$ exa -T result/
result
├── bin
│  ├── fedpkg
│  └── fedpkg-stage
├── etc
│  └── rpkg
│     ├── fedpkg-stage.conf
│     └── fedpkg.conf
├── lib
│  └── python2.7
│     └── site-packages
│        ├── fedpkg
│        │  ├── __init__.py
│        │  ├── __init__.pyc
│        │  ├── __main__.py
│        │  ├── __main__.pyc
│        │  ├── cli.py
│        │  ├── cli.pyc
│        │  ├── lookaside.py
│        │  └── lookaside.pyc
│        └── fedpkg-1.29.dist-info
│           ├── COPYING
│           ├── INSTALLER
│           ├── METADATA
│           ├── RECORD
│           ├── top_level.txt
│           └── WHEEL
├── nix-support
│  └── propagated-build-inputs
└── share
   ├── bash-completion
   │  └── completions
   │     └── fedpkg.bash
   └── zsh
      └── site-functions
         └── _fedpkg

@worldofpeace
Copy link
Contributor

@marsam Would you mind doing other cleanups for this?

@marsam
Copy link
Contributor Author

marsam commented Dec 1, 2018

sure, do you have anything in mind?

@worldofpeace
Copy link
Contributor

sure, do you have anything in mind?

Yep, just wanted to ask before I started reviewing again.

worldofpeace
worldofpeace reviewed Dec 1, 2018
View reviewed changes
Copy link
Contributor

@worldofpeace worldofpeace left a comment

Choose a reason for hiding this comment

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

I think this a tool and not meant to be used as an importable module.

So we should use buildPythonApplication (similar to what was done in #50863) and move it to a better home in nixpkgs.

@worldofpeace
Copy link
Contributor

Also, all that cleanup I think an update would be cool.

@marsam
fedpkg: fix patch
7905c38
@marsam
fedpkg: promote to python application
c220fe8
@marsam
fedpkg: add fedora_cert as dependency
2256273 
[1: 1b9fd36] Removed fedora_cert from nixpkgs, but fedpkg 1.29 still
it required at runtime.

1: 1b9fd36
   fedora_cert: remove package
@marsam
Copy link
Contributor Author

marsam commented Dec 1, 2018 •
edited

I've updated fedpkg with buildPythonApplication, and checked the binaries are working

Also, I did try to update it, but that it's going to take a bit of time: 3c1823c9838, because they don't quite follow the standard python packaging. I think that can go in another PR.

@worldofpeace
Copy link
Contributor

I've updated fedpkg with buildPythonApplication, and checked the binaries are working

👍

Also, I did try to update it, but that it's going to take a bit of time: 3c1823c, because they don't quite follow the standard python packaging. I think that can go in another PR.

I agree that a separate pr for that would be appropriate.

worldofpeace
worldofpeace approved these changes Dec 2, 2018
View reviewed changes
Copy link
Contributor

@worldofpeace worldofpeace left a comment

Choose a reason for hiding this comment

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

Builds and executes locally. Also I can clone a repo anonymously.
Though I had to specify the path to a modified config with the new urls.

@worldofpeace worldofpeace merged commit 572b514 into NixOS:master Dec 5, 2018
@marsam marsam deleted the feature/fedpkg-cleanup branch December 5, 2018 02:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jtojnar jtojnar jtojnar left review comments

@worldofpeace worldofpeace worldofpeace approved these changes

@FRidh FRidh Awaiting requested review from FRidh

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

Successfully merging this pull request may close these issues.

None yet
4 participants
@marsam @jtojnar @GrahamcOfBorg @worldofpeace