platformio: 3.4.1 -> 3.5.0 #33367

mogorman · 2018-01-03T05:09:29Z

Motivation for this change

i wanted to use an esp32 so i needed to update platformio. it needs a specific version of lru_cache because arrow 0.12.0 needs a specific version it seems. also the wrapper function had to be changed as it was not linking to the lru package correctly.

Things done

Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
Built on platform(s)
- [X ] 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"
[ X] Tested execution of all binary files (usually in ./result/bin/)
Fits CONTRIBUTING.md.

adisbladis · 2018-01-03T13:20:22Z

pkgs/development/python-modules/arrow/default.nix

@@ -16,7 +16,7 @@ buildPythonPackage rec {
  '';

  checkInputs = [ nose chai simplejson ];
-  propagatedBuildInputs = [ dateutil backports_functools_lru_cache ];
+  propagatedBuildInputs = [ dateutil backports_functools_lru_cache_121 ];


I would rather patch the line install_requires.append('backports.functools_lru_cache==1.2.1') from setup.py to read install_requires.append('backports.functools_lru_cache>=1.2.1').

I've patched the setup.py in 340cadd.

adisbladis · 2018-01-03T13:24:38Z

pkgs/top-level/python-packages.nix

@@ -1007,6 +1007,8 @@ in {

  backports_functools_lru_cache = callPackage ../development/python-modules/backports_functools_lru_cache { };

+  backports_functools_lru_cache_121 = callPackage ../development/python-modules/backports_functools_lru_cache_121 { };


Even if arrow really does require a very specific version of lru_cache this version should not be exposed in python-packages.nix.

Ideally arrow should be patched to not require a very explicit version but if it really does this override should be moved to the arrow directory.

Additional versions of packages are not permitted in python-packages.nix at all as they cause collisions, so also not inside expressions. Applications that are defined outside python-packages.nix can override the package set to insert whatever version they need.

FRidh · 2018-01-03T13:38:46Z

pkgs/top-level/python-packages.nix

@@ -1007,6 +1007,8 @@ in {

  backports_functools_lru_cache = callPackage ../development/python-modules/backports_functools_lru_cache { };

+  backports_functools_lru_cache_121 = callPackage ../development/python-modules/backports_functools_lru_cache_121 { };


Additional versions of packages are not permitted in python-packages.nix at all as they cause collisions, so also not inside expressions. Applications that are defined outside python-packages.nix can override the package set to insert whatever version they need.

mogorman · 2018-01-03T16:14:05Z

made changes requested by @FRidh and @adisbladis and verified it still worked on my box. I also added pio alias as it has been bugging me its not there

FRidh · 2018-01-03T17:49:24Z

pkgs/development/arduino/platformio/chrootenv.nix

@@ -30,5 +32,9 @@ buildFHSUserEnv {
    platforms = with platforms; linux;
  };

+  extraInstallCommands = ''
+    ln -s $out/bin/platformio $out/bin/pio
+  ''a


FRidh · 2018-01-03T17:53:00Z

pkgs/development/python-modules/platformio/default.nix

@@ -23,6 +23,13 @@ buildPythonPackage rec {

  patches = [ ./fix-searchpath.patch ];

+  postInstall = ''


Why is this needed? wrapPythonPrograms already sets PATH and injects PYTHONPATH.
Note also that the postFixup (or fixupPhase in general) is preferred for wrappers.

you are right its no longer needed with the other fixes in place. earlier i was not seeing the lru getting linked in properly.

FRidh · 2018-01-03T18:05:11Z

What are the packages in the chrootenv for? They all seem to be dependencies of platformio already. Did you get an import error if you did not add say the backports package?

mogorman · 2018-01-03T18:13:19Z

Earlier i thought I did. I just tested it with them removed and it runs fine as well. I pushed updated code just now @FRidh

FRidh · 2018-01-03T18:17:07Z

I think you may as well write python.withPackages(ps: with ps; [ platformio ]) instead of the current dependencies.

mogorman · 2018-01-03T19:48:34Z

@FRidh i am happy to make that change but im not sure how. i looked at some of the packages that make use of it but not sure i completely grok whats going on.

FRidh · 2018-01-04T12:20:39Z

@mogorman it creates a tree of symbolic links including the listed packages and Python dependencies.

mogorman · 2018-01-04T17:10:11Z

right @FRidh , im just not sure how to correctly to use it in the expression and have the resulting fhsuserenv work. i tried saying let pythonUserEnv = python.withPackages(ps: with ps; [ platformio ]) and then including that instead of the python deps and it failed to run

FRidh · 2018-01-06T16:43:34Z

i tried saying let pythonUserEnv = python.withPackages(ps: with ps; [ platformio ]) and then including that instead of the python deps and it failed to run

That's a pity, I thought that could work. How did it fail? With what error?

FRidh · 2018-01-06T16:44:28Z

In any case, that's an improvement that can be made separate from this PR.

mogorman requested a review from FRidh as a code owner January 3, 2018 05:09

mogorman changed the title ~~platformio: 3.4.1 -> 3.5.0c~~ platformio: 3.4.1 -> 3.5.0 Jan 3, 2018

GrahamcOfBorg added 10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100 labels Jan 3, 2018

adisbladis requested changes Jan 3, 2018

View reviewed changes

FRidh requested changes Jan 3, 2018

View reviewed changes

mogorman force-pushed the platformio-3.5.0 branch from 4d8e4eb to 9c7eee2 Compare January 3, 2018 16:13

GrahamcOfBorg added 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 and removed 10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100 labels Jan 3, 2018

mogorman force-pushed the platformio-3.5.0 branch from 9c7eee2 to d4109bd Compare January 3, 2018 16:31

FRidh reviewed Jan 3, 2018

View reviewed changes

mogorman force-pushed the platformio-3.5.0 branch 3 times, most recently from f3d2507 to 147abaa Compare January 3, 2018 17:59

platformio: 3.4.1 -> 3.5.0

27b5dbb

mogorman force-pushed the platformio-3.5.0 branch from 147abaa to 27b5dbb Compare January 3, 2018 18:12

adisbladis approved these changes Jan 3, 2018

View reviewed changes

FRidh merged commit b78c42c into NixOS:master Jan 6, 2018

mogorman deleted the platformio-3.5.0 branch January 6, 2018 22:44

mogorman mentioned this pull request Jan 11, 2018

platformio fails to upload #31136

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

platformio: 3.4.1 -> 3.5.0 #33367

platformio: 3.4.1 -> 3.5.0 #33367

mogorman commented Jan 3, 2018

adisbladis Jan 3, 2018

FRidh Jan 3, 2018

adisbladis Jan 3, 2018

FRidh Jan 3, 2018

FRidh Jan 3, 2018

mogorman commented Jan 3, 2018 •

edited

FRidh Jan 3, 2018

mogorman Jan 3, 2018

FRidh Jan 3, 2018

mogorman Jan 3, 2018

FRidh commented Jan 3, 2018

mogorman commented Jan 3, 2018

FRidh commented Jan 3, 2018

mogorman commented Jan 3, 2018

FRidh commented Jan 4, 2018

mogorman commented Jan 4, 2018

FRidh commented Jan 6, 2018 •

edited

FRidh commented Jan 6, 2018

		@@ -1007,6 +1007,8 @@ in {

		backports_functools_lru_cache = callPackage ../development/python-modules/backports_functools_lru_cache { };

		backports_functools_lru_cache_121 = callPackage ../development/python-modules/backports_functools_lru_cache_121 { };

		@@ -23,6 +23,13 @@ buildPythonPackage rec {

		patches = [ ./fix-searchpath.patch ];

		postInstall = ''

platformio: 3.4.1 -> 3.5.0 #33367

platformio: 3.4.1 -> 3.5.0 #33367

Conversation

mogorman commented Jan 3, 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

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mogorman commented Jan 3, 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

FRidh commented Jan 3, 2018

mogorman commented Jan 3, 2018

FRidh commented Jan 3, 2018

mogorman commented Jan 3, 2018

FRidh commented Jan 4, 2018

mogorman commented Jan 4, 2018

FRidh commented Jan 6, 2018 • edited

FRidh commented Jan 6, 2018

mogorman commented Jan 3, 2018 •

edited

FRidh commented Jan 6, 2018 •

edited