From 5134c370d8e7eca3c41f21a3364dd48165fe54d3 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Mon, 19 Dec 2022 22:58:50 -0800 Subject: [PATCH 01/10] eiwd: init at 2.0-1 eiwd is iwd, minus the dbus dependency. It consists of iwd, plus: - a bunch of `#ifdef HAVE_DBUS` lines added - name resolution defaults to resolvconf instead of systemd - inability to access /etc/resolv.conf is not a fatal error - ell is vendored as a submodule to ensure consistent versions That's it. You control eiwd with ordinary UNIX signals and by simply editing files in its state directory. --- pkgs/os-specific/linux/eiwd/default.nix | 85 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 87 insertions(+) create mode 100644 pkgs/os-specific/linux/eiwd/default.nix diff --git a/pkgs/os-specific/linux/eiwd/default.nix b/pkgs/os-specific/linux/eiwd/default.nix new file mode 100644 index 0000000000000..39366dd6c042b --- /dev/null +++ b/pkgs/os-specific/linux/eiwd/default.nix @@ -0,0 +1,85 @@ +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, pkg-config +, python3Packages # for tests +, openssl # for tests +, enableManpages ? true +, docutils # for manpages +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "eiwd"; + version = "2.0-1"; + + src = fetchFromGitHub { + owner = "illiliti"; + repo = "eiwd"; + rev = finalAttrs.version; + hash = "sha256-eO9Bu1BzoxYJi/3MBRokIjYGAkzdkpXoMcG1J6i0rS8="; + fetchSubmodules = true; + }; + + outputs = [ + "out" "doc" + ] ++ lib.optionals enableManpages [ + "man" + ] ++ lib.optionals finalAttrs.doCheck [ + "test" + ]; + + postUnpack = '' + patchShebangs . + ''; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ] ++ lib.optionals enableManpages [ + docutils # only for the man pages + ]; + + buildInputs = [ ]; + + checkInputs = [ + python3Packages.python + (lib.getBin openssl) + ]; + + configureFlags = [ + "--disable-dbus" + ] ++ lib.optionals (!enableManpages) [ + "--disable-manual-pages" + ]; + + enableParallelBuilding = true; + + # override this to false if you don't want to build python3 + doCheck = stdenv.hostPlatform == stdenv.buildPlatform; + + # prevent the `install-data-local` Makefile rule from running; + # all it does is attempt to `mkdir` the `localstatedir`. + preInstall = '' + mkdir install-data-local + substituteInPlace Makefile --replace \ + '$(MKDIR_P) -m 700 $(DESTDIR)$(daemon_storagedir)' \ + 'true' + ''; + + postInstall = '' + mkdir -p $doc/share/doc + cp -a doc $doc/share/doc/iwd + cp -a README AUTHORS TODO $doc/share/doc/iwd + '' + lib.optionalString finalAttrs.doCheck '' + mkdir -p $test/bin + cp -a test/* $test/bin/ + ''; + + meta = with lib; { + homepage = "https://github.com/illiliti/eiwd/"; + description = "Fork of iwd (wifi daemon) which does not require dbus"; + license = licenses.lgpl21Plus; + platforms = platforms.linux; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7d9a91929d278..6383c79b19fda 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27985,6 +27985,8 @@ with pkgs; iwd = callPackage ../os-specific/linux/iwd { }; + eiwd = callPackage ../os-specific/linux/eiwd { }; + jool-cli = callPackage ../os-specific/linux/jool/cli.nix { }; juju = callPackage ../applications/networking/juju { }; From 5c8f765e1bb60baed8816b4eedb9a3bfcbf0fc8b Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sun, 23 Apr 2023 19:41:03 -0700 Subject: [PATCH 02/10] eiwd: 2.0-1 -> 2.1-1 --- pkgs/os-specific/linux/eiwd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/eiwd/default.nix b/pkgs/os-specific/linux/eiwd/default.nix index 39366dd6c042b..1c3fe9d8ff696 100644 --- a/pkgs/os-specific/linux/eiwd/default.nix +++ b/pkgs/os-specific/linux/eiwd/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "eiwd"; - version = "2.0-1"; + version = "2.1-1"; src = fetchFromGitHub { owner = "illiliti"; repo = "eiwd"; rev = finalAttrs.version; - hash = "sha256-eO9Bu1BzoxYJi/3MBRokIjYGAkzdkpXoMcG1J6i0rS8="; + hash = "sha256-XnSpaCis6nxtkow9yma+pJmuq1m98VKp8tx82PhL/dQ="; fetchSubmodules = true; }; From 83daf63e92ed90f54f839c2768c8c91592715197 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sun, 23 Apr 2023 19:42:19 -0700 Subject: [PATCH 03/10] eiwd: 2.1-1 -> 2.2-1 --- pkgs/os-specific/linux/eiwd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/eiwd/default.nix b/pkgs/os-specific/linux/eiwd/default.nix index 1c3fe9d8ff696..82e040b01d834 100644 --- a/pkgs/os-specific/linux/eiwd/default.nix +++ b/pkgs/os-specific/linux/eiwd/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "eiwd"; - version = "2.1-1"; + version = "2.2-1"; src = fetchFromGitHub { owner = "illiliti"; repo = "eiwd"; rev = finalAttrs.version; - hash = "sha256-XnSpaCis6nxtkow9yma+pJmuq1m98VKp8tx82PhL/dQ="; + hash = "sha256-VrZnmOXGhIi7B76jPQx5v9yf4NVDzXJApr1dED3mvAk="; fetchSubmodules = true; }; From a4a6133c1dd058263ee3e8b775ac19bfcc912616 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sun, 23 Apr 2023 19:43:55 -0700 Subject: [PATCH 04/10] eiwd: 2.2-1 -> 2.3-1 --- pkgs/os-specific/linux/eiwd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/eiwd/default.nix b/pkgs/os-specific/linux/eiwd/default.nix index 82e040b01d834..eabcb4d24d93f 100644 --- a/pkgs/os-specific/linux/eiwd/default.nix +++ b/pkgs/os-specific/linux/eiwd/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "eiwd"; - version = "2.2-1"; + version = "2.3-1"; src = fetchFromGitHub { owner = "illiliti"; repo = "eiwd"; rev = finalAttrs.version; - hash = "sha256-VrZnmOXGhIi7B76jPQx5v9yf4NVDzXJApr1dED3mvAk="; + hash = "sha256-chWsIquLoN7SSVuwQq996n+05cYP3vSivTRCE+uVcHg="; fetchSubmodules = true; }; From 3471586cf4252cbc24b5cebcf266730e420950e9 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sun, 23 Apr 2023 19:45:25 -0700 Subject: [PATCH 05/10] eiwd: 2.3-1 -> 2.4-1 --- pkgs/os-specific/linux/eiwd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/eiwd/default.nix b/pkgs/os-specific/linux/eiwd/default.nix index eabcb4d24d93f..a28f169dc93e1 100644 --- a/pkgs/os-specific/linux/eiwd/default.nix +++ b/pkgs/os-specific/linux/eiwd/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "eiwd"; - version = "2.3-1"; + version = "2.4-1"; src = fetchFromGitHub { owner = "illiliti"; repo = "eiwd"; rev = finalAttrs.version; - hash = "sha256-chWsIquLoN7SSVuwQq996n+05cYP3vSivTRCE+uVcHg="; + hash = "sha256-PEqgjvd14IFJyKtJ0mWz8Bwba7R+oLTXm+vY5IrA8Ac="; fetchSubmodules = true; }; From 7c1fecd7635f6893f2f1ca68d82aabb0f519dcd3 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sat, 5 Aug 2023 14:00:40 -0700 Subject: [PATCH 06/10] eiwd: 2.4-1 -> 2.5-1 --- pkgs/os-specific/linux/eiwd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/eiwd/default.nix b/pkgs/os-specific/linux/eiwd/default.nix index a28f169dc93e1..ea1b8263c72e9 100644 --- a/pkgs/os-specific/linux/eiwd/default.nix +++ b/pkgs/os-specific/linux/eiwd/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "eiwd"; - version = "2.4-1"; + version = "2.5-1"; src = fetchFromGitHub { owner = "illiliti"; repo = "eiwd"; rev = finalAttrs.version; - hash = "sha256-PEqgjvd14IFJyKtJ0mWz8Bwba7R+oLTXm+vY5IrA8Ac="; + hash = "sha256-7uGNWarZGdaxaRZ+g/K8H/4BcFrSxr8t0cAL6Lq07sQ="; fetchSubmodules = true; }; From 369134f6a8c886c088f6a6d2515ff5c5badb6270 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sat, 5 Aug 2023 14:02:11 -0700 Subject: [PATCH 07/10] eiwd: 2.5-1 -> 2.6-1 --- pkgs/os-specific/linux/eiwd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/eiwd/default.nix b/pkgs/os-specific/linux/eiwd/default.nix index ea1b8263c72e9..84470b927f5f6 100644 --- a/pkgs/os-specific/linux/eiwd/default.nix +++ b/pkgs/os-specific/linux/eiwd/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "eiwd"; - version = "2.5-1"; + version = "2.6-1"; src = fetchFromGitHub { owner = "illiliti"; repo = "eiwd"; rev = finalAttrs.version; - hash = "sha256-7uGNWarZGdaxaRZ+g/K8H/4BcFrSxr8t0cAL6Lq07sQ="; + hash = "sha256-cR+1fL4HjYBgmCRiuwqldPkxZIrz7Ra+XZGwvOVzsAY="; fetchSubmodules = true; }; From 1e3ec209b99a8b31ab02598b25e5fbcd3d979e1c Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sat, 21 Oct 2023 22:54:35 -0700 Subject: [PATCH 08/10] eiwd: 2.6-1 -> 2.8-1 --- pkgs/os-specific/linux/eiwd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/eiwd/default.nix b/pkgs/os-specific/linux/eiwd/default.nix index 84470b927f5f6..03df45d9ce7c2 100644 --- a/pkgs/os-specific/linux/eiwd/default.nix +++ b/pkgs/os-specific/linux/eiwd/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "eiwd"; - version = "2.6-1"; + version = "2.8-1"; src = fetchFromGitHub { owner = "illiliti"; repo = "eiwd"; rev = finalAttrs.version; - hash = "sha256-cR+1fL4HjYBgmCRiuwqldPkxZIrz7Ra+XZGwvOVzsAY="; + hash = "sha256-SD/RJFuGBwFT4G73f93VrWO/6mGKQxjVhmNrpKRA/WY="; fetchSubmodules = true; }; From 66eb36fa2789f05472732e5be78cd03ecaebd229 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sun, 22 Oct 2023 18:13:43 -0700 Subject: [PATCH 09/10] eiwd: move to pkgs/by-name --- .../linux/eiwd/default.nix => by-name/ei/eiwd/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{os-specific/linux/eiwd/default.nix => by-name/ei/eiwd/package.nix} (100%) diff --git a/pkgs/os-specific/linux/eiwd/default.nix b/pkgs/by-name/ei/eiwd/package.nix similarity index 100% rename from pkgs/os-specific/linux/eiwd/default.nix rename to pkgs/by-name/ei/eiwd/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6383c79b19fda..7d9a91929d278 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27985,8 +27985,6 @@ with pkgs; iwd = callPackage ../os-specific/linux/iwd { }; - eiwd = callPackage ../os-specific/linux/eiwd { }; - jool-cli = callPackage ../os-specific/linux/jool/cli.nix { }; juju = callPackage ../applications/networking/juju { }; From 57cb2ad0f64c535defc0361a9ded7beb8dd35ef8 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Thu, 2 Nov 2023 23:15:22 -0700 Subject: [PATCH 10/10] https://github.com/NixOS/nixpkgs/pull/208844#discussion_r1381145197 --- pkgs/by-name/ei/eiwd/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/ei/eiwd/package.nix b/pkgs/by-name/ei/eiwd/package.nix index 03df45d9ce7c2..16a8cd98f30be 100644 --- a/pkgs/by-name/ei/eiwd/package.nix +++ b/pkgs/by-name/ei/eiwd/package.nix @@ -40,8 +40,6 @@ stdenv.mkDerivation (finalAttrs: { docutils # only for the man pages ]; - buildInputs = [ ]; - checkInputs = [ python3Packages.python (lib.getBin openssl)