From 8e8f937c762050f893941ff9f39b1a1da1ad596f Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Mon, 28 Jul 2025 18:56:29 +0000 Subject: [PATCH] treewide: refactor package definitions in by-name/ws folder. --- pkgs/by-name/ws/wsdd/package.nix | 14 ++++---- pkgs/by-name/ws/wshowkeys/package.nix | 10 +++--- pkgs/by-name/ws/wsjtz/package.nix | 46 ++++++++++++++------------ pkgs/by-name/ws/wsl-open/package.nix | 16 ++++----- pkgs/by-name/ws/wsl-vpnkit/package.nix | 2 +- pkgs/by-name/ws/wslay/package.nix | 14 ++++---- pkgs/by-name/ws/wslu/package.nix | 8 ++--- pkgs/by-name/ws/wsysmon/package.nix | 14 ++++---- 8 files changed, 63 insertions(+), 61 deletions(-) diff --git a/pkgs/by-name/ws/wsdd/package.nix b/pkgs/by-name/ws/wsdd/package.nix index ba37b253cf87..b8b572169452 100644 --- a/pkgs/by-name/ws/wsdd/package.nix +++ b/pkgs/by-name/ws/wsdd/package.nix @@ -8,14 +8,14 @@ python3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wsdd"; version = "0.9"; src = fetchFromGitHub { owner = "christgau"; repo = "wsdd"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-i3+Mw1l/kTRQT/CxRKvaEfdEh2qcEQp1Wa90Vk3JUMM="; }; @@ -41,12 +41,12 @@ stdenv.mkDerivation rec { tests.samba-wsdd = nixosTests.samba-wsdd; }; - meta = with lib; { + meta = { homepage = "https://github.com/christgau/wsdd"; description = "Web Service Discovery (WSD) host daemon for SMB/Samba"; - maintainers = with maintainers; [ izorkin ]; - license = licenses.mit; - platforms = platforms.all; + maintainers = with lib.maintainers; [ izorkin ]; + license = lib.licenses.mit; + platforms = lib.platforms.all; mainProgram = "wsdd"; }; -} +}) diff --git a/pkgs/by-name/ws/wshowkeys/package.nix b/pkgs/by-name/ws/wshowkeys/package.nix index bd39242ff50f..bf7ed333bb4c 100644 --- a/pkgs/by-name/ws/wshowkeys/package.nix +++ b/pkgs/by-name/ws/wshowkeys/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { owner = "ammgws"; repo = "wshowkeys"; rev = "e8bfc78f08ebdd1316daae59ecc77e62bba68b2b"; - sha256 = "sha256-/HvNCQWsXOJZeCxHWmsLlbBDhBzF7XP/SPLdDiWMDC4="; + hash = "sha256-/HvNCQWsXOJZeCxHWmsLlbBDhBzF7XP/SPLdDiWMDC4="; }; strictDeps = true; @@ -41,7 +41,7 @@ stdenv.mkDerivation { libxkbcommon ]; - meta = with lib; { + meta = { description = "Displays keys being pressed on a Wayland session"; longDescription = '' Displays keypresses on screen on supported Wayland compositors (requires @@ -51,14 +51,14 @@ stdenv.mkDerivation { setuid binary (use "programs.wshowkeys.enable = true;"). ''; homepage = "https://github.com/ammgws/wshowkeys"; - license = with licenses; [ + license = with lib.licenses; [ gpl3Only mit ]; # Some portions of the code are taken from Sway which is MIT licensed. # TODO: gpl3Only or gpl3Plus (ask upstream)? - platforms = platforms.linux; - maintainers = with maintainers; [ + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ berbiche ]; mainProgram = "wshowkeys"; diff --git a/pkgs/by-name/ws/wsjtz/package.nix b/pkgs/by-name/ws/wsjtz/package.nix index dd0d5e25220b..ad44eebb5b8f 100644 --- a/pkgs/by-name/ws/wsjtz/package.nix +++ b/pkgs/by-name/ws/wsjtz/package.nix @@ -4,28 +4,30 @@ wsjtx, }: -wsjtx.overrideAttrs (old: rec { - pname = "wsjtz"; - version = "2.7.0-rc7-1.48"; +wsjtx.overrideAttrs ( + finalAttrs: old: { + pname = "wsjtz"; + version = "2.7.0-rc7-1.48"; - src = fetchzip { - url = "mirror://sourceforge/wsjt-z/Source/wsjtz-${version}.zip"; - hash = "sha256-8PHbBlF0MtIgLn4HCFkbGivy8vBwg7NbvjMLaRj+4nI="; - }; + src = fetchzip { + url = "mirror://sourceforge/wsjt-z/Source/wsjtz-${finalAttrs.version}.zip"; + hash = "sha256-8PHbBlF0MtIgLn4HCFkbGivy8vBwg7NbvjMLaRj+4nI="; + }; - postInstall = '' - mv $out/bin/wsjtx $out/bin/wsjtz - mv $out/bin/wsjtx_app_version $out/bin/wsjtz_app_version - ''; + postInstall = '' + mv $out/bin/wsjtx $out/bin/wsjtz + mv $out/bin/wsjtx_app_version $out/bin/wsjtz_app_version + ''; - meta = { - description = "WSJT-X fork, primarily focused on automation and enhanced functionality"; - homepage = "https://sourceforge.net/projects/wsjt-z/"; - license = lib.licenses.gpl3Only; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ - scd31 - ]; - mainProgram = "wsjtz"; - }; -}) + meta = { + description = "WSJT-X fork, primarily focused on automation and enhanced functionality"; + homepage = "https://sourceforge.net/projects/wsjt-z/"; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ + scd31 + ]; + mainProgram = "wsjtz"; + }; + } +) diff --git a/pkgs/by-name/ws/wsl-open/package.nix b/pkgs/by-name/ws/wsl-open/package.nix index bf92ea0b3058..12a5e4ead602 100644 --- a/pkgs/by-name/ws/wsl-open/package.nix +++ b/pkgs/by-name/ws/wsl-open/package.nix @@ -5,15 +5,15 @@ installShellFiles, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wsl-open"; version = "2.2.1"; src = fetchFromGitHub { owner = "4U6U57"; repo = "wsl-open"; - rev = "v${version}"; - sha256 = "sha256-amqkDXdgIqGjRZMkltwco0UAI++G0RY/MxLXwtlxogE="; + tag = "v${finalAttrs.version}"; + hash = "sha256-amqkDXdgIqGjRZMkltwco0UAI++G0RY/MxLXwtlxogE="; }; nativeBuildInputs = [ installShellFiles ]; @@ -23,12 +23,12 @@ stdenv.mkDerivation rec { installManPage wsl-open.1 ''; - meta = with lib; { + meta = { description = "Open files with xdg-open from Windows Subsystem for Linux (WSL) in Windows applications"; homepage = "https://gitlab.com/4U6U57/wsl-open"; - license = licenses.mit; - platforms = platforms.all; - maintainers = with maintainers; [ SuperSandro2000 ]; + license = lib.licenses.mit; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ SuperSandro2000 ]; mainProgram = "wsl-open"; }; -} +}) diff --git a/pkgs/by-name/ws/wsl-vpnkit/package.nix b/pkgs/by-name/ws/wsl-vpnkit/package.nix index ee3eeb5a39cb..5d3619ef82a0 100644 --- a/pkgs/by-name/ws/wsl-vpnkit/package.nix +++ b/pkgs/by-name/ws/wsl-vpnkit/package.nix @@ -30,7 +30,7 @@ resholve.mkDerivation { src = fetchFromGitHub { owner = "sakai135"; repo = "wsl-vpnkit"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-Igbr3L2W32s4uBepllSz07bkbI3qwAKMZkBrXLqGrGA="; }; diff --git a/pkgs/by-name/ws/wslay/package.nix b/pkgs/by-name/ws/wslay/package.nix index 85f3294ebabe..229d1e335859 100644 --- a/pkgs/by-name/ws/wslay/package.nix +++ b/pkgs/by-name/ws/wslay/package.nix @@ -9,14 +9,14 @@ nettle, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wslay"; version = "1.1.1"; src = fetchFromGitHub { owner = "tatsuhiro-t"; repo = "wslay"; - rev = "release-${version}"; + tag = "release-${finalAttrs.version}"; hash = "sha256-xKQGZO5hNzMg+JYKeqOBsu73YO+ucBEOcNhG8iSNYvA="; }; @@ -43,11 +43,11 @@ stdenv.mkDerivation rec { export DYLD_LIBRARY_PATH=$(pwd)/lib/.libs ''; - meta = with lib; { + meta = { homepage = "https://tatsuhiro-t.github.io/wslay/"; description = "WebSocket library in C"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ pingiun ]; - platforms = platforms.unix; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pingiun ]; + platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ws/wslu/package.nix b/pkgs/by-name/ws/wslu/package.nix index ecd287cf3873..913ef1f7557a 100644 --- a/pkgs/by-name/ws/wslu/package.nix +++ b/pkgs/by-name/ws/wslu/package.nix @@ -5,14 +5,14 @@ copyDesktopItems, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wslu"; version = "4.1.4"; src = fetchFromGitHub { owner = "wslutilities"; repo = "wslu"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ssiwYkQg2rOirC/ZZVq2bJm4Ggc364uRkoS2y365Eb0="; }; @@ -37,9 +37,9 @@ stdenv.mkDerivation rec { meta = { description = "Collection of utilities for Windows Subsystem for Linux"; homepage = "https://github.com/wslutilities/wslu"; - changelog = "https://github.com/wslutilities/wslu/releases/tag/v${version}"; + changelog = "https://github.com/wslutilities/wslu/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ jamiemagee ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ws/wsysmon/package.nix b/pkgs/by-name/ws/wsysmon/package.nix index 76ffb4ab5964..923ce6c790ab 100644 --- a/pkgs/by-name/ws/wsysmon/package.nix +++ b/pkgs/by-name/ws/wsysmon/package.nix @@ -9,14 +9,14 @@ spdlog, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wsysmon"; version = "0.1.0"; src = fetchFromGitHub { owner = "slyfabi"; repo = "wsysmon"; - rev = version; + tag = finalAttrs.version; hash = "sha256-5kfZT+hm064qXoAzi0RdmUqXi8VaXamlbm+FJOrGh3A="; }; @@ -39,12 +39,12 @@ stdenv.mkDerivation rec { spdlog ]; - meta = with lib; { + meta = { description = "Windows task manager clone for Linux"; homepage = "https://github.com/SlyFabi/WSysMon"; - license = [ licenses.mit ]; - platforms = platforms.linux; - maintainers = with maintainers; [ totoroot ]; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ totoroot ]; mainProgram = "WSysMon"; }; -} +})