diff --git a/nixos/tests/bitcoind.nix b/nixos/tests/bitcoind.nix index a4ec0beb51b5..f00f18011ec6 100644 --- a/nixos/tests/bitcoind.nix +++ b/nixos/tests/bitcoind.nix @@ -1,8 +1,8 @@ -{ pkgs, ... }: +{ lib, ... }: { name = "bitcoind"; - meta = with pkgs.lib; { - maintainers = with maintainers; [ _1000101 ]; + meta = { + maintainers = with lib.maintainers; [ _1000101 ]; }; nodes.machine = diff --git a/nixos/tests/blockbook-frontend.nix b/nixos/tests/blockbook-frontend.nix index bf6d6bb458c4..2851bf97650f 100644 --- a/nixos/tests/blockbook-frontend.nix +++ b/nixos/tests/blockbook-frontend.nix @@ -1,8 +1,8 @@ { pkgs, ... }: { name = "blockbook-frontend"; - meta = with pkgs.lib; { - maintainers = with maintainers; [ _1000101 ]; + meta = { + maintainers = with pkgs.lib.maintainers; [ _1000101 ]; }; nodes.machine = diff --git a/nixos/tests/borgbackup.nix b/nixos/tests/borgbackup.nix index ed965600d277..d26ad166de5d 100644 --- a/nixos/tests/borgbackup.nix +++ b/nixos/tests/borgbackup.nix @@ -42,8 +42,8 @@ let in { name = "borgbackup"; - meta = with pkgs.lib; { - maintainers = with maintainers; [ dotlambda ]; + meta = { + maintainers = with pkgs.lib.maintainers; [ dotlambda ]; }; nodes = { diff --git a/nixos/tests/btrbk-doas.nix b/nixos/tests/btrbk-doas.nix index 326998b16b49..4443cf43523f 100644 --- a/nixos/tests/btrbk-doas.nix +++ b/nixos/tests/btrbk-doas.nix @@ -16,8 +16,8 @@ let in { name = "btrbk-doas"; - meta = with pkgs.lib; { - maintainers = with maintainers; [ + meta = { + maintainers = with pkgs.lib.maintainers; [ symphorien tu-maurice ]; diff --git a/nixos/tests/btrbk.nix b/nixos/tests/btrbk.nix index 10ca8c3ca95e..b7f3ee1da5e6 100644 --- a/nixos/tests/btrbk.nix +++ b/nixos/tests/btrbk.nix @@ -16,8 +16,8 @@ let in { name = "btrbk"; - meta = with pkgs.lib; { - maintainers = with maintainers; [ symphorien ]; + meta = { + maintainers = with pkgs.lib.maintainers; [ symphorien ]; }; nodes = { diff --git a/nixos/tests/dokuwiki.nix b/nixos/tests/dokuwiki.nix index 8307c443f16d..2e30ab269c22 100644 --- a/nixos/tests/dokuwiki.nix +++ b/nixos/tests/dokuwiki.nix @@ -102,8 +102,8 @@ let in { name = "dokuwiki"; - meta = with pkgs.lib; { - maintainers = with maintainers; [ + meta = { + maintainers = with pkgs.lib.maintainers; [ _1000101 onny e1mo diff --git a/nixos/tests/geth.nix b/nixos/tests/geth.nix index 49a2c4f11701..37d55cfe697e 100644 --- a/nixos/tests/geth.nix +++ b/nixos/tests/geth.nix @@ -1,8 +1,8 @@ { pkgs, ... }: { name = "geth"; - meta = with pkgs.lib; { - maintainers = with maintainers; [ bachp ]; + meta = { + maintainers = with pkgs.lib.maintainers; [ bachp ]; }; nodes.machine = diff --git a/nixos/tests/jibri.nix b/nixos/tests/jibri.nix index 2bfc41ed188d..9199f347fb2c 100644 --- a/nixos/tests/jibri.nix +++ b/nixos/tests/jibri.nix @@ -1,8 +1,8 @@ { pkgs, ... }: { name = "jibri"; - meta = with pkgs.lib; { - maintainers = teams.jitsi.members; + meta = { + maintainers = pkgs.lib.teams.jitsi.members; }; nodes.machine = diff --git a/nixos/tests/jitsi-meet.nix b/nixos/tests/jitsi-meet.nix index 2181ed863a88..1237f442c24e 100644 --- a/nixos/tests/jitsi-meet.nix +++ b/nixos/tests/jitsi-meet.nix @@ -1,8 +1,8 @@ { pkgs, ... }: { name = "jitsi-meet"; - meta = with pkgs.lib; { - maintainers = teams.jitsi.members; + meta = { + maintainers = pkgs.lib.teams.jitsi.members; }; nodes = { diff --git a/nixos/tests/matrix/dendrite.nix b/nixos/tests/matrix/dendrite.nix index 4477f522a37b..0540cb3b7f3c 100644 --- a/nixos/tests/matrix/dendrite.nix +++ b/nixos/tests/matrix/dendrite.nix @@ -8,8 +8,8 @@ let in { name = "dendrite"; - meta = with pkgs.lib; { - maintainers = teams.matrix.members; + meta = { + maintainers = pkgs.lib.teams.matrix.members; }; nodes = { diff --git a/nixos/tests/matrix/pantalaimon.nix b/nixos/tests/matrix/pantalaimon.nix index eb2123ee3ca6..b2538ca17dfb 100644 --- a/nixos/tests/matrix/pantalaimon.nix +++ b/nixos/tests/matrix/pantalaimon.nix @@ -31,8 +31,8 @@ let in { name = "pantalaimon"; - meta = with pkgs.lib; { - maintainers = teams.matrix.members; + meta = { + maintainers = pkgs.lib.teams.matrix.members; }; nodes.machine = diff --git a/nixos/tests/mosquitto.nix b/nixos/tests/mosquitto.nix index e4bdb106b8e0..bb21c4b1a5ad 100644 --- a/nixos/tests/mosquitto.nix +++ b/nixos/tests/mosquitto.nix @@ -58,8 +58,8 @@ let in { name = "mosquitto"; - meta = with pkgs.lib; { - maintainers = with maintainers; [ peterhoeg ]; + meta = { + maintainers = with pkgs.lib.maintainers; [ peterhoeg ]; }; nodes = diff --git a/nixos/tests/nats.nix b/nixos/tests/nats.nix index 2ed97ee86b09..ea9dcf34e4d8 100644 --- a/nixos/tests/nats.nix +++ b/nixos/tests/nats.nix @@ -6,11 +6,11 @@ let topic = "foo.bar"; in -{ pkgs, lib, ... }: +{ lib, ... }: { name = "nats"; - meta = with pkgs.lib; { - maintainers = with maintainers; [ c0deaddict ]; + meta = { + maintainers = with lib.maintainers; [ c0deaddict ]; }; nodes = diff --git a/nixos/tests/retroarch.nix b/nixos/tests/retroarch.nix index 5f4fe101b46d..08661a0ed0bf 100644 --- a/nixos/tests/retroarch.nix +++ b/nixos/tests/retroarch.nix @@ -2,8 +2,8 @@ { name = "retroarch"; - meta = with pkgs.lib; { - maintainers = teams.libretro.members ++ [ maintainers.j0hax ]; + meta = { + maintainers = pkgs.lib.teams.libretro.members ++ [ pkgs.lib.maintainers.j0hax ]; }; nodes.machine = diff --git a/nixos/tests/trezord.nix b/nixos/tests/trezord.nix index 4955ecb9c714..3d7658754bc8 100644 --- a/nixos/tests/trezord.nix +++ b/nixos/tests/trezord.nix @@ -1,8 +1,8 @@ { pkgs, ... }: { name = "trezord"; - meta = with pkgs.lib; { - maintainers = with maintainers; [ + meta = { + maintainers = with pkgs.lib.maintainers; [ mmahut _1000101 ]; diff --git a/nixos/tests/trickster.nix b/nixos/tests/trickster.nix index e987341bc7de..6710af753c7c 100644 --- a/nixos/tests/trickster.nix +++ b/nixos/tests/trickster.nix @@ -1,8 +1,8 @@ { pkgs, ... }: { name = "trickster"; - meta = with pkgs.lib; { - maintainers = with maintainers; [ _1000101 ]; + meta = { + maintainers = with pkgs.lib.maintainers; [ _1000101 ]; }; nodes = { diff --git a/pkgs/applications/misc/plover/default.nix b/pkgs/applications/misc/plover/default.nix index 6ee360b9e226..fc0ff2a6b9f9 100644 --- a/pkgs/applications/misc/plover/default.nix +++ b/pkgs/applications/misc/plover/default.nix @@ -16,7 +16,7 @@ version = "4.0.2"; format = "setuptools"; - meta = with lib; { + meta = { broken = stdenv.hostPlatform.isDarwin; description = "OpenSteno Plover stenography software"; maintainers = with lib.maintainers; [ diff --git a/pkgs/applications/networking/cluster/hadoop/containerExecutor.nix b/pkgs/applications/networking/cluster/hadoop/containerExecutor.nix index 21b39a5d06d2..22026b9d4aa7 100644 --- a/pkgs/applications/networking/cluster/hadoop/containerExecutor.nix +++ b/pkgs/applications/networking/cluster/hadoop/containerExecutor.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { mv target/usr/local/bin $out/ ''; - meta = with lib; { + meta = { homepage = "https://hadoop.apache.org/"; description = "Framework for distributed processing of large data sets across clusters of computers"; license = lib.licenses.asl20; @@ -45,6 +45,6 @@ stdenv.mkDerivation (finalAttrs: { ''; maintainers = with lib.maintainers; [ illustris ]; - platforms = filter (strings.hasSuffix "linux") (attrNames platformAttrs); + platforms = lib.filter (lib.strings.hasSuffix "linux") (lib.attrNames platformAttrs); }; }) diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix index 5d564fc2bb94..57e0ff7ee8c6 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix @@ -312,13 +312,13 @@ stdenv.mkDerivation rec { $out/opt/citrix-icaclient/util/ctx_rehash ''; - meta = with lib; { + meta = { # webkitgtk_4_0 was removed broken = true; license = lib.licenses.unfree; description = "Citrix Workspace"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - platforms = [ "x86_64-linux" ] ++ optional (versionOlder version "24") "i686-linux"; + platforms = [ "x86_64-linux" ] ++ lib.optional (lib.versionOlder version "24") "i686-linux"; maintainers = with lib.maintainers; [ flacks ]; inherit homepage; }; diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix index a7c265341a3b..9692b6f0877b 100644 --- a/pkgs/applications/search/recoll/default.nix +++ b/pkgs/applications/search/recoll/default.nix @@ -197,7 +197,7 @@ mkDerivation rec { enableParallelBuilding = false; # XXX: -j44 tried linking befoire librecoll had been created - meta = with lib; { + meta = { description = "Full-text search tool"; longDescription = '' Recoll is an Xapian frontend that can search through files, archive diff --git a/pkgs/applications/video/vdr/wrapper.nix b/pkgs/applications/video/vdr/wrapper.nix index 9680d4ad3c2e..7c57fc5098f3 100644 --- a/pkgs/applications/video/vdr/wrapper.nix +++ b/pkgs/applications/video/vdr/wrapper.nix @@ -26,9 +26,12 @@ symlinkJoin { --prefix XINE_PLUGIN_PATH ":" ${lib.escapeShellArg (makeXinePluginPath requiredXinePlugins)} ''; - meta = with vdr.meta; { - inherit license homepage; + meta = { + inherit (vdr.meta) license homepage; description = - description + " (with plugins: " + lib.concatStringsSep ", " (map (x: "" + x.name) plugins) + ")"; + vdr.meta.description + + " (with plugins: " + + lib.concatStringsSep ", " (map (x: "" + x.name) plugins) + + ")"; }; } diff --git a/pkgs/by-name/ba/babl/package.nix b/pkgs/by-name/ba/babl/package.nix index e8f013ea168d..fe499cb872b5 100644 --- a/pkgs/by-name/ba/babl/package.nix +++ b/pkgs/by-name/ba/babl/package.nix @@ -58,12 +58,12 @@ stdenv.mkDerivation (finalAttrs: { moveToOutput "share/doc" "$devdoc" ''; - meta = with lib; { + meta = { description = "Image pixel format conversion library"; mainProgram = "babl"; homepage = "https://gegl.org/babl/"; changelog = "https://gitlab.gnome.org/GNOME/babl/-/blob/BABL_${ - replaceStrings [ "." ] [ "_" ] finalAttrs.version + lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version }/NEWS"; license = lib.licenses.lgpl3Plus; maintainers = with lib.maintainers; [ jtojnar ]; diff --git a/pkgs/by-name/be/bencode/package.nix b/pkgs/by-name/be/bencode/package.nix index d4e2257c6665..6ef2f15debc5 100644 --- a/pkgs/by-name/be/bencode/package.nix +++ b/pkgs/by-name/be/bencode/package.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { rm -rf $out/lib64 ''; - meta = with lib; { + meta = { description = "Header-only C++20 bencode serialization/deserialization library"; homepage = "https://github.com/fbdtemme/bencode"; changelog = "https://github.com/fbdtemme/bencode/blob/${src.rev}/CHANGELOG.md"; diff --git a/pkgs/by-name/bu/burpsuite/package.nix b/pkgs/by-name/bu/burpsuite/package.nix index 0c313295410f..b3c1cb7f7210 100644 --- a/pkgs/by-name/bu/burpsuite/package.nix +++ b/pkgs/by-name/bu/burpsuite/package.nix @@ -93,7 +93,7 @@ buildFHSEnv { passthru.updateScript = ./update.sh; - meta = with lib; { + meta = { inherit description; longDescription = '' Burp Suite is an integrated platform for performing security testing of web applications. @@ -104,7 +104,7 @@ buildFHSEnv { homepage = "https://portswigger.net/burp/"; changelog = "https://portswigger.net/burp/releases/professional-community-" - + replaceStrings [ "." ] [ "-" ] version; + + lib.replaceStrings [ "." ] [ "-" ] version; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.unfree; platforms = jdk.meta.platforms; diff --git a/pkgs/by-name/ce/ceph/old-python-packages/cryptography.nix b/pkgs/by-name/ce/ceph/old-python-packages/cryptography.nix index 27d704118332..fb9f074ed5dd 100644 --- a/pkgs/by-name/ce/ceph/old-python-packages/cryptography.nix +++ b/pkgs/by-name/ce/ceph/old-python-packages/cryptography.nix @@ -118,7 +118,7 @@ buildPythonPackage rec { "tests/hazmat/backends/test_openssl_memleak.py" ]; - meta = with lib; { + meta = { description = "Package which provides cryptographic recipes and primitives"; longDescription = '' Cryptography includes both high level recipes and low level interfaces to @@ -129,7 +129,7 @@ buildPythonPackage rec { ''; homepage = "https://github.com/pyca/cryptography"; changelog = - "https://cryptography.io/en/latest/changelog/#v" + replaceStrings [ "." ] [ "-" ] version; + "https://cryptography.io/en/latest/changelog/#v" + lib.replaceStrings [ "." ] [ "-" ] version; license = with lib.licenses; [ asl20 bsd3 diff --git a/pkgs/by-name/co/comixcursors/package.nix b/pkgs/by-name/co/comixcursors/package.nix index ea73cc5e5615..1a0b6e9a546e 100644 --- a/pkgs/by-name/co/comixcursors/package.nix +++ b/pkgs/by-name/co/comixcursors/package.nix @@ -116,10 +116,10 @@ stdenvNoCC.mkDerivation rec { # attributes are used to choose which variant(s) to have. outputsToInstall = [ ]; - meta = with lib; { + meta = { description = "Comix Cursors mouse themes"; longDescription = '' - There are many (${toString ((length outputs) - 1)}) variants of color, + There are many (${toString ((lib.length outputs) - 1)}) variants of color, opacity, edge thickness, and right- or left-handedness, for this cursor theme. This package's derivation has an output for each of these variants, named following the upstream convention, and the attribute for diff --git a/pkgs/by-name/dm/dmtcp/package.nix b/pkgs/by-name/dm/dmtcp/package.nix index 3ef7253cb9da..4d2cecc48dcf 100644 --- a/pkgs/by-name/dm/dmtcp/package.nix +++ b/pkgs/by-name/dm/dmtcp/package.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { --replace "os.getenv('USER')" "\"nixbld1\"" ''; - meta = with lib; { + meta = { description = "Distributed MultiThreaded Checkpointing"; longDescription = '' DMTCP (Distributed MultiThreaded Checkpointing) is a tool to @@ -50,6 +50,6 @@ stdenv.mkDerivation { ''; homepage = "http://dmtcp.sourceforge.net/"; license = lib.licenses.lgpl3Plus; # most files seem this or LGPL-2.1+ - platforms = intersectLists lib.platforms.linux lib.platforms.x86; # broken on ARM and Darwin + platforms = lib.intersectLists lib.platforms.linux lib.platforms.x86; # broken on ARM and Darwin }; } diff --git a/pkgs/by-name/fa/fasmg/package.nix b/pkgs/by-name/fa/fasmg/package.nix index 6f582704f94a..546eb5a43f6d 100644 --- a/pkgs/by-name/fa/fasmg/package.nix +++ b/pkgs/by-name/fa/fasmg/package.nix @@ -85,12 +85,12 @@ stdenv.mkDerivation rec { nix-update fasmg --version "$version" ''; - meta = with lib; { + meta = { description = "x86(-64) macro assembler to binary, MZ, PE, COFF, and ELF"; mainProgram = "fasmg"; homepage = "https://flatassembler.net"; license = lib.licenses.bsd3; maintainers = [ ]; - platforms = with lib.platforms; intersectLists (linux ++ darwin) x86; + platforms = with lib.platforms; lib.intersectLists (linux ++ darwin) x86; }; } diff --git a/pkgs/by-name/gi/giac/package.nix b/pkgs/by-name/gi/giac/package.nix index 2f839d7ed2c7..c6b89f93fa4a 100644 --- a/pkgs/by-name/gi/giac/package.nix +++ b/pkgs/by-name/gi/giac/package.nix @@ -220,11 +220,11 @@ stdenv.mkDerivation rec { done; ''; - meta = with lib; { + meta = { description = "Free computer algebra system (CAS)"; homepage = "https://www-fourier.ujf-grenoble.fr/~parisse/giac.html"; license = lib.licenses.gpl3Plus; - platforms = lib.platforms.linux ++ (optionals (!enableGUI) lib.platforms.darwin); + platforms = lib.platforms.linux ++ (lib.optionals (!enableGUI) lib.platforms.darwin); maintainers = [ lib.maintainers.symphorien ]; }; } diff --git a/pkgs/by-name/gl/glide-media-player/package.nix b/pkgs/by-name/gl/glide-media-player/package.nix index 59773d9f34b2..73576c51d564 100644 --- a/pkgs/by-name/gl/glide-media-player/package.nix +++ b/pkgs/by-name/gl/glide-media-player/package.nix @@ -63,13 +63,13 @@ stdenv.mkDerivation rec { glib-networking ]; - meta = with lib; { + meta = { description = "Linux/macOS media player based on GStreamer and GTK"; homepage = "https://philn.github.io/glide"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ aleksana ]; mainProgram = "glide"; # Required gdk4-{wayland,x11} and gstreamer-gl not available on darwin - platforms = subtractLists lib.platforms.darwin lib.platforms.unix; + platforms = lib.subtractLists lib.platforms.darwin lib.platforms.unix; }; } diff --git a/pkgs/by-name/gr/grass-sass/package.nix b/pkgs/by-name/gr/grass-sass/package.nix index 61487926bab5..a2f3bb0e9bbc 100644 --- a/pkgs/by-name/gr/grass-sass/package.nix +++ b/pkgs/by-name/gr/grass-sass/package.nix @@ -18,11 +18,11 @@ rustPlatform.buildRustPackage rec { # tests require rust nightly doCheck = false; - meta = with lib; { + meta = { description = "Sass compiler written purely in Rust"; homepage = "https://github.com/connorskees/grass"; changelog = "https://github.com/connorskees/grass/blob/master/CHANGELOG.md#${ - replaceStrings [ "." ] [ "" ] version + lib.replaceStrings [ "." ] [ "" ] version }"; license = lib.licenses.mit; maintainers = [ ]; diff --git a/pkgs/by-name/gv/gvfs/package.nix b/pkgs/by-name/gv/gvfs/package.nix index 3e13d55a4682..0869a9d9e359 100644 --- a/pkgs/by-name/gv/gvfs/package.nix +++ b/pkgs/by-name/gv/gvfs/package.nix @@ -159,9 +159,9 @@ stdenv.mkDerivation (finalAttrs: { }; }; - meta = with lib; { + meta = { description = - "Virtual Filesystem support library" + optionalString gnomeSupport " (full GNOME support)"; + "Virtual Filesystem support library" + lib.optionalString gnomeSupport " (full GNOME support)"; license = lib.licenses.lgpl2Plus; platforms = lib.platforms.unix; teams = [ lib.teams.gnome ]; diff --git a/pkgs/by-name/jo/joypixels/package.nix b/pkgs/by-name/jo/joypixels/package.nix index ab7d9d37e7e6..b8c15b6675d6 100644 --- a/pkgs/by-name/jo/joypixels/package.nix +++ b/pkgs/by-name/jo/joypixels/package.nix @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = { description = "Finest emoji you can use legally (formerly EmojiOne)"; longDescription = '' Updated for 2024! JoyPixels 9.0 includes 3,820 originally crafted icon diff --git a/pkgs/by-name/nr/nrf-command-line-tools/package.nix b/pkgs/by-name/nr/nrf-command-line-tools/package.nix index 87c751641be1..d8ff63ef5727 100644 --- a/pkgs/by-name/nr/nrf-command-line-tools/package.nix +++ b/pkgs/by-name/nr/nrf-command-line-tools/package.nix @@ -70,11 +70,11 @@ stdenv.mkDerivation { runHook postInstall ''; - meta = with lib; { + meta = { description = "Nordic Semiconductor nRF Command Line Tools"; homepage = "https://www.nordicsemi.com/Products/Development-tools/nRF-Command-Line-Tools"; license = lib.licenses.unfree; - platforms = attrNames supported; + platforms = lib.attrNames supported; maintainers = with lib.maintainers; [ stargate01 ]; }; } diff --git a/pkgs/by-name/nv/nvpy/package.nix b/pkgs/by-name/nv/nvpy/package.nix index d17d640701a7..e1dda170ce99 100644 --- a/pkgs/by-name/nv/nvpy/package.nix +++ b/pkgs/by-name/nv/nvpy/package.nix @@ -1,5 +1,5 @@ { - pkgs, + lib, fetchFromGitHub, python3Packages, }: @@ -41,11 +41,11 @@ pythonPackages.buildPythonApplication rec { pythonImportsCheck = [ "nvpy" ]; - meta = with pkgs.lib; { + meta = { description = "Simplenote-syncing note-taking tool inspired by Notational Velocity"; homepage = "https://github.com/cpbotha/nvpy"; - platforms = platforms.linux; - license = licenses.bsd3; + platforms = lib.platforms.linux; + license = lib.licenses.bsd3; mainProgram = "nvpy"; }; } diff --git a/pkgs/by-name/pg/pgbouncer/package.nix b/pkgs/by-name/pg/pgbouncer/package.nix index ae9c9b08ceb7..5bab21bf1d99 100644 --- a/pkgs/by-name/pg/pgbouncer/package.nix +++ b/pkgs/by-name/pg/pgbouncer/package.nix @@ -33,12 +33,12 @@ stdenv.mkDerivation rec { pgbouncer = nixosTests.pgbouncer; }; - meta = with lib; { + meta = { homepage = "https://www.pgbouncer.org/"; mainProgram = "pgbouncer"; description = "Lightweight connection pooler for PostgreSQL"; changelog = "https://github.com/pgbouncer/pgbouncer/releases/tag/pgbouncer_${ - replaceStrings [ "." ] [ "_" ] version + lib.replaceStrings [ "." ] [ "_" ] version }"; license = lib.licenses.isc; maintainers = with lib.maintainers; [ _1000101 ]; diff --git a/pkgs/by-name/po/polkadot/package.nix b/pkgs/by-name/po/polkadot/package.nix index abdafaf9b41c..d0d4227fd0d8 100644 --- a/pkgs/by-name/po/polkadot/package.nix +++ b/pkgs/by-name/po/polkadot/package.nix @@ -72,7 +72,7 @@ rustPlatform.buildRustPackage rec { PROTOC = "${protobuf}/bin/protoc"; ROCKSDB_LIB_DIR = "${rocksdb}/lib"; - meta = with lib; { + meta = { description = "Implementation of a https://polkadot.network node in Rust based on the Substrate framework"; homepage = "https://github.com/paritytech/polkadot-sdk"; license = lib.licenses.gpl3Only; @@ -83,7 +83,7 @@ rustPlatform.buildRustPackage rec { RaghavSood ]; # See Iso::from_arch in src/isa/mod.rs in cranelift-codegen-meta. - platforms = intersectLists lib.platforms.unix ( + platforms = lib.intersectLists lib.platforms.unix ( lib.platforms.aarch64 ++ lib.platforms.s390x ++ lib.platforms.riscv64 ++ lib.platforms.x86 ); }; diff --git a/pkgs/by-name/ro/root/tests/test-thisroot.nix b/pkgs/by-name/ro/root/tests/test-thisroot.nix index 9a7b7446d5ec..be72dea14444 100644 --- a/pkgs/by-name/ro/root/tests/test-thisroot.nix +++ b/pkgs/by-name/ro/root/tests/test-thisroot.nix @@ -9,9 +9,9 @@ }: runCommand "test-thisroot" { - meta = with lib; { + meta = { description = "Test for root thisroot.* sourcing"; - maintainers = unique ((with lib.maintainers; [ ShamrockLee ]) ++ root.meta.maintainers); + maintainers = lib.unique ((with lib.maintainers; [ ShamrockLee ]) ++ root.meta.maintainers); }; } '' diff --git a/pkgs/by-name/sa/saleae-logic/package.nix b/pkgs/by-name/sa/saleae-logic/package.nix index 09bd65981b32..4a6c6a36aac9 100644 --- a/pkgs/by-name/sa/saleae-logic/package.nix +++ b/pkgs/by-name/sa/saleae-logic/package.nix @@ -126,12 +126,12 @@ stdenv.mkDerivation rec { cp Drivers/99-SaleaeLogic.rules "$out/etc/udev/rules.d/" ''; - meta = with lib; { + meta = { description = "Software for Saleae logic analyzers"; homepage = "https://www.saleae.com/"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; - platforms = intersectLists lib.platforms.x86_64 lib.platforms.linux; + platforms = lib.intersectLists lib.platforms.x86_64 lib.platforms.linux; maintainers = [ lib.maintainers.bjornfor ]; }; } diff --git a/pkgs/by-name/si/simde/package.nix b/pkgs/by-name/si/simde/package.nix index fd143c46533e..1cf764508965 100644 --- a/pkgs/by-name/si/simde/package.nix +++ b/pkgs/by-name/si/simde/package.nix @@ -22,12 +22,12 @@ stdenv.mkDerivation rec { ninja ]; - meta = with lib; { + meta = { homepage = "https://simd-everywhere.github.io"; description = "Implementations of SIMD instruction sets for systems which don't natively support them"; license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ whiteley ]; - platforms = flatten ( + platforms = lib.flatten ( with lib.platforms; [ arm diff --git a/pkgs/by-name/si/singular/package.nix b/pkgs/by-name/si/singular/package.nix index d731ae09168f..916a48e81297 100644 --- a/pkgs/by-name/si/singular/package.nix +++ b/pkgs/by-name/si/singular/package.nix @@ -190,12 +190,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; __darwinAllowLocalNetworking = true; - meta = with lib; { + meta = { description = "CAS for polynomial computations"; teams = [ lib.teams.sage ]; # 32 bit x86 fails with some link error: `undefined reference to `__divmoddi4@GCC_7.0.0'` # https://www.singular.uni-kl.de:8002/trac/ticket/837 - platforms = subtractLists lib.platforms.i686 lib.platforms.unix; + platforms = lib.subtractLists lib.platforms.i686 lib.platforms.unix; license = lib.licenses.gpl3; # Or GPLv2 at your option - but not GPLv4 homepage = "https://www.singular.uni-kl.de"; downloadPage = "http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/"; diff --git a/pkgs/by-name/so/solana-cli/package.nix b/pkgs/by-name/so/solana-cli/package.nix index abdb1ecb9942..05eb62917bc7 100644 --- a/pkgs/by-name/so/solana-cli/package.nix +++ b/pkgs/by-name/so/solana-cli/package.nix @@ -109,17 +109,17 @@ rustPlatform.buildRustPackage rec { # If set, always finds OpenSSL in the system, even if the vendored feature is enabled. OPENSSL_NO_VENDOR = 1; - meta = with lib; { + meta = { description = "Web-Scale Blockchain for fast, secure, scalable, decentralized apps and marketplaces"; homepage = "https://solana.com"; - license = licenses.asl20; - maintainers = with maintainers; [ + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ netfox happysalada aikooo7 JacoMalan1 ]; - platforms = platforms.unix; + platforms = lib.platforms.unix; }; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/so/solo5/package.nix b/pkgs/by-name/so/solo5/package.nix index 746ac6dfc8df..8c544a6de5ea 100644 --- a/pkgs/by-name/so/solo5/package.nix +++ b/pkgs/by-name/so/solo5/package.nix @@ -89,11 +89,11 @@ stdenv.mkDerivation { runHook postCheck ''; - meta = with lib; { + meta = { description = "Sandboxed execution environment"; homepage = "https://github.com/solo5/solo5"; license = lib.licenses.isc; - platforms = mapCartesianProduct ({ arch, os }: "${arch}-${os}") { + platforms = lib.mapCartesianProduct ({ arch, os }: "${arch}-${os}") { arch = [ "aarch64" "x86_64" diff --git a/pkgs/by-name/st/string-machine/package.nix b/pkgs/by-name/st/string-machine/package.nix index dafbf697a4d9..78072442c382 100644 --- a/pkgs/by-name/st/string-machine/package.nix +++ b/pkgs/by-name/st/string-machine/package.nix @@ -49,11 +49,11 @@ stdenv.mkDerivation { "PREFIX=$(out)" ]; - meta = with lib; { + meta = { homepage = "https://github.com/jpcima/string-machine"; description = "Digital model of electronic string ensemble instrument"; maintainers = [ lib.maintainers.magnetophon ]; - platforms = intersectLists lib.platforms.linux lib.platforms.x86; + platforms = lib.intersectLists lib.platforms.linux lib.platforms.x86; license = lib.licenses.boost; }; } diff --git a/pkgs/by-name/ta/tabnine/package.nix b/pkgs/by-name/ta/tabnine/package.nix index 52074f76ef45..0d95b9d19724 100644 --- a/pkgs/by-name/ta/tabnine/package.nix +++ b/pkgs/by-name/ta/tabnine/package.nix @@ -43,11 +43,11 @@ stdenv.mkDerivation { updateScript = ./update.sh; }; - meta = with lib; { + meta = { homepage = "https://tabnine.com"; description = "Smart Compose for code that uses deep learning to help you write code faster"; license = lib.licenses.unfree; - platforms = attrNames sources.platforms; + platforms = lib.attrNames sources.platforms; maintainers = with lib.maintainers; [ lovesegfault ]; }; } diff --git a/pkgs/by-name/tc/tcb/package.nix b/pkgs/by-name/tc/tcb/package.nix index 366c5b4c1617..1f1f5e986ec1 100644 --- a/pkgs/by-name/tc/tcb/package.nix +++ b/pkgs/by-name/tc/tcb/package.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation { makeFlagsArray+=("CC=$CC") ''; - meta = with lib; { + meta = { description = "Alternative password shadowing scheme"; longDescription = '' The tcb package contains core components of our tcb suite implementing the alternative @@ -61,7 +61,7 @@ stdenv.mkDerivation { ''; homepage = "https://www.openwall.com/tcb/"; license = lib.licenses.bsd3; - platforms = systems.inspect.patterns.isGnu; + platforms = lib.systems.inspect.patterns.isGnu; maintainers = with lib.maintainers; [ izorkin ]; }; } diff --git a/pkgs/by-name/te/tela-icon-theme/package.nix b/pkgs/by-name/te/tela-icon-theme/package.nix index 9d652a537255..7af830eb456b 100644 --- a/pkgs/by-name/te/tela-icon-theme/package.nix +++ b/pkgs/by-name/te/tela-icon-theme/package.nix @@ -49,13 +49,13 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = { description = "Flat colorful Design icon theme"; homepage = "https://github.com/vinceliuice/tela-icon-theme"; changelog = "https://github.com/vinceliuice/Tela-icon-theme/releases/tag/${src.rev}"; license = lib.licenses.gpl3Only; # darwin systems use case-insensitive filesystems that cause hash mismatches - platforms = subtractLists lib.platforms.darwin lib.platforms.unix; + platforms = lib.subtractLists lib.platforms.darwin lib.platforms.unix; maintainers = [ ]; }; } diff --git a/pkgs/by-name/ut/ut1999/package.nix b/pkgs/by-name/ut/ut1999/package.nix index fe6b947c92dd..28f6e08c72d6 100644 --- a/pkgs/by-name/ut/ut1999/package.nix +++ b/pkgs/by-name/ut/ut1999/package.nix @@ -197,10 +197,10 @@ stdenv.mkDerivation (finalAttrs: { }) ]; - meta = with lib; { + meta = { description = "Unreal Tournament GOTY (1999) with the OldUnreal patch"; license = lib.licenses.unfree; - platforms = attrNames srcs; + platforms = lib.attrNames srcs; maintainers = with lib.maintainers; [ eliandoran dwt diff --git a/pkgs/by-name/vg/vgmstream/package.nix b/pkgs/by-name/vg/vgmstream/package.nix index 441419ea5872..39569ac7b4f1 100644 --- a/pkgs/by-name/vg/vgmstream/package.nix +++ b/pkgs/by-name/vg/vgmstream/package.nix @@ -101,7 +101,7 @@ stdenv.mkDerivation (finalAttrs: { }; }; - meta = with lib; { + meta = { description = "Library for playback of various streamed audio formats used in video games"; homepage = "https://vgmstream.org"; maintainers = with lib.maintainers; [ zane ]; @@ -111,7 +111,7 @@ stdenv.mkDerivation (finalAttrs: { isc # vgmstream itself mit # atrac9 ] - ++ optional (stdenv.system == "x86_64-linux") bsd2; + ++ lib.optional (stdenv.system == "x86_64-linux") bsd2; platforms = with lib.platforms; unix; }; }) diff --git a/pkgs/by-name/wa/wayfarer/package.nix b/pkgs/by-name/wa/wayfarer/package.nix index 2063c6c3495d..7cd100a454e8 100644 --- a/pkgs/by-name/wa/wayfarer/package.nix +++ b/pkgs/by-name/wa/wayfarer/package.nix @@ -55,12 +55,12 @@ stdenv.mkDerivation (finalAttrs: { pipewire ]; - meta = with lib; { + meta = { description = "Screen recorder for GNOME / Wayland / pipewire"; homepage = "https://github.com/stronnag/wayfarer"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ fgaz ]; mainProgram = "wayfarer"; - platforms = subtractLists lib.platforms.darwin lib.platforms.unix; + platforms = lib.subtractLists lib.platforms.darwin lib.platforms.unix; }; }) diff --git a/pkgs/by-name/we/webrtc-audio-processing_0_3/package.nix b/pkgs/by-name/we/webrtc-audio-processing_0_3/package.nix index cdc2323f5392..05e763932fcc 100644 --- a/pkgs/by-name/we/webrtc-audio-processing_0_3/package.nix +++ b/pkgs/by-name/we/webrtc-audio-processing_0_3/package.nix @@ -58,13 +58,13 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with lib; { + meta = { homepage = "https://www.freedesktop.org/software/pulseaudio/webrtc-audio-processing"; description = "More Linux packaging friendly copy of the AudioProcessing module from the WebRTC project"; license = lib.licenses.bsd3; # https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/blob/v0.3.1/webrtc/typedefs.h # + our patches - platforms = intersectLists lib.platforms.unix ( + platforms = lib.intersectLists lib.platforms.unix ( lib.platforms.arm ++ lib.platforms.aarch64 ++ lib.platforms.mips diff --git a/pkgs/by-name/we/webrtc-audio-processing_1/package.nix b/pkgs/by-name/we/webrtc-audio-processing_1/package.nix index 7edc5f611ef8..2d061db64706 100644 --- a/pkgs/by-name/we/webrtc-audio-processing_1/package.nix +++ b/pkgs/by-name/we/webrtc-audio-processing_1/package.nix @@ -55,12 +55,12 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-msse2"; }; - meta = with lib; { + meta = { homepage = "https://www.freedesktop.org/software/pulseaudio/webrtc-audio-processing"; description = "More Linux packaging friendly copy of the AudioProcessing module from the WebRTC project"; license = lib.licenses.bsd3; platforms = - intersectLists + lib.intersectLists # https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/blob/master/meson.build (lib.platforms.darwin ++ lib.platforms.linux ++ lib.platforms.windows) # https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/blob/master/webrtc/rtc_base/system/arch.h diff --git a/pkgs/by-name/wi/wireguard-vanity-keygen/package.nix b/pkgs/by-name/wi/wireguard-vanity-keygen/package.nix index 7dcafb56609b..fd8567b9af43 100644 --- a/pkgs/by-name/wi/wireguard-vanity-keygen/package.nix +++ b/pkgs/by-name/wi/wireguard-vanity-keygen/package.nix @@ -23,10 +23,10 @@ buildGoModule rec { "-X main.appVersion=${version}" ]; - meta = with lib; { + meta = { changelog = let - versionWithoutDots = concatStrings (splitString "." version); + versionWithoutDots = lib.concatStrings (lib.splitString "." version); in "https://github.com/axllent/wireguard-vanity-keygen/blob/develop/CHANGELOG.md#${versionWithoutDots}"; description = "WireGuard vanity key generator"; diff --git a/pkgs/by-name/wl/wlr-layout-ui/package.nix b/pkgs/by-name/wl/wlr-layout-ui/package.nix index 54db15657f56..6ecb98ac9090 100644 --- a/pkgs/by-name/wl/wlr-layout-ui/package.nix +++ b/pkgs/by-name/wl/wlr-layout-ui/package.nix @@ -30,12 +30,12 @@ python3.pkgs.buildPythonApplication rec { install -Dm644 files/wlr-layout-ui.desktop $out/share/applications/wlr-layout-ui.desktop ''; - meta = with lib; { + meta = { description = "Simple GUI to setup the screens layout on wlroots based systems"; homepage = "https://github.com/fdev31/wlr-layout-ui/"; maintainers = with lib.maintainers; [ bnlrnz ]; license = lib.licenses.mit; mainProgram = "wlrlui"; - platforms = subtractLists lib.platforms.darwin lib.platforms.unix; + platforms = lib.subtractLists lib.platforms.darwin lib.platforms.unix; }; } diff --git a/pkgs/by-name/xd/xdgmenumaker/package.nix b/pkgs/by-name/xd/xdgmenumaker/package.nix index 184609c6f4d2..a13c78010d09 100644 --- a/pkgs/by-name/xd/xdgmenumaker/package.nix +++ b/pkgs/by-name/xd/xdgmenumaker/package.nix @@ -55,13 +55,13 @@ python3Packages.buildPythonApplication rec { passthru.updateScript = gitUpdater { }; - meta = with lib; { + meta = { description = "Command line tool that generates XDG menus for several window managers"; mainProgram = "xdgmenumaker"; homepage = "https://github.com/gapan/xdgmenumaker"; license = lib.licenses.gpl3Plus; # NOTE: exclude darwin from platforms because Travis reports hash mismatch - platforms = with lib.platforms; filter (x: !(elem x darwin)) unix; + platforms = with lib.platforms; lib.filter (x: !(lib.elem x darwin)) unix; maintainers = [ lib.maintainers.romildo ]; }; } diff --git a/pkgs/by-name/yo/yourkit-java/package.nix b/pkgs/by-name/yo/yourkit-java/package.nix index 082cf804ae02..72ba039eb3e7 100644 --- a/pkgs/by-name/yo/yourkit-java/package.nix +++ b/pkgs/by-name/yo/yourkit-java/package.nix @@ -91,13 +91,13 @@ stdenvNoCC.mkDerivation { passthru.updateScript = ./update.sh; - meta = with lib; { + meta = { description = "Award winning, fully featured low overhead profiler for Java EE and Java SE platforms"; homepage = "https://www.yourkit.com"; changelog = "https://www.yourkit.com/changes/"; license = lib.licenses.unfree; mainProgram = "yourkit-java-profiler"; - platforms = attrNames arches; + platforms = lib.attrNames arches; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; maintainers = with lib.maintainers; [ herberteuler ]; }; diff --git a/pkgs/by-name/ze/zeroad-unwrapped/package.nix b/pkgs/by-name/ze/zeroad-unwrapped/package.nix index b41db187955c..3a16aaf5c3b6 100644 --- a/pkgs/by-name/ze/zeroad-unwrapped/package.nix +++ b/pkgs/by-name/ze/zeroad-unwrapped/package.nix @@ -162,7 +162,7 @@ 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 lib.licenses; [ @@ -173,7 +173,7 @@ stdenv.mkDerivation rec { lib.licenses.zlib # otherwise masked by pkgs.zlib ]; maintainers = with lib.maintainers; [ chvp ]; - platforms = subtractLists lib.platforms.i686 lib.platforms.linux; + platforms = lib.subtractLists lib.platforms.i686 lib.platforms.linux; mainProgram = "0ad"; }; } diff --git a/pkgs/desktops/gnome/extensions/clock-override/default.nix b/pkgs/desktops/gnome/extensions/clock-override/default.nix index 7b4b20b31ad0..2092cd7f1713 100644 --- a/pkgs/desktops/gnome/extensions/clock-override/default.nix +++ b/pkgs/desktops/gnome/extensions/clock-override/default.nix @@ -40,11 +40,11 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = { description = "Customize the date and time format displayed in clock in the top bar in GNOME Shell"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ rhoriguchi ]; homepage = "https://github.com/stuartlangridge/gnome-shell-clock-override"; - broken = versionOlder gnome-shell.version "3.18"; + broken = lib.versionOlder gnome-shell.version "3.18"; }; } diff --git a/pkgs/desktops/gnome/extensions/pidgin-im-integration/default.nix b/pkgs/desktops/gnome/extensions/pidgin-im-integration/default.nix index 4af167bdb70e..4a21f6c48c88 100644 --- a/pkgs/desktops/gnome/extensions/pidgin-im-integration/default.nix +++ b/pkgs/desktops/gnome/extensions/pidgin-im-integration/default.nix @@ -34,12 +34,12 @@ stdenv.mkDerivation rec { extensionPortalSlug = "pidgin-im-integration"; }; - meta = with lib; { + meta = { homepage = "https://github.com/muffinmad/pidgin-im-gnome-shell-extension"; description = "Make Pidgin IM conversations appear in the Gnome Shell message tray"; license = lib.licenses.gpl2; platforms = lib.platforms.linux; maintainers = [ ]; - broken = versionAtLeast gnome-shell.version "3.32"; # Doesn't support 3.34 + broken = lib.versionAtLeast gnome-shell.version "3.32"; # Doesn't support 3.34 }; } diff --git a/pkgs/desktops/gnome/extensions/unite/default.nix b/pkgs/desktops/gnome/extensions/unite/default.nix index 46e5979bb93e..03529846c871 100644 --- a/pkgs/desktops/gnome/extensions/unite/default.nix +++ b/pkgs/desktops/gnome/extensions/unite/default.nix @@ -40,11 +40,11 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = { description = "Unite is a GNOME Shell extension which makes a few layout tweaks to the top panel and removes window decorations to make it look like Ubuntu Unity Shell"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ rhoriguchi ]; homepage = "https://github.com/hardpixel/unite-shell"; - broken = versionOlder gnome-shell.version "3.32"; + broken = lib.versionOlder gnome-shell.version "3.32"; }; } diff --git a/pkgs/desktops/xfce/core/thunar/wrapper.nix b/pkgs/desktops/xfce/core/thunar/wrapper.nix index 009710ea353e..79d1b236af28 100644 --- a/pkgs/desktops/xfce/core/thunar/wrapper.nix +++ b/pkgs/desktops/xfce/core/thunar/wrapper.nix @@ -45,7 +45,7 @@ else done ''; - meta = with lib; { + meta = { inherit (thunar.meta) homepage license @@ -56,7 +56,7 @@ else description = thunar.meta.description + - optionalString (0 != length thunarPlugins) - " (with plugins: ${concatStringsSep ", " (map (x: x.name) thunarPlugins)})"; + lib.optionalString (0 != lib.length thunarPlugins) + " (with plugins: ${lib.concatStringsSep ", " (map (x: x.name) thunarPlugins)})"; }; } diff --git a/pkgs/development/compilers/ccl/default.nix b/pkgs/development/compilers/ccl/default.nix index 0881446f1e2d..c5f4418e7c62 100644 --- a/pkgs/development/compilers/ccl/default.nix +++ b/pkgs/development/compilers/ccl/default.nix @@ -108,7 +108,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - meta = with lib; { + meta = { # assembler failures during build, x86_64-darwin broken since 2020-10-14 broken = (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64); description = "Clozure Common Lisp"; @@ -116,6 +116,6 @@ stdenv.mkDerivation rec { license = lib.licenses.asl20; mainProgram = "ccl"; teams = [ lib.teams.lisp ]; - platforms = attrNames options; + platforms = lib.attrNames options; }; } diff --git a/pkgs/development/compilers/mozart/binary.nix b/pkgs/development/compilers/mozart/binary.nix index 8ff2f062e439..a19aac53d5de 100644 --- a/pkgs/development/compilers/mozart/binary.nix +++ b/pkgs/development/compilers/mozart/binary.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation { patchShebangs $out ''; - meta = with lib; { + meta = { homepage = "https://www.mozart-oz.org/"; description = "Multiplatform implementation of the Oz programming language"; longDescription = '' @@ -83,7 +83,7 @@ stdenv.mkDerivation { ''; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.mit; - platforms = attrNames binaries; + platforms = lib.attrNames binaries; hydraPlatforms = [ ]; }; } diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index a82660eb217f..5787748f3cba 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -315,13 +315,13 @@ stdenv.mkDerivation (self: { __darwinAllowLocalNetworking = true; - meta = with lib; { + meta = { description = "Common Lisp compiler"; homepage = "https://sbcl.org"; license = lib.licenses.publicDomain; # and FreeBSD mainProgram = "sbcl"; teams = [ lib.teams.lisp ]; - platforms = attrNames bootstrapBinaries ++ [ + platforms = lib.attrNames bootstrapBinaries ++ [ # These aren’t bootstrapped using the binary distribution but compiled # using a separate (lisp) host "x86_64-darwin" diff --git a/pkgs/development/compilers/scala/2.x.nix b/pkgs/development/compilers/scala/2.x.nix index 7ca4c3800baa..eaf5ef0e0f31 100644 --- a/pkgs/development/compilers/scala/2.x.nix +++ b/pkgs/development/compilers/scala/2.x.nix @@ -98,7 +98,7 @@ stdenv.mkDerivation rec { ''; }; - meta = with lib; { + meta = { description = "General purpose programming language"; longDescription = '' Scala is a general purpose programming language designed to express @@ -111,7 +111,7 @@ stdenv.mkDerivation rec { homepage = "https://www.scala-lang.org/"; license = lib.licenses.bsd3; platforms = lib.platforms.all; - branch = versions.majorMinor version; + branch = lib.versions.majorMinor version; maintainers = with lib.maintainers; [ kashw2 ]; diff --git a/pkgs/development/interpreters/acl2/default.nix b/pkgs/development/interpreters/acl2/default.nix index 08a4c836190b..0b900710c785 100644 --- a/pkgs/development/interpreters/acl2/default.nix +++ b/pkgs/development/interpreters/acl2/default.nix @@ -146,7 +146,7 @@ stdenv.mkDerivation rec { rm -rf $out/share/${pname}/books ''; - meta = with lib; { + meta = { description = "Interpreter and prover for a Lisp dialect"; mainProgram = "acl2"; longDescription = '' @@ -182,7 +182,7 @@ stdenv.mkDerivation rec { # ACL2 itself is bsd3 bsd3 ] - ++ optionals certifyBooks [ + ++ lib.optionals certifyBooks [ # The community books are mostly bsd3 or mit but with a few # other things thrown in. mit diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 3f91c65090a8..1e8b00c05cd5 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -824,12 +824,12 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; - meta = with lib; { + meta = { homepage = "https://www.python.org"; changelog = let - majorMinor = versions.majorMinor version; - dashedVersion = replaceStrings [ "." "a" "b" ] [ "-" "-alpha-" "-beta-" ] version; + majorMinor = lib.versions.majorMinor version; + dashedVersion = lib.replaceStrings [ "." "a" "b" ] [ "-" "-alpha-" "-beta-" ] version; in if sourceVersion.suffix == "" then "https://docs.python.org/release/${version}/whatsnew/changelog.html" diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/development/libraries/glew/default.nix index 3413bc948139..5efd402f1f02 100644 --- a/pkgs/development/libraries/glew/default.nix +++ b/pkgs/development/libraries/glew/default.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = with lib; { + meta = { description = "OpenGL extension loading library for C/C++"; homepage = "https://glew.sourceforge.net/"; license = with lib.licenses; [ @@ -94,7 +94,9 @@ stdenv.mkDerivation (finalAttrs: { ]; # For full details, see https://github.com/nigels-com/glew#copyright-and-licensing pkgConfigModules = [ "glew" ]; platforms = - with lib.platforms; - if enableEGL then subtractLists darwin mesa.meta.platforms else mesa.meta.platforms; + if enableEGL then + lib.subtractLists lib.platforms.darwin mesa.meta.platforms + else + mesa.meta.platforms; }; }) diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index 16f8feb1710f..37252077c6df 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -438,7 +438,7 @@ qtModule ( requiredSystemFeatures = [ "big-parallel" ]; - meta = with lib; { + meta = { description = "Web engine based on the Chromium web browser"; mainProgram = "qwebengine_convert_dict"; maintainers = [ ]; @@ -450,7 +450,7 @@ qtModule ( let inherit (lib.systems.inspect) patternLogicalAnd; in - concatMap (patternLogicalAnd isUnix) ( + lib.concatMap (patternLogicalAnd isUnix) ( lib.concatMap lib.toList [ isx86_32 isx86_64 diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index 1e89de29f05b..f3eaef61b82c 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -342,11 +342,11 @@ stdenv.mkDerivation rec { ; }; - meta = with lib; { + meta = { description = "Basic Linear Algebra Subprograms"; license = lib.licenses.bsd3; homepage = "https://github.com/OpenMathLib/OpenBLAS"; - platforms = attrNames configs; + platforms = lib.attrNames configs; maintainers = with lib.maintainers; [ ttuegel ]; }; } diff --git a/pkgs/development/ocaml-modules/ocaml-freestanding/default.nix b/pkgs/development/ocaml-modules/ocaml-freestanding/default.nix index 2940bac18f50..a1e2906f1310 100644 --- a/pkgs/development/ocaml-modules/ocaml-freestanding/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-freestanding/default.nix @@ -64,14 +64,14 @@ else runHook postInstall ''; - meta = with lib; { + meta = { broken = true; # Not compatible with solo5 ≥ 0.7 description = "Freestanding OCaml runtime"; license = lib.licenses.mit; maintainers = [ lib.maintainers.sternenseemann ]; homepage = "https://github.com/mirage/ocaml-freestanding"; platforms = map ({ arch, os }: "${arch}-${os}") ( - cartesianProduct { + lib.cartesianProduct { arch = [ "aarch64" "x86_64" diff --git a/pkgs/development/python-modules/atenpdu/default.nix b/pkgs/development/python-modules/atenpdu/default.nix index 580163fa440c..2e61b502e665 100644 --- a/pkgs/development/python-modules/atenpdu/default.nix +++ b/pkgs/development/python-modules/atenpdu/default.nix @@ -32,13 +32,13 @@ buildPythonPackage rec { pythonImportsCheck = [ "atenpdu" ]; - meta = with lib; { + meta = { description = "Python interface to control ATEN PE PDUs"; homepage = "https://github.com/mtdcr/pductl"; changelog = "https://github.com/mtdcr/pductl/releases/tag/${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; mainProgram = "pductl"; - broken = versionAtLeast pysnmp.version "7"; + broken = lib.versionAtLeast pysnmp.version "7"; }; } diff --git a/pkgs/development/python-modules/azure-mgmt-common/default.nix b/pkgs/development/python-modules/azure-mgmt-common/default.nix index cecaf2dd2bd4..c928a10ae30d 100644 --- a/pkgs/development/python-modules/azure-mgmt-common/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-common/default.nix @@ -1,5 +1,5 @@ { - pkgs, + lib, buildPythonPackage, fetchPypi, python, @@ -28,18 +28,18 @@ buildPythonPackage rec { msrestazure ]; - postInstall = pkgs.lib.optionalString (!isPy3k) '' + postInstall = lib.optionalString (!isPy3k) '' echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/${python.sitePackages}"/azure/mgmt/__init__.py echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/${python.sitePackages}"/azure/__init__.py ''; doCheck = false; - meta = with pkgs.lib; { + meta = { description = "This is the Microsoft Azure Resource Management common code"; homepage = "https://github.com/Azure/azure-sdk-for-python"; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ olcai maxwilson ]; diff --git a/pkgs/development/python-modules/azure-mgmt-core/default.nix b/pkgs/development/python-modules/azure-mgmt-core/default.nix index e9e2eb34c9c2..db00dd7143b8 100644 --- a/pkgs/development/python-modules/azure-mgmt-core/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-core/default.nix @@ -1,5 +1,5 @@ { - pkgs, + lib, buildPythonPackage, fetchPypi, azure-core, @@ -33,10 +33,10 @@ buildPythonPackage rec { "azure.core" ]; - meta = with pkgs.lib; { + meta = { description = "Microsoft Azure Management Core Library for Python"; homepage = "https://github.com/Azure/azure-sdk-for-python"; - license = licenses.mit; + license = lib.licenses.mit; maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix b/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix index 27fa690bb52e..6ea9b152364d 100644 --- a/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix @@ -1,5 +1,5 @@ { - pkgs, + lib, buildPythonPackage, fetchPypi, azure-nspkg, @@ -20,11 +20,11 @@ buildPythonPackage rec { doCheck = false; - meta = with pkgs.lib; { + meta = { description = "Microsoft Azure SDK for Python"; homepage = "https://github.com/Azure/azure-sdk-for-python"; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ olcai maxwilson ]; diff --git a/pkgs/development/python-modules/breezy/default.nix b/pkgs/development/python-modules/breezy/default.nix index 28db0b8cb0ed..cfe36674911a 100644 --- a/pkgs/development/python-modules/breezy/default.nix +++ b/pkgs/development/python-modules/breezy/default.nix @@ -114,10 +114,10 @@ buildPythonPackage rec { }; }; - meta = with lib; { + meta = { description = "Friendly distributed version control system"; homepage = "https://www.breezy-vcs.org/"; - changelog = "https://github.com/breezy-team/breezy/blob/${src.rev}/doc/en/release-notes/brz-${versions.majorMinor version}.txt"; + changelog = "https://github.com/breezy-team/breezy/blob/${src.rev}/doc/en/release-notes/brz-${lib.versions.majorMinor version}.txt"; license = lib.licenses.gpl2Only; maintainers = [ ]; mainProgram = "brz"; diff --git a/pkgs/development/python-modules/clifford/default.nix b/pkgs/development/python-modules/clifford/default.nix index 3c43bd7d5a24..48d6fff862cd 100644 --- a/pkgs/development/python-modules/clifford/default.nix +++ b/pkgs/development/python-modules/clifford/default.nix @@ -63,7 +63,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "clifford" ]; - meta = with lib; { + meta = { description = "Numerical Geometric Algebra Module"; homepage = "https://clifford.readthedocs.io"; changelog = "https://github.com/pygae/clifford/releases/tag/v${version}"; @@ -71,6 +71,6 @@ buildPythonPackage rec { maintainers = [ ]; # Broken with numba >= 0.54 # see https://github.com/pygae/clifford/issues/430 - broken = versionAtLeast numba.version "0.58"; + broken = lib.versionAtLeast numba.version "0.58"; }; } diff --git a/pkgs/development/python-modules/deepwave/default.nix b/pkgs/development/python-modules/deepwave/default.nix index 4366843b565c..bae0ccdb6b50 100644 --- a/pkgs/development/python-modules/deepwave/default.nix +++ b/pkgs/development/python-modules/deepwave/default.nix @@ -63,11 +63,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "deepwave" ]; - meta = with lib; { + meta = { description = "Wave propagation modules for PyTorch"; homepage = "https://github.com/ar4/deepwave"; license = lib.licenses.mit; - platforms = intersectLists lib.platforms.x86_64 lib.platforms.linux; + platforms = lib.intersectLists lib.platforms.x86_64 lib.platforms.linux; maintainers = with lib.maintainers; [ atila ]; }; } diff --git a/pkgs/development/python-modules/dependency-injector/default.nix b/pkgs/development/python-modules/dependency-injector/default.nix index da5fdfe1e102..2896754e476e 100644 --- a/pkgs/development/python-modules/dependency-injector/default.nix +++ b/pkgs/development/python-modules/dependency-injector/default.nix @@ -61,13 +61,13 @@ buildPythonPackage rec { "tests/unit/providers/configuration/test_pydantic_settings_in_init_py36.py" ]; - meta = with lib; { + meta = { description = "Dependency injection microframework for Python"; homepage = "https://github.com/ets-labs/python-dependency-injector"; changelog = "https://github.com/ets-labs/python-dependency-injector/blob/${src.tag}/docs/main/changelog.rst"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ gerschtli ]; # https://github.com/ets-labs/python-dependency-injector/issues/726 - broken = versionAtLeast pydantic.version "2"; + broken = lib.versionAtLeast pydantic.version "2"; }; } diff --git a/pkgs/development/python-modules/dirigera/default.nix b/pkgs/development/python-modules/dirigera/default.nix index 25a03cbad94d..2f5faa833929 100644 --- a/pkgs/development/python-modules/dirigera/default.nix +++ b/pkgs/development/python-modules/dirigera/default.nix @@ -36,13 +36,13 @@ buildPythonPackage rec { pythonImportsCheck = [ "dirigera" ]; - meta = with lib; { + meta = { description = "Module for controlling the IKEA Dirigera Smart Home Hub"; homepage = "https://github.com/Leggin/dirigera"; changelog = "https://github.com/Leggin/dirigera/releases/tag/v${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; mainProgram = "generate-token"; - broken = versionOlder pydantic.version "2"; + broken = lib.versionOlder pydantic.version "2"; }; } diff --git a/pkgs/development/python-modules/django-leaflet/default.nix b/pkgs/development/python-modules/django-leaflet/default.nix index d68a6f15d084..b43f0c721ffd 100644 --- a/pkgs/development/python-modules/django-leaflet/default.nix +++ b/pkgs/development/python-modules/django-leaflet/default.nix @@ -1,5 +1,5 @@ { - pkgs, + lib, buildPythonPackage, django, fetchPypi, @@ -32,11 +32,11 @@ buildPythonPackage rec { # This dosn't work either because of the same exception as above # pythonImportsCheck = [ "leaflet" ]; - meta = with pkgs.lib; { + meta = { description = "Allows you to use Leaflet in your Django projects"; homepage = "https://github.com/makinacorpus/django-leaflet"; changelog = "https://github.com/makinacorpus/django-leaflet/blob/${version}/CHANGES"; - license = licenses.lgpl3Only; + license = lib.licenses.lgpl3Only; maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/dopy/default.nix b/pkgs/development/python-modules/dopy/default.nix index 684f4c17ad45..68c64292d683 100644 --- a/pkgs/development/python-modules/dopy/default.nix +++ b/pkgs/development/python-modules/dopy/default.nix @@ -1,4 +1,5 @@ { + lib, pkgs, buildPythonPackage, requests, @@ -26,10 +27,10 @@ buildPythonPackage { doCheck = false; pythonImportsCheck = [ "dopy" ]; - meta = with pkgs.lib; { + meta = { description = "Digital Ocean API python wrapper"; homepage = "https://github.com/Wiredcraft/dopy"; - license = licenses.mit; - maintainers = with maintainers; [ lihop ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ lihop ]; }; } diff --git a/pkgs/development/python-modules/dtschema/default.nix b/pkgs/development/python-modules/dtschema/default.nix index dbeeb2f726fc..5208c1754c3d 100644 --- a/pkgs/development/python-modules/dtschema/default.nix +++ b/pkgs/development/python-modules/dtschema/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "dtschema" ]; - meta = with lib; { + meta = { description = "Tooling for devicetree validation using YAML and jsonschema"; homepage = "https://github.com/devicetree-org/dt-schema/"; changelog = "https://github.com/devicetree-org/dt-schema/releases/tag/v${version}"; @@ -55,7 +55,7 @@ buildPythonPackage rec { || # see https://github.com/devicetree-org/dt-schema/issues/108 - versionAtLeast jsonschema.version "4.18" + lib.versionAtLeast jsonschema.version "4.18" ); }; } diff --git a/pkgs/development/python-modules/escapism/default.nix b/pkgs/development/python-modules/escapism/default.nix index 1146c3cb67d9..80b754aaf3ab 100644 --- a/pkgs/development/python-modules/escapism/default.nix +++ b/pkgs/development/python-modules/escapism/default.nix @@ -1,5 +1,5 @@ { - pkgs, + lib, buildPythonPackage, fetchPypi, }: @@ -17,10 +17,10 @@ buildPythonPackage rec { # No tests distributed doCheck = false; - meta = with pkgs.lib; { + meta = { description = "Simple, generic API for escaping strings"; homepage = "https://github.com/minrk/escapism"; - license = licenses.mit; - maintainers = with maintainers; [ bzizou ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ bzizou ]; }; } diff --git a/pkgs/development/python-modules/facebook-sdk/default.nix b/pkgs/development/python-modules/facebook-sdk/default.nix index 7ef73d1a1fa6..35ce112fd918 100644 --- a/pkgs/development/python-modules/facebook-sdk/default.nix +++ b/pkgs/development/python-modules/facebook-sdk/default.nix @@ -1,5 +1,5 @@ { - pkgs, + lib, buildPythonPackage, fetchPypi, requests, @@ -25,10 +25,10 @@ buildPythonPackage rec { ${python.interpreter} test/test_facebook.py ''; - meta = with pkgs.lib; { + meta = { description = "Client library that supports the Facebook Graph API and the official Facebook JavaScript SDK"; homepage = "https://github.com/pythonforfacebook/facebook-sdk"; - license = licenses.asl20; + license = lib.licenses.asl20; maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/haystack-ai/default.nix b/pkgs/development/python-modules/haystack-ai/default.nix index 015372fc0c5f..f64753da6dda 100644 --- a/pkgs/development/python-modules/haystack-ai/default.nix +++ b/pkgs/development/python-modules/haystack-ai/default.nix @@ -257,7 +257,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "haystack" ]; - meta = with lib; { + meta = { description = "LLM orchestration framework to build customizable, production-ready LLM applications"; longDescription = '' LLM orchestration framework to build customizable, production-ready LLM applications. Connect components (models, vector DBs, file converters) to pipelines or agents that can interact with your data. With advanced retrieval methods, it's best suited for building RAG, question answering, semantic search or conversational agent chatbots @@ -267,6 +267,6 @@ buildPythonPackage rec { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ happysalada ]; # https://github.com/deepset-ai/haystack/issues/5304 - broken = versionAtLeast pydantic.version "2"; + broken = lib.versionAtLeast pydantic.version "2"; }; } diff --git a/pkgs/development/python-modules/impacket/default.nix b/pkgs/development/python-modules/impacket/default.nix index 15ff73ee42d6..e7282ace1c1e 100644 --- a/pkgs/development/python-modules/impacket/default.nix +++ b/pkgs/development/python-modules/impacket/default.nix @@ -54,12 +54,12 @@ buildPythonPackage rec { "tests/SMB_RPC/" ]; - meta = with lib; { + meta = { description = "Network protocols Constructors and Dissectors"; homepage = "https://github.com/SecureAuthCorp/impacket"; changelog = "https://github.com/fortra/impacket/releases/tag/impacket_" - + replaceStrings [ "." ] [ "_" ] version; + + lib.replaceStrings [ "." ] [ "_" ] version; # Modified Apache Software License, Version 1.1 license = lib.licenses.free; maintainers = with lib.maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/m2r/default.nix b/pkgs/development/python-modules/m2r/default.nix index 10a7f11e7e43..dc14012dc06b 100644 --- a/pkgs/development/python-modules/m2r/default.nix +++ b/pkgs/development/python-modules/m2r/default.nix @@ -39,12 +39,12 @@ buildPythonPackage rec { nativeCheckInputs = [ pygments ]; - meta = with lib; { + meta = { homepage = "https://github.com/miyakogi/m2r"; description = "Markdown to reStructuredText converter"; license = lib.licenses.mit; maintainers = [ ]; # https://github.com/miyakogi/m2r/issues/66 - broken = versionAtLeast mistune.version "2"; + broken = lib.versionAtLeast mistune.version "2"; }; } diff --git a/pkgs/development/python-modules/markupsafe/default.nix b/pkgs/development/python-modules/markupsafe/default.nix index ff05a550813d..cdb90dd781ac 100644 --- a/pkgs/development/python-modules/markupsafe/default.nix +++ b/pkgs/development/python-modules/markupsafe/default.nix @@ -46,9 +46,9 @@ buildPythonPackage rec { ; }; - meta = with lib; { + meta = { changelog = "https://markupsafe.palletsprojects.com/page/changes/#version-${ - replaceStrings [ "." ] [ "-" ] version + lib.replaceStrings [ "." ] [ "-" ] version }"; description = "Implements a XML/HTML/XHTML Markup safe string"; homepage = "https://palletsprojects.com/p/markupsafe/"; diff --git a/pkgs/development/python-modules/md2gemini/default.nix b/pkgs/development/python-modules/md2gemini/default.nix index af493efa63a0..d61a70778851 100644 --- a/pkgs/development/python-modules/md2gemini/default.nix +++ b/pkgs/development/python-modules/md2gemini/default.nix @@ -26,11 +26,11 @@ buildPythonPackage rec { hash = "sha256-XreDqqzH3UQ+RIBOrvHpaBb7PXcPPptjQx5cjpI+VzQ="; }; - meta = with lib; { + meta = { description = "Markdown to Gemini text format conversion library"; homepage = "https://github.com/makeworld-the-better-one/md2gemini"; license = lib.licenses.lgpl3Plus; maintainers = [ lib.maintainers.kaction ]; - broken = versionAtLeast mistune.version "3"; + broken = lib.versionAtLeast mistune.version "3"; }; } diff --git a/pkgs/development/python-modules/opcua-widgets/default.nix b/pkgs/development/python-modules/opcua-widgets/default.nix index f12d7140ea62..1d35bf820fe6 100644 --- a/pkgs/development/python-modules/opcua-widgets/default.nix +++ b/pkgs/development/python-modules/opcua-widgets/default.nix @@ -1,5 +1,5 @@ { - pkgs, + lib, buildPythonPackage, pythonOlder, fetchFromGitHub, @@ -31,10 +31,10 @@ buildPythonPackage rec { #This test is broken, when updating this package check if the test was fixed. doCheck = false; - meta = with pkgs.lib; { + meta = { description = "Common widgets for opcua-modeler og opcua-client-gui"; homepage = "https://github.com/FreeOpcUa/opcua-widgets"; - license = licenses.gpl3Only; + license = lib.licenses.gpl3Only; maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/prometrix/default.nix b/pkgs/development/python-modules/prometrix/default.nix index 0e6ff0dff720..649602bd5069 100644 --- a/pkgs/development/python-modules/prometrix/default.nix +++ b/pkgs/development/python-modules/prometrix/default.nix @@ -52,7 +52,7 @@ buildPythonPackage { pythonImportsCheck = [ "prometrix" ]; - meta = with lib; { + meta = { description = "Unified Prometheus client"; longDescription = '' This Python package provides a unified Prometheus client that can be used @@ -63,6 +63,6 @@ buildPythonPackage { maintainers = [ ]; # prometheus-api-client 0.5.5 is not working # https://github.com/robusta-dev/prometrix/issues/14 - broken = versionAtLeast prometheus-api-client.version "0.5.3"; + broken = lib.versionAtLeast prometheus-api-client.version "0.5.3"; }; } diff --git a/pkgs/development/python-modules/pycurl/default.nix b/pkgs/development/python-modules/pycurl/default.nix index 55c5face0b1e..49be840bf8f9 100644 --- a/pkgs/development/python-modules/pycurl/default.nix +++ b/pkgs/development/python-modules/pycurl/default.nix @@ -108,12 +108,12 @@ buildPythonPackage rec { "tests/multi_test.py" ]; - meta = with lib; { + meta = { description = "Python Interface To The cURL library"; homepage = "http://pycurl.io/"; changelog = "https://github.com/pycurl/pycurl/blob/REL_" - + replaceStrings [ "." ] [ "_" ] version + + lib.replaceStrings [ "." ] [ "_" ] version + "/ChangeLog"; license = with lib.licenses; [ lgpl2Only diff --git a/pkgs/development/python-modules/repoze-sphinx-autointerface/default.nix b/pkgs/development/python-modules/repoze-sphinx-autointerface/default.nix index bebd9ace09f6..37b255755d60 100644 --- a/pkgs/development/python-modules/repoze-sphinx-autointerface/default.nix +++ b/pkgs/development/python-modules/repoze-sphinx-autointerface/default.nix @@ -42,13 +42,13 @@ buildPythonPackage rec { "repoze.sphinx" ]; - meta = with lib; { + meta = { homepage = "https://github.com/repoze/repoze.sphinx.autointerface"; description = "Auto-generate Sphinx API docs from Zope interfaces"; changelog = "https://github.com/repoze/repoze.sphinx.autointerface/blob/${version}/CHANGES.rst"; license = lib.licenses.bsd0; maintainers = [ ]; # https://github.com/repoze/repoze.sphinx.autointerface/issues/21 - broken = versionAtLeast sphinx.version "7.2"; + broken = lib.versionAtLeast sphinx.version "7.2"; }; } diff --git a/pkgs/development/python-modules/selenium-wire/default.nix b/pkgs/development/python-modules/selenium-wire/default.nix index 3219692516f4..31a8f8a43caf 100644 --- a/pkgs/development/python-modules/selenium-wire/default.nix +++ b/pkgs/development/python-modules/selenium-wire/default.nix @@ -67,12 +67,12 @@ buildPythonPackage rec { "tests/end2end/test_end2end.py" ]; - meta = with lib; { + meta = { description = "Extends Selenium's Python bindings to give you the ability to inspect requests made by the browser"; homepage = "https://github.com/wkeeling/selenium-wire"; changelog = "https://github.com/wkeeling/selenium-wire/blob/${version}/HISTORY.rst"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; - broken = versionAtLeast blinker.version "1.8"; + broken = lib.versionAtLeast blinker.version "1.8"; }; } diff --git a/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix b/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix index 9ab25d05ad37..20454b070e80 100644 --- a/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix +++ b/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix @@ -29,12 +29,12 @@ buildPythonPackage rec { pythonImportsCheck = [ "setuptools_scm_git_archive" ]; - meta = with lib; { + meta = { description = "setuptools_scm plugin for git archives"; homepage = "https://github.com/Changaco/setuptools_scm_git_archive"; license = lib.licenses.mit; maintainers = [ ]; # https://github.com/Changaco/setuptools_scm_git_archive/pull/22 - broken = versionAtLeast setuptools-scm.version "8"; + broken = lib.versionAtLeast setuptools-scm.version "8"; }; } diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index a8cb29116308..9dae458a8dcb 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -39,11 +39,11 @@ buildPythonPackage rec { inherit distutils; }; - meta = with lib; { + meta = { description = "Utilities to facilitate the installation of Python packages"; homepage = "https://github.com/pypa/setuptools"; changelog = "https://setuptools.pypa.io/en/stable/history.html#v${ - replaceStrings [ "." ] [ "-" ] version + lib.replaceStrings [ "." ] [ "-" ] version }"; license = with lib.licenses; [ mit ]; platforms = python.meta.platforms; diff --git a/pkgs/development/python-modules/shazamio/default.nix b/pkgs/development/python-modules/shazamio/default.nix index f1434dc56e0b..10c7301e4990 100644 --- a/pkgs/development/python-modules/shazamio/default.nix +++ b/pkgs/development/python-modules/shazamio/default.nix @@ -67,13 +67,13 @@ buildPythonPackage rec { pythonImportsCheck = [ "shazamio" ]; - meta = with lib; { + meta = { description = "Free asynchronous library from reverse engineered Shazam API"; homepage = "https://github.com/dotX12/ShazamIO"; changelog = "https://github.com/dotX12/ShazamIO/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = [ ]; # https://github.com/shazamio/ShazamIO/issues/80 - broken = versionAtLeast pydantic.version "2"; + broken = lib.versionAtLeast pydantic.version "2"; }; } diff --git a/pkgs/development/python-modules/solo-python/default.nix b/pkgs/development/python-modules/solo-python/default.nix index 905f6c02a17d..30f7c9b90e78 100644 --- a/pkgs/development/python-modules/solo-python/default.nix +++ b/pkgs/development/python-modules/solo-python/default.nix @@ -53,7 +53,7 @@ buildPythonPackage rec { "solo.operations" ]; - meta = with lib; { + meta = { description = "Python tool and library for SoloKeys Solo 1"; homepage = "https://github.com/solokeys/solo1-cli"; maintainers = with lib.maintainers; [ wucke13 ]; @@ -63,6 +63,6 @@ buildPythonPackage rec { ]; # not compatible with fido2 >= 1.0.0 # https://github.com/solokeys/solo1-cli/issues/157 - broken = versionAtLeast fido2.version "1.0.0"; + broken = lib.versionAtLeast fido2.version "1.0.0"; }; } diff --git a/pkgs/development/python-modules/steamship/default.nix b/pkgs/development/python-modules/steamship/default.nix index 2c8a15e3a511..304bca446d71 100644 --- a/pkgs/development/python-modules/steamship/default.nix +++ b/pkgs/development/python-modules/steamship/default.nix @@ -47,13 +47,13 @@ buildPythonPackage rec { pythonImportsCheck = [ "steamship" ]; - meta = with lib; { + meta = { description = "Fastest way to add language AI to your product"; homepage = "https://www.steamship.com/"; changelog = "https://github.com/steamship-core/python-client/releases/tag/${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ natsukium ]; # https://github.com/steamship-core/python-client/issues/503 - broken = versionAtLeast pydantic.version "2"; + broken = lib.versionAtLeast pydantic.version "2"; }; } diff --git a/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix b/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix index 9486f7ed9aaf..5e50ffe45720 100644 --- a/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { # No tests available doCheck = false; - meta = with lib; { + meta = { homepage = "https://github.com/tulir/telethon-session-sqlalchemy"; description = "SQLAlchemy backend for Telethon session storage"; license = lib.licenses.mit; @@ -33,6 +33,6 @@ buildPythonPackage rec { # https://github.com/tulir/telethon-session-sqlalchemy/blob/d498503ddde332e190bfa47e70f0bfa59fe6b5ef/setup.py#L17 # Repo is archived and so this is unlikely to change unless someone forks # and takes over development - broken = versionAtLeast sqlalchemy.version "2"; + broken = lib.versionAtLeast sqlalchemy.version "2"; }; } diff --git a/pkgs/development/python-modules/tree-sitter-languages/default.nix b/pkgs/development/python-modules/tree-sitter-languages/default.nix index 2c8d1706f555..ce0ce2ee1e20 100644 --- a/pkgs/development/python-modules/tree-sitter-languages/default.nix +++ b/pkgs/development/python-modules/tree-sitter-languages/default.nix @@ -53,12 +53,12 @@ buildPythonPackage rec { pythonImportsCheck = [ "tree_sitter_languages" ]; - meta = with lib; { + meta = { description = "Binary Python wheels for all tree sitter languages"; homepage = "https://github.com/grantjenks/py-tree-sitter-languages"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ doronbehar ]; # https://github.com/grantjenks/py-tree-sitter-languages/issues/67 - broken = versionAtLeast tree-sitter.version "0.22"; + broken = lib.versionAtLeast tree-sitter.version "0.22"; }; } diff --git a/pkgs/development/python-modules/ward/default.nix b/pkgs/development/python-modules/ward/default.nix index e01741ea3bdf..56c465fa3cb4 100644 --- a/pkgs/development/python-modules/ward/default.nix +++ b/pkgs/development/python-modules/ward/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "ward" ]; - meta = with lib; { + meta = { description = "Test framework for Python"; homepage = "https://github.com/darrenburns/ward"; changelog = "https://github.com/darrenburns/ward/releases/tag/release%2F${version}"; @@ -55,6 +55,6 @@ buildPythonPackage rec { mainProgram = "ward"; # Old requirements (cucumber-tag-expressions and rich) # https://github.com/darrenburns/ward/issues/380 - broken = versionAtLeast rich.version "13.0.0"; + broken = lib.versionAtLeast rich.version "13.0.0"; }; } diff --git a/pkgs/development/python-modules/withings-api/default.nix b/pkgs/development/python-modules/withings-api/default.nix index 0dcc33b27bfa..1c184dfcff33 100644 --- a/pkgs/development/python-modules/withings-api/default.nix +++ b/pkgs/development/python-modules/withings-api/default.nix @@ -49,12 +49,12 @@ buildPythonPackage rec { pythonImportsCheck = [ "withings_api" ]; - meta = with lib; { + meta = { description = "Library for the Withings Health API"; homepage = "https://github.com/vangorra/python_withings_api"; changelog = "https://github.com/vangorra/python_withings_api/releases/tag/${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ kittywitch ]; - broken = versionAtLeast pydantic.version "2"; + broken = lib.versionAtLeast pydantic.version "2"; }; } diff --git a/pkgs/development/tools/analysis/rr/zen_workaround.nix b/pkgs/development/tools/analysis/rr/zen_workaround.nix index 739691b7d723..91b5036d82f2 100644 --- a/pkgs/development/tools/analysis/rr/zen_workaround.nix +++ b/pkgs/development/tools/analysis/rr/zen_workaround.nix @@ -48,12 +48,12 @@ stdenv.mkDerivation { runHook postInstall ''; - meta = with lib; { + meta = { description = "Kernel module supporting the rr debugger on (some) AMD Zen-based CPUs"; homepage = "https://github.com/rr-debugger/rr/wiki/Zen#kernel-module"; license = lib.licenses.gpl2; maintainers = [ lib.maintainers.vcunat ]; platforms = [ "x86_64-linux" ]; - broken = versionOlder kernel.version "4.19"; # 4.14 breaks and 4.19 works + broken = lib.versionOlder kernel.version "4.19"; # 4.14 breaks and 4.19 works }; } diff --git a/pkgs/development/tools/electron/binary/generic.nix b/pkgs/development/tools/electron/binary/generic.nix index 9f14ac48d435..419d835e24cd 100644 --- a/pkgs/development/tools/electron/binary/generic.nix +++ b/pkgs/development/tools/electron/binary/generic.nix @@ -39,7 +39,7 @@ version: hashes: let pname = "electron"; - meta = with lib; { + meta = { description = "Cross platform desktop application shell"; homepage = "https://github.com/electron/electron"; license = lib.licenses.mit; @@ -54,7 +54,7 @@ let ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; # https://www.electronjs.org/docs/latest/tutorial/electron-timelines - knownVulnerabilities = optional (versionOlder version "37.0.0") "Electron version ${version} is EOL"; + knownVulnerabilities = lib.optional (lib.versionOlder version "37.0.0") "Electron version ${version} is EOL"; }; fetcher = diff --git a/pkgs/development/tools/electron/common.nix b/pkgs/development/tools/electron/common.nix index e68d07f5c18f..128dc4c2cc32 100644 --- a/pkgs/development/tools/electron/common.nix +++ b/pkgs/development/tools/electron/common.nix @@ -318,7 +318,7 @@ in inherit info; }; - meta = with lib; { + meta = { description = "Cross platform desktop application shell"; homepage = "https://github.com/electron/electron"; platforms = lib.platforms.linux; @@ -326,7 +326,7 @@ in teams = [ lib.teams.electron ]; mainProgram = "electron"; hydraPlatforms = - lib.optionals (!(hasInfix "alpha" info.version) && !(hasInfix "beta" info.version)) + lib.optionals (!(lib.hasInfix "alpha" info.version) && !(lib.hasInfix "beta" info.version)) [ "aarch64-linux" "x86_64-linux" diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index d11aafdb1713..80451e726d51 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -550,7 +550,7 @@ let inherit majorVersion; }; - meta = with lib; { + meta = { description = "Event-driven I/O framework for the V8 JavaScript engine"; homepage = "https://nodejs.org"; changelog = "https://github.com/nodejs/node/releases/tag/v${version}"; @@ -561,7 +561,7 @@ let broken = !canExecute && !canEmulate && (stdenv.buildPlatform.parsed.cpu != stdenv.hostPlatform.parsed.cpu); mainProgram = "node"; - knownVulnerabilities = optional (versionOlder version "18") "This NodeJS release has reached its end of life. See https://nodejs.org/en/about/releases/."; + knownVulnerabilities = lib.optional (lib.versionOlder version "18") "This NodeJS release has reached its end of life. See https://nodejs.org/en/about/releases/."; }; passthru.python = python; # to ensure nodeEnv uses the same version diff --git a/pkgs/os-specific/linux/gasket/default.nix b/pkgs/os-specific/linux/gasket/default.nix index 7091e9cedcd9..223fc0e9376b 100644 --- a/pkgs/os-specific/linux/gasket/default.nix +++ b/pkgs/os-specific/linux/gasket/default.nix @@ -55,12 +55,12 @@ stdenv.mkDerivation { ]; nativeBuildInputs = kernel.moduleBuildDependencies; - meta = with lib; { + meta = { description = "Coral Gasket Driver allows usage of the Coral EdgeTPU on Linux systems"; homepage = "https://github.com/google/gasket-driver"; license = lib.licenses.gpl2Only; maintainers = [ lib.maintainers.kylehendricks ]; platforms = lib.platforms.linux; - broken = versionOlder kernel.version "5.15"; + broken = lib.versionOlder kernel.version "5.15"; }; } diff --git a/pkgs/os-specific/linux/ixgbevf/default.nix b/pkgs/os-specific/linux/ixgbevf/default.nix index c69dd60f3c6a..6a299d97dea5 100644 --- a/pkgs/os-specific/linux/ixgbevf/default.nix +++ b/pkgs/os-specific/linux/ixgbevf/default.nix @@ -29,12 +29,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with lib; { + meta = { description = "Intel 82599 Virtual Function Driver"; homepage = "https://sourceforge.net/projects/e1000/files/ixgbevf%20stable/"; license = lib.licenses.gpl2Only; priority = 20; # kernels ship ixgbevf driver for a long time already, maybe switch to a newest kernel? - broken = versionAtLeast kernel.version "5.2"; + broken = lib.versionAtLeast kernel.version "5.2"; }; } diff --git a/pkgs/os-specific/linux/zenpower/default.nix b/pkgs/os-specific/linux/zenpower/default.nix index d8d062ac8976..31081446ef2d 100644 --- a/pkgs/os-specific/linux/zenpower/default.nix +++ b/pkgs/os-specific/linux/zenpower/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { install -D zenpower.ko -t "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/hwmon/zenpower/" ''; - meta = with lib; { + meta = { inherit (src.meta) homepage; description = "Linux kernel driver for reading temperature, voltage(SVI2), current(SVI2) and power(SVI2) for AMD Zen family CPUs"; license = lib.licenses.gpl2Plus; @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { artturin ]; platforms = [ "x86_64-linux" ]; - broken = versionOlder kernel.version "4.14"; + broken = lib.versionOlder kernel.version "4.14"; }; } diff --git a/pkgs/servers/home-assistant/custom-components/README.md b/pkgs/servers/home-assistant/custom-components/README.md index fc6f90dd95d2..3820328e2ed4 100644 --- a/pkgs/servers/home-assistant/custom-components/README.md +++ b/pkgs/servers/home-assistant/custom-components/README.md @@ -36,7 +36,7 @@ buildHomeAssistantComponent { # python requirements, as specified in manifest.json ]; - meta = with lib; { + meta = { # changelog, description, homepage, license, maintainers }; } 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 0dd94721b924..594465af314a 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-zS9LfvSOWCKQIv5GsRS48taM31ZN4i2REY+IIQbqisk="; aarch64-darwin = "sha256-0QfTdgOkfs27EW1VB+AgHPwF1GRcFBxMPBZ9nRyovrs="; }; - meta = with lib; { + meta = { description = "Connects Grafana to ClickHouse"; license = lib.licenses.asl20; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; maintainers = with lib.maintainers; [ moody ]; - platforms = attrNames zipHash; + platforms = lib.attrNames zipHash; }; } diff --git a/pkgs/servers/web-apps/discourse/update.py b/pkgs/servers/web-apps/discourse/update.py index c859394bf11f..fd774b902274 100755 --- a/pkgs/servers/web-apps/discourse/update.py +++ b/pkgs/servers/web-apps/discourse/update.py @@ -347,10 +347,10 @@ def update_plugins(): rev = "replace-with-git-rev"; sha256 = "replace-with-sha256"; }}; - meta = with lib; {{ + meta = {{ homepage = ""; - maintainers = with maintainers; [ ]; - license = licenses.mit; # change to the correct license! + maintainers = with lib.maintainers; [ ]; + license = lib.licenses.mit; # change to the correct license! description = ""; }}; }}""")) diff --git a/pkgs/tools/package-management/nix/common-meson.nix b/pkgs/tools/package-management/nix/common-meson.nix index f9a8f2574e90..19d3f30fc654 100644 --- a/pkgs/tools/package-management/nix/common-meson.nix +++ b/pkgs/tools/package-management/nix/common-meson.nix @@ -261,7 +261,7 @@ stdenv.mkDerivation (finalAttrs: { # point 'nix edit' and ofborg at the file that defines the attribute, # not this common file. pos = builtins.unsafeGetAttrPos "version" args; - meta = with lib; { + meta = { description = "Powerful package manager that makes package management reliable and reproducible"; longDescription = '' Nix is a powerful package manager for Linux and other Unix systems that @@ -278,7 +278,7 @@ stdenv.mkDerivation (finalAttrs: { # https://hydra.nixos.org/build/298175022 # probably https://github.com/NixOS/nix/issues/13042 broken = stdenv.hostPlatform.system == "i686-linux" && stdenv.buildPlatform != stdenv.hostPlatform; - outputsToInstall = [ "out" ] ++ optional enableDocumentation "man"; + outputsToInstall = [ "out" ] ++ lib.optional enableDocumentation "man"; mainProgram = "nix"; }; }) diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index a1ee8907459d..577602cfca9e 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -334,11 +334,11 @@ stdenv.mkDerivation ( tests.netdata = nixosTests.netdata; }; - meta = with lib; { + meta = { broken = stdenv.buildPlatform != stdenv.hostPlatform || withEbpf; description = "Real-time performance monitoring tool"; homepage = "https://www.netdata.cloud/"; - changelog = "https://github.com/netdata/netdata/releases/tag/v${version}"; + changelog = "https://github.com/netdata/netdata/releases/tag/v${finalAttrs.version}"; license = [ lib.licenses.gpl3Plus ] ++ lib.optionals withCloudUi [ lib.licenses.ncul1 ]; mainProgram = "netdata"; platforms = lib.platforms.unix;