Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Platformio: 3.5.2 -> 3.5.3 and fix for click dependency #42254

Merged
merged 2 commits into from Jun 20, 2018
Merged

Platformio: 3.5.2 -> 3.5.3 and fix for click dependency #42254

merged 2 commits into from Jun 20, 2018

Conversation

Moredread
Copy link
Contributor

@Moredread Moredread commented Jun 19, 2018 •
edited

Motivation for this change

The normal click package now applies a patch that doesn't work with the
older version used for platformio.

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/)
  • Fits CONTRIBUTING.md.

@Moredread
platformio: Fix building of overridden click package
9374c3f 
The normal click package now applies a patch that doesn't work with the
older version used for platformio.
@Moredread
platformio: 3.5.2 -> 3.5.3
2388a9b
@Moredread Moredread mentioned this pull request Jun 19, 2018
Merged
8 tasks
@flokli
Copy link
Contributor

flokli commented Jun 19, 2018

click-5 doesn't try to execute the locale binary (and platformio-core itself requires click>=5,<6, so no way to use click-6). As platformio seems to be the only package overriding click, LGMT simply dropping that patch in the override.

@flokli
Copy link
Contributor

flokli commented Jun 19, 2018

@GrahamcOfBorg build platformio

@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

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

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
Copy link

Success on aarch64-linux (full log)

Attempted: platformio

Partial log (click to expand)

collision between `/nix/store/raplxfhaj9p6ak7bch67yi62dxg88vl8-gcc-7.3.0-lib/lib64/libgcc_s.so' and `/nix/store/d5djbvna6ffvviqnkpy29p0798zprchr-glibc-2.27/lib64/libgcc_s.so'
collision between `/nix/store/raplxfhaj9p6ak7bch67yi62dxg88vl8-gcc-7.3.0-lib/lib/libgcc_s.so.1' and `/nix/store/d5djbvna6ffvviqnkpy29p0798zprchr-glibc-2.27/lib/libgcc_s.so.1'
collision between `/nix/store/raplxfhaj9p6ak7bch67yi62dxg88vl8-gcc-7.3.0-lib/lib/libgcc_s.so' and `/nix/store/d5djbvna6ffvviqnkpy29p0798zprchr-glibc-2.27/lib/libgcc_s.so'
collision between `/nix/store/5cy2prhvl7hdz2k9kkdvjj36kqsbrpyc-shadow-4.5/etc/pam.d' and `/nix/store/pkklh34shifmab9v6syc4hcy8x2iq8wg-platformio-chrootenv-etc/etc/pam.d'
collision between `/nix/store/5cy2prhvl7hdz2k9kkdvjj36kqsbrpyc-shadow-4.5/etc/login.defs' and `/nix/store/pkklh34shifmab9v6syc4hcy8x2iq8wg-platformio-chrootenv-etc/etc/login.defs'
created 1968 symlinks in user environment
building '/nix/store/i568d5q5y8xrbvdvzahv86zqrjwf3sv3-platformio-fhs.drv'...
building '/nix/store/8frklarhivx8p97d3ndxxr9zxs34xqfg-platformio-init.drv'...
building '/nix/store/s4niqjsvvfqbx21dv5kmbf8riqkzjsmk-platformio.drv'...
/nix/store/svzqfmrm2x859kq0bbf0sjqiyy1isjvr-platformio

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: platformio

Partial log (click to expand)

----------------------------------------------------------------------
Ran 0 tests in 0.000s

OK
building '/nix/store/scwsavig4w0x63ca87myl8inlzgy4vqh-platformio-usr-multi.drv'...
created 933 symlinks in user environment
building '/nix/store/7v73qvr29m8akfm40wds88f80frkihjd-platformio-fhs.drv'...
building '/nix/store/b6mx6bj0frhfw9b4a3vqcmrd04laqiqm-platformio-init.drv'...
building '/nix/store/ly1v1f0v62s912fj41zwlqmcb1q2z5hw-platformio.drv'...
/nix/store/gs07j3180fvhahz49i0hr8ygh2c1574v-platformio

@Mic92 Mic92 merged commit 7afab16 into NixOS:master Jun 20, 2018
@Moredread Moredread deleted the platformio/bump branch June 20, 2018 10:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@Moredread @flokli @GrahamcOfBorg @Mic92