inav: init at 2.0.0-rc2; betaflight: 3.2.3 -> 3.4.0-rc4 #40978

elitak · 2018-05-23T10:06:24Z

Motivation for this change

betaflight version bump and inav init (fork of betaflight with almost identical build)

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.

ryantm · 2018-05-26T14:15:32Z

pkgs/development/misc/stm32/betaflight/default.nix

@@ -21,8 +19,8 @@ in stdenv.mkDerivation rec {
  src = fetchFromGitHub {
    owner = "betaflight";
    repo = "betaflight";
-    rev = "v${version}";
-    sha256 = "0vbjyxfjxgpaiiwvj5bscrlfikzp3wnxpmc4sxcz5yw5mwb9g428";
+    rev = "041362614bac4aaed4c0e4cc163a1ba99139dfdc";


Why stop using the version?

It's because of the first line in postPatch; the short form of the revision is baked into the firmware images. If I use the tag, I will still need to store the commit id someplace, unless you know of a way to convert the tag to a commit id at build time, without pulling in any extra buildInputs. Is it cached someplace in the src derviation by the builder?

I'll add a note for now.

I didn't notice it was being used there. I looked into it some, but it doesn't look like there is a better solution than what you have, unless leaveDotGit works here. It looks like leaveDotGit has some issues of its own though #8567 (comment)

ryantm · 2018-05-26T14:16:25Z

pkgs/development/misc/stm32/inav/default.nix

+  src = fetchFromGitHub {
+    owner = "iNavFlight";
+    repo = "inav";
+    rev = "03a5c1922a7c06e18d33de9d0cc09c709b37fcc6";


It would be nice to use the version tag here too.

elitak · 2018-07-02T09:12:17Z

These commits are rather innocuous. Can I get some approval here?

ryantm · 2018-07-02T12:39:59Z

Sorry, I didn't see you updated the branch (I don't think GitHub sends notifications for branch pushes.). Let's push this along.

@GrahamcOfBorg build betaflight inav

GrahamcOfBorg · 2018-07-02T12:40:22Z

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: betaflight, inav

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 · 2018-07-02T12:41:10Z

Failure on aarch64-linux (full log)

Attempted: betaflight, inav

Partial log (click to expand)

/nix/store/bl2rcqq49gjzk2im4zhjz7j9m9whnvp5-gcc-arm-embedded-6-2017-q2-update/bin/arm-none-eabi-g++: line 1: �ELF����: not found
/nix/store/bl2rcqq49gjzk2im4zhjz7j9m9whnvp5-gcc-arm-embedded-6-2017-q2-update/bin/arm-none-eabi-g++: line 2: syntax error: unexpected "("
        from ./src/utils/build_stamp.rb:66:in `hash_config'
        from ./src/utils/build_stamp.rb:44:in `stamp'
        from ./src/utils/build_stamp.rb:89:in `<main>'
make[1]: *** [Makefile:311: obj/main/OMNIBUSF7/build.stamp] Error 1
make[1]: Leaving directory '/build/source'
make: *** [Makefile:379: OMNIBUSF7] Error 2
builder for '/nix/store/nsv67pcnrpbyplxvm5pigzmiqiisgqcx-inav-2.0.0-rc2.drv' failed with exit code 2
error: build of '/nix/store/31555n8jqd510h1n6r4yhvwv5cnfj9j7-betaflight-3.4.0-rc4.drv', '/nix/store/nsv67pcnrpbyplxvm5pigzmiqiisgqcx-inav-2.0.0-rc2.drv' failed

GrahamcOfBorg · 2018-07-02T13:16:26Z

Success on x86_64-linux (full log)

Attempted: betaflight, inav

Partial log (click to expand)

make[1]: Leaving directory '/build/source'
Building YUPIF7 succeeded.
installing
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/1nprzcirihimv04jv9lwb5ykdvrvbrzr-betaflight-3.4.0-rc4
strip is /nix/store/4qvrxzxa535y8304mk195x50b6p9607d-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/1nprzcirihimv04jv9lwb5ykdvrvbrzr-betaflight-3.4.0-rc4
checking for references to /build in /nix/store/1nprzcirihimv04jv9lwb5ykdvrvbrzr-betaflight-3.4.0-rc4...
/nix/store/1nprzcirihimv04jv9lwb5ykdvrvbrzr-betaflight-3.4.0-rc4
/nix/store/ji2y33x0cc4nh5m6p08rgsjj8kswfngy-inav-2.0.0-rc2

elitak · 2018-07-02T17:13:34Z

I've removed those non-building platforms from meta

ryantm · 2018-07-02T17:55:54Z

@GrahamcOfBorg build betaflight inav

GrahamcOfBorg · 2018-07-02T17:56:21Z

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: betaflight, inav

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 · 2018-07-02T17:56:32Z

No attempt on aarch64-linux (full log)

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

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 · 2018-07-02T17:57:08Z

Success on x86_64-linux (full log)

Attempted: betaflight, inav

Partial log (click to expand)

/nix/store/1nprzcirihimv04jv9lwb5ykdvrvbrzr-betaflight-3.4.0-rc4
/nix/store/ji2y33x0cc4nh5m6p08rgsjj8kswfngy-inav-2.0.0-rc2

ryantm · 2018-07-03T02:18:33Z

Looks good to me

samueldr

I don't have any hardware to validate this, but it built a bunch of things fine.

Love the work on the skipped targets. (Actually documenting what's wrong.)

LGTM

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

ryantm reviewed May 26, 2018

View reviewed changes

elitak force-pushed the inav branch from 4966cfd to c548092 Compare May 26, 2018 16:41

elitak force-pushed the inav branch from c548092 to c9a926b Compare June 3, 2018 19:19

elitak force-pushed the inav branch from c9a926b to 685fb7b Compare July 2, 2018 09:06

elitak added 2 commits July 2, 2018 10:11

betaflight: 3.2.3 -> 3.4.0-rc4

9710439

inav: init at 2.0.0-rc2

fd004d9

elitak force-pushed the inav branch from 685fb7b to fd004d9 Compare July 2, 2018 17:11

GrahamcOfBorg added the 8.has: clean-up label Jul 2, 2018

elitak changed the title ~~inav: init at 1.9.1; betaflight: 3.2.3 -> 3.3.2~~ inav: init at 2.0.0-rc2; betaflight: 3.2.3 -> 3.4.0-rc4 Jul 3, 2018

samueldr approved these changes Aug 10, 2018

View reviewed changes

samueldr merged commit c116b48 into NixOS:master Aug 10, 2018

elitak deleted the inav branch December 29, 2018 08:41

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

inav: init at 2.0.0-rc2; betaflight: 3.2.3 -> 3.4.0-rc4 #40978

inav: init at 2.0.0-rc2; betaflight: 3.2.3 -> 3.4.0-rc4 #40978

elitak commented May 23, 2018 •

edited

ryantm May 26, 2018

elitak May 26, 2018

ryantm May 26, 2018

ryantm May 26, 2018

elitak commented Jul 2, 2018

ryantm commented Jul 2, 2018

GrahamcOfBorg commented Jul 2, 2018

GrahamcOfBorg commented Jul 2, 2018

GrahamcOfBorg commented Jul 2, 2018

elitak commented Jul 2, 2018

ryantm commented Jul 2, 2018

GrahamcOfBorg commented Jul 2, 2018

GrahamcOfBorg commented Jul 2, 2018

GrahamcOfBorg commented Jul 2, 2018

ryantm commented Jul 3, 2018

samueldr left a comment

inav: init at 2.0.0-rc2; betaflight: 3.2.3 -> 3.4.0-rc4 #40978

inav: init at 2.0.0-rc2; betaflight: 3.2.3 -> 3.4.0-rc4 #40978

Conversation

elitak commented May 23, 2018 • edited

Motivation for this change

Things done

ryantm May 26, 2018

Choose a reason for hiding this comment

elitak May 26, 2018

Choose a reason for hiding this comment

ryantm May 26, 2018

Choose a reason for hiding this comment

ryantm May 26, 2018

Choose a reason for hiding this comment

elitak commented Jul 2, 2018

ryantm commented Jul 2, 2018

GrahamcOfBorg commented Jul 2, 2018

GrahamcOfBorg commented Jul 2, 2018

GrahamcOfBorg commented Jul 2, 2018

elitak commented Jul 2, 2018

ryantm commented Jul 2, 2018

GrahamcOfBorg commented Jul 2, 2018

GrahamcOfBorg commented Jul 2, 2018

GrahamcOfBorg commented Jul 2, 2018

ryantm commented Jul 3, 2018

samueldr left a comment

Choose a reason for hiding this comment

elitak commented May 23, 2018 •

edited