zeronet: init at 0.6.2 #40883

fgaz · 2018-05-21T15:06:21Z

Motivation for this change

https://zeronet.io

Things done

Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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/)
Fits CONTRIBUTING.md.

Is the path correct or should I put it under pkgs/servers?

This probably needs a nixos module too but I won't add it in this pr.

FRidh · 2018-05-21T18:48:37Z

pkgs/applications/networking/p2p/zeronet/default.nix

+
+  format = "other";
+
+  buildPhase = "python -O -m compileall .";


${python.interpreter} instead of python

FRidh · 2018-05-21T18:49:05Z

pkgs/applications/networking/p2p/zeronet/default.nix

+
+  # Wrap the main executable and set the log and data dir to something out of
+  # the store
+  fixupPhase = ''


Its intentional to replace any existing fixupPhase?

But there shouldn't be any, as I am using format="other". Or should I move it to postFixup anyway?

Oh well, moving it won't do any harm

FRidh · 2018-05-21T18:49:46Z

pkgs/applications/networking/p2p/zeronet/default.nix

@@ -0,0 +1,42 @@
+{ stdenv, fetchFromGitHub, buildPythonApplication


applications should pass in python or pythonPackages, not the individual attributes.

fgaz · 2018-05-21T20:00:41Z

@FRidh All done

Chiiruno · 2018-05-21T20:47:44Z

Nice, maybe we'll get ZeroNet here soon.
You can probably for the most part copy this other zeronet commit for the module.
pkgs/applications/networking/p2p should be fine as it is, pkgs/servers is more for inbound network facing packages.

fgaz · 2018-05-21T21:55:50Z

@Chiiruno oh... there was another pr?! I always forget to do a search before writing code and duplicating things >.<

fgaz · 2018-05-21T22:07:33Z

Only now I see the horror that is that lib directory... What is the policy on vendoring here? Should I patch it to use upstream for each of those libraries?

Chiiruno · 2018-05-21T22:37:26Z

AFAIK you shouldn't have to mess with the lib directory, and you don't necessarily need to implement all the config options that the other commit did.
See this module for ideas on the zeronet module, it shouldn't have to get more complex than that.
Make sure to add a user/group id to nixos/modules/misc/ids.nix and call your module in nixos/modules/module-list.nix.

Chiiruno · 2018-05-21T22:43:27Z

This is one of those packages where the authors think its a good idea to bundle everything and do updating from within the application, see HelloZeroNet/ZeroNet#382.

This is likely going to need quite some patching to get rid of vendored dependencies. They also do some sys.path. manipulation in zeronet.py I saw.

From #31910

You may want to check if your package has a problem with any of that.

FRidh · 2018-05-22T18:49:44Z

pkgs/applications/networking/p2p/zeronet/default.nix

@@ -0,0 +1,41 @@
+{ stdenv, fetchFromGitHub, python2Packages, python2 }:


python2Packages or python2. The interpreter is part of the package set, python2Packages.python, and the packages part of the interpreter, python2.pkgs

fgaz · 2018-06-01T12:10:04Z

@Chiiruno The path should be ok, and I think the deps will remain vendored for now

xeji · 2018-06-02T08:54:57Z

@GrahamcOfBorg build zeronet

GrahamcOfBorg · 2018-06-02T08:55:48Z

Success on x86_64-darwin (full log)

Attempted: zeronet

Partial log (click to expand)

Listing ./tools ...
Listing ./tools/coffee ...
Listing ./tools/tor ...
Compiling ./update.py ...
Compiling ./zeronet.py ...
installing
post-installation fixup
strip is /nix/store/r5mcn9vqq80v5pfqp45d7290cis7dwp4-cctools-binutils-darwin/bin/strip
patching script interpreter paths in /nix/store/nwdmga7cyl557la6wjplnilwvfjc2vr9-zeronet-0.6.2
/nix/store/nwdmga7cyl557la6wjplnilwvfjc2vr9-zeronet-0.6.2/share/zeronet.py: interpreter directive changed from "/usr/bin/env python2.7" to "/nix/store/q3ncxyf9ql0wffblk758a2790mjfvan6-python-2.7.15/bin/python2.7"

GrahamcOfBorg · 2018-06-02T08:56:10Z

Success on aarch64-linux (full log)

Attempted: zeronet

Partial log (click to expand)

Compiling ./update.py ...
Compiling ./zeronet.py ...
installing
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/hblz98pxggh1w63n2ig1wvd7xsl3a1xi-zeronet-0.6.2
strip is /nix/store/8yfik687kfccisxnad42j19lfb7ij9b4-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/hblz98pxggh1w63n2ig1wvd7xsl3a1xi-zeronet-0.6.2
/nix/store/hblz98pxggh1w63n2ig1wvd7xsl3a1xi-zeronet-0.6.2/share/zeronet.py: interpreter directive changed from "/usr/bin/env python2.7" to "/nix/store/1xkxxrd2sd8q78icm687ac8si9miak45-python-2.7.15/bin/python2.7"
checking for references to /build in /nix/store/hblz98pxggh1w63n2ig1wvd7xsl3a1xi-zeronet-0.6.2...
/nix/store/hblz98pxggh1w63n2ig1wvd7xsl3a1xi-zeronet-0.6.2

GrahamcOfBorg · 2018-06-02T08:56:23Z

Success on x86_64-linux (full log)

Attempted: zeronet

Partial log (click to expand)

Listing ./tools/tor ...
Compiling ./update.py ...
Compiling ./zeronet.py ...
installing
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/n5h2ad8jdvpvj63jh2f8ywada4cqs4b5-zeronet-0.6.2
strip is /nix/store/92d2ifxcni4n3zx9s8wnkcjlvnx5ajlc-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/n5h2ad8jdvpvj63jh2f8ywada4cqs4b5-zeronet-0.6.2
/nix/store/n5h2ad8jdvpvj63jh2f8ywada4cqs4b5-zeronet-0.6.2/share/zeronet.py: interpreter directive changed from "/usr/bin/env python2.7" to "/nix/store/xlc7ld1xd57ha3x9mbx11c84j290va0f-python-2.7.15/bin/python2.7"
checking for references to /build in /nix/store/n5h2ad8jdvpvj63jh2f8ywada4cqs4b5-zeronet-0.6.2...

GrahamcOfBorg added 8.has: package (new) 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 labels May 21, 2018

FRidh reviewed May 21, 2018

View reviewed changes

fgaz force-pushed the zeronet branch from 9c60afd to 91a63b3 Compare May 21, 2018 20:00

FRidh reviewed May 22, 2018

View reviewed changes

zeronet: init at 0.6.2

0ea1979

fgaz force-pushed the zeronet branch from 91a63b3 to 0ea1979 Compare June 1, 2018 12:08

xeji merged commit b25c251 into NixOS:master Jun 2, 2018

xeji mentioned this pull request Jun 2, 2018

zeronet: init at 0.6.0 #31910

Closed

8 tasks

fgaz deleted the zeronet branch March 5, 2019 08:21

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

zeronet: init at 0.6.2 #40883

zeronet: init at 0.6.2 #40883

fgaz commented May 21, 2018 •

edited

FRidh May 21, 2018

FRidh May 21, 2018

fgaz May 21, 2018

fgaz May 21, 2018

FRidh May 21, 2018

fgaz commented May 21, 2018

Chiiruno commented May 21, 2018 •

edited

fgaz commented May 21, 2018

fgaz commented May 21, 2018

Chiiruno commented May 21, 2018 •

edited

Chiiruno commented May 21, 2018 •

edited

FRidh May 22, 2018

fgaz Jun 1, 2018

fgaz commented Jun 1, 2018

xeji commented Jun 2, 2018

GrahamcOfBorg commented Jun 2, 2018

GrahamcOfBorg commented Jun 2, 2018

GrahamcOfBorg commented Jun 2, 2018

		@@ -0,0 +1,42 @@
		{ stdenv, fetchFromGitHub, buildPythonApplication

		@@ -0,0 +1,41 @@
		{ stdenv, fetchFromGitHub, python2Packages, python2 }:

zeronet: init at 0.6.2 #40883

zeronet: init at 0.6.2 #40883

Conversation

fgaz commented May 21, 2018 • edited

Motivation for this change

Things done

FRidh May 21, 2018

Choose a reason for hiding this comment

FRidh May 21, 2018

Choose a reason for hiding this comment

fgaz May 21, 2018

Choose a reason for hiding this comment

fgaz May 21, 2018

Choose a reason for hiding this comment

FRidh May 21, 2018

Choose a reason for hiding this comment

fgaz commented May 21, 2018

Chiiruno commented May 21, 2018 • edited

fgaz commented May 21, 2018

fgaz commented May 21, 2018

Chiiruno commented May 21, 2018 • edited

Chiiruno commented May 21, 2018 • edited

FRidh May 22, 2018

Choose a reason for hiding this comment

fgaz Jun 1, 2018

Choose a reason for hiding this comment

fgaz commented Jun 1, 2018

xeji commented Jun 2, 2018

GrahamcOfBorg commented Jun 2, 2018

GrahamcOfBorg commented Jun 2, 2018

GrahamcOfBorg commented Jun 2, 2018

fgaz commented May 21, 2018 •

edited

Chiiruno commented May 21, 2018 •

edited

Chiiruno commented May 21, 2018 •

edited

Chiiruno commented May 21, 2018 •

edited