awsebcli: clean up derivation #35380

eqyiel · 2018-02-23T05:50:09Z

Motivation for this change

Follow up from comments on #35315: #35315 (review)

cc @dotlambda, thank you for for the helpful suggestions.

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.

dotlambda · 2018-02-23T07:18:56Z

pkgs/tools/virtualization/awsebcli/default.nix

          pname = "docker-py";
          version = "1.7.2";
-          name = "${pname}-${version}";


You can only drop that if you remove name from the pythonPackages.docker expression.

However, it seems to me like the docker dependency and some others were completely removed from awsebcli's setup.py. Please have a look.

You're right that docker-py is no longer required. docker is now an optional dependency. Even though it's an optional dependency the script is a bit evil, it will try and install docker using pip if you run a command that requires it. I'm not sure how to resolve this though, because the docker in nixpkgs requires a version of requests that awsebcli is not satisified with. I'll remove it for now.

Okay, then we should try to add it nevertheless. Is there maybe a patch to make awsebcli work with a newer version of requests?

dotlambda · 2018-02-23T07:23:05Z

pkgs/tools/virtualization/awsebcli/default.nix

+    packageOverrides = self: super: {
+      cement = super.cement.overridePythonAttrs (oldAttrs: {
+        src = oldAttrs.src.override {
+          version = "2.8.2";


inherit version;

dotlambda · 2018-02-23T07:23:34Z

pkgs/tools/virtualization/awsebcli/default.nix

@@ -2,70 +2,52 @@
 let

  localPython = python.override {
-    packageOverrides = self: super: rec {
-      cement = super.cement.overridePythonAttrs (oldAttrs: rec {
-        version = "2.8.2";


Don't leave that out, otherwise the derivation will have a wrong name.

dotlambda · 2018-02-23T07:24:09Z

pkgs/tools/virtualization/awsebcli/default.nix

          sha256 = "0zsqrzlybf25xscgi7ja4s48y2abf9wvjkn47wh984qgs1fq2xy5";
        };
      });

-      semantic-version = super.semantic-version.overridePythonAttrs (oldAttrs: rec {
-        version = "2.5.0";


Same here for version

dotlambda · 2018-02-23T07:24:20Z

pkgs/tools/virtualization/awsebcli/default.nix

          sha256 = "0p5n3d6blgkncxdz00yxqav0cis87fisdkirjm0ljjh7rdfx7aiv";
        };
      });

-      tabulate = super.tabulate.overridePythonAttrs (oldAttrs: rec {
-        version = "0.7.5";


eqyiel · 2018-02-25T23:56:49Z

@dotlambda thanks again for the feedback, please take another look if you can

dotlambda

Please include (cherry-pick) this commit in your PR: ~~dotlambda@b053d46~~
Otherwise, you would also have to override the name for those python modules specifying a name .

dotlambda · 2018-02-26T07:04:49Z

pkgs/tools/virtualization/awsebcli/default.nix

-          inherit version;
+      colorama = super.colorama.overridePythonAttrs (oldAttrs: {
+        src = oldAttrs.src.override {
+          version = "0.3.7";


inherit version

dotlambda · 2018-02-26T07:11:25Z

pkgs/tools/virtualization/awsebcli/default.nix

@@ -81,7 +59,7 @@ in with localPython.pkgs; buildPythonApplication rec {
  doCheck = false;

  propagatedBuildInputs = [
-    blessed botocore cement colorama docker dockerpty docopt pathspec pyyaml
+    blessed botocore cement colorama dockerpty docopt pathspec pyyaml


Maybe you could add a comment

# FIXME: Add optional docker dependency, which requires requests >= 2.14.2. # Otherwise, awsebcli will try to install it using pip.

dotlambda · 2018-02-26T07:48:56Z

Found a mistake in above commit, use this one instead: dotlambda@073ef99

eqyiel · 2018-02-27T23:43:42Z

@dotlambda I applied those changes on top of your commit and rebased 👍

dotlambda · 2018-02-28T00:02:53Z

@GrahamcOfBorg build awsebcli

GrahamcOfBorg · 2018-02-28T00:03:16Z

Success on x86_64-linux (full log)

Partial log (click to expand)

Successfully installed awsebcli-3.12.3
/tmp/nix-build-awsebcli-3.12.3.drv-0/awsebcli-3.12.3
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/r2q0apj9vp6qmlnr9aw797yf2axvqmm3-awsebcli-3.12.3
strip is /nix/store/b0zlxla7dmy1iwc3g459rjznx59797xy-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/r2q0apj9vp6qmlnr9aw797yf2axvqmm3-awsebcli-3.12.3/lib  /nix/store/r2q0apj9vp6qmlnr9aw797yf2axvqmm3-awsebcli-3.12.3/bin 
patching script interpreter paths in /nix/store/r2q0apj9vp6qmlnr9aw797yf2axvqmm3-awsebcli-3.12.3
checking for references to /tmp/nix-build-awsebcli-3.12.3.drv-0 in /nix/store/r2q0apj9vp6qmlnr9aw797yf2axvqmm3-awsebcli-3.12.3...
wrapping `/nix/store/r2q0apj9vp6qmlnr9aw797yf2axvqmm3-awsebcli-3.12.3/bin/ebp'...
wrapping `/nix/store/r2q0apj9vp6qmlnr9aw797yf2axvqmm3-awsebcli-3.12.3/bin/eb'...

eqyiel · 2018-02-28T02:06:02Z

@dotlambda thanks!

GrahamcOfBorg · 2018-02-28T04:47:55Z

Success on aarch64-linux (full log)

Partial log (click to expand)

/build/awsebcli-3.12.3
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/l98nd84061xi3vy7valw29631izm0jfj-awsebcli-3.12.3
strip is /nix/store/viv0il4zpdqj4p7yamwbmn2k9pb8dcnv-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/l98nd84061xi3vy7valw29631izm0jfj-awsebcli-3.12.3/lib  /nix/store/l98nd84061xi3vy7valw29631izm0jfj-awsebcli-3.12.3/bin
patching script interpreter paths in /nix/store/l98nd84061xi3vy7valw29631izm0jfj-awsebcli-3.12.3
checking for references to /build in /nix/store/l98nd84061xi3vy7valw29631izm0jfj-awsebcli-3.12.3...
wrapping `/nix/store/l98nd84061xi3vy7valw29631izm0jfj-awsebcli-3.12.3/bin/eb'...
wrapping `/nix/store/l98nd84061xi3vy7valw29631izm0jfj-awsebcli-3.12.3/bin/ebp'...
/nix/store/l98nd84061xi3vy7valw29631izm0jfj-awsebcli-3.12.3

GrahamcOfBorg added 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 labels Feb 23, 2018

dotlambda requested changes Feb 23, 2018

View reviewed changes

eqyiel force-pushed the awsebcli-cleanup branch from 7da33e5 to 038fb49 Compare February 25, 2018 23:54

dotlambda requested changes Feb 26, 2018

View reviewed changes

dotlambda added the 6.topic: python label Feb 27, 2018

dotlambda self-assigned this Feb 27, 2018

Robert Schütz and others added 2 commits February 28, 2018 10:10

python: remove name from some expressions

12c71b3

awsebcli: clean up derivation

411b786

eqyiel force-pushed the awsebcli-cleanup branch from 038fb49 to 411b786 Compare February 27, 2018 23:41

eqyiel requested a review from FRidh as a code owner February 27, 2018 23:41

GrahamcOfBorg added 8.has: documentation 10.rebuild-linux: 11-100 and removed 10.rebuild-linux: 1-10 labels Feb 27, 2018

dotlambda merged commit d63835d into NixOS:master Feb 28, 2018

eqyiel deleted the awsebcli-cleanup branch February 28, 2018 02:06

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

awsebcli: clean up derivation #35380

awsebcli: clean up derivation #35380

eqyiel commented Feb 23, 2018

dotlambda Feb 23, 2018

dotlambda Feb 23, 2018

eqyiel Feb 25, 2018

dotlambda Feb 26, 2018 •

edited

dotlambda Feb 23, 2018

dotlambda Feb 23, 2018

dotlambda Feb 23, 2018

dotlambda Feb 23, 2018

eqyiel commented Feb 25, 2018

dotlambda left a comment •

edited

dotlambda Feb 26, 2018

dotlambda Feb 26, 2018

dotlambda commented Feb 26, 2018

eqyiel commented Feb 27, 2018

dotlambda commented Feb 28, 2018

GrahamcOfBorg commented Feb 28, 2018

eqyiel commented Feb 28, 2018

GrahamcOfBorg commented Feb 28, 2018

awsebcli: clean up derivation #35380

awsebcli: clean up derivation #35380

Conversation

eqyiel commented Feb 23, 2018

Motivation for this change

Things done

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dotlambda Feb 26, 2018 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

eqyiel commented Feb 25, 2018

dotlambda left a comment • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dotlambda commented Feb 26, 2018

eqyiel commented Feb 27, 2018

dotlambda commented Feb 28, 2018

GrahamcOfBorg commented Feb 28, 2018

eqyiel commented Feb 28, 2018

GrahamcOfBorg commented Feb 28, 2018

dotlambda Feb 26, 2018 •

edited

dotlambda left a comment •

edited