libubox, ubus, uci, netifd: update (#121543)
These packages originating from OpenWRT don't see regular releases, so this bumps them to their latest commits. Also implements some suggestions like removing spaces from cmakeFlags and replacing the legacy lgpl21 license with the appropriate lgpl21Only.
This commit is contained in:
parent
799fbc3e3c
commit
5f16549ccf
|
@ -2,12 +2,12 @@
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
pname = "libubox";
|
pname = "libubox";
|
||||||
version = "unstable-2020-01-20";
|
version = "unstable-2021-03-09";
|
||||||
|
|
||||||
src = fetchgit {
|
src = fetchgit {
|
||||||
url = "https://git.openwrt.org/project/libubox.git";
|
url = "https://git.openwrt.org/project/libubox.git";
|
||||||
rev = "43a103ff17ee5872669f8712606578c90c14591d";
|
rev = "551d75b5662cccd0466b990d58136bdf799a804d";
|
||||||
sha256 = "0cihgckghamcfxrvqjjn69giib80xhsqaj98ldn0gd96zqh96sd4";
|
sha256 = "05cnjjqjv9nvrs1d8pg4xxxf27jryiv6xk8plmdpmm7r2wkvwn3r";
|
||||||
};
|
};
|
||||||
|
|
||||||
cmakeFlags = [ "-DBUILD_LUA=OFF" "-DBUILD_EXAMPLES=OFF" ];
|
cmakeFlags = [ "-DBUILD_LUA=OFF" "-DBUILD_EXAMPLES=OFF" ];
|
||||||
|
|
|
@ -2,22 +2,22 @@
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
pname = "ubus";
|
pname = "ubus";
|
||||||
version = "unstable-2020-01-05";
|
version = "unstable-2021-02-15";
|
||||||
|
|
||||||
src = fetchgit {
|
src = fetchgit {
|
||||||
url = "https://git.openwrt.org/project/ubus.git";
|
url = "https://git.openwrt.org/project/ubus.git";
|
||||||
rev = "d35df8adda873dc75d876f72b78e84db8cfa72ee";
|
rev = "2537be01858710e714c329153760c64fe3f8a73e";
|
||||||
sha256 = "1ksrih5vfyixaafzsrs6ab88qw34d0197wvw201jl5p1fc7drgn4";
|
sha256 = "03ljxsn4w87bfrilccxhrkzqmd30hy6ihkvsinw0i3l7rpp5m4a7";
|
||||||
};
|
};
|
||||||
|
|
||||||
cmakeFlags = [ "-D BUILD_LUA:BOOL=OFF" ];
|
cmakeFlags = [ "-DBUILD_LUA=OFF" ];
|
||||||
buildInputs = [ libubox libjson ];
|
buildInputs = [ libubox libjson ];
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [ cmake ];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "OpenWrt system message/RPC bus";
|
description = "OpenWrt system message/RPC bus";
|
||||||
homepage = "https://git.openwrt.org/?p=project/ubus.git;a=summary";
|
homepage = "https://git.openwrt.org/?p=project/ubus.git;a=summary";
|
||||||
license = licenses.lgpl21;
|
license = licenses.lgpl21Only;
|
||||||
platforms = platforms.all;
|
platforms = platforms.all;
|
||||||
maintainers = with maintainers; [ petabyteboy ];
|
maintainers = with maintainers; [ petabyteboy ];
|
||||||
};
|
};
|
||||||
|
|
|
@ -2,23 +2,23 @@
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
pname = "uci";
|
pname = "uci";
|
||||||
version = "unstable-2020-04-27";
|
version = "unstable-2021-04-14";
|
||||||
|
|
||||||
src = fetchgit {
|
src = fetchgit {
|
||||||
url = "https://git.openwrt.org/project/uci.git";
|
url = "https://git.openwrt.org/project/uci.git";
|
||||||
rev = "ec8d3233948603485e1b97384113fac9f1bab5d6";
|
rev = "4b3db1179747b6a6779029407984bacef851325c";
|
||||||
sha256 = "0p765l8znvwhzhgkq7dp36w62k5rmzav59vgdqmqq1bjmlz1yyi6";
|
sha256 = "1zflxazazzkrycpflzfg420kzp7kgy4dlz85cms279vk07dc1d52";
|
||||||
};
|
};
|
||||||
|
|
||||||
hardeningDisable = [ "all" ];
|
hardeningDisable = [ "all" ];
|
||||||
cmakeFlags = [ "-D BUILD_LUA:BOOL=OFF" ];
|
cmakeFlags = [ "-DBUILD_LUA=OFF" ];
|
||||||
buildInputs = [ libubox ];
|
buildInputs = [ libubox ];
|
||||||
nativeBuildInputs = [ cmake pkg-config ];
|
nativeBuildInputs = [ cmake pkg-config ];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "OpenWrt Unified Configuration Interface";
|
description = "OpenWrt Unified Configuration Interface";
|
||||||
homepage = "https://git.openwrt.org/?p=project/uci.git;a=summary";
|
homepage = "https://git.openwrt.org/?p=project/uci.git;a=summary";
|
||||||
license = licenses.lgpl21;
|
license = licenses.lgpl21Only;
|
||||||
platforms = platforms.all;
|
platforms = platforms.all;
|
||||||
maintainers = with maintainers; [ petabyteboy ];
|
maintainers = with maintainers; [ petabyteboy ];
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,27 +1,22 @@
|
||||||
{ runCommand, lib, stdenv, cmake, fetchgit, libnl, libubox, uci, ubus, json_c }:
|
{ lib, stdenv, cmake, fetchgit, libnl, libubox, uci, ubus, json_c, pkg-config }:
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
pname = "netifd";
|
pname = "netifd";
|
||||||
version = "unstable-2020-07-11";
|
version = "unstable-2021-04-03";
|
||||||
|
|
||||||
src = fetchgit {
|
src = fetchgit {
|
||||||
url = "https://git.openwrt.org/project/netifd.git";
|
url = "https://git.openwrt.org/project/netifd.git";
|
||||||
rev = "3d9bd73e8c2d8a1f78effbe92dd2495bbd2552c4";
|
rev = "327da9895327bc56b23413ee91a6e6b6e0e4329d";
|
||||||
sha256 = "085sx1gsigbi1jr19l387rc5p6ja1np6q2gb84khjd4pyiqwk840";
|
sha256 = "0jvk2hx8kbkc6d72gh9rwap8ds6qgnmny6306vvzxy68v03xikwv";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ libnl libubox uci ubus json_c ];
|
buildInputs = [ libnl libubox uci ubus json_c ];
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [ cmake pkg-config ];
|
||||||
|
|
||||||
preBuild = ''
|
|
||||||
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE \
|
|
||||||
-I$(echo "${lib.getDev libnl}"/include/libnl*/)"
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "OpenWrt Network interface configuration daemon";
|
description = "OpenWrt Network interface configuration daemon";
|
||||||
homepage = "https://git.openwrt.org/?p=project/netifd.git;a=summary";
|
homepage = "https://git.openwrt.org/?p=project/netifd.git;a=summary";
|
||||||
license = licenses.lgpl21;
|
license = licenses.lgpl21Only;
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux;
|
||||||
maintainers = with maintainers; [ petabyteboy ];
|
maintainers = with maintainers; [ petabyteboy ];
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue