diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2020-02-23 17:11:59 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-23 17:11:59 +0000 |
| commit | 02fc8dc4dcdc72d3b895b7cd707c69d5f5f04c28 (patch) | |
| tree | d82f4c9c98a5058dbf200aa15252815c1875e7b3 /pkgs/tools/networking | |
| parent | 5c500875665785b27539557520364582be8ffe0e (diff) | |
| parent | d24c4038da7fe62f18fa41e17e1eea07591f251b (diff) | |
| download | nixlib-02fc8dc4dcdc72d3b895b7cd707c69d5f5f04c28.tar nixlib-02fc8dc4dcdc72d3b895b7cd707c69d5f5f04c28.tar.gz nixlib-02fc8dc4dcdc72d3b895b7cd707c69d5f5f04c28.tar.bz2 nixlib-02fc8dc4dcdc72d3b895b7cd707c69d5f5f04c28.tar.lz nixlib-02fc8dc4dcdc72d3b895b7cd707c69d5f5f04c28.tar.xz nixlib-02fc8dc4dcdc72d3b895b7cd707c69d5f5f04c28.tar.zst nixlib-02fc8dc4dcdc72d3b895b7cd707c69d5f5f04c28.zip | |
Merge pull request #79882 from petabyteboy/feature/netifd
update libubox, uqmi; init uci, ubus, netifd
Diffstat (limited to 'pkgs/tools/networking')
| -rw-r--r-- | pkgs/tools/networking/netifd/default.nix | 28 | ||||
| -rw-r--r-- | pkgs/tools/networking/uqmi/default.nix | 7 |
2 files changed, 32 insertions, 3 deletions
diff --git a/pkgs/tools/networking/netifd/default.nix b/pkgs/tools/networking/netifd/default.nix new file mode 100644 index 000000000000..38591f38fcf8 --- /dev/null +++ b/pkgs/tools/networking/netifd/default.nix @@ -0,0 +1,28 @@ +{ runCommand, stdenv, cmake, fetchgit, libnl, libubox, uci, ubus, json_c }: + +stdenv.mkDerivation { + pname = "netifd"; + version = "unstable-2020-01-18"; + + src = fetchgit { + url = "https://git.openwrt.org/project/netifd.git"; + rev = "1321c1bd8fe921986c4eb39c3783ddd827b79543"; + sha256 = "178pckyf1cydi6zzr4bmhksv8vyaks91zv9lqqd2z5nkmccl6vf3"; + }; + + buildInputs = [ libnl libubox uci ubus json_c ]; + nativeBuildInputs = [ cmake ]; + + preBuild = '' + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE \ + -I$(echo "${stdenv.lib.getDev libnl}"/include/libnl*/)" + ''; + + meta = with stdenv.lib; { + description = "OpenWrt Network interface configuration daemon"; + homepage = "https://git.openwrt.org/?p=project/netifd.git;a=summary"; + license = licenses.lgpl21; + platforms = platforms.linux; + maintainers = with maintainers; [ petabyteboy ]; + }; +} diff --git a/pkgs/tools/networking/uqmi/default.nix b/pkgs/tools/networking/uqmi/default.nix index 010d6a7f8e85..17a55d86b9a3 100644 --- a/pkgs/tools/networking/uqmi/default.nix +++ b/pkgs/tools/networking/uqmi/default.nix @@ -1,12 +1,13 @@ { stdenv, lib, fetchgit, cmake, perl, libubox, json_c }: stdenv.mkDerivation { - name = "uqmi-2016-12-19"; + pname = "uqmi"; + version = "unstable-2019-06-27"; src = fetchgit { url = "https://git.openwrt.org/project/uqmi.git"; - rev = "8ceeab690d8c6f1e3afbd4bcaee7bc2ba3fbe165"; - sha256 = "1fw9r36d024iiq6bq2cikaq5pams5pnbc4z6pcmcny2k4l5cdb6m"; + rev = "1965c713937495a5cb029165c16acdb6572c3f87"; + sha256 = "1gn8sdcl4lwfs3lwabmnjbvdhhk1l42bwbajwds7j4936fpbklx0"; }; postPatch = '' |