git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #79882 from petabyteboy/feature/netifd

update libubox, uqmi; init uci, ubus, netifd

commit02fc8dc4dcdc72d3b895b7cd707c69d5f5f04c28 authorFranz Pletz <fpletz@fnordicwalking.de> dateSun 23 Feb 2020, 17:11 (7 years ago) parent5c50087d24c403
6 files changed+91−6
pkgs/development/libraries/libubox/default.nix+4−3 pkgs/development/libraries/ubus/default.nix+24 pkgs/development/libraries/uci/default.nix+25 pkgs/tools/networking/netifd/default.nix+28 pkgs/tools/networking/uqmi/default.nix+4−3 pkgs/top-level/all-packages.nix+6
pkgs/development/libraries/libubox/default.nix+4−3
@@ -1,12 +1,13 @@
11{ stdenv, lib, fetchgit, cmake, pkgconfig, json_c }:
22
33stdenv.mkDerivation {
4− name = "libubox-2017-09-29";
4+ pname = "libubox";
5+ version = "unstable-2020-01-20";
56
67 src = fetchgit {
78 url = "https://git.openwrt.org/project/libubox.git";
8− rev = "632688e8d6cde32781e4ec685d59afb0938300ad";
9− sha256 = "1rkwn287k7p802hbd9ap13xxrxsghq6827r86ymqbbcmbcrna13c";
9+ rev = "43a103ff17ee5872669f8712606578c90c14591d";
10+ sha256 = "0cihgckghamcfxrvqjjn69giib80xhsqaj98ldn0gd96zqh96sd4";
1011 };
1112
1213 cmakeFlags = [ "-DBUILD_LUA=OFF" "-DBUILD_EXAMPLES=OFF" ];
pkgs/development/libraries/ubus/default.nixnew file+24
@@ -0,0 +1,24 @@
1+{ stdenv, cmake, fetchgit, libubox, libjson }:
2+
3+stdenv.mkDerivation {
4+ pname = "ubus";
5+ version = "unstable-2020-01-05";
6+
7+ src = fetchgit {
8+ url = "https://git.openwrt.org/project/ubus.git";
9+ rev = "d35df8adda873dc75d876f72b78e84db8cfa72ee";
10+ sha256 = "1ksrih5vfyixaafzsrs6ab88qw34d0197wvw201jl5p1fc7drgn4";
11+ };
12+
13+ cmakeFlags = [ "-D BUILD_LUA:BOOL=OFF" ];
14+ buildInputs = [ libubox libjson ];
15+ nativeBuildInputs = [ cmake ];
16+
17+ meta = with stdenv.lib; {
18+ description = "OpenWrt system message/RPC bus";
19+ homepage = "https://git.openwrt.org/?p=project/ubus.git;a=summary";
20+ license = licenses.lgpl21;
21+ platforms = platforms.all;
22+ maintainers = with maintainers; [ petabyteboy ];
23+ };
24+}
pkgs/development/libraries/uci/default.nixnew file+25
@@ -0,0 +1,25 @@
1+{ stdenv, cmake, fetchgit, pkgconfig, libubox }:
2+
3+stdenv.mkDerivation {
4+ pname = "uci";
5+ version = "unstable-2020-01-27";
6+
7+ src = fetchgit {
8+ url = "https://git.openwrt.org/project/uci.git";
9+ rev = "e8d83732f9eb571dce71aa915ff38a072579610b";
10+ sha256 = "1si8dh8zzw4j6m7387qciw2akfvl7c4779s8q5ns2ys6dn4sz6by";
11+ };
12+
13+ hardeningDisable = [ "all" ];
14+ cmakeFlags = [ "-D BUILD_LUA:BOOL=OFF" ];
15+ buildInputs = [ libubox ];
16+ nativeBuildInputs = [ cmake pkgconfig ];
17+
18+ meta = with stdenv.lib; {
19+ description = "OpenWrt Unified Configuration Interface";
20+ homepage = "https://git.openwrt.org/?p=project/uci.git;a=summary";
21+ license = licenses.lgpl21;
22+ platforms = platforms.all;
23+ maintainers = with maintainers; [ petabyteboy ];
24+ };
25+}
pkgs/tools/networking/netifd/default.nixnew file+28
@@ -0,0 +1,28 @@
1+{ runCommand, stdenv, cmake, fetchgit, libnl, libubox, uci, ubus, json_c }:
2+
3+stdenv.mkDerivation {
4+ pname = "netifd";
5+ version = "unstable-2020-01-18";
6+
7+ src = fetchgit {
8+ url = "https://git.openwrt.org/project/netifd.git";
9+ rev = "1321c1bd8fe921986c4eb39c3783ddd827b79543";
10+ sha256 = "178pckyf1cydi6zzr4bmhksv8vyaks91zv9lqqd2z5nkmccl6vf3";
11+ };
12+
13+ buildInputs = [ libnl libubox uci ubus json_c ];
14+ nativeBuildInputs = [ cmake ];
15+
16+ preBuild = ''
17+ export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE \
18+ -I$(echo "${stdenv.lib.getDev libnl}"/include/libnl*/)"
19+ '';
20+
21+ meta = with stdenv.lib; {
22+ description = "OpenWrt Network interface configuration daemon";
23+ homepage = "https://git.openwrt.org/?p=project/netifd.git;a=summary";
24+ license = licenses.lgpl21;
25+ platforms = platforms.linux;
26+ maintainers = with maintainers; [ petabyteboy ];
27+ };
28+}
pkgs/tools/networking/uqmi/default.nix+4−3
@@ -1,12 +1,13 @@
11{ stdenv, lib, fetchgit, cmake, perl, libubox, json_c }:
22
33stdenv.mkDerivation {
4− name = "uqmi-2016-12-19";
4+ pname = "uqmi";
5+ version = "unstable-2019-06-27";
56
67 src = fetchgit {
78 url = "https://git.openwrt.org/project/uqmi.git";
8− rev = "8ceeab690d8c6f1e3afbd4bcaee7bc2ba3fbe165";
9− sha256 = "1fw9r36d024iiq6bq2cikaq5pams5pnbc4z6pcmcny2k4l5cdb6m";
9+ rev = "1965c713937495a5cb029165c16acdb6572c3f87";
10+ sha256 = "1gn8sdcl4lwfs3lwabmnjbvdhhk1l42bwbajwds7j4936fpbklx0";
1011 };
1112
1213 postPatch = ''
pkgs/top-level/all-packages.nix+6
@@ -4267,6 +4267,8 @@ in
42674267
42684268 netmask = callPackage ../tools/networking/netmask {};
42694269
4270+ netifd = callPackage ../tools/networking/netifd {};
4271+
42704272 ipscan = callPackage ../tools/security/ipscan { };
42714273
42724274 ipv6calc = callPackage ../tools/networking/ipv6calc {};
@@ -11137,6 +11139,10 @@ in
1113711139
1113811140 cpp-netlib = callPackage ../development/libraries/cpp-netlib {};
1113911141
11142+ ubus = callPackage ../development/libraries/ubus { };
11143+
11144+ uci = callPackage ../development/libraries/uci { };
11145+
1114011146 uri = callPackage ../development/libraries/uri { };
1114111147
1114211148 cppcms = callPackage ../development/libraries/cppcms { };