mkspiffs: init at 0.2.3 #46674

haslersn · 2018-09-14T21:11:42Z

Motivation for this change

There wasn't a derivation for mkspiffs yet, so I made one.

Supersedes #46623 as it does, besides the generic version, also contain the versions for arduino-esp32, arduino-esp8266 and esp-idf.

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.

infinisil · 2018-09-20T18:01:17Z

pkgs/tools/filesystems/mkspiffs/default.nix

+  version = "0.2.3";
+
+  src = fetchgit {
+    url = "https://github.com/igrr/mkspiffs";


Use fetchFromGitHub instead

fetchFromGitHub doesn't support deepClone as far as I know.

However, for fetchFromGitHub there is fetchSubmodules = true; which does what I want.

infinisil · 2018-09-20T18:02:54Z

pkgs/tools/filesystems/mkspiffs/default.nix

@@ -0,0 +1,33 @@
+{ stdenv, fetchgit, git
+, extraBuildFlags ? ""


Don't take this as an argument

infinisil · 2018-09-20T18:16:20Z

pkgs/tools/filesystems/mkspiffs/presets.nix

+let
+  buildMkspiffs = overrides : import ./default.nix (
+    { inherit stdenv fetchgit git; } // overrides
+  );


I suggest doing this instead along with the above change:

{ lib, mkspiffs }: lib.mapAttrs (name: { extraBuildFlags }: (mkspiffs.override { buildConfigName = name; }).overrideAttrs (drv: { buildFlags = drv.buildFlags ++ extraBuildFlags; }) ) { arduino-esp32 = { extraBuildFlags = [ "-DSPIFFS_OBJ_META_LEN=4" ]; }; # ... }

infinisil · 2018-09-20T18:16:53Z

pkgs/tools/filesystems/mkspiffs/default.nix

+  nativeBuildInputs = [ git ];
+  installPhase = ''
+    make clean
+    make dist CPPFLAGS="${extraBuildFlags}" BUILD_CONFIG_NAME="-${buildConfigName}"


Isn't the dist target the build phase? If so, you should use buildFlags = [ "dist" ] instead, along with passing the flags via makeFlags = [ "CPPFLAGS=..." "..." ]; or via buildFlags as well. (buildFlags is applied to only the build phase, while makeFlags to all other make phases as well), while using the install phase for the install only. This should also remove the need to make clean (you probably put it there because the default build phase calls make without any arguments).

* Replaced `fetchgit` by `fetchFromGitHub` with `fetchSubmodules = true;` * Removed the args extraBuildFlags and buildConfigNames from default.nix. They used to set the environment variables CPPFLAGS and BUILD_CONFIG_NAME which can be achieved by just overriding the corresponding attributes. * Adapted presets.nix accordingly based on Infinisil's proposal

infinisil · 2018-09-22T14:51:49Z

@GrahamcOfBorg build mkspiffs mkspiffs-presets.arduino-esp8266 mkspiffs-presets.arduino-esp32 mkspiffs-presets.esp-idf

GrahamcOfBorg · 2018-09-22T14:52:43Z

Success on x86_64-linux (full log)

Attempted: mkspiffs, mkspiffs-presets.arduino-esp8266, mkspiffs-presets.arduino-esp32, mkspiffs-presets.esp-idf

Partial log (click to expand)

shrinking RPATHs of ELF executables and libraries in /nix/store/kvdvw2ky489rjz00ngrzxg0va9kijr5v-mkspiffs-0.2.3
shrinking /nix/store/kvdvw2ky489rjz00ngrzxg0va9kijr5v-mkspiffs-0.2.3/bin/mkspiffs
strip is /nix/store/h0lbngpv6ln56hjj59i6l77vxq25flbz-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/kvdvw2ky489rjz00ngrzxg0va9kijr5v-mkspiffs-0.2.3/bin
patching script interpreter paths in /nix/store/kvdvw2ky489rjz00ngrzxg0va9kijr5v-mkspiffs-0.2.3
checking for references to /build in /nix/store/kvdvw2ky489rjz00ngrzxg0va9kijr5v-mkspiffs-0.2.3...
/nix/store/jxs1rd5n7g1gha3x8d7sfzj8qpi2ga5b-mkspiffs-0.2.3
/nix/store/kvdvw2ky489rjz00ngrzxg0va9kijr5v-mkspiffs-0.2.3
/nix/store/ngx3n33v4lnd6r22phzfds8cpy5qhf7c-mkspiffs-0.2.3
/nix/store/ji2x8i36ywxyxmqwy8wak5m42fykz2b6-mkspiffs-0.2.3

GrahamcOfBorg · 2018-09-22T14:52:52Z

Failure on x86_64-darwin (full log)

Attempted: mkspiffs, mkspiffs-presets.arduino-esp8266, mkspiffs-presets.arduino-esp32, mkspiffs-presets.esp-idf

Partial log (click to expand)

      _spiffs_object_create in spiffs_nucleus.o
      _spiffs_object_update_index_hdr in spiffs_nucleus.o
  "start", referenced from:
     implicit entry/start for main executable
ld: symbol(s) not found for architecture i386
clang-5.0: error: linker command failed with exit code 1 (use -v to see invocation)
make: *** [Makefile:106: mkspiffs] Error 1
builder for '/nix/store/93qih1v1wmkv812zrsfb2yldfk1398f1-mkspiffs-0.2.3.drv' failed with exit code 2
builder for '/nix/store/x8c30s9216yczz90f0jafab0p20j53dj-mkspiffs-0.2.3.drv' failed with exit code 2
error: build of '/nix/store/145akjfyrcd7nbphr8a0vimg44499iz1-mkspiffs-0.2.3.drv', '/nix/store/93qih1v1wmkv812zrsfb2yldfk1398f1-mkspiffs-0.2.3.drv', '/nix/store/qv3k2rbsg737xcgd6pzl3n9v0bwwwfhy-mkspiffs-0.2.3.drv', '/nix/store/x8c30s9216yczz90f0jafab0p20j53dj-mkspiffs-0.2.3.drv' failed

GrahamcOfBorg · 2018-09-22T14:56:23Z

Success on aarch64-linux (full log)

Attempted: mkspiffs, mkspiffs-presets.arduino-esp8266, mkspiffs-presets.arduino-esp32, mkspiffs-presets.esp-idf

Partial log (click to expand)

strip is /nix/store/y4ymnvgxygpq05h03kyzbj572zmh6zla-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/d8rcj9miyf6camdwvx87wn74n5xcdlng-mkspiffs-0.2.3/bin
patching script interpreter paths in /nix/store/d8rcj9miyf6camdwvx87wn74n5xcdlng-mkspiffs-0.2.3
patching script interpreter paths in /nix/store/jlvr0smc2kj4f5m6xkc8h7wg1z3rhhyd-mkspiffs-0.2.3
checking for references to /build in /nix/store/jlvr0smc2kj4f5m6xkc8h7wg1z3rhhyd-mkspiffs-0.2.3...
checking for references to /build in /nix/store/d8rcj9miyf6camdwvx87wn74n5xcdlng-mkspiffs-0.2.3...
/nix/store/cr6n6d8qg0kp3lnbjrcyvl7y9ji77vsd-mkspiffs-0.2.3
/nix/store/92y0llfm9pqcv2rp3binal0jdp92l0lf-mkspiffs-0.2.3
/nix/store/d8rcj9miyf6camdwvx87wn74n5xcdlng-mkspiffs-0.2.3
/nix/store/jlvr0smc2kj4f5m6xkc8h7wg1z3rhhyd-mkspiffs-0.2.3

infinisil · 2018-09-22T15:01:12Z

If you happen to know how to fix the darwin failure that would be nice. If not, you should disable darwin (maybe set meta.platforms = platforms.linux)

Adapted the comments to the previous fixup

Added `platforms = platforms.linux` since it doesn't build on darwin

haslersn · 2018-09-23T20:31:40Z

If you happen to know how to fix the darwin failure that would be nice. If not, you should disable darwin (maybe set meta.platforms = platforms.linux)

I currently don't know how to fix the failure, so I added the suggested code.

Ekleog · 2018-10-01T00:42:10Z

(triage) The concerns from @infinisil appear to have been taken care of, this looks ready to me. Triggering a build just in case.

@GrahamcOfBorg build mkspiffs mkspiffs-presets.arduino-esp8266 mkspiffs-presets.arduino-esp32 mkspiffs-presets.esp-idf

GrahamcOfBorg · 2018-10-01T00:42:34Z

Success on aarch64-linux (full log)

Attempted: mkspiffs, mkspiffs-presets.arduino-esp8266, mkspiffs-presets.arduino-esp32, mkspiffs-presets.esp-idf

Partial log (click to expand)

shrinking RPATHs of ELF executables and libraries in /nix/store/g3cbn2bh54xwd06jgl2n0q8a87lsq9nh-mkspiffs-0.2.3
shrinking /nix/store/g3cbn2bh54xwd06jgl2n0q8a87lsq9nh-mkspiffs-0.2.3/bin/mkspiffs
strip is /nix/store/y4ymnvgxygpq05h03kyzbj572zmh6zla-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/g3cbn2bh54xwd06jgl2n0q8a87lsq9nh-mkspiffs-0.2.3/bin
patching script interpreter paths in /nix/store/g3cbn2bh54xwd06jgl2n0q8a87lsq9nh-mkspiffs-0.2.3
checking for references to /build in /nix/store/g3cbn2bh54xwd06jgl2n0q8a87lsq9nh-mkspiffs-0.2.3...
/nix/store/ysp2rshi2qzvhg8kz9ijssh9mi90xsnr-mkspiffs-0.2.3
/nix/store/79z6vn5wk9v1nzrijkin5nqdz8bk13x2-mkspiffs-0.2.3
/nix/store/xiy132mplnjqp3cm4drjlp27zi6wb3iv-mkspiffs-0.2.3
/nix/store/g3cbn2bh54xwd06jgl2n0q8a87lsq9nh-mkspiffs-0.2.3

GrahamcOfBorg · 2018-10-01T00:42:40Z

Success on x86_64-linux (full log)

Attempted: mkspiffs, mkspiffs-presets.arduino-esp8266, mkspiffs-presets.arduino-esp32, mkspiffs-presets.esp-idf

Partial log (click to expand)

shrinking RPATHs of ELF executables and libraries in /nix/store/qcf1gyingyvfwvw2j80927x1rshfpm5g-mkspiffs-0.2.3
shrinking /nix/store/qcf1gyingyvfwvw2j80927x1rshfpm5g-mkspiffs-0.2.3/bin/mkspiffs
strip is /nix/store/h0lbngpv6ln56hjj59i6l77vxq25flbz-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/qcf1gyingyvfwvw2j80927x1rshfpm5g-mkspiffs-0.2.3/bin
patching script interpreter paths in /nix/store/qcf1gyingyvfwvw2j80927x1rshfpm5g-mkspiffs-0.2.3
checking for references to /build in /nix/store/qcf1gyingyvfwvw2j80927x1rshfpm5g-mkspiffs-0.2.3...
/nix/store/qcf1gyingyvfwvw2j80927x1rshfpm5g-mkspiffs-0.2.3
/nix/store/f6z5g0lcyrfp6nrn30vf48wxgan4njr3-mkspiffs-0.2.3
/nix/store/qrd0k8zv3bfaap0657rskbzvfy97ghkm-mkspiffs-0.2.3
/nix/store/qhikr38fxc141kyam6z02g3p7s8vwikr-mkspiffs-0.2.3

maintainers: add 'haslersn'

9624b74

haslersn changed the title ~~Mkspiffs 0.2.3~~ mkspiffs: init at 0.2.3 Sep 14, 2018

GrahamcOfBorg added 8.has: package (new) 10.rebuild-darwin: 0 10.rebuild-linux: 1-10 labels Sep 14, 2018

haslersn force-pushed the mkspiffs-0.2.3 branch 5 times, most recently from d36b4fa to c36363f Compare September 19, 2018 02:07

mkspiffs: init at 0.2.3

afc683c

haslersn force-pushed the mkspiffs-0.2.3 branch from c36363f to afc683c Compare September 19, 2018 02:37

infinisil requested changes Sep 20, 2018

View reviewed changes

haslersn force-pushed the mkspiffs-0.2.3 branch from b2f0c85 to 1f8d105 Compare September 21, 2018 00:37

haslersn added 2 commits September 23, 2018 03:37

fixup! mkspiffs: init at 0.2.3

0ba5ec5

Adapted the comments to the previous fixup

fixup! mkspiffs: init at 0.2.3

1c0d44a

Added `platforms = platforms.linux` since it doesn't build on darwin

fpletz approved these changes Oct 1, 2018

View reviewed changes

fpletz merged commit 62bf19d into NixOS:master Oct 1, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

mkspiffs: init at 0.2.3 #46674

mkspiffs: init at 0.2.3 #46674

haslersn commented Sep 14, 2018 •

edited

infinisil Sep 20, 2018

haslersn Sep 20, 2018 •

edited

haslersn Sep 21, 2018

infinisil Sep 20, 2018

infinisil Sep 20, 2018

infinisil Sep 20, 2018

infinisil commented Sep 22, 2018

GrahamcOfBorg commented Sep 22, 2018

GrahamcOfBorg commented Sep 22, 2018

GrahamcOfBorg commented Sep 22, 2018

infinisil commented Sep 22, 2018

haslersn commented Sep 23, 2018

Ekleog commented Oct 1, 2018

GrahamcOfBorg commented Oct 1, 2018

GrahamcOfBorg commented Oct 1, 2018

		@@ -0,0 +1,33 @@
		{ stdenv, fetchgit, git
		, extraBuildFlags ? ""

mkspiffs: init at 0.2.3 #46674

mkspiffs: init at 0.2.3 #46674

Conversation

haslersn commented Sep 14, 2018 • edited

Motivation for this change

Things done

infinisil Sep 20, 2018

Choose a reason for hiding this comment

haslersn Sep 20, 2018 • edited

Choose a reason for hiding this comment

haslersn Sep 21, 2018

Choose a reason for hiding this comment

infinisil Sep 20, 2018

Choose a reason for hiding this comment

infinisil Sep 20, 2018

Choose a reason for hiding this comment

infinisil Sep 20, 2018

Choose a reason for hiding this comment

infinisil commented Sep 22, 2018

GrahamcOfBorg commented Sep 22, 2018

GrahamcOfBorg commented Sep 22, 2018

GrahamcOfBorg commented Sep 22, 2018

infinisil commented Sep 22, 2018

haslersn commented Sep 23, 2018

Ekleog commented Oct 1, 2018

GrahamcOfBorg commented Oct 1, 2018

GrahamcOfBorg commented Oct 1, 2018

haslersn commented Sep 14, 2018 •

edited

haslersn Sep 20, 2018 •

edited