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

unicorn(-emu): 1.0.2-rc4 -> 1.0.2 #102085

Merged
merged 1 commit into from
Nov 2, 2020
Merged

unicorn(-emu): 1.0.2-rc4 -> 1.0.2 #102085

merged 1 commit into from
Nov 2, 2020
+34 −37

Conversation

luc65r
Copy link
Contributor

@luc65r luc65r commented Oct 29, 2020 •
edited
Loading

Motivation for this change

Updated unicorn and simplified the file.
Since the unicorn attribute name is free for some time now, I used it

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.

@ofborg ofborg bot added the 8.has: package (new) This PR adds a new package label Oct 29, 2020
@ofborg ofborg bot requested a review from thoughtpolice October 29, 2020 18:38
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 labels Oct 29, 2020
@luc65r
Copy link
Contributor Author

luc65r commented Oct 29, 2020

@thoughtpolice could you take a look?

@SuperSandro2000
Copy link
Member

Result of nixpkgs-review pr 102085 run on x86_64-linux 1

7 packages failed to build:
  • pwndbg
  • pwntools (python38Packages.pwntools)
  • python27Packages.pwntools
  • python27Packages.unicorn
  • python37Packages.pwntools
  • python37Packages.unicorn
  • python38Packages.unicorn
1 package built:
  • unicorn (unicorn-emu)

@luc65r
Copy link
Contributor Author

luc65r commented Oct 29, 2020

IDK why license was bsd3, it is clearly stated on the website that it is licensed under gpl2

@luc65r
Copy link
Contributor Author

luc65r commented Oct 29, 2020

Now everything should work @SuperSandro2000

@luc65r
unicorn(-emu): 1.0.2-rc4 -> 1.0.2

Verified

This commit was signed with the committer’s verified signature.
janb87 Jan Bevers
SSH Key Fingerprint: Q4MM1aj9NRNSXhCdudBo4HGT+Bc10rYGmMPZgGbXTTk
Verified
Learn about vigilant mode
345f1d1
@luc65r
Copy link
Contributor Author

luc65r commented Oct 29, 2020

now ofborg-eval-package-list-no-aliases should be happy

@ofborg ofborg bot requested review from risicle and bennofs October 29, 2020 21:17
@SuperSandro2000
Copy link
Member

SuperSandro2000 commented Oct 29, 2020 •
edited
Loading

Result of nixpkgs-review pr 102085 run on x86_64-darwin 1

3 packages failed to build:
  • pwntools (python38Packages.pwntools)
  • python27Packages.pwntools
  • python37Packages.pwntools
4 packages built:
  • python27Packages.unicorn
  • python37Packages.unicorn
  • python38Packages.unicorn
  • unicorn
/nix/store/d61m18vxxwqshv4vik4jw3i7a9d3sflx-stdenv-darwin/setup: line 1309: patchelf: command not found
cannot build derivation '/nix/store/bgsbvql6p4p7p3kjczd0dwvb3wpz05dm-python2.7-pwntools-4.2.2.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/89kad2w5wkb1f6jf8r6m2rr22brg96ym-python3.7-pwntools-4.2.2.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/q2yvfbkdp4wsnny5qnvqzwwwh8658g7w-python3.8-pwntools-4.2.2.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/czyfn65q3jzx6x0j3xfbkdzfp5w8ll91-env.drv': 3 dependencies couldn't be built

Thats strange.

@risicle
Copy link
Contributor

risicle commented Oct 29, 2020

pwntools appears already broken on darwin in master. Same result for me on macos 10.14.

On linux x86_64, all rebuilds are happy.

@luc65r
Copy link
Contributor Author

luc65r commented Oct 30, 2020

I guess it can be merged in this state since it doesn't break what wasn't broken before.
Someone who can test on darwin could try to fix pwntools in another PR.

mkg20001
mkg20001 approved these changes Nov 2, 2020
View reviewed changes
Copy link
Member

@mkg20001 mkg20001 left a comment

Choose a reason for hiding this comment

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

LGTM

@mkg20001 mkg20001 merged commit 16abe1a into NixOS:master Nov 2, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SuperSandro2000 SuperSandro2000

@mkg20001 mkg20001

@thoughtpolice thoughtpolice

@FRidh FRidh

@jonringer jonringer

@risicle risicle

@bennofs bennofs

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: 1-10 10.rebuild-linux: 1-10 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@luc65r @SuperSandro2000 @risicle @mkg20001