diff options
| author | Ryan Mulligan <ryan@ryantm.com> | 2018-09-29 11:24:31 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-29 11:24:31 -0700 |
| commit | 30f58023ddf9fb7311ffb484c4e2965e0e5f0b82 (patch) | |
| tree | 8c1bd275cac92a150e50e973837a3dbc525ea868 | |
| parent | 7e7c0f9e7ab90e3978bc208301ebf2be42b0f62f (diff) | |
| parent | 551d20377585730378d1f53b8c351d2b2aebee2a (diff) | |
| download | nixlib-30f58023ddf9fb7311ffb484c4e2965e0e5f0b82.tar nixlib-30f58023ddf9fb7311ffb484c4e2965e0e5f0b82.tar.gz nixlib-30f58023ddf9fb7311ffb484c4e2965e0e5f0b82.tar.bz2 nixlib-30f58023ddf9fb7311ffb484c4e2965e0e5f0b82.tar.lz nixlib-30f58023ddf9fb7311ffb484c4e2965e0e5f0b82.tar.xz nixlib-30f58023ddf9fb7311ffb484c4e2965e0e5f0b82.tar.zst nixlib-30f58023ddf9fb7311ffb484c4e2965e0e5f0b82.zip | |
Merge pull request #45767 from ericevenchick/add-can-isotp
can-isotp: init at 20180629
| -rw-r--r-- | maintainers/maintainer-list.nix | 5 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/can-isotp/default.nix | 36 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 43 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5ae4e1209ca2..3a535cbb3a94 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1332,6 +1332,11 @@ github = "etu"; name = "Elis Hirwing"; }; + evck = { + email = "eric@evenchick.com"; + github = "ericevenchick"; + name = "Eric Evenchick"; + }; exfalso = { email = "0slemi0@gmail.com"; github = "exfalso"; diff --git a/pkgs/os-specific/linux/can-isotp/default.nix b/pkgs/os-specific/linux/can-isotp/default.nix new file mode 100644 index 000000000000..0c32c3f5e62a --- /dev/null +++ b/pkgs/os-specific/linux/can-isotp/default.nix @@ -0,0 +1,36 @@ +{ stdenv, kernel, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "can-isotp-${version}"; + version = "20180629"; + + hardeningDisable = [ "pic" ]; + + src = fetchFromGitHub { + owner = "hartkopp"; + repo = "can-isotp"; + rev = "6003f9997587e6a563cebf1f246bcd0eb6deff3d"; + sha256 = "0b2pqb0vd1wgv2zpl7lvfavqkzr8mrwhrv7zdqkq3rz9givcv8w7"; + }; + + KERNELDIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; + INSTALL_MOD_PATH = "\${out}"; + + buildPhase = '' + make modules + ''; + + installPhase = '' + make modules_install + ''; + + nativeBuildInputs = kernel.moduleBuildDependencies; + + meta = with stdenv.lib; { + description = "Kernel module for ISO-TP (ISO 15765-2)"; + homepage = "https://github.com/hartkopp/can-isotp"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.evck ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ed7d91618c6c..782017a9e93c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14298,6 +14298,8 @@ with pkgs; }) zfsStable zfsUnstable; zfs = zfsStable; + + can-isotp = callPackage ../os-specific/linux/can-isotp { }; }); # The current default kernel / kernel modules. |