From fd0575a66bc9c860c230e9131b55e32e3c304285 Mon Sep 17 00:00:00 2001 From: lucasew Date: Mon, 6 Jan 2025 15:42:40 -0300 Subject: [PATCH] treewide: partially remove with lib from meta Signed-off-by: lucasew --- maintainers/scripts/nixpkgs-lint.nix | 6 +++--- nixos/modules/hardware/cpu/x86-msr.nix | 4 ++-- nixos/modules/hardware/raid/hpsa.nix | 4 ++-- nixos/modules/services/desktops/bamf.nix | 4 ++-- nixos/modules/services/desktops/geoclue2.nix | 4 ++-- nixos/modules/services/desktops/tumbler.nix | 4 ++-- nixos/modules/services/desktops/zeitgeist.nix | 4 ++-- .../sane_extra_backends/brscan4_etc_files.nix | 8 ++++---- .../sane_extra_backends/brscan5_etc_files.nix | 8 ++++---- .../display-managers/account-service-util.nix | 4 ++-- .../plugins/nvim-treesitter/update-shell.nix | 2 -- .../build-fhsenv-chroot/chrootenv/default.nix | 6 +++--- .../docker/nix-prefetch-docker.nix | 6 +++--- pkgs/build-support/mitm-cache/default.nix | 6 +++--- .../node/fetch-npm-deps/default.nix | 6 +++--- .../replace-secret/replace-secret.nix | 8 ++++---- .../patch-rc-path-hooks/default.nix | 16 ++++++++-------- .../test/references/default.nix | 3 +-- pkgs/data/fonts/emojione/default.nix | 6 +++--- pkgs/data/fonts/font-awesome/default.nix | 8 ++++---- pkgs/data/fonts/iosevka/comfy.nix | 6 +++--- pkgs/data/fonts/liberation-fonts/default.nix | 6 +++--- pkgs/data/fonts/maple-font/default.nix | 8 ++++---- .../data/fonts/mplus-outline-fonts/default.nix | 16 ++++++++-------- pkgs/data/fonts/openmoji/default.nix | 8 ++++---- pkgs/data/fonts/pretendard/default.nix | 8 ++++---- pkgs/data/fonts/tex-gyre-math/default.nix | 8 ++++---- pkgs/data/fonts/tex-gyre/default.nix | 6 +++--- .../icons/beauty-line-icon-theme/default.nix | 8 ++++---- pkgs/data/icons/bibata-cursors/translucent.nix | 8 ++++---- .../icons/flat-remix-icon-theme/default.nix | 6 +++--- pkgs/data/icons/gruppled-cursors/default.nix | 6 +++--- .../icons/gruppled-lite-cursors/default.nix | 6 +++--- .../icons/gruvbox-dark-icons-gtk/default.nix | 8 ++++---- pkgs/data/icons/kora-icon-theme/default.nix | 8 ++++---- .../icons/la-capitaine-icon-theme/default.nix | 8 ++++---- pkgs/data/icons/maia-icon-theme/default.nix | 8 ++++---- pkgs/data/icons/numix-icon-theme/default.nix | 8 ++++---- pkgs/data/icons/papirus-icon-theme/default.nix | 8 ++++---- .../icons/papirus-maia-icon-theme/default.nix | 8 ++++---- pkgs/data/icons/tango-icon-theme/default.nix | 6 +++--- .../icons/tela-circle-icon-theme/default.nix | 8 ++++---- pkgs/data/icons/zafiro-icons/default.nix | 8 ++++---- pkgs/data/misc/cacert/default.nix | 10 +++++----- pkgs/data/misc/fedora-backgrounds/generic.nix | 6 +++--- pkgs/data/misc/nixos-artwork/icons.nix | 6 +++--- pkgs/data/misc/nixos-artwork/wallpapers.nix | 4 ++-- pkgs/data/themes/adwaita-qt/default.nix | 6 +++--- .../themes/andromeda-gtk-theme/default.nix | 8 ++++---- pkgs/data/themes/ant-theme/ant-bloody.nix | 8 ++++---- pkgs/data/themes/ant-theme/ant-nebula.nix | 8 ++++---- pkgs/data/themes/ant-theme/ant.nix | 8 ++++---- pkgs/data/themes/breath-theme/default.nix | 8 ++++---- pkgs/data/themes/chili-sddm/default.nix | 7 ++++--- pkgs/data/themes/colloid-kde/default.nix | 8 ++++---- pkgs/data/themes/elegant-sddm/default.nix | 6 +++--- .../data/themes/graphite-kde-theme/default.nix | 8 ++++---- .../themes/gtk-theme-framework/default.nix | 4 ++-- pkgs/data/themes/kde2/default.nix | 6 +++--- .../kde-rounded-corners/default.nix | 6 +++--- .../sierra-breeze-enhanced/default.nix | 6 +++--- pkgs/data/themes/layan-kde/default.nix | 8 ++++---- pkgs/data/themes/lightly-boehs/default.nix | 10 +++++----- pkgs/data/themes/lightly-qt/default.nix | 8 ++++---- .../material-kwin-decoration/default.nix | 8 ++++---- pkgs/data/themes/plata/default.nix | 8 ++++---- pkgs/data/themes/qtcurve/default.nix | 6 +++--- .../themes/utterly-nord-plasma/default.nix | 8 ++++---- pkgs/games/0ad/data.nix | 8 ++++---- pkgs/games/0ad/game.nix | 10 +++++----- pkgs/games/90secondportraits/default.nix | 8 ++++---- pkgs/games/amoeba/data.nix | 8 ++++---- pkgs/games/amoeba/default.nix | 8 ++++---- pkgs/games/anki/bin.nix | 4 ++-- pkgs/games/anki/default.nix | 6 +++--- pkgs/games/armagetronad/default.nix | 8 ++++---- pkgs/games/asc/default.nix | 10 +++++----- pkgs/games/black-hole-solver/default.nix | 4 ++-- pkgs/games/blightmud/default.nix | 8 ++++---- pkgs/games/bugdom/default.nix | 8 ++++---- pkgs/games/bzflag/default.nix | 6 +++--- pkgs/games/cataclysm-dda/common.nix | 8 ++++---- .../pkgs/tilesets/UndeadPeople/default.nix | 8 ++++---- pkgs/games/chessx/default.nix | 8 ++++---- pkgs/games/chiaki-ng/default.nix | 8 ++++---- pkgs/games/chiaki/default.nix | 6 +++--- pkgs/games/crawl/default.nix | 10 +++++----- pkgs/games/crossfire/crossfire-arch.nix | 8 ++++---- pkgs/games/crossfire/crossfire-client.nix | 10 +++++----- pkgs/games/crossfire/crossfire-maps.nix | 10 +++++----- pkgs/games/crossfire/crossfire-server.nix | 10 +++++----- pkgs/games/curseofwar/default.nix | 8 ++++---- pkgs/games/cutechess/default.nix | 8 ++++---- pkgs/games/cutemaze/default.nix | 8 ++++---- pkgs/games/ddnet/default.nix | 6 +++--- pkgs/games/deliantra/arch.nix | 8 ++++---- pkgs/games/deliantra/data.nix | 8 ++++---- pkgs/games/deliantra/maps.nix | 8 ++++---- pkgs/games/deliantra/server.nix | 8 ++++---- pkgs/games/devilutionx/default.nix | 8 ++++---- pkgs/games/doom-ports/doomrunner/default.nix | 8 ++++---- pkgs/games/doom-ports/doomseeker/default.nix | 6 +++--- pkgs/games/doom-ports/slade/default.nix | 8 ++++---- pkgs/games/doom-ports/slade/git.nix | 8 ++++---- .../doom-ports/zandronum/alpha/default.nix | 8 ++++---- pkgs/games/doom-ports/zandronum/default.nix | 8 ++++---- pkgs/games/doom-ports/zandronum/fmod.nix | 6 +++--- pkgs/games/doom-ports/zdoom/bcc-git.nix | 6 +++--- pkgs/games/doom-ports/zdoom/default.nix | 8 ++++---- pkgs/games/doom-ports/zdoom/zdbsp.nix | 8 ++++---- pkgs/games/duckmarines/default.nix | 8 ++++---- .../dwarf-fortress/dwarf-therapist/default.nix | 8 ++++---- .../dwarf-fortress/legends-browser/default.nix | 10 +++++----- pkgs/games/dxx-rebirth/assets.nix | 6 +++--- pkgs/games/dxx-rebirth/default.nix | 10 +++++----- pkgs/games/dxx-rebirth/full.nix | 8 ++++---- pkgs/games/easyrpg-player/default.nix | 6 +++--- pkgs/games/exult/default.nix | 6 +++--- pkgs/games/ferium/default.nix | 6 +++--- pkgs/games/flare/default.nix | 10 +++++----- pkgs/games/flare/engine.nix | 8 ++++---- pkgs/games/flare/game.nix | 8 ++++---- pkgs/games/flightgear/default.nix | 9 ++++----- pkgs/games/fltrator/default.nix | 8 ++++---- pkgs/games/fteqw/generic.nix | 8 ++++---- .../garden-of-coloured-lights/default.nix | 4 ++-- pkgs/games/gcompris/default.nix | 8 ++++---- pkgs/games/gl-gsync-demo/default.nix | 10 +++++----- pkgs/games/gogdl/default.nix | 6 +++--- pkgs/games/gscrabble/default.nix | 8 ++++---- pkgs/games/gshogi/default.nix | 8 ++++---- pkgs/games/hedgewars/default.nix | 8 ++++---- pkgs/games/heroic/default.nix | 6 +++--- pkgs/games/instawow/default.nix | 6 +++--- pkgs/games/iortcw/sp.nix | 8 ++++---- pkgs/games/ldmud/default.nix | 8 ++++---- pkgs/games/leela-zero/default.nix | 12 ++++++------ pkgs/games/legendary-gl/default.nix | 8 ++++---- pkgs/games/libremines/default.nix | 8 ++++---- pkgs/games/lincity/default.nix | 4 ++-- pkgs/games/lincity/ng.nix | 8 ++++---- pkgs/games/linthesia/default.nix | 6 +++--- pkgs/games/liquidwar/5.nix | 8 ++++---- pkgs/games/liquidwar/default.nix | 8 ++++---- pkgs/games/lzwolf/default.nix | 10 +++++----- pkgs/games/maptool/default.nix | 8 ++++---- pkgs/games/minecraft-servers/derivation.nix | 10 +++++----- pkgs/games/minecraft/default.nix | 18 +++++++++--------- pkgs/games/mrrescue/default.nix | 6 +++--- pkgs/games/mudlet/default.nix | 8 ++++---- pkgs/games/nethack/default.nix | 6 +++--- pkgs/games/nile/default.nix | 13 +++++++------ pkgs/games/npush/default.nix | 8 ++++---- pkgs/games/openmw/default.nix | 8 ++++---- pkgs/games/openmw/tes3mp.nix | 6 +++--- pkgs/games/openra/build-engine.nix | 6 +++--- pkgs/games/openrw/default.nix | 8 ++++---- pkgs/games/openspades/default.nix | 8 ++++---- pkgs/games/openttd/default.nix | 8 ++++---- pkgs/games/openttd/grfcodec.nix | 8 ++++---- pkgs/games/openttd/nml.nix | 6 +++--- pkgs/games/openxray/default.nix | 6 +++--- pkgs/games/orthorobot/default.nix | 8 ++++---- pkgs/games/pegasus-frontend/default.nix | 10 +++++----- pkgs/games/pentobi/default.nix | 8 +++----- pkgs/games/pokerth/default.nix | 8 ++++---- pkgs/games/pro-office-calculator/default.nix | 8 ++++---- pkgs/games/pysolfc/default.nix | 6 +++--- pkgs/games/qgo/default.nix | 6 +++--- pkgs/games/qtads/default.nix | 8 ++++---- pkgs/games/quake2/yquake2/default.nix | 8 ++++---- pkgs/games/quake2/yquake2/games.nix | 8 ++++---- pkgs/games/quake3/content/demo.nix | 8 ++++---- pkgs/games/quake3/content/hires.nix | 8 ++++---- pkgs/games/quake3/content/pointrelease.nix | 8 ++++---- pkgs/games/quakespasm/default.nix | 6 +++--- pkgs/games/quakespasm/vulkan.nix | 6 +++--- pkgs/games/qzdl/default.nix | 8 ++++---- pkgs/games/rare/default.nix | 6 +++--- pkgs/games/rogue/default.nix | 6 +++--- pkgs/games/rott/default.nix | 9 ++++----- pkgs/games/scummvm/default.nix | 9 ++++----- pkgs/games/scummvm/games.nix | 6 +++--- pkgs/games/sgt-puzzles/default.nix | 8 ++++---- pkgs/games/soi/default.nix | 8 ++++---- pkgs/games/solarus/default.nix | 6 +++--- .../space-station-14-launcher.nix | 4 ++-- pkgs/games/spring/default.nix | 6 +++--- pkgs/games/spring/springlobby.nix | 6 +++--- pkgs/games/starsector/default.nix | 8 ++++---- pkgs/games/stuntrally/default.nix | 8 ++++---- pkgs/games/super-tux-kart/default.nix | 10 ++++------ pkgs/games/the-butterfly-effect/default.nix | 8 ++++---- pkgs/games/toppler/default.nix | 8 ++++---- pkgs/games/vcmi/default.nix | 8 ++++---- pkgs/games/vessel/default.nix | 6 +++--- pkgs/games/vimgolf/default.nix | 8 ++++---- pkgs/games/warsow/default.nix | 6 +++--- pkgs/games/warsow/engine.nix | 10 +++++----- pkgs/games/wesnoth/default.nix | 8 ++++---- pkgs/games/xpilot/bloodspilot-server.nix | 8 ++++---- pkgs/games/xpilot/default.nix | 8 ++++---- pkgs/servers/bindle/default.nix | 6 +++--- pkgs/servers/binserve/default.nix | 8 ++++---- pkgs/servers/diod/default.nix | 8 ++++---- pkgs/servers/fedigroups/default.nix | 8 ++++---- pkgs/servers/firebird/default.nix | 6 +++--- pkgs/servers/klipper/default.nix | 8 ++++---- pkgs/servers/klipper/klipper-firmware.nix | 6 +++--- pkgs/servers/mobilizon/default.nix | 6 +++--- pkgs/servers/mobilizon/frontend.nix | 6 +++--- pkgs/servers/monitoring/grafana/default.nix | 6 +++--- .../bsull-console-datasource/default.nix | 10 +++++----- .../doitintl-bigquery-datasource/default.nix | 10 +++++----- .../fetzerch-sunandmoon-datasource/default.nix | 10 +++++----- .../frser-sqlite-datasource/default.nix | 10 +++++----- .../grafadruid-druid-datasource/default.nix | 10 +++++----- .../grafana-clickhouse-datasource/default.nix | 10 +++++----- .../plugins/grafana-clock-panel/default.nix | 10 +++++----- .../grafana-discourse-datasource/default.nix | 10 +++++----- .../grafana-github-datasource/default.nix | 10 +++++----- .../default.nix | 10 +++++----- .../grafana-mqtt-datasource/default.nix | 10 +++++----- .../plugins/grafana-oncall-app/default.nix | 6 +++--- .../grafana-opensearch-datasource/default.nix | 10 +++++----- .../plugins/grafana-piechart-panel/default.nix | 10 +++++----- .../plugins/grafana-polystat-panel/default.nix | 10 +++++----- .../plugins/grafana-worldmap-panel/default.nix | 10 +++++----- .../marcusolsson-calendar-panel/default.nix | 10 +++++----- .../marcusolsson-csv-datasource/default.nix | 10 +++++----- .../marcusolsson-dynamictext-panel/default.nix | 10 +++++----- .../marcusolsson-json-datasource/default.nix | 10 +++++----- .../grafana/plugins/redis-app/default.nix | 10 +++++----- .../plugins/redis-datasource/default.nix | 10 +++++----- .../plugins/redis-explorer-app/default.nix | 10 +++++----- .../ventura-psychrometric-panel/default.nix | 10 +++++----- .../volkovlabs-echarts-panel/default.nix | 10 +++++----- .../plugins/volkovlabs-form-panel/default.nix | 10 +++++----- .../volkovlabs-rss-datasource/default.nix | 10 +++++----- .../volkovlabs-variable-panel/default.nix | 10 +++++----- .../default.nix | 10 +++++----- pkgs/servers/monitoring/laurel/default.nix | 8 ++++---- .../servers/monitoring/openobserve/default.nix | 6 +++--- pkgs/servers/mpd/default.nix | 8 ++++---- pkgs/servers/oxigraph/default.nix | 6 +++--- pkgs/servers/peertube/default.nix | 6 +++--- pkgs/servers/pinnwand/default.nix | 17 ++++++++--------- pkgs/servers/pinnwand/steck.nix | 6 +++--- pkgs/servers/piping-server-rust/default.nix | 6 +++--- pkgs/servers/roapi/http.nix | 8 ++++---- pkgs/servers/shairplay/default.nix | 8 ++++---- pkgs/servers/sickbeard/sickgear.nix | 6 +++--- pkgs/servers/snac2/default.nix | 8 ++++---- pkgs/servers/spicedb/default.nix | 6 +++--- pkgs/servers/spicedb/zed.nix | 6 +++--- pkgs/servers/tautulli/default.nix | 8 ++++---- pkgs/servers/unpackerr/default.nix | 4 ++-- pkgs/servers/unstructured-api/default.nix | 6 +++--- pkgs/servers/varnish/default.nix | 6 +++--- pkgs/servers/varnish/digest.nix | 4 +--- pkgs/servers/varnish/dynamic.nix | 3 +-- pkgs/servers/varnish/modules.nix | 2 +- pkgs/servers/x11/quartz-wm/default.nix | 8 ++++---- pkgs/servers/x11/xorg/xcb-util-xrm.nix | 6 +++--- pkgs/servers/x11/xorg/xwayland.nix | 8 ++++---- pkgs/shells/bash/5.nix | 6 +++--- pkgs/shells/carapace/default.nix | 6 +++--- pkgs/shells/fish/babelfish.nix | 6 +++--- pkgs/shells/fish/default.nix | 8 ++++---- pkgs/shells/fish/plugins/async-prompt.nix | 6 +++--- pkgs/shells/fish/plugins/autopair.nix | 6 +++--- pkgs/shells/fish/plugins/bass.nix | 6 +++--- pkgs/shells/fish/plugins/bobthefish.nix | 6 +++--- pkgs/shells/fish/plugins/bobthefisher.nix | 6 +++--- pkgs/shells/fish/plugins/clownfish.nix | 6 +++--- pkgs/shells/fish/plugins/colored-man-pages.nix | 8 ++++---- pkgs/shells/fish/plugins/done.nix | 6 +++--- pkgs/shells/fish/plugins/fifc.nix | 6 +++--- pkgs/shells/fish/plugins/fishtape_3.nix | 6 +++--- .../fish/plugins/foreign-env/default.nix | 8 ++++---- pkgs/shells/fish/plugins/forgit.nix | 6 +++--- pkgs/shells/fish/plugins/fzf-fish.nix | 6 +++--- pkgs/shells/fish/plugins/fzf.nix | 6 +++--- pkgs/shells/fish/plugins/git-abbr.nix | 8 ++++---- .../fish/plugins/github-copilot-cli-fish.nix | 6 +++--- pkgs/shells/fish/plugins/grc.nix | 8 ++++---- pkgs/shells/fish/plugins/humantime-fish.nix | 8 ++++---- pkgs/shells/fish/plugins/hydro.nix | 8 ++++---- pkgs/shells/fish/plugins/pisces.nix | 6 +++--- pkgs/shells/fish/plugins/sdkman-for-fish.nix | 6 +++--- pkgs/shells/fish/plugins/sponge.nix | 6 +++--- pkgs/shells/fish/plugins/tide.nix | 6 +++--- pkgs/shells/fish/plugins/transient-fish.nix | 6 +++--- pkgs/shells/fish/plugins/wakatime-fish.nix | 6 +++--- pkgs/shells/fish/plugins/z.nix | 6 +++--- pkgs/shells/nushell/default.nix | 6 +++--- pkgs/shells/nushell/plugins/dbus.nix | 8 ++++---- pkgs/shells/nushell/plugins/formats.nix | 8 ++++---- pkgs/shells/nushell/plugins/gstat.nix | 8 ++++---- pkgs/shells/nushell/plugins/highlight.nix | 8 ++++---- pkgs/shells/nushell/plugins/net.nix | 6 +++--- pkgs/shells/nushell/plugins/polars.nix | 8 ++++---- pkgs/shells/nushell/plugins/skim.nix | 8 ++++---- pkgs/shells/nushell/plugins/units.nix | 8 ++++---- .../upstreamStackHpackVersion/default.nix | 4 ++-- 305 files changed, 1140 insertions(+), 1152 deletions(-) diff --git a/maintainers/scripts/nixpkgs-lint.nix b/maintainers/scripts/nixpkgs-lint.nix index 8c67c4b6edb188..fe9c77408915c0 100644 --- a/maintainers/scripts/nixpkgs-lint.nix +++ b/maintainers/scripts/nixpkgs-lint.nix @@ -28,10 +28,10 @@ stdenv.mkDerivation { wrapProgram $out/bin/nixpkgs-lint --set PERL5LIB $PERL5LIB ''; - meta = with lib; { - maintainers = [ maintainers.eelco ]; + meta = { + maintainers = [ lib.maintainers.eelco ]; description = "A utility for Nixpkgs contributors to check Nixpkgs for common errors"; mainProgram = "nixpkgs-lint"; - platforms = platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/nixos/modules/hardware/cpu/x86-msr.nix b/nixos/modules/hardware/cpu/x86-msr.nix index 56f6e23812abce..f494ece2c77204 100644 --- a/nixos/modules/hardware/cpu/x86-msr.nix +++ b/nixos/modules/hardware/cpu/x86-msr.nix @@ -107,7 +107,7 @@ in ''; }; - meta = with lib; { - maintainers = with maintainers; [ lorenzleutgeb ]; + meta = { + maintainers = [ lib.maintainers.lorenzleutgeb ]; }; } diff --git a/nixos/modules/hardware/raid/hpsa.nix b/nixos/modules/hardware/raid/hpsa.nix index effac77bdd5aa9..25efbe74070cc4 100644 --- a/nixos/modules/hardware/raid/hpsa.nix +++ b/nixos/modules/hardware/raid/hpsa.nix @@ -37,10 +37,10 @@ let dontStrip = true; - meta = with lib; { + meta = { description = "HP Smart Array CLI"; homepage = "https://downloads.linux.hpe.com/SDR/downloads/MCP/Ubuntu/pool/non-free/"; - license = licenses.unfreeRedistributable; + license = lib.licenses.unfreeRedistributable; platforms = [ "x86_64-linux" ]; maintainers = [ ]; }; diff --git a/nixos/modules/services/desktops/bamf.nix b/nixos/modules/services/desktops/bamf.nix index d9c46e94d9e041..59abadadc46c58 100644 --- a/nixos/modules/services/desktops/bamf.nix +++ b/nixos/modules/services/desktops/bamf.nix @@ -1,8 +1,8 @@ # Bamf { config, lib, pkgs, ... }: { - meta = with lib; { - maintainers = with lib.maintainers; [ ] ++ lib.teams.pantheon.members; + meta = { + maintainers = [ ] ++ lib.teams.pantheon.members; }; ###### interface diff --git a/nixos/modules/services/desktops/geoclue2.nix b/nixos/modules/services/desktops/geoclue2.nix index 16d1cb17ca066d..f45b9751a6aed1 100644 --- a/nixos/modules/services/desktops/geoclue2.nix +++ b/nixos/modules/services/desktops/geoclue2.nix @@ -296,7 +296,7 @@ in ); }; - meta = with lib; { - maintainers = with maintainers; [ ] ++ teams.pantheon.members; + meta = { + maintainers = with lib.maintainers; [ ] ++ teams.pantheon.members; }; } diff --git a/nixos/modules/services/desktops/tumbler.nix b/nixos/modules/services/desktops/tumbler.nix index 521f8c0a58f13e..c8ebf7e81e8924 100644 --- a/nixos/modules/services/desktops/tumbler.nix +++ b/nixos/modules/services/desktops/tumbler.nix @@ -17,8 +17,8 @@ in (lib.mkRemovedOptionModule [ "services" "tumbler" "package" ] "") ]; - meta = with lib; { - maintainers = with lib.maintainers; [ ] ++ lib.teams.pantheon.members; + meta = { + maintainers = [ ] ++ lib.teams.pantheon.members; }; ###### interface diff --git a/nixos/modules/services/desktops/zeitgeist.nix b/nixos/modules/services/desktops/zeitgeist.nix index 5e9cba9930165b..e8b539bef0c46d 100644 --- a/nixos/modules/services/desktops/zeitgeist.nix +++ b/nixos/modules/services/desktops/zeitgeist.nix @@ -7,8 +7,8 @@ }: { - meta = with lib; { - maintainers = with maintainers; [ ] ++ teams.pantheon.members; + meta = { + maintainers = with lib.maintainers; [ ] ++ teams.pantheon.members; }; ###### interface diff --git a/nixos/modules/services/hardware/sane_extra_backends/brscan4_etc_files.nix b/nixos/modules/services/hardware/sane_extra_backends/brscan4_etc_files.nix index 8ec6b72cb5ea56..7274807ffa8e33 100644 --- a/nixos/modules/services/hardware/sane_extra_backends/brscan4_etc_files.nix +++ b/nixos/modules/services/hardware/sane_extra_backends/brscan4_etc_files.nix @@ -65,11 +65,11 @@ stdenv.mkDerivation { dontStrip = true; dontPatchELF = true; - meta = with lib; { + meta = { description = "Brother brscan4 sane backend driver etc files"; homepage = "http://www.brother.com"; - platforms = platforms.linux; - license = licenses.unfree; - maintainers = with maintainers; [ jraygauthier ]; + platforms = lib.platforms.linux; + license = lib.licenses.unfree; + maintainers = [ lib.maintainers.jraygauthier ]; }; } diff --git a/nixos/modules/services/hardware/sane_extra_backends/brscan5_etc_files.nix b/nixos/modules/services/hardware/sane_extra_backends/brscan5_etc_files.nix index 9ad64c41ee69d1..deb03e8f048288 100644 --- a/nixos/modules/services/hardware/sane_extra_backends/brscan5_etc_files.nix +++ b/nixos/modules/services/hardware/sane_extra_backends/brscan5_etc_files.nix @@ -73,11 +73,11 @@ stdenv.mkDerivation { dontInstall = true; - meta = with lib; { + meta = { description = "Brother brscan5 sane backend driver etc files"; homepage = "https://www.brother.com"; - platforms = platforms.linux; - license = licenses.unfree; - maintainers = with maintainers; [ mattchrist ]; + platforms = lib.platforms.linux; + license = lib.licenses.unfree; + maintainers = [ lib.maintainers.mattchrist ]; }; } diff --git a/nixos/modules/services/x11/display-managers/account-service-util.nix b/nixos/modules/services/x11/display-managers/account-service-util.nix index 93affdef3fc83a..d64bca2190484a 100644 --- a/nixos/modules/services/x11/display-managers/account-service-util.nix +++ b/nixos/modules/services/x11/display-managers/account-service-util.nix @@ -39,7 +39,7 @@ python3.pkgs.buildPythonApplication { chmod +x $out/bin/set-session ''; - meta = with lib; { - maintainers = with maintainers; [ ] ++ teams.pantheon.members; + meta = { + maintainers = with lib.maintainers; [ ] ++ teams.pantheon.members; }; } diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/update-shell.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/update-shell.nix index a81c4daa32f8d1..3dd2f8dbe48413 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/update-shell.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/update-shell.nix @@ -2,8 +2,6 @@ pkgs ? import ../../../../../.. { }, }: -with pkgs; - let inherit (vimPlugins) nvim-treesitter; diff --git a/pkgs/build-support/build-fhsenv-chroot/chrootenv/default.nix b/pkgs/build-support/build-fhsenv-chroot/chrootenv/default.nix index 99903f3e4ad6af..194e77a67a438d 100644 --- a/pkgs/build-support/build-fhsenv-chroot/chrootenv/default.nix +++ b/pkgs/build-support/build-fhsenv-chroot/chrootenv/default.nix @@ -18,10 +18,10 @@ stdenv.mkDerivation { ]; buildInputs = [ glib ]; - meta = with lib; { + meta = { description = "Setup mount/user namespace for FHS emulation"; - license = licenses.mit; + license = lib.licenses.mit; maintainers = [ ]; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/build-support/docker/nix-prefetch-docker.nix b/pkgs/build-support/docker/nix-prefetch-docker.nix index fac192e7eef9af..65e7006e219313 100644 --- a/pkgs/build-support/docker/nix-prefetch-docker.nix +++ b/pkgs/build-support/docker/nix-prefetch-docker.nix @@ -16,10 +16,10 @@ stdenv.mkDerivation { preferLocalBuild = true; - meta = with lib; { + meta = { description = "Script used to obtain source hashes for dockerTools.pullImage"; mainProgram = "nix-prefetch-docker"; - maintainers = with maintainers; [ offline ]; - platforms = platforms.unix; + maintainers = [ lib.maintainers.offline ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/build-support/mitm-cache/default.nix b/pkgs/build-support/mitm-cache/default.nix index 80287e60a33a1a..cefe7541757cdd 100644 --- a/pkgs/build-support/mitm-cache/default.nix +++ b/pkgs/build-support/mitm-cache/default.nix @@ -35,11 +35,11 @@ rustPlatform.buildRustPackage rec { passthru.fetch = callPackage ./fetch.nix { }; - meta = with lib; { + meta = { description = "A MITM caching proxy for use in nixpkgs"; homepage = "https://github.com/chayleaf/mitm-cache#readme"; - license = licenses.mit; - maintainers = with maintainers; [ chayleaf ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.chayleaf ]; mainProgram = "mitm-cache"; }; } diff --git a/pkgs/build-support/node/fetch-npm-deps/default.nix b/pkgs/build-support/node/fetch-npm-deps/default.nix index a001f80b113ce1..0afd27d211dd32 100644 --- a/pkgs/build-support/node/fetch-npm-deps/default.nix +++ b/pkgs/build-support/node/fetch-npm-deps/default.nix @@ -139,11 +139,11 @@ }; }; - meta = with lib; { + meta = { description = "Prefetch dependencies from npm (for use with `fetchNpmDeps`)"; mainProgram = "prefetch-npm-deps"; - maintainers = with maintainers; [ winter ]; - license = licenses.mit; + maintainers = [ lib.maintainers.winter ]; + license = lib.licenses.mit; }; }; diff --git a/pkgs/build-support/replace-secret/replace-secret.nix b/pkgs/build-support/replace-secret/replace-secret.nix index 7e661a012bc31c..82f1bc2e29bb35 100644 --- a/pkgs/build-support/replace-secret/replace-secret.nix +++ b/pkgs/build-support/replace-secret/replace-secret.nix @@ -25,10 +25,10 @@ stdenv.mkDerivation { $out/bin/replace-secret "and this" <(echo "b") short_test diff ${./test/expected_short_output} short_test ''; - meta = with lib; { - platforms = platforms.all; - maintainers = with maintainers; [ talyz ]; - license = licenses.mit; + meta = { + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.talyz ]; + license = lib.licenses.mit; description = "Replace a string in one file with a secret from a second file"; longDescription = '' Replace a string in one file with a secret from a second file. diff --git a/pkgs/build-support/setup-hooks/patch-rc-path-hooks/default.nix b/pkgs/build-support/setup-hooks/patch-rc-path-hooks/default.nix index e07cc15cacd092..6040c22bee2190 100644 --- a/pkgs/build-support/setup-hooks/patch-rc-path-hooks/default.nix +++ b/pkgs/build-support/setup-hooks/patch-rc-path-hooks/default.nix @@ -10,9 +10,9 @@ in { patchRcPathBash = makeSetupHook { name = "patch-rc-path-bash"; - meta = with lib; { + meta = { description = "Setup-hook to inject source-time PATH prefix to a Bash/Ksh/Zsh script"; - maintainers = with maintainers; [ ShamrockLee ]; + maintainers = [ lib.maintainers.ShamrockLee ]; }; passthru.tests = { inherit (tests) test-bash; @@ -23,9 +23,9 @@ in substitutions = { sed = "${gnused}/bin/sed"; }; - meta = with lib; { + meta = { description = "Setup-hook to inject source-time PATH prefix to a Csh script"; - maintainers = with maintainers; [ ShamrockLee ]; + maintainers = [ lib.maintainers.ShamrockLee ]; }; passthru.tests = { inherit (tests) test-csh; @@ -33,9 +33,9 @@ in } ./patch-rc-path-csh.sh; patchRcPathFish = makeSetupHook { name = "patch-rc-path-fish"; - meta = with lib; { + meta = { description = "Setup-hook to inject source-time PATH prefix to a Fish script"; - maintainers = with maintainers; [ ShamrockLee ]; + maintainers = [ lib.maintainers.ShamrockLee ]; }; passthru.tests = { inherit (tests) test-fish; @@ -46,9 +46,9 @@ in substitutions = { sed = "${gnused}/bin/sed"; }; - meta = with lib; { + meta = { description = "Setup-hook to inject source-time PATH prefix to a POSIX shell script"; - maintainers = with maintainers; [ ShamrockLee ]; + maintainers = [ lib.maintainers.ShamrockLee ]; }; passthru.tests = { inherit (tests) test-posix; diff --git a/pkgs/build-support/trivial-builders/test/references/default.nix b/pkgs/build-support/trivial-builders/test/references/default.nix index bc9f8913e99afc..8ea7fd38e142fc 100644 --- a/pkgs/build-support/trivial-builders/test/references/default.nix +++ b/pkgs/build-support/trivial-builders/test/references/default.nix @@ -3,7 +3,6 @@ stdenvNoCC, testers, callPackage, - writeText, # nativeBuildInputs shellcheck-minimal, # Samples @@ -92,7 +91,7 @@ let ; }; - meta = with lib; { + meta = { mainProgram = "references-test"; }; }); diff --git a/pkgs/data/fonts/emojione/default.nix b/pkgs/data/fonts/emojione/default.nix index d46325f6a81c74..01b9193b088622 100644 --- a/pkgs/data/fonts/emojione/default.nix +++ b/pkgs/data/fonts/emojione/default.nix @@ -57,10 +57,10 @@ stdenv.mkDerivation rec { install -Dm755 build/EmojiOneColor-SVGinOT.ttf $out/share/fonts/truetype/EmojiOneColor-SVGinOT.ttf ''; - meta = with lib; { + meta = { description = "Open source emoji set"; homepage = "http://emojione.com/"; - license = licenses.cc-by-40; - maintainers = with maintainers; [ abbradar ]; + license = lib.licenses.cc-by-40; + maintainers = [ lib.maintainers.abbradar ]; }; } diff --git a/pkgs/data/fonts/font-awesome/default.nix b/pkgs/data/fonts/font-awesome/default.nix index fe48972b0573aa..fb17ca71544ef5 100644 --- a/pkgs/data/fonts/font-awesome/default.nix +++ b/pkgs/data/fonts/font-awesome/default.nix @@ -28,16 +28,16 @@ let runHook postInstall ''; - meta = with lib; { + meta = { description = "Font Awesome - OTF font"; longDescription = '' Font Awesome gives you scalable vector icons that can instantly be customized. This package includes only the OTF font. For full CSS etc. see the project website. ''; homepage = "https://fontawesome.com/"; - license = licenses.ofl; - platforms = platforms.all; - maintainers = with maintainers; [ + license = lib.licenses.ofl; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ abaldeau johnazoidberg ]; diff --git a/pkgs/data/fonts/iosevka/comfy.nix b/pkgs/data/fonts/iosevka/comfy.nix index 52974e657f9d95..022b3de6fa3bf7 100644 --- a/pkgs/data/fonts/iosevka/comfy.nix +++ b/pkgs/data/fonts/iosevka/comfy.nix @@ -57,16 +57,16 @@ let npmDepsHash = "sha256-xwGR21+CpZRFdZYz8SQrSf1tkp3fjGudoMmP5TGgEe8="; - meta = with lib; { + meta = { inherit (src.meta) homepage; description = '' Customised build of the Iosevka typeface, with a consistent rounded style and overrides for almost all individual glyphs in both roman (upright) and italic (slanted) variants. ''; - license = licenses.ofl; + license = lib.licenses.ofl; platforms = iosevka.meta.platforms; - maintainers = [ maintainers.DamienCassou ]; + maintainers = [ lib.maintainers.DamienCassou ]; }; } ); diff --git a/pkgs/data/fonts/liberation-fonts/default.nix b/pkgs/data/fonts/liberation-fonts/default.nix index 2e1e0e68cae37e..0f8b3943f2741b 100644 --- a/pkgs/data/fonts/liberation-fonts/default.nix +++ b/pkgs/data/fonts/liberation-fonts/default.nix @@ -42,7 +42,7 @@ let done ''; - meta = with lib; { + meta = { description = "Liberation Fonts, replacements for Times New Roman, Arial, and Courier New"; longDescription = '' The Liberation Fonts are intended to be replacements for the three most @@ -56,9 +56,9 @@ let Bitstream Vera Sans Mono). ''; - license = licenses.ofl; + license = lib.licenses.ofl; homepage = "https://github.com/liberationfonts"; - maintainers = with maintainers; [ raskin ]; + maintainers = [ lib.maintainers.raskin ]; }; }; in diff --git a/pkgs/data/fonts/maple-font/default.nix b/pkgs/data/fonts/maple-font/default.nix index fbaeaa59a1a830..5d778c34743a14 100644 --- a/pkgs/data/fonts/maple-font/default.nix +++ b/pkgs/data/fonts/maple-font/default.nix @@ -30,14 +30,14 @@ let find . -name '*.woff2' -exec install -Dt $out/share/fonts/woff2 {} \; ''; - meta = with lib; { + meta = { homepage = "https://github.com/subframe7536/Maple-font"; description = '' Open source ${desc} font with round corner and ligatures for IDE and command line ''; - license = licenses.ofl; - platforms = platforms.all; - maintainers = with maintainers; [ oluceps ]; + license = lib.licenses.ofl; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.oluceps ]; }; }; diff --git a/pkgs/data/fonts/mplus-outline-fonts/default.nix b/pkgs/data/fonts/mplus-outline-fonts/default.nix index 9c2404822a82e3..47def0bc29b595 100644 --- a/pkgs/data/fonts/mplus-outline-fonts/default.nix +++ b/pkgs/data/fonts/mplus-outline-fonts/default.nix @@ -26,12 +26,12 @@ in runHook postInstall ''; - meta = with lib; { + meta = { description = "M+ Outline Fonts (legacy OSDN release)"; homepage = "https://mplus-fonts.osdn.jp"; - maintainers = with maintainers; [ uakci ]; - platforms = platforms.all; - license = licenses.mplus; + maintainers = [ lib.maintainers.uakci ]; + platforms = lib.platforms.all; + license = lib.licenses.mplus; }; }; @@ -56,12 +56,12 @@ in runHook postInstall ''; - meta = with lib; { + meta = { description = "M+ Outline Fonts (GitHub release)"; homepage = "https://mplusfonts.github.io"; - maintainers = with maintainers; [ uakci ]; - platforms = platforms.all; - license = licenses.ofl; + maintainers = [ lib.maintainers.uakci ]; + platforms = lib.platforms.all; + license = lib.licenses.ofl; }; }; } diff --git a/pkgs/data/fonts/openmoji/default.nix b/pkgs/data/fonts/openmoji/default.nix index 5c9e54611545a7..b7ff41aaf56307 100644 --- a/pkgs/data/fonts/openmoji/default.nix +++ b/pkgs/data/fonts/openmoji/default.nix @@ -96,13 +96,13 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; - meta = with lib; { - license = licenses.cc-by-sa-40; - maintainers = with maintainers; [ + meta = { + license = lib.licenses.cc-by-sa-40; + maintainers = with lib.maintainers; [ _999eagle fgaz ]; - platforms = platforms.all; + platforms = lib.platforms.all; homepage = "https://openmoji.org/"; downloadPage = "https://github.com/hfg-gmuend/openmoji/releases"; description = "Open-source emojis for designers, developers and everyone else"; diff --git a/pkgs/data/fonts/pretendard/default.nix b/pkgs/data/fonts/pretendard/default.nix index b51de3cfd627ec..e4b74cc51e8cda 100644 --- a/pkgs/data/fonts/pretendard/default.nix +++ b/pkgs/data/fonts/pretendard/default.nix @@ -30,12 +30,12 @@ let runHook postInstall ''; - meta = with lib; { + meta = { homepage = "https://github.com/orioncactus/pretendard"; description = "Alternative font to system-ui for all platforms"; - license = licenses.ofl; - platforms = platforms.all; - maintainers = with maintainers; [ sudosubin ]; + license = lib.licenses.ofl; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.sudosubin ]; }; }; diff --git a/pkgs/data/fonts/tex-gyre-math/default.nix b/pkgs/data/fonts/tex-gyre-math/default.nix index fbed169a7e0391..c09797ae61249c 100644 --- a/pkgs/data/fonts/tex-gyre-math/default.nix +++ b/pkgs/data/fonts/tex-gyre-math/default.nix @@ -61,7 +61,7 @@ let outputHashMode = "recursive"; inherit outputHash; - meta = with lib; { + meta = { longDescription = '' TeX Gyre ${displayName} Math is a math companion for the TeX Gyre ${displayName} family of fonts (see @@ -71,9 +71,9 @@ let # "The TeX Gyre Math fonts are licensed under the GUST Font License (GFL), # which is a free license, legally equivalent to the LaTeX Project Public # License (LPPL), version 1.3c or later." - GUST website - license = licenses.lppl13c; - maintainers = with maintainers; [ siddharthist ]; - platforms = platforms.all; + license = lib.licenses.lppl13c; + maintainers = [ lib.maintainers.siddharthist ]; + platforms = lib.platforms.all; }; }; in diff --git a/pkgs/data/fonts/tex-gyre/default.nix b/pkgs/data/fonts/tex-gyre/default.nix index a0b7b01cff6bea..bc6a7a0336f3fd 100644 --- a/pkgs/data/fonts/tex-gyre/default.nix +++ b/pkgs/data/fonts/tex-gyre/default.nix @@ -34,14 +34,14 @@ let outputHashMode = "recursive"; inherit outputHash; - meta = with lib; { + meta = { homepage = "http://www.gust.org.pl/projects/e-foundry/tex-gyre"; # "The TeX Gyre fonts are licensed under the GUST Font License (GFL), # which is a free license, legally equivalent to the LaTeX Project Public # License (LPPL), version 1.3c or later." - GUST website - license = licenses.lppl13c; + license = lib.licenses.lppl13c; maintainers = [ ]; - platforms = platforms.all; + platforms = lib.platforms.all; }; }; in diff --git a/pkgs/data/icons/beauty-line-icon-theme/default.nix b/pkgs/data/icons/beauty-line-icon-theme/default.nix index d1bea8dfd6bdfa..04390260d958a1 100644 --- a/pkgs/data/icons/beauty-line-icon-theme/default.nix +++ b/pkgs/data/icons/beauty-line-icon-theme/default.nix @@ -58,11 +58,11 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = { description = "BeautyLine icon theme"; homepage = "https://www.gnome-look.org/p/1425426/"; - platforms = platforms.linux; - license = [ licenses.publicDomain ]; - maintainers = with maintainers; [ gvolpe ]; + platforms = lib.platforms.linux; + license = [ lib.licenses.publicDomain ]; + maintainers = [ lib.maintainers.gvolpe ]; }; } diff --git a/pkgs/data/icons/bibata-cursors/translucent.nix b/pkgs/data/icons/bibata-cursors/translucent.nix index ac7e8c2ce67784..5b8d62cb10dcc6 100644 --- a/pkgs/data/icons/bibata-cursors/translucent.nix +++ b/pkgs/data/icons/bibata-cursors/translucent.nix @@ -20,11 +20,11 @@ stdenvNoCC.mkDerivation rec { cp -pr Bibata_* $out/share/icons/ ''; - meta = with lib; { + meta = { description = "Translucent Varient of the Material Based Cursor"; homepage = "https://github.com/Silicasandwhich/Bibata_Cursor_Translucent"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ AdsonCicilioti ]; + license = lib.licenses.gpl3; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.AdsonCicilioti ]; }; } diff --git a/pkgs/data/icons/flat-remix-icon-theme/default.nix b/pkgs/data/icons/flat-remix-icon-theme/default.nix index ad9d166a5a6b27..11550492291ab6 100644 --- a/pkgs/data/icons/flat-remix-icon-theme/default.nix +++ b/pkgs/data/icons/flat-remix-icon-theme/default.nix @@ -45,12 +45,12 @@ stdenvNoCC.mkDerivation rec { recordPropagatedDependencies ''; - meta = with lib; { + meta = { description = "Flat remix is a pretty simple icon theme inspired on material design"; homepage = "https://drasite.com/flat-remix"; - license = with licenses; [ gpl3Only ]; + license = [ lib.licenses.gpl3Only ]; # breeze-icons and pantheon.elementary-icon-theme dependencies are restricted to linux - platforms = platforms.linux; + platforms = lib.platforms.linux; maintainers = [ ]; }; } diff --git a/pkgs/data/icons/gruppled-cursors/default.nix b/pkgs/data/icons/gruppled-cursors/default.nix index 4a223fc67d339e..83ee75e73e39f4 100644 --- a/pkgs/data/icons/gruppled-cursors/default.nix +++ b/pkgs/data/icons/gruppled-cursors/default.nix @@ -21,10 +21,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { cp -r ${theme}/{cursors,index.theme} $out/share/icons/${theme} ''; - meta = with lib; { + meta = { description = "Gruppled Cursors theme"; homepage = "https://github.com/nim65s/gruppled-cursors"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ nim65s ]; + license = lib.licenses.gpl2Only; + maintainers = [ lib.maintainers.nim65s ]; }; }) diff --git a/pkgs/data/icons/gruppled-lite-cursors/default.nix b/pkgs/data/icons/gruppled-lite-cursors/default.nix index bd564ea565c198..09d65a940b9cd3 100644 --- a/pkgs/data/icons/gruppled-lite-cursors/default.nix +++ b/pkgs/data/icons/gruppled-lite-cursors/default.nix @@ -21,10 +21,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { cp -r ${theme}/{cursors,index.theme} $out/share/icons/${theme} ''; - meta = with lib; { + meta = { description = "Gruppled Lite Cursors theme"; homepage = "https://github.com/nim65s/gruppled-lite-cursors"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ nim65s ]; + license = lib.licenses.gpl2Only; + maintainers = [ lib.maintainers.nim65s ]; }; }) diff --git a/pkgs/data/icons/gruvbox-dark-icons-gtk/default.nix b/pkgs/data/icons/gruvbox-dark-icons-gtk/default.nix index ad03691639dacf..306d9886e9f9c7 100644 --- a/pkgs/data/icons/gruvbox-dark-icons-gtk/default.nix +++ b/pkgs/data/icons/gruvbox-dark-icons-gtk/default.nix @@ -36,11 +36,11 @@ stdenvNoCC.mkDerivation rec { dontDropIconThemeCache = true; - meta = with lib; { + meta = { description = "Gruvbox icons for GTK based desktop environments"; homepage = "https://github.com/jmattheis/gruvbox-dark-gtk"; - license = licenses.gpl3Only; - platforms = platforms.unix; - maintainers = [ maintainers.nomisiv ]; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.nomisiv ]; }; } diff --git a/pkgs/data/icons/kora-icon-theme/default.nix b/pkgs/data/icons/kora-icon-theme/default.nix index 486f06b614b0ec..a8029ef670e018 100644 --- a/pkgs/data/icons/kora-icon-theme/default.nix +++ b/pkgs/data/icons/kora-icon-theme/default.nix @@ -49,11 +49,11 @@ stdenvNoCC.mkDerivation rec { rev-prefix = "v"; }; - meta = with lib; { + meta = { description = "SVG icon theme in four variants"; homepage = "https://github.com/bikass/kora"; - license = with licenses; [ gpl3Only ]; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; + license = [ lib.licenses.gpl3Only ]; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.romildo ]; }; } diff --git a/pkgs/data/icons/la-capitaine-icon-theme/default.nix b/pkgs/data/icons/la-capitaine-icon-theme/default.nix index 6b215636bffbe2..29fa25fd475295 100644 --- a/pkgs/data/icons/la-capitaine-icon-theme/default.nix +++ b/pkgs/data/icons/la-capitaine-icon-theme/default.nix @@ -43,14 +43,14 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = { description = "Icon theme inspired by macOS and Google's Material Design"; homepage = "https://github.com/keeferrourke/la-capitaine-icon-theme"; - license = with licenses; [ + license = with lib.licenses; [ gpl3Plus mit ]; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.romildo ]; }; } diff --git a/pkgs/data/icons/maia-icon-theme/default.nix b/pkgs/data/icons/maia-icon-theme/default.nix index e0558ce70c38b8..d8b957d4e74c3f 100644 --- a/pkgs/data/icons/maia-icon-theme/default.nix +++ b/pkgs/data/icons/maia-icon-theme/default.nix @@ -45,11 +45,11 @@ stdenv.mkDerivation { done ''; - meta = with lib; { + meta = { description = "Icons based on Breeze and Super Flat Remix"; homepage = "https://gitlab.manjaro.org/artwork/themes/maia"; - license = licenses.lgpl3; - maintainers = with maintainers; [ mounium ]; - platforms = platforms.all; + license = lib.licenses.lgpl3; + maintainers = [ lib.maintainers.mounium ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/data/icons/numix-icon-theme/default.nix b/pkgs/data/icons/numix-icon-theme/default.nix index 262f5dadc457cf..c06efbd14a8b42 100644 --- a/pkgs/data/icons/numix-icon-theme/default.nix +++ b/pkgs/data/icons/numix-icon-theme/default.nix @@ -51,12 +51,12 @@ stdenvNoCC.mkDerivation rec { passthru.updateScript = gitUpdater { }; - meta = with lib; { + meta = { description = "Numix icon theme"; homepage = "https://numixproject.github.io"; - license = licenses.gpl3Only; + license = lib.licenses.gpl3Only; # darwin cannot deal with file names differing only in case - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.romildo ]; }; } diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix index 22898dd77162bf..42d4b6557937e4 100644 --- a/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/pkgs/data/icons/papirus-icon-theme/default.nix @@ -57,13 +57,13 @@ stdenvNoCC.mkDerivation rec { passthru.updateScript = gitUpdater { }; - meta = with lib; { + meta = { description = "Pixel perfect icon theme for Linux"; homepage = "https://github.com/PapirusDevelopmentTeam/papirus-icon-theme"; - license = licenses.gpl3Only; + license = lib.licenses.gpl3Only; # darwin gives hash mismatch in source, probably because of file names differing only in case - platforms = platforms.linux; - maintainers = with maintainers; [ + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ romildo moni ]; diff --git a/pkgs/data/icons/papirus-maia-icon-theme/default.nix b/pkgs/data/icons/papirus-maia-icon-theme/default.nix index 3375f5668da876..3aed03ec7aeee0 100644 --- a/pkgs/data/icons/papirus-maia-icon-theme/default.nix +++ b/pkgs/data/icons/papirus-maia-icon-theme/default.nix @@ -45,11 +45,11 @@ stdenv.mkDerivation rec { done ''; - meta = with lib; { + meta = { description = "Manjaro variation of Papirus icon theme"; homepage = "https://github.com/Ste74/papirus-maia-icon-theme"; - license = licenses.lgpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; + license = lib.licenses.lgpl3; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.romildo ]; }; } diff --git a/pkgs/data/icons/tango-icon-theme/default.nix b/pkgs/data/icons/tango-icon-theme/default.nix index 6d4da143a828df..9cc1d188ffaf6e 100644 --- a/pkgs/data/icons/tango-icon-theme/default.nix +++ b/pkgs/data/icons/tango-icon-theme/default.nix @@ -44,10 +44,10 @@ stdenv.mkDerivation rec { postInstall = '''${gtk.out}/bin/gtk-update-icon-cache' "$out/share/icons/Tango" ''; - meta = with lib; { + meta = { description = "Basic set of icons"; homepage = "http://tango.freedesktop.org/Tango_Icon_Library"; - platforms = platforms.linux; - license = licenses.publicDomain; + platforms = lib.platforms.linux; + license = lib.licenses.publicDomain; }; } diff --git a/pkgs/data/icons/tela-circle-icon-theme/default.nix b/pkgs/data/icons/tela-circle-icon-theme/default.nix index db58831f062408..45460063aac2a4 100644 --- a/pkgs/data/icons/tela-circle-icon-theme/default.nix +++ b/pkgs/data/icons/tela-circle-icon-theme/default.nix @@ -84,11 +84,11 @@ lib.checkListOfEnum "${pname}: color variants" passthru.updateScript = gitUpdater { }; - meta = with lib; { + meta = { description = "Flat and colorful personality icon theme"; homepage = "https://github.com/vinceliuice/Tela-circle-icon-theme"; - license = licenses.gpl3Only; - platforms = platforms.linux; # darwin use case-insensitive filesystems that cause hash mismatches - maintainers = with maintainers; [ romildo ]; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.linux; # darwin use case-insensitive filesystems that cause hash mismatches + maintainers = [ lib.maintainers.romildo ]; }; } diff --git a/pkgs/data/icons/zafiro-icons/default.nix b/pkgs/data/icons/zafiro-icons/default.nix index 44858afeb9e342..abf7fbe32fb45b 100644 --- a/pkgs/data/icons/zafiro-icons/default.nix +++ b/pkgs/data/icons/zafiro-icons/default.nix @@ -67,11 +67,11 @@ stdenvNoCC.mkDerivation rec { passthru.updateScript = gitUpdater { }; - meta = with lib; { + meta = { description = "Icon pack flat with light colors"; homepage = "https://github.com/zayronxio/Zafiro-icons"; - license = with licenses; [ gpl3 ]; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; + license = [ lib.licenses.gpl3 ]; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.romildo ]; }; } diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix index d3f4c4f2eb606b..3b4ee864646927 100644 --- a/pkgs/data/misc/cacert/default.nix +++ b/pkgs/data/misc/cacert/default.nix @@ -25,15 +25,15 @@ let srcVersion = "3.107"; version = if nssOverride != null then nssOverride.version else srcVersion; - meta = with lib; { + meta = { homepage = "https://curl.haxx.se/docs/caextract.html"; description = "Bundle of X.509 certificates of public Certificate Authorities (CA)"; - platforms = platforms.all; - maintainers = with maintainers; [ + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ fpletz lukegb ]; - license = licenses.mpl20; + license = lib.licenses.mpl20; }; certdata = stdenv.mkDerivation { pname = "nss-cacert-certdata"; @@ -64,7 +64,7 @@ let inherit meta; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "nss-cacert"; inherit version; diff --git a/pkgs/data/misc/fedora-backgrounds/generic.nix b/pkgs/data/misc/fedora-backgrounds/generic.nix index dd75ea9e88b106..e3735865927eb7 100644 --- a/pkgs/data/misc/fedora-backgrounds/generic.nix +++ b/pkgs/data/misc/fedora-backgrounds/generic.nix @@ -40,11 +40,11 @@ stdenvNoCC.mkDerivation { "WP_DIR_LN=$(DESTDIR)/share/backgrounds/$(WP_NAME)" ]; - meta = with lib; { + meta = { homepage = "https://github.com/fedoradesign/backgrounds"; description = "Set of default and supplemental wallpapers for Fedora"; - license = licenses.cc-by-sa-40; - platforms = platforms.unix; + license = lib.licenses.cc-by-sa-40; + platforms = lib.platforms.unix; maintainers = [ ]; }; } diff --git a/pkgs/data/misc/nixos-artwork/icons.nix b/pkgs/data/misc/nixos-artwork/icons.nix index 8a9ed3d40a847e..93216e8c73e82c 100644 --- a/pkgs/data/misc/nixos-artwork/icons.nix +++ b/pkgs/data/misc/nixos-artwork/icons.nix @@ -30,11 +30,11 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; - meta = with lib; { + meta = { description = "Icons of the Nix logo, in Freedesktop Icon Directory Layout"; homepage = "https://github.com/NixOS/nixos-artwork"; - license = licenses.cc-by-40; + license = lib.licenses.cc-by-40; maintainers = [ ]; - platforms = platforms.all; + platforms = lib.platforms.all; }; }) diff --git a/pkgs/data/misc/nixos-artwork/wallpapers.nix b/pkgs/data/misc/nixos-artwork/wallpapers.nix index 117a58c8176968..7a79f5280b86a2 100644 --- a/pkgs/data/misc/nixos-artwork/wallpapers.nix +++ b/pkgs/data/misc/nixos-artwork/wallpapers.nix @@ -63,10 +63,10 @@ let kdeFilePath = "${pkg}/share/wallpapers/${name}/contents/images/${src.name}"; }; - meta = with lib; { + meta = { inherit description license; homepage = "https://github.com/NixOS/nixos-artwork"; - platforms = platforms.all; + platforms = lib.platforms.all; }; }; in diff --git a/pkgs/data/themes/adwaita-qt/default.nix b/pkgs/data/themes/adwaita-qt/default.nix index 704d49af1cb01b..a6390a56184b8b 100644 --- a/pkgs/data/themes/adwaita-qt/default.nix +++ b/pkgs/data/themes/adwaita-qt/default.nix @@ -64,11 +64,11 @@ stdenv.mkDerivation rec { updateScript = nix-update-script { }; }; - meta = with lib; { + meta = { description = "Style to bend Qt applications to look like they belong into GNOME Shell"; homepage = "https://github.com/FedoraQt/adwaita-qt"; - license = licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; maintainers = [ ]; - platforms = platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/data/themes/andromeda-gtk-theme/default.nix b/pkgs/data/themes/andromeda-gtk-theme/default.nix index da49e70adeba2c..281c0eee0b579d 100644 --- a/pkgs/data/themes/andromeda-gtk-theme/default.nix +++ b/pkgs/data/themes/andromeda-gtk-theme/default.nix @@ -56,12 +56,12 @@ stdenvNoCC.mkDerivation { runHook postInstall ''; - meta = with lib; { + meta = { description = "Elegant dark theme for gnome, mate, budgie, cinnamon, xfce"; homepage = "https://github.com/EliverLara/Andromeda-gtk"; - license = licenses.gpl3Only; - platforms = platforms.linux; - maintainers = with maintainers; [ + license = lib.licenses.gpl3Only; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ jakedevs romildo ]; diff --git a/pkgs/data/themes/ant-theme/ant-bloody.nix b/pkgs/data/themes/ant-theme/ant-bloody.nix index b00455b79a67c2..2b8cd937f400ed 100644 --- a/pkgs/data/themes/ant-theme/ant-bloody.nix +++ b/pkgs/data/themes/ant-theme/ant-bloody.nix @@ -29,11 +29,11 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = { description = "Bloody variant of the Ant theme"; homepage = "https://github.com/EliverLara/${themeName}"; - license = licenses.gpl3; - platforms = platforms.all; - maintainers = with maintainers; [ alexarice ]; + license = lib.licenses.gpl3; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.alexarice ]; }; } diff --git a/pkgs/data/themes/ant-theme/ant-nebula.nix b/pkgs/data/themes/ant-theme/ant-nebula.nix index 3e7a31902cc20e..a3def551252297 100644 --- a/pkgs/data/themes/ant-theme/ant-nebula.nix +++ b/pkgs/data/themes/ant-theme/ant-nebula.nix @@ -29,11 +29,11 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = { description = "Nebula variant of the Ant theme"; homepage = "https://github.com/EliverLara/${themeName}"; - license = licenses.gpl3; - platforms = platforms.all; - maintainers = with maintainers; [ alexarice ]; + license = lib.licenses.gpl3; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.alexarice ]; }; } diff --git a/pkgs/data/themes/ant-theme/ant.nix b/pkgs/data/themes/ant-theme/ant.nix index e6bc0f848681b8..70faef591c054c 100644 --- a/pkgs/data/themes/ant-theme/ant.nix +++ b/pkgs/data/themes/ant-theme/ant.nix @@ -29,11 +29,11 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = { description = "Flat and light theme with a modern look"; homepage = "https://github.com/EliverLara/${themeName}"; - license = licenses.gpl3; - platforms = platforms.all; - maintainers = with maintainers; [ alexarice ]; + license = lib.licenses.gpl3; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.alexarice ]; }; } diff --git a/pkgs/data/themes/breath-theme/default.nix b/pkgs/data/themes/breath-theme/default.nix index 1c320651509940..4b8d2502112b1c 100644 --- a/pkgs/data/themes/breath-theme/default.nix +++ b/pkgs/data/themes/breath-theme/default.nix @@ -38,11 +38,11 @@ stdenv.mkDerivation { "-DBUILD_SDDM_THEME=ON" ]; - meta = with lib; { + meta = { description = "Manjaro KDE default theme"; homepage = "https://gitlab.manjaro.org/artwork/themes/breath"; - license = licenses.cc-by-sa-40; - maintainers = with maintainers; [ huantian ]; - platforms = platforms.linux; + license = lib.licenses.cc-by-sa-40; + maintainers = [ lib.maintainers.huantian ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/data/themes/chili-sddm/default.nix b/pkgs/data/themes/chili-sddm/default.nix index cb6939b3d3e4d9..e6eafc09a52639 100644 --- a/pkgs/data/themes/chili-sddm/default.nix +++ b/pkgs/data/themes/chili-sddm/default.nix @@ -48,9 +48,10 @@ stdenv.mkDerivation { echo ${qtgraphicaleffects} >> $out/nix-support/propagated-user-env-packages ''; - meta = with lib; { - license = licenses.gpl3; - maintainers = with lib.maintainers; [ sents ]; + + meta = { + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.sents ]; homepage = "https://github.com/MarianArlt/sddm-chili"; description = "Chili login theme for SDDM"; longDescription = '' diff --git a/pkgs/data/themes/colloid-kde/default.nix b/pkgs/data/themes/colloid-kde/default.nix index ef620f4e327098..e3d9f4fe1c03c7 100644 --- a/pkgs/data/themes/colloid-kde/default.nix +++ b/pkgs/data/themes/colloid-kde/default.nix @@ -67,11 +67,11 @@ stdenvNoCC.mkDerivation rec { passthru.updateScript = gitUpdater { }; - meta = with lib; { + meta = { description = "Clean and concise theme for KDE Plasma desktop"; homepage = "https://github.com/vinceliuice/Colloid-kde-theme"; - license = licenses.gpl3Only; - platforms = platforms.all; - maintainers = [ maintainers.romildo ]; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.romildo ]; }; } diff --git a/pkgs/data/themes/elegant-sddm/default.nix b/pkgs/data/themes/elegant-sddm/default.nix index c4d297884194ff..1a5059dd786fb7 100644 --- a/pkgs/data/themes/elegant-sddm/default.nix +++ b/pkgs/data/themes/elegant-sddm/default.nix @@ -59,10 +59,10 @@ stdenvNoCC.mkDerivation { echo ${qtgraphicaleffects} >> $out/nix-support/propagated-user-env-packages ''; - meta = with lib; { + meta = { description = "Sleek and stylish SDDM theme crafted in QML"; homepage = "https://github.com/surajmandalcell/Elegant-sddm"; - license = licenses.gpl3; - maintainers = with maintainers; [ GaetanLepage ]; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.GaetanLepage ]; }; } diff --git a/pkgs/data/themes/graphite-kde-theme/default.nix b/pkgs/data/themes/graphite-kde-theme/default.nix index 7d1d548f9031b4..8f03b54549b22b 100644 --- a/pkgs/data/themes/graphite-kde-theme/default.nix +++ b/pkgs/data/themes/graphite-kde-theme/default.nix @@ -51,11 +51,11 @@ stdenv.mkDerivation rec { passthru.updateScript = gitUpdater { }; - meta = with lib; { + meta = { description = "Flat Design theme for KDE Plasma desktop"; homepage = "https://github.com/vinceliuice/Graphite-kde-theme"; - license = licenses.gpl3Only; - platforms = platforms.all; - maintainers = [ maintainers.romildo ]; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.romildo ]; }; } diff --git a/pkgs/data/themes/gtk-theme-framework/default.nix b/pkgs/data/themes/gtk-theme-framework/default.nix index 1ae655fe8c3723..0becb6e5a1511c 100644 --- a/pkgs/data/themes/gtk-theme-framework/default.nix +++ b/pkgs/data/themes/gtk-theme-framework/default.nix @@ -33,9 +33,9 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = { homepage = "https://github.com/jaxwilko/gtk-theme-framework"; - license = licenses.gpl3Only; + license = lib.licenses.gpl3Only; maintainers = [ ]; }; } diff --git a/pkgs/data/themes/kde2/default.nix b/pkgs/data/themes/kde2/default.nix index 4eab649978119c..8d33a05d0560ea 100644 --- a/pkgs/data/themes/kde2/default.nix +++ b/pkgs/data/themes/kde2/default.nix @@ -36,11 +36,11 @@ mkDerivation rec { kdecoration ]; - meta = with lib; { + meta = { description = "KDE 2 window decoration ported to Plasma 5"; homepage = "https://github.com/repos-holder/kdecoration2-kde2"; - license = licenses.bsd2; - platforms = platforms.linux; + license = lib.licenses.bsd2; + platforms = lib.platforms.linux; maintainers = [ ]; }; } diff --git a/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix b/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix index 2fa58b4dfb1e5a..b976ca3492baec 100644 --- a/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix +++ b/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix @@ -36,10 +36,10 @@ stdenv.mkDerivation rec { qtbase ]; - meta = with lib; { + meta = { description = "Rounds the corners of your windows"; homepage = "https://github.com/matinlotfali/KDE-Rounded-Corners"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ devusb ]; + license = lib.licenses.gpl3Only; + maintainers = [ lib.maintainers.devusb ]; }; } diff --git a/pkgs/data/themes/kwin-decorations/sierra-breeze-enhanced/default.nix b/pkgs/data/themes/kwin-decorations/sierra-breeze-enhanced/default.nix index 4eaaabd1954c2c..4f4b807b2b103b 100644 --- a/pkgs/data/themes/kwin-decorations/sierra-breeze-enhanced/default.nix +++ b/pkgs/data/themes/kwin-decorations/sierra-breeze-enhanced/default.nix @@ -39,11 +39,11 @@ stdenv.mkDerivation rec { "-DKDE_INSTALL_USE_QT_SYS_PATHS=ON" ]; - meta = with lib; { + meta = { description = "OSX-like window decoration for KDE Plasma written in C++"; homepage = "https://github.com/kupiqu/SierraBreezeEnhanced"; changelog = "https://github.com/kupiqu/SierraBreezeEnhanced/releases/tag/V${version}"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ A1ca7raz ]; + license = lib.licenses.gpl3Only; + maintainers = [ lib.maintainers.A1ca7raz ]; }; } diff --git a/pkgs/data/themes/layan-kde/default.nix b/pkgs/data/themes/layan-kde/default.nix index 2f08b5ccdcaa98..d2df62531ce46f 100644 --- a/pkgs/data/themes/layan-kde/default.nix +++ b/pkgs/data/themes/layan-kde/default.nix @@ -51,11 +51,11 @@ stdenv.mkDerivation rec { passthru.updateScript = gitUpdater { }; - meta = with lib; { + meta = { description = "Flat Design theme for KDE Plasma desktop"; homepage = "https://github.com/vinceliuice/Layan-kde"; - license = licenses.gpl3Only; - platforms = platforms.all; - maintainers = [ maintainers.romildo ]; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.romildo ]; }; } diff --git a/pkgs/data/themes/lightly-boehs/default.nix b/pkgs/data/themes/lightly-boehs/default.nix index 521736858752e1..c82e27ef184f22 100644 --- a/pkgs/data/themes/lightly-boehs/default.nix +++ b/pkgs/data/themes/lightly-boehs/default.nix @@ -10,7 +10,7 @@ qt5, }: -mkDerivation rec { +mkDerivation { pname = "lightly-boehs"; version = "0.4.1"; @@ -33,12 +33,12 @@ mkDerivation rec { extra-cmake-modules ]; - meta = with lib; { + meta = { description = "Fork of the Lightly breeze theme style that aims to be visually modern and minimalistic"; mainProgram = "lightly-settings5"; homepage = "https://github.com/boehs/Lightly"; - license = licenses.gpl2Plus; - maintainers = [ maintainers.hikari ]; - platforms = platforms.all; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.hikari ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/data/themes/lightly-qt/default.nix b/pkgs/data/themes/lightly-qt/default.nix index 6b6729c9cbb758..cd494ae40eefd7 100644 --- a/pkgs/data/themes/lightly-qt/default.nix +++ b/pkgs/data/themes/lightly-qt/default.nix @@ -33,12 +33,12 @@ mkDerivation rec { extra-cmake-modules ]; - meta = with lib; { + meta = { description = "Fork of breeze theme style that aims to be visually modern and minimalistic"; mainProgram = "lightly-settings5"; homepage = "https://github.com/Luwx/Lightly"; - license = licenses.gpl2Plus; - maintainers = [ maintainers.pwoelfel ]; - platforms = platforms.all; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.pwoelfel ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/data/themes/material-kwin-decoration/default.nix b/pkgs/data/themes/material-kwin-decoration/default.nix index a32eb8766e46a7..945081062b7919 100644 --- a/pkgs/data/themes/material-kwin-decoration/default.nix +++ b/pkgs/data/themes/material-kwin-decoration/default.nix @@ -16,7 +16,7 @@ unstableGitUpdater, }: -mkDerivation rec { +mkDerivation { pname = "material-kwin-decoration"; version = "7-unstable-2023-01-15"; @@ -56,10 +56,10 @@ mkDerivation rec { }; }; - meta = with lib; { + meta = { description = "Material-ish window decoration theme for KWin"; homepage = "https://github.com/Zren/material-decoration"; - license = licenses.gpl2; - maintainers = with maintainers; [ nickcao ]; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.nickcao ]; }; } diff --git a/pkgs/data/themes/plata/default.nix b/pkgs/data/themes/plata/default.nix index cdcd080e165701..aedc371505958f 100644 --- a/pkgs/data/themes/plata/default.nix +++ b/pkgs/data/themes/plata/default.nix @@ -97,14 +97,14 @@ stdenv.mkDerivation rec { done ''; - meta = with lib; { + meta = { description = "GTK theme based on Material Design Refresh"; homepage = "https://gitlab.com/tista500/plata-theme"; - license = with licenses; [ + license = with lib.licenses; [ gpl2 cc-by-sa-40 ]; - platforms = platforms.linux; - maintainers = [ maintainers.tadfisher ]; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.tadfisher ]; }; } diff --git a/pkgs/data/themes/qtcurve/default.nix b/pkgs/data/themes/qtcurve/default.nix index dd2aaeed7d35ef..54d386f1fc470e 100644 --- a/pkgs/data/themes/qtcurve/default.nix +++ b/pkgs/data/themes/qtcurve/default.nix @@ -96,11 +96,11 @@ mkDerivation rec { "-DENABLE_QT4=OFF" ]; - meta = with lib; { + meta = { homepage = "https://github.com/QtCurve/qtcurve"; description = "Widget styles for Qt5/Plasma 5 and gtk2"; - platforms = platforms.linux; - license = licenses.lgpl21Plus; + platforms = lib.platforms.linux; + license = lib.licenses.lgpl21Plus; maintainers = [ ]; }; } diff --git a/pkgs/data/themes/utterly-nord-plasma/default.nix b/pkgs/data/themes/utterly-nord-plasma/default.nix index b181ca18c56633..86d7271ed76828 100644 --- a/pkgs/data/themes/utterly-nord-plasma/default.nix +++ b/pkgs/data/themes/utterly-nord-plasma/default.nix @@ -54,11 +54,11 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = { description = "Plasma theme with Nordic Colors, transparency, blur and round edges for UI elements"; homepage = "https://himdek.com/Utterly-Nord-Plasma/"; - license = licenses.gpl2Plus; - platforms = platforms.all; - maintainers = [ maintainers.romildo ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.romildo ]; }; } diff --git a/pkgs/games/0ad/data.nix b/pkgs/games/0ad/data.nix index 9165b107be4dd9..a781be9cfe2d89 100644 --- a/pkgs/games/0ad/data.nix +++ b/pkgs/games/0ad/data.nix @@ -20,12 +20,12 @@ stdenv.mkDerivation rec { cp -r binaries/data $out/share/0ad/ ''; - meta = with lib; { + meta = { description = "Free, open-source game of ancient warfare -- data files"; homepage = "https://play0ad.com/"; - license = licenses.cc-by-sa-30; - maintainers = with maintainers; [ chvp ]; - platforms = platforms.linux; + license = lib.licenses.cc-by-sa-30; + maintainers = [ lib.maintainers.chvp ]; + platforms = lib.platforms.linux; hydraPlatforms = [ ]; }; } diff --git a/pkgs/games/0ad/game.nix b/pkgs/games/0ad/game.nix index 7f41d04321a8d4..18564d77e113e2 100644 --- a/pkgs/games/0ad/game.nix +++ b/pkgs/games/0ad/game.nix @@ -179,18 +179,18 @@ stdenv.mkDerivation rec { install -D build/resources/0ad.desktop $out/share/applications/0ad.desktop ''; - meta = with lib; { + meta = { description = "Free, open-source game of ancient warfare"; homepage = "https://play0ad.com/"; - license = with licenses; [ + license = with lib.licenses; [ gpl2Plus lgpl21 mit cc-by-sa-30 - licenses.zlib # otherwise masked by pkgs.zlib + lib.licenses.zlib # otherwise masked by pkgs.zlib ]; - maintainers = with maintainers; [ chvp ]; - platforms = subtractLists platforms.i686 platforms.linux; + maintainers = [ lib.maintainers.chvp ]; + platforms = lib.subtractLists lib.platforms.i686 lib.platforms.linux; mainProgram = "0ad"; }; } diff --git a/pkgs/games/90secondportraits/default.nix b/pkgs/games/90secondportraits/default.nix index 3d0f95f304a8b1..a627bec5f8fab5 100644 --- a/pkgs/games/90secondportraits/default.nix +++ b/pkgs/games/90secondportraits/default.nix @@ -53,12 +53,12 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = { description = "Silly speed painting game"; mainProgram = "90secondportraits"; - maintainers = with maintainers; [ leenaars ]; - platforms = platforms.linux; - license = with licenses; [ + maintainers = [ lib.maintainers.leenaars ]; + platforms = lib.platforms.linux; + license = with lib.licenses; [ zlib cc-by-sa-40 cc-by-sa-30 # vendored diff --git a/pkgs/games/amoeba/data.nix b/pkgs/games/amoeba/data.nix index fcffe73b1d628e..321d484e264cbc 100644 --- a/pkgs/games/amoeba/data.nix +++ b/pkgs/games/amoeba/data.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { cp demo.dat $out/share/amoeba/ ''; - meta = with lib; { + meta = { description = "Fast-paced, polished OpenGL demonstration by Excess (data files)"; homepage = "https://packages.qa.debian.org/a/amoeba-data.html"; - license = licenses.unfree; - maintainers = [ maintainers.dezgeg ]; - platforms = platforms.all; + license = lib.licenses.unfree; + maintainers = [ lib.maintainers.dezgeg ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/games/amoeba/default.nix b/pkgs/games/amoeba/default.nix index 274e91ba33dcbf..20bd7f37f64f7b 100644 --- a/pkgs/games/amoeba/default.nix +++ b/pkgs/games/amoeba/default.nix @@ -60,11 +60,11 @@ stdenv.mkDerivation rec { installManPage ../debian/amoeba.1 ''; - meta = with lib; { + meta = { description = "Fast-paced, polished OpenGL demonstration by Excess"; homepage = "https://packages.qa.debian.org/a/amoeba.html"; - license = licenses.gpl2Only; # Engine is GPLv2, data files in amoeba-data nonfree - maintainers = [ maintainers.dezgeg ]; - platforms = platforms.linux; + license = lib.licenses.gpl2Only; # Engine is GPLv2, data files in amoeba-data nonfree + maintainers = [ lib.maintainers.dezgeg ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/games/anki/bin.nix b/pkgs/games/anki/bin.nix index 11c03ec3bebe92..a5e00089f53e59 100644 --- a/pkgs/games/anki/bin.nix +++ b/pkgs/games/anki/bin.nix @@ -54,7 +54,7 @@ let ''; }; - meta = with lib; { + meta = { inherit (anki.meta) license homepage @@ -67,7 +67,7 @@ let "x86_64-darwin" "aarch64-darwin" ]; - maintainers = with maintainers; [ mahmoudk1000 ]; + maintainers = [ lib.maintainers.mahmoudk1000 ]; }; passthru = { diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index 76033e6fdec7f5..fadc702dffc4fc 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -312,7 +312,7 @@ python3.pkgs.buildPythonApplication { tests.anki-sync-server = nixosTests.anki-sync-server; }; - meta = with lib; { + meta = { description = "Spaced repetition flashcard program"; mainProgram = "anki"; longDescription = '' @@ -328,9 +328,9 @@ python3.pkgs.buildPythonApplication { or even practicing guitar chords! ''; homepage = "https://apps.ankiweb.net"; - license = licenses.agpl3Plus; + license = lib.licenses.agpl3Plus; inherit (mesa.meta) platforms; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ euank oxij ]; diff --git a/pkgs/games/armagetronad/default.nix b/pkgs/games/armagetronad/default.nix index 5bab46e5b7c34e..ce4ece16ab1f88 100644 --- a/pkgs/games/armagetronad/default.nix +++ b/pkgs/games/armagetronad/default.nix @@ -236,13 +236,13 @@ let tests.armagetronad = nixosTests.armagetronad; }; - meta = with lib; { + meta = { inherit mainProgram; homepage = "https://www.armagetronad.org"; description = "Multiplayer networked arcade racing game in 3D similar to Tron"; - maintainers = with maintainers; [ numinit ]; - license = licenses.gpl2Plus; - platforms = platforms.linux; + maintainers = [ lib.maintainers.numinit ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; }; }; in diff --git a/pkgs/games/asc/default.nix b/pkgs/games/asc/default.nix index fb74dada582f79..1b525c031a14b1 100644 --- a/pkgs/games/asc/default.nix +++ b/pkgs/games/asc/default.nix @@ -28,7 +28,7 @@ libogg, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "asc"; version = "2.6.3.0"; @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { libsigcxx ]; - meta = with lib; { + meta = { description = "Turn based strategy game"; longDescription = '' @@ -78,9 +78,9 @@ stdenv.mkDerivation rec { homepage = "https://www.asc-hq.org/"; - license = licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; - maintainers = with maintainers; [ raskin ]; - platforms = platforms.linux; + maintainers = [ lib.maintainers.raskin ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/games/black-hole-solver/default.nix b/pkgs/games/black-hole-solver/default.nix index dc9e1c7e967201..15ba45b44228fa 100644 --- a/pkgs/games/black-hole-solver/default.nix +++ b/pkgs/games/black-hole-solver/default.nix @@ -35,10 +35,10 @@ stdenv.mkDerivation rec { patchShebangs ./scripts ''; - meta = with lib; { + meta = { description = "Solver for Solitaire variants Golf, Black Hole, and All in a Row"; mainProgram = "black-hole-solve"; homepage = "https://www.shlomifish.org/open-source/projects/black-hole-solitaire-solver/"; - license = licenses.mit; + license = lib.licenses.mit; }; } diff --git a/pkgs/games/blightmud/default.nix b/pkgs/games/blightmud/default.nix index c152ed040a4ec8..9ef9f121dc25ad 100644 --- a/pkgs/games/blightmud/default.nix +++ b/pkgs/games/blightmud/default.nix @@ -75,7 +75,7 @@ rustPlatform.buildRustPackage rec { in builtins.concatStringsSep " " (builtins.map skipFlag skipList); - meta = with lib; { + meta = { description = "Terminal MUD client written in Rust"; mainProgram = "blightmud"; longDescription = '' @@ -88,8 +88,8 @@ rustPlatform.buildRustPackage rec { friendly mode. ''; homepage = "https://github.com/Blightmud/Blightmud"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ cpu ]; - platforms = platforms.linux ++ platforms.darwin; + license = lib.licenses.gpl3Plus; + maintainers = [ lib.maintainers.cpu ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/games/bugdom/default.nix b/pkgs/games/bugdom/default.nix index 76cf666873dff1..5a222b8757be43 100644 --- a/pkgs/games/bugdom/default.nix +++ b/pkgs/games/bugdom/default.nix @@ -79,12 +79,12 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = { description = "Port of Bugdom, a 1999 Macintosh game by Pangea Software, for modern operating systems"; homepage = "https://github.com/jorio/Bugdom"; - license = with licenses; [ cc-by-sa-40 ]; - maintainers = with maintainers; [ lux ]; + license = [ lib.licenses.cc-by-sa-40 ]; + maintainers = [ lib.maintainers.lux ]; mainProgram = "Bugdom"; - platforms = platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/games/bzflag/default.nix b/pkgs/games/bzflag/default.nix index b2036bb6d0db0d..bb5148156743fe 100644 --- a/pkgs/games/bzflag/default.nix +++ b/pkgs/games/bzflag/default.nix @@ -39,11 +39,11 @@ stdenv.mkDerivation rec { CoreServices ]; - meta = with lib; { + meta = { description = "Multiplayer 3D Tank game"; homepage = "https://bzflag.org/"; - license = licenses.lgpl21Plus; - platforms = platforms.unix; + license = lib.licenses.lgpl21Plus; + platforms = lib.platforms.unix; maintainers = [ ]; }; } diff --git a/pkgs/games/cataclysm-dda/common.nix b/pkgs/games/cataclysm-dda/common.nix index 268f5d5256d28b..3c87c2946108c1 100644 --- a/pkgs/games/cataclysm-dda/common.nix +++ b/pkgs/games/cataclysm-dda/common.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation { isCurses = !tiles; }; - meta = with lib; { + meta = { description = "Free, post apocalyptic, zombie infested rogue-like"; mainProgram = "cataclysm-tiles"; longDescription = '' @@ -97,8 +97,8 @@ stdenv.mkDerivation { than their original form. ''; homepage = "https://cataclysmdda.org/"; - license = licenses.cc-by-sa-30; - maintainers = with maintainers; [ mnacamura DeeUnderscore ]; - platforms = platforms.unix; + license = lib.licenses.cc-by-sa-30; + maintainers = with lib.maintainers; [ mnacamura DeeUnderscore ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/games/cataclysm-dda/pkgs/tilesets/UndeadPeople/default.nix b/pkgs/games/cataclysm-dda/pkgs/tilesets/UndeadPeople/default.nix index 30c2793f6a8fd0..e0a88d84711604 100644 --- a/pkgs/games/cataclysm-dda/pkgs/tilesets/UndeadPeople/default.nix +++ b/pkgs/games/cataclysm-dda/pkgs/tilesets/UndeadPeople/default.nix @@ -17,11 +17,11 @@ buildTileSet { modRoot = "MSX++UnDeadPeopleEdition"; - meta = with lib; { + meta = { description = "Cataclysm DDA tileset based on MSX++ tileset"; homepage = "https://github.com/jmz-b/UndeadPeopleTileset"; - license = licenses.unfree; - maintainers = with maintainers; [ mnacamura ]; - platforms = platforms.all; + license = lib.licenses.unfree; + maintainers = [ lib.maintainers.mnacamura ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/games/chessx/default.nix b/pkgs/games/chessx/default.nix index e76cccc6853285..09279e599b9dd7 100644 --- a/pkgs/games/chessx/default.nix +++ b/pkgs/games/chessx/default.nix @@ -63,12 +63,12 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - meta = with lib; { + meta = { homepage = "https://chessx.sourceforge.io/"; description = "Browse and analyse chess games"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ luispedro ]; - platforms = platforms.linux; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.luispedro ]; + platforms = lib.platforms.linux; mainProgram = "chessx"; }; }) diff --git a/pkgs/games/chiaki-ng/default.nix b/pkgs/games/chiaki-ng/default.nix index 28520c26d4fed6..7879df40313028 100644 --- a/pkgs/games/chiaki-ng/default.nix +++ b/pkgs/games/chiaki-ng/default.nix @@ -112,16 +112,16 @@ stdenv.mkDerivation rec { wrapPythonPrograms ''; - meta = with lib; { + meta = { homepage = "https://streetpea.github.io/chiaki-ng/"; description = "Next-Generation of Chiaki (the open-source remote play client for PlayStation)"; # Includes OpenSSL linking exception that we currently have no way # to represent. # # See also: - license = licenses.agpl3Only; - maintainers = with maintainers; [ devusb ]; - platforms = platforms.linux; + license = lib.licenses.agpl3Only; + maintainers = [ lib.maintainers.devusb ]; + platforms = lib.platforms.linux; mainProgram = "chiaki"; }; } diff --git a/pkgs/games/chiaki/default.nix b/pkgs/games/chiaki/default.nix index 2c9f319029e42a..ef0d78bae469ab 100644 --- a/pkgs/games/chiaki/default.nix +++ b/pkgs/games/chiaki/default.nix @@ -60,12 +60,12 @@ mkDerivation rec { installCheckPhase = "$out/bin/chiaki --help"; - meta = with lib; { + meta = { homepage = "https://git.sr.ht/~thestr4ng3r/chiaki"; description = "Free and Open Source PlayStation Remote Play Client"; - license = licenses.agpl3Only; + license = lib.licenses.agpl3Only; maintainers = [ ]; - platforms = platforms.all; + platforms = lib.platforms.all; mainProgram = "chiaki"; }; } diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix index 81e8f826e509dc..3d1889600578f8 100644 --- a/pkgs/games/crawl/default.nix +++ b/pkgs/games/crawl/default.nix @@ -131,7 +131,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with lib; { + meta = { description = "Open-source, single-player, role-playing roguelike game"; homepage = "http://crawl.develz.org/"; longDescription = '' @@ -140,15 +140,15 @@ stdenv.mkDerivation rec { with dangerous and unfriendly monsters in a quest to rescue the mystifyingly fabulous Orb of Zot. ''; - platforms = platforms.linux ++ platforms.darwin; - license = with licenses; [ + platforms = lib.platforms.linux ++ lib.platforms.darwin; + license = with lib.licenses; [ gpl2Plus bsd2 bsd3 mit - licenses.zlib + lib.licenses.zlib cc0 ]; - maintainers = [ maintainers.abbradar ]; + maintainers = [ lib.maintainers.abbradar ]; }; } diff --git a/pkgs/games/crossfire/crossfire-arch.nix b/pkgs/games/crossfire/crossfire-arch.nix index cb21856eab9f8b..907f8f7c14f11d 100644 --- a/pkgs/games/crossfire/crossfire-arch.nix +++ b/pkgs/games/crossfire/crossfire-arch.nix @@ -22,12 +22,12 @@ stdenv.mkDerivation rec { cp -a . "$out/" ''; - meta = with lib; { + meta = { description = "Archetype data for the Crossfire free MMORPG"; homepage = "http://crossfire.real-time.com/"; - license = licenses.gpl2Plus; - platforms = platforms.linux; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; hydraPlatforms = [ ]; - maintainers = with maintainers; [ ToxicFrog ]; + maintainers = [ lib.maintainers.ToxicFrog ]; }; } diff --git a/pkgs/games/crossfire/crossfire-client.nix b/pkgs/games/crossfire/crossfire-client.nix index 99c3ae355af6f5..10b96bb60710ce 100644 --- a/pkgs/games/crossfire/crossfire-client.nix +++ b/pkgs/games/crossfire/crossfire-client.nix @@ -25,7 +25,7 @@ sha256, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "crossfire-client"; version = rev; @@ -60,12 +60,12 @@ stdenv.mkDerivation rec { ]; hardeningDisable = [ "format" ]; - meta = with lib; { + meta = { description = "GTKv2 client for the Crossfire free MMORPG"; mainProgram = "crossfire-client-gtk2"; homepage = "http://crossfire.real-time.com/"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ ToxicFrog ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.ToxicFrog ]; }; } diff --git a/pkgs/games/crossfire/crossfire-maps.nix b/pkgs/games/crossfire/crossfire-maps.nix index 7740452d054d5c..5332d87410bd91 100644 --- a/pkgs/games/crossfire/crossfire-maps.nix +++ b/pkgs/games/crossfire/crossfire-maps.nix @@ -7,7 +7,7 @@ sha256, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "crossfire-maps"; version = rev; @@ -22,12 +22,12 @@ stdenv.mkDerivation rec { cp -a . "$out/" ''; - meta = with lib; { + meta = { description = "Map data for the Crossfire free MMORPG"; homepage = "http://crossfire.real-time.com/"; - license = licenses.gpl2Plus; - platforms = platforms.linux; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; hydraPlatforms = [ ]; - maintainers = with maintainers; [ ToxicFrog ]; + maintainers = [ lib.maintainers.ToxicFrog ]; }; } diff --git a/pkgs/games/crossfire/crossfire-server.nix b/pkgs/games/crossfire/crossfire-server.nix index a22eb9dc11936d..b2c54c51b022c4 100644 --- a/pkgs/games/crossfire/crossfire-server.nix +++ b/pkgs/games/crossfire/crossfire-server.nix @@ -17,7 +17,7 @@ arch, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "crossfire-server"; version = rev; @@ -55,11 +55,11 @@ stdenv.mkDerivation rec { ln -s ${maps} "$out/share/crossfire/maps" ''; - meta = with lib; { + meta = { description = "Server for the Crossfire free MMORPG"; homepage = "http://crossfire.real-time.com/"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ ToxicFrog ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.ToxicFrog ]; }; } diff --git a/pkgs/games/curseofwar/default.nix b/pkgs/games/curseofwar/default.nix index 0a74065cec930d..aec86e7089a645 100644 --- a/pkgs/games/curseofwar/default.nix +++ b/pkgs/games/curseofwar/default.nix @@ -28,11 +28,11 @@ stdenv.mkDerivation (finalAttrs: { "CC=${stdenv.cc.targetPrefix}cc" ]; - meta = with lib; { + meta = { description = "Fast-paced action strategy game"; homepage = "https://a-nikolaev.github.io/curseofwar/"; - license = licenses.gpl3; - maintainers = with maintainers; [ fgaz ]; - platforms = platforms.all; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.fgaz ]; + platforms = lib.platforms.all; }; }) diff --git a/pkgs/games/cutechess/default.nix b/pkgs/games/cutechess/default.nix index 05a75351e9e296..c3a0a74e6b9921 100644 --- a/pkgs/games/cutechess/default.nix +++ b/pkgs/games/cutechess/default.nix @@ -35,12 +35,12 @@ stdenv.mkDerivation (finalAttrs: { install -Dm444 $src/docs/cutechess-engines.json.5 -t $out/share/man/man5/ ''; - meta = with lib; { + meta = { description = "GUI, CLI, and library for playing chess"; homepage = "https://cutechess.com/"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ ]; - platforms = with platforms; (linux ++ windows); + license = lib.licenses.gpl3Plus; + maintainers = [ ]; + platforms = with lib.platforms; (linux ++ windows); mainProgram = "cutechess"; }; }) diff --git a/pkgs/games/cutemaze/default.nix b/pkgs/games/cutemaze/default.nix index f2f741934f25a4..fd948a02e2b3db 100644 --- a/pkgs/games/cutemaze/default.nix +++ b/pkgs/games/cutemaze/default.nix @@ -48,13 +48,13 @@ stdenv.mkDerivation rec { else null; - meta = with lib; { + meta = { changelog = "https://github.com/gottcode/cutemaze/blob/v${version}/ChangeLog"; description = "Simple, top-down game in which mazes are randomly generated"; mainProgram = "cutemaze"; homepage = "https://gottcode.org/cutemaze/"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ dotlambda ]; - platforms = platforms.unix; + license = lib.licenses.gpl3Plus; + maintainers = [ lib.maintainers.dotlambda ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/games/ddnet/default.nix b/pkgs/games/ddnet/default.nix index f69c15ecfa3fc6..728c497d456bf3 100644 --- a/pkgs/games/ddnet/default.nix +++ b/pkgs/games/ddnet/default.nix @@ -116,7 +116,7 @@ stdenv.mkDerivation rec { install_name_tool -change "$out/lib/libsteam_api.dylib" "$out/lib/ddnet/libsteam_api.dylib" "$out/bin/DDNet" ''; - meta = with lib; { + meta = { description = "Teeworlds modification with a unique cooperative gameplay"; longDescription = '' DDraceNetwork (DDNet) is an actively maintained version of DDRace, @@ -126,8 +126,8 @@ stdenv.mkDerivation rec { design your own maps, or run your own server. ''; homepage = "https://ddnet.org"; - license = licenses.asl20; - maintainers = with maintainers; [ + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ sirseruju lom ncfavier diff --git a/pkgs/games/deliantra/arch.nix b/pkgs/games/deliantra/arch.nix index 24fdaa82df487f..c5ec1c546f5cc3 100644 --- a/pkgs/games/deliantra/arch.nix +++ b/pkgs/games/deliantra/arch.nix @@ -20,14 +20,14 @@ stdenv.mkDerivation rec { ${deliantra-server}/bin/cfutil --install-arch . ''; - meta = with lib; { + meta = { description = "Archetype data for the Deliantra free MMORPG"; homepage = "http://www.deliantra.net/"; - license = with licenses; [ + license = with lib.licenses; [ gpl2Plus agpl3Plus ]; - platforms = platforms.linux; - maintainers = with maintainers; [ ToxicFrog ]; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.ToxicFrog ]; }; } diff --git a/pkgs/games/deliantra/data.nix b/pkgs/games/deliantra/data.nix index 7d16f4a3d91511..90acb5d18993c0 100644 --- a/pkgs/games/deliantra/data.nix +++ b/pkgs/games/deliantra/data.nix @@ -16,15 +16,15 @@ symlinkJoin rec { "${deliantra-server}/share/deliantra-server" ]; - meta = with lib; { + meta = { description = "Combined game data (maps + archetypes) for the Deliantra free MMORPG"; homepage = "http://www.deliantra.net/"; - license = with licenses; [ + license = with lib.licenses; [ gpl2Plus agpl3Plus ]; - platforms = platforms.linux; - maintainers = with maintainers; [ ToxicFrog ]; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ ToxicFrog ]; hydraPlatforms = [ ]; }; } diff --git a/pkgs/games/deliantra/maps.nix b/pkgs/games/deliantra/maps.nix index f630a1e50d3a7e..2d537bbf4db73b 100644 --- a/pkgs/games/deliantra/maps.nix +++ b/pkgs/games/deliantra/maps.nix @@ -20,14 +20,14 @@ stdenv.mkDerivation rec { ${deliantra-server}/bin/cfutil --install-maps . ''; - meta = with lib; { + meta = { description = "Map data for the Deliantra free MMORPG"; homepage = "http://www.deliantra.net/"; - license = with licenses; [ + license = with lib.licenses; [ gpl2Plus agpl3Plus ]; - platforms = platforms.linux; - maintainers = with maintainers; [ ToxicFrog ]; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.ToxicFrog ]; }; } diff --git a/pkgs/games/deliantra/server.nix b/pkgs/games/deliantra/server.nix index 9f92d99aad1ba0..90e69f3eb4726a 100644 --- a/pkgs/games/deliantra/server.nix +++ b/pkgs/games/deliantra/server.nix @@ -80,14 +80,14 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/deliantra-server --prefix PERL5LIB : $PERL5LIB ''; - meta = with lib; { + meta = { description = "Server for the Deliantra free MMORPG"; homepage = "http://www.deliantra.net/"; - license = with licenses; [ + license = with lib.licenses; [ gpl2Plus agpl3Plus ]; - platforms = platforms.linux; - maintainers = with maintainers; [ ToxicFrog ]; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.ToxicFrog ]; }; } diff --git a/pkgs/games/devilutionx/default.nix b/pkgs/games/devilutionx/default.nix index 87c6accaaad501..ffd765228ef307 100644 --- a/pkgs/games/devilutionx/default.nix +++ b/pkgs/games/devilutionx/default.nix @@ -132,16 +132,16 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = { homepage = "https://github.com/diasurgical/devilutionX"; description = "Diablo build for modern operating systems"; mainProgram = "devilutionx"; longDescription = "In order to play this game a copy of diabdat.mpq is required. Place a copy of diabdat.mpq in ~/.local/share/diasurgical/devilution before executing the game."; - license = licenses.sustainableUse; - maintainers = with maintainers; [ + license = lib.licenses.sustainableUse; + maintainers = with lib.maintainers; [ karolchmist aanderse ]; - platforms = platforms.linux ++ platforms.windows; + platforms = lib.platforms.linux ++ lib.platforms.windows; }; } diff --git a/pkgs/games/doom-ports/doomrunner/default.nix b/pkgs/games/doom-ports/doomrunner/default.nix index c61055e190aba9..8cec4b500616de 100644 --- a/pkgs/games/doom-ports/doomrunner/default.nix +++ b/pkgs/games/doom-ports/doomrunner/default.nix @@ -54,13 +54,13 @@ stdenv.mkDerivation (finalAttrs: { exec = "DoomRunner"; }; - meta = with lib; { + meta = { description = "Graphical launcher of ZDoom and derivatives"; mainProgram = "DoomRunner"; homepage = "https://github.com/Youda008/DoomRunner/"; changelog = "https://github.com/Youda008/DoomRunner/blob/${finalAttrs.src.rev}/changelog.txt"; - license = licenses.gpl3Only; - platforms = platforms.linux; - maintainers = with maintainers; [ keenanweaver ]; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.keenanweaver ]; }; }) diff --git a/pkgs/games/doom-ports/doomseeker/default.nix b/pkgs/games/doom-ports/doomseeker/default.nix index eb1b4dedce92a6..69e25c3c23b5cb 100644 --- a/pkgs/games/doom-ports/doomseeker/default.nix +++ b/pkgs/games/doom-ports/doomseeker/default.nix @@ -52,12 +52,12 @@ stdenv.mkDerivation { ln -s $out/lib/doomseeker/doomseeker $out/bin/ ''; - meta = with lib; { + meta = { homepage = "http://doomseeker.drdteam.org/"; description = "Multiplayer server browser for many Doom source ports"; mainProgram = "doomseeker"; - license = licenses.gpl2Plus; - platforms = platforms.unix; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; maintainers = [ ]; }; } diff --git a/pkgs/games/doom-ports/slade/default.nix b/pkgs/games/doom-ports/slade/default.nix index a388922e168aee..5a83c748a39cf9 100644 --- a/pkgs/games/doom-ports/slade/default.nix +++ b/pkgs/games/doom-ports/slade/default.nix @@ -62,11 +62,11 @@ stdenv.mkDerivation rec { ) ''; - meta = with lib; { + meta = { description = "Doom editor"; homepage = "http://slade.mancubus.net/"; - license = licenses.gpl2Only; # https://github.com/sirjuddington/SLADE/issues/1754 - platforms = platforms.linux; - maintainers = with maintainers; [ abbradar ]; + license = lib.licenses.gpl2Only; # https://github.com/sirjuddington/SLADE/issues/1754 + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.abbradar ]; }; } diff --git a/pkgs/games/doom-ports/slade/git.nix b/pkgs/games/doom-ports/slade/git.nix index c5abf8a04bb2f5..51cbb106d1b82c 100644 --- a/pkgs/games/doom-ports/slade/git.nix +++ b/pkgs/games/doom-ports/slade/git.nix @@ -67,11 +67,11 @@ stdenv.mkDerivation { url = "https://github.com/sirjuddington/SLADE.git"; }; - meta = with lib; { + meta = { description = "Doom editor"; homepage = "http://slade.mancubus.net/"; - license = licenses.gpl2Only; # https://github.com/sirjuddington/SLADE/issues/1754 - platforms = platforms.linux; - maintainers = with maintainers; [ ertes ]; + license = lib.licenses.gpl2Only; # https://github.com/sirjuddington/SLADE/issues/1754 + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.ertes ]; }; } diff --git a/pkgs/games/doom-ports/zandronum/alpha/default.nix b/pkgs/games/doom-ports/zandronum/alpha/default.nix index 0cacb54b2f2df1..c38fc3834e510a 100644 --- a/pkgs/games/doom-ports/zandronum/alpha/default.nix +++ b/pkgs/games/doom-ports/zandronum/alpha/default.nix @@ -118,11 +118,11 @@ stdenv.mkDerivation rec { inherit fmod sqlite; }; - meta = with lib; { + meta = { homepage = "https://zandronum.com/"; description = "Multiplayer oriented port, based off Skulltag, for Doom and Doom II by id Software"; - maintainers = with maintainers; [ lassulus ]; - license = licenses.sleepycat; - platforms = platforms.linux; + maintainers = [ lib.maintainers.lassulus ]; + license = lib.licenses.sleepycat; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/games/doom-ports/zandronum/default.nix b/pkgs/games/doom-ports/zandronum/default.nix index 9a39719d42db17..734125c1af5957 100644 --- a/pkgs/games/doom-ports/zandronum/default.nix +++ b/pkgs/games/doom-ports/zandronum/default.nix @@ -118,12 +118,12 @@ stdenv.mkDerivation rec { inherit fmod sqlite; }; - meta = with lib; { + meta = { homepage = "https://zandronum.com/"; description = "Multiplayer oriented port, based off Skulltag, for Doom and Doom II by id Software"; mainProgram = "zandronum-server"; - maintainers = with maintainers; [ lassulus ]; - license = licenses.sleepycat; - platforms = platforms.linux; + maintainers = [ lib.maintainers.lassulus ]; + license = lib.licenses.sleepycat; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/games/doom-ports/zandronum/fmod.nix b/pkgs/games/doom-ports/zandronum/fmod.nix index 030f20e084e495..36d0e24d9250db 100644 --- a/pkgs/games/doom-ports/zandronum/fmod.nix +++ b/pkgs/games/doom-ports/zandronum/fmod.nix @@ -54,15 +54,15 @@ stdenv.mkDerivation rec { cp -r api/inc $out/include ''; - meta = with lib; { + meta = { description = "Programming library and toolkit for the creation and playback of interactive audio"; homepage = "http://www.fmod.org/"; - license = licenses.unfreeRedistributable; + license = lib.licenses.unfreeRedistributable; platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; - maintainers = [ maintainers.lassulus ]; + maintainers = [ lib.maintainers.lassulus ]; }; } diff --git a/pkgs/games/doom-ports/zdoom/bcc-git.nix b/pkgs/games/doom-ports/zdoom/bcc-git.nix index 3c78b892970cc4..147c112c18f605 100644 --- a/pkgs/games/doom-ports/zdoom/bcc-git.nix +++ b/pkgs/games/doom-ports/zdoom/bcc-git.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation { cp -av lib $out/lib/bcc ''; - meta = with lib; { + meta = { description = "Compiler for Doom/Hexen scripts (ACS, BCS)"; mainProgram = "bcc"; homepage = "https://github.com/wormt/bcc"; - license = licenses.mit; - maintainers = with maintainers; [ ertes ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.ertes ]; }; } diff --git a/pkgs/games/doom-ports/zdoom/default.nix b/pkgs/games/doom-ports/zdoom/default.nix index d34f4498c5d6d8..043f43cae9c921 100644 --- a/pkgs/games/doom-ports/zdoom/default.nix +++ b/pkgs/games/doom-ports/zdoom/default.nix @@ -71,12 +71,12 @@ stdenv.mkDerivation rec { ln -s $out/lib/zdoom/zdoom $out/bin/zdoom ''; - meta = with lib; { + meta = { homepage = "http://zdoom.org/"; description = "Enhanced port of the official DOOM source code"; # Doom source license, MAME license - license = licenses.unfreeRedistributable; - platforms = platforms.linux; - maintainers = with maintainers; [ lassulus ]; + license = lib.licenses.unfreeRedistributable; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.lassulus ]; }; } diff --git a/pkgs/games/doom-ports/zdoom/zdbsp.nix b/pkgs/games/doom-ports/zdoom/zdbsp.nix index bef477e1fc1524..17e36344718fc8 100644 --- a/pkgs/games/doom-ports/zdoom/zdbsp.nix +++ b/pkgs/games/doom-ports/zdoom/zdbsp.nix @@ -28,15 +28,15 @@ stdenv.mkDerivation rec { install -Dm755 zdbsp $out/bin/zdbsp ''; - meta = with lib; { + meta = { homepage = "https://zdoom.org/wiki/ZDBSP"; description = "ZDoom's internal node builder for DOOM maps"; mainProgram = "zdbsp"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ lassulus siraben ]; - platforms = platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/games/duckmarines/default.nix b/pkgs/games/duckmarines/default.nix index 36fdccc01c5ab1..af246938b9724e 100644 --- a/pkgs/games/duckmarines/default.nix +++ b/pkgs/games/duckmarines/default.nix @@ -53,12 +53,12 @@ stdenv.mkDerivation rec { ln -s ${desktopItem}/share/applications/* $out/share/applications/ ''; - meta = with lib; { + meta = { description = "Duck-themed action puzzle video game"; - maintainers = with maintainers; [ leenaars ]; - platforms = platforms.linux; + maintainers = [ lib.maintainers.leenaars ]; + platforms = lib.platforms.linux; hydraPlatforms = [ ]; - license = licenses.free; + license = lib.licenses.free; downloadPage = "http://tangramgames.dk/games/duckmarines"; }; diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix index 1c3e05e92368d8..28e572628f4586 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix @@ -36,12 +36,12 @@ stdenv.mkDerivation rec { dontWrapQtApps = true; - meta = with lib; { + meta = { mainProgram = "dwarftherapist"; description = "Tool to manage dwarves in a running game of Dwarf Fortress"; - maintainers = with maintainers; [ abbradar bendlas numinit ]; - license = licenses.mit; - platforms = platforms.x86; + maintainers = with lib.maintainers; [ abbradar bendlas numinit ]; + license = lib.licenses.mit; + platforms = lib.platforms.x86; homepage = "https://github.com/Dwarf-Therapist/Dwarf-Therapist"; }; } diff --git a/pkgs/games/dwarf-fortress/legends-browser/default.nix b/pkgs/games/dwarf-fortress/legends-browser/default.nix index 3920c1f4693e99..f50fbdaac00db1 100644 --- a/pkgs/games/dwarf-fortress/legends-browser/default.nix +++ b/pkgs/games/dwarf-fortress/legends-browser/default.nix @@ -26,12 +26,12 @@ buildEnv { inherit name; paths = [ script ]; - meta = with lib; { + meta = { description = "Multi-platform, open source, java-based legends viewer for dwarf fortress"; - maintainers = with maintainers; [ Baughn ]; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = licenses.mit; - platforms = platforms.all; + maintainers = with lib.maintainers; [ Baughn ]; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; + license = lib.licenses.mit; + platforms = lib.platforms.all; homepage = "https://github.com/robertjanetzko/LegendsBrowser"; }; } diff --git a/pkgs/games/dxx-rebirth/assets.nix b/pkgs/games/dxx-rebirth/assets.nix index fb37b540068e6b..740ed4aed1ffa8 100644 --- a/pkgs/games/dxx-rebirth/assets.nix +++ b/pkgs/games/dxx-rebirth/assets.nix @@ -48,11 +48,11 @@ let runHook postInstall ''; - meta = with lib; { + meta = { description = "Descent ${toString ver} assets from GOG"; homepage = "https://www.dxx-rebirth.com/"; - license = licenses.unfree; - maintainers = with maintainers; [ peterhoeg ]; + license = lib.licenses.unfree; + maintainers = [ lib.maintainers.peterhoeg ]; hydraPlatforms = [ ]; }; }; diff --git a/pkgs/games/dxx-rebirth/default.nix b/pkgs/games/dxx-rebirth/default.nix index 4226c37bb6a951..43645c2fd1cf8d 100644 --- a/pkgs/games/dxx-rebirth/default.nix +++ b/pkgs/games/dxx-rebirth/default.nix @@ -22,7 +22,7 @@ let }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "dxx-rebirth"; version = "0.60.0-beta2-unstable-2024-12-07"; @@ -64,11 +64,11 @@ stdenv.mkDerivation rec { passthru.updateScript = unstableGitUpdater { }; - meta = with lib; { + meta = { description = "Source Port of the Descent 1 and 2 engines"; homepage = "https://www.dxx-rebirth.com/"; - license = licenses.gpl3; - maintainers = with maintainers; [ peterhoeg ]; - platforms = with platforms; linux; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.peterhoeg ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/games/dxx-rebirth/full.nix b/pkgs/games/dxx-rebirth/full.nix index 1bffa245449b2d..54d6e2ecc0395b 100644 --- a/pkgs/games/dxx-rebirth/full.nix +++ b/pkgs/games/dxx-rebirth/full.nix @@ -22,15 +22,15 @@ let --add-flags "-hogdir ${assets}/share/games/descent${toString ver}" ''; - meta = with lib; { + meta = { description = "Descent ${toString ver} using the DXX-Rebirth project engine and game assets from GOG"; homepage = "https://www.dxx-rebirth.com/"; - license = with licenses; [ + license = with lib.licenses; [ free unfree ]; - maintainers = with maintainers; [ peterhoeg ]; - platforms = with platforms; linux; + maintainers = [ lib.maintainers.peterhoeg ]; + platforms = lib.platforms.linux; hydraPlatforms = [ ]; }; }; diff --git a/pkgs/games/easyrpg-player/default.nix b/pkgs/games/easyrpg-player/default.nix index be92949cb91a6f..0ece96c42888fe 100644 --- a/pkgs/games/easyrpg-player/default.nix +++ b/pkgs/games/easyrpg-player/default.nix @@ -128,12 +128,12 @@ stdenv.mkDerivation rec { enableParallelChecking = true; - meta = with lib; { + meta = { description = "RPG Maker 2000/2003 and EasyRPG games interpreter"; homepage = "https://easyrpg.org/"; - license = licenses.gpl3; + license = lib.licenses.gpl3; maintainers = [ ]; - platforms = platforms.all; + platforms = lib.platforms.all; mainProgram = lib.optionalString stdenv.hostPlatform.isDarwin "EasyRPG Player"; }; } diff --git a/pkgs/games/exult/default.nix b/pkgs/games/exult/default.nix index 4f26dbed108a51..708bbeb7550635 100644 --- a/pkgs/games/exult/default.nix +++ b/pkgs/games/exult/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { makeFlags = [ "NIX_DESTDIR=$(out)" ]; # see postPatch configureFlags = lib.optional (!enableTools) "--disable-tools"; - meta = with lib; { + meta = { description = "Exult is a project to recreate Ultima VII for modern operating systems"; longDescription = '' Ultima VII, an RPG from the early 1990's, still has a huge following. But, @@ -72,8 +72,8 @@ stdenv.mkDerivation rec { possible. ''; homepage = "http://exult.info"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ azahi ]; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.azahi ]; mainProgram = "exult"; }; } diff --git a/pkgs/games/ferium/default.nix b/pkgs/games/ferium/default.nix index 1073764cbaeadb..1642b213228fc5 100644 --- a/pkgs/games/ferium/default.nix +++ b/pkgs/games/ferium/default.nix @@ -41,12 +41,12 @@ rustPlatform.buildRustPackage rec { done ''; - meta = with lib; { + meta = { description = "Fast and multi-source CLI program for managing Minecraft mods and modpacks from Modrinth, CurseForge, and GitHub Releases"; mainProgram = "ferium"; homepage = "https://github.com/gorilla-devs/ferium"; - license = licenses.mpl20; - maintainers = with maintainers; [ + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ leo60228 soupglasses ]; diff --git a/pkgs/games/flare/default.nix b/pkgs/games/flare/default.nix index 8dd6c435c1b575..f4fe3e9683e9c9 100644 --- a/pkgs/games/flare/default.nix +++ b/pkgs/games/flare/default.nix @@ -20,18 +20,18 @@ buildEnv { makeWrapper $out/games/flare $out/bin/flare --chdir "$out/share/games/flare" ''; - meta = with lib; { + meta = { description = "Fantasy action RPG using the FLARE engine"; mainProgram = "flare"; homepage = "https://flarerpg.org/"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ aanderse McSinyx ]; license = [ - licenses.gpl3 - licenses.cc-by-sa-30 + lib.licenses.gpl3 + lib.licenses.cc-by-sa-30 ]; - platforms = platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/games/flare/engine.nix b/pkgs/games/flare/engine.nix index 8d4069874bd6d4..69183ed5ce7538 100644 --- a/pkgs/games/flare/engine.nix +++ b/pkgs/games/flare/engine.nix @@ -31,14 +31,14 @@ stdenv.mkDerivation rec { SDL2_ttf ] ++ lib.optional stdenv.hostPlatform.isDarwin Cocoa; - meta = with lib; { + meta = { description = "Free/Libre Action Roleplaying Engine"; homepage = "https://github.com/flareteam/flare-engine"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ aanderse McSinyx ]; - license = [ licenses.gpl3 ]; - platforms = platforms.unix; + license = [ lib.licenses.gpl3 ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/games/flare/game.nix b/pkgs/games/flare/game.nix index 74dbcaaaae318e..a89c3b102ffe9a 100644 --- a/pkgs/games/flare/game.nix +++ b/pkgs/games/flare/game.nix @@ -18,14 +18,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with lib; { + meta = { description = "Fantasy action RPG using the FLARE engine"; homepage = "https://github.com/flareteam/flare-game"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ aanderse McSinyx ]; - license = [ licenses.cc-by-sa-30 ]; - platforms = platforms.unix; + license = [ lib.licenses.cc-by-sa-30 ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/games/flightgear/default.nix b/pkgs/games/flightgear/default.nix index ec9b9358b1559b..7d0cd14a8b4d6d 100644 --- a/pkgs/games/flightgear/default.nix +++ b/pkgs/games/flightgear/default.nix @@ -28,7 +28,6 @@ udev, fltk13, apr, - makeDesktopItem, qtbase, qtdeclarative, glew, @@ -104,12 +103,12 @@ stdenv.mkDerivation rec { "--set FG_ROOT ${data}/share/FlightGear" ]; - meta = with lib; { + meta = { description = "Flight simulator"; - maintainers = with maintainers; [ raskin ]; - platforms = platforms.linux; + maintainers = [ lib.maintainers.raskin ]; + platforms = lib.platforms.linux; hydraPlatforms = [ ]; # disabled from hydra because it's so big - license = licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; mainProgram = "fgfs"; }; } diff --git a/pkgs/games/fltrator/default.nix b/pkgs/games/fltrator/default.nix index d1a39f76a13090..63d80f7b34f2b0 100644 --- a/pkgs/games/fltrator/default.nix +++ b/pkgs/games/fltrator/default.nix @@ -49,16 +49,16 @@ stdenv.mkDerivation rec { cp rsc/fltrator-128.png $out/share/icons/hicolor/128x128/apps/fltrator2.png ''; - meta = with lib; { + meta = { description = "Simple retro style arcade side-scroller game"; longDescription = '' FLTrator is a simple retro style arcade side-scroller game in which you steer a spaceship through a landscape with hostile rockets and other obstacles. It has ten different levels and a level editor to create new levels or modify the existing. ''; # from https://libregamewiki.org/FLTrator homepage = "https://fltrator.sourceforge.net/"; - platforms = platforms.linux; - maintainers = [ maintainers.marius851000 ]; - license = licenses.gpl3; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.marius851000 ]; + license = lib.licenses.gpl3; }; } diff --git a/pkgs/games/fteqw/generic.nix b/pkgs/games/fteqw/generic.nix index 1c158602bf876f..21c89139260144 100644 --- a/pkgs/games/fteqw/generic.nix +++ b/pkgs/games/fteqw/generic.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation { runHook postInstall ''; - meta = with lib; { + meta = { inherit description; homepage = "https://fteqw.org"; longDescription = '' @@ -63,8 +63,8 @@ stdenv.mkDerivation { limits, vulkan and OpenGL renderers, a dedicated server, and fteqcc, for easier QuakeC development ''; - maintainers = with maintainers; [ necrophcodr ]; - license = licenses.gpl2Plus; - platforms = platforms.linux; + maintainers = [ lib.maintainers.necrophcodr ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/games/garden-of-coloured-lights/default.nix b/pkgs/games/garden-of-coloured-lights/default.nix index a26cea27961295..6525c74d26a973 100644 --- a/pkgs/games/garden-of-coloured-lights/default.nix +++ b/pkgs/games/garden-of-coloured-lights/default.nix @@ -33,12 +33,12 @@ stdenv.mkDerivation rec { # `eclass'; eclass.o:src/eclass.c:21: first defined here env.NIX_CFLAGS_COMPILE = "-fcommon"; - meta = with lib; { + meta = { description = "Old-school vertical shoot-em-up / bullet hell"; mainProgram = "garden"; homepage = "https://garden.sourceforge.net/drupal/"; maintainers = [ ]; - license = licenses.gpl3; + license = lib.licenses.gpl3; }; } diff --git a/pkgs/games/gcompris/default.nix b/pkgs/games/gcompris/default.nix index 15133bcf74d906..7efab45cbe4a91 100644 --- a/pkgs/games/gcompris/default.nix +++ b/pkgs/games/gcompris/default.nix @@ -63,12 +63,12 @@ stdenv.mkDerivation (finalAttrs: { # we need a graphical environment for the tests doCheck = false; - meta = with lib; { + meta = { description = "High quality educational software suite, including a large number of activities for children aged 2 to 10"; homepage = "https://gcompris.net/"; - license = licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; mainProgram = "gcompris-qt"; - maintainers = with maintainers; [ guibou ]; - platforms = platforms.linux; + maintainers = [ lib.maintainers.guibou ]; + platforms = lib.platforms.linux; }; }) diff --git a/pkgs/games/gl-gsync-demo/default.nix b/pkgs/games/gl-gsync-demo/default.nix index 9a7be5418c8aa7..542e0858f577c3 100644 --- a/pkgs/games/gl-gsync-demo/default.nix +++ b/pkgs/games/gl-gsync-demo/default.nix @@ -9,7 +9,7 @@ lib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gl-gsync-demo"; version = "unstable-2020-12-27"; @@ -36,10 +36,10 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with lib; { - license = with licenses; mit; - platforms = platforms.linux; - maintainers = with maintainers; [ atemu ]; + meta = { + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.atemu ]; description = "Very basic OpenGL demo for testing NVIDIA's G-SYNC technology on Linux"; mainProgram = "gl-gsync-demo"; longDescription = '' diff --git a/pkgs/games/gogdl/default.nix b/pkgs/games/gogdl/default.nix index 08161f7f3c1f87..ed322b3b22666d 100644 --- a/pkgs/games/gogdl/default.nix +++ b/pkgs/games/gogdl/default.nix @@ -30,12 +30,12 @@ buildPythonApplication rec { pythonImportsCheck = [ "gogdl" ]; - meta = with lib; { + meta = { description = "GOG Downloading module for Heroic Games Launcher"; mainProgram = "gogdl"; homepage = "https://github.com/Heroic-Games-Launcher/heroic-gogdl"; - license = with licenses; [ gpl3 ]; - maintainers = with maintainers; [ aidalgol ]; + license = [ lib.licenses.gpl3 ]; + maintainers = [ lib.maintainers.aidalgol ]; }; # Upstream no longer create git tags when bumping the version, so we have to diff --git a/pkgs/games/gscrabble/default.nix b/pkgs/games/gscrabble/default.nix index 95146c8f88048f..83f0326c46e388 100644 --- a/pkgs/games/gscrabble/default.nix +++ b/pkgs/games/gscrabble/default.nix @@ -48,15 +48,15 @@ buildPythonApplication { ) ''; - meta = with lib; { + meta = { # Fails to build, propably incompatible with latest Python # error: Multiple top-level packages discovered in a flat-layout # https://github.com/RaaH/gscrabble/issues/13 broken = true; description = "Golden Scrabble crossword puzzle game"; homepage = "https://github.com/RaaH/gscrabble/"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ onny ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.onny ]; }; } diff --git a/pkgs/games/gshogi/default.nix b/pkgs/games/gshogi/default.nix index 3fdd60a5fa2c40..518e9db7c5351e 100644 --- a/pkgs/games/gshogi/default.nix +++ b/pkgs/games/gshogi/default.nix @@ -40,12 +40,12 @@ python3.pkgs.buildPythonApplication rec { makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; - meta = with lib; { + meta = { homepage = "http://johncheetham.com/projects/gshogi/"; description = "Graphical implementation of the Shogi board game, also known as Japanese Chess"; mainProgram = "gshogi"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = [ maintainers.ciil ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.ciil ]; }; } diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix index f98183d8239d00..f69b6c11de41f4 100644 --- a/pkgs/games/hedgewars/default.nix +++ b/pkgs/games/hedgewars/default.nix @@ -110,10 +110,10 @@ stdenv.mkDerivation rec { }" ]; - meta = with lib; { + meta = { description = "Turn-based strategy artillery game similar to Worms"; homepage = "https://hedgewars.org/"; - license = licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; longDescription = '' Each player controls a team of several hedgehogs. During the course of the game, players take turns with one of their hedgehogs. They then use @@ -137,11 +137,11 @@ stdenv.mkDerivation rec { contact with explosions, to zero (the damage dealt to the attacked hedgehog or hedgehogs after a player's or CPU turn is shown only when all movement on the battlefield has ceased).''; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ kragniz fpletz ]; broken = stdenv.hostPlatform.isDarwin; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/games/heroic/default.nix b/pkgs/games/heroic/default.nix index db33d848568440..d25737c0b02df4 100644 --- a/pkgs/games/heroic/default.nix +++ b/pkgs/games/heroic/default.nix @@ -106,12 +106,12 @@ stdenv.mkDerivation (finalAttrs: { updateScript = nix-update-script { }; }; - meta = with lib; { + meta = { description = "Native GOG, Epic, and Amazon Games Launcher for Linux, Windows and Mac"; homepage = "https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher"; changelog = "https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher/releases"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ aidalgol ]; + license = lib.licenses.gpl3Only; + maintainers = [ lib.maintainers.aidalgol ]; # Heroic may work on nix-darwin, but it needs a dedicated maintainer for the platform. # It may also work on other Linux targets, but all the game stores only # support x86 Linux, so it would require extra hacking to run games via QEMU diff --git a/pkgs/games/instawow/default.nix b/pkgs/games/instawow/default.nix index b73cd91032eb25..9fcde16705e8f9 100644 --- a/pkgs/games/instawow/default.nix +++ b/pkgs/games/instawow/default.nix @@ -36,11 +36,11 @@ python3.pkgs.buildPythonApplication rec { yarl ] ++ plugins; - meta = with lib; { + meta = { homepage = "https://github.com/layday/instawow"; description = "World of Warcraft add-on manager CLI and GUI"; mainProgram = "instawow"; - license = licenses.gpl3; - maintainers = with maintainers; [ seirl ]; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.seirl ]; }; } diff --git a/pkgs/games/iortcw/sp.nix b/pkgs/games/iortcw/sp.nix index 92ee59c6891ccc..d887662188a052 100644 --- a/pkgs/games/iortcw/sp.nix +++ b/pkgs/games/iortcw/sp.nix @@ -59,11 +59,11 @@ stdenv.mkDerivation rec { done ''; - meta = with lib; { + meta = { description = "Single player version of game engine for Return to Castle Wolfenstein"; homepage = src.meta.homepage; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ rjpcasalino ]; + license = lib.licenses.gpl3; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.rjpcasalino ]; }; } diff --git a/pkgs/games/ldmud/default.nix b/pkgs/games/ldmud/default.nix index de92518781fe1f..3065af2cf34c56 100644 --- a/pkgs/games/ldmud/default.nix +++ b/pkgs/games/ldmud/default.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { cp -v ../COPYRIGHT $out/share/ ''; - meta = with lib; { + meta = { description = "Gamedriver for LPMuds including a LPC compiler, interpreter and runtime"; homepage = "https://ldmud.eu"; changelog = "https://github.com/ldmud/ldmud/blob/${version}/HISTORY"; @@ -95,8 +95,8 @@ stdenv.mkDerivation rec { a driver in its own right. ''; # See https://github.com/ldmud/ldmud/blob/master/COPYRIGHT - license = licenses.unfreeRedistributable; - platforms = with platforms; linux ++ darwin; - maintainers = with maintainers; [ cpu ]; + license = lib.licenses.unfreeRedistributable; + platforms = with lib.platforms; linux ++ darwin; + maintainers = [ lib.maintainers.cpu ]; }; } diff --git a/pkgs/games/leela-zero/default.nix b/pkgs/games/leela-zero/default.nix index da7c815fa0566b..2e434aedea3f43 100644 --- a/pkgs/games/leela-zero/default.nix +++ b/pkgs/games/leela-zero/default.nix @@ -34,14 +34,14 @@ stdenv.mkDerivation rec { dontWrapQtApps = true; - meta = with lib; { + meta = { description = "Go engine modeled after AlphaGo Zero"; homepage = "https://github.com/gcp/leela-zero"; - license = licenses.gpl3Plus; - maintainers = [ - maintainers.averelld - maintainers.omnipotententity + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ + averelld + omnipotententity ]; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/games/legendary-gl/default.nix b/pkgs/games/legendary-gl/default.nix index 7888c2111f5196..b94d2a73169132 100644 --- a/pkgs/games/legendary-gl/default.nix +++ b/pkgs/games/legendary-gl/default.nix @@ -8,7 +8,7 @@ filelock, }: -buildPythonApplication rec { +buildPythonApplication { pname = "legendary-gl"; # Name in pypi version = "0.20.34"; @@ -31,11 +31,11 @@ buildPythonApplication rec { pythonImportsCheck = [ "legendary" ]; - meta = with lib; { + meta = { description = "Free and open-source Epic Games Launcher alternative"; homepage = "https://github.com/derrod/legendary"; - license = licenses.gpl3; - maintainers = with maintainers; [ equirosa ]; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.equirosa ]; mainProgram = "legendary"; }; diff --git a/pkgs/games/libremines/default.nix b/pkgs/games/libremines/default.nix index b3b7cda9d4c60a..61500536733a79 100644 --- a/pkgs/games/libremines/default.nix +++ b/pkgs/games/libremines/default.nix @@ -34,15 +34,15 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DUSE_QT6=TRUE" ]; - meta = with lib; { + meta = { description = "Qt based Minesweeper game"; mainProgram = "libremines"; longDescription = '' A Free/Libre and Open Source Software Qt based Minesweeper game available for GNU/Linux, FreeBSD and Windows systems. ''; homepage = "https://bollos00.github.io/LibreMines"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ aleksana ]; - platforms = platforms.unix; + license = lib.licenses.gpl3Plus; + maintainers = [ lib.maintainers.aleksana ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/games/lincity/default.nix b/pkgs/games/lincity/default.nix index 9bfdc8e189c1ff..ed175dc0b886d7 100644 --- a/pkgs/games/lincity/default.nix +++ b/pkgs/games/lincity/default.nix @@ -48,10 +48,10 @@ stdenv.mkDerivation rec { # multiple definition of `monthgraph_style'; ldsvguts.o:/build/lincity-1.13.1/screen.h:23: first defined here env.NIX_CFLAGS_COMPILE = "-fcommon"; - meta = with lib; { + meta = { description = "City simulation game"; mainProgram = "xlincity"; - license = licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; homepage = "https://sourceforge.net/projects/lincity"; maintainers = [ ]; # ../lcintl.h:14:10: fatal error: 'libintl.h' file not found diff --git a/pkgs/games/lincity/ng.nix b/pkgs/games/lincity/ng.nix index 6ca8b8c6471599..7c6de9cba50402 100644 --- a/pkgs/games/lincity/ng.nix +++ b/pkgs/games/lincity/ng.nix @@ -76,11 +76,11 @@ stdenv.mkDerivation { runHook postInstall ''; - meta = with lib; { + meta = { description = "City building game"; mainProgram = "lincity-ng"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ raskin ]; - platforms = platforms.linux; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.raskin ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/games/linthesia/default.nix b/pkgs/games/linthesia/default.nix index a214c80b779217..99c56548c7bcf9 100644 --- a/pkgs/games/linthesia/default.nix +++ b/pkgs/games/linthesia/default.nix @@ -52,12 +52,12 @@ stdenv.mkDerivation rec { gtk3.out # icon cache ]; - meta = with lib; { + meta = { description = "Game of playing music using a MIDI keyboard following a MIDI file"; mainProgram = "linthesia"; inherit (src.meta) homepage; - license = licenses.gpl2Plus; - platforms = platforms.linux; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; maintainers = [ ]; }; } diff --git a/pkgs/games/liquidwar/5.nix b/pkgs/games/liquidwar/5.nix index 1d49a6cef6e749..3a2e401dacaeba 100644 --- a/pkgs/games/liquidwar/5.nix +++ b/pkgs/games/liquidwar/5.nix @@ -27,10 +27,10 @@ stdenv.mkDerivation rec { "-lm" ]; - meta = with lib; { + meta = { description = "Classic version of a quick tactics game LiquidWar"; - maintainers = [ maintainers.raskin ]; - license = licenses.gpl2Plus; - platforms = platforms.linux; + maintainers = [ lib.maintainers.raskin ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/games/liquidwar/default.nix b/pkgs/games/liquidwar/default.nix index c974c71ecd50a7..0ac6905c9f3431 100644 --- a/pkgs/games/liquidwar/default.nix +++ b/pkgs/games/liquidwar/default.nix @@ -83,11 +83,11 @@ stdenv.mkDerivation rec { # To avoid problems finding SDL_types.h. configureFlags = [ "CFLAGS=-I${lib.getDev SDL}/include/SDL" ]; - meta = with lib; { + meta = { description = "Quick tactics game"; homepage = "https://www.gnu.org/software/liquidwar6/"; - maintainers = [ maintainers.raskin ]; - license = licenses.gpl3Plus; - platforms = platforms.linux; + maintainers = [ lib.maintainers.raskin ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/games/lzwolf/default.nix b/pkgs/games/lzwolf/default.nix index 44551efd384a45..9a9d5729f9ade5 100644 --- a/pkgs/games/lzwolf/default.nix +++ b/pkgs/games/lzwolf/default.nix @@ -16,7 +16,7 @@ SDL2_mixer, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "lzwolf"; # Fix-Me: Remember to remove SDL2_mixer pin (at top-level) on next lzwolf upgrade. version = "unstable-2022-12-26"; @@ -81,12 +81,12 @@ stdenv.mkDerivation rec { ln -s $out/lib/lzwolf/lzwolf $out/bin/lzwolf ''; - meta = with lib; { + meta = { homepage = "https://bitbucket.org/linuxwolf6/lzwolf"; description = "Enhanced fork of ECWolf, a Wolfenstein 3D source port"; mainProgram = "lzwolf"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ tgunnoe ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.tgunnoe ]; }; } diff --git a/pkgs/games/maptool/default.nix b/pkgs/games/maptool/default.nix index 3e57c7055367c1..649094d66aa7f6 100644 --- a/pkgs/games/maptool/default.nix +++ b/pkgs/games/maptool/default.nix @@ -20,16 +20,16 @@ let hash = "sha256-KjP6zugQw9r1hvdxqOgTrt4hYMYg+lgjkgkj3tfb38s="; }; - meta = with lib; { + meta = { description = "Virtual Tabletop for playing roleplaying games with remote players or face to face"; mainProgram = "maptool"; homepage = "https://www.rptools.net/toolbox/maptool/"; - sourceProvenance = with sourceTypes; [ + sourceProvenance = with lib.sourceTypes; [ binaryBytecode binaryNativeCode ]; - license = licenses.agpl3Plus; - maintainers = with maintainers; [ rhendric ]; + license = lib.licenses.agpl3Plus; + maintainers = [ lib.maintainers.rhendric ]; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/games/minecraft-servers/derivation.nix b/pkgs/games/minecraft-servers/derivation.nix index a93ede2a89abf3..cca610be513b12 100644 --- a/pkgs/games/minecraft-servers/derivation.nix +++ b/pkgs/games/minecraft-servers/derivation.nix @@ -39,13 +39,13 @@ stdenv.mkDerivation { updateScript = ./update.py; }; - meta = with lib; { + meta = { description = "Minecraft Server"; homepage = "https://minecraft.net"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = licenses.unfreeRedistributable; - platforms = platforms.unix; - maintainers = with maintainers; [ + sourceProvenance = [ lib.sourceTypes.binaryBytecode ]; + license = lib.licenses.unfreeRedistributable; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ thoughtpolice tomberek costrouc diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix index 9bbe09367dd099..f617e97bdfdeb1 100644 --- a/pkgs/games/minecraft/default.nix +++ b/pkgs/games/minecraft/default.nix @@ -144,20 +144,20 @@ stdenv.mkDerivation rec { desktopItems = [ desktopItem ]; - meta = with lib; { + passthru = { + tests = { inherit (nixosTests) minecraft; }; + updateScript = ./update.sh; + }; + + meta = { description = "Official launcher for Minecraft, a sandbox-building game"; homepage = "https://minecraft.net"; - maintainers = with maintainers; [ ryantm ]; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; + maintainers = [ lib.maintainers.ryantm ]; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; + license = lib.licenses.unfree; platforms = [ "x86_64-linux" ]; # "minecraft-launcher will fail on NixOS for minecraft versions >1.19 # try prismlauncher or atlauncher instead" broken = true; }; - - passthru = { - tests = { inherit (nixosTests) minecraft; }; - updateScript = ./update.sh; - }; } diff --git a/pkgs/games/mrrescue/default.nix b/pkgs/games/mrrescue/default.nix index c42364f0d71d83..3ba5c0c7a40b1b 100644 --- a/pkgs/games/mrrescue/default.nix +++ b/pkgs/games/mrrescue/default.nix @@ -58,12 +58,12 @@ stdenv.mkDerivation { ln -s ${desktopItem}/share/applications/* $out/share/applications/ ''; - meta = with lib; { + meta = { description = "Arcade-style fire fighting game"; mainProgram = "mrrescue"; maintainers = [ ]; - platforms = platforms.linux; - license = licenses.zlib; + platforms = lib.platforms.linux; + license = lib.licenses.zlib; downloadPage = "http://tangramgames.dk/games/mrrescue"; }; diff --git a/pkgs/games/mudlet/default.nix b/pkgs/games/mudlet/default.nix index eef4560e386a52..3a5f68635afda5 100644 --- a/pkgs/games/mudlet/default.nix +++ b/pkgs/games/mudlet/default.nix @@ -148,12 +148,12 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = { description = "Crossplatform mud client"; homepage = "https://www.mudlet.org/"; - maintainers = with maintainers; [ wyvie pstn cpu felixalbrigtsen ]; - platforms = platforms.linux ++ platforms.darwin; - license = licenses.gpl2Plus; + maintainers = with lib.maintainers; [ wyvie pstn cpu felixalbrigtsen ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + license = lib.licenses.gpl2Plus; mainProgram = "mudlet"; }; } diff --git a/pkgs/games/nethack/default.nix b/pkgs/games/nethack/default.nix index c9f804c43e1525..90049137215151 100644 --- a/pkgs/games/nethack/default.nix +++ b/pkgs/games/nethack/default.nix @@ -222,12 +222,12 @@ stdenv.mkDerivation rec { }) ]; - meta = with lib; { + meta = { description = "Rogue-like game"; homepage = "http://nethack.org/"; license = "nethack"; - platforms = if x11Mode then platforms.linux else platforms.unix; - maintainers = with maintainers; [ abbradar ]; + platforms = if x11Mode then lib.platforms.linux else lib.platforms.unix; + maintainers = [ lib.maintainers.abbradar ]; mainProgram = "nethack"; }; } diff --git a/pkgs/games/nile/default.nix b/pkgs/games/nile/default.nix index aa24289ba07042..348b4d073f49f4 100644 --- a/pkgs/games/nile/default.nix +++ b/pkgs/games/nile/default.nix @@ -51,15 +51,16 @@ buildPythonApplication { pythonImportsCheck = [ "nile" ]; - meta = with lib; { + passthru.updateScript = gitUpdater { + rev-prefix = "v"; + }; + + meta = { description = "Unofficial Amazon Games client"; mainProgram = "nile"; homepage = "https://github.com/imLinguin/nile"; - license = with licenses; [ gpl3 ]; - maintainers = with maintainers; [ aidalgol ]; + license = [ lib.licenses.gpl3 ]; + maintainers = [ lib.maintainers.aidalgol ]; }; - passthru.updateScript = gitUpdater { - rev-prefix = "v"; - }; } diff --git a/pkgs/games/npush/default.nix b/pkgs/games/npush/default.nix index f8a5b732c066d6..9f50d924c8d7d6 100644 --- a/pkgs/games/npush/default.nix +++ b/pkgs/games/npush/default.nix @@ -42,13 +42,13 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = { broken = stdenv.hostPlatform.isDarwin; homepage = "https://npush.sourceforge.net/"; description = "Sokoban-like game"; mainProgram = "npush"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = with platforms; unix; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.AndersonTorres ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/games/openmw/default.nix b/pkgs/games/openmw/default.nix index c83c5648eb62a2..fc71e27be0ee48 100644 --- a/pkgs/games/openmw/default.nix +++ b/pkgs/games/openmw/default.nix @@ -129,14 +129,14 @@ stdenv.mkDerivation rec { "-DOPENMW_OSX_DEPLOYMENT=ON" ]; - meta = with lib; { + meta = { description = "Unofficial open source engine reimplementation of the game Morrowind"; homepage = "https://openmw.org"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ abbradar marius851000 ]; - platforms = platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/games/openmw/tes3mp.nix b/pkgs/games/openmw/tes3mp.nix index f94d288f93d9cb..d5cb32ace10166 100644 --- a/pkgs/games/openmw/tes3mp.nix +++ b/pkgs/games/openmw/tes3mp.nix @@ -129,11 +129,11 @@ let mv $out/bin/tes3mp-* $out/libexec ''; - meta = with lib; { + meta = { description = "Multiplayer for TES3:Morrowind based on OpenMW"; homepage = "https://tes3mp.com/"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ peterhoeg ]; + license = lib.licenses.gpl3Only; + maintainers = [ lib.maintainers.peterhoeg ]; platforms = [ "x86_64-linux" "i686-linux" diff --git a/pkgs/games/openra/build-engine.nix b/pkgs/games/openra/build-engine.nix index 85644fadef0651..d029ca2167f719 100644 --- a/pkgs/games/openra/build-engine.nix +++ b/pkgs/games/openra/build-engine.nix @@ -74,11 +74,11 @@ buildDotnetModule rec { done ''; - meta = with lib; { + meta = { description = "Open Source real-time strategy game engine for early Westwood games such as Command & Conquer: Red Alert. ${engine.build} version"; homepage = "https://www.openra.net/"; - license = licenses.gpl3; - maintainers = with maintainers; [ mdarocha ]; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.mdarocha ]; platforms = [ "x86_64-linux" ]; mainProgram = "openra-ra"; }; diff --git a/pkgs/games/openrw/default.nix b/pkgs/games/openrw/default.nix index fdec4d1fe77000..5043dd9d449d57 100644 --- a/pkgs/games/openrw/default.nix +++ b/pkgs/games/openrw/default.nix @@ -64,16 +64,16 @@ stdenv.mkDerivation { Cocoa ]; - meta = with lib; { + meta = { description = "Unofficial open source recreation of the classic Grand Theft Auto III game executable"; homepage = "https://github.com/rwengine/openrw"; - license = licenses.gpl3; + license = lib.licenses.gpl3; longDescription = '' OpenRW is an open source re-implementation of Rockstar Games' Grand Theft Auto III, a classic 3D action game first published in 2001. ''; - maintainers = with maintainers; [ kragniz ]; - platforms = platforms.all; + maintainers = [ lib.maintainers.kragniz ]; + platforms = lib.platforms.all; mainProgram = "rwgame"; }; } diff --git a/pkgs/games/openspades/default.nix b/pkgs/games/openspades/default.nix index fd070312b1f9f8..7b58e9277efaa3 100644 --- a/pkgs/games/openspades/default.nix +++ b/pkgs/games/openspades/default.nix @@ -57,13 +57,13 @@ stdenv.mkDerivation rec { NIX_CFLAGS_LINK = "-lopenal"; - meta = with lib; { + meta = { description = "Compatible client of Ace of Spades 0.75"; mainProgram = "openspades"; homepage = "https://github.com/yvt/openspades/"; - license = licenses.gpl3; - platforms = platforms.all; - maintainers = with maintainers; [ abbradar azahi ]; + license = lib.licenses.gpl3; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ abbradar azahi ]; # never built on aarch64-linux since first introduction in nixpkgs broken = stdenv.hostPlatform.isDarwin || (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); }; diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index 4a5e1551412448..181d83987d86e5 100644 --- a/pkgs/games/openttd/default.nix +++ b/pkgs/games/openttd/default.nix @@ -136,7 +136,7 @@ stdenv.mkDerivation rec { ''} ''; - meta = with lib; { + meta = { description = ''Open source clone of the Microprose game "Transport Tycoon Deluxe"''; mainProgram = "openttd"; longDescription = '' @@ -151,9 +151,9 @@ stdenv.mkDerivation rec { ''; homepage = "https://www.openttd.org/"; changelog = "https://cdn.openttd.org/openttd-releases/${version}/changelog.txt"; - license = licenses.gpl2Only; - platforms = platforms.linux; - maintainers = with maintainers; [ + license = lib.licenses.gpl2Only; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ jcumming fpletz ]; diff --git a/pkgs/games/openttd/grfcodec.nix b/pkgs/games/openttd/grfcodec.nix index e9d559793adf35..97fa9ed8700f0c 100644 --- a/pkgs/games/openttd/grfcodec.nix +++ b/pkgs/games/openttd/grfcodec.nix @@ -7,7 +7,7 @@ git, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "openttd-grfcodec"; version = "unstable-2021-03-10"; @@ -29,10 +29,10 @@ stdenv.mkDerivation rec { cp -a grfcodec grfid grfstrip nforenum $out/bin/ ''; - meta = with lib; { + meta = { description = "Low-level (dis)assembler and linter for OpenTTD GRF files"; homepage = "http://openttd.org/"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ ToxicFrog ]; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.ToxicFrog ]; }; } diff --git a/pkgs/games/openttd/nml.nix b/pkgs/games/openttd/nml.nix index b2ce587d1aa4c9..9debb2e7748821 100644 --- a/pkgs/games/openttd/nml.nix +++ b/pkgs/games/openttd/nml.nix @@ -20,11 +20,11 @@ python3.pkgs.buildPythonApplication rec { ply ]; - meta = with lib; { + meta = { homepage = "http://openttdcoop.org/"; description = "Compiler for OpenTTD NML files"; mainProgram = "nmlc"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ ToxicFrog ]; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.ToxicFrog ]; }; } diff --git a/pkgs/games/openxray/default.nix b/pkgs/games/openxray/default.nix index 5d761fbf7f71b5..a383dd4bbcda3e 100644 --- a/pkgs/games/openxray/default.nix +++ b/pkgs/games/openxray/default.nix @@ -64,14 +64,14 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = gitUpdater { }; - meta = with lib; { + meta = { mainProgram = "xr_3da"; description = "Improved version of the X-Ray Engine, the game engine used in the world-famous S.T.A.L.K.E.R. game series by GSC Game World"; homepage = "https://github.com/OpenXRay/xray-16/"; - license = licenses.unfree // { + license = lib.licenses.unfree // { url = "https://github.com/OpenXRay/xray-16/blob/${finalAttrs.version}/License.txt"; }; - maintainers = with maintainers; [ OPNA2608 ]; + maintainers = [ lib.maintainers.OPNA2608 ]; platforms = [ "x86_64-linux" "i686-linux" diff --git a/pkgs/games/orthorobot/default.nix b/pkgs/games/orthorobot/default.nix index 5278cd20c6e125..3fdb489485e195 100644 --- a/pkgs/games/orthorobot/default.nix +++ b/pkgs/games/orthorobot/default.nix @@ -67,12 +67,12 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = { description = "Recharge the robot"; mainProgram = "orthorobot"; - maintainers = with maintainers; [ leenaars ]; - platforms = platforms.linux; - license = licenses.free; + maintainers = [ lib.maintainers.leenaars ]; + platforms = lib.platforms.linux; + license = lib.licenses.free; downloadPage = "https://stabyourself.net/orthorobot/"; }; } diff --git a/pkgs/games/pegasus-frontend/default.nix b/pkgs/games/pegasus-frontend/default.nix index de566c43e6a818..e70a59baf9d907 100644 --- a/pkgs/games/pegasus-frontend/default.nix +++ b/pkgs/games/pegasus-frontend/default.nix @@ -14,7 +14,7 @@ wrapQtAppsHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "pegasus-frontend"; version = "0-unstable-2024-11-11"; @@ -42,12 +42,12 @@ stdenv.mkDerivation rec { SDL2 ]; - meta = with lib; { + meta = { description = "Cross platform, customizable graphical frontend for launching emulators and managing your game collection"; mainProgram = "pegasus-fe"; homepage = "https://pegasus-frontend.org/"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ tengkuizdihar ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = [ lib.maintainers.tengkuizdihar ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/games/pentobi/default.nix b/pkgs/games/pentobi/default.nix index cbcddf570b0321..b18edf6754de09 100644 --- a/pkgs/games/pentobi/default.nix +++ b/pkgs/games/pentobi/default.nix @@ -4,8 +4,6 @@ appstream, fetchFromGitHub, cmake, - gettext, - libxslt, librsvg, itstool, qtbase, @@ -54,11 +52,11 @@ mkDerivation rec { "-DMETAINFO_ITS=${appstream}/share/gettext/its/metainfo.its" ]; - meta = with lib; { + meta = { description = "Computer opponent for the board game Blokus"; homepage = "https://pentobi.sourceforge.io"; - license = licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; maintainers = [ ]; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/games/pokerth/default.nix b/pkgs/games/pokerth/default.nix index f8ef4e598d0fcf..d152cd4e1b0f47 100644 --- a/pkgs/games/pokerth/default.nix +++ b/pkgs/games/pokerth/default.nix @@ -83,12 +83,12 @@ mkDerivation rec { env.NIX_CFLAGS_COMPILE = "-I${lib.getDev SDL}/include/SDL"; - meta = with lib; { + meta = { homepage = "https://www.pokerth.net"; description = "Poker game ${target}"; mainProgram = "pokerth"; - license = licenses.gpl3; - maintainers = with maintainers; [ obadz ]; - platforms = platforms.all; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.obadz ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/games/pro-office-calculator/default.nix b/pkgs/games/pro-office-calculator/default.nix index 88894e2fb99d1c..f2aecc45091480 100644 --- a/pkgs/games/pro-office-calculator/default.nix +++ b/pkgs/games/pro-office-calculator/default.nix @@ -26,12 +26,12 @@ mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with lib; { + meta = { description = "Completely normal office calculator"; mainProgram = "procalc"; homepage = "https://proofficecalculator.com/"; - maintainers = [ maintainers.pmiddend ]; - platforms = platforms.linux; - license = licenses.gpl3; + maintainers = [ lib.maintainers.pmiddend ]; + platforms = lib.platforms.linux; + license = lib.licenses.gpl3; }; } diff --git a/pkgs/games/pysolfc/default.nix b/pkgs/games/pysolfc/default.nix index dede95fe0c80cd..d86a349966478a 100644 --- a/pkgs/games/pysolfc/default.nix +++ b/pkgs/games/pysolfc/default.nix @@ -101,11 +101,11 @@ python311Packages.buildPythonApplication rec { ] ); - meta = with lib; { + meta = { description = "A collection of more than 1000 solitaire card games"; mainProgram = "pysol.py"; homepage = "https://pysolfc.sourceforge.io"; - license = licenses.gpl3; - maintainers = with maintainers; [ ]; + license = lib.licenses.gpl3; + maintainers = [ ]; }; } diff --git a/pkgs/games/qgo/default.nix b/pkgs/games/qgo/default.nix index 68b4a9325b3812..cd8e54068b306a 100644 --- a/pkgs/games/qgo/default.nix +++ b/pkgs/games/qgo/default.nix @@ -12,7 +12,7 @@ mkDerivation { pname = "qgo"; version = "unstable-2017-12-18"; - meta = with lib; { + meta = { description = "Go client based on Qt5"; mainProgram = "qgo"; longDescription = '' @@ -28,8 +28,8 @@ mkDerivation { Chinese, "囲碁(Yi Go)" in Japanese, "바둑(Baduk)" in Korean. ''; homepage = "https://github.com/pzorin/qgo"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ zalakain ]; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.zalakain ]; }; src = fetchFromGitHub { diff --git a/pkgs/games/qtads/default.nix b/pkgs/games/qtads/default.nix index 4de706b5c50dcb..41b8b679a7e632 100644 --- a/pkgs/games/qtads/default.nix +++ b/pkgs/games/qtads/default.nix @@ -37,12 +37,12 @@ mkDerivation rec { qtbase ]; - meta = with lib; { + meta = { homepage = "https://realnc.github.io/qtads/"; description = "Multimedia interpreter for TADS games"; mainProgram = "qtads"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ orivej ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.orivej ]; }; } diff --git a/pkgs/games/quake2/yquake2/default.nix b/pkgs/games/quake2/yquake2/default.nix index 08d3c3e40dbef7..e4afa2e3b28b1d 100644 --- a/pkgs/games/quake2/yquake2/default.nix +++ b/pkgs/games/quake2/yquake2/default.nix @@ -102,12 +102,12 @@ let }) ]; - meta = with lib; { + meta = { description = "Yamagi Quake II client"; homepage = "https://www.yamagi.org/quake2/"; - license = licenses.gpl2Plus; - platforms = platforms.unix; - maintainers = with maintainers; [ tadfisher ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.tadfisher ]; }; }; diff --git a/pkgs/games/quake2/yquake2/games.nix b/pkgs/games/quake2/yquake2/games.nix index 2e1053eded7262..5794bbf6471dbb 100644 --- a/pkgs/games/quake2/yquake2/games.nix +++ b/pkgs/games/quake2/yquake2/games.nix @@ -55,12 +55,12 @@ let runHook postInstall ''; - meta = with lib; { + meta = { inherit (data) description; homepage = "https://www.yamagi.org/quake2/"; - license = licenses.unfree; - platforms = platforms.unix; - maintainers = with maintainers; [ tadfisher ]; + license = lib.licenses.unfree; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.tadfisher ]; }; }; diff --git a/pkgs/games/quake3/content/demo.nix b/pkgs/games/quake3/content/demo.nix index 9b3b4d06245b83..ea36021f4b23b6 100644 --- a/pkgs/games/quake3/content/demo.nix +++ b/pkgs/games/quake3/content/demo.nix @@ -25,10 +25,10 @@ stdenv.mkDerivation { preferLocalBuild = true; - meta = with lib; { + meta = { description = "Quake 3 Arena demo content"; - license = licenses.unfreeRedistributable; - platforms = platforms.all; - maintainers = with maintainers; [ abbradar ]; + license = lib.licenses.unfreeRedistributable; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.abbradar ]; }; } diff --git a/pkgs/games/quake3/content/hires.nix b/pkgs/games/quake3/content/hires.nix index 2195e41313529c..50aec06332aab6 100644 --- a/pkgs/games/quake3/content/hires.nix +++ b/pkgs/games/quake3/content/hires.nix @@ -21,10 +21,10 @@ stdenv.mkDerivation { preferLocalBuild = true; - meta = with lib; { + meta = { description = "Quake 3 high-resolution textures"; - license = licenses.cc0; - platforms = platforms.all; - maintainers = with maintainers; [ rvolosatovs ]; + license = lib.licenses.cc0; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.rvolosatovs ]; }; } diff --git a/pkgs/games/quake3/content/pointrelease.nix b/pkgs/games/quake3/content/pointrelease.nix index e3b54859607021..e023d9b58d3e11 100644 --- a/pkgs/games/quake3/content/pointrelease.nix +++ b/pkgs/games/quake3/content/pointrelease.nix @@ -25,10 +25,10 @@ stdenv.mkDerivation { preferLocalBuild = true; - meta = with lib; { + meta = { description = "Quake 3 Arena point release"; - license = licenses.unfreeRedistributable; - platforms = platforms.all; - maintainers = with maintainers; [ abbradar ]; + license = lib.licenses.unfreeRedistributable; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.abbradar ]; }; } diff --git a/pkgs/games/quakespasm/default.nix b/pkgs/games/quakespasm/default.nix index c947356d226d3b..365f0f2e977ed3 100644 --- a/pkgs/games/quakespasm/default.nix +++ b/pkgs/games/quakespasm/default.nix @@ -125,7 +125,7 @@ stdenv.mkDerivation rec { }) ]; - meta = with lib; { + meta = { description = "Engine for iD software's Quake"; homepage = "https://quakespasm.sourceforge.net/"; longDescription = '' @@ -137,8 +137,8 @@ stdenv.mkDerivation rec { and smoother mouse input - though no CD support. ''; - platforms = platforms.unix; - maintainers = with maintainers; [ mikroskeem ]; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.mikroskeem ]; mainProgram = "quake"; }; } diff --git a/pkgs/games/quakespasm/vulkan.nix b/pkgs/games/quakespasm/vulkan.nix index 137bf667f2f4e5..f4bf5ad6415bf4 100644 --- a/pkgs/games/quakespasm/vulkan.nix +++ b/pkgs/games/quakespasm/vulkan.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { --add-rpath ${lib.makeLibraryPath [ vulkan-loader ]} ''; - meta = with lib; { + meta = { description = "Vulkan Quake port based on QuakeSpasm"; homepage = src.meta.homepage; longDescription = '' @@ -85,8 +85,8 @@ stdenv.mkDerivation rec { specialization constants, CPU/GPU parallelism and memory pooling. ''; - platforms = with platforms; linux ++ darwin; - maintainers = with maintainers; [ + platforms = with lib.platforms; linux ++ darwin; + maintainers = with lib.maintainers; [ PopeRigby ylh ]; diff --git a/pkgs/games/qzdl/default.nix b/pkgs/games/qzdl/default.nix index de7cef007f2756..4b737d8d8dd063 100644 --- a/pkgs/games/qzdl/default.nix +++ b/pkgs/games/qzdl/default.nix @@ -12,7 +12,7 @@ copyDesktopItems, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "qzdl"; version = "unstable-2023-04-04"; @@ -55,12 +55,12 @@ stdenv.mkDerivation rec { }) ]; - meta = with lib; { + meta = { description = "ZDoom WAD Launcher"; homepage = "https://zdl.vectec.net"; - license = licenses.gpl3Only; + license = lib.licenses.gpl3Only; inherit (qtbase.meta) platforms; - maintainers = with maintainers; [ azahi ]; + maintainers = [ lib.maintainers.azahi ]; mainProgram = "zdl"; }; } diff --git a/pkgs/games/rare/default.nix b/pkgs/games/rare/default.nix index d3d74c09a34b7b..94a69d61e243d4 100644 --- a/pkgs/games/rare/default.nix +++ b/pkgs/games/rare/default.nix @@ -55,12 +55,12 @@ buildPythonApplication rec { # Project has no tests doCheck = false; - meta = with lib; { + meta = { description = "GUI for Legendary, an Epic Games Launcher open source alternative"; homepage = "https://github.com/RareDevs/Rare"; maintainers = [ ]; - license = licenses.gpl3Only; - platforms = platforms.linux; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.linux; mainProgram = "rare"; }; } diff --git a/pkgs/games/rogue/default.nix b/pkgs/games/rogue/default.nix index dcb16306767a62..06b57ae9e3c92f 100644 --- a/pkgs/games/rogue/default.nix +++ b/pkgs/games/rogue/default.nix @@ -20,12 +20,12 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses ]; - meta = with lib; { + meta = { homepage = "http://rogue.rogueforge.net/rogue-5-4/"; description = "Final version of the original Rogue game developed for the UNIX operating system"; mainProgram = "rogue"; - platforms = platforms.all; - license = licenses.bsd3; + platforms = lib.platforms.all; + license = lib.licenses.bsd3; maintainers = [ ]; }; } diff --git a/pkgs/games/rott/default.nix b/pkgs/games/rott/default.nix index a91187730151d6..20daddda196ebc 100644 --- a/pkgs/games/rott/default.nix +++ b/pkgs/games/rott/default.nix @@ -7,7 +7,6 @@ SDL_mixer, makeDesktopItem, copyDesktopItems, - runtimeShell, buildShareware ? false, }: @@ -69,12 +68,12 @@ stdenv.mkDerivation rec { }) ]; - meta = with lib; { + meta = { description = "SDL port of Rise of the Triad"; mainProgram = "rott"; homepage = "https://icculus.org/rott/"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ sander ]; - platforms = platforms.all; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.sander ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/games/scummvm/default.nix b/pkgs/games/scummvm/default.nix index 716a4787dbfc39..f930483832779b 100644 --- a/pkgs/games/scummvm/default.nix +++ b/pkgs/games/scummvm/default.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, nasm, alsa-lib, curl, @@ -95,12 +94,12 @@ stdenv.mkDerivation rec { updateScript = nix-update-script { }; }; - meta = with lib; { + meta = { description = "Program to run certain classic graphical point-and-click adventure games (such as Monkey Island)"; mainProgram = "scummvm"; homepage = "https://www.scummvm.org/"; - license = licenses.gpl2Plus; - maintainers = [ maintainers.peterhoeg ]; - platforms = platforms.unix; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.peterhoeg ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/games/scummvm/games.nix b/pkgs/games/scummvm/games.nix index adf358522abeed..0187f877052634 100644 --- a/pkgs/games/scummvm/games.nix +++ b/pkgs/games/scummvm/games.nix @@ -88,10 +88,10 @@ let runHook postInstall ''; - meta = with lib; { + meta = { homepage = "https://www.scummvm.org"; - license = licenses.free; # refer to the readme for exact wording - maintainers = with maintainers; [ peterhoeg ]; + license = lib.licenses.free; # refer to the readme for exact wording + maintainers = [ lib.maintainers.peterhoeg ]; inherit description; inherit (scummvm.meta) platforms; }; diff --git a/pkgs/games/sgt-puzzles/default.nix b/pkgs/games/sgt-puzzles/default.nix index 257bad506f5d81..59b68a044759cb 100644 --- a/pkgs/games/sgt-puzzles/default.nix +++ b/pkgs/games/sgt-puzzles/default.nix @@ -88,14 +88,14 @@ stdenv.mkDerivation rec { ''; }; - meta = with lib; { + meta = { description = "Simon Tatham's portable puzzle collection"; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ raskin tomfitzhenry ]; - platforms = platforms.linux; + platforms = lib.platforms.linux; homepage = "https://www.chiark.greenend.org.uk/~sgtatham/puzzles/"; }; } diff --git a/pkgs/games/soi/default.nix b/pkgs/games/soi/default.nix index c99a422fe27d1a..6e389e8d07c206 100644 --- a/pkgs/games/soi/default.nix +++ b/pkgs/games/soi/default.nix @@ -37,12 +37,12 @@ stdenv.mkDerivation rec { "-DLUABIND_LIBRARY=${luabind}/lib/libluabind09.a" ]; - meta = with lib; { + meta = { description = "Physics-based puzzle game"; mainProgram = "soi"; - maintainers = with maintainers; [ raskin ]; - platforms = platforms.linux; - license = licenses.free; + maintainers = [ lib.maintainers.raskin ]; + platforms = lib.platforms.linux; + license = lib.licenses.free; downloadPage = "https://sourceforge.net/projects/soi/files/"; }; } diff --git a/pkgs/games/solarus/default.nix b/pkgs/games/solarus/default.nix index 90b988de4796e6..ad55b459efd694 100644 --- a/pkgs/games/solarus/default.nix +++ b/pkgs/games/solarus/default.nix @@ -59,16 +59,16 @@ mkDerivation rec { mv $out/lib $lib ''; - meta = with lib; { + meta = { description = "Zelda-like ARPG game engine"; longDescription = '' Solarus is a game engine for Zelda-like ARPG games written in lua. Many full-fledged games have been writen for the engine. ''; homepage = "https://www.solarus-games.org"; - license = licenses.gpl3; + license = lib.licenses.gpl3; maintainers = [ ]; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix b/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix index a014a00ebaf0ba..586fdcf998a510 100644 --- a/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix +++ b/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix @@ -116,10 +116,10 @@ buildDotnetModule rec { makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; - meta = with lib; { + meta = { description = "Launcher for Space Station 14, a multiplayer game about paranoia and disaster"; homepage = "https://spacestation14.io"; - license = licenses.mit; + license = lib.licenses.mit; maintainers = [ ]; platforms = [ "x86_64-linux" ]; mainProgram = "SS14.Launcher"; diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix index 410de8382c9383..6b6658727684c3 100644 --- a/pkgs/games/spring/default.nix +++ b/pkgs/games/spring/default.nix @@ -92,11 +92,11 @@ stdenv.mkDerivation rec { --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ]}" ''; - meta = with lib; { + meta = { homepage = "https://springrts.com/"; description = "Powerful real-time strategy (RTS) game engine"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ qknight domenkozar sorki diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix index dc3ae4ef6d7a71..0331b5e6bc158a 100644 --- a/pkgs/games/spring/springlobby.nix +++ b/pkgs/games/spring/springlobby.nix @@ -68,11 +68,11 @@ stdenv.mkDerivation rec { --set SPRING_BUNDLE_DIR "${spring}/lib" ''; - meta = with lib; { + meta = { homepage = "https://springlobby.springrts.com"; description = "Cross-platform lobby client for the Spring RTS project"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ qknight domenkozar ]; diff --git a/pkgs/games/starsector/default.nix b/pkgs/games/starsector/default.nix index 7733bb7077fdc2..456f0cd84afdd3 100644 --- a/pkgs/games/starsector/default.nix +++ b/pkgs/games/starsector/default.nix @@ -96,12 +96,12 @@ stdenv.mkDerivation rec { update-source-version ${pname} "$version" --file=./pkgs/games/starsector/default.nix ''; - meta = with lib; { + meta = { description = "Open-world single-player space-combat, roleplaying, exploration, and economic game"; homepage = "https://fractalsoftworks.com"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = licenses.unfree; - maintainers = with maintainers; [ + sourceProvenance = [ lib.sourceTypes.binaryBytecode ]; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ bbigras rafaelrc ]; diff --git a/pkgs/games/stuntrally/default.nix b/pkgs/games/stuntrally/default.nix index c847ad4ceda48c..7409f88f3d9f09 100644 --- a/pkgs/games/stuntrally/default.nix +++ b/pkgs/games/stuntrally/default.nix @@ -81,11 +81,11 @@ stdenv.mkDerivation rec { tinyxml-2 ]; - meta = with lib; { + meta = { description = "Stunt Rally game with Track Editor, based on VDrift and OGRE"; homepage = "http://stuntrally.tuxfamily.org/"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ pSub ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = [ lib.maintainers.pSub ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/games/super-tux-kart/default.nix b/pkgs/games/super-tux-kart/default.nix index 31aaf3a5f46b55..0e58a955a49c6d 100644 --- a/pkgs/games/super-tux-kart/default.nix +++ b/pkgs/games/super-tux-kart/default.nix @@ -153,7 +153,7 @@ stdenv.mkDerivation rec { --set-default SUPERTUXKART_DATADIR "$out/share/supertuxkart" \ ''; - meta = with lib; { + meta = { description = "Free 3D kart racing game"; mainProgram = "supertuxkart"; longDescription = '' @@ -162,11 +162,9 @@ stdenv.mkDerivation rec { Kart. ''; homepage = "https://supertuxkart.net/"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ - peterhoeg - ]; - platforms = with platforms; unix; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.peterhoeg ]; + platforms = lib.platforms.unix; changelog = "https://github.com/supertuxkart/stk-code/blob/${version}/CHANGELOG.md"; }; } diff --git a/pkgs/games/the-butterfly-effect/default.nix b/pkgs/games/the-butterfly-effect/default.nix index 8e03d34c8d2bf9..1316e97143cf00 100644 --- a/pkgs/games/the-butterfly-effect/default.nix +++ b/pkgs/games/the-butterfly-effect/default.nix @@ -45,12 +45,12 @@ mkDerivation rec { cp -r ../usr/share $out/ ''; - meta = with lib; { + meta = { description = "Physics-based game vaguely similar to Incredible Machine"; mainProgram = "tbe"; homepage = "http://the-butterfly-effect.org/"; - maintainers = [ maintainers.raskin ]; - platforms = platforms.linux; - license = licenses.gpl2Only; + maintainers = [ lib.maintainers.raskin ]; + platforms = lib.platforms.linux; + license = lib.licenses.gpl2Only; }; } diff --git a/pkgs/games/toppler/default.nix b/pkgs/games/toppler/default.nix index 0c9290dcc4d940..031e9c5c97236c 100644 --- a/pkgs/games/toppler/default.nix +++ b/pkgs/games/toppler/default.nix @@ -52,11 +52,11 @@ stdenv.mkDerivation (finalAttrs: { hardeningDisable = [ "format" ]; - meta = with lib; { + meta = { description = "Jump and run game, reimplementation of Tower Toppler/Nebulus"; homepage = "https://gitlab.com/roever/toppler"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ fgaz ]; - platforms = platforms.all; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.fgaz ]; + platforms = lib.platforms.all; }; }) diff --git a/pkgs/games/vcmi/default.nix b/pkgs/games/vcmi/default.nix index fb80aa1d67ea12..c0af707df52260 100644 --- a/pkgs/games/vcmi/default.nix +++ b/pkgs/games/vcmi/default.nix @@ -97,16 +97,16 @@ stdenv.mkDerivation rec { ''; }; - meta = with lib; { + meta = { description = "Open-source engine for Heroes of Might and Magic III"; homepage = "https://vcmi.eu"; changelog = "https://github.com/vcmi/vcmi/blob/${src.rev}/ChangeLog.md"; - license = with licenses; [ + license = with lib.licenses; [ gpl2Plus cc-by-sa-40 ]; - maintainers = with maintainers; [ azahi ]; - platforms = platforms.linux; + maintainers = with lib.maintainers; [ azahi ]; + platforms = lib.platforms.linux; mainProgram = "vcmilauncher"; }; } diff --git a/pkgs/games/vessel/default.nix b/pkgs/games/vessel/default.nix index 0aad0143aa6014..0dcbffaa90fee8 100644 --- a/pkgs/games/vessel/default.nix +++ b/pkgs/games/vessel/default.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { chmod +x $out/bin/Vessel ''; - meta = with lib; { + meta = { description = "Fluid physics based puzzle game"; longDescription = '' Living liquid machines have overrun this world of unstoppable progress, @@ -97,8 +97,8 @@ stdenv.mkDerivation rec { to life, and all the consequences that ensue. ''; homepage = "http://www.strangeloopgames.com"; - license = licenses.unfree; - maintainers = with maintainers; [ jcumming ]; + license = lib.licenses.unfree; + maintainers = [ lib.maintainers.jcumming ]; }; } diff --git a/pkgs/games/vimgolf/default.nix b/pkgs/games/vimgolf/default.nix index f2e6c5075f14f3..d9932ab7a2bf8f 100644 --- a/pkgs/games/vimgolf/default.nix +++ b/pkgs/games/vimgolf/default.nix @@ -11,11 +11,11 @@ bundlerApp { passthru.updateScript = bundlerUpdateScript "vimgolf"; - meta = with lib; { + meta = { description = "Game that tests Vim efficiency"; homepage = "https://vimgolf.com"; - license = licenses.mit; - maintainers = with maintainers; [ leungbk ]; - platforms = platforms.unix; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.leungbk ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/games/warsow/default.nix b/pkgs/games/warsow/default.nix index 57fe262babd4e8..08ef1975af3da3 100644 --- a/pkgs/games/warsow/default.nix +++ b/pkgs/games/warsow/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { done ''; - meta = with lib; { + meta = { description = "Multiplayer FPS game designed for competitive gaming"; longDescription = '' Set in a futuristic cartoon-like world where rocketlauncher-wielding @@ -37,8 +37,8 @@ stdenv.mkDerivation rec { and macOS. ''; homepage = "http://www.warsow.net"; - license = licenses.unfreeRedistributable; - maintainers = with maintainers; [ + license = lib.licenses.unfreeRedistributable; + maintainers = with lib.maintainers; [ astsmtl abbradar ]; diff --git a/pkgs/games/warsow/engine.nix b/pkgs/games/warsow/engine.nix index 0d2ef4cfaae1fd..dfb7a3e85f3d4a 100644 --- a/pkgs/games/warsow/engine.nix +++ b/pkgs/games/warsow/engine.nix @@ -17,7 +17,7 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "warsow-engine"; version = "2.1.0"; @@ -80,15 +80,15 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = { description = "Multiplayer FPS game designed for competitive gaming (engine only)"; homepage = "http://www.warsow.net"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ astsmtl abbradar ]; - platforms = platforms.linux; + platforms = lib.platforms.linux; broken = stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix index 92ac3e6b4c08da..c6187585008d30 100644 --- a/pkgs/games/wesnoth/default.nix +++ b/pkgs/games/wesnoth/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-framework AppKit"; - meta = with lib; { + meta = { description = "Battle for Wesnoth, a free, turn-based strategy game with a fantasy theme"; longDescription = '' The Battle for Wesnoth is a Free, turn-based tactical strategy @@ -39,8 +39,8 @@ stdenv.mkDerivation rec { ''; homepage = "https://www.wesnoth.org/"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ abbradar ]; - platforms = platforms.unix; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.abbradar ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/games/xpilot/bloodspilot-server.nix b/pkgs/games/xpilot/bloodspilot-server.nix index 2e3ac840ea67ab..9ab1eaa14f0f8b 100644 --- a/pkgs/games/xpilot/bloodspilot-server.nix +++ b/pkgs/games/xpilot/bloodspilot-server.nix @@ -22,12 +22,12 @@ stdenv.mkDerivation rec { ./server-gcc5.patch ]; - meta = with lib; { + meta = { description = "Multiplayer X11 space combat game (server part)"; mainProgram = "xpilots"; homepage = "http://bloodspilot.sf.net/"; - license = licenses.gpl2Plus; - maintainers = [ maintainers.raskin ]; - platforms = platforms.linux; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.raskin ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/games/xpilot/default.nix b/pkgs/games/xpilot/default.nix index 8e011af62f299e..dff558994f0e9a 100644 --- a/pkgs/games/xpilot/default.nix +++ b/pkgs/games/xpilot/default.nix @@ -35,11 +35,11 @@ stdenv.mkDerivation rec { patches = [ ./xpilot-ng-gcc-14-fix.patch ]; - meta = with lib; { + meta = { description = "Multiplayer X11 space combat game"; homepage = "http://xpilot.sf.net/"; - license = licenses.gpl2Plus; - maintainers = [ maintainers.raskin ]; - platforms = platforms.linux; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.raskin ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/servers/bindle/default.nix b/pkgs/servers/bindle/default.nix index 07507e00adde77..70e6f03952a669 100644 --- a/pkgs/servers/bindle/default.nix +++ b/pkgs/servers/bindle/default.nix @@ -36,11 +36,11 @@ rustPlatform.buildRustPackage rec { "--all-features" ]; - meta = with lib; { + meta = { description = "Bindle: Aggregate Object Storage"; homepage = "https://github.com/deislabs/bindle"; - license = licenses.asl20; + license = lib.licenses.asl20; maintainers = [ ]; - platforms = platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/servers/binserve/default.nix b/pkgs/servers/binserve/default.nix index df1cf540b52cee..6af69d6a60a79c 100644 --- a/pkgs/servers/binserve/default.nix +++ b/pkgs/servers/binserve/default.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { doCheck = false; - meta = with lib; { + meta = { description = "Fast production-ready static web server"; homepage = "https://github.com/mufeedvh/binserve"; longDescription = '' @@ -30,9 +30,9 @@ rustPlatform.buildRustPackage rec { (HTTPS), routing, hot reloading, caching, templating, and security in a single-binary you can set up with zero code ''; - license = licenses.mit; - maintainers = with maintainers; [ snapdgn ]; - platforms = platforms.unix; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.snapdgn ]; + platforms = lib.platforms.unix; mainProgram = "binserve"; }; } diff --git a/pkgs/servers/diod/default.nix b/pkgs/servers/diod/default.nix index 21d3f5d9a43a75..79c37fda27de05 100644 --- a/pkgs/servers/diod/default.nix +++ b/pkgs/servers/diod/default.nix @@ -31,10 +31,10 @@ stdenv.mkDerivation rec { ncurses ]; - meta = with lib; { + meta = { description = "I/O forwarding server that implements a variant of the 9P protocol"; - maintainers = with maintainers; [ rnhmjoj ]; - platforms = platforms.linux; - license = licenses.gpl2Plus; + maintainers = [ lib.maintainers.rnhmjoj ]; + platforms = lib.platforms.linux; + license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/servers/fedigroups/default.nix b/pkgs/servers/fedigroups/default.nix index 83e53c195fcf9b..09efef40bcc6a6 100644 --- a/pkgs/servers/fedigroups/default.nix +++ b/pkgs/servers/fedigroups/default.nix @@ -44,13 +44,13 @@ rustPlatform.buildRustPackage rec { openssl ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; - meta = with lib; { + meta = { homepage = "https://git.ondrovo.com/MightyPork/group-actor#fedi-groups"; downloadPage = "https://git.ondrovo.com/MightyPork/group-actor/releases"; description = "Approximation of groups usable with Fediverse software that implements the Mastodon client API"; - license = licenses.mit; - maintainers = with maintainers; [ fgaz ]; - platforms = platforms.all; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.fgaz ]; + platforms = lib.platforms.all; mainProgram = "fedigroups"; }; } diff --git a/pkgs/servers/firebird/default.nix b/pkgs/servers/firebird/default.nix index 7e7387819ab004..db21274b9f2ea5 100644 --- a/pkgs/servers/firebird/default.nix +++ b/pkgs/servers/firebird/default.nix @@ -3,14 +3,14 @@ let base = { pname = "firebird"; - meta = with lib; { + meta = { description = "SQL relational database management system"; downloadPage = "https://github.com/FirebirdSQL/firebird/"; homepage = "https://firebirdsql.org/"; changelog = "https://github.com/FirebirdSQL/firebird/blob/master/CHANGELOG.md"; license = [ "IDPL" "Interbase-1.0" ]; - platforms = platforms.linux; - maintainers = with maintainers; [ marcweber ]; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.marcweber ]; }; nativeBuildInputs = [ autoreconfHook271 ]; diff --git a/pkgs/servers/klipper/default.nix b/pkgs/servers/klipper/default.nix index 30bf9464955c75..e6eb7876460e24 100644 --- a/pkgs/servers/klipper/default.nix +++ b/pkgs/servers/klipper/default.nix @@ -93,12 +93,12 @@ stdenv.mkDerivation rec { tagPrefix = "v"; }; - meta = with lib; { + meta = { description = "Klipper 3D printer firmware"; mainProgram = "klippy"; homepage = "https://github.com/KevinOConnor/klipper"; - maintainers = with maintainers; [ lovesegfault zhaofengli cab404 ]; - platforms = platforms.linux; - license = licenses.gpl3Only; + maintainers = with lib.maintainers; [ lovesegfault zhaofengli cab404 ]; + platforms = lib.platforms.linux; + license = lib.licenses.gpl3Only; }; } diff --git a/pkgs/servers/klipper/klipper-firmware.nix b/pkgs/servers/klipper/klipper-firmware.nix index b314379be190b1..595c154fe5868f 100644 --- a/pkgs/servers/klipper/klipper-firmware.nix +++ b/pkgs/servers/klipper/klipper-firmware.nix @@ -55,10 +55,10 @@ stdenv.mkDerivation rec { dontFixup = true; - meta = with lib; { + meta = { inherit (klipper.meta) homepage license; description = "Firmware part of Klipper"; - maintainers = with maintainers; [ vtuan10 ]; - platforms = platforms.linux; + maintainers = [ lib.maintainers.vtuan10 ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/servers/mobilizon/default.nix b/pkgs/servers/mobilizon/default.nix index efd40acbfeefb3..7cc2ee6c6a20b4 100644 --- a/pkgs/servers/mobilizon/default.nix +++ b/pkgs/servers/mobilizon/default.nix @@ -153,11 +153,11 @@ mixRelease rec { elixirPackage = beamPackages.elixir; }; - meta = with lib; { + meta = { description = "Mobilizon is an online tool to help manage your events, your profiles and your groups"; homepage = "https://joinmobilizon.org/"; - license = licenses.agpl3Plus; - maintainers = with maintainers; [ + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [ minijackson erictapen ]; diff --git a/pkgs/servers/mobilizon/frontend.nix b/pkgs/servers/mobilizon/frontend.nix index a18a164196b4e4..95f86c380e0c4f 100644 --- a/pkgs/servers/mobilizon/frontend.nix +++ b/pkgs/servers/mobilizon/frontend.nix @@ -14,10 +14,10 @@ buildNpmPackage { cp -r priv/static $out/static ''; - meta = with lib; { + meta = { description = "Frontend for the Mobilizon server"; homepage = "https://joinmobilizon.org/"; - license = licenses.agpl3Plus; - maintainers = with maintainers; [ minijackson erictapen ]; + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [ minijackson erictapen ]; }; } diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 0757122ca1f5ef..07266613e9834d 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -158,11 +158,11 @@ buildGoModule rec { updateScript = nix-update-script { }; }; - meta = with lib; { + meta = { description = "Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"; - license = licenses.agpl3Only; + license = lib.licenses.agpl3Only; homepage = "https://grafana.com"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ offline fpletz willibutz diff --git a/pkgs/servers/monitoring/grafana/plugins/bsull-console-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/bsull-console-datasource/default.nix index 30f38f1c4ae476..dc6318552ef95a 100644 --- a/pkgs/servers/monitoring/grafana/plugins/bsull-console-datasource/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/bsull-console-datasource/default.nix @@ -1,13 +1,13 @@ { grafanaPlugin, lib }: -grafanaPlugin rec { +grafanaPlugin { pname = "bsull-console-datasource"; version = "1.0.1"; zipHash = "sha256-V6D/VIdwwQvG21nVMXD/xF86Uy8WRecL2RjyDTZr1wQ="; - meta = with lib; { + meta = { description = "This is a streaming Grafana data source which can connect to the Tokio console subscriber."; - license = licenses.asl20; - maintainers = with maintainers; [ nagisa ]; - platforms = platforms.unix; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.nagisa ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/servers/monitoring/grafana/plugins/doitintl-bigquery-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/doitintl-bigquery-datasource/default.nix index aa8520e69b8e1c..0a930fbc4ab6cb 100644 --- a/pkgs/servers/monitoring/grafana/plugins/doitintl-bigquery-datasource/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/doitintl-bigquery-datasource/default.nix @@ -1,13 +1,13 @@ { grafanaPlugin, lib }: -grafanaPlugin rec { +grafanaPlugin { pname = "doitintl-bigquery-datasource"; version = "2.0.3"; zipHash = "sha256-QxUNRsO1ony+6tVdpwx3P/63XNIdAVIren6hUwChf9E="; - meta = with lib; { + meta = { description = "BigQuery DataSource for Grafana"; - license = licenses.mit; - maintainers = with maintainers; [ jwygoda ]; - platforms = platforms.unix; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.jwygoda ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/servers/monitoring/grafana/plugins/fetzerch-sunandmoon-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/fetzerch-sunandmoon-datasource/default.nix index 3c1c3410f24847..5a2606850fa686 100644 --- a/pkgs/servers/monitoring/grafana/plugins/fetzerch-sunandmoon-datasource/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/fetzerch-sunandmoon-datasource/default.nix @@ -1,13 +1,13 @@ { grafanaPlugin, lib }: -grafanaPlugin rec { +grafanaPlugin { pname = "fetzerch-sunandmoon-datasource"; version = "0.3.3"; zipHash = "sha256-IJe1OiPt9MxqqPymuH0K27jToSb92M0P4XGZXvk0paE="; - meta = with lib; { + meta = { description = "SunAndMoon is a Datasource Plugin for Grafana that calculates the position of Sun and Moon as well as the Moon illumination using SunCalc."; - license = licenses.mit; - maintainers = with maintainers; [ nagisa ]; - platforms = platforms.unix; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.nagisa ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/servers/monitoring/grafana/plugins/frser-sqlite-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/frser-sqlite-datasource/default.nix index ba373386052656..f72971389e7706 100644 --- a/pkgs/servers/monitoring/grafana/plugins/frser-sqlite-datasource/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/frser-sqlite-datasource/default.nix @@ -1,13 +1,13 @@ { grafanaPlugin, lib }: -grafanaPlugin rec { +grafanaPlugin { pname = "frser-sqlite-datasource"; version = "3.5.0"; zipHash = "sha256-BwAurFpMyyR318HMzVXCnOEQWM8W2vPPisXhhklFLBY="; - meta = with lib; { + meta = { description = "This is a Grafana backend plugin to allow using an SQLite database as a data source. The SQLite database needs to be accessible to the filesystem of the device where Grafana itself is running."; - license = licenses.asl20; - maintainers = with maintainers; [ nagisa ]; - platforms = platforms.unix; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.nagisa ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/servers/monitoring/grafana/plugins/grafadruid-druid-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafadruid-druid-datasource/default.nix index a5ed12fbfa475e..09bd2373b72c4c 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafadruid-druid-datasource/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafadruid-druid-datasource/default.nix @@ -1,13 +1,13 @@ { grafanaPlugin, lib }: -grafanaPlugin rec { +grafanaPlugin { pname = "grafadruid-druid-datasource"; version = "1.4.1"; zipHash = "sha256-7atxqRqKqop6ABQ+ead6wR/YRpJaV8j/Ri4VB9FXMu8="; - meta = with lib; { + meta = { description = "Connects Grafana to Druid"; - license = licenses.asl20; - maintainers = with maintainers; [ nukaduka ]; - platforms = platforms.unix; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.nukaduka ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-clickhouse-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-clickhouse-datasource/default.nix index b80f1bedcaa186..7b389d19a1ef16 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-clickhouse-datasource/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-clickhouse-datasource/default.nix @@ -9,11 +9,11 @@ grafanaPlugin rec { x86_64-darwin = "sha256-Y6Xp4HCYF+Nkw8CNrfEMOtpNgKunMI/4oVqD8Wq5VEI="; aarch64-darwin = "sha256-x/Z5BA9N5sZurQ5K1NQCYXQPZ/yF1p/372GPIeVU0ps="; }; - meta = with lib; { + meta = { description = "Connects Grafana to ClickHouse"; - license = licenses.asl20; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - maintainers = with maintainers; [ moody ]; - platforms = attrNames zipHash; + license = lib.licenses.asl20; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; + maintainers = [ lib.maintainers.moody ]; + platforms = lib.attrNames zipHash; }; } diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-clock-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-clock-panel/default.nix index 0165770335f79d..30c74c7a6f1d4d 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-clock-panel/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-clock-panel/default.nix @@ -1,13 +1,13 @@ { grafanaPlugin, lib }: -grafanaPlugin rec { +grafanaPlugin { pname = "grafana-clock-panel"; version = "2.1.8"; zipHash = "sha256-QLvq2CSlJuEaYAazn8MoY3XCiXeRILj4dTp/aqrHL/k="; - meta = with lib; { + meta = { description = "Clock panel for Grafana"; - license = licenses.mit; - maintainers = with maintainers; [ lukegb ]; - platforms = platforms.unix; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.lukegb ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-discourse-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-discourse-datasource/default.nix index a1250b353cf9fa..1c6bdbb10cd650 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-discourse-datasource/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-discourse-datasource/default.nix @@ -1,13 +1,13 @@ { grafanaPlugin, lib }: -grafanaPlugin rec { +grafanaPlugin { pname = "grafana-discourse-datasource"; version = "2.0.2"; zipHash = "sha256-0MTxPe7RJHMA0SwjOcFlbi4VkhlLUFP+5r2DsHAaffc="; - meta = with lib; { + meta = { description = "The Discourse data source plugin allows users to search and view topics, posts, users, tags, categories, and reports on a given Discourse forum."; - license = licenses.asl20; - maintainers = with maintainers; [ nagisa ]; - platforms = platforms.unix; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.nagisa ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-github-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-github-datasource/default.nix index f76beec1866f42..445e405448a4e7 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-github-datasource/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-github-datasource/default.nix @@ -1,6 +1,6 @@ { grafanaPlugin, lib }: -grafanaPlugin rec { +grafanaPlugin { pname = "grafana-github-datasource"; version = "1.9.0"; zipHash = { @@ -9,10 +9,10 @@ grafanaPlugin rec { x86_64-darwin = "sha256-UBwc8CZRRHsEKpzTgn5PNXjxLzETyWKGsDFtXZnkRW4="; aarch64-darwin = "sha256-xgQ7s3QP7Sq8ni0n54NE/nYlyALIESfXNKncruAWty0="; }; - meta = with lib; { + meta = { description = "The GitHub datasource allows GitHub API data to be visually represented in Grafana dashboards."; - license = licenses.asl20; - maintainers = with maintainers; [ nagisa ]; - platforms = platforms.unix; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ nagisa ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-googlesheets-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-googlesheets-datasource/default.nix index 4e258eb8137810..6a6baeab20fb3a 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-googlesheets-datasource/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-googlesheets-datasource/default.nix @@ -1,6 +1,6 @@ { grafanaPlugin, lib }: -grafanaPlugin rec { +grafanaPlugin { pname = "grafana-googlesheets-datasource"; version = "1.2.14"; zipHash = { @@ -9,10 +9,10 @@ grafanaPlugin rec { x86_64-darwin = "sha256-EwE6w67ARVp/2GE9pSqaD5TuBnsgwsDLZCrEXPfRfUE="; aarch64-darwin = "sha256-3UGd/t1k6aZsKsQCplLV9klmjQAga19VaopHx330xUs="; }; - meta = with lib; { + meta = { description = "The Grafana JSON Datasource plugin empowers you to seamlessly integrate JSON data into Grafana."; - license = licenses.asl20; - maintainers = with maintainers; [ nagisa ]; - platforms = platforms.unix; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.nagisa ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-mqtt-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-mqtt-datasource/default.nix index e132e831fc66e1..1f5b84b2fe7318 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-mqtt-datasource/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-mqtt-datasource/default.nix @@ -1,6 +1,6 @@ { grafanaPlugin, lib }: -grafanaPlugin rec { +grafanaPlugin { pname = "grafana-mqtt-datasource"; version = "1.1.0-beta.2"; zipHash = { @@ -9,10 +9,10 @@ grafanaPlugin rec { x86_64-darwin = "sha256-PZmUkghYawU5aKA536u3/LCzsvkIFVJIzl1FVWcrKTI="; aarch64-darwin = "sha256-9FP7UbNI4q4nqRTzlNKcEPnJ9mdqzOL4E0nuEAdFNJw="; }; - meta = with lib; { + meta = { description = "The MQTT data source plugin allows you to visualize streaming MQTT data from within Grafana."; - license = licenses.asl20; - maintainers = with maintainers; [ nagisa ]; - platforms = platforms.unix; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.nagisa ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-oncall-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-oncall-app/default.nix index 8767f2b51e885e..3104c023cee5be 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-oncall-app/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-oncall-app/default.nix @@ -4,10 +4,10 @@ grafanaPlugin { pname = "grafana-oncall-app"; version = "1.10.2"; zipHash = "sha256-wRgzdPKSA24O4kSDhaO/09uOG6lIoJGWUGOgX1vdjlU="; - meta = with lib; { + meta = { description = "Developer-friendly incident response for Grafana"; - license = licenses.agpl3Only; + license = lib.licenses.agpl3Only; maintainers = lib.teams.fslabs.members; - platforms = platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-opensearch-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-opensearch-datasource/default.nix index 3a5955efcb4cb3..be3b34c8aa0ec8 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-opensearch-datasource/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-opensearch-datasource/default.nix @@ -1,6 +1,6 @@ { grafanaPlugin, lib }: -grafanaPlugin rec { +grafanaPlugin { pname = "grafana-opensearch-datasource"; version = "2.19.0"; zipHash = { @@ -9,10 +9,10 @@ grafanaPlugin rec { x86_64-darwin = "sha256-6rqdTsYcqjqcXtM20ekJguT42w5dr4EUHvNuRDIU6k0="; aarch64-darwin = "sha256-Z4ISwwkFJXXdVcLOspAK8euI4yor4Ii08K7zZffY9tM="; }; - meta = with lib; { + meta = { description = "The Grafana JSON Datasource plugin empowers you to seamlessly integrate JSON data into Grafana."; - license = licenses.asl20; - maintainers = with maintainers; [ nagisa ]; - platforms = platforms.unix; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.nagisa ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-piechart-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-piechart-panel/default.nix index 168295c64cd5c8..784778b962ba48 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-piechart-panel/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-piechart-panel/default.nix @@ -1,13 +1,13 @@ { grafanaPlugin, lib }: -grafanaPlugin rec { +grafanaPlugin { pname = "grafana-piechart-panel"; version = "1.6.4"; zipHash = "sha256-bdAl3OmZgSNB+IxxlCb81abR+4dykKkRY3MpQUQyLks="; - meta = with lib; { + meta = { description = "Pie chart panel for Grafana"; - license = licenses.mit; - maintainers = with maintainers; [ lukegb ]; - platforms = platforms.unix; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.lukegb ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-polystat-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-polystat-panel/default.nix index 05c59191dc9bb0..bad74e8b2fdf93 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-polystat-panel/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-polystat-panel/default.nix @@ -1,13 +1,13 @@ { grafanaPlugin, lib }: -grafanaPlugin rec { +grafanaPlugin { pname = "grafana-polystat-panel"; version = "2.1.13"; zipHash = "sha256-O8YOSVLhJ1hDNbBHKwkikNBOjQTrGofGklVTalgDH4I="; - meta = with lib; { + meta = { description = "Hexagonal multi-stat panel for Grafana"; - license = licenses.asl20; - maintainers = with maintainers; [ lukegb ]; - platforms = platforms.unix; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.lukegb ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-worldmap-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-worldmap-panel/default.nix index 630e5833667c3f..145356fef3a428 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-worldmap-panel/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-worldmap-panel/default.nix @@ -1,13 +1,13 @@ { grafanaPlugin, lib }: -grafanaPlugin rec { +grafanaPlugin { pname = "grafana-worldmap-panel"; version = "1.0.6"; zipHash = "sha256-/lgsdBEL9HdJX1X1Qy0THBlYdUUI8SRtgF1Wig1Ktpk="; - meta = with lib; { + meta = { description = "World Map panel for Grafana"; - license = licenses.mit; - maintainers = with maintainers; [ lukegb ]; - platforms = platforms.unix; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.lukegb ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/servers/monitoring/grafana/plugins/marcusolsson-calendar-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/marcusolsson-calendar-panel/default.nix index cdf6b85c2a81db..e2fd241402fb8c 100644 --- a/pkgs/servers/monitoring/grafana/plugins/marcusolsson-calendar-panel/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/marcusolsson-calendar-panel/default.nix @@ -1,13 +1,13 @@ { grafanaPlugin, lib }: -grafanaPlugin rec { +grafanaPlugin { pname = "marcusolsson-calendar-panel"; version = "3.7.0"; zipHash = "sha256-O8EvkS+lWq2qaIj1HJzPagRGhrEENvY1YDBusvUejM0="; - meta = with lib; { + meta = { description = "Calendar Panel is a Grafana plugin that displays events from various data sources."; - license = licenses.asl20; - maintainers = with maintainers; [ nagisa ]; - platforms = platforms.unix; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.nagisa ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/servers/monitoring/grafana/plugins/marcusolsson-csv-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/marcusolsson-csv-datasource/default.nix index bafa04400514a5..cfc24d746a3655 100644 --- a/pkgs/servers/monitoring/grafana/plugins/marcusolsson-csv-datasource/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/marcusolsson-csv-datasource/default.nix @@ -1,6 +1,6 @@ { grafanaPlugin, lib }: -grafanaPlugin rec { +grafanaPlugin { pname = "marcusolsson-csv-datasource"; version = "0.6.19"; zipHash = { @@ -9,10 +9,10 @@ grafanaPlugin rec { x86_64-darwin = "sha256-6sGA06INQbiRCd23ykdtUWAR+oA3YFh57KBT7zWUP44="; aarch64-darwin = "sha256-gzQRcPeRqLvl27SB18hTTtcHx/namT2V0NOgX5J1mbs="; }; - meta = with lib; { + meta = { description = "The Grafana CSV Datasource plugin is designed to load CSV data into Grafana, expanding your capabilities to visualize and analyze data stored in CSV (Comma-Separated Values) format."; - license = licenses.asl20; - maintainers = with maintainers; [ nagisa ]; - platforms = platforms.unix; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.nagisa ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/servers/monitoring/grafana/plugins/marcusolsson-dynamictext-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/marcusolsson-dynamictext-panel/default.nix index 55b5f39d90ad6a..1ed2e9e9cfc094 100644 --- a/pkgs/servers/monitoring/grafana/plugins/marcusolsson-dynamictext-panel/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/marcusolsson-dynamictext-panel/default.nix @@ -1,13 +1,13 @@ { grafanaPlugin, lib }: -grafanaPlugin rec { +grafanaPlugin { pname = "marcusolsson-dynamictext-panel"; version = "5.4.0"; zipHash = "sha256-IgPON60oRqO52W64UvHuwYoa6UG2NfDWIA4S2HfkGQs="; - meta = with lib; { + meta = { description = "Dynamic, data-driven text panel for Grafana"; - license = licenses.asl20; - maintainers = with maintainers; [ herbetom ]; - platforms = platforms.unix; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.herbetom ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/servers/monitoring/grafana/plugins/marcusolsson-json-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/marcusolsson-json-datasource/default.nix index f2ca72a12134af..b443dfedd1614f 100644 --- a/pkgs/servers/monitoring/grafana/plugins/marcusolsson-json-datasource/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/marcusolsson-json-datasource/default.nix @@ -1,13 +1,13 @@ { grafanaPlugin, lib }: -grafanaPlugin rec { +grafanaPlugin { pname = "marcusolsson-json-datasource"; version = "1.3.17"; zipHash = "sha256-L1G5s9fEEuvNs5AWXlT00f+dU2/2Rtjm4R3kpFc4NRg="; - meta = with lib; { + meta = { description = "The Grafana JSON Datasource plugin empowers you to seamlessly integrate JSON data into Grafana."; - license = licenses.asl20; - maintainers = with maintainers; [ nagisa ]; - platforms = platforms.unix; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.nagisa ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/servers/monitoring/grafana/plugins/redis-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/redis-app/default.nix index f3dedc247bdb20..714e995fd9771b 100644 --- a/pkgs/servers/monitoring/grafana/plugins/redis-app/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/redis-app/default.nix @@ -1,13 +1,13 @@ { grafanaPlugin, lib }: -grafanaPlugin rec { +grafanaPlugin { pname = "redis-app"; version = "2.2.1"; zipHash = "sha256-1ZzJaGhlM6CaTecj69aqJ9fqN7wYSsiDCMTRVkZJUb0="; - meta = with lib; { + meta = { description = "Redis Application plugin for Grafana"; - license = licenses.asl20; - maintainers = with maintainers; [ azahi ]; - platforms = platforms.unix; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.azahi ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/servers/monitoring/grafana/plugins/redis-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/redis-datasource/default.nix index 4d21fe4fffecef..d76b8e81b8558a 100644 --- a/pkgs/servers/monitoring/grafana/plugins/redis-datasource/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/redis-datasource/default.nix @@ -1,13 +1,13 @@ { grafanaPlugin, lib }: -grafanaPlugin rec { +grafanaPlugin { pname = "redis-datasource"; version = "2.2.0"; zipHash = "sha256-a4at8o185XSOyNxZZKfb0/j1CVoKQ9JZx0ofoPUBqKs="; - meta = with lib; { + meta = { description = "Redis Data Source for Grafana"; - license = licenses.asl20; - maintainers = with maintainers; [ azahi ]; - platforms = platforms.unix; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.azahi ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/servers/monitoring/grafana/plugins/redis-explorer-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/redis-explorer-app/default.nix index e58da0bebd8308..500afb5b7baaef 100644 --- a/pkgs/servers/monitoring/grafana/plugins/redis-explorer-app/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/redis-explorer-app/default.nix @@ -1,13 +1,13 @@ { grafanaPlugin, lib }: -grafanaPlugin rec { +grafanaPlugin { pname = "redis-explorer-app"; version = "2.1.1"; zipHash = "sha256-t5L9XURNcswDbZWSmehs/JYU7NoEwhX1If7ghbi509g="; - meta = with lib; { + meta = { description = "Redis Explorer plugin for Grafana"; - license = licenses.asl20; - maintainers = with maintainers; [ azahi ]; - platforms = platforms.unix; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.azahi ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/servers/monitoring/grafana/plugins/ventura-psychrometric-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/ventura-psychrometric-panel/default.nix index 28cdd3f09446b3..8d473bcd504095 100644 --- a/pkgs/servers/monitoring/grafana/plugins/ventura-psychrometric-panel/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/ventura-psychrometric-panel/default.nix @@ -1,13 +1,13 @@ { grafanaPlugin, lib }: -grafanaPlugin rec { +grafanaPlugin { pname = "ventura-psychrometric-panel"; version = "4.5.1"; zipHash = "sha256-Y/Eh3eWZkPS8Q1eha7sEJ3wTMI7QxOr7MEbPc25fnGg="; - meta = with lib; { + meta = { description = "Grafana plugin to display air conditions on a psychrometric chart."; - license = licenses.bsd3Lbnl; - maintainers = with maintainers; [ nagisa ]; - platforms = platforms.unix; + license = lib.licenses.bsd3Lbnl; + maintainers = [ lib.maintainers.nagisa ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-echarts-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-echarts-panel/default.nix index ecb8b7f707271e..a8391882ffc005 100644 --- a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-echarts-panel/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-echarts-panel/default.nix @@ -1,13 +1,13 @@ { grafanaPlugin, lib }: -grafanaPlugin rec { +grafanaPlugin { pname = "volkovlabs-echarts-panel"; version = "6.4.1"; zipHash = "sha256-RHOfFKplZs0gbD/esvrpXkkPKPfo5R4zjCUJWPpkDNU="; - meta = with lib; { + meta = { description = "The Apache ECharts plugin is a visualization panel for Grafana that allows you to incorporate the popular Apache ECharts library into your Grafana dashboard."; - license = licenses.asl20; - maintainers = with maintainers; [ nagisa ]; - platforms = platforms.unix; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.nagisa ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-form-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-form-panel/default.nix index 21eb1fb5cf41ad..0be477ba97de09 100644 --- a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-form-panel/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-form-panel/default.nix @@ -1,13 +1,13 @@ { grafanaPlugin, lib }: -grafanaPlugin rec { +grafanaPlugin { pname = "volkovlabs-form-panel"; version = "4.6.0"; zipHash = "sha256-ne2dfCr+PBodeaxGfZL0VrAxHLYEAaeQfuZQf2F3s0s="; - meta = with lib; { + meta = { description = "The Data Manipulation Panel is the first plugin that allows inserting and updating application data, as well as modifying configuration directly from your Grafana dashboard."; - license = licenses.asl20; - maintainers = with maintainers; [ nagisa ]; - platforms = platforms.unix; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.nagisa ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-rss-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-rss-datasource/default.nix index 06c5b41e798ae9..9c8dda9fbe9160 100644 --- a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-rss-datasource/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-rss-datasource/default.nix @@ -1,13 +1,13 @@ { grafanaPlugin, lib }: -grafanaPlugin rec { +grafanaPlugin { pname = "volkovlabs-rss-datasource"; version = "4.2.0"; zipHash = "sha256-+3tgvpH6xlJORqN4Sx7qwzsiQZoLwdarzhx6kHvtOoY="; - meta = with lib; { + meta = { description = "The RSS/Atom data source is a plugin for Grafana that retrieves RSS/Atom feeds and allows visualizing them using Dynamic Text and other panels."; - license = licenses.asl20; - maintainers = with maintainers; [ nagisa ]; - platforms = platforms.unix; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.nagisa ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-variable-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-variable-panel/default.nix index abeffe05dc1091..c350e3aa070368 100644 --- a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-variable-panel/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-variable-panel/default.nix @@ -1,13 +1,13 @@ { grafanaPlugin, lib }: -grafanaPlugin rec { +grafanaPlugin { pname = "volkovlabs-variable-panel"; version = "3.5.0"; zipHash = "sha256-SqMTCdB+8OUo94zJ3eS5NoCeyjc7sdMCR0CTvVe/L1g="; - meta = with lib; { + meta = { description = "The Variable panel allows you to have dashboard filters in a separate panel which you can place anywhere on the dashboard."; - license = licenses.asl20; - maintainers = with maintainers; [ nagisa ]; - platforms = platforms.unix; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.nagisa ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/servers/monitoring/grafana/plugins/yesoreyeram-infinity-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/yesoreyeram-infinity-datasource/default.nix index 7c6eab7d4931bd..b63f3b5f9e6693 100644 --- a/pkgs/servers/monitoring/grafana/plugins/yesoreyeram-infinity-datasource/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/yesoreyeram-infinity-datasource/default.nix @@ -1,6 +1,6 @@ { grafanaPlugin, lib }: -grafanaPlugin rec { +grafanaPlugin { pname = "yesoreyeram-infinity-datasource"; version = "2.11.0"; zipHash = { @@ -9,10 +9,10 @@ grafanaPlugin rec { x86_64-darwin = "sha256-BuOMpZK+NoJx32f3pqcDI5szIW4bQl3+yFZI9zjzYE8="; aarch64-darwin = "sha256-ss/HxouKDZYZvF42KWJgMbOh9kSviH5oz6f/mrlcXk8="; }; - meta = with lib; { + meta = { description = "Visualize data from JSON, CSV, XML, GraphQL and HTML endpoints in Grafana."; - license = licenses.asl20; - maintainers = with maintainers; [ nagisa ]; - platforms = platforms.unix; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.nagisa ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/servers/monitoring/laurel/default.nix b/pkgs/servers/monitoring/laurel/default.nix index 30791e412af193..5ab047ab4a4d09 100644 --- a/pkgs/servers/monitoring/laurel/default.nix +++ b/pkgs/servers/monitoring/laurel/default.nix @@ -28,12 +28,12 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ rustPlatform.bindgenHook ]; buildInputs = [ acl ]; - meta = with lib; { + meta = { description = "Transform Linux Audit logs for SIEM usage"; homepage = "https://github.com/threathunters-io/laurel"; changelog = "https://github.com/threathunters-io/laurel/releases/tag/v${version}"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ emilylange ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = [ lib.maintainers.emilylange ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/servers/monitoring/openobserve/default.nix b/pkgs/servers/monitoring/openobserve/default.nix index 7bc779d552d5de..cbb5cf59387ce2 100644 --- a/pkgs/servers/monitoring/openobserve/default.nix +++ b/pkgs/servers/monitoring/openobserve/default.nix @@ -140,11 +140,11 @@ rustPlatform.buildRustPackage { "--skip tests::e2e_test" ]; - meta = with lib; { + meta = { description = "Cloud-native observability platform built specifically for logs, metrics, traces, analytics & realtime user-monitoring"; homepage = "https://github.com/openobserve/openobserve"; - license = licenses.asl20; - maintainers = with maintainers; [ happysalada ]; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.happysalada ]; mainProgram = "openobserve"; }; } diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 84c8d7ce74bb9f..86d68cbceac86e 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -275,15 +275,15 @@ let passthru.tests.nixos = nixosTests.mpd; - meta = with lib; { + meta = { description = "Flexible, powerful daemon for playing music"; homepage = "https://www.musicpd.org/"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ astsmtl tobim ]; - platforms = platforms.unix; + platforms = lib.platforms.unix; mainProgram = "mpd"; longDescription = '' diff --git a/pkgs/servers/oxigraph/default.nix b/pkgs/servers/oxigraph/default.nix index 091b2037d23565..98ab0b4eb17606 100644 --- a/pkgs/servers/oxigraph/default.nix +++ b/pkgs/servers/oxigraph/default.nix @@ -30,12 +30,12 @@ rustPlatform.buildRustPackage rec { # requires packaging of the associated python modules doCheck = false; - meta = with lib; { + meta = { homepage = "https://github.com/oxigraph/oxigraph"; description = "SPARQL graph database"; platforms = [ "x86_64-linux" "aarch64-linux" "aarch64-darwin" ]; - maintainers = with maintainers; [ astro ]; - license = with licenses; [ asl20 mit ]; + maintainers = [ lib.maintainers.astro ]; + license = with lib.licenses; [ asl20 mit ]; mainProgram = "oxigraph_server"; }; } diff --git a/pkgs/servers/peertube/default.nix b/pkgs/servers/peertube/default.nix index 3b52900577afba..fa0a807036bb21 100644 --- a/pkgs/servers/peertube/default.nix +++ b/pkgs/servers/peertube/default.nix @@ -185,7 +185,7 @@ stdenv.mkDerivation rec { passthru.tests.peertube = nixosTests.peertube; - meta = with lib; { + meta = { description = "Free software to take back control of your videos"; longDescription = '' PeerTube aspires to be a decentralized and free/libre alternative to video @@ -201,7 +201,7 @@ stdenv.mkDerivation rec { though if the administrator of your instance had previously connected it with other instances. ''; - license = licenses.agpl3Plus; + license = lib.licenses.agpl3Plus; homepage = "https://joinpeertube.org/"; platforms = [ "x86_64-linux" @@ -209,7 +209,7 @@ stdenv.mkDerivation rec { # feasible, looking for maintainer to help out # "x86_64-darwin" "aarch64-darwin" ]; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ immae izorkin stevenroose diff --git a/pkgs/servers/pinnwand/default.nix b/pkgs/servers/pinnwand/default.nix index 2b19dedb1093d8..2492e39e621268 100644 --- a/pkgs/servers/pinnwand/default.nix +++ b/pkgs/servers/pinnwand/default.nix @@ -5,8 +5,7 @@ nixosTests, }: -with python3.pkgs; -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "pinnwand"; version = "1.6.0"; pyproject = true; @@ -18,9 +17,9 @@ buildPythonApplication rec { hash = "sha256-oB7Dd1iVzGqr+5nG7BfZuwOQUgUnmg6ptQDZPGH7P5E="; }; - build-system = [ pdm-pep517 ]; + build-system = with python3.pkgs; [ pdm-pep517 ]; - dependencies = [ + dependencies = with python3.pkgs; [ click docutils pygments @@ -32,7 +31,7 @@ buildPythonApplication rec { tornado ]; - nativeCheckInputs = [ + nativeCheckInputs = with python3.pkgs; [ gitpython pytest-asyncio pytest-cov-stub @@ -52,13 +51,13 @@ buildPythonApplication rec { passthru.tests = nixosTests.pinnwand; - meta = with lib; { + meta = { changelog = "https://github.com/supakeen/pinnwand/releases/tag/v${version}"; description = "Python pastebin that tries to keep it simple"; homepage = "https://github.com/supakeen/pinnwand"; - license = licenses.mit; - maintainers = with maintainers; [ hexa ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.hexa ]; mainProgram = "pinnwand"; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/servers/pinnwand/steck.nix b/pkgs/servers/pinnwand/steck.nix index f4f8578c0797a4..87f5a539b1b8c5 100644 --- a/pkgs/servers/pinnwand/steck.nix +++ b/pkgs/servers/pinnwand/steck.nix @@ -41,11 +41,11 @@ python3Packages.buildPythonApplication rec { passthru.tests = nixosTests.pinnwand; - meta = with lib; { + meta = { homepage = "https://github.com/supakeen/steck"; - license = licenses.mit; + license = lib.licenses.mit; description = "Client for pinnwand pastebin"; mainProgram = "steck"; - maintainers = with maintainers; [ hexa ]; + maintainers = [ lib.maintainers.hexa ]; }; } diff --git a/pkgs/servers/piping-server-rust/default.nix b/pkgs/servers/piping-server-rust/default.nix index 5b4d101b2ff0ea..95a258456b3657 100644 --- a/pkgs/servers/piping-server-rust/default.nix +++ b/pkgs/servers/piping-server-rust/default.nix @@ -25,12 +25,12 @@ rustPlatform.buildRustPackage rec { Security ]; - meta = with lib; { + meta = { description = "Infinitely transfer between every device over pure HTTP with pipes or browsers"; homepage = "https://github.com/nwtgck/piping-server-rust"; changelog = "https://github.com/nwtgck/piping-server-rust/blob/v${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.figsoda ]; mainProgram = "piping-server"; }; } diff --git a/pkgs/servers/roapi/http.nix b/pkgs/servers/roapi/http.nix index 21d5359e7fd7a3..021f40863b4b20 100644 --- a/pkgs/servers/roapi/http.nix +++ b/pkgs/servers/roapi/http.nix @@ -46,11 +46,11 @@ stdenv.mkDerivation rec { cp roapi-http $out/bin ''; - meta = with lib; { + meta = { description = "Create full-fledged APIs for static datasets without writing a single line of code."; homepage = "https://roapi.github.io/docs/"; - license = licenses.asl20; - maintainers = with maintainers; [ happysalada ]; - platforms = platforms.darwin; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.happysalada ]; + platforms = lib.platforms.darwin; }; } diff --git a/pkgs/servers/shairplay/default.nix b/pkgs/servers/shairplay/default.nix index 3bfdd8ead9afb3..9cdfb5c6951b80 100644 --- a/pkgs/servers/shairplay/default.nix +++ b/pkgs/servers/shairplay/default.nix @@ -38,12 +38,12 @@ stdenv.mkDerivation rec { $out/bin/shairplay ''; - meta = with lib; { + meta = { inherit (src.meta) homepage; description = "Apple AirPlay and RAOP protocol server"; - license = licenses.mit; - maintainers = with maintainers; [ peterhoeg ]; - platforms = platforms.unix; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.peterhoeg ]; + platforms = lib.platforms.unix; mainProgram = "shairplay"; }; } diff --git a/pkgs/servers/sickbeard/sickgear.nix b/pkgs/servers/sickbeard/sickgear.nix index ddbf2c0945113e..b9e7b3e0eabcc5 100644 --- a/pkgs/servers/sickbeard/sickgear.nix +++ b/pkgs/servers/sickbeard/sickgear.nix @@ -47,11 +47,11 @@ stdenv.mkDerivation rec { --suffix PATH : ${lib.makeBinPath [ libarchive ]} ''; - meta = with lib; { + meta = { description = "Most reliable stable TV fork of the great Sick-Beard to fully automate TV enjoyment with innovation"; mainProgram = "sickgear"; - license = licenses.gpl3; + license = lib.licenses.gpl3; homepage = "https://github.com/SickGear/SickGear"; - maintainers = with lib.maintainers; [ rembo10 ]; + maintainers = [ lib.maintainers.rembo10 ]; }; } diff --git a/pkgs/servers/snac2/default.nix b/pkgs/servers/snac2/default.nix index 9fb1750807ebaa..f20ba2d91dce34 100644 --- a/pkgs/servers/snac2/default.nix +++ b/pkgs/servers/snac2/default.nix @@ -43,13 +43,13 @@ stdenv.mkDerivation rec { updateScript = nix-update-script { }; }; - meta = with lib; { + meta = { homepage = "https://codeberg.org/grunfink/snac2"; description = "Simple, minimalistic ActivityPub instance (2.x, C)"; changelog = "https://codeberg.org/grunfink/snac2/src/tag/${version}/RELEASE_NOTES.md"; - license = licenses.mit; - maintainers = with maintainers; [ misuzu ]; - platforms = platforms.unix; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.misuzu ]; + platforms = lib.platforms.unix; mainProgram = "snac"; }; } diff --git a/pkgs/servers/spicedb/default.nix b/pkgs/servers/spicedb/default.nix index 2eed999ae2e5cf..09064113d411af 100644 --- a/pkgs/servers/spicedb/default.nix +++ b/pkgs/servers/spicedb/default.nix @@ -23,15 +23,15 @@ buildGoModule rec { subPackages = [ "cmd/spicedb" ]; - meta = with lib; { + meta = { description = "Open source permission database"; longDescription = '' SpiceDB is an open-source permissions database inspired by Google Zanzibar. ''; homepage = "https://authzed.com/"; - license = licenses.asl20; - maintainers = with maintainers; [ thoughtpolice ]; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.thoughtpolice ]; mainProgram = "spicedb"; }; } diff --git a/pkgs/servers/spicedb/zed.nix b/pkgs/servers/spicedb/zed.nix index 98364e02609895..fcb8e57d45c5ed 100644 --- a/pkgs/servers/spicedb/zed.nix +++ b/pkgs/servers/spicedb/zed.nix @@ -21,7 +21,7 @@ buildGoModule rec { "-X 'github.com/jzelinskie/cobrautil/v2.Version=${src.rev}'" ]; - meta = with lib; { + meta = { description = "Command line for managing SpiceDB"; mainProgram = "zed"; longDescription = '' @@ -29,7 +29,7 @@ buildGoModule rec { Google Zanzibar. zed is the command line client for SpiceDB. ''; homepage = "https://authzed.com/"; - license = licenses.asl20; - maintainers = with maintainers; [ thoughtpolice ]; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.thoughtpolice ]; }; } diff --git a/pkgs/servers/tautulli/default.nix b/pkgs/servers/tautulli/default.nix index af9c015bf94af9..9f07dedfa41269 100644 --- a/pkgs/servers/tautulli/default.nix +++ b/pkgs/servers/tautulli/default.nix @@ -53,11 +53,11 @@ buildPythonApplication rec { runHook postCheck ''; - meta = with lib; { + meta = { description = "Python based monitoring and tracking tool for Plex Media Server"; homepage = "https://tautulli.com/"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ rhoriguchi ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.rhoriguchi ]; }; } diff --git a/pkgs/servers/unpackerr/default.nix b/pkgs/servers/unpackerr/default.nix index 0e01767fa2ba71..bbb54824d52ea5 100644 --- a/pkgs/servers/unpackerr/default.nix +++ b/pkgs/servers/unpackerr/default.nix @@ -31,11 +31,11 @@ buildGoModule rec { "-X golift.io/version.Version=${version}" ]; - meta = with lib; { + meta = { description = "Extracts downloads for Radarr, Sonarr, Lidarr - Deletes extracted files after import"; homepage = "https://github.com/davidnewhall/unpackerr"; maintainers = [ ]; - license = licenses.mit; + license = lib.licenses.mit; mainProgram = "unpackerr"; }; } diff --git a/pkgs/servers/unstructured-api/default.nix b/pkgs/servers/unstructured-api/default.nix index 5f323fdd305336..a32ce53e5211e2 100644 --- a/pkgs/servers/unstructured-api/default.nix +++ b/pkgs/servers/unstructured-api/default.nix @@ -187,11 +187,11 @@ stdenvNoCC.mkDerivation { updateScript = nix-update-script { }; }; - meta = with lib; { + meta = { description = "open-source toolkit designed to make it easy to prepare unstructured data like PDFs, HTML and Word Documents for downstream data science tasks"; homepage = "https://github.com/Unstructured-IO/unstructured-api"; changelog = "https://github.com/Unstructured-IO/unstructured-api/releases/tag/${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ happysalada ]; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.happysalada ]; }; } diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index d1d67d74b1532e..25ae11abe190f9 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -79,12 +79,12 @@ let nixosTests."varnish${builtins.replaceStrings [ "." ] [ "" ] (lib.versions.majorMinor version)}"; }; - meta = with lib; { + meta = { description = "Web application accelerator also known as a caching HTTP reverse proxy"; homepage = "https://www.varnish-cache.org"; - license = licenses.bsd2; + license = lib.licenses.bsd2; maintainers = [ ]; - platforms = platforms.unix; + platforms = lib.platforms.unix; }; }; in diff --git a/pkgs/servers/varnish/digest.nix b/pkgs/servers/varnish/digest.nix index 763e534a56976b..1d311e23a1b3cc 100644 --- a/pkgs/servers/varnish/digest.nix +++ b/pkgs/servers/varnish/digest.nix @@ -1,5 +1,4 @@ { - lib, stdenv, fetchFromGitHub, autoreconfHook, @@ -7,7 +6,6 @@ varnish, libmhash, docutils, - coreutils, version, sha256, }: @@ -44,7 +42,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with lib; { + meta = { description = "Digest and HMAC vmod"; homepage = "https://github.com/varnish/libvmod-digest"; inherit (varnish.meta) license platforms maintainers; diff --git a/pkgs/servers/varnish/dynamic.nix b/pkgs/servers/varnish/dynamic.nix index da1df5fc50a69c..5f481277496b1a 100644 --- a/pkgs/servers/varnish/dynamic.nix +++ b/pkgs/servers/varnish/dynamic.nix @@ -1,5 +1,4 @@ { - lib, stdenv, fetchFromGitHub, autoreconfHook269, @@ -33,7 +32,7 @@ stdenv.mkDerivation { ''; configureFlags = [ "VMOD_DIR=$(out)/lib/varnish/vmods" ]; - meta = with lib; { + meta = { description = "Dynamic director similar to the DNS director from Varnish 3"; homepage = "https://github.com/nigoroll/libvmod-dynamic"; inherit (varnish.meta) license platforms maintainers; diff --git a/pkgs/servers/varnish/modules.nix b/pkgs/servers/varnish/modules.nix index 225d5c5e9f42ee..0dde0ee0215c70 100644 --- a/pkgs/servers/varnish/modules.nix +++ b/pkgs/servers/varnish/modules.nix @@ -43,7 +43,7 @@ let postInstall = "find $out -type f -exec remove-references-to -t ${varnish.dev} '{}' +"; # varnish.dev captured only as __FILE__ in assert messages - meta = with lib; { + meta = { description = "Collection of Varnish Cache modules (vmods) by Varnish Software"; homepage = "https://github.com/varnish/varnish-modules"; inherit (varnish.meta) license platforms maintainers; diff --git a/pkgs/servers/x11/quartz-wm/default.nix b/pkgs/servers/x11/quartz-wm/default.nix index b6a1c1f525be42..21cd4c045b6a5b 100644 --- a/pkgs/servers/x11/quartz-wm/default.nix +++ b/pkgs/servers/x11/quartz-wm/default.nix @@ -37,9 +37,9 @@ stdenv.mkDerivation { Xplugin Foundation ]; - meta = with lib; { - license = licenses.apple-psl20; - platforms = platforms.darwin; - maintainers = with maintainers; [ matthewbauer ]; + meta = { + license = lib.licenses.apple-psl20; + platforms = lib.platforms.darwin; + maintainers = [ lib.maintainers.matthewbauer ]; }; } diff --git a/pkgs/servers/x11/xorg/xcb-util-xrm.nix b/pkgs/servers/x11/xorg/xcb-util-xrm.nix index 487e0cb406616c..f075c8364a6b3e 100644 --- a/pkgs/servers/x11/xorg/xcb-util-xrm.nix +++ b/pkgs/servers/x11/xorg/xcb-util-xrm.nix @@ -31,10 +31,10 @@ stdenv.mkDerivation rec { libX11 ]; - meta = with lib; { + meta = { description = "XCB utility functions for the X resource manager"; homepage = "https://github.com/Airblader/xcb-util-xrm"; - license = licenses.mit; # X11 variant - platforms = with platforms; unix; + license = lib.licenses.mit; # X11 variant + platforms = lib.platforms.unix; }; } diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix index eb46bb349a4335..b7ba7acc05ff5b 100644 --- a/pkgs/servers/x11/xorg/xwayland.nix +++ b/pkgs/servers/x11/xorg/xwayland.nix @@ -128,15 +128,15 @@ stdenv.mkDerivation rec { rev-prefix = "xwayland-"; }; - meta = with lib; { + meta = { description = "X server for interfacing X11 apps with the Wayland protocol"; homepage = "https://wayland.freedesktop.org/xserver.html"; - license = licenses.mit; + license = lib.licenses.mit; mainProgram = "Xwayland"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ emantor k900 ]; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/shells/bash/5.nix b/pkgs/shells/bash/5.nix index 1e1fe340dcda17..14e2e706e8fb7a 100644 --- a/pkgs/shells/bash/5.nix +++ b/pkgs/shells/bash/5.nix @@ -136,7 +136,7 @@ stdenv.mkDerivation rec { tests.static = pkgsStatic.bash; }; - meta = with lib; { + meta = { homepage = "https://www.gnu.org/software/bash/"; description = "GNU Bourne-Again Shell, the de facto standard shell on Linux" + lib.optionalString interactive " (for interactive use)"; longDescription = '' @@ -149,8 +149,8 @@ stdenv.mkDerivation rec { interactive use. In addition, most sh scripts can be run by Bash without modification. ''; - license = licenses.gpl3Plus; - platforms = platforms.all; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.all; # https://github.com/NixOS/nixpkgs/issues/333338 badPlatforms = [ lib.systems.inspect.patterns.isMinGW ]; maintainers = [ ]; diff --git a/pkgs/shells/carapace/default.nix b/pkgs/shells/carapace/default.nix index fb90bfb8ffa4c9..bc90491e40cd97 100644 --- a/pkgs/shells/carapace/default.nix +++ b/pkgs/shells/carapace/default.nix @@ -35,11 +35,11 @@ buildGoModule rec { passthru.tests.version = testers.testVersion { package = carapace; }; - meta = with lib; { + meta = { description = "Multi-shell multi-command argument completer"; homepage = "https://carapace.sh/"; - maintainers = with maintainers; [ mimame ]; - license = licenses.mit; + maintainers = [ lib.maintainers.mimame ]; + license = lib.licenses.mit; mainProgram = "carapace"; }; } diff --git a/pkgs/shells/fish/babelfish.nix b/pkgs/shells/fish/babelfish.nix index d5a317b6186340..368bdee4b4abb5 100644 --- a/pkgs/shells/fish/babelfish.nix +++ b/pkgs/shells/fish/babelfish.nix @@ -16,12 +16,12 @@ buildGoModule rec { vendorHash = "sha256-HY9ejLfT6gj3vUMSzbNZ4QlpB+liigTtNDBNWCy8X38="; - meta = with lib; { + meta = { description = "Translate bash scripts to fish"; mainProgram = "babelfish"; homepage = "https://github.com/bouk/babelfish"; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ bouk kevingriffin ]; diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 76d9a9b2fbc783..4f8fc26948b077 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -333,13 +333,13 @@ let tee -a $out/share/fish/__fish_build_paths.fish < ${fishPreInitHooks} ''; - meta = with lib; { + meta = { description = "Smart and user-friendly command line shell"; homepage = "https://fishshell.com/"; changelog = "https://github.com/fish-shell/fish-shell/releases/tag/${version}"; - license = licenses.gpl2Only; - platforms = platforms.unix; - maintainers = with maintainers; [ + license = lib.licenses.gpl2Only; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ adamcstephens cole-h winter diff --git a/pkgs/shells/fish/plugins/async-prompt.nix b/pkgs/shells/fish/plugins/async-prompt.nix index 2f25dcf87060e8..241fecda1900a4 100644 --- a/pkgs/shells/fish/plugins/async-prompt.nix +++ b/pkgs/shells/fish/plugins/async-prompt.nix @@ -15,10 +15,10 @@ buildFishPlugin rec { hash = "sha256-B7Ze0a5Zp+5JVsQUOv97mKHh5wiv3ejsDhJMrK7YOx4="; }; - meta = with lib; { + meta = { description = "Make your prompt asynchronous to improve the reactivity"; homepage = "https://github.com/acomagu/fish-async-prompt"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.figsoda ]; }; } diff --git a/pkgs/shells/fish/plugins/autopair.nix b/pkgs/shells/fish/plugins/autopair.nix index 6832c0bf746ba3..1bca9e22b4dc94 100644 --- a/pkgs/shells/fish/plugins/autopair.nix +++ b/pkgs/shells/fish/plugins/autopair.nix @@ -15,11 +15,11 @@ buildFishPlugin rec { sha256 = "sha256-s1o188TlwpUQEN3X5MxUlD/2CFCpEkWu83U9O+wg3VU="; }; - meta = with lib; { + meta = { description = "Auto-complete matching pairs in the Fish command line"; homepage = "https://github.com/jorgebucaran/autopair.fish"; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ figsoda kidonng pyrox0 diff --git a/pkgs/shells/fish/plugins/bass.nix b/pkgs/shells/fish/plugins/bass.nix index f14be816f7af8c..3b1a682b5849a3 100644 --- a/pkgs/shells/fish/plugins/bass.nix +++ b/pkgs/shells/fish/plugins/bass.nix @@ -26,10 +26,10 @@ buildFishPlugin rec { make test ''; - meta = with lib; { + meta = { description = "Fish function making it easy to use utilities written for Bash in Fish shell"; homepage = "https://github.com/edc/bass"; - license = licenses.mit; - maintainers = with maintainers; [ beezow ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ beezow ]; }; } diff --git a/pkgs/shells/fish/plugins/bobthefish.nix b/pkgs/shells/fish/plugins/bobthefish.nix index b2c723b275e9c2..ea1100df649a62 100644 --- a/pkgs/shells/fish/plugins/bobthefish.nix +++ b/pkgs/shells/fish/plugins/bobthefish.nix @@ -14,10 +14,10 @@ buildFishPlugin { sha256 = "sha256-LB4g+EA3C7OxTuHfcxfgl8IVBe5NufFc+5z9VcS0Bt0="; }; - meta = with lib; { + meta = { description = "Powerline-style, Git-aware fish theme optimized for awesome"; homepage = "https://github.com/oh-my-fish/theme-bobthefish"; - license = licenses.mit; - maintainers = with maintainers; [ Scrumplex ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.Scrumplex ]; }; } diff --git a/pkgs/shells/fish/plugins/bobthefisher.nix b/pkgs/shells/fish/plugins/bobthefisher.nix index 39d16ea6100b42..bc115662e02403 100644 --- a/pkgs/shells/fish/plugins/bobthefisher.nix +++ b/pkgs/shells/fish/plugins/bobthefisher.nix @@ -14,10 +14,10 @@ buildFishPlugin { sha256 = "sha256-l1DHSZa40BX2/4GCjm5E53UOeFEnMioWbZtCW14WX6k="; }; - meta = with lib; { + meta = { description = "Powerline-style, Git-aware fish theme optimized for awesome (fork of bobthefish)"; homepage = "https://github.com/Scrumplex/bobthefisher"; - license = licenses.mit; - maintainers = with maintainers; [ Scrumplex ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.Scrumplex ]; }; } diff --git a/pkgs/shells/fish/plugins/clownfish.nix b/pkgs/shells/fish/plugins/clownfish.nix index c70dc11fd3e4e3..1a2b7ffe1ca140 100644 --- a/pkgs/shells/fish/plugins/clownfish.nix +++ b/pkgs/shells/fish/plugins/clownfish.nix @@ -15,10 +15,10 @@ buildFishPlugin { sha256 = "04xvikyrdm6yxh588vbpwvm04fas76pa7sigsaqrip7yh021xxab"; }; - meta = with lib; { + meta = { description = "Fish function to mock the behaviour of commands"; homepage = "https://github.com/IlanCosman/clownfish"; - license = licenses.mit; - maintainers = with maintainers; [ euxane ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.euxane ]; }; } diff --git a/pkgs/shells/fish/plugins/colored-man-pages.nix b/pkgs/shells/fish/plugins/colored-man-pages.nix index b2c76ce1d86e89..8069143e8c5c05 100644 --- a/pkgs/shells/fish/plugins/colored-man-pages.nix +++ b/pkgs/shells/fish/plugins/colored-man-pages.nix @@ -4,7 +4,7 @@ fetchFromGitHub, }: -buildFishPlugin rec { +buildFishPlugin { pname = "colored-man-pages"; version = "0-unstable-2022-04-30"; @@ -15,10 +15,10 @@ buildFishPlugin rec { sha256 = "0ifqdbaw09hd1ai0ykhxl8735fcsm0x2fwfzsk7my2z52ds60bwa"; }; - meta = with lib; { + meta = { description = "Fish shell plugin to colorize man pages"; homepage = "https://github.com/PatrickF1/colored_man_pages.fish"; - license = licenses.mit; - maintainers = [ maintainers.jocelynthode ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.jocelynthode ]; }; } diff --git a/pkgs/shells/fish/plugins/done.nix b/pkgs/shells/fish/plugins/done.nix index 7c94772dc8df3f..3f031abe487ca5 100644 --- a/pkgs/shells/fish/plugins/done.nix +++ b/pkgs/shells/fish/plugins/done.nix @@ -21,10 +21,10 @@ buildFishPlugin rec { fishtape test/done.fish ''; - meta = with lib; { + meta = { description = "Automatically receive notifications when long processes finish"; homepage = "https://github.com/franciscolourenco/done"; - license = licenses.mit; - maintainers = [ maintainers.malo ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.malo ]; }; } diff --git a/pkgs/shells/fish/plugins/fifc.nix b/pkgs/shells/fish/plugins/fifc.nix index 0b287d39ba2fcf..a3b4ae23068b84 100644 --- a/pkgs/shells/fish/plugins/fifc.nix +++ b/pkgs/shells/fish/plugins/fifc.nix @@ -14,10 +14,10 @@ buildFishPlugin rec { hash = "sha256-p5E4Mx6j8hcM1bDbeftikyhfHxQ+qPDanuM1wNqGm6E="; }; - meta = with lib; { + meta = { description = "Fzf powers on top of fish completion engine and allows customizable completion rules"; homepage = "https://github.com/gazorby/fifc"; - license = licenses.mit; - maintainers = with maintainers; [ hmajid2301 ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ hmajid2301 ]; }; } diff --git a/pkgs/shells/fish/plugins/fishtape_3.nix b/pkgs/shells/fish/plugins/fishtape_3.nix index fa9d1c3839a058..2777fb3fd2ae67 100644 --- a/pkgs/shells/fish/plugins/fishtape_3.nix +++ b/pkgs/shells/fish/plugins/fishtape_3.nix @@ -20,10 +20,10 @@ buildFishPlugin rec { fishtape tests/*.fish ''; - meta = with lib; { + meta = { description = "100% pure-Fish test runner"; homepage = "https://github.com/jorgebucaran/fishtape"; - license = licenses.mit; - maintainers = with maintainers; [ euxane ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.euxane ]; }; } diff --git a/pkgs/shells/fish/plugins/foreign-env/default.nix b/pkgs/shells/fish/plugins/foreign-env/default.nix index ac9548b23523ab..c56f3160bc6760 100644 --- a/pkgs/shells/fish/plugins/foreign-env/default.nix +++ b/pkgs/shells/fish/plugins/foreign-env/default.nix @@ -27,10 +27,10 @@ buildFishPlugin { -i functions/* ''; - meta = with lib; { + meta = { description = "Foreign environment interface for Fish shell"; - license = licenses.mit; - maintainers = with maintainers; [ jgillich ]; - platforms = with platforms; unix; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.jgillich ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/shells/fish/plugins/forgit.nix b/pkgs/shells/fish/plugins/forgit.nix index 5c6886cba67fcc..45df03a78238a2 100644 --- a/pkgs/shells/fish/plugins/forgit.nix +++ b/pkgs/shells/fish/plugins/forgit.nix @@ -19,10 +19,10 @@ buildFishPlugin rec { cp -r bin $out/share/fish/vendor_conf.d/ ''; - meta = with lib; { + meta = { description = "Utility tool powered by fzf for using git interactively"; homepage = "https://github.com/wfxr/forgit"; - license = licenses.mit; - maintainers = with maintainers; [ happysalada ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.happysalada ]; }; } diff --git a/pkgs/shells/fish/plugins/fzf-fish.nix b/pkgs/shells/fish/plugins/fzf-fish.nix index 1bf3f640e30955..477b75a22eca9b 100644 --- a/pkgs/shells/fish/plugins/fzf-fish.nix +++ b/pkgs/shells/fish/plugins/fzf-fish.nix @@ -58,12 +58,12 @@ buildFishPlugin rec { ''script -c 'fish -c "fishtape tests/*/*.fish"' '' ); - meta = with lib; { + meta = { description = "Augment your fish command line with fzf key bindings"; homepage = "https://github.com/PatrickF1/fzf.fish"; changelog = "https://github.com/PatrickF1/fzf.fish/releases/tag/${src.rev}"; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ euxane natsukium ]; diff --git a/pkgs/shells/fish/plugins/fzf.nix b/pkgs/shells/fish/plugins/fzf.nix index 8e9d99a18a9daf..dc46ecbee5804d 100644 --- a/pkgs/shells/fish/plugins/fzf.nix +++ b/pkgs/shells/fish/plugins/fzf.nix @@ -14,10 +14,10 @@ buildFishPlugin rec { sha256 = "sha256-28QW/WTLckR4lEfHv6dSotwkAKpNJFCShxmKFGQQ1Ew="; }; - meta = with lib; { + meta = { description = "Ef-fish-ient fish keybindings for fzf"; homepage = "https://github.com/jethrokuan/fzf"; - license = licenses.mit; - maintainers = with maintainers; [ Scrumplex ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.Scrumplex ]; }; } diff --git a/pkgs/shells/fish/plugins/git-abbr.nix b/pkgs/shells/fish/plugins/git-abbr.nix index 664c897500827d..0fa2b96d57eac6 100644 --- a/pkgs/shells/fish/plugins/git-abbr.nix +++ b/pkgs/shells/fish/plugins/git-abbr.nix @@ -3,7 +3,7 @@ buildFishPlugin, fetchFromGitHub, }: -buildFishPlugin rec { +buildFishPlugin { pname = "fish-git-abbr"; version = "0.2.1-unstable-2023-06-19"; @@ -14,10 +14,10 @@ buildFishPlugin rec { hash = "sha256-6z3Wr2t8CP85xVEp6UCYaM2KC9PX4MDyx19f/wjHkb0="; }; - meta = with lib; { + meta = { description = "Abbreviations for git for the fish shell 🐟"; homepage = "https://github.com/lewisacidic/fish-git-abbr"; - license = licenses.mit; - maintainers = with maintainers; [ hmajid2301 ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.hmajid2301 ]; }; } diff --git a/pkgs/shells/fish/plugins/github-copilot-cli-fish.nix b/pkgs/shells/fish/plugins/github-copilot-cli-fish.nix index 0a1370f7156166..0a6b078aad7864 100644 --- a/pkgs/shells/fish/plugins/github-copilot-cli-fish.nix +++ b/pkgs/shells/fish/plugins/github-copilot-cli-fish.nix @@ -15,10 +15,10 @@ buildFishPlugin rec { hash = "sha256-CFXbeO0euC/UtvQV0KCz4WQfdJgsuXKPM6M9oaw7hvg="; }; - meta = with lib; { + meta = { description = "GitHub Copilot CLI aliases for Fish Shell"; homepage = "https://github.com/z11i/github-copilot-cli.fish"; - license = licenses.asl20; - maintainers = [ maintainers.malo ]; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.malo ]; }; } diff --git a/pkgs/shells/fish/plugins/grc.nix b/pkgs/shells/fish/plugins/grc.nix index af713bcc20137e..2774c0c2c40520 100644 --- a/pkgs/shells/fish/plugins/grc.nix +++ b/pkgs/shells/fish/plugins/grc.nix @@ -19,10 +19,10 @@ buildFishPlugin { cp conf.d/executables $out/share/fish/vendor_conf.d/ ''; - meta = with lib; { + meta = { description = "grc Colourizer for some commands on Fish shell"; - license = licenses.mit; - maintainers = with maintainers; [ onny ]; - platforms = with platforms; unix; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.onny ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/shells/fish/plugins/humantime-fish.nix b/pkgs/shells/fish/plugins/humantime-fish.nix index 33e708e94f82e1..5375def149748f 100644 --- a/pkgs/shells/fish/plugins/humantime-fish.nix +++ b/pkgs/shells/fish/plugins/humantime-fish.nix @@ -4,7 +4,7 @@ fetchFromGitHub, fishtape, }: -buildFishPlugin rec { +buildFishPlugin { pname = "humantime-fish"; version = "1.0.0-unstable-2022-04-08"; @@ -20,10 +20,10 @@ buildFishPlugin rec { fishtape tests/humantime.fish ''; - meta = with lib; { + meta = { description = "Turn milliseconds into a human-readable string in Fish"; homepage = "https://github.com/jorgebucaran/humantime.fish"; - license = licenses.mit; - maintainers = with maintainers; [ Scrumplex ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.Scrumplex ]; }; } diff --git a/pkgs/shells/fish/plugins/hydro.nix b/pkgs/shells/fish/plugins/hydro.nix index 4b7a7c3eeb4065..ca026985adbb78 100644 --- a/pkgs/shells/fish/plugins/hydro.nix +++ b/pkgs/shells/fish/plugins/hydro.nix @@ -4,7 +4,7 @@ fetchFromGitHub, }: -buildFishPlugin rec { +buildFishPlugin { pname = "hydro"; version = "0-unstable-2024-03-24"; @@ -15,10 +15,10 @@ buildFishPlugin rec { hash = "sha256-0MMiM0NRbjZPJLAMDXb+Frgm+du80XpAviPqkwoHjDA="; }; - meta = with lib; { + meta = { description = "Ultra-pure, lag-free prompt with async Git status"; homepage = "https://github.com/jorgebucaran/hydro"; - license = licenses.mit; - maintainers = with maintainers; [ pyrox0 ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.pyrox0 ]; }; } diff --git a/pkgs/shells/fish/plugins/pisces.nix b/pkgs/shells/fish/plugins/pisces.nix index be59b248277b30..0ddbe19c83b3fe 100644 --- a/pkgs/shells/fish/plugins/pisces.nix +++ b/pkgs/shells/fish/plugins/pisces.nix @@ -15,10 +15,10 @@ buildFishPlugin rec { sha256 = "sha256-Oou2IeNNAqR00ZT3bss/DbhrJjGeMsn9dBBYhgdafBw="; }; - meta = with lib; { + meta = { description = "Paired symbols in the command line"; homepage = "https://github.com/laughedelic/pisces"; - license = licenses.lgpl3; - maintainers = with maintainers; [ vanilla ]; + license = lib.licenses.lgpl3; + maintainers = with lib.maintainers; [ vanilla ]; }; } diff --git a/pkgs/shells/fish/plugins/sdkman-for-fish.nix b/pkgs/shells/fish/plugins/sdkman-for-fish.nix index c137cc2cded9f1..a4bd5e803c86e7 100644 --- a/pkgs/shells/fish/plugins/sdkman-for-fish.nix +++ b/pkgs/shells/fish/plugins/sdkman-for-fish.nix @@ -15,10 +15,10 @@ buildFishPlugin rec { hash = "sha256-7cgyR3hQ30Jv+9lJS5qaBvSaI/0YVT8xPXlUhDBTdFc="; }; - meta = with lib; { + meta = { description = "Adds support for SDKMAN! to fish"; homepage = "https://github.com/reitzig/sdkman-for-fish"; - license = licenses.mit; - maintainers = with maintainers; [ giorgiga ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.giorgiga ]; }; } diff --git a/pkgs/shells/fish/plugins/sponge.nix b/pkgs/shells/fish/plugins/sponge.nix index 81b29d77536623..892b376a3b359d 100644 --- a/pkgs/shells/fish/plugins/sponge.nix +++ b/pkgs/shells/fish/plugins/sponge.nix @@ -15,10 +15,10 @@ buildFishPlugin rec { sha256 = "sha256-MdcZUDRtNJdiyo2l9o5ma7nAX84xEJbGFhAVhK+Zm1w="; }; - meta = with lib; { + meta = { description = "keeps your fish shell history clean from typos, incorrectly used commands and everything you don't want to store due to privacy reasons"; homepage = "https://github.com/meaningful-ooo/sponge"; - license = licenses.mit; - maintainers = with maintainers; [ quantenzitrone ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.quantenzitrone ]; }; } diff --git a/pkgs/shells/fish/plugins/tide.nix b/pkgs/shells/fish/plugins/tide.nix index a0bfc69e95e7af..23789171992440 100644 --- a/pkgs/shells/fish/plugins/tide.nix +++ b/pkgs/shells/fish/plugins/tide.nix @@ -22,10 +22,10 @@ buildFishPlugin rec { cp -R functions/tide $out/share/fish/vendor_functions.d/ ''; - meta = with lib; { + meta = { description = "Ultimate Fish prompt"; homepage = "https://github.com/IlanCosman/tide"; - license = licenses.mit; - maintainers = [ maintainers.jocelynthode ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.jocelynthode ]; }; } diff --git a/pkgs/shells/fish/plugins/transient-fish.nix b/pkgs/shells/fish/plugins/transient-fish.nix index 8acdec2cbd65e0..f52574b41b6e68 100644 --- a/pkgs/shells/fish/plugins/transient-fish.nix +++ b/pkgs/shells/fish/plugins/transient-fish.nix @@ -14,10 +14,10 @@ buildFishPlugin { hash = "sha256-rEkCimnkxcydKRI2y4DxEM7FD7F2/cGTZJN2Edq/Acc="; }; - meta = with lib; { + meta = { description = "Fish plugin to enable a transient prompt"; homepage = "https://github.com/zzhaolei/transient.fish"; - license = licenses.mit; - maintainers = with maintainers; [ iynaix ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.iynaix ]; }; } diff --git a/pkgs/shells/fish/plugins/wakatime-fish.nix b/pkgs/shells/fish/plugins/wakatime-fish.nix index 743164202ddf4d..f6476aa4f3aedf 100644 --- a/pkgs/shells/fish/plugins/wakatime-fish.nix +++ b/pkgs/shells/fish/plugins/wakatime-fish.nix @@ -22,10 +22,10 @@ buildFishPlugin rec { --replace-fail "(type -p wakatime)" "${lib.getExe wakatime-cli}" ''; - meta = with lib; { + meta = { description = "Fish plugin for wakatime"; homepage = "https://github.com/ik11235/wakatime.fish"; - license = licenses.mit; - maintainers = with maintainers; [ ocfox ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.ocfox ]; }; } diff --git a/pkgs/shells/fish/plugins/z.nix b/pkgs/shells/fish/plugins/z.nix index 0bf42ecb56fd74..171d54d87db014 100644 --- a/pkgs/shells/fish/plugins/z.nix +++ b/pkgs/shells/fish/plugins/z.nix @@ -14,10 +14,10 @@ buildFishPlugin rec { sha256 = "sha256-+FUBM7CodtZrYKqU542fQD+ZDGrd2438trKM0tIESs0="; }; - meta = with lib; { + meta = { description = "Pure-fish z directory jumping"; homepage = "https://github.com/jethrokuan/z"; - license = licenses.mit; - maintainers = with maintainers; [ Scrumplex ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.Scrumplex ]; }; } diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index dd453cd8bdd139..b81ca55a77da1e 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -89,11 +89,11 @@ rustPlatform.buildRustPackage { updateScript = nix-update-script { }; }; - meta = with lib; { + meta = { description = "Modern shell written in Rust"; homepage = "https://www.nushell.sh/"; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ Br1ght0ne johntitor joaquintrinanes diff --git a/pkgs/shells/nushell/plugins/dbus.nix b/pkgs/shells/nushell/plugins/dbus.nix index c86cebf2377c43..8794109021a0ec 100644 --- a/pkgs/shells/nushell/plugins/dbus.nix +++ b/pkgs/shells/nushell/plugins/dbus.nix @@ -41,12 +41,12 @@ rustPlatform.buildRustPackage rec { ''; }; - meta = with lib; { + meta = { description = "Nushell plugin for communicating with D-Bus"; mainProgram = "nu_plugin_dbus"; homepage = "https://github.com/devyn/nu_plugin_dbus"; - license = licenses.mit; - maintainers = with maintainers; [ aftix ]; - platforms = with platforms; linux; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ aftix ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/shells/nushell/plugins/formats.nix b/pkgs/shells/nushell/plugins/formats.nix index 7e2112d491a5db..bb658754aa2828 100644 --- a/pkgs/shells/nushell/plugins/formats.nix +++ b/pkgs/shells/nushell/plugins/formats.nix @@ -30,15 +30,15 @@ rustPlatform.buildRustPackage rec { extraArgs = [ "--version=skip" ]; }; - meta = with lib; { + meta = { description = "Formats plugin for Nushell"; mainProgram = "nu_plugin_formats"; homepage = "https://github.com/nushell/nushell/tree/${version}/crates/nu_plugin_formats"; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ viraptor aidalgol ]; - platforms = with platforms; all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/shells/nushell/plugins/gstat.nix b/pkgs/shells/nushell/plugins/gstat.nix index 47ab2ea27ead76..33eaa96f0a26e3 100644 --- a/pkgs/shells/nushell/plugins/gstat.nix +++ b/pkgs/shells/nushell/plugins/gstat.nix @@ -27,15 +27,15 @@ rustPlatform.buildRustPackage rec { extraArgs = [ "--version=skip" ]; }; - meta = with lib; { + meta = { description = "Git status plugin for Nushell"; mainProgram = "nu_plugin_gstat"; homepage = "https://github.com/nushell/nushell/tree/${version}/crates/nu_plugin_gstat"; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ mrkkrp aidalgol ]; - platforms = with platforms; all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/shells/nushell/plugins/highlight.nix b/pkgs/shells/nushell/plugins/highlight.nix index efb7bb99087dbc..7237b2e55c7e0f 100644 --- a/pkgs/shells/nushell/plugins/highlight.nix +++ b/pkgs/shells/nushell/plugins/highlight.nix @@ -36,12 +36,12 @@ rustPlatform.buildRustPackage rec { passthru.updateScript = nix-update-script { }; - meta = with lib; { + meta = { description = "A nushell plugin for syntax highlighting."; mainProgram = "nu_plugin_highlight"; homepage = "https://github.com/cptpiepmatz/nu-plugin-highlight"; - license = licenses.mit; - maintainers = with maintainers; [ mgttlinger ]; - platforms = with platforms; all; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ mgttlinger ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/shells/nushell/plugins/net.nix b/pkgs/shells/nushell/plugins/net.nix index 4b28ddf74b7442..222ba35ef6f6b2 100644 --- a/pkgs/shells/nushell/plugins/net.nix +++ b/pkgs/shells/nushell/plugins/net.nix @@ -30,11 +30,11 @@ rustPlatform.buildRustPackage rec { passthru.updateScript = nix-update-script { }; - meta = with lib; { + meta = { description = "Nushell plugin to list system network interfaces"; homepage = "https://github.com/fennewald/nu_plugin_net"; - license = licenses.mit; - maintainers = with maintainers; [ happysalada ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.happysalada ]; mainProgram = "nu_plugin_net"; }; } diff --git a/pkgs/shells/nushell/plugins/polars.nix b/pkgs/shells/nushell/plugins/polars.nix index caccd2f62f00d6..7488aab1573611 100644 --- a/pkgs/shells/nushell/plugins/polars.nix +++ b/pkgs/shells/nushell/plugins/polars.nix @@ -34,12 +34,12 @@ rustPlatform.buildRustPackage rec { extraArgs = [ "--version=skip" ]; }; - meta = with lib; { + meta = { description = "Nushell dataframe plugin commands based on polars"; mainProgram = "nu_plugin_polars"; homepage = "https://github.com/nushell/nushell/tree/${version}/crates/nu_plugin_polars"; - license = licenses.mit; - maintainers = with maintainers; [ joaquintrinanes ]; - platforms = with platforms; all; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ joaquintrinanes ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/shells/nushell/plugins/skim.nix b/pkgs/shells/nushell/plugins/skim.nix index f93a752f06b5be..329cd54df3b110 100644 --- a/pkgs/shells/nushell/plugins/skim.nix +++ b/pkgs/shells/nushell/plugins/skim.nix @@ -44,12 +44,12 @@ rustPlatform.buildRustPackage rec { ''; }; - meta = with lib; { + meta = { description = "A nushell plugin that adds integrates the skim fuzzy finder"; mainProgram = "nu_plugin_skim"; homepage = "https://github.com/idanarye/nu_plugin_skim"; - license = licenses.mit; - maintainers = with maintainers; [ aftix ]; - platforms = platforms.all; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ aftix ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/shells/nushell/plugins/units.nix b/pkgs/shells/nushell/plugins/units.nix index d929d02860717c..4d9d1baa0c4a92 100644 --- a/pkgs/shells/nushell/plugins/units.nix +++ b/pkgs/shells/nushell/plugins/units.nix @@ -30,12 +30,12 @@ rustPlatform.buildRustPackage rec { passthru.updateScript = nix-update-script { }; - meta = with lib; { + meta = { description = "A nushell plugin for easily converting between common units."; mainProgram = "nu_plugin_units"; homepage = "https://github.com/JosephTLyons/nu_plugin_units"; - license = licenses.mit; - maintainers = with maintainers; [ mgttlinger ]; - platforms = with platforms; all; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.mgttlinger ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/test/haskell/upstreamStackHpackVersion/default.nix b/pkgs/test/haskell/upstreamStackHpackVersion/default.nix index 788a3e2db5ef82..56ad2f28e735aa 100644 --- a/pkgs/test/haskell/upstreamStackHpackVersion/default.nix +++ b/pkgs/test/haskell/upstreamStackHpackVersion/default.nix @@ -147,9 +147,9 @@ stdenv.mkDerivation { '' + testScript; - meta = with lib; { + meta = { description = "Test that the stack in Nixpkgs uses the same version of Hpack as the upstream stack release"; - maintainers = with maintainers; [ cdepillabout ]; + maintainers = [ lib.maintainers.cdepillabout ]; # This derivation internally runs a statically-linked version of stack from # upstream. This statically-linked version of stack is only available for