From 3bf226de8bbf4d2722fcaa2aaa40f829cfb5d576 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Wed, 6 Aug 2025 21:23:01 +0000 Subject: [PATCH] treewide: refactor package definitions --- pkgs/by-name/co/codemov/package.nix | 6 +++--- pkgs/by-name/co/codux/package.nix | 10 +++++----- pkgs/by-name/co/coeurl/package.nix | 14 +++++++------- pkgs/by-name/co/coffeegrindsize/package.nix | 6 +++--- pkgs/by-name/co/colorls/package.nix | 6 +++--- pkgs/by-name/co/comedilib/package.nix | 12 ++++++------ pkgs/by-name/co/comic-mono/package.nix | 8 ++++---- pkgs/by-name/co/commandergenius/package.nix | 14 +++++++------- pkgs/by-name/co/commit-mono/package.nix | 18 +++++++++--------- pkgs/by-name/co/confetty/package.nix | 6 +++--- pkgs/by-name/co/confluencepot/package.nix | 10 +++++----- pkgs/by-name/co/conspy/package.nix | 16 ++++++++-------- .../by-name/co/copilot-node-server/package.nix | 6 +++--- pkgs/by-name/co/corkscrew/package.nix | 10 +++++----- pkgs/by-name/co/cowsay/package.nix | 8 ++++---- pkgs/by-name/co/cowsql/package.nix | 8 ++++---- 16 files changed, 79 insertions(+), 79 deletions(-) diff --git a/pkgs/by-name/co/codemov/package.nix b/pkgs/by-name/co/codemov/package.nix index 454dcf3b9427..f4321e49c307 100644 --- a/pkgs/by-name/co/codemov/package.nix +++ b/pkgs/by-name/co/codemov/package.nix @@ -51,11 +51,11 @@ rustPlatform.buildRustPackage { } ''; - meta = with lib; { + meta = { description = "Create a video of how a git repository's code changes over time"; homepage = "https://github.com/sloganking/codemov"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ figsoda ]; mainProgram = "codemov"; }; } diff --git a/pkgs/by-name/co/codux/package.nix b/pkgs/by-name/co/codux/package.nix index 516b62a470fb..dc0424da6d0b 100644 --- a/pkgs/by-name/co/codux/package.nix +++ b/pkgs/by-name/co/codux/package.nix @@ -20,17 +20,17 @@ appimageTools.wrapType2 rec { inherit pname version src; extraInstallCommands = '' - install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications + install -m 444 -D ${appimageContents}/codux.desktop -t $out/share/applications cp -r ${appimageContents}/usr/share/icons $out/share - substituteInPlace $out/share/applications/${pname}.desktop --replace 'Exec=AppRun' 'Exec=${pname}' + substituteInPlace $out/share/applications/codux.desktop --replace 'Exec=AppRun' 'Exec=codux' ''; - meta = with lib; { + meta = { description = "Visual IDE for React"; homepage = "https://www.codux.com"; - license = licenses.unfree; + license = lib.licenses.unfree; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ dit7ya kashw2 ]; diff --git a/pkgs/by-name/co/coeurl/package.nix b/pkgs/by-name/co/coeurl/package.nix index 51651e5f0f92..4de231022ed6 100644 --- a/pkgs/by-name/co/coeurl/package.nix +++ b/pkgs/by-name/co/coeurl/package.nix @@ -10,7 +10,7 @@ spdlog, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "coeurl"; version = "0.3.1"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { domain = "nheko.im"; owner = "nheko-reborn"; repo = "coeurl"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-NGplM5c/dMGSQbhKeuPOTWL8KsqvMd/76YuwCxnqNNE="; }; postPatch = '' @@ -37,11 +37,11 @@ stdenv.mkDerivation rec { spdlog ]; - meta = with lib; { + meta = { description = "Simple async wrapper around CURL for C++"; homepage = "https://nheko.im/nheko-reborn/coeurl"; - license = licenses.mit; - platforms = platforms.all; - maintainers = with maintainers; [ rnhmjoj ]; + license = lib.licenses.mit; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ rnhmjoj ]; }; -} +}) diff --git a/pkgs/by-name/co/coffeegrindsize/package.nix b/pkgs/by-name/co/coffeegrindsize/package.nix index 5df497e4bd1e..466e7a64af29 100644 --- a/pkgs/by-name/co/coffeegrindsize/package.nix +++ b/pkgs/by-name/co/coffeegrindsize/package.nix @@ -38,11 +38,11 @@ python3.pkgs.buildPythonApplication { runHook postInstall ''; - meta = with lib; { + meta = { description = "Detects the individual coffee grounds in a white-background picture to determine particle size distribution"; mainProgram = "coffeegrindsize"; homepage = "https://github.com/jgagneastro/coffeegrindsize"; - license = licenses.mit; - maintainers = with maintainers; [ t4ccer ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ t4ccer ]; }; } diff --git a/pkgs/by-name/co/colorls/package.nix b/pkgs/by-name/co/colorls/package.nix index ba8d8d9ea170..b773fa0b8019 100644 --- a/pkgs/by-name/co/colorls/package.nix +++ b/pkgs/by-name/co/colorls/package.nix @@ -13,11 +13,11 @@ passthru.updateScript = bundlerUpdateScript "colorls"; - meta = with lib; { + meta = { description = "Prettified LS"; homepage = "https://github.com/athityakumar/colorls"; - license = with licenses; mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ lukebfox nicknovitski cbley diff --git a/pkgs/by-name/co/comedilib/package.nix b/pkgs/by-name/co/comedilib/package.nix index ff73498c8cb1..295b421c7e04 100644 --- a/pkgs/by-name/co/comedilib/package.nix +++ b/pkgs/by-name/co/comedilib/package.nix @@ -21,8 +21,8 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "Linux-Comedi"; repo = "comedilib"; - rev = "r${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}"; - sha256 = "0kfs2dw62vjz8j7fgsxq6ky8r8kca726gyklbm6kljvgfh47lyfw"; + tag = "r${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}"; + hash = "sha256-3Hl6CHRvSzpNXXT6Z8RRbKKM/DS46+eORF9uYXgT2k0="; }; nativeBuildInputs = [ @@ -56,11 +56,11 @@ stdenv.mkDerivation (finalAttrs: { "doc" ]; - meta = with lib; { + meta = { description = "Linux Control and Measurement Device Interface Library"; homepage = "https://github.com/Linux-Comedi/comedilib"; - license = licenses.lgpl21; - maintainers = [ maintainers.doronbehar ]; - platforms = platforms.linux; + license = lib.licenses.lgpl21; + maintainers = with lib.maintainers; [ doronbehar ]; + platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/co/comic-mono/package.nix b/pkgs/by-name/co/comic-mono/package.nix index d843337d1dc7..2000b880e405 100644 --- a/pkgs/by-name/co/comic-mono/package.nix +++ b/pkgs/by-name/co/comic-mono/package.nix @@ -27,7 +27,7 @@ stdenvNoCC.mkDerivation { runHook postInstall ''; - meta = with lib; { + meta = { description = "Legible monospace font that looks like Comic Sans"; longDescription = '' A legible monospace font... the very typeface you’ve been trained to @@ -36,11 +36,11 @@ stdenvNoCC.mkDerivation { ''; homepage = "https://dtinth.github.io/comic-mono-font/"; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ an-empty-string totoroot ]; - platforms = platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/by-name/co/commandergenius/package.nix b/pkgs/by-name/co/commandergenius/package.nix index 5c60cde73927..62065d635370 100644 --- a/pkgs/by-name/co/commandergenius/package.nix +++ b/pkgs/by-name/co/commandergenius/package.nix @@ -18,14 +18,14 @@ xorg, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "commandergenius"; version = "3.5.2"; src = fetchFromGitLab { owner = "Dringgstein"; repo = "Commander-Genius"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-4WfHdgn8frcDVa3Va6vo/jZihf09vIs+bNdAxScgovE="; }; @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { sed -i 's,APPDIR games,APPDIR bin,' src/install.cmake ''; - meta = with lib; { + meta = { description = "Modern Interpreter for the Commander Keen Games"; longDescription = '' Commander Genius is an open-source clone of @@ -82,8 +82,8 @@ stdenv.mkDerivation rec { are required to do so ''; homepage = "https://github.com/gerstrong/Commander-Genius"; - maintainers = with maintainers; [ hce ]; - license = licenses.gpl2Plus; - platforms = platforms.linux; + maintainers = with lib.maintainers; [ hce ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/co/commit-mono/package.nix b/pkgs/by-name/co/commit-mono/package.nix index 574e45163bd0..46b957fdc797 100644 --- a/pkgs/by-name/co/commit-mono/package.nix +++ b/pkgs/by-name/co/commit-mono/package.nix @@ -3,12 +3,12 @@ stdenvNoCC, fetchzip, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "commit-mono"; version = "1.143"; src = fetchzip { - url = "https://github.com/eigilnikolajsen/commit-mono/releases/download/v${version}/CommitMono-${version}.zip"; + url = "https://github.com/eigilnikolajsen/commit-mono/releases/download/v${finalAttrs.version}/CommitMono-${finalAttrs.version}.zip"; hash = "sha256-JTyPgWfbWq+lXQU/rgnyvPG6+V3f+FB5QUkd+I1oFKE="; stripRoot = false; }; @@ -21,16 +21,16 @@ stdenvNoCC.mkDerivation rec { installPhase = '' runHook preInstall - install -Dm644 CommitMono-${version}/*.otf -t $out/share/fonts/opentype - install -Dm644 CommitMono-${version}/ttfautohint/*.ttf -t $out/share/fonts/truetype + install -Dm644 CommitMono-${finalAttrs.version}/*.otf -t $out/share/fonts/opentype + install -Dm644 CommitMono-${finalAttrs.version}/ttfautohint/*.ttf -t $out/share/fonts/truetype runHook postInstall ''; - meta = with lib; { + meta = { description = "Anonymous and neutral programming typeface focused on creating a better reading experience"; homepage = "https://commitmono.com/"; - license = licenses.ofl; - maintainers = [ maintainers.yoavlavi ]; - platforms = platforms.all; + license = lib.licenses.ofl; + maintainers = with lib.maintainers; [ yoavlavi ]; + platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/co/confetty/package.nix b/pkgs/by-name/co/confetty/package.nix index 9267b51db70b..e70c90bdfc2c 100644 --- a/pkgs/by-name/co/confetty/package.nix +++ b/pkgs/by-name/co/confetty/package.nix @@ -22,11 +22,11 @@ buildGoModule { "-w" ]; - meta = with lib; { + meta = { description = "Confetti in your TTY"; homepage = "https://github.com/maaslalani/confetty"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ figsoda ]; mainProgram = "confetty"; }; } diff --git a/pkgs/by-name/co/confluencepot/package.nix b/pkgs/by-name/co/confluencepot/package.nix index 1bbcd0d4b3bd..0f6eb2d763bc 100644 --- a/pkgs/by-name/co/confluencepot/package.nix +++ b/pkgs/by-name/co/confluencepot/package.nix @@ -12,7 +12,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "SIFalcon"; repo = "confluencePot"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-jIbL6prOUII8o9FghIYa80BytJ9SSuyj/TZmAxwAbJk="; }; @@ -24,7 +24,7 @@ buildGoModule rec { ''; postInstall = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' - mv $out/bin/confluencePot $out/bin/${pname} + mv $out/bin/confluencePot $out/bin/confluencepot ''; preFixup = '' @@ -32,15 +32,15 @@ buildGoModule rec { install -vD confluence.html -t $out/share ''; - meta = with lib; { + meta = { description = "Honeypot for the Atlassian Confluence OGNL injection vulnerability"; homepage = "https://github.com/SIFalcon/confluencePot"; longDescription = '' ConfluencePot is a simple honeypot for the Atlassian Confluence unauthenticated and remote OGNL injection vulnerability (CVE-2022-26134). ''; - license = with licenses; [ agpl3Plus ]; - maintainers = with maintainers; [ fab ]; + license = with lib.licenses; [ agpl3Plus ]; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "confluencepot"; }; } diff --git a/pkgs/by-name/co/conspy/package.nix b/pkgs/by-name/co/conspy/package.nix index 6612322744ba..bf0d57b840d9 100644 --- a/pkgs/by-name/co/conspy/package.nix +++ b/pkgs/by-name/co/conspy/package.nix @@ -7,13 +7,13 @@ ncurses, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "conspy"; version = "1.16"; src = fetchurl { - url = "mirror://sourceforge/project/conspy/conspy-${version}-1/conspy-${version}.tar.gz"; - sha256 = "02andak806vd04bgjlr0y0d2ddx7cazyf8nvca80vlh8x94gcppf"; + url = "mirror://sourceforge/project/conspy/conspy-${finalAttrs.version}-1/conspy-${finalAttrs.version}.tar.gz"; + hash = "sha256-7l72SOoI0g2QYtsi579ip7cmGvAgU/kWAW0bgKZqVgk="; curlOpts = " -A application/octet-stream "; }; @@ -33,11 +33,11 @@ stdenv.mkDerivation rec { autoconf ''; - meta = with lib; { + meta = { description = "Linux text console viewer"; mainProgram = "conspy"; - license = licenses.epl10; - maintainers = with maintainers; [ raskin ]; - platforms = platforms.linux; + license = lib.licenses.epl10; + maintainers = with lib.maintainers; [ raskin ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/co/copilot-node-server/package.nix b/pkgs/by-name/co/copilot-node-server/package.nix index 9dac4e80164b..244f882d30e4 100644 --- a/pkgs/by-name/co/copilot-node-server/package.nix +++ b/pkgs/by-name/co/copilot-node-server/package.nix @@ -32,11 +32,11 @@ buildNpmPackage rec { forceEmptyCache = true; dontNpmBuild = true; - meta = with lib; { + meta = { description = "Copilot Node.js server"; homepage = src.meta.homepage; - license = licenses.unfree; # I don't know: https://github.com/jfcherng/copilot-node-server/blob/main/LICENSE.md - maintainers = with maintainers; [ DamienCassou ]; + license = lib.licenses.unfree; # I don't know: https://github.com/jfcherng/copilot-node-server/blob/main/LICENSE.md + maintainers = with lib.maintainers; [ DamienCassou ]; mainProgram = "copilot-node-server"; }; } diff --git a/pkgs/by-name/co/corkscrew/package.nix b/pkgs/by-name/co/corkscrew/package.nix index 00a1f54697f3..ac48fa7ee387 100644 --- a/pkgs/by-name/co/corkscrew/package.nix +++ b/pkgs/by-name/co/corkscrew/package.nix @@ -5,23 +5,23 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "corkscrew"; version = "2.0"; src = fetchFromGitHub { owner = "bryanpkc"; repo = "corkscrew"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-JiddvTbuOysenrVWGUEyKSzpCF1PJaYWQUdz3FuLCdw="; }; nativeBuildInputs = [ autoreconfHook ]; - meta = with lib; { + meta = { homepage = "https://github.com/bryanpkc/corkscrew"; description = "Tool for tunneling SSH through HTTP proxies"; license = lib.licenses.gpl2Only; - platforms = platforms.unix; + platforms = lib.platforms.unix; mainProgram = "corkscrew"; }; -} +}) diff --git a/pkgs/by-name/co/cowsay/package.nix b/pkgs/by-name/co/cowsay/package.nix index af8ba6b3fe94..aad6eefb68e8 100644 --- a/pkgs/by-name/co/cowsay/package.nix +++ b/pkgs/by-name/co/cowsay/package.nix @@ -43,13 +43,13 @@ stdenv.mkDerivation (finalAttrs: { }; }; - meta = with lib; { + meta = { description = "Program which generates ASCII pictures of a cow with a message"; homepage = "https://cowsay.diamonds"; changelog = "https://github.com/cowsay-org/cowsay/releases/tag/v${finalAttrs.version}"; - license = licenses.gpl3Only; - platforms = platforms.all; - maintainers = with maintainers; [ + license = lib.licenses.gpl3Only; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ rob anthonyroussel ]; diff --git a/pkgs/by-name/co/cowsql/package.nix b/pkgs/by-name/co/cowsql/package.nix index 538a46889ce1..6cc820c52ca7 100644 --- a/pkgs/by-name/co/cowsql/package.nix +++ b/pkgs/by-name/co/cowsql/package.nix @@ -48,12 +48,12 @@ stdenv.mkDerivation (finalAttrs: { updateScript = nix-update-script { }; }; - meta = with lib; { + meta = { changelog = "https://github.com/cowsql/cowsql/releases/tag/${finalAttrs.version}"; description = "Embeddable, replicated and fault tolerant SQL engine"; homepage = "https://github.com/cowsql/cowsql"; - license = licenses.lgpl3Only; - teams = [ teams.lxc ]; - platforms = platforms.unix; + license = lib.licenses.lgpl3Only; + teams = with lib.teams; [ lxc ]; + platforms = lib.platforms.unix; }; })