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

marp: 0.0.13 -> 0.0.14 #50757

Merged
merged 2 commits into from Nov 28, 2018
Merged

marp: 0.0.13 -> 0.0.14 #50757

merged 2 commits into from Nov 28, 2018

Conversation

puffnfresh
Copy link
Contributor

@puffnfresh puffnfresh commented Nov 19, 2018 •
edited

I think 0.0.13 never worked. The 0.0.14 download is weird.

yhatt/marp#258

Motivation for this change
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)
  • Fits CONTRIBUTING.md.

@puffnfresh
marp: 0.0.13 -> 0.0.14
afaa2c8 
I think 0.0.13 never worked. The 0.0.14 download is weird.

yhatt/marp#258
c0bw3b
c0bw3b reviewed Nov 21, 2018
View reviewed changes
pkgs/applications/office/marp/default.nix Outdated
'';

postFixup = ''
chmod u+x $out/bin/Marp
Copy link
Contributor

Choose a reason for hiding this comment

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

The default fixup phase should do that already, no?

Copy link
Member

Choose a reason for hiding this comment

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

I don't think so. Sometimes there are some non-executable files in the same directory also this is dirty but some software just require that.

@Mic92
Copy link
Member

Mic92 commented Nov 21, 2018

Does this need a backport?

@puffnfresh
Copy link
Contributor Author

@Mic92 yes, this is a security release

@aanderse
Copy link
Member

Changelog: https://github.com/yhatt/marp/releases/tag/v0.0.14

@Mic92
Copy link
Member

Mic92 commented Nov 23, 2018

I get a different checksum:

fixed-output derivation produced path '/nix/store/iqmmn394wi5mmqyhp3b457pwrw9v7gif-0.0.14-Marp-linux-x64.tar.gz' with sha256 hash '0nklzxwdx5llzfwz1hl2jpp2kwz78w4y63h5l00fh6fv6zisw6j4' instead of the expected hash '0yx6qxrjfs4q4p6j11zxydr23r9y16l8arygr0yjl4dlzffdygxm'

@puffnfresh
Copy link
Contributor Author

I reported a bug and they must have recreated the release 😢

@c0bw3b
Copy link
Contributor

c0bw3b commented Nov 25, 2018

They corrected their archives.
Bad news is you need to correct the SHA hash. Good news is you can remove your unpackPhase and stick to the previous sourceRoot = ".";

Also I tested building without chmod u+x $out/bin/Marp in the postFixup hook and the file seems to have the necessary rights after install in the nix store:

$ ll ./result/bin/
total 4
lrwxrwxrwx 1 root root 69  1 janv.  1970 Marp -> /nix/store/ax7c2jnlb2fjkmancw1jai4m7a02ylfm-marp-0.0.14/lib/marp/Marp

@c0bw3b
Copy link
Contributor

c0bw3b commented Nov 28, 2018

@GrahamcOfBorg build marp

@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: marp

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: marp

Partial log (click to expand)

post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/bfmjpk5k4l1kka6dpqmg4m6iigscyisn-marp-0.0.14
shrinking /nix/store/bfmjpk5k4l1kka6dpqmg4m6iigscyisn-marp-0.0.14/lib/marp/Marp
shrinking /nix/store/bfmjpk5k4l1kka6dpqmg4m6iigscyisn-marp-0.0.14/lib/marp/libnode.so
shrinking /nix/store/bfmjpk5k4l1kka6dpqmg4m6iigscyisn-marp-0.0.14/lib/marp/libffmpeg.so
strip is /nix/store/n4hb93w6j076xcjw5pm09rdmc09s075b-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/bfmjpk5k4l1kka6dpqmg4m6iigscyisn-marp-0.0.14/lib  /nix/store/bfmjpk5k4l1kka6dpqmg4m6iigscyisn-marp-0.0.14/bin
patching script interpreter paths in /nix/store/bfmjpk5k4l1kka6dpqmg4m6iigscyisn-marp-0.0.14
checking for references to /build in /nix/store/bfmjpk5k4l1kka6dpqmg4m6iigscyisn-marp-0.0.14...
/nix/store/bfmjpk5k4l1kka6dpqmg4m6iigscyisn-marp-0.0.14

@GrahamcOfBorg
Copy link

No attempt on aarch64-linux (full log)

The following builds were skipped because they don't evaluate on aarch64-linux: marp

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.

@c0bw3b c0bw3b merged commit 8b472e3 into NixOS:master Nov 28, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mic92 Mic92 Mic92 left review comments

@c0bw3b c0bw3b c0bw3b left review comments

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@puffnfresh @Mic92 @aanderse @c0bw3b @GrahamcOfBorg