From 8f583860c8ecb111752256284894f2a2113b9eb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Wed, 12 Feb 2020 01:57:19 +0100 Subject: [PATCH 1/5] libubox: 2017-09-29 -> unstable-2020-01-20 --- pkgs/development/libraries/libubox/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libubox/default.nix b/pkgs/development/libraries/libubox/default.nix index 71ac22e85a8f..2cd5bd8a3412 100644 --- a/pkgs/development/libraries/libubox/default.nix +++ b/pkgs/development/libraries/libubox/default.nix @@ -1,12 +1,13 @@ { stdenv, lib, fetchgit, cmake, pkgconfig, json_c }: stdenv.mkDerivation { - name = "libubox-2017-09-29"; + pname = "libubox"; + version = "unstable-2020-01-20"; src = fetchgit { url = "https://git.openwrt.org/project/libubox.git"; - rev = "632688e8d6cde32781e4ec685d59afb0938300ad"; - sha256 = "1rkwn287k7p802hbd9ap13xxrxsghq6827r86ymqbbcmbcrna13c"; + rev = "43a103ff17ee5872669f8712606578c90c14591d"; + sha256 = "0cihgckghamcfxrvqjjn69giib80xhsqaj98ldn0gd96zqh96sd4"; }; cmakeFlags = [ "-DBUILD_LUA=OFF" "-DBUILD_EXAMPLES=OFF" ]; From e9cb7037f961bf367cb7da7cc758abc1a4d8dcef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Wed, 12 Feb 2020 01:58:00 +0100 Subject: [PATCH 2/5] uqmi: 2016-12-19 -> unstable-2019-06-27 --- pkgs/tools/networking/uqmi/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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 = '' From 020e93b394c18f0ca902947eb8d4fd870f53a133 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Wed, 12 Feb 2020 02:01:17 +0100 Subject: [PATCH 3/5] ubus: init at unstable-2020-01-05 --- pkgs/development/libraries/ubus/default.nix | 24 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/libraries/ubus/default.nix diff --git a/pkgs/development/libraries/ubus/default.nix b/pkgs/development/libraries/ubus/default.nix new file mode 100644 index 000000000000..1f7124411ac3 --- /dev/null +++ b/pkgs/development/libraries/ubus/default.nix @@ -0,0 +1,24 @@ +{ stdenv, cmake, fetchgit, libubox, libjson }: + +stdenv.mkDerivation { + pname = "ubus"; + version = "unstable-2020-01-05"; + + src = fetchgit { + url = "https://git.openwrt.org/project/ubus.git"; + rev = "d35df8adda873dc75d876f72b78e84db8cfa72ee"; + sha256 = "1ksrih5vfyixaafzsrs6ab88qw34d0197wvw201jl5p1fc7drgn4"; + }; + + cmakeFlags = [ "-D BUILD_LUA:BOOL=OFF" ]; + buildInputs = [ libubox libjson ]; + nativeBuildInputs = [ cmake ]; + + meta = with stdenv.lib; { + description = "OpenWrt system message/RPC bus"; + homepage = "https://git.openwrt.org/?p=project/ubus.git;a=summary"; + license = licenses.lgpl21; + platforms = platforms.all; + maintainers = with maintainers; [ petabyteboy ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cb4016b49716..e9cc7bc43767 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11104,6 +11104,8 @@ in cpp-netlib = callPackage ../development/libraries/cpp-netlib {}; + ubus = callPackage ../development/libraries/ubus { }; + uri = callPackage ../development/libraries/uri { }; cppcms = callPackage ../development/libraries/cppcms { }; From 6ad91bb5ca13ff97f0c20dc0e8c46a3283b3a093 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Wed, 12 Feb 2020 02:02:19 +0100 Subject: [PATCH 4/5] uci: init at unstable-2020-01-27 --- pkgs/development/libraries/uci/default.nix | 25 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/libraries/uci/default.nix diff --git a/pkgs/development/libraries/uci/default.nix b/pkgs/development/libraries/uci/default.nix new file mode 100644 index 000000000000..e3bdea8c8890 --- /dev/null +++ b/pkgs/development/libraries/uci/default.nix @@ -0,0 +1,25 @@ +{ stdenv, cmake, fetchgit, pkgconfig, libubox }: + +stdenv.mkDerivation { + pname = "uci"; + version = "unstable-2020-01-27"; + + src = fetchgit { + url = "https://git.openwrt.org/project/uci.git"; + rev = "e8d83732f9eb571dce71aa915ff38a072579610b"; + sha256 = "1si8dh8zzw4j6m7387qciw2akfvl7c4779s8q5ns2ys6dn4sz6by"; + }; + + hardeningDisable = [ "all" ]; + cmakeFlags = [ "-D BUILD_LUA:BOOL=OFF" ]; + buildInputs = [ libubox ]; + nativeBuildInputs = [ cmake pkgconfig ]; + + meta = with stdenv.lib; { + description = "OpenWrt Unified Configuration Interface"; + homepage = "https://git.openwrt.org/?p=project/uci.git;a=summary"; + license = licenses.lgpl21; + platforms = platforms.all; + maintainers = with maintainers; [ petabyteboy ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e9cc7bc43767..7bd293399af0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11106,6 +11106,8 @@ in ubus = callPackage ../development/libraries/ubus { }; + uci = callPackage ../development/libraries/uci { }; + uri = callPackage ../development/libraries/uri { }; cppcms = callPackage ../development/libraries/cppcms { }; From d24c4038da7fe62f18fa41e17e1eea07591f251b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Wed, 12 Feb 2020 02:02:34 +0100 Subject: [PATCH 5/5] netifd: init at unstable-2020-01-18 --- pkgs/tools/networking/netifd/default.nix | 28 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/tools/networking/netifd/default.nix 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7bd293399af0..c3bad082994a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4252,6 +4252,8 @@ in netmask = callPackage ../tools/networking/netmask {}; + netifd = callPackage ../tools/networking/netifd {}; + ipscan = callPackage ../tools/security/ipscan { }; ipv6calc = callPackage ../tools/networking/ipv6calc {};