From ea012b09640eb951b7bdcd3276a8cb8f275a88cf Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 22 May 2024 20:54:31 -0300 Subject: [PATCH 1/3] iw: migrate to by-name --- .../linux/iw/default.nix => by-name/iw/iw/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{os-specific/linux/iw/default.nix => by-name/iw/iw/package.nix} (100%) diff --git a/pkgs/os-specific/linux/iw/default.nix b/pkgs/by-name/iw/iw/package.nix similarity index 100% rename from pkgs/os-specific/linux/iw/default.nix rename to pkgs/by-name/iw/iw/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7ac2f98ab11d..3da3940b9e52 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27190,8 +27190,6 @@ with pkgs; itpp = callPackage ../development/libraries/science/math/itpp { }; - iw = callPackage ../os-specific/linux/iw { }; - iwd = callPackage ../os-specific/linux/iwd { }; jool-cli = callPackage ../os-specific/linux/jool/cli.nix { }; From 0bd1bacb94e89e1f4516e620af7f147cc70ff5e0 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 22 May 2024 20:59:02 -0300 Subject: [PATCH 2/3] iw: adopt and refactor - finalAttrs - split outputs - strictDeps --- pkgs/by-name/iw/iw/package.nix | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/iw/iw/package.nix b/pkgs/by-name/iw/iw/package.nix index 4c1d94f02e6b..3da8386f06cf 100644 --- a/pkgs/by-name/iw/iw/package.nix +++ b/pkgs/by-name/iw/iw/package.nix @@ -1,31 +1,45 @@ -{ lib, stdenv, fetchurl, pkg-config, libnl }: +{ + lib, + fetchurl, + libnl, + pkg-config, + stdenv, +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "iw"; version = "5.19"; src = fetchurl { - url = "https://www.kernel.org/pub/software/network/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-8We76UfdU7uevAwdzvXbatc6wdYITyxvk3bFw2DMTU4="; + url = "https://www.kernel.org/pub/software/network/iw/iw-${finalAttrs.version}.tar.xz"; + hash = "sha256-8We76UfdU7uevAwdzvXbatc6wdYITyxvk3bFw2DMTU4="; }; nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libnl ]; + outputs = [ + "out" + "man" + ]; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; + strictDeps = true; + meta = { + homepage = "https://wireless.wiki.kernel.org/en/users/Documentation/iw"; description = "Tool to use nl80211"; - mainProgram = "iw"; longDescription = '' iw is a new nl80211 based CLI configuration utility for wireless devices. It supports all new drivers that have been added to the kernel recently. The old tool iwconfig, which uses Wireless Extensions interface, is deprecated and it's strongly recommended to switch to iw and nl80211. ''; - homepage = "https://wireless.wiki.kernel.org/en/users/Documentation/iw"; license = lib.licenses.isc; - maintainers = with lib.maintainers; [ viric primeos ]; - platforms = with lib.platforms; linux; + mainProgram = "iw"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.linux; }; -} +}) From ca940221fddfe4c5c55f8aa55f83928e8ceaa01a Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 22 May 2024 21:02:00 -0300 Subject: [PATCH 3/3] iw: 5.19 -> 6.7 --- pkgs/by-name/iw/iw/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/iw/iw/package.nix b/pkgs/by-name/iw/iw/package.nix index 3da8386f06cf..a218f8afc79d 100644 --- a/pkgs/by-name/iw/iw/package.nix +++ b/pkgs/by-name/iw/iw/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "iw"; - version = "5.19"; + version = "6.7"; src = fetchurl { url = "https://www.kernel.org/pub/software/network/iw/iw-${finalAttrs.version}.tar.xz"; - hash = "sha256-8We76UfdU7uevAwdzvXbatc6wdYITyxvk3bFw2DMTU4="; + hash = "sha256-qs9JwmaynVANcwhnmKHGUudgwZEmqFmf2BGFBDB4mjU="; }; nativeBuildInputs = [ pkg-config ];