diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix index 54a25ef3a743..e8ad1bb31291 100644 --- a/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/pkgs/applications/networking/cluster/hadoop/default.nix @@ -146,28 +146,26 @@ let # The recursiveUpdate below breaks default meta.position, so manually override it. pos = __curPos; - meta = - with lib; - recursiveUpdate { - homepage = "https://hadoop.apache.org/"; - description = "Framework for distributed processing of large data sets across clusters of computers"; - license = lib.licenses.asl20; - sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; + meta = lib.recursiveUpdate { + homepage = "https://hadoop.apache.org/"; + description = "Framework for distributed processing of large data sets across clusters of computers"; + license = lib.licenses.asl20; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; - longDescription = '' - The Apache Hadoop software library is a framework that allows for - the distributed processing of large data sets across clusters of - computers using a simple programming model. It is designed to - scale up from single servers to thousands of machines, each - offering local computation and storage. Rather than rely on - hardware to deliver high-avaiability, the library itself is - designed to detect and handle failures at the application layer, - so delivering a highly-availabile service on top of a cluster of - computers, each of which may be prone to failures. - ''; - maintainers = with lib.maintainers; [ illustris ]; - platforms = attrNames platformAttrs; - } (attrByPath [ stdenv.system "meta" ] { } platformAttrs); + longDescription = '' + The Apache Hadoop software library is a framework that allows for + the distributed processing of large data sets across clusters of + computers using a simple programming model. It is designed to + scale up from single servers to thousands of machines, each + offering local computation and storage. Rather than rely on + hardware to deliver high-avaiability, the library itself is + designed to detect and handle failures at the application layer, + so delivering a highly-availabile service on top of a cluster of + computers, each of which may be prone to failures. + ''; + maintainers = with lib.maintainers; [ illustris ]; + platforms = lib.attrNames platformAttrs; + } (lib.attrByPath [ stdenv.system "meta" ] { } platformAttrs); }); in { diff --git a/pkgs/applications/networking/mullvad/openvpn.nix b/pkgs/applications/networking/mullvad/openvpn.nix index f851f85796cf..b554997dcba1 100644 --- a/pkgs/applications/networking/mullvad/openvpn.nix +++ b/pkgs/applications/networking/mullvad/openvpn.nix @@ -109,7 +109,7 @@ openvpn.overrideAttrs ( meta = oldAttrs.meta or { } // { description = "OpenVPN with Mullvad-specific patches applied"; homepage = "https://github.com/mullvad/openvpn"; - maintainers = with lib; [ maintainers.cole-h ]; + maintainers = with lib.maintainers; [ cole-h ]; }; } ) diff --git a/pkgs/by-name/ca/caprine-bin/package.nix b/pkgs/by-name/ca/caprine-bin/package.nix index 076c9533e647..1e8d6c427299 100644 --- a/pkgs/by-name/ca/caprine-bin/package.nix +++ b/pkgs/by-name/ca/caprine-bin/package.nix @@ -6,12 +6,12 @@ let pname = "caprine"; version = "2.59.1"; - metaCommon = with lib; { + metaCommon = { description = "Elegant Facebook Messenger desktop app"; homepage = "https://sindresorhus.com/caprine"; - license = licenses.mit; - maintainers = with maintainers; [ ShamrockLee ]; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ShamrockLee ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; x86_64-appimage = callPackage ./build-from-appimage.nix { inherit pname version metaCommon; diff --git a/pkgs/by-name/de/deskflow/package.nix b/pkgs/by-name/de/deskflow/package.nix index 702fb6427202..98c8fbf1c1b7 100644 --- a/pkgs/by-name/de/deskflow/package.nix +++ b/pkgs/by-name/de/deskflow/package.nix @@ -120,10 +120,10 @@ stdenv.mkDerivation (finalAttrs: { description = "Share one mouse and keyboard between multiple computers on Windows, macOS and Linux"; mainProgram = "deskflow"; maintainers = with lib.maintainers; [ flacks ]; - license = with lib; [ - licenses.gpl2Plus - licenses.openssl - licenses.mit # share/applications/org.deskflow.deskflow.desktop + license = with lib.licenses; [ + gpl2Plus + openssl + mit # share/applications/org.deskflow.deskflow.desktop ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/ev/evcc/package.nix b/pkgs/by-name/ev/evcc/package.nix index 4665e63c5073..719aacfe066f 100644 --- a/pkgs/by-name/ev/evcc/package.nix +++ b/pkgs/by-name/ev/evcc/package.nix @@ -28,9 +28,9 @@ let vendorHash = "sha256-VG1/6KadRC4jLBIOL39M6l8ZED1KLb+wKGHNQowAV1g="; - commonMeta = with lib; { - license = licenses.mit; - maintainers = with maintainers; [ hexa ]; + commonMeta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ hexa ]; }; decorate = buildGo125Module { diff --git a/pkgs/by-name/fl/flow-control/build.zig.zon.nix b/pkgs/by-name/fl/flow-control/build.zig.zon.nix index 84681e57692b..76180ab5c2a1 100644 --- a/pkgs/by-name/fl/flow-control/build.zig.zon.nix +++ b/pkgs/by-name/fl/flow-control/build.zig.zon.nix @@ -10,9 +10,6 @@ name ? "zig-packages", }: -with builtins; -with lib; - let unpackZigArtifact = { name, artifact }: @@ -41,9 +38,9 @@ let rev ? throw "rev is required, remove and regenerate the zon2json-lock file", }: let - parts = splitString "#" url; - url_base = elemAt parts 0; - url_without_query = elemAt (splitString "?" url_base) 0; + parts = lib.splitString "#" url; + url_base = lib.elemAt parts 0; + url_without_query = lib.elemAt (lib.splitString "?" url_base) 0; in fetchgit { inherit name rev hash; @@ -59,9 +56,9 @@ let ... }@args: let - parts = splitString "://" url; - proto = elemAt parts 0; - path = elemAt parts 1; + parts = lib.splitString "://" url; + proto = lib.elemAt parts 0; + path = lib.elemAt parts 1; fetcher = { "git+http" = fetchGitZig ( args diff --git a/pkgs/by-name/li/libserialport/package.nix b/pkgs/by-name/li/libserialport/package.nix index db6bdd650e7c..be4bfffb661f 100644 --- a/pkgs/by-name/li/libserialport/package.nix +++ b/pkgs/by-name/li/libserialport/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Cross-platform shared library for serial port access"; homepage = "https://sigrok.org/"; license = lib.licenses.gpl3Plus; - platforms = with lib; platforms.linux ++ platforms.darwin ++ platforms.windows; + platforms = with lib.platforms; linux ++ darwin ++ windows; maintainers = [ lib.maintainers.bjornfor ]; }; }) diff --git a/pkgs/by-name/lo/losslesscut-bin/build-from-dmg.nix b/pkgs/by-name/lo/losslesscut-bin/build-from-dmg.nix index c13fc28be9ac..7ac0dc35587c 100644 --- a/pkgs/by-name/lo/losslesscut-bin/build-from-dmg.nix +++ b/pkgs/by-name/lo/losslesscut-bin/build-from-dmg.nix @@ -34,10 +34,8 @@ stdenvNoCC.mkDerivation { runHook postInstall ''; - meta = - metaCommon - // (with lib; { - platforms = if isAarch64 then [ "aarch64-darwin" ] else platforms.darwin; - mainProgram = "losslesscut"; - }); + meta = metaCommon // { + platforms = if isAarch64 then [ "aarch64-darwin" ] else lib.platforms.darwin; + mainProgram = "losslesscut"; + }; } diff --git a/pkgs/by-name/lo/losslesscut-bin/build-from-windows.nix b/pkgs/by-name/lo/losslesscut-bin/build-from-windows.nix index 87d398d28ef0..397161a82d45 100644 --- a/pkgs/by-name/lo/losslesscut-bin/build-from-windows.nix +++ b/pkgs/by-name/lo/losslesscut-bin/build-from-windows.nix @@ -36,10 +36,8 @@ stdenvNoCC.mkDerivation { runHook postInstall ''; - meta = - metaCommon - // (with lib; { - platforms = platforms.windows; - mainProgram = "LosslessCut.exe"; - }); + meta = metaCommon // { + platforms = lib.platforms.windows; + mainProgram = "LosslessCut.exe"; + }; } diff --git a/pkgs/by-name/lo/losslesscut-bin/package.nix b/pkgs/by-name/lo/losslesscut-bin/package.nix index fe4c651b10ed..8fd238d8c9d8 100644 --- a/pkgs/by-name/lo/losslesscut-bin/package.nix +++ b/pkgs/by-name/lo/losslesscut-bin/package.nix @@ -8,13 +8,13 @@ let pname = "losslesscut"; version = "3.64.0"; - metaCommon = with lib; { + metaCommon = { description = "Swiss army knife of lossless video/audio editing"; homepage = "https://mifi.no/losslesscut/"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ ShamrockLee ]; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ ShamrockLee ]; mainProgram = "losslesscut"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; }; x86_64-appimage = callPackage ./build-from-appimage.nix { inherit pname version metaCommon; diff --git a/pkgs/by-name/ly/ly/deps.nix b/pkgs/by-name/ly/ly/deps.nix index ad15692d602d..689a3a413c71 100644 --- a/pkgs/by-name/ly/ly/deps.nix +++ b/pkgs/by-name/ly/ly/deps.nix @@ -10,9 +10,6 @@ name ? "zig-packages", }: -with builtins; -with lib; - let unpackZigArtifact = { name, artifact }: @@ -41,9 +38,9 @@ let rev ? throw "rev is required, remove and regenerate the zon2json-lock file", }: let - parts = splitString "#" url; - url_base = elemAt parts 0; - url_without_query = elemAt (splitString "?" url_base) 0; + parts = lib.splitString "#" url; + url_base = lib.elemAt parts 0; + url_without_query = lib.elemAt (lib.splitString "?" url_base) 0; in fetchgit { inherit name rev hash; @@ -59,9 +56,9 @@ let ... }@args: let - parts = splitString "://" url; - proto = elemAt parts 0; - path = elemAt parts 1; + parts = lib.splitString "://" url; + proto = lib.elemAt parts 0; + path = lib.elemAt parts 1; fetcher = { "git+http" = fetchGitZig ( args diff --git a/pkgs/by-name/ma/manticoresearch/columnar.nix b/pkgs/by-name/ma/manticoresearch/columnar.nix index 296d50176bcb..3b30950bc5eb 100644 --- a/pkgs/by-name/ma/manticoresearch/columnar.nix +++ b/pkgs/by-name/ma/manticoresearch/columnar.nix @@ -164,9 +164,9 @@ stdenv.mkDerivation (finalAttrs: { sed -i '/set (ADD_AVX_BUILDS 1)/d' CMakeLists.txt ''; - meta = with lib; { + meta = { description = "Manticore Columnar Library - columnar storage and secondary indexes library for Manticore Search"; homepage = "https://github.com/manticoresoftware/columnar"; - license = licenses.asl20; + license = lib.licenses.asl20; }; }) diff --git a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix index 491b8d4af218..41d2264f6e92 100644 --- a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix +++ b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix @@ -162,7 +162,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; maintainers = with lib.maintainers; [ getchoo ]; mainProgram = "ModrinthApp"; - platforms = with lib; platforms.linux ++ platforms.darwin; + platforms = with lib.platforms; linux ++ darwin; # This builds on architectures like aarch64, but the launcher itself does not support them yet. # Darwin is the only exception # See https://github.com/modrinth/code/issues/776#issuecomment-1742495678 diff --git a/pkgs/by-name/mp/mpv/scripts.nix b/pkgs/by-name/mp/mpv/scripts.nix index b90501c0e7cf..3eb9f39075c7 100644 --- a/pkgs/by-name/mp/mpv/scripts.nix +++ b/pkgs/by-name/mp/mpv/scripts.nix @@ -82,16 +82,15 @@ let scope = self: - with lib; - pipe + lib.pipe { inherit (self) callPackage; directory = ./scripts; } [ - packagesFromDirectoryRecursive - recurseIntoAttrs - (mapAttrsRecursiveCond (x: x.recurseForDerivations or false) addTests) + lib.packagesFromDirectoryRecursive + lib.recurseIntoAttrs + (lib.mapAttrsRecursiveCond (x: x.recurseForDerivations or false) addTests) ]; mkAliases = self: { diff --git a/pkgs/by-name/ni/nimlangserver/package.nix b/pkgs/by-name/ni/nimlangserver/package.nix index c7fc8872c5c7..4d6785d9ac57 100644 --- a/pkgs/by-name/ni/nimlangserver/package.nix +++ b/pkgs/by-name/ni/nimlangserver/package.nix @@ -21,14 +21,12 @@ buildNimPackage ( doCheck = false; - meta = - final.src.meta - // (with lib; { - description = "Nim language server implementation (based on nimsuggest)"; - homepage = "https://github.com/nim-lang/langserver"; - license = licenses.mit; - mainProgram = "nimlangserver"; - maintainers = with maintainers; [ daylinmorgan ]; - }); + meta = final.src.meta // { + description = "Nim language server implementation (based on nimsuggest)"; + homepage = "https://github.com/nim-lang/langserver"; + license = lib.licenses.mit; + mainProgram = "nimlangserver"; + maintainers = with lib.maintainers; [ daylinmorgan ]; + }; } ) diff --git a/pkgs/by-name/nr/nrfutil/package.nix b/pkgs/by-name/nr/nrfutil/package.nix index 7c1af81f15eb..407bff8b1a94 100644 --- a/pkgs/by-name/nr/nrfutil/package.nix +++ b/pkgs/by-name/nr/nrfutil/package.nix @@ -24,14 +24,14 @@ let platformSources = sources.${stdenvNoCC.system} or (throw "unsupported platform ${stdenvNoCC.system}"); - sharedMeta = with lib; { + sharedMeta = { description = "CLI tool for managing Nordic Semiconductor devices"; homepage = "https://www.nordicsemi.com/Products/Development-tools/nRF-Util"; changelog = "https://docs.nordicsemi.com/bundle/nrfutil/page/guides/revision_history.html"; - license = licenses.unfree; + license = lib.licenses.unfree; platforms = lib.attrNames sources; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ h7x4 ezrizhu ]; diff --git a/pkgs/by-name/od/odiff/build.zig.zon.nix b/pkgs/by-name/od/odiff/build.zig.zon.nix index 9a621d22e855..701696565c5c 100644 --- a/pkgs/by-name/od/odiff/build.zig.zon.nix +++ b/pkgs/by-name/od/odiff/build.zig.zon.nix @@ -10,9 +10,6 @@ name ? "zig-packages", }: -with builtins; -with lib; - let unpackZigArtifact = { name, artifact }: @@ -41,9 +38,9 @@ let rev ? throw "rev is required, remove and regenerate the zon2json-lock file", }: let - parts = splitString "#" url; - url_base = elemAt parts 0; - url_without_query = elemAt (splitString "?" url_base) 0; + parts = lib.splitString "#" url; + url_base = lib.elemAt parts 0; + url_without_query = lib.elemAt (lib.splitString "?" url_base) 0; in fetchgit { inherit name rev hash; @@ -59,9 +56,9 @@ let ... }@args: let - parts = splitString "://" url; - proto = elemAt parts 0; - path = elemAt parts 1; + parts = lib.splitString "://" url; + proto = lib.elemAt parts 0; + path = lib.elemAt parts 1; fetcher = { "git+http" = fetchGitZig ( args diff --git a/pkgs/by-name/pa/pam_rundir/package.nix b/pkgs/by-name/pa/pam_rundir/package.nix index 3b88ffcf2001..3fcf4a85d15c 100644 --- a/pkgs/by-name/pa/pam_rundir/package.nix +++ b/pkgs/by-name/pa/pam_rundir/package.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { description = "Provide user runtime directory on Linux systems"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; - maintainers = with lib; [ maintainers.aanderse ]; + maintainers = with lib.maintainers; [ aanderse ]; }; } diff --git a/pkgs/by-name/pr/prisma-engines_7/package.nix b/pkgs/by-name/pr/prisma-engines_7/package.nix index 91854e23a96e..39b5444528b9 100644 --- a/pkgs/by-name/pr/prisma-engines_7/package.nix +++ b/pkgs/by-name/pr/prisma-engines_7/package.nix @@ -49,13 +49,13 @@ rustPlatform.buildRustPackage (finalAttrs: { setupHook = ./setup-hook.sh; - meta = with lib; { + meta = { description = "Collection of engines that power the core stack for Prisma"; homepage = "https://www.prisma.io/"; - license = licenses.asl20; - platforms = platforms.unix; + license = lib.licenses.asl20; + platforms = lib.platforms.unix; mainProgram = "prisma"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ aqrln ]; }; diff --git a/pkgs/by-name/pr/prisma_7/package.nix b/pkgs/by-name/pr/prisma_7/package.nix index 113c33111ead..0a6ccb981adf 100644 --- a/pkgs/by-name/pr/prisma_7/package.nix +++ b/pkgs/by-name/pr/prisma_7/package.nix @@ -98,12 +98,12 @@ stdenv.mkDerivation (finalAttrs: { cli = callPackage ./test-cli.nix { }; }; - meta = with lib; { + meta = { description = "Next-generation ORM for Node.js and TypeScript"; homepage = "https://www.prisma.io/"; - license = licenses.asl20; - maintainers = with maintainers; [ aqrln ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ aqrln ]; mainProgram = "prisma"; - platforms = platforms.unix; + platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/ri/river-ultitile/build.zig.zon.nix b/pkgs/by-name/ri/river-ultitile/build.zig.zon.nix index a26d29e2067e..12ed09927d06 100644 --- a/pkgs/by-name/ri/river-ultitile/build.zig.zon.nix +++ b/pkgs/by-name/ri/river-ultitile/build.zig.zon.nix @@ -10,9 +10,6 @@ name ? "zig-packages", }: -with builtins; -with lib; - let unpackZigArtifact = { name, artifact }: @@ -41,9 +38,9 @@ let rev ? throw "rev is required, remove and regenerate the zon2json-lock file", }: let - parts = splitString "#" url; - url_base = elemAt parts 0; - url_without_query = elemAt (splitString "?" url_base) 0; + parts = lib.splitString "#" url; + url_base = lib.elemAt parts 0; + url_without_query = lib.elemAt (lib.splitString "?" url_base) 0; in fetchgit { inherit name rev hash; @@ -59,9 +56,9 @@ let ... }@args: let - parts = splitString "://" url; - proto = elemAt parts 0; - path = elemAt parts 1; + parts = lib.splitString "://" url; + proto = lib.elemAt parts 0; + path = lib.elemAt parts 1; fetcher = { "git+http" = fetchGitZig ( args diff --git a/pkgs/by-name/rs/rssguard/package.nix b/pkgs/by-name/rs/rssguard/package.nix index 700967b0557b..d77797846d5d 100644 --- a/pkgs/by-name/rs/rssguard/package.nix +++ b/pkgs/by-name/rs/rssguard/package.nix @@ -32,8 +32,8 @@ stdenv.mkDerivation rec { wrapGAppsHook4 qt6.wrapQtAppsHook ]; - cmakeFlags = with lib; [ - (cmakeFeature "CMAKE_BUILD_TYPE" "\"Release\"") + cmakeFlags = [ + (lib.cmakeFeature "CMAKE_BUILD_TYPE" "\"Release\"") ]; dontWrapGApps = true; diff --git a/pkgs/by-name/so/sonic-pi/update.sh b/pkgs/by-name/so/sonic-pi/update.sh index 1d1cdbc0ff5b..b869b31e72f6 100755 --- a/pkgs/by-name/so/sonic-pi/update.sh +++ b/pkgs/by-name/so/sonic-pi/update.sh @@ -14,7 +14,7 @@ nixeval() { } vendorhash() { - (nix --extra-experimental-features nix-command build --impure --argstr nixpkgs "$nixpkgs" --argstr attr "$1" --expr '{ nixpkgs, attr }: let pkgs = import nixpkgs {}; in with pkgs.lib; (getAttrFromPath (splitString "." attr) pkgs).overrideAttrs (attrs: { outputHash = fakeHash; })' --no-link 2>&1 >/dev/null | tail -n3 | grep -F got: | cut -d: -f2- | stripwhitespace) 2>/dev/null || true + (nix --extra-experimental-features nix-command build --impure --argstr nixpkgs "$nixpkgs" --argstr attr "$1" --expr '{ nixpkgs, attr }: let pkgs = import nixpkgs {}; in (pkgs.lib.getAttrFromPath (pkgs.lib.splitString "." attr) pkgs).overrideAttrs (attrs: { outputHash = pkgs.lib.fakeHash; })' --no-link 2>&1 >/dev/null | tail -n3 | grep -F got: | cut -d: -f2- | stripwhitespace) 2>/dev/null || true } findpath() { diff --git a/pkgs/by-name/st/stable-diffusion-cpp/package.nix b/pkgs/by-name/st/stable-diffusion-cpp/package.nix index c6e3275189c6..782e2aca4c32 100644 --- a/pkgs/by-name/st/stable-diffusion-cpp/package.nix +++ b/pkgs/by-name/st/stable-diffusion-cpp/package.nix @@ -110,17 +110,17 @@ effectiveStdenv.mkDerivation (finalAttrs: { (cmakeFeature "CMAKE_HIP_ARCHITECTURES" (builtins.concatStringsSep ";" rocmGpuTargets)) ]; - meta = with lib; { + meta = { description = "Stable Diffusion inference in pure C/C++"; homepage = "https://github.com/leejet/stable-diffusion.cpp"; - license = licenses.mit; + license = lib.licenses.mit; mainProgram = "sd"; maintainers = with lib.maintainers; [ dit7ya adriangl ]; - platforms = platforms.unix; - badPlatforms = optionals (cudaSupport || openclSupport) platforms.darwin; + platforms = lib.platforms.unix; + badPlatforms = lib.optionals (cudaSupport || openclSupport) lib.platforms.darwin; broken = metalSupport && !stdenv.hostPlatform.isDarwin; }; }) diff --git a/pkgs/by-name/ug/ugrep/package.nix b/pkgs/by-name/ug/ugrep/package.nix index d61df9afbe2a..457b1627cd05 100644 --- a/pkgs/by-name/ug/ugrep/package.nix +++ b/pkgs/by-name/ug/ugrep/package.nix @@ -105,23 +105,21 @@ stdenv.mkDerivation (finalAttrs: { }; }; - meta = - with lib; - { - description = "Ultra fast grep with interactive query UI"; - homepage = "https://github.com/Genivia/ugrep"; - changelog = "https://github.com/Genivia/ugrep/releases/tag/v${finalAttrs.version}"; - maintainers = with lib.maintainers; [ - numkem - mikaelfangel - ]; - license = lib.licenses.bsd3; - platforms = lib.platforms.all; - mainProgram = "ug"; - } - # Needed to ensure that the grep replacements take precedence over - # `gnugrep` when installed. Lower priority values win. - // lib.optionalAttrs createGrepReplacementLinks { - priority = (gnugrep.meta.priority or meta.defaultPriority) - 1; - }; + meta = { + description = "Ultra fast grep with interactive query UI"; + homepage = "https://github.com/Genivia/ugrep"; + changelog = "https://github.com/Genivia/ugrep/releases/tag/v${finalAttrs.version}"; + maintainers = with lib.maintainers; [ + numkem + mikaelfangel + ]; + license = lib.licenses.bsd3; + platforms = lib.platforms.all; + mainProgram = "ug"; + } + # Needed to ensure that the grep replacements take precedence over + # `gnugrep` when installed. Lower priority values win. + // lib.optionalAttrs createGrepReplacementLinks { + priority = (gnugrep.meta.priority or lib.meta.defaultPriority) - 1; + }; }) diff --git a/pkgs/by-name/va/valdi/package.nix b/pkgs/by-name/va/valdi/package.nix index 9a2074b1ab69..d36d6d38e127 100644 --- a/pkgs/by-name/va/valdi/package.nix +++ b/pkgs/by-name/va/valdi/package.nix @@ -19,11 +19,11 @@ buildNpmPackage rec { npmDepsHash = "sha256-LGgyMdhDQ4UwdtENZT/89yiQawn8SxKdth/p7evDAgk="; - meta = with lib; { + meta = { description = "Cross-platform UI framework CLI by Snapchat"; homepage = "https://github.com/Snapchat/Valdi"; - license = licenses.mit; - maintainers = with maintainers; [ jonasfranke ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ jonasfranke ]; mainProgram = "valdi"; }; } diff --git a/pkgs/by-name/wx/wxedid/package.nix b/pkgs/by-name/wx/wxedid/package.nix index 61227f1564e2..dff8684ceae0 100644 --- a/pkgs/by-name/wx/wxedid/package.nix +++ b/pkgs/by-name/wx/wxedid/package.nix @@ -23,12 +23,12 @@ stdenv.mkDerivation rec { patchShebangs src/rcode/rcd_autogen ''; - meta = with lib; { + meta = { description = "wxWidgets-based EDID (Extended Display Identification Data) editor"; homepage = "https://sourceforge.net/projects/wxedid"; - license = licenses.gpl3Only; + license = lib.licenses.gpl3Only; mainProgram = "wxedid"; - maintainers = [ maintainers.meanwhile131 ]; + maintainers = [ lib.maintainers.meanwhile131 ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/xb/xbattbar/package.nix b/pkgs/by-name/xb/xbattbar/package.nix index 5d4b7b618eff..8ab71fa18b8e 100644 --- a/pkgs/by-name/xb/xbattbar/package.nix +++ b/pkgs/by-name/xb/xbattbar/package.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Display battery status in X11"; homepage = "https://salsa.debian.org/debian/xbattbar"; - license = with lib; licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ q3k ]; mainProgram = "xbattbar"; diff --git a/pkgs/development/coq-modules/ElmExtraction/default.nix b/pkgs/development/coq-modules/ElmExtraction/default.nix index eae09a6ab10b..ddb5b5dbb85d 100644 --- a/pkgs/development/coq-modules/ElmExtraction/default.nix +++ b/pkgs/development/coq-modules/ElmExtraction/default.nix @@ -7,7 +7,6 @@ version ? null, }: -with lib; mkCoqDerivation { pname = "ElmExtraction"; repo = "coq-elm-extraction"; @@ -25,14 +24,13 @@ mkCoqDerivation { inherit out; }; in - with versions; - switch + lib.switch [ coq.coq-version metacoq.version ] [ - (case (range "8.17" "9.0") (range "1.3.1" "1.3.4") "0.1.1") + (case (lib.versions.range "8.17" "9.0") (lib.versions.range "1.3.1" "1.3.4") "0.1.1") ] null; @@ -50,7 +48,7 @@ mkCoqDerivation { meta = { description = "Framework for extracting Coq programs to Elm"; - maintainers = with maintainers; [ _4ever2 ]; - license = licenses.mit; + maintainers = with lib.maintainers; [ _4ever2 ]; + license = lib.licenses.mit; }; } diff --git a/pkgs/development/coq-modules/RustExtraction/default.nix b/pkgs/development/coq-modules/RustExtraction/default.nix index fb115d6f56ca..b9d2d731bcd7 100644 --- a/pkgs/development/coq-modules/RustExtraction/default.nix +++ b/pkgs/development/coq-modules/RustExtraction/default.nix @@ -7,7 +7,6 @@ version ? null, }: -with lib; mkCoqDerivation { pname = "RustExtraction"; repo = "coq-rust-extraction"; @@ -24,9 +23,9 @@ mkCoqDerivation { ]; inherit out; }; + inherit (lib.versions) range; in - with versions; - switch + lib.switch [ coq.coq-version metacoq.version @@ -56,7 +55,7 @@ mkCoqDerivation { meta = { description = "Framework for extracting Coq programs to Rust"; - maintainers = with maintainers; [ _4ever2 ]; - license = licenses.mit; + maintainers = with lib.maintainers; [ _4ever2 ]; + license = lib.licenses.mit; }; } diff --git a/pkgs/development/coq-modules/parseque/default.nix b/pkgs/development/coq-modules/parseque/default.nix index f890c4e17139..b027d9a54a22 100644 --- a/pkgs/development/coq-modules/parseque/default.nix +++ b/pkgs/development/coq-modules/parseque/default.nix @@ -5,7 +5,6 @@ version ? null, }: -with lib; let derivation = mkCoqDerivation { pname = "parseque"; @@ -17,9 +16,8 @@ let let case = case: out: { inherit case out; }; in - with versions; - switch coq.coq-version [ - (case (range "8.16" "8.20") "0.2.2") + lib.switch coq.coq-version [ + (case (lib.versions.range "8.16" "8.20") "0.2.2") ] null; release."0.2.2".sha256 = "sha256-O50Rs7Yf1H4wgwb7ltRxW+7IF0b04zpfs+mR83rxT+E="; @@ -28,8 +26,8 @@ let meta = { description = "Total parser combinators in Coq/Rocq"; - maintainers = with maintainers; [ womeier ]; - license = licenses.mit; + maintainers = with lib.maintainers; [ womeier ]; + license = lib.licenses.mit; }; }; in diff --git a/pkgs/development/coq-modules/vscoq-language-server/default.nix b/pkgs/development/coq-modules/vscoq-language-server/default.nix index 97cfa917da58..02527cb467e5 100644 --- a/pkgs/development/coq-modules/vscoq-language-server/default.nix +++ b/pkgs/development/coq-modules/vscoq-language-server/default.nix @@ -77,16 +77,14 @@ ocamlPackages.buildDunePackage { ppx_optcomp ]); - meta = - with lib; - { - description = "Language server for the vscoq vscode/codium extension"; - homepage = "https://github.com/coq-community/vscoq"; - maintainers = with lib.maintainers; [ cohencyril ]; - license = lib.licenses.mit; - } - // optionalAttrs (fetched.broken or false) { - coqFilter = true; - broken = true; - }; + meta = { + description = "Language server for the vscoq vscode/codium extension"; + homepage = "https://github.com/coq-community/vscoq"; + maintainers = with lib.maintainers; [ cohencyril ]; + license = lib.licenses.mit; + } + // lib.optionalAttrs (fetched.broken or false) { + coqFilter = true; + broken = true; + }; } diff --git a/pkgs/development/coq-modules/wasmcert/default.nix b/pkgs/development/coq-modules/wasmcert/default.nix index 2e9782e2af13..5533291d0d31 100644 --- a/pkgs/development/coq-modules/wasmcert/default.nix +++ b/pkgs/development/coq-modules/wasmcert/default.nix @@ -11,7 +11,6 @@ version ? null, }: -with lib; mkCoqDerivation { pname = "wasm"; repo = "WasmCert-Coq"; @@ -28,11 +27,10 @@ mkCoqDerivation { inherit out; }; in - with lib.versions; lib.switch [ coq.coq-version mathcomp-boot.version ] [ - (case (range "8.20" "9.0") (isGe "2.4") "2.2.0") + (case (lib.versions.range "8.20" "9.0") (lib.versions.isGe "2.4") "2.2.0") ] null; @@ -62,7 +60,7 @@ mkCoqDerivation { meta = { description = "Wasm mechanisation in Coq/Rocq"; - maintainers = with maintainers; [ womeier ]; - license = licenses.mit; + maintainers = with lib.maintainers; [ womeier ]; + license = lib.licenses.mit; }; } diff --git a/pkgs/development/python-modules/django-scopes/default.nix b/pkgs/development/python-modules/django-scopes/default.nix index 94a1ef052f4d..26ee21684be3 100644 --- a/pkgs/development/python-modules/django-scopes/default.nix +++ b/pkgs/development/python-modules/django-scopes/default.nix @@ -28,10 +28,10 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "django_scopes" ]; - meta = with lib; { + meta = { description = "Safely separate multiple tenants in a Django database"; homepage = "https://github.com/raphaelm/django-scopes"; - license = licenses.asl20; - maintainers = with maintainers; [ ambroisie ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ ambroisie ]; }; }) diff --git a/pkgs/development/python-modules/language-tags/default.nix b/pkgs/development/python-modules/language-tags/default.nix index 167164aff9b1..0da713b4d320 100644 --- a/pkgs/development/python-modules/language-tags/default.nix +++ b/pkgs/development/python-modules/language-tags/default.nix @@ -21,10 +21,10 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "language_tags" ]; - meta = with lib; { + meta = { description = "Dealing with IANA language tags in Python"; homepage = "https://language-tags.readthedocs.io/en/latest/"; - license = licenses.mit; - maintainers = with maintainers; [ ambroisie ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ambroisie ]; }; }) diff --git a/pkgs/development/python-modules/streamcontroller-streamdeck/default.nix b/pkgs/development/python-modules/streamcontroller-streamdeck/default.nix index 413ec089a865..0838aba51775 100644 --- a/pkgs/development/python-modules/streamcontroller-streamdeck/default.nix +++ b/pkgs/development/python-modules/streamcontroller-streamdeck/default.nix @@ -31,12 +31,12 @@ buildPythonPackage rec { pythonImportsCheck = [ "StreamDeck" ]; doCheck = false; - meta = with lib; { + meta = { # This is a fork of abcminiuser/python-elgato-streamdeck targeted at StreamController. description = "Python library to control the Elgato Stream Deck"; homepage = "https://github.com/StreamController/streamcontroller-python-elgato-streamdeck"; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ majiir sifmelcara ]; diff --git a/pkgs/development/rocq-modules/parseque/default.nix b/pkgs/development/rocq-modules/parseque/default.nix index 048d5a676530..584276ccc818 100644 --- a/pkgs/development/rocq-modules/parseque/default.nix +++ b/pkgs/development/rocq-modules/parseque/default.nix @@ -6,7 +6,6 @@ version ? null, }: -with lib; mkRocqDerivation { pname = "parseque"; repo = "parseque"; @@ -14,12 +13,11 @@ mkRocqDerivation { inherit version; defaultVersion = - with versions; - switch + lib.switch [ rocq-core.rocq-version ] [ { - cases = [ (range "9.0" "9.1") ]; + cases = [ (lib.versions.range "9.0" "9.1") ]; out = "0.3.0"; } ] @@ -33,7 +31,7 @@ mkRocqDerivation { meta = { description = "Total parser combinators in Rocq"; - maintainers = with maintainers; [ womeier ]; - license = licenses.mit; + maintainers = with lib.maintainers; [ womeier ]; + license = lib.licenses.mit; }; } diff --git a/pkgs/development/rocq-modules/vsrocq-language-server/default.nix b/pkgs/development/rocq-modules/vsrocq-language-server/default.nix index 7d724a8328e7..aad1e3efecf7 100644 --- a/pkgs/development/rocq-modules/vsrocq-language-server/default.nix +++ b/pkgs/development/rocq-modules/vsrocq-language-server/default.nix @@ -15,10 +15,9 @@ let let case = case: out: { inherit case out; }; in - with lib.versions; lib.switch rocq-core.rocq-version [ - (case (range "8.18" "9.1") "2.3.3") - (case (range "8.18" "9.1") "2.3.0") + (case (lib.versions.range "8.18" "9.1") "2.3.3") + (case (lib.versions.range "8.18" "9.1") "2.3.0") ] null; location = { domain = "github.com"; @@ -66,16 +65,14 @@ ocamlPackages.buildDunePackage { make dune-files ''; - meta = - with lib; - { - description = "Language server for the vsrocq vscode/codium extension"; - homepage = "https://github.com/rocq-prover/vsrocq"; - maintainers = with lib.maintainers; [ cohencyril ]; - license = lib.licenses.mit; - } - // optionalAttrs (fetched.broken or false) { - rocqFilter = true; - broken = true; - }; + meta = { + description = "Language server for the vsrocq vscode/codium extension"; + homepage = "https://github.com/rocq-prover/vsrocq"; + maintainers = with lib.maintainers; [ cohencyril ]; + license = lib.licenses.mit; + } + // lib.optionalAttrs (fetched.broken or false) { + rocqFilter = true; + broken = true; + }; } diff --git a/pkgs/games/openra_2019/mod-update.sh b/pkgs/games/openra_2019/mod-update.sh index 8489d5a97a7c..08b724b9474a 100755 --- a/pkgs/games/openra_2019/mod-update.sh +++ b/pkgs/games/openra_2019/mod-update.sh @@ -3,9 +3,8 @@ # for mod in $(nix eval --raw '( # with import { }; -# with lib; -# let mods = attrNames (removeAttrs openraPackages.mods [ "recurseForDerivations" ]); -# in concatStringsSep " " mods +# let mods = lib.attrNames (lib.removeAttrs openraPackages.mods [ "recurseForDerivations" ]); +# in lib.concatStringsSep " " mods # )'); do # ./mod-update.sh "$mod" # done diff --git a/pkgs/servers/home-assistant/custom-components/thewatchman/package.nix b/pkgs/servers/home-assistant/custom-components/thewatchman/package.nix index af7339976dfc..b6844bdeaed4 100644 --- a/pkgs/servers/home-assistant/custom-components/thewatchman/package.nix +++ b/pkgs/servers/home-assistant/custom-components/thewatchman/package.nix @@ -40,10 +40,10 @@ buildHomeAssistantComponent rec { pytestCheckHook ]; - meta = with lib; { + meta = { description = "Keep track of missing entities and services in your config files"; homepage = "https://github.com/dummylabs/thewatchman"; - maintainers = with maintainers; [ SuperSandro2000 ]; - license = licenses.mit; + maintainers = with lib.maintainers; [ SuperSandro2000 ]; + license = lib.licenses.mit; }; } diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix index ca8d9fb15ada..d035dbd74cb0 100644 --- a/pkgs/servers/http/nginx/generic.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -306,19 +306,18 @@ stdenv.mkDerivation { if meta != null then meta else - with lib; { description = "Reverse proxy and lightweight webserver"; mainProgram = "nginx"; homepage = "http://nginx.org"; - license = [ licenses.bsd2 ] ++ concatMap (m: m.meta.license) modules; + license = [ lib.licenses.bsd2 ] ++ lib.concatMap (m: m.meta.license) modules; broken = lib.any (m: m.meta.broken or false) modules; - platforms = platforms.all; - maintainers = with maintainers; [ + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ fpletz raitobezarius ]; - teams = with teams; [ + teams = with lib.teams; [ helsinki-systems stridtech ]; diff --git a/pkgs/servers/nextcloud/packages/apps/memories.nix b/pkgs/servers/nextcloud/packages/apps/memories.nix index 5c3a8e811a91..af9e7b620d3f 100644 --- a/pkgs/servers/nextcloud/packages/apps/memories.nix +++ b/pkgs/servers/nextcloud/packages/apps/memories.nix @@ -23,11 +23,11 @@ let latestVersionForNc.${ncVersion} or (throw "memories currently does not support nextcloud version ${ncVersion}"); - commonMeta = with lib; { + commonMeta = { homepage = "https://apps.nextcloud.com/apps/memories"; changelog = "https://github.com/pulsejet/memories/blob/v${currentVersionInfo.version}/CHANGELOG.md"; - license = licenses.agpl3Only; - maintainers = with maintainers; [ SuperSandro2000 ]; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ SuperSandro2000 ]; }; go-vod = buildGoModule rec {