treewide: refactor package definitions in by-name/ws folder.

Changed files
+63 -61
pkgs
by-name
ws
wsdd
wshowkeys
wsjtz
wsl-open
wsl-vpnkit
wslay
wslu
wsysmon
+7 -7
pkgs/by-name/ws/wsdd/package.nix
···
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=";
};
···
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";
};
-
}
+
})
+5 -5
pkgs/by-name/ws/wshowkeys/package.nix
···
owner = "ammgws";
repo = "wshowkeys";
rev = "e8bfc78f08ebdd1316daae59ecc77e62bba68b2b";
-
sha256 = "sha256-/HvNCQWsXOJZeCxHWmsLlbBDhBzF7XP/SPLdDiWMDC4=";
+
hash = "sha256-/HvNCQWsXOJZeCxHWmsLlbBDhBzF7XP/SPLdDiWMDC4=";
};
strictDeps = true;
···
libxkbcommon
];
-
meta = with lib; {
+
meta = {
description = "Displays keys being pressed on a Wayland session";
longDescription = ''
Displays keypresses on screen on supported Wayland compositors (requires
···
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";
+24 -22
pkgs/by-name/ws/wsjtz/package.nix
···
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";
+
};
+
}
+
)
+8 -8
pkgs/by-name/ws/wsl-open/package.nix
···
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 ];
···
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";
};
-
}
+
})
+1 -1
pkgs/by-name/ws/wsl-vpnkit/package.nix
···
src = fetchFromGitHub {
owner = "sakai135";
repo = "wsl-vpnkit";
-
rev = "v${version}";
+
tag = "v${version}";
hash = "sha256-Igbr3L2W32s4uBepllSz07bkbI3qwAKMZkBrXLqGrGA=";
};
+7 -7
pkgs/by-name/ws/wslay/package.nix
···
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=";
};
···
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;
};
-
}
+
})
+4 -4
pkgs/by-name/ws/wslu/package.nix
···
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=";
};
···
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;
};
-
}
+
})
+7 -7
pkgs/by-name/ws/wsysmon/package.nix
···
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=";
};
···
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";
};
-
}
+
})