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

can-isotp: init at 20180629 #45767

Merged
merged 1 commit into from Sep 29, 2018
Merged

can-isotp: init at 20180629 #45767

merged 1 commit into from Sep 29, 2018

Conversation

ericevenchick
Copy link
Contributor

Motivation for this change

NixOS already has the can_utils package which provides utilities for interacting with CAN devices/buses, but does not have the kernel module needed for the ISO-TP utilities (isotprecv, isotpsend, isotpsniffer, etc...). This adds the required can-isotp kernel module.

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.

ryantm
ryantm requested changes Sep 25, 2018
View reviewed changes
pkgs/os-specific/linux/can-isotp/default.nix Outdated
meta = with stdenv.lib; {
description = "Kernel module for ISO-TP (ISO 15765-2)";
homepage = "https://github.com/hartkopp/can-isotp";
license = licenses.bsd3;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The license for this thing seems a lot more complicated than just being BSD3. It looks like GPL2 might be more appropriate in the context it is being included?

@ryantm
Copy link
Member

ryantm commented Sep 25, 2018

@GrahamcOfBorg build linuxPackages.can-isotp

@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: linuxPackages.can-isotp

Partial log (click to expand)

while evaluating the attribute 'linux_4_14' at /private/var/lib/ofborg/builds/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-ndnd/pkgs/top-level/all-packages.nix:14082:3:
while evaluating 'callPackageWith' at /private/var/lib/ofborg/builds/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-ndnd/lib/customisation.nix:108:35, called from /private/var/lib/ofborg/builds/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-ndnd/pkgs/top-level/all-packages.nix:14082:16:
while evaluating 'makeOverridable' at /private/var/lib/ofborg/builds/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-ndnd/lib/customisation.nix:67:24, called from /private/var/lib/ofborg/builds/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-ndnd/lib/customisation.nix:112:8:
while evaluating anonymous function at /private/var/lib/ofborg/builds/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-ndnd/pkgs/os-specific/linux/kernel/linux-4.14.nix:1:1, called from /private/var/lib/ofborg/builds/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-ndnd/lib/customisation.nix:69:12:
while evaluating 'buildLinux' at /private/var/lib/ofborg/builds/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-ndnd/pkgs/top-level/all-packages.nix:14391:16, called from /private/var/lib/ofborg/builds/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-ndnd/pkgs/os-specific/linux/kernel/linux-4.14.nix:5:1:
while evaluating 'callPackageWith' at /private/var/lib/ofborg/builds/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-ndnd/lib/customisation.nix:108:35, called from /private/var/lib/ofborg/builds/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-ndnd/pkgs/top-level/all-packages.nix:14391:23:
while evaluating 'makeOverridable' at /private/var/lib/ofborg/builds/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-ndnd/lib/customisation.nix:67:24, called from /private/var/lib/ofborg/builds/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-ndnd/lib/customisation.nix:112:8:
while evaluating anonymous function at /private/var/lib/ofborg/builds/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-ndnd/pkgs/os-specific/linux/kernel/generic.nix:1:1, called from /private/var/lib/ofborg/builds/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-ndnd/lib/customisation.nix:69:12:
assertion failed at /private/var/lib/ofborg/builds/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-ndnd/pkgs/os-specific/linux/kernel/generic.nix:51:1

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: linuxPackages.can-isotp

Partial log (click to expand)

  INSTALL /build/source/net/can/can-isotp.ko
  DEPMOD  4.14.71
make[1]: Leaving directory '/nix/store/bysvmgnj3yqwz7hkrzq1hrhmw8a104ja-linux-4.14.71-dev/lib/modules/4.14.71/build'
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/dzhr25pfwqk7rsmgrxx69gdxr15kkpv0-can-isotp-20180629
strip is /nix/store/h0lbngpv6ln56hjj59i6l77vxq25flbz-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/dzhr25pfwqk7rsmgrxx69gdxr15kkpv0-can-isotp-20180629/lib
patching script interpreter paths in /nix/store/dzhr25pfwqk7rsmgrxx69gdxr15kkpv0-can-isotp-20180629
checking for references to /build in /nix/store/dzhr25pfwqk7rsmgrxx69gdxr15kkpv0-can-isotp-20180629...
/nix/store/dzhr25pfwqk7rsmgrxx69gdxr15kkpv0-can-isotp-20180629

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: linuxPackages.can-isotp

Partial log (click to expand)

  INSTALL /build/source/net/can/can-isotp.ko
  DEPMOD  4.14.71
make[1]: Leaving directory '/nix/store/2qa673gq8hdfc4wv68zdkpdkxqjmn4x5-linux-4.14.71-dev/lib/modules/4.14.71/build'
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/pi6b460zjhqblz38pdi65aj4i235p41z-can-isotp-20180629
strip is /nix/store/y4ymnvgxygpq05h03kyzbj572zmh6zla-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/pi6b460zjhqblz38pdi65aj4i235p41z-can-isotp-20180629/lib
patching script interpreter paths in /nix/store/pi6b460zjhqblz38pdi65aj4i235p41z-can-isotp-20180629
checking for references to /build in /nix/store/pi6b460zjhqblz38pdi65aj4i235p41z-can-isotp-20180629...
/nix/store/pi6b460zjhqblz38pdi65aj4i235p41z-can-isotp-20180629

@ericevenchick
can-isotp: init at 20180629
551d203 
changed license to gpl2
@ryantm ryantm merged commit 30f5802 into NixOS:master Sep 29, 2018
@ryantm
Copy link
Member

ryantm commented Sep 29, 2018

thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ryantm ryantm ryantm approved these changes

Assignees
No one assigned
Labels
8.has: package (new) 10.rebuild-darwin: 0 10.rebuild-linux: 11-100 12. first-time contribution
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@ericevenchick @ryantm @GrahamcOfBorg @Janik-Haag