diff --git a/pkgs/applications/audio/dfasma/default.nix b/pkgs/applications/audio/dfasma/default.nix index bc9acbe3b692e9..6c40d9b77f10f7 100644 --- a/pkgs/applications/audio/dfasma/default.nix +++ b/pkgs/applications/audio/dfasma/default.nix @@ -75,7 +75,7 @@ mkDerivation rec { ''; homepage = "https://gillesdegottex.gitlab.io/dfasma-website/"; license = [ - licenses.gpl3Plus + lib.licenses.gpl3Plus reaperFork.meta.license ]; platforms = lib.platforms.linux; diff --git a/pkgs/applications/audio/easyaudiosync/default.nix b/pkgs/applications/audio/easyaudiosync/default.nix index 085e297124c252..e43a0bddfcfe44 100644 --- a/pkgs/applications/audio/easyaudiosync/default.nix +++ b/pkgs/applications/audio/easyaudiosync/default.nix @@ -96,6 +96,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/complexlogic/EasyAudioSync"; license = lib.licenses.unlicense; maintainers = with lib.maintainers; [ matteopacini ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix index 27cf12a91eaa9f..467fba74a96a5c 100644 --- a/pkgs/applications/audio/fluidsynth/default.nix +++ b/pkgs/applications/audio/fluidsynth/default.nix @@ -29,9 +29,9 @@ stdenv.mkDerivation rec { meta = { description = "Real-time software synthesizer based on the SoundFont 2 specifications"; homepage = "https://www.fluidsynth.org"; - license = licenses.lgpl21Plus; + license = lib.licenses.lgpl21Plus; maintainers = with lib.maintainers; [ lovek323 ]; - platforms = platforms.unix; + platforms = lib.platforms.unix; mainProgram = "fluidsynth"; }; } diff --git a/pkgs/applications/audio/minidsp/default.nix b/pkgs/applications/audio/minidsp/default.nix index d04dd80e050c33..d4b46692d97284 100644 --- a/pkgs/applications/audio/minidsp/default.nix +++ b/pkgs/applications/audio/minidsp/default.nix @@ -36,10 +36,10 @@ rustPlatform.buildRustPackage rec { description = "Control interface for some MiniDSP products"; homepage = "https://github.com/mrene/minidsp-rs"; license = lib.licenses.asl20; - platforms = lib.platforms.linux ++ platforms.darwin; - maintainers = [ - maintainers.adamcstephens - maintainers.mrene + platforms = lib.platforms.linux ++ lib.platforms.darwin; + maintainers = with lib.maintainers; [ + adamcstephens + mrene ]; }; } diff --git a/pkgs/applications/audio/mopidy/podcast.nix b/pkgs/applications/audio/mopidy/podcast.nix index f754c63280c11d..4f74d5e25a89e6 100644 --- a/pkgs/applications/audio/mopidy/podcast.nix +++ b/pkgs/applications/audio/mopidy/podcast.nix @@ -30,7 +30,7 @@ python3Packages.buildPythonApplication rec { description = "Mopidy extension for browsing and playing podcasts"; license = lib.licenses.asl20; maintainers = [ - maintainers.daneads + lib.maintainers.daneads ]; }; } diff --git a/pkgs/applications/audio/noson/default.nix b/pkgs/applications/audio/noson/default.nix index 7211952aa3027f..636ae87f9f94f2 100644 --- a/pkgs/applications/audio/noson/default.nix +++ b/pkgs/applications/audio/noson/default.nix @@ -49,8 +49,8 @@ stdenv.mkDerivation (finalAttrs: { description = "SONOS controller for Linux (and macOS)"; homepage = "https://janbar.github.io/noson-app/"; mainProgram = "noson-app"; - platforms = lib.platforms.linux ++ platforms.darwin; - license = [ licenses.gpl3Only ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + license = [ lib.licenses.gpl3Only ]; maintainers = with lib.maintainers; [ callahad ]; }; }) diff --git a/pkgs/applications/audio/puredata/default.nix b/pkgs/applications/audio/puredata/default.nix index c207c8077ea88c..f77b8c539db24c 100644 --- a/pkgs/applications/audio/puredata/default.nix +++ b/pkgs/applications/audio/puredata/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { description = ''A real-time graphical programming environment for audio, video, and graphical processing''; homepage = "http://puredata.info"; license = lib.licenses.bsd3; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ carlthome ]; mainProgram = "pd"; changelog = "https://msp.puredata.info/Pd_documentation/x5.htm#s1"; diff --git a/pkgs/applications/audio/snapcast/default.nix b/pkgs/applications/audio/snapcast/default.nix index d1d17f811e0f8b..6d5101b19b6c51 100644 --- a/pkgs/applications/audio/snapcast/default.nix +++ b/pkgs/applications/audio/snapcast/default.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { description = "Synchronous multi-room audio player"; homepage = "https://github.com/badaix/snapcast"; maintainers = with lib.maintainers; [ fpletz ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; license = lib.licenses.gpl3Plus; }; } diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix index 27f75be05c0417..660c5e7cbf82ab 100644 --- a/pkgs/applications/blockchains/polkadot/default.nix +++ b/pkgs/applications/blockchains/polkadot/default.nix @@ -93,8 +93,8 @@ rustPlatform.buildRustPackage rec { RaghavSood ]; # See Iso::from_arch in src/isa/mod.rs in cranelift-codegen-meta. - platforms = intersectLists platforms.unix ( - platforms.aarch64 ++ platforms.s390x ++ platforms.riscv64 ++ platforms.x86 + platforms = lib.intersectLists lib.platforms.unix ( + lib.platforms.aarch64 ++ lib.platforms.s390x ++ lib.platforms.riscv64 ++ lib.platforms.x86 ); }; } diff --git a/pkgs/applications/editors/standardnotes/default.nix b/pkgs/applications/editors/standardnotes/default.nix index b812aebbb1314d..50d9fc34cc427e 100644 --- a/pkgs/applications/editors/standardnotes/default.nix +++ b/pkgs/applications/editors/standardnotes/default.nix @@ -21,7 +21,7 @@ let in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "standardnotes"; @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { chuangzhu squalus ]; - sourceProvenance = [ sourceTypes.binaryNativeCode ]; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; platforms = builtins.attrNames srcjson.deb; mainProgram = "standardnotes"; }; diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/update-shell.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/update-shell.nix index 3dd2f8dbe48413..fa295773d4152d 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/update-shell.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/update-shell.nix @@ -3,15 +3,15 @@ }: let - inherit (vimPlugins) nvim-treesitter; + inherit (pkgs.vimPlugins) nvim-treesitter; neovim = pkgs.neovim.override { configure.packages.all.start = [ nvim-treesitter ]; }; in -mkShell { - packages = [ +pkgs.mkShell { + packages = with pkgs; [ neovim nurl python3 diff --git a/pkgs/applications/graphics/ImageMagick/6.x.nix b/pkgs/applications/graphics/ImageMagick/6.x.nix index 05ee2da7f23afa..94eebe52096594 100644 --- a/pkgs/applications/graphics/ImageMagick/6.x.nix +++ b/pkgs/applications/graphics/ImageMagick/6.x.nix @@ -170,7 +170,7 @@ stdenv.mkDerivation (finalAttrs: { "ImageMagick" "MagickWand" ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = [ ]; license = lib.licenses.asl20; knownVulnerabilities = [ diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 099e16a77856fc..ba3c94bf434de9 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -153,7 +153,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/ImageMagick/Website/blob/main/ChangeLog.md"; description = "Software suite to create, edit, compose, or convert bitmap images"; pkgConfigModules = [ "ImageMagick" "MagickWand" ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ dotlambda rhendric bloxx12 ]; license = lib.licenses.asl20; mainProgram = "magick"; diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index 3fa0c5d7fa8b86..0e0f38ed6cd504 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -133,7 +133,7 @@ stdenv.mkDerivation rec { license = lib.licenses.unfree; changelog = "https://github.com/jgraph/drawio-desktop/releases/tag/v${version}"; maintainers = with lib.maintainers; [ darkonion0 ]; - platforms = lib.platforms.darwin ++ platforms.linux; + platforms = lib.platforms.darwin ++ lib.platforms.linux; mainProgram = "drawio"; }; } diff --git a/pkgs/applications/graphics/fstl/default.nix b/pkgs/applications/graphics/fstl/default.nix index 690b07e5eef03a..87b153d61959e5 100644 --- a/pkgs/applications/graphics/fstl/default.nix +++ b/pkgs/applications/graphics/fstl/default.nix @@ -33,7 +33,7 @@ mkDerivation rec { mainProgram = "fstl"; homepage = "https://github.com/fstl-app/fstl"; license = lib.licenses.mit; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ tweber ]; }; } diff --git a/pkgs/applications/graphics/vengi-tools/default.nix b/pkgs/applications/graphics/vengi-tools/default.nix index 9c49c8981828a1..eda125d66399cd 100644 --- a/pkgs/applications/graphics/vengi-tools/default.nix +++ b/pkgs/applications/graphics/vengi-tools/default.nix @@ -116,9 +116,9 @@ stdenv.mkDerivation (finalAttrs: { ''; homepage = "https://mgerhardy.github.io/vengi/"; downloadPage = "https://github.com/mgerhardy/vengi/releases"; - license = [ - licenses.mit - licenses.cc-by-sa-30 + license = with lib.licenses; [ + mit + cc-by-sa-30 ]; maintainers = with lib.maintainers; [ fgaz ]; platforms = lib.platforms.all; diff --git a/pkgs/applications/kde/ark/default.nix b/pkgs/applications/kde/ark/default.nix index e1a50c3083947e..71390ea20f20a1 100644 --- a/pkgs/applications/kde/ark/default.nix +++ b/pkgs/applications/kde/ark/default.nix @@ -83,7 +83,7 @@ mkDerivation { description = "Graphical file compression/decompression utility"; mainProgram = "ark"; license = - with licenses; + with lib.licenses; [ gpl2 lgpl3 diff --git a/pkgs/applications/kde/kdevelop/kdev-php.nix b/pkgs/applications/kde/kdevelop/kdev-php.nix index facbe70191af82..a5c5e992e00d66 100644 --- a/pkgs/applications/kde/kdevelop/kdev-php.nix +++ b/pkgs/applications/kde/kdevelop/kdev-php.nix @@ -30,6 +30,6 @@ mkDerivation rec { platforms = lib.platforms.linux; description = "PHP support for KDevelop"; homepage = "https://www.kdevelop.org"; - license = [ licenses.gpl2 ]; + license = [ lib.licenses.gpl2 ]; }; } diff --git a/pkgs/applications/kde/kdevelop/kdev-python.nix b/pkgs/applications/kde/kdevelop/kdev-python.nix index 127b4c355ad8c6..f87e05d3057ac5 100644 --- a/pkgs/applications/kde/kdevelop/kdev-python.nix +++ b/pkgs/applications/kde/kdevelop/kdev-python.nix @@ -13,7 +13,7 @@ let # https://invent.kde.org/kdevelop/kdev-python/-/merge_requests/16 python = python39; in -mkDerivation rec { +mkDerivation { pname = "kdev-python"; cmakeFlags = [ @@ -37,6 +37,6 @@ mkDerivation rec { platforms = lib.platforms.linux; description = "Python support for KDevelop"; homepage = "https://www.kdevelop.org"; - license = [ licenses.gpl2 ]; + license = [ lib.licenses.gpl2 ]; }; } diff --git a/pkgs/applications/kde/koko.nix b/pkgs/applications/kde/koko.nix index 6334d4fb175703..4049b0b765303a 100644 --- a/pkgs/applications/kde/koko.nix +++ b/pkgs/applications/kde/koko.nix @@ -77,9 +77,9 @@ mkDerivation rec { mainProgram = "koko"; homepage = "https://apps.kde.org/koko/"; # LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL - license = [ - licenses.lgpl3Only - licenses.lgpl21Only + license = with lib.licenses; [ + lgpl3Only + lgpl21Only ]; maintainers = [ ]; }; diff --git a/pkgs/applications/kde/kpublictransport.nix b/pkgs/applications/kde/kpublictransport.nix index 9ad70d9936597c..fe696581218443 100644 --- a/pkgs/applications/kde/kpublictransport.nix +++ b/pkgs/applications/kde/kpublictransport.nix @@ -9,10 +9,7 @@ mkDerivation { pname = "kpublictransport"; - meta = { - license = [ licenses.cc0 ]; - maintainers = [ ]; - }; + nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ @@ -20,4 +17,9 @@ mkDerivation { networkmanager-qt ki18n ]; + + meta = { + license = [ lib.licenses.cc0 ]; + maintainers = [ ]; + }; } diff --git a/pkgs/applications/misc/audio/sox/default.nix b/pkgs/applications/misc/audio/sox/default.nix index 80e4d888f5c5db..d0deadb7ddfdce 100644 --- a/pkgs/applications/misc/audio/sox/default.nix +++ b/pkgs/applications/misc/audio/sox/default.nix @@ -93,7 +93,7 @@ stdenv.mkDerivation rec { description = "Sample Rate Converter for audio"; homepage = "https://sox.sourceforge.net/"; maintainers = with lib.maintainers; [ marcweber ]; - license = if enableAMR then licenses.unfree else licenses.gpl2Plus; + license = if enableAMR then lib.licenses.unfree else lib.licenses.gpl2Plus; platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/misc/flashprint/default.nix b/pkgs/applications/misc/flashprint/default.nix index f9542f9c062797..f37f929d195fce 100644 --- a/pkgs/applications/misc/flashprint/default.nix +++ b/pkgs/applications/misc/flashprint/default.nix @@ -49,6 +49,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "flashprint"; maintainers = [ lib.maintainers.ianliu ]; platforms = [ "x86_64-linux" ]; - sourceProvenance = [ sourceTypes.binaryNativeCode ]; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; }; }) diff --git a/pkgs/applications/misc/keepassxc/default.nix b/pkgs/applications/misc/keepassxc/default.nix index 4dfa474d572848..5101dba2a1a540 100644 --- a/pkgs/applications/misc/keepassxc/default.nix +++ b/pkgs/applications/misc/keepassxc/default.nix @@ -162,6 +162,6 @@ stdenv.mkDerivation rec { blankparticle sigmasquadron ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/applications/misc/kemai/default.nix b/pkgs/applications/misc/kemai/default.nix index f4e0b34eafe663..0d4196114afa84 100644 --- a/pkgs/applications/misc/kemai/default.nix +++ b/pkgs/applications/misc/kemai/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/AlexandrePTJ/kemai"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ poelzi ]; - platforms = platforms.unix; + platforms = lib.platforms.unix; broken = stdenv.hostPlatform.isDarwin; mainProgram = "Kemai"; }; diff --git a/pkgs/applications/misc/pe-bear/default.nix b/pkgs/applications/misc/pe-bear/default.nix index df1a80ff3ec597..4ffa0b8b47904d 100644 --- a/pkgs/applications/misc/pe-bear/default.nix +++ b/pkgs/applications/misc/pe-bear/default.nix @@ -33,15 +33,15 @@ stdenv.mkDerivation rec { mainProgram = "PE-bear"; homepage = "https://hshrzd.wordpress.com/pe-bear/"; - license = [ + license = with lib.licenses; [ # PE-Bear - licenses.gpl2Only + gpl2Only # Vendored capstone - licenses.bsd3 + bsd3 # Vendored bearparser - licenses.bsd2 + bsd2 ]; maintainers = with lib.maintainers; [ blitz ]; diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix index 54854372cde975..acc92f8b1b3bf9 100644 --- a/pkgs/applications/misc/syncthingtray/default.nix +++ b/pkgs/applications/misc/syncthingtray/default.nix @@ -119,6 +119,6 @@ stdenv.mkDerivation (finalAttrs: { description = "Tray application and Dolphin/Plasma integration for Syncthing"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ doronbehar ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; }) diff --git a/pkgs/applications/networking/browsers/palemoon/bin.nix b/pkgs/applications/networking/browsers/palemoon/bin.nix index ba3c3b741f5e4d..30361a1de6a651 100644 --- a/pkgs/applications/networking/browsers/palemoon/bin.nix +++ b/pkgs/applications/networking/browsers/palemoon/bin.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { ]; desktopItems = [ - (makeDesktopItem rec { + (makeDesktopItem { name = "palemoon-bin"; desktopName = "Pale Moon Web Browser"; comment = "Browse the World Wide Web"; @@ -219,7 +219,7 @@ stdenv.mkDerivation (finalAttrs: { ''; changelog = "https://repo.palemoon.org/MoonchildProductions/Pale-Moon/releases/tag/${finalAttrs.version}_Release"; license = [ - licenses.mpl20 + lib.licenses.mpl20 { fullName = "Pale Moon Redistribution License"; url = "https://www.palemoon.org/redist.shtml"; diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 60e673dce5a7f8..fb84ff2232848d 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -127,7 +127,7 @@ in stdenv.mkDerivation rec { meta = { description = "Browser for our Friends, powerful and personal"; homepage = "https://vivaldi.com"; - license = licenses.unfree; + license = lib.licenses.unfree; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; mainProgram = "vivaldi"; maintainers = with lib.maintainers; [ otwieracz badmutex ]; diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index 220d3c88ff8ccf..8626b847a5b163 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -81,7 +81,7 @@ buildGoModule rec { homepage = "https://www.cloudflare.com/products/tunnel"; changelog = "https://github.com/cloudflare/cloudflared/releases/tag/${version}"; license = lib.licenses.asl20; - platforms = lib.platforms.unix ++ platforms.windows; + platforms = lib.platforms.unix ++ lib.platforms.windows; maintainers = with lib.maintainers; [ bbigras enorris thoughtpolice piperswe qjoly ]; mainProgram = "cloudflared"; }; diff --git a/pkgs/applications/networking/cluster/hadoop/containerExecutor.nix b/pkgs/applications/networking/cluster/hadoop/containerExecutor.nix index 00a992007592fd..6d82e031bef9f0 100644 --- a/pkgs/applications/networking/cluster/hadoop/containerExecutor.nix +++ b/pkgs/applications/networking/cluster/hadoop/containerExecutor.nix @@ -42,6 +42,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/cluster/tubekit/default.nix b/pkgs/applications/networking/cluster/tubekit/default.nix index 9e6ba9ca80856a..a317c75ce586cc 100644 --- a/pkgs/applications/networking/cluster/tubekit/default.nix +++ b/pkgs/applications/networking/cluster/tubekit/default.nix @@ -22,7 +22,7 @@ buildGoModule rec { mainProgram = "tubectl"; homepage = "https://github.com/reconquest/tubekit"; license = lib.licenses.mit; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ farcaller ]; }; } diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index 51fd07cd756a6b..af230850550b0a 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -88,7 +88,7 @@ buildFHSEnv { meta = { description = "Online stored folders (daemon version)"; homepage = "http://www.dropbox.com/"; - license = licenses.unfree; + license = lib.licenses.unfree; maintainers = with lib.maintainers; [ ttuegel ]; platforms = [ "i686-linux" "x86_64-linux" ]; mainProgram = "dropbox"; diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix index cc54e360257cb4..21388a9410c0b8 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix @@ -89,6 +89,6 @@ stdenv.mkDerivation rec { lassulus pSub ]; - platforms = lib.platforms.gnu ++ platforms.linux; # arbitrary choice + platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice }; } diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index 79d71cb50143f7..bcb7da811fb9fc 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -124,7 +124,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "dino"; homepage = "https://github.com/dino/dino"; license = lib.licenses.gpl3Plus; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ qyliss tomfitzhenry ]; }; }) diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index 2d1ab77dbd4a17..a2a3107209b5bb 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -220,7 +220,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Mail indexer"; homepage = "https://notmuchmail.org/"; - changelog = "https://git.notmuchmail.org/git?p=notmuch;a=blob_plain;f=NEWS;hb=${version}"; + changelog = "https://git.notmuchmail.org/git?p=notmuch;a=blob_plain;f=NEWS;hb=${finalAttrs.version}"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ flokli diff --git a/pkgs/applications/networking/mailreaders/sylpheed/default.nix b/pkgs/applications/networking/mailreaders/sylpheed/default.nix index d75faf193e30d1..8439eda4722374 100644 --- a/pkgs/applications/networking/mailreaders/sylpheed/default.nix +++ b/pkgs/applications/networking/mailreaders/sylpheed/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { description = "Lightweight and user-friendly e-mail client"; mainProgram = "sylpheed"; maintainers = [ ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; license = lib.licenses.gpl2; }; } diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix index 9af52aed771da5..7d35cfdb756bb7 100644 --- a/pkgs/applications/networking/pjsip/default.nix +++ b/pkgs/applications/networking/pjsip/default.nix @@ -143,7 +143,7 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ olynch ]; mainProgram = "pjsua"; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; pkgConfigModules = [ "libpjproject" ]; }; }) diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix index f7d7a2336122c2..f0f5a97387c601 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix @@ -238,7 +238,7 @@ stdenv.mkDerivation rec { 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/networking/remote/putty/default.nix b/pkgs/applications/networking/remote/putty/default.nix index bc98fb6958f8c6..f31e6b002b6c6d 100644 --- a/pkgs/applications/networking/remote/putty/default.nix +++ b/pkgs/applications/networking/remote/putty/default.nix @@ -48,6 +48,6 @@ stdenv.mkDerivation rec { ''; homepage = "https://www.chiark.greenend.org.uk/~sgtatham/putty/"; license = lib.licenses.mit; - platforms = lib.platforms.unix ++ platforms.windows; + platforms = lib.platforms.unix ++ lib.platforms.windows; }; } diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index 8d351df8485f8e..7601861ca750f6 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -8,7 +8,6 @@ wrapGAppsHook3, curl, fuse3, - fetchpatch2, desktopToDarwinBundle, glib, gtk3, @@ -150,6 +149,6 @@ stdenv.mkDerivation (finalAttrs: { melsigl ryantm ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; }) diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index c5e48dfa79d5d4..d3613d1320d7aa 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -228,7 +228,7 @@ stdenv.mkDerivation rec { homepage = "https://www.wireshark.org"; changelog = "https://www.wireshark.org/docs/relnotes/wireshark-${version}.html"; license = lib.licenses.gpl2Plus; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ bjornfor fpletz diff --git a/pkgs/applications/networking/syncplay/default.nix b/pkgs/applications/networking/syncplay/default.nix index 5b77730d630671..6162e9750cb51a 100644 --- a/pkgs/applications/networking/syncplay/default.nix +++ b/pkgs/applications/networking/syncplay/default.nix @@ -56,7 +56,7 @@ buildPythonApplication rec { homepage = "https://syncplay.pl/"; description = "Free software that synchronises media players"; license = lib.licenses.asl20; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ assistant ]; }; } diff --git a/pkgs/applications/radio/limesuite/default.nix b/pkgs/applications/radio/limesuite/default.nix index 5a67f9f3eff1c0..0964dc455573a7 100644 --- a/pkgs/applications/radio/limesuite/default.nix +++ b/pkgs/applications/radio/limesuite/default.nix @@ -61,6 +61,6 @@ stdenv.mkDerivation rec { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ markuskowa ]; platforms = lib.platforms.unix; - badPlatforms = lib.optionals withGui platforms.darwin; # withGui transitively depends on mesa, which is broken on darwin + badPlatforms = lib.optionals withGui lib.platforms.darwin; # withGui transitively depends on mesa, which is broken on darwin }; } diff --git a/pkgs/applications/radio/uhd/default.nix b/pkgs/applications/radio/uhd/default.nix index f7e009d3b17a28..293472f170cfe0 100644 --- a/pkgs/applications/radio/uhd/default.nix +++ b/pkgs/applications/radio/uhd/default.nix @@ -229,7 +229,7 @@ stdenv.mkDerivation (finalAttrs: { ''; homepage = "https://uhd.ettus.com/"; license = lib.licenses.gpl3Plus; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ bjornfor fpletz diff --git a/pkgs/applications/science/computer-architecture/qtrvsim/default.nix b/pkgs/applications/science/computer-architecture/qtrvsim/default.nix index 58fa1bce318f0b..56194c5c3ffd62 100644 --- a/pkgs/applications/science/computer-architecture/qtrvsim/default.nix +++ b/pkgs/applications/science/computer-architecture/qtrvsim/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/cvut/qtrvsim"; license = lib.licenses.gpl3Plus; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ jdupak ]; mainProgram = "qtrvsim_gui"; }; diff --git a/pkgs/applications/science/logic/cedille/default.nix b/pkgs/applications/science/logic/cedille/default.nix index eda73c4fda9d90..d5a9c617efb8c8 100644 --- a/pkgs/applications/science/logic/cedille/default.nix +++ b/pkgs/applications/science/logic/cedille/default.nix @@ -62,6 +62,6 @@ stdenv.mkDerivation rec { # Broken due to Agda update. See # https://github.com/NixOS/nixpkgs/pull/129606#issuecomment-881107449. broken = true; - hydraPlatforms = platforms.none; + hydraPlatforms = lib.platforms.none; }; } diff --git a/pkgs/applications/science/logic/cvc5/default.nix b/pkgs/applications/science/logic/cvc5/default.nix index 4f1e0d8a24f6a5..824edc1cf73b36 100644 --- a/pkgs/applications/science/logic/cvc5/default.nix +++ b/pkgs/applications/science/logic/cvc5/default.nix @@ -34,8 +34,8 @@ stdenv.mkDerivation rec { description = "High-performance theorem prover and SMT solver"; mainProgram = "cvc5"; homepage = "https://cvc5.github.io"; - license = licenses.gpl3Only; - platforms = platforms.unix; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ shadaj ]; }; } diff --git a/pkgs/applications/science/logic/glucose/default.nix b/pkgs/applications/science/logic/glucose/default.nix index cb6e2b49c8937e..455e66c0616b26 100644 --- a/pkgs/applications/science/logic/glucose/default.nix +++ b/pkgs/applications/science/logic/glucose/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { } version)"; mainProgram = "glucose"; homepage = "https://www.labri.fr/perso/lsimon/research/glucose/"; - license = if enableUnfree then licenses.unfreeRedistributable else licenses.mit; + license = if enableUnfree then lib.licenses.unfreeRedistributable else lib.licenses.mit; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ gebner ]; }; diff --git a/pkgs/applications/science/machine-learning/shogun/default.nix b/pkgs/applications/science/machine-learning/shogun/default.nix index 4deb68342e1ef6..30611c3a5f123f 100644 --- a/pkgs/applications/science/machine-learning/shogun/default.nix +++ b/pkgs/applications/science/machine-learning/shogun/default.nix @@ -236,7 +236,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Toolbox which offers a wide range of efficient and unified machine learning methods"; homepage = "http://shogun-toolbox.org/"; - license = if withSvmLight then licenses.unfree else licenses.gpl3Plus; + license = if withSvmLight then lib.licenses.unfree else lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ edwtjo smancill diff --git a/pkgs/applications/science/math/caffe/default.nix b/pkgs/applications/science/math/caffe/default.nix index 890f9e1f757968..a48613b2d79439 100644 --- a/pkgs/applications/science/math/caffe/default.nix +++ b/pkgs/applications/science/math/caffe/default.nix @@ -187,6 +187,6 @@ stdenv.mkDerivation rec { || !(leveldbSupport -> (leveldb != null && snappy != null)) || !(pythonSupport -> (python != null && numpy != null)); license = lib.licenses.bsd2; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix index 81de086578165e..c9fc6ef806b9bb 100644 --- a/pkgs/applications/science/math/pari/default.nix +++ b/pkgs/applications/science/math/pari/default.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { downloadPage = "http://pari.math.u-bordeaux.fr/download.html"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ ertes ] ++ teams.sage.members; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; mainProgram = "gp"; }; } diff --git a/pkgs/applications/version-management/git-absorb/default.nix b/pkgs/applications/version-management/git-absorb/default.nix index 47b2f42f29f0cc..2dc7544f409617 100644 --- a/pkgs/applications/version-management/git-absorb/default.nix +++ b/pkgs/applications/version-management/git-absorb/default.nix @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec { meta = { homepage = "https://github.com/tummychow/git-absorb"; description = "git commit --fixup, but automatic"; - license = [ licenses.bsd3 ]; + license = [ lib.licenses.bsd3 ]; maintainers = with lib.maintainers; [ tomfitzhenry matthiasbeyer diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 571016e67ac093..cd3a239c036497 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -119,7 +119,7 @@ let description = "Fast, lightweight SCM system for very large distributed projects"; homepage = "https://www.mercurial-scm.org"; downloadPage = "https://www.mercurial-scm.org/release/"; - changelog = "https://wiki.mercurial-scm.org/Release${versions.majorMinor version}"; + changelog = "https://wiki.mercurial-scm.org/Release${lib.versions.majorMinor version}"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ lukegb diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index fffde89a6e2e00..0dbd4f0baf3bc8 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -182,7 +182,7 @@ let homepage = "https://subversion.apache.org/"; mainProgram = "svn"; maintainers = with lib.maintainers; [ lovek323 ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/applications/video/kodi/addons/netflix/default.nix b/pkgs/applications/video/kodi/addons/netflix/default.nix index 56b68a835a894e..671643c1967343 100644 --- a/pkgs/applications/video/kodi/addons/netflix/default.nix +++ b/pkgs/applications/video/kodi/addons/netflix/default.nix @@ -33,6 +33,6 @@ buildKodiAddon rec { homepage = "https://github.com/CastagnaIT/plugin.video.netflix"; description = "Netflix VOD Services Add-on"; license = lib.licenses.mit; - maintainers = lib.teams.kodi.members ++ [ maintainers.pks ]; + maintainers = lib.teams.kodi.members ++ [ lib.maintainers.pks ]; }; } diff --git a/pkgs/applications/video/kodi/addons/sendtokodi/default.nix b/pkgs/applications/video/kodi/addons/sendtokodi/default.nix index 0e05b7a1e203f9..ff483e85e8ea2b 100644 --- a/pkgs/applications/video/kodi/addons/sendtokodi/default.nix +++ b/pkgs/applications/video/kodi/addons/sendtokodi/default.nix @@ -44,6 +44,6 @@ buildKodiAddon rec { homepage = "https://github.com/firsttris/plugin.video.sendtokodi"; description = "Plays various stream sites on Kodi using yt-dlp"; license = lib.licenses.mit; - maintainers = lib.teams.kodi.members ++ [ maintainers.pks ]; + maintainers = lib.teams.kodi.members ++ [ lib.maintainers.pks ]; }; } diff --git a/pkgs/applications/video/kodi/unwrapped.nix b/pkgs/applications/video/kodi/unwrapped.nix index 97016537385bf4..7783ece324d979 100644 --- a/pkgs/applications/video/kodi/unwrapped.nix +++ b/pkgs/applications/video/kodi/unwrapped.nix @@ -257,8 +257,8 @@ in stdenv.mkDerivation (finalAttrs: { meta = { description = "Media center"; homepage = "https://kodi.tv/"; - license = licenses.gpl2Plus; - platforms = platforms.linux; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; maintainers = lib.teams.kodi.members; mainProgram = "kodi"; }; diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index adbae9c7b2384b..cae59a79ce2012 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -127,9 +127,9 @@ mkDerivation { expiration date. ''; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - license = [ - licenses.unfree - licenses.lgpl21 + license = with lib.licenses; [ + unfree + lgpl21 ]; homepage = "http://makemkv.com"; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/video/webcamoid/default.nix b/pkgs/applications/video/webcamoid/default.nix index 01a2e072ac13e3..d6cee1e5bad33e 100644 --- a/pkgs/applications/video/webcamoid/default.nix +++ b/pkgs/applications/video/webcamoid/default.nix @@ -60,7 +60,7 @@ mkDerivation rec { description = "Webcam Capture Software"; longDescription = "Webcamoid is a full featured and multiplatform webcam suite."; homepage = "https://github.com/webcamoid/webcamoid/"; - license = [ licenses.gpl3Plus ]; + license = [ lib.licenses.gpl3Plus ]; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ robaca ]; mainProgram = "webcamoid"; diff --git a/pkgs/applications/virtualization/lima/bin.nix b/pkgs/applications/virtualization/lima/bin.nix index 557ded1442120a..ccfb1e43918676 100644 --- a/pkgs/applications/virtualization/lima/bin.nix +++ b/pkgs/applications/virtualization/lima/bin.nix @@ -122,6 +122,6 @@ stdenvNoCC.mkDerivation { description = "Linux virtual machines (on macOS, in most cases)"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ tricktron ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/_3/_3270font/package.nix b/pkgs/by-name/_3/_3270font/package.nix index 2f8a0df58306a2..c074ad134f949a 100644 --- a/pkgs/by-name/_3/_3270font/package.nix +++ b/pkgs/by-name/_3/_3270font/package.nix @@ -33,9 +33,9 @@ stdenvNoCC.mkDerivation rec { description = "Monospaced font based on IBM 3270 terminals"; homepage = "https://github.com/rbanffy/3270font"; changelog = "https://github.com/rbanffy/3270font/blob/v${version}/CHANGELOG.md"; - license = [ - licenses.bsd3 - licenses.ofl + license = with lib.licenses; [ + bsd3 + ofl ]; maintainers = [ ]; platforms = lib.platforms.all; diff --git a/pkgs/by-name/_5/_5etools/package.nix b/pkgs/by-name/_5/_5etools/package.nix index 52e2d0800e43ab..61660d54773b40 100644 --- a/pkgs/by-name/_5/_5etools/package.nix +++ b/pkgs/by-name/_5/_5etools/package.nix @@ -13,7 +13,7 @@ fetchFromGitHub rec { description = "Suite of browser-based tools for players and DMs of D&D 5e"; homepage = "https://5e.tools"; changelog = "https://github.com/5etools-mirror-1/5etools-mirror-1.github.io/releases/tag/v${version}"; - license = [ licenses.mit ]; + license = [ lib.licenses.mit ]; maintainers = with lib.maintainers; [ urandom ]; hydraPlatforms = [ ]; # src tarball is 4.7G, unpackeed 4.8G, exceeds hydras output limit }; diff --git a/pkgs/by-name/_7/_7kaa/package.nix b/pkgs/by-name/_7/_7kaa/package.nix index c297507ea9b2fa..ad9c3b0efc9120 100644 --- a/pkgs/by-name/_7/_7kaa/package.nix +++ b/pkgs/by-name/_7/_7kaa/package.nix @@ -83,7 +83,7 @@ gccStdenv.mkDerivation (finalAttrs: { homepage = "https://www.7kfans.com"; description = "GPL release of the Seven Kingdoms with multiplayer (available only on x86 platforms)"; license = lib.licenses.gpl2Only; - platforms = lib.platforms.x86_64 ++ platforms.aarch64; + platforms = lib.platforms.x86_64 ++ lib.platforms.aarch64; maintainers = with lib.maintainers; [ _1000101 ]; }; }) diff --git a/pkgs/by-name/ac/accountsservice/package.nix b/pkgs/by-name/ac/accountsservice/package.nix index 07b14584302d44..53c1e8e6847df6 100644 --- a/pkgs/by-name/ac/accountsservice/package.nix +++ b/pkgs/by-name/ac/accountsservice/package.nix @@ -105,7 +105,7 @@ stdenv.mkDerivation rec { description = "D-Bus interface for user account query and manipulation"; homepage = "https://www.freedesktop.org/wiki/Software/AccountsService"; license = lib.licenses.gpl3Plus; - maintainers = lib.teams.freedesktop.members ++ (with maintainers; [ pSub ]); + maintainers = lib.teams.freedesktop.members ++ (with lib.maintainers; [ pSub ]); platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/ad/advancecomp/package.nix b/pkgs/by-name/ad/advancecomp/package.nix index 520955db1df97a..db560a6178c999 100644 --- a/pkgs/by-name/ad/advancecomp/package.nix +++ b/pkgs/by-name/ad/advancecomp/package.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { description = "Set of tools to optimize deflate-compressed files"; license = lib.licenses.gpl3; maintainers = [ lib.maintainers.raskin ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; homepage = "https://github.com/amadvance/advancecomp"; changelog = "https://github.com/amadvance/advancecomp/blob/v${version}/HISTORY"; }; diff --git a/pkgs/by-name/ae/aeron-cpp/package.nix b/pkgs/by-name/ae/aeron-cpp/package.nix index b07cff89cdcd8e..7da6212b50f563 100644 --- a/pkgs/by-name/ae/aeron-cpp/package.nix +++ b/pkgs/by-name/ae/aeron-cpp/package.nix @@ -119,9 +119,9 @@ stdenv.mkDerivation { license = lib.licenses.asl20; mainProgram = "aeronmd"; maintainers = [ lib.maintainers.vaci ]; - sourceProvenance = [ - sourceTypes.fromSource - sourceTypes.binaryBytecode + sourceProvenance = with lib.sourceTypes; [ + fromSource + binaryBytecode ]; }; } diff --git a/pkgs/by-name/ae/aeron/package.nix b/pkgs/by-name/ae/aeron/package.nix index 6fd8fcd4efd537..79caf83d59e992 100644 --- a/pkgs/by-name/ae/aeron/package.nix +++ b/pkgs/by-name/ae/aeron/package.nix @@ -126,7 +126,7 @@ stdenv.mkDerivation { mainProgram = "${pname}-media-driver"; maintainers = [ lib.maintainers.vaci ]; sourceProvenance = [ - sourceTypes.binaryBytecode + lib.sourceTypes.binaryBytecode ]; }; } diff --git a/pkgs/by-name/ae/aescrypt/package.nix b/pkgs/by-name/ae/aescrypt/package.nix index 38ae108bc194eb..f1eec7f36df44a 100644 --- a/pkgs/by-name/ae/aescrypt/package.nix +++ b/pkgs/by-name/ae/aescrypt/package.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { qknight ]; platforms = lib.platforms.all; - hydraPlatforms = with platforms; unix; + hydraPlatforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/ak/akira-unstable/package.nix b/pkgs/by-name/ak/akira-unstable/package.nix index 2f6fe57e439615..1b9b733337f923 100644 --- a/pkgs/by-name/ak/akira-unstable/package.nix +++ b/pkgs/by-name/ak/akira-unstable/package.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/akiraux/Akira"; license = lib.licenses.gpl3Plus; maintainers = - with maintainers; + with lib.maintainers; [ Br1ght0ne neonfuz diff --git a/pkgs/by-name/al/ali/package.nix b/pkgs/by-name/al/ali/package.nix index 3aef6b51259d3b..232b60532d462d 100644 --- a/pkgs/by-name/al/ali/package.nix +++ b/pkgs/by-name/al/ali/package.nix @@ -22,7 +22,7 @@ buildGo122Module rec { homepage = "https://github.com/nakabonne/ali"; changelog = "https://github.com/nakabonne/ali/releases/tag/v${version}"; license = lib.licenses.mit; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ farcaller ]; mainProgram = "ali"; }; diff --git a/pkgs/by-name/al/alpaca-proxy/package.nix b/pkgs/by-name/al/alpaca-proxy/package.nix index 7b360f46d17925..3223c6ca34cacf 100644 --- a/pkgs/by-name/al/alpaca-proxy/package.nix +++ b/pkgs/by-name/al/alpaca-proxy/package.nix @@ -32,7 +32,7 @@ buildGoModule rec { homepage = "https://github.com/samuong/alpaca"; changelog = "https://github.com/samuong/alpaca/releases/tag/v${src.rev}"; license = lib.licenses.asl20; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ _1nv0k32 ]; mainProgram = "alpaca-proxy"; }; diff --git a/pkgs/by-name/an/ansifilter/package.nix b/pkgs/by-name/an/ansifilter/package.nix index 826e59a96b2182..987bbda6392201 100644 --- a/pkgs/by-name/an/ansifilter/package.nix +++ b/pkgs/by-name/an/ansifilter/package.nix @@ -42,6 +42,6 @@ stdenv.mkDerivation rec { homepage = "http://www.andre-simon.de/doku/ansifilter/en/ansifilter.html"; license = lib.licenses.gpl3; maintainers = [ lib.maintainers.Adjective-Object ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/an/anyk/package.nix b/pkgs/by-name/an/anyk/package.nix index 696d052994287b..ed0fd3bc75ba3a 100644 --- a/pkgs/by-name/an/anyk/package.nix +++ b/pkgs/by-name/an/anyk/package.nix @@ -107,7 +107,7 @@ stdenv.mkDerivation { ]; desktopItems = [ - (makeDesktopItem rec { + (makeDesktopItem { desktopName = "ÁNYK"; name = "anyk"; exec = "anyk"; @@ -146,7 +146,7 @@ stdenv.mkDerivation { license = lib.licenses.unfree; maintainers = with lib.maintainers; [ chpatrick ]; platforms = openjdk.meta.platforms; - sourceProvenance = [ sourceTypes.binaryBytecode ]; + sourceProvenance = [ lib.sourceTypes.binaryBytecode ]; mainProgram = "anyk"; }; } diff --git a/pkgs/by-name/ap/apkg/package.nix b/pkgs/by-name/ap/apkg/package.nix index e73c824fb50245..ad75006a8475b3 100644 --- a/pkgs/by-name/ap/apkg/package.nix +++ b/pkgs/by-name/ap/apkg/package.nix @@ -65,7 +65,7 @@ python3Packages.buildPythonApplication rec { homepage = "https://pkg.labs.nic.cz/pages/apkg"; license = lib.licenses.gpl3Plus; maintainers = [ - maintainers.vcunat # close to upstream + lib.maintainers.vcunat # close to upstream ]; mainProgram = "apkg"; }; diff --git a/pkgs/by-name/ap/appflowy/package.nix b/pkgs/by-name/ap/appflowy/package.nix index 6ca2612764d980..cf8cbed12237df 100644 --- a/pkgs/by-name/ap/appflowy/package.nix +++ b/pkgs/by-name/ap/appflowy/package.nix @@ -106,7 +106,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { license = lib.licenses.agpl3Only; changelog = "https://github.com/AppFlowy-IO/appflowy/releases/tag/${finalAttrs.version}"; maintainers = with lib.maintainers; [ darkonion0 ]; - platforms = [ "x86_64-linux" ] ++ platforms.darwin; + platforms = [ "x86_64-linux" ] ++ lib.platforms.darwin; mainProgram = "appflowy"; }; }) diff --git a/pkgs/by-name/ap/apple-cursor/package.nix b/pkgs/by-name/ap/apple-cursor/package.nix index 27150029a31870..41d0644275947b 100644 --- a/pkgs/by-name/ap/apple-cursor/package.nix +++ b/pkgs/by-name/ap/apple-cursor/package.nix @@ -22,7 +22,7 @@ let ]; version = "2.0.1"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "apple_cursor"; inherit version; inherit srcs; @@ -37,10 +37,10 @@ stdenv.mkDerivation rec { meta = { description = "Opensource macOS Cursors"; homepage = "https://github.com/ful1e5/apple_cursor"; - license = [ - licenses.gpl3Only + license = with lib.licenses; [ + gpl3Only # Potentially a derivative work of copyrighted Apple designs - licenses.unfree + unfree ]; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ diff --git a/pkgs/by-name/ar/arduino-cli/package.nix b/pkgs/by-name/ar/arduino-cli/package.nix index cb1cc2ffcbd6ac..297c93b630e04d 100644 --- a/pkgs/by-name/ar/arduino-cli/package.nix +++ b/pkgs/by-name/ar/arduino-cli/package.nix @@ -76,9 +76,9 @@ let description = "Arduino from the command line"; mainProgram = "arduino-cli"; changelog = "https://github.com/arduino/arduino-cli/releases/tag/${version}"; - license = [ - licenses.gpl3Only - licenses.asl20 + license = with lib.licenses; [ + gpl3Only + asl20 ]; maintainers = with lib.maintainers; [ ryantm diff --git a/pkgs/by-name/ar/arp-scan/package.nix b/pkgs/by-name/ar/arp-scan/package.nix index c5e0843ef19da2..30011c2d958682 100644 --- a/pkgs/by-name/ar/arp-scan/package.nix +++ b/pkgs/by-name/ar/arp-scan/package.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/royhills/arp-scan/wiki/arp-scan-User-Guide"; license = lib.licenses.gpl3; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ bjornfor mikoim diff --git a/pkgs/by-name/as/assimp/package.nix b/pkgs/by-name/as/assimp/package.nix index 51f03e4696287b..302bb22d839146 100644 --- a/pkgs/by-name/as/assimp/package.nix +++ b/pkgs/by-name/as/assimp/package.nix @@ -42,6 +42,6 @@ stdenv.mkDerivation rec { homepage = "https://www.assimp.org/"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ ehmry ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/at/at-spi2-core/package.nix b/pkgs/by-name/at/at-spi2-core/package.nix index d4e098b11e2f4e..1f233a24c91aba 100644 --- a/pkgs/by-name/at/at-spi2-core/package.nix +++ b/pkgs/by-name/at/at-spi2-core/package.nix @@ -111,7 +111,7 @@ stdenv.mkDerivation rec { description = "Assistive Technology Service Provider Interface protocol definitions and daemon for D-Bus"; homepage = "https://gitlab.gnome.org/GNOME/at-spi2-core"; license = lib.licenses.lgpl21Plus; - maintainers = lib.teams.gnome.members ++ (with maintainers; [ raskin ]); + maintainers = lib.teams.gnome.members ++ (with lib.maintainers; [ raskin ]); platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/at/attic-client/package.nix b/pkgs/by-name/at/attic-client/package.nix index 528a0fa96cfdc2..43baddea3dbbb1 100644 --- a/pkgs/by-name/at/attic-client/package.nix +++ b/pkgs/by-name/at/attic-client/package.nix @@ -76,7 +76,7 @@ rustPlatform.buildRustPackage { zhaofengli aciceri ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; mainProgram = "attic"; }; } diff --git a/pkgs/by-name/av/avrdudess/package.nix b/pkgs/by-name/av/avrdudess/package.nix index 4c756aff05341b..d304a951eb9595 100644 --- a/pkgs/by-name/av/avrdudess/package.nix +++ b/pkgs/by-name/av/avrdudess/package.nix @@ -10,7 +10,7 @@ xdg-utils, }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "avrdudess"; version = "2.18"; @@ -57,10 +57,10 @@ stdenv.mkDerivation { meta = { description = "GUI for AVRDUDE (AVR microcontroller programmer)"; homepage = "https://blog.zakkemble.net/avrdudess-a-gui-for-avrdude/"; - changelog = "https://github.com/ZakKemble/AVRDUDESS/blob/v${version}/Changelog.txt"; + changelog = "https://github.com/ZakKemble/AVRDUDESS/blob/v${finalAttrs.version}/Changelog.txt"; license = lib.licenses.gpl3; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.bjornfor ]; mainProgram = "avrdudess"; }; -} +}) diff --git a/pkgs/by-name/ax/axmldec/package.nix b/pkgs/by-name/ax/axmldec/package.nix index c48f4e30c57790..67bdfe61186961 100644 --- a/pkgs/by-name/ax/axmldec/package.nix +++ b/pkgs/by-name/ax/axmldec/package.nix @@ -41,6 +41,6 @@ stdenv.mkDerivation rec { license = lib.licenses.isc; mainProgram = "axmldec"; maintainers = with lib.maintainers; [ franciscod ]; - platforms = lib.platforms.unix ++ platforms.windows; + platforms = lib.platforms.unix ++ lib.platforms.windows; }; } diff --git a/pkgs/by-name/ay/ayatana-ido/package.nix b/pkgs/by-name/ay/ayatana-ido/package.nix index edc976b8d064a8..7e9019f4d356df 100644 --- a/pkgs/by-name/ay/ayatana-ido/package.nix +++ b/pkgs/by-name/ay/ayatana-ido/package.nix @@ -33,9 +33,9 @@ stdenv.mkDerivation rec { description = "Ayatana Display Indicator Objects"; homepage = "https://github.com/AyatanaIndicators/ayatana-ido"; changelog = "https://github.com/AyatanaIndicators/ayatana-ido/blob/${version}/ChangeLog"; - license = [ - licenses.lgpl3Plus - licenses.lgpl21Plus + license = with lib.licenses; [ + lgpl3Plus + lgpl21Plus ]; maintainers = [ lib.maintainers.nickhu ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/ba/babl/package.nix b/pkgs/by-name/ba/babl/package.nix index 8816f727af0273..053c1f29af45b9 100644 --- a/pkgs/by-name/ba/babl/package.nix +++ b/pkgs/by-name/ba/babl/package.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { 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/ba/balena-cli/package.nix b/pkgs/by-name/ba/balena-cli/package.nix index fde2f47de69129..67c45d6ac42dfc 100644 --- a/pkgs/by-name/ba/balena-cli/package.nix +++ b/pkgs/by-name/ba/balena-cli/package.nix @@ -10,7 +10,6 @@ udev, cctools, apple-sdk_12, - darwinMinVersionHook, }: buildNpmPackage rec { @@ -68,9 +67,9 @@ buildNpmPackage rec { homepage = "https://github.com/balena-io/balena-cli"; changelog = "https://github.com/balena-io/balena-cli/blob/v${version}/CHANGELOG.md"; license = lib.licenses.asl20; - maintainers = [ - maintainers.kalebpace - maintainers.doronbehar + maintainers = with lib.maintainers; [ + kalebpace + doronbehar ]; mainProgram = "balena"; }; diff --git a/pkgs/by-name/ba/bandwidth/package.nix b/pkgs/by-name/ba/bandwidth/package.nix index f6a7e05df61e93..dae0c713999602 100644 --- a/pkgs/by-name/ba/bandwidth/package.nix +++ b/pkgs/by-name/ba/bandwidth/package.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { homepage = "https://zsmith.co/bandwidth.html"; description = "Artificial benchmark for identifying weaknesses in the memory subsystem"; license = lib.licenses.gpl2Plus; - platforms = lib.platforms.x86 ++ platforms.arm ++ platforms.aarch64; + platforms = lib.platforms.x86 ++ lib.platforms.arm ++ lib.platforms.aarch64; maintainers = with lib.maintainers; [ r-burns ]; mainProgram = "bandwidth"; }; diff --git a/pkgs/by-name/ba/bash-preexec/package.nix b/pkgs/by-name/ba/bash-preexec/package.nix index 98e9c34da00f13..e637d8c3404207 100644 --- a/pkgs/by-name/ba/bash-preexec/package.nix +++ b/pkgs/by-name/ba/bash-preexec/package.nix @@ -46,9 +46,9 @@ stdenvNoCC.mkDerivation { description = "preexec and precmd functions for Bash just like Zsh"; license = lib.licenses.mit; homepage = "https://github.com/rcaloras/bash-preexec"; - maintainers = [ - maintainers.hawkw - maintainers.rycee + maintainers = with lib.maintainers; [ + hawkw + rycee ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/ba/bazel-buildtools/package.nix b/pkgs/by-name/ba/bazel-buildtools/package.nix index 3855cc143a1de2..a8a81c471d0706 100644 --- a/pkgs/by-name/ba/bazel-buildtools/package.nix +++ b/pkgs/by-name/ba/bazel-buildtools/package.nix @@ -40,7 +40,7 @@ buildGoModule rec { changelog = "https://github.com/bazelbuild/buildtools/releases/tag/v${version}"; license = lib.licenses.asl20; maintainers = - with maintainers; + with lib.maintainers; [ elasticdog uri-canva diff --git a/pkgs/by-name/ba/bazel-remote/package.nix b/pkgs/by-name/ba/bazel-remote/package.nix index 0bc38ddd1f971e..f39a8f80bf4724 100644 --- a/pkgs/by-name/ba/bazel-remote/package.nix +++ b/pkgs/by-name/ba/bazel-remote/package.nix @@ -34,6 +34,6 @@ buildGoModule rec { changelog = "https://github.com/buchgr/bazel-remote/releases/tag/v${version}"; license = lib.licenses.asl20; maintainers = lib.teams.bazel.members; - platforms = lib.platforms.darwin ++ platforms.linux; + platforms = lib.platforms.darwin ++ lib.platforms.linux; }; } diff --git a/pkgs/by-name/be/betaflight-configurator/package.nix b/pkgs/by-name/be/betaflight-configurator/package.nix index b3102b1a60d34c..8598d25d3e6ebe 100644 --- a/pkgs/by-name/be/betaflight-configurator/package.nix +++ b/pkgs/by-name/be/betaflight-configurator/package.nix @@ -51,8 +51,8 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/betaflight/betaflight/wiki"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - license = licenses.gpl3; + license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ wucke13 ]; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/bi/bicon/package.nix b/pkgs/by-name/bi/bicon/package.nix index b5030a4b19cb64..e7b8dbff1adb5e 100644 --- a/pkgs/by-name/bi/bicon/package.nix +++ b/pkgs/by-name/bi/bicon/package.nix @@ -50,10 +50,10 @@ stdenv.mkDerivation rec { meta = { description = "Bidirectional console"; homepage = "https://github.com/behdad/bicon"; - license = [ - licenses.lgpl21 - licenses.psfl - licenses.bsd0 + license = with lib.licenses; [ + lgpl21 + psfl + bsd0 ]; maintainers = [ ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/bl/bluemix-cli/package.nix b/pkgs/by-name/bl/bluemix-cli/package.nix index 2cd9a54b4cb1b4..4d47611a088f11 100644 --- a/pkgs/by-name/bl/bluemix-cli/package.nix +++ b/pkgs/by-name/bl/bluemix-cli/package.nix @@ -37,9 +37,9 @@ stdenv.mkDerivation rec { downloadPage = "https://console.bluemix.net/docs/cli/reference/bluemix_cli/download_cli.html#download_install"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; - maintainers = [ - maintainers.tazjin - maintainers.jensbin + maintainers = with lib.maintainers; [ + tazjin + jensbin ]; platforms = [ "x86_64-linux" diff --git a/pkgs/by-name/bo/book-summary/package.nix b/pkgs/by-name/bo/book-summary/package.nix index 69103fa2193173..562b6034a3df46 100644 --- a/pkgs/by-name/bo/book-summary/package.nix +++ b/pkgs/by-name/bo/book-summary/package.nix @@ -20,6 +20,6 @@ rustPlatform.buildRustPackage rec { mainProgram = "book-summary"; homepage = "https://github.com/dvogt23/book-summary"; license = lib.licenses.mit; - maintainers = with teams; iog.members; + maintainers = with lib.teams; iog.members; }; } diff --git a/pkgs/by-name/bo/boot/package.nix b/pkgs/by-name/bo/boot/package.nix index 04cf95ba178189..fcaabd8ccbb997 100644 --- a/pkgs/by-name/bo/boot/package.nix +++ b/pkgs/by-name/bo/boot/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { mainProgram = "boot"; homepage = "https://boot-clj.github.io/"; license = lib.licenses.epl10; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ ragge ]; }; } diff --git a/pkgs/by-name/bo/boringtun/package.nix b/pkgs/by-name/bo/boringtun/package.nix index 69d509f5b57bd5..dfe39bb6ddafec 100644 --- a/pkgs/by-name/bo/boringtun/package.nix +++ b/pkgs/by-name/bo/boringtun/package.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/cloudflare/boringtun"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ xrelkd ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; mainProgram = "boringtun-cli"; }; } diff --git a/pkgs/by-name/bp/bpftools/package.nix b/pkgs/by-name/bp/bpftools/package.nix index e925977e7fccd7..ec3e17fa548e70 100644 --- a/pkgs/by-name/bp/bpftools/package.nix +++ b/pkgs/by-name/bp/bpftools/package.nix @@ -75,9 +75,9 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/libbpf/bpftool"; description = "Debugging/program analysis tools for the eBPF subsystem"; - license = [ - licenses.gpl2Only - licenses.bsd2 + license = with lib.licenses; [ + gpl2Only + bsd2 ]; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ thoughtpolice ]; diff --git a/pkgs/by-name/br/brillo/package.nix b/pkgs/by-name/br/brillo/package.nix index 66ae6ade8fab11..88dae6369bf807 100644 --- a/pkgs/by-name/br/brillo/package.nix +++ b/pkgs/by-name/br/brillo/package.nix @@ -38,9 +38,9 @@ stdenv.mkDerivation rec { description = "Backlight and Keyboard LED control tool"; homepage = "https://gitlab.com/cameronnemo/brillo"; mainProgram = "brillo"; - license = [ - licenses.gpl3 - licenses.bsd0 + license = with lib.licenses; [ + gpl3 + bsd0 ]; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.alexarice ]; diff --git a/pkgs/by-name/bt/btcpayserver/package.nix b/pkgs/by-name/bt/btcpayserver/package.nix index 37864eae58e9f9..921ea70896eefb 100644 --- a/pkgs/by-name/bt/btcpayserver/package.nix +++ b/pkgs/by-name/bt/btcpayserver/package.nix @@ -34,6 +34,6 @@ buildDotnetModule rec { changelog = "https://github.com/btcpayserver/btcpayserver/blob/v${version}/Changelog.md"; maintainers = with lib.maintainers; [ kcalvinalvin erikarvstedt ]; license = lib.licenses.mit; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/bu/bup/package.nix b/pkgs/by-name/bu/bup/package.nix index 9f97734aedab03..52e86eccb7a27f 100644 --- a/pkgs/by-name/bu/bup/package.nix +++ b/pkgs/by-name/bu/bup/package.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation { Capable of doing *fast* incremental backups of virtual machine images. ''; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ rnhmjoj ]; }; } diff --git a/pkgs/by-name/bu/burpsuite/package.nix b/pkgs/by-name/bu/burpsuite/package.nix index 05076ff8e1773f..550d5fcf8b7cd8 100644 --- a/pkgs/by-name/bu/burpsuite/package.nix +++ b/pkgs/by-name/bu/burpsuite/package.nix @@ -102,7 +102,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/ca/cakelisp/package.nix b/pkgs/by-name/ca/cakelisp/package.nix index 062675defc135c..bf4bfd5bb41058 100644 --- a/pkgs/by-name/ca/cakelisp/package.nix +++ b/pkgs/by-name/ca/cakelisp/package.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation { mainProgram = "cakelisp"; homepage = "https://macoy.me/code/macoy/cakelisp"; license = lib.licenses.gpl3Plus; - platforms = lib.platforms.darwin ++ platforms.linux; + platforms = lib.platforms.darwin ++ lib.platforms.linux; maintainers = [ lib.maintainers.sbond75 ]; # never built on aarch64-darwin since first introduction in nixpkgs broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; diff --git a/pkgs/by-name/ca/caligula/package.nix b/pkgs/by-name/ca/caligula/package.nix index 66864969517ce6..880eb4d460ad04 100644 --- a/pkgs/by-name/ca/caligula/package.nix +++ b/pkgs/by-name/ca/caligula/package.nix @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { ifd3f sodiboo ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; mainProgram = "caligula"; }; } diff --git a/pkgs/by-name/ca/caudec/package.nix b/pkgs/by-name/ca/caudec/package.nix index 0007281f107ace..742d4c5863c109 100644 --- a/pkgs/by-name/ca/caudec/package.nix +++ b/pkgs/by-name/ca/caudec/package.nix @@ -52,6 +52,6 @@ stdenv.mkDerivation rec { homepage = "https://caudec.cocatre.net/"; description = "Multiprocess audio converter that supports many formats (FLAC, MP3, Ogg Vorbis, Windows codecs and many more)"; license = lib.licenses.gpl3; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/cd/cdecrypt/package.nix b/pkgs/by-name/cd/cdecrypt/package.nix index 027304399f666a..91ce7bc654eb64 100644 --- a/pkgs/by-name/cd/cdecrypt/package.nix +++ b/pkgs/by-name/cd/cdecrypt/package.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/VitaSmith/cdecrypt/releases/tag/v${version}"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ hughobrien ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/cd/cdimgtools/package.nix b/pkgs/by-name/cd/cdimgtools/package.nix index d2514d05089a1c..cce53c31360824 100644 --- a/pkgs/by-name/cd/cdimgtools/package.nix +++ b/pkgs/by-name/cd/cdimgtools/package.nix @@ -70,6 +70,6 @@ stdenv.mkDerivation { description = "Tools to inspect and manipulate CD/DVD optical disc images"; license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ hhm ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/cf/cflow/package.nix b/pkgs/by-name/cf/cflow/package.nix index 11ea1fee0b537a..f54330d306e05e 100644 --- a/pkgs/by-name/cf/cflow/package.nix +++ b/pkgs/by-name/cf/cflow/package.nix @@ -52,6 +52,6 @@ stdenv.mkDerivation rec { maintainers = [ ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/ch/chrome-export/package.nix b/pkgs/by-name/ch/chrome-export/package.nix index 49af8503f8ded1..4c225d2b0d348a 100644 --- a/pkgs/by-name/ch/chrome-export/package.nix +++ b/pkgs/by-name/ch/chrome-export/package.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "Scripts to save Google Chrome's bookmarks and history as HTML bookmarks files"; homepage = "https://github.com/bdesham/chrome-export"; - license = [ licenses.isc ]; + license = [ lib.licenses.isc ]; maintainers = [ lib.maintainers.bdesham ]; platforms = python3.meta.platforms; }; diff --git a/pkgs/by-name/ci/cinnamon-common/package.nix b/pkgs/by-name/ci/cinnamon-common/package.nix index 7de7a0a4d638ac..5a0df878dd9a07 100644 --- a/pkgs/by-name/ci/cinnamon-common/package.nix +++ b/pkgs/by-name/ci/cinnamon-common/package.nix @@ -211,7 +211,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/linuxmint/cinnamon"; description = "Cinnamon desktop environment"; - license = [ licenses.gpl2 ]; + license = [ lib.licenses.gpl2 ]; platforms = lib.platforms.linux; maintainers = lib.teams.cinnamon.members; }; diff --git a/pkgs/by-name/ci/cinnamon-desktop/package.nix b/pkgs/by-name/ci/cinnamon-desktop/package.nix index 22b9dbd1a1478c..d0b700f03c1180 100644 --- a/pkgs/by-name/ci/cinnamon-desktop/package.nix +++ b/pkgs/by-name/ci/cinnamon-desktop/package.nix @@ -79,9 +79,9 @@ stdenv.mkDerivation rec { gtk-doc. ''; - license = [ - licenses.gpl2 - licenses.lgpl2 + license = with lib.licenses; [ + gpl2 + lgpl2 ]; platforms = lib.platforms.linux; maintainers = lib.teams.cinnamon.members; diff --git a/pkgs/by-name/ci/cinnamon-menus/package.nix b/pkgs/by-name/ci/cinnamon-menus/package.nix index 5e8c53382230b7..7f7c74149c0f43 100644 --- a/pkgs/by-name/ci/cinnamon-menus/package.nix +++ b/pkgs/by-name/ci/cinnamon-menus/package.nix @@ -36,9 +36,9 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/linuxmint/cinnamon-menus"; description = "Menu system for the Cinnamon project"; - license = [ - licenses.gpl2 - licenses.lgpl2 + license = with lib.licenses; [ + gpl2 + lgpl2 ]; platforms = lib.platforms.linux; maintainers = lib.teams.cinnamon.members; diff --git a/pkgs/by-name/ci/cinnamon-screensaver/package.nix b/pkgs/by-name/ci/cinnamon-screensaver/package.nix index 935fa6acda9ee8..6a0bf3943bbf4d 100644 --- a/pkgs/by-name/ci/cinnamon-screensaver/package.nix +++ b/pkgs/by-name/ci/cinnamon-screensaver/package.nix @@ -108,9 +108,9 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/linuxmint/cinnamon-screensaver"; description = "Cinnamon screen locker and screensaver program"; - license = [ - licenses.gpl2 - licenses.lgpl2 + license = with lib.licenses; [ + gpl2 + lgpl2 ]; platforms = lib.platforms.linux; maintainers = lib.teams.cinnamon.members; diff --git a/pkgs/by-name/cl/clboss/package.nix b/pkgs/by-name/cl/clboss/package.nix index 85eea2b6bc43fb..a67369b6b7ece1 100644 --- a/pkgs/by-name/cl/clboss/package.nix +++ b/pkgs/by-name/cl/clboss/package.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/ZmnSCPxj/clboss"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ prusnak ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; mainProgram = "clboss"; }; } diff --git a/pkgs/by-name/cl/click/package.nix b/pkgs/by-name/cl/click/package.nix index 3955dc7d456a58..79d00a9aed6766 100644 --- a/pkgs/by-name/cl/click/package.nix +++ b/pkgs/by-name/cl/click/package.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { meta = { description = ''The "Command Line Interactive Controller for Kubernetes"''; homepage = "https://github.com/databricks/click"; - license = [ licenses.asl20 ]; + license = [ lib.licenses.asl20 ]; maintainers = [ lib.maintainers.mbode ]; platforms = [ "x86_64-linux" diff --git a/pkgs/by-name/cl/clightning/package.nix b/pkgs/by-name/cl/clightning/package.nix index 77636042b21359..e2fb0d18767b67 100644 --- a/pkgs/by-name/cl/clightning/package.nix +++ b/pkgs/by-name/cl/clightning/package.nix @@ -114,6 +114,6 @@ stdenv.mkDerivation rec { prusnak ]; license = lib.licenses.mit; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/cl/cloudmonkey/package.nix b/pkgs/by-name/cl/cloudmonkey/package.nix index 41f1822c0a5999..4e39c9873ac530 100644 --- a/pkgs/by-name/cl/cloudmonkey/package.nix +++ b/pkgs/by-name/cl/cloudmonkey/package.nix @@ -20,7 +20,7 @@ buildGoModule rec { meta = { description = "CLI for Apache CloudStack"; homepage = "https://github.com/apache/cloudstack-cloudmonkey"; - license = [ licenses.asl20 ]; + license = [ lib.licenses.asl20 ]; maintainers = [ lib.maintainers.womfoo ]; mainProgram = "cloudstack-cloudmonkey"; }; diff --git a/pkgs/by-name/cl/clp/package.nix b/pkgs/by-name/cl/clp/package.nix index 12cbdbb555954d..a3ca971e5c27b3 100644 --- a/pkgs/by-name/cl/clp/package.nix +++ b/pkgs/by-name/cl/clp/package.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/coin-or/Clp"; description = "Open-source linear programming solver written in C++"; mainProgram = "clp"; - platforms = lib.platforms.darwin ++ platforms.linux; + platforms = lib.platforms.darwin ++ lib.platforms.linux; maintainers = [ lib.maintainers.vbgl ]; }; } diff --git a/pkgs/by-name/cm/cmusfm/package.nix b/pkgs/by-name/cm/cmusfm/package.nix index fa4b4b9d48ef2a..be2a5f9ef17b34 100644 --- a/pkgs/by-name/cm/cmusfm/package.nix +++ b/pkgs/by-name/cm/cmusfm/package.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { mudri ]; license = lib.licenses.gpl3Plus; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; mainProgram = "cmusfm"; }; } diff --git a/pkgs/by-name/cn/cnstrokeorder/package.nix b/pkgs/by-name/cn/cnstrokeorder/package.nix index efefa8eb58fc0f..0ba277b8f9d8f6 100644 --- a/pkgs/by-name/cn/cnstrokeorder/package.nix +++ b/pkgs/by-name/cn/cnstrokeorder/package.nix @@ -26,7 +26,7 @@ stdenvNoCC.mkDerivation rec { meta = { description = "Chinese font that shows stroke order for HSK 1-4"; homepage = "http://rtega.be/chmn/index.php?subpage=68"; - license = [ licenses.arphicpl ]; + license = [ lib.licenses.arphicpl ]; maintainers = with lib.maintainers; [ johnazoidberg ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/cn/cntlm/package.nix b/pkgs/by-name/cn/cntlm/package.nix index 389a1c64be9d8d..bfc9e354aa2c49 100644 --- a/pkgs/by-name/cn/cntlm/package.nix +++ b/pkgs/by-name/cn/cntlm/package.nix @@ -31,11 +31,11 @@ stdenv.mkDerivation rec { description = "NTLM/NTLMv2 authenticating HTTP proxy"; homepage = "https://cntlm.sourceforge.net/"; license = lib.licenses.gpl2Only; - maintainers = [ - maintainers.qknight - maintainers.carlosdagos + maintainers = with lib.maintainers; [ + qknight + carlosdagos ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; mainProgram = "cntlm"; }; } diff --git a/pkgs/by-name/co/codesearch/package.nix b/pkgs/by-name/co/codesearch/package.nix index 034615e950efd8..fec1c02fd9dbd1 100644 --- a/pkgs/by-name/co/codesearch/package.nix +++ b/pkgs/by-name/co/codesearch/package.nix @@ -25,7 +25,7 @@ buildGoModule rec { meta = { description = "Fast, indexed regexp search over large file trees"; homepage = "https://github.com/google/codesearch"; - license = [ licenses.bsd3 ]; + license = [ lib.licenses.bsd3 ]; maintainers = with lib.maintainers; [ bennofs ]; }; } diff --git a/pkgs/by-name/co/coin3d/package.nix b/pkgs/by-name/co/coin3d/package.nix index 09c31f8337bce1..a2114b0ca1660b 100644 --- a/pkgs/by-name/co/coin3d/package.nix +++ b/pkgs/by-name/co/coin3d/package.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "coin-config"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ gebner ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; }) diff --git a/pkgs/by-name/co/colmena/package.nix b/pkgs/by-name/co/colmena/package.nix index 0ad0935ba8829c..550c6c6b82b7d1 100644 --- a/pkgs/by-name/co/colmena/package.nix +++ b/pkgs/by-name/co/colmena/package.nix @@ -67,7 +67,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://colmena.cli.rs/${passthru.apiVersion}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ zhaofengli ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; mainProgram = "colmena"; }; } diff --git a/pkgs/by-name/co/colord/package.nix b/pkgs/by-name/co/colord/package.nix index e13947e5371463..ddde8ff9ae15ae 100644 --- a/pkgs/by-name/co/colord/package.nix +++ b/pkgs/by-name/co/colord/package.nix @@ -136,7 +136,7 @@ stdenv.mkDerivation rec { description = "System service to manage, install and generate color profiles to accurately color manage input and output devices"; homepage = "https://www.freedesktop.org/software/colord/"; license = lib.licenses.lgpl2Plus; - maintainers = [ lib.maintainers.marcweber ] ++ teams.freedesktop.members; + maintainers = [ lib.maintainers.marcweber ] ++ lib.teams.freedesktop.members; platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/co/comixcursors/package.nix b/pkgs/by-name/co/comixcursors/package.nix index 12bf203745a3f3..1a0b6e9a546e70 100644 --- a/pkgs/by-name/co/comixcursors/package.nix +++ b/pkgs/by-name/co/comixcursors/package.nix @@ -119,7 +119,7 @@ stdenvNoCC.mkDerivation rec { 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/co/consul-alerts/package.nix b/pkgs/by-name/co/consul-alerts/package.nix index 55c0278d9d583f..7b1eb609ee0acb 100644 --- a/pkgs/by-name/co/consul-alerts/package.nix +++ b/pkgs/by-name/co/consul-alerts/package.nix @@ -28,7 +28,7 @@ buildGoModule rec { description = "Extendable open source continuous integration server"; homepage = "https://github.com/AcalephStorage/consul-alerts"; # As per README - platforms = lib.platforms.linux ++ platforms.freebsd ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.freebsd ++ lib.platforms.darwin; license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ nh2 ]; }; diff --git a/pkgs/by-name/co/consul-template/package.nix b/pkgs/by-name/co/consul-template/package.nix index 7e33bb1c3ed2ef..c0052bbc4122d7 100644 --- a/pkgs/by-name/co/consul-template/package.nix +++ b/pkgs/by-name/co/consul-template/package.nix @@ -29,7 +29,7 @@ buildGoModule rec { meta = { homepage = "https://github.com/hashicorp/consul-template/"; description = "Generic template rendering and notifications with Consul"; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ cpcloud diff --git a/pkgs/by-name/co/consul/package.nix b/pkgs/by-name/co/consul/package.nix index d6ba6fc67f46ea..7ab97dc7813ccd 100644 --- a/pkgs/by-name/co/consul/package.nix +++ b/pkgs/by-name/co/consul/package.nix @@ -54,7 +54,7 @@ buildGoModule rec { description = "Tool for service discovery, monitoring and configuration"; changelog = "https://github.com/hashicorp/consul/releases/tag/v${version}"; homepage = "https://www.consul.io/"; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; license = lib.licenses.bsl11; maintainers = with lib.maintainers; [ adamcstephens diff --git a/pkgs/by-name/co/contour/package.nix b/pkgs/by-name/co/contour/package.nix index 6f6cb94349eba4..d013b709486cd1 100644 --- a/pkgs/by-name/co/contour/package.nix +++ b/pkgs/by-name/co/contour/package.nix @@ -103,7 +103,7 @@ stdenv.mkDerivation (final: { meta = { description = "Modern C++ Terminal Emulator"; homepage = "https://github.com/contour-terminal/contour"; - changelog = "https://github.com/contour-terminal/contour/raw/v${version}/Changelog.md"; + changelog = "https://github.com/contour-terminal/contour/raw/v${final.version}/Changelog.md"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ moni ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/co/cook-cli/package.nix b/pkgs/by-name/co/cook-cli/package.nix index f1a3e0f7b84ee7..552efed98937e6 100644 --- a/pkgs/by-name/co/cook-cli/package.nix +++ b/pkgs/by-name/co/cook-cli/package.nix @@ -54,9 +54,9 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/cooklang/cookcli/releases/tag/v${version}"; description = "Suite of tools to create shopping lists and maintain recipes"; homepage = "https://cooklang.org/"; - license = [ licenses.mit ]; + license = [ lib.licenses.mit ]; mainProgram = "cook"; maintainers = [ lib.maintainers.emilioziniades ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/co/corsix-th/package.nix b/pkgs/by-name/co/corsix-th/package.nix index 4902a337fc3b4e..0d97373a5f9728 100644 --- a/pkgs/by-name/co/corsix-th/package.nix +++ b/pkgs/by-name/co/corsix-th/package.nix @@ -86,6 +86,6 @@ stdenv.mkDerivation (finalAttrs: { hughobrien matteopacini ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; }) diff --git a/pkgs/by-name/co/cosmic-protocols/package.nix b/pkgs/by-name/co/cosmic-protocols/package.nix index cd0d77a1ec3079..db95a36290d7d9 100644 --- a/pkgs/by-name/co/cosmic-protocols/package.nix +++ b/pkgs/by-name/co/cosmic-protocols/package.nix @@ -22,9 +22,9 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/pop-os/cosmic-protocols"; description = "Additional wayland-protocols used by the COSMIC desktop environment"; - license = [ - licenses.mit - licenses.gpl3Only + license = with lib.licenses; [ + mit + gpl3Only ]; maintainers = with lib.maintainers; [ nyabinary ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/co/coursera-dl/package.nix b/pkgs/by-name/co/coursera-dl/package.nix index 7cf03e596f2972..b79b0b2069e55e 100644 --- a/pkgs/by-name/co/coursera-dl/package.nix +++ b/pkgs/by-name/co/coursera-dl/package.nix @@ -70,6 +70,6 @@ python3.pkgs.buildPythonApplication rec { changelog = "https://github.com/coursera-dl/coursera-dl/blob/${src.rev}/CHANGELOG.md"; license = lib.licenses.lgpl3Plus; maintainers = with lib.maintainers; [ alexfmpe ]; - platforms = lib.platforms.darwin ++ platforms.linux; + platforms = lib.platforms.darwin ++ lib.platforms.linux; }; } diff --git a/pkgs/by-name/cp/cpp-utilities/package.nix b/pkgs/by-name/cp/cpp-utilities/package.nix index b728c313c216be..7e973b2f5d0bfc 100644 --- a/pkgs/by-name/cp/cpp-utilities/package.nix +++ b/pkgs/by-name/cp/cpp-utilities/package.nix @@ -40,6 +40,6 @@ stdenv.mkDerivation (finalAttrs: { description = "Common C++ classes and routines used by @Martchus' applications featuring argument parser, IO and conversion utilities"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ doronbehar ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; }) diff --git a/pkgs/by-name/cp/cppunit/package.nix b/pkgs/by-name/cp/cppunit/package.nix index 3864931a3e6bc0..7fbde85c3910b9 100644 --- a/pkgs/by-name/cp/cppunit/package.nix +++ b/pkgs/by-name/cp/cppunit/package.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { description = "C++ unit testing framework"; mainProgram = "DllPlugInTester"; license = lib.licenses.lgpl21; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/cu/cups-kyocera-3500-4500/package.nix b/pkgs/by-name/cu/cups-kyocera-3500-4500/package.nix index b81eef7726f31d..23ed60e0576b52 100644 --- a/pkgs/by-name/cu/cups-kyocera-3500-4500/package.nix +++ b/pkgs/by-name/cu/cups-kyocera-3500-4500/package.nix @@ -17,7 +17,7 @@ let kyodialog_version_long = "9.0"; date = "20221003"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "cups-kyocera-3500-4500"; version = "${kyodialog_version_long}-${date}"; @@ -105,7 +105,7 @@ stdenv.mkDerivation rec { meta = { description = "CUPS drivers for Kyocera ECOSYS MA3500cix, MA3500cifx, MA4000cix, MA4000cifx, PA3500cx, PA4000cx and PA4500cx, for Kyocera CS MA4500ci and PA4500ci, and for Kyocera TASKalfa MA3500ci, MA4500ci and PI4500ci printers"; homepage = "https://www.kyoceradocumentsolutions.com"; - sourceProvenance = [ sourceTypes.binaryNativeCode ]; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; license = lib.licenses.unfree; maintainers = [ lib.maintainers.me-and ]; platforms = [ diff --git a/pkgs/by-name/cu/cutecapture/package.nix b/pkgs/by-name/cu/cutecapture/package.nix index e8c8e4c0feaab1..b26fe6e4a70812 100644 --- a/pkgs/by-name/cu/cutecapture/package.nix +++ b/pkgs/by-name/cu/cutecapture/package.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { description = "(3)DS capture software for Linux and Mac"; homepage = "https://github.com/Gotos/CuteCapture"; license = lib.licenses.asl20; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ raphaelr ]; }; }) diff --git a/pkgs/by-name/cy/cyclonedx-cli/package.nix b/pkgs/by-name/cy/cyclonedx-cli/package.nix index b8a3e47fd823a3..04164d57e6ec96 100644 --- a/pkgs/by-name/cy/cyclonedx-cli/package.nix +++ b/pkgs/by-name/cy/cyclonedx-cli/package.nix @@ -32,7 +32,7 @@ buildDotnetModule rec { description = "CycloneDX CLI tool for SBOM analysis, merging, diffs and format conversions"; homepage = "https://github.com/CycloneDX/cyclonedx-cli"; changelog = "https://github.com/CycloneDX/cyclonedx-cli/releases/tag/v${version}"; - maintainers = (with maintainers; [ thillux ]) ++ teams.cyberus.members; + maintainers = (with lib.maintainers; [ thillux ]) ++ lib.teams.cyberus.members; license = lib.licenses.asl20; platforms = with lib.platforms; (linux ++ darwin); mainProgram = "cyclonedx"; diff --git a/pkgs/by-name/cy/cyme/package.nix b/pkgs/by-name/cy/cyme/package.nix index f49630b9c98f15..b0327e92059ccb 100644 --- a/pkgs/by-name/cy/cyme/package.nix +++ b/pkgs/by-name/cy/cyme/package.nix @@ -59,7 +59,7 @@ rustPlatform.buildRustPackage rec { description = "Modern cross-platform lsusb"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ h7x4 ]; - platforms = lib.platforms.linux ++ platforms.darwin ++ platforms.windows; + platforms = lib.platforms.linux ++ lib.platforms.darwin ++ lib.platforms.windows; mainProgram = "cyme"; }; } diff --git a/pkgs/by-name/da/dante/package.nix b/pkgs/by-name/da/dante/package.nix index 0a1e118b9bd65d..03bdb84cb67350 100644 --- a/pkgs/by-name/da/dante/package.nix +++ b/pkgs/by-name/da/dante/package.nix @@ -64,6 +64,6 @@ stdenv.mkDerivation rec { homepage = "https://www.inet.no/dante/"; maintainers = [ lib.maintainers.arobyn ]; license = lib.licenses.bsdOriginal; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/da/dav1d/package.nix b/pkgs/by-name/da/dav1d/package.nix index ecdc4e2c698012..50956b0843b168 100644 --- a/pkgs/by-name/da/dav1d/package.nix +++ b/pkgs/by-name/da/dav1d/package.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { changelog = "https://code.videolan.org/videolan/dav1d/-/tags/${version}"; # More technical: https://code.videolan.org/videolan/dav1d/blob/${version}/NEWS license = lib.licenses.bsd2; - platforms = lib.platforms.unix ++ platforms.windows; + platforms = lib.platforms.unix ++ lib.platforms.windows; maintainers = with lib.maintainers; [ primeos ]; }; } diff --git a/pkgs/by-name/db/dbeaver-bin/package.nix b/pkgs/by-name/db/dbeaver-bin/package.nix index 7ce5f4fe00ffcd..8a5db461641279 100644 --- a/pkgs/by-name/db/dbeaver-bin/package.nix +++ b/pkgs/by-name/db/dbeaver-bin/package.nix @@ -120,7 +120,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { ''; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.asl20; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ gepbird mkg20001 diff --git a/pkgs/by-name/dc/dclib/package.nix b/pkgs/by-name/dc/dclib/package.nix index 97c5000fbb6220..78d9f8d61e1d2b 100644 --- a/pkgs/by-name/dc/dclib/package.nix +++ b/pkgs/by-name/dc/dclib/package.nix @@ -28,9 +28,9 @@ stdenv.mkDerivation rec { description = "Peer-to-Peer file sharing client"; homepage = "http://dcgui.berlios.de"; platforms = lib.platforms.linux; - license = [ - licenses.openssl - licenses.gpl2 + license = with lib.licenses; [ + openssl + gpl2 ]; }; } diff --git a/pkgs/by-name/de/desktop-file-utils/package.nix b/pkgs/by-name/de/desktop-file-utils/package.nix index 63910478b3ef26..99f57ee503f888 100644 --- a/pkgs/by-name/de/desktop-file-utils/package.nix +++ b/pkgs/by-name/de/desktop-file-utils/package.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.freedesktop.org/wiki/Software/desktop-file-utils"; description = "Command line utilities for working with .desktop files"; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/by-name/de/deterministic-uname/package.nix b/pkgs/by-name/de/deterministic-uname/package.nix index 9a8b22be3a98a0..fbf020944c8f2d 100644 --- a/pkgs/by-name/de/deterministic-uname/package.nix +++ b/pkgs/by-name/de/deterministic-uname/package.nix @@ -52,7 +52,7 @@ substituteAll { not intercept these calls, builds made on different kernels will produce different results. ''; - license = [ licenses.mit ]; + license = [ lib.licenses.mit ]; maintainers = with lib.maintainers; [ artturin ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/dh/dhcpcd/package.nix b/pkgs/by-name/dh/dhcpcd/package.nix index d776087434d0c0..0e280f01b81017 100644 --- a/pkgs/by-name/dh/dhcpcd/package.nix +++ b/pkgs/by-name/dh/dhcpcd/package.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { meta = { description = "Client for the Dynamic Host Configuration Protocol (DHCP)"; homepage = "https://roy.marples.name/projects/dhcpcd"; - platforms = lib.platforms.linux ++ platforms.freebsd; + platforms = lib.platforms.linux ++ lib.platforms.freebsd; license = lib.licenses.bsd2; maintainers = [ ]; mainProgram = "dhcpcd"; diff --git a/pkgs/by-name/dm/dmtcp/package.nix b/pkgs/by-name/dm/dmtcp/package.nix index c1f1cb6f083991..485ef8c2a932d5 100644 --- a/pkgs/by-name/dm/dmtcp/package.nix +++ b/pkgs/by-name/dm/dmtcp/package.nix @@ -50,6 +50,6 @@ stdenv.mkDerivation rec { ''; homepage = "http://dmtcp.sourceforge.net/"; license = lib.licenses.lgpl3Plus; # most files seem this or LGPL-2.1+ - platforms = intersectLists platforms.linux 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/dn/dnf5/package.nix b/pkgs/by-name/dn/dnf5/package.nix index de770d1b5e69aa..8f75aa3d46ffe3 100644 --- a/pkgs/by-name/dn/dnf5/package.nix +++ b/pkgs/by-name/dn/dnf5/package.nix @@ -129,6 +129,6 @@ stdenv.mkDerivation (finalAttrs: { katexochen ]; mainProgram = "dnf5"; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; }) diff --git a/pkgs/by-name/do/double-conversion/package.nix b/pkgs/by-name/do/double-conversion/package.nix index eb38b1aca3369e..3ae6beff73fc75 100644 --- a/pkgs/by-name/do/double-conversion/package.nix +++ b/pkgs/by-name/do/double-conversion/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { description = "Binary-decimal and decimal-binary routines for IEEE doubles"; homepage = "https://github.com/google/double-conversion"; license = lib.licenses.bsd3; - platforms = lib.platforms.unix ++ platforms.windows; + platforms = lib.platforms.unix ++ lib.platforms.windows; maintainers = with lib.maintainers; [ abbradar ]; }; } diff --git a/pkgs/by-name/dp/dpdk/package.nix b/pkgs/by-name/dp/dpdk/package.nix index 249c3301379881..4412482ad8e72a 100644 --- a/pkgs/by-name/dp/dpdk/package.nix +++ b/pkgs/by-name/dp/dpdk/package.nix @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { description = "Set of libraries and drivers for fast packet processing"; homepage = "http://dpdk.org/"; license = with lib.licenses; [ lgpl21 gpl2Only bsd2 ]; - platforms = platforms.linux; + platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ magenbluten orivej mic92 zhaofengli ]; }; } diff --git a/pkgs/by-name/dr/driftnet/package.nix b/pkgs/by-name/dr/driftnet/package.nix index 293e81322cfbd1..5d5d3c54c25008 100644 --- a/pkgs/by-name/dr/driftnet/package.nix +++ b/pkgs/by-name/dr/driftnet/package.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { changelog = "https://github.com/deiv/driftnet/releases/tag/v${version}"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ offline ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; mainProgram = "driftnet"; }; } diff --git a/pkgs/by-name/du/dumpasn1/package.nix b/pkgs/by-name/du/dumpasn1/package.nix index 0fff2a27969827..a3a7d2086daf6f 100644 --- a/pkgs/by-name/du/dumpasn1/package.nix +++ b/pkgs/by-name/du/dumpasn1/package.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.bsd2; mainProgram = "dumpasn1"; maintainers = with lib.maintainers; [ katexochen ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; }) diff --git a/pkgs/by-name/du/duplicacy/package.nix b/pkgs/by-name/du/duplicacy/package.nix index c74b26dd212c71..ee6b55722c36fa 100644 --- a/pkgs/by-name/du/duplicacy/package.nix +++ b/pkgs/by-name/du/duplicacy/package.nix @@ -22,7 +22,7 @@ buildGoModule rec { meta = { homepage = "https://duplicacy.com"; description = "New generation cloud backup tool"; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; license = lib.licenses.unfree; maintainers = with lib.maintainers; [ ffinkdevs diff --git a/pkgs/by-name/dv/dvdauthor/package.nix b/pkgs/by-name/dv/dvdauthor/package.nix index d6d40ef2a61189..d31f63014bc5fd 100644 --- a/pkgs/by-name/dv/dvdauthor/package.nix +++ b/pkgs/by-name/dv/dvdauthor/package.nix @@ -43,6 +43,6 @@ stdenv.mkDerivation rec { description = "Tools for generating DVD files to be played on standalone DVD players"; homepage = "https://dvdauthor.sourceforge.net/"; license = lib.licenses.gpl2; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/dv/dvgrab/package.nix b/pkgs/by-name/dv/dvgrab/package.nix index 96fb47311dd10f..f4965d34ac4181 100644 --- a/pkgs/by-name/dv/dvgrab/package.nix +++ b/pkgs/by-name/dv/dvgrab/package.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation { homepage = "https://github.com/ddennedy/dvgrab"; # Formerly http://www.kinodv.org/ license = lib.licenses.gpl2Plus; - platforms = lib.platforms.gnu ++ platforms.linux; + platforms = lib.platforms.gnu ++ lib.platforms.linux; mainProgram = "dvgrab"; }; } diff --git a/pkgs/by-name/dy/dynamips/package.nix b/pkgs/by-name/dy/dynamips/package.nix index d838373b8ffc8c..945e5a185b9e6a 100644 --- a/pkgs/by-name/dy/dynamips/package.nix +++ b/pkgs/by-name/dy/dynamips/package.nix @@ -48,6 +48,6 @@ stdenv.mkDerivation rec { primeos anthonyroussel ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/ea/easyrsa/package.nix b/pkgs/by-name/ea/easyrsa/package.nix index 26a1ab358d4f76..0e1a9db42e4da0 100644 --- a/pkgs/by-name/ea/easyrsa/package.nix +++ b/pkgs/by-name/ea/easyrsa/package.nix @@ -63,9 +63,9 @@ stdenv.mkDerivation rec { description = "Simple shell based CA utility"; homepage = "https://openvpn.net/"; license = lib.licenses.gpl2Only; - maintainers = [ - maintainers.offline - maintainers.numinit + maintainers = with lib.maintainers; [ + offline + numinit ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/ea/easytag/package.nix b/pkgs/by-name/ea/easytag/package.nix index 4e9f639796f0a9..d448b34bcc9ec1 100644 --- a/pkgs/by-name/ea/easytag/package.nix +++ b/pkgs/by-name/ea/easytag/package.nix @@ -78,6 +78,6 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.gnome.org/GNOME/easytag"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ matteopacini ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/el/elf2uf2-rs/package.nix b/pkgs/by-name/el/elf2uf2-rs/package.nix index 413858aba19a69..37633ea7173f78 100644 --- a/pkgs/by-name/el/elf2uf2-rs/package.nix +++ b/pkgs/by-name/el/elf2uf2-rs/package.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { mainProgram = "elf2uf2-rs"; homepage = "https://github.com/JoNil/elf2uf2-rs"; license = with lib.licenses; [ bsd0 ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ polygon moni diff --git a/pkgs/by-name/ep/epeg/package.nix b/pkgs/by-name/ep/epeg/package.nix index de220f986f554b..a8a9c69e660259 100644 --- a/pkgs/by-name/ep/epeg/package.nix +++ b/pkgs/by-name/ep/epeg/package.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/mattes/epeg"; description = "Insanely fast JPEG/ JPG thumbnail scaling"; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; license = { url = "https://github.com/mattes/epeg#license"; }; diff --git a/pkgs/by-name/ep/epiphany/package.nix b/pkgs/by-name/ep/epiphany/package.nix index efacc873806396..23afa0e589999c 100644 --- a/pkgs/by-name/ep/epiphany/package.nix +++ b/pkgs/by-name/ep/epiphany/package.nix @@ -107,7 +107,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://apps.gnome.org/Epiphany/"; description = "WebKit based web browser for GNOME"; mainProgram = "epiphany"; - maintainers = lib.teams.gnome.members ++ teams.pantheon.members; + maintainers = lib.teams.gnome.members ++ lib.teams.pantheon.members; license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/ep/epoll-shim/package.nix b/pkgs/by-name/ep/epoll-shim/package.nix index 0327dfb23b719f..4c4b02dd88455d 100644 --- a/pkgs/by-name/ep/epoll-shim/package.nix +++ b/pkgs/by-name/ep/epoll-shim/package.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Small epoll implementation using kqueue"; homepage = "https://github.com/jiixyj/epoll-shim"; license = lib.licenses.mit; - platforms = lib.platforms.darwin ++ platforms.freebsd ++ platforms.netbsd ++ platforms.openbsd; + platforms = lib.platforms.darwin ++ lib.platforms.freebsd ++ lib.platforms.netbsd ++ lib.platforms.openbsd; maintainers = with lib.maintainers; [ wegank ]; }; }) diff --git a/pkgs/by-name/er/erofs-utils/package.nix b/pkgs/by-name/er/erofs-utils/package.nix index 14340fdcac1c82..2a2be65ccf49aa 100644 --- a/pkgs/by-name/er/erofs-utils/package.nix +++ b/pkgs/by-name/er/erofs-utils/package.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/about/"; description = "Userspace utilities for linux-erofs file system"; - changelog = "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/tree/ChangeLog?h=v${version}"; + changelog = "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/tree/ChangeLog?h=v${finalAttrs.version}"; license = with lib.licenses; [ gpl2Plus ]; maintainers = with lib.maintainers; [ ehmry diff --git a/pkgs/by-name/es/esptool/package.nix b/pkgs/by-name/es/esptool/package.nix index a797c7746f6c28..b46f280cc4b6ec 100644 --- a/pkgs/by-name/es/esptool/package.nix +++ b/pkgs/by-name/es/esptool/package.nix @@ -76,7 +76,7 @@ python3Packages.buildPythonApplication rec { homepage = "https://github.com/espressif/esptool"; license = lib.licenses.gpl2Plus; maintainers = - with maintainers; + with lib.maintainers; [ dezgeg dotlambda diff --git a/pkgs/by-name/et/eternal-terminal/package.nix b/pkgs/by-name/et/eternal-terminal/package.nix index 33c721ff4abbf8..e3229eebd90bc6 100644 --- a/pkgs/by-name/et/eternal-terminal/package.nix +++ b/pkgs/by-name/et/eternal-terminal/package.nix @@ -9,7 +9,6 @@ protobuf, zlib, catch2, - darwin, }: stdenv.mkDerivation rec { @@ -61,6 +60,6 @@ stdenv.mkDerivation rec { dezgeg jshort ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/ev/evince/package.nix b/pkgs/by-name/ev/evince/package.nix index 5215a3ccd56661..eb586899130794 100644 --- a/pkgs/by-name/ev/evince/package.nix +++ b/pkgs/by-name/ev/evince/package.nix @@ -151,6 +151,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; mainProgram = "evince"; - maintainers = lib.teams.gnome.members ++ teams.pantheon.members; + maintainers = lib.teams.gnome.members ++ lib.teams.pantheon.members; }; }) diff --git a/pkgs/by-name/ev/evmdis/package.nix b/pkgs/by-name/ev/evmdis/package.nix index e085969eaa23e5..3d212c9a37437e 100644 --- a/pkgs/by-name/ev/evmdis/package.nix +++ b/pkgs/by-name/ev/evmdis/package.nix @@ -27,7 +27,7 @@ buildGoModule { homepage = "https://github.com/Arachnid/evmdis"; description = "Ethereum EVM disassembler"; mainProgram = "evmdis"; - license = [ licenses.asl20 ]; + license = [ lib.licenses.asl20 ]; maintainers = with lib.maintainers; [ asymmetric ]; }; } diff --git a/pkgs/by-name/ex/exempi/package.nix b/pkgs/by-name/ex/exempi/package.nix index a616bfcfc57859..4f251986ccf745 100644 --- a/pkgs/by-name/ex/exempi/package.nix +++ b/pkgs/by-name/ex/exempi/package.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { description = "Implementation of XMP (Adobe's Extensible Metadata Platform)"; mainProgram = "exempi"; homepage = "https://libopenraw.freedesktop.org/exempi/"; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; license = lib.licenses.bsd3; }; } diff --git a/pkgs/by-name/ex/exercism/package.nix b/pkgs/by-name/ex/exercism/package.nix index b06b527e8c2f3d..18f3c0e8577463 100644 --- a/pkgs/by-name/ex/exercism/package.nix +++ b/pkgs/by-name/ex/exercism/package.nix @@ -38,9 +38,9 @@ buildGoModule rec { inherit (src.meta) homepage; description = "Go based command line tool for exercism.io"; license = lib.licenses.mit; - maintainers = [ - maintainers.rbasso - maintainers.nobbz + maintainers = with lib.maintainers; [ + rbasso + nobbz ]; mainProgram = "exercism"; }; diff --git a/pkgs/by-name/ez/eza/package.nix b/pkgs/by-name/ez/eza/package.nix index 434ddbcd0faaa2..0abd7005095d01 100644 --- a/pkgs/by-name/ez/eza/package.nix +++ b/pkgs/by-name/ez/eza/package.nix @@ -77,6 +77,6 @@ rustPlatform.buildRustPackage rec { _9glenda sigmasquadron ]; - platforms = lib.platforms.unix ++ platforms.windows; + platforms = lib.platforms.unix ++ lib.platforms.windows; }; } diff --git a/pkgs/by-name/fa/fantomas/package.nix b/pkgs/by-name/fa/fantomas/package.nix index cc5c12f568bf0b..8e2c5b4336f1c7 100644 --- a/pkgs/by-name/fa/fantomas/package.nix +++ b/pkgs/by-name/fa/fantomas/package.nix @@ -10,7 +10,7 @@ buildDotnetGlobalTool { description = "F# source code formatter"; homepage = "https://github.com/fsprojects/fantomas"; license = lib.licenses.asl20; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ mikaelfangel ]; mainProgram = "fantomas"; }; diff --git a/pkgs/by-name/fa/fasthenry/package.nix b/pkgs/by-name/fa/fasthenry/package.nix index a803d2dfdd514d..94a9d7576214e0 100644 --- a/pkgs/by-name/fa/fasthenry/package.nix +++ b/pkgs/by-name/fa/fasthenry/package.nix @@ -64,6 +64,6 @@ stdenv.mkDerivation rec { homepage = "https://www.fastfieldsolvers.com/fasthenry2.htm"; license = lib.licenses.lgpl2Only; maintainers = with lib.maintainers; [ fbeffa ]; - platforms = intersectLists (platforms.linux) (platforms.x86_64 ++ platforms.x86); + platforms = lib.intersectLists (lib.platforms.linux) (lib.platforms.x86_64 ++ lib.platforms.x86); }; } diff --git a/pkgs/by-name/fe/fermyon-spin/package.nix b/pkgs/by-name/fe/fermyon-spin/package.nix index d119182ce4f3b0..4bb79375a4cb28 100644 --- a/pkgs/by-name/fe/fermyon-spin/package.nix +++ b/pkgs/by-name/fe/fermyon-spin/package.nix @@ -70,6 +70,6 @@ stdenv.mkDerivation rec { license = with lib.licenses; [ asl20 ]; mainProgram = "spin"; maintainers = with lib.maintainers; [ mglolenstine ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/ff/fftw/package.nix b/pkgs/by-name/ff/fftw/package.nix index adc317dcf97902..493f05d3071d40 100644 --- a/pkgs/by-name/ff/fftw/package.nix +++ b/pkgs/by-name/ff/fftw/package.nix @@ -100,6 +100,6 @@ stdenv.mkDerivation (finalAttrs: { ]; platforms = lib.platforms.unix; # quad-precision requires libquadmath from gfortran, but libquadmath is not supported on aarch64 - badPlatforms = lib.optionals (precision == "quad-precision") platforms.aarch64; + badPlatforms = lib.optionals (precision == "quad-precision") lib.platforms.aarch64; }; }) diff --git a/pkgs/by-name/fi/file-roller/package.nix b/pkgs/by-name/fi/file-roller/package.nix index 574a2dcc64f75d..252c56d0a69df1 100644 --- a/pkgs/by-name/fi/file-roller/package.nix +++ b/pkgs/by-name/fi/file-roller/package.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Archive manager for the GNOME desktop environment"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; - maintainers = lib.teams.gnome.members ++ teams.pantheon.members; + maintainers = lib.teams.gnome.members ++ lib.teams.pantheon.members; mainProgram = "file-roller"; }; }) diff --git a/pkgs/by-name/fl/flameshot/package.nix b/pkgs/by-name/fl/flameshot/package.nix index a16dc49e413b4f..3a309603c05a62 100644 --- a/pkgs/by-name/fl/flameshot/package.nix +++ b/pkgs/by-name/fl/flameshot/package.nix @@ -131,6 +131,6 @@ stdenv'.mkDerivation { oxalica ]; license = lib.licenses.gpl3Plus; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/fl/flatcc/package.nix b/pkgs/by-name/fl/flatcc/package.nix index e163a44fa266e9..793af39a196d86 100644 --- a/pkgs/by-name/fl/flatcc/package.nix +++ b/pkgs/by-name/fl/flatcc/package.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { description = "FlatBuffers Compiler and Library in C for C"; mainProgram = "flatcc"; homepage = "https://github.com/dvidelabs/flatcc"; - license = [ licenses.asl20 ]; + license = [ lib.licenses.asl20 ]; maintainers = with lib.maintainers; [ onny ]; }; } diff --git a/pkgs/by-name/fl/flottbot/package.nix b/pkgs/by-name/fl/flottbot/package.nix index 65b0b8fbe6d325..aa3e185412d1d1 100644 --- a/pkgs/by-name/fl/flottbot/package.nix +++ b/pkgs/by-name/fl/flottbot/package.nix @@ -37,7 +37,7 @@ buildGoModule rec { homepage = "https://github.com/target/flottbot"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ bryanhonof ]; - sourceProvenance = [ sourceTypes.fromSource ]; + sourceProvenance = [ lib.sourceTypes.fromSource ]; mainProgram = "flottbot"; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/fl/fluffychat/package.nix b/pkgs/by-name/fl/fluffychat/package.nix index 89fbde2e2765b0..deee3577675d5a 100644 --- a/pkgs/by-name/fl/fluffychat/package.nix +++ b/pkgs/by-name/fl/fluffychat/package.nix @@ -54,7 +54,7 @@ flutter324.buildFlutterApplication ( "x86_64-linux" "aarch64-linux" ]; - sourceProvenance = [ sourceTypes.fromSource ]; + sourceProvenance = [ lib.sourceTypes.fromSource ]; inherit (olm.meta) knownVulnerabilities; }; } diff --git a/pkgs/by-name/fo/foot/package.nix b/pkgs/by-name/fo/foot/package.nix index 243fdb25484b68..2838a7c06f929d 100644 --- a/pkgs/by-name/fo/foot/package.nix +++ b/pkgs/by-name/fo/foot/package.nix @@ -222,9 +222,9 @@ stdenv.mkDerivation { changelog = "https://codeberg.org/dnkl/foot/releases/tag/${version}"; description = "Fast, lightweight and minimalistic Wayland terminal emulator"; license = lib.licenses.mit; - maintainers = [ - maintainers.sternenseemann - maintainers.abbe + maintainers = with lib.maintainers; [ + sternenseemann + abbe ]; platforms = lib.platforms.linux; mainProgram = "foot"; diff --git a/pkgs/by-name/fo/foremost/package.nix b/pkgs/by-name/fo/foremost/package.nix index 79d4ac7fb65d1a..999534a8f8660d 100644 --- a/pkgs/by-name/fo/foremost/package.nix +++ b/pkgs/by-name/fo/foremost/package.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { homepage = "https://foremost.sourceforge.net/"; license = lib.licenses.publicDomain; maintainers = [ lib.maintainers.jiegec ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; mainProgram = "foremost"; }; } diff --git a/pkgs/by-name/fo/fortune-kind/package.nix b/pkgs/by-name/fo/fortune-kind/package.nix index 58318e2656182b..f3ac180b2b3275 100644 --- a/pkgs/by-name/fo/fortune-kind/package.nix +++ b/pkgs/by-name/fo/fortune-kind/package.nix @@ -74,6 +74,6 @@ rustPlatform.buildRustPackage rec { license = lib.licenses.gpl3Only; mainProgram = "fortune-kind"; maintainers = with lib.maintainers; [ cafkafk ]; - platforms = lib.platforms.unix ++ platforms.windows; + platforms = lib.platforms.unix ++ lib.platforms.windows; }; } diff --git a/pkgs/by-name/fr/fragments/package.nix b/pkgs/by-name/fr/fragments/package.nix index a9a4f17108e94e..45afef89617535 100644 --- a/pkgs/by-name/fr/fragments/package.nix +++ b/pkgs/by-name/fr/fragments/package.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.gnome.org/World/Fragments"; description = "Easy to use BitTorrent client for the GNOME desktop environment"; maintainers = - with maintainers; + with lib.maintainers; [ emilytrau ] diff --git a/pkgs/by-name/fr/freedroidrpg/package.nix b/pkgs/by-name/fr/freedroidrpg/package.nix index 7fe57e1edb615e..51b15003984b7d 100644 --- a/pkgs/by-name/fr/freedroidrpg/package.nix +++ b/pkgs/by-name/fr/freedroidrpg/package.nix @@ -101,6 +101,6 @@ stdenv.mkDerivation { maintainers = [ ]; platforms = lib.platforms.unix; - hydraPlatforms = platforms.linux; # sdl-config times out on darwin + hydraPlatforms = lib.platforms.linux; # sdl-config times out on darwin }; } diff --git a/pkgs/by-name/fr/freefilesync/package.nix b/pkgs/by-name/fr/freefilesync/package.nix index 7741096236abef..b15e05f7aa89c5 100644 --- a/pkgs/by-name/fr/freefilesync/package.nix +++ b/pkgs/by-name/fr/freefilesync/package.nix @@ -138,11 +138,11 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Open Source File Synchronization & Backup Software"; homepage = "https://freefilesync.org"; - license = [ - licenses.gpl3Only - licenses.openssl - licenses.curl - licenses.bsd3 + license = with lib.licenses; [ + gpl3Only + openssl + curl + bsd3 ]; maintainers = with lib.maintainers; [ wegank ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/fr/frei0r/package.nix b/pkgs/by-name/fr/frei0r/package.nix index e8952ba7eceab0..ac2123e6908b77 100644 --- a/pkgs/by-name/fr/frei0r/package.nix +++ b/pkgs/by-name/fr/frei0r/package.nix @@ -49,6 +49,6 @@ stdenv.mkDerivation rec { description = "Minimalist, cross-platform, shared video plugins"; license = lib.licenses.gpl2Plus; maintainers = [ ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/fr/frink/package.nix b/pkgs/by-name/fr/frink/package.nix index ecfc1faff65fe1..d9158b4da0c4f0 100644 --- a/pkgs/by-name/fr/frink/package.nix +++ b/pkgs/by-name/fr/frink/package.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { description = "Practical calculating tool and programming language"; homepage = "https://frinklang.org/"; license = lib.licenses.unfree; - sourceProvenance = [ sourceTypes.binaryBytecode ]; + sourceProvenance = [ lib.sourceTypes.binaryBytecode ]; maintainers = [ lib.maintainers.stefanfehrenbach ]; }; diff --git a/pkgs/by-name/fr/frr/package.nix b/pkgs/by-name/fr/frr/package.nix index 101f4a3ec6b7ff..bf15c14b8971cc 100644 --- a/pkgs/by-name/fr/frr/package.nix +++ b/pkgs/by-name/fr/frr/package.nix @@ -233,7 +233,7 @@ stdenv.mkDerivation (finalAttrs: { license = with lib.licenses; [ gpl2Plus lgpl21Plus ]; maintainers = with lib.maintainers; [ woffs thillux ]; # adapt to platforms stated in http://docs.frrouting.org/en/latest/overview.html#supported-platforms - platforms = (platforms.linux ++ platforms.freebsd ++ platforms.netbsd ++ platforms.openbsd); + platforms = (lib.platforms.linux ++ lib.platforms.freebsd ++ lib.platforms.netbsd ++ lib.platforms.openbsd); }; passthru.tests = { inherit (nixosTests) frr; }; diff --git a/pkgs/by-name/ga/galen/package.nix b/pkgs/by-name/ga/galen/package.nix index e1b72956d32c69..d0a884180ec608 100644 --- a/pkgs/by-name/ga/galen/package.nix +++ b/pkgs/by-name/ga/galen/package.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.asl20; maintainers = [ ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/gb/gbenchmark/package.nix b/pkgs/by-name/gb/gbenchmark/package.nix index 49f1b682d562dc..e9afef282b7b30 100644 --- a/pkgs/by-name/gb/gbenchmark/package.nix +++ b/pkgs/by-name/gb/gbenchmark/package.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { description = "Microbenchmark support library"; homepage = "https://github.com/google/benchmark"; license = lib.licenses.asl20; - platforms = lib.platforms.linux ++ platforms.darwin ++ platforms.freebsd; + platforms = lib.platforms.linux ++ lib.platforms.darwin ++ lib.platforms.freebsd; maintainers = with lib.maintainers; [ abbradar ]; }; } diff --git a/pkgs/by-name/ge/geeqie/package.nix b/pkgs/by-name/ge/geeqie/package.nix index bab4070a3bfd58..0ecbf6bf2b14d0 100644 --- a/pkgs/by-name/ge/geeqie/package.nix +++ b/pkgs/by-name/ge/geeqie/package.nix @@ -184,6 +184,6 @@ stdenv.mkDerivation rec { pSub markus1189 ]; - platforms = lib.platforms.gnu ++ platforms.linux; + platforms = lib.platforms.gnu ++ lib.platforms.linux; }; } diff --git a/pkgs/by-name/gf/gfs2-utils/package.nix b/pkgs/by-name/gf/gfs2-utils/package.nix index 2978d4a0c152d0..cf145bb7f317f9 100644 --- a/pkgs/by-name/gf/gfs2-utils/package.nix +++ b/pkgs/by-name/gf/gfs2-utils/package.nix @@ -51,9 +51,9 @@ stdenv.mkDerivation rec { homepage = "https://pagure.io/gfs2-utils"; description = "Tools for creating, checking and working with gfs2 filesystems"; maintainers = with lib.maintainers; [ qyliss ]; - license = [ - licenses.gpl2Plus - licenses.lgpl2Plus + license = with lib.licenses; [ + gpl2Plus + lgpl2Plus ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/gi/giac/package.nix b/pkgs/by-name/gi/giac/package.nix index f40a29fd06b600..8cad735db7ad6d 100644 --- a/pkgs/by-name/gi/giac/package.nix +++ b/pkgs/by-name/gi/giac/package.nix @@ -223,7 +223,7 @@ stdenv.mkDerivation rec { 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) platforms.darwin); + platforms = lib.platforms.linux ++ (lib.optionals (!enableGUI) lib.platforms.darwin); maintainers = [ lib.maintainers.symphorien ]; }; } diff --git a/pkgs/by-name/gi/git-gr/package.nix b/pkgs/by-name/gi/git-gr/package.nix index 8e9f3689db8f8b..042483c69240a8 100644 --- a/pkgs/by-name/gi/git-gr/package.nix +++ b/pkgs/by-name/gi/git-gr/package.nix @@ -60,7 +60,7 @@ rustPlatform.buildRustPackage { homepage = "https://github.com/9999years/git-gr"; changelog = "https://github.com/9999years/git-gr/releases/tag/v${version}"; description = "Gerrit CLI client"; - license = [ licenses.mit ]; + license = [ lib.licenses.mit ]; maintainers = [ lib.maintainers._9999years ]; mainProgram = "git-gr"; }; diff --git a/pkgs/by-name/gi/git-vanity-hash/package.nix b/pkgs/by-name/gi/git-vanity-hash/package.nix index d6f66113478ed6..4decdcaba4ce4f 100644 --- a/pkgs/by-name/gi/git-vanity-hash/package.nix +++ b/pkgs/by-name/gi/git-vanity-hash/package.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage { meta = { homepage = "https://github.com/prasmussen/git-vanity-hash"; description = "Tool for creating commit hashes with a specific prefix"; - license = [ licenses.mit ]; + license = [ lib.licenses.mit ]; maintainers = [ lib.maintainers.kaction ]; mainProgram = "git-vanity-hash"; }; diff --git a/pkgs/by-name/gi/github-runner/package.nix b/pkgs/by-name/gi/github-runner/package.nix index 3b6c36b7ea0d58..b9a3ce3b1ff686 100644 --- a/pkgs/by-name/gi/github-runner/package.nix +++ b/pkgs/by-name/gi/github-runner/package.nix @@ -329,7 +329,7 @@ buildDotnetModule (finalAttrs: { }; meta = { - changelog = "https://github.com/actions/runner/releases/tag/v${version}"; + changelog = "https://github.com/actions/runner/releases/tag/v${finalAttrs.version}"; description = "Self-hosted runner for GitHub Actions"; homepage = "https://github.com/actions/runner"; license = lib.licenses.mit; diff --git a/pkgs/by-name/gi/gitlab-runner/package.nix b/pkgs/by-name/gi/gitlab-runner/package.nix index f2b3e236320041..f458bd761d0d86 100644 --- a/pkgs/by-name/gi/gitlab-runner/package.nix +++ b/pkgs/by-name/gi/gitlab-runner/package.nix @@ -69,7 +69,7 @@ buildGoModule rec { description = "GitLab Runner the continuous integration executor of GitLab"; license = lib.licenses.mit; homepage = "https://docs.gitlab.com/runner/"; - platforms = lib.platforms.unix ++ platforms.darwin; + platforms = lib.platforms.unix ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ zimbatm ] ++ teams.gitlab.members; }; } diff --git a/pkgs/by-name/gi/gitolite/package.nix b/pkgs/by-name/gi/gitolite/package.nix index 23f5ef45164577..79ec18e7499d99 100644 --- a/pkgs/by-name/gi/gitolite/package.nix +++ b/pkgs/by-name/gi/gitolite/package.nix @@ -67,10 +67,10 @@ stdenv.mkDerivation rec { homepage = "https://gitolite.com/gitolite/index.html"; license = lib.licenses.gpl2; platforms = lib.platforms.unix; - maintainers = [ - maintainers.thoughtpolice - maintainers.lassulus - maintainers.tomberek + maintainers = with lib.maintainers; [ + thoughtpolice + lassulus + tomberek ]; }; } diff --git a/pkgs/by-name/gi/gitversion/package.nix b/pkgs/by-name/gi/gitversion/package.nix index 5d5e676310cff4..308be75442bc66 100644 --- a/pkgs/by-name/gi/gitversion/package.nix +++ b/pkgs/by-name/gi/gitversion/package.nix @@ -16,7 +16,7 @@ buildDotnetGlobalTool rec { changelog = "https://github.com/GitTools/GitVersion/releases/tag/${version}"; downloadPage = "https://github.com/GitTools/GitVersion"; license = lib.licenses.mit; - platforms = lib.platforms.linux ++ platforms.windows ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.windows ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ acesyde ]; }; } diff --git a/pkgs/by-name/gl/glib/package.nix b/pkgs/by-name/gl/glib/package.nix index 86b63556e1fc3c..b4db3a13b74bf6 100644 --- a/pkgs/by-name/gl/glib/package.nix +++ b/pkgs/by-name/gl/glib/package.nix @@ -397,8 +397,8 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://gitlab.gnome.org/GNOME/glib"; license = lib.licenses.lgpl21Plus; maintainers = - teams.gnome.members - ++ (with maintainers; [ + lib.teams.gnome.members + ++ (with lib.maintainers; [ lovek323 raskin ]); @@ -407,7 +407,7 @@ stdenv.mkDerivation (finalAttrs: { "gobject-2.0" "gthread-2.0" ]; - platforms = lib.platforms.unix ++ platforms.windows; + platforms = lib.platforms.unix ++ lib.platforms.windows; longDescription = '' GLib provides the core application building blocks for libraries diff --git a/pkgs/by-name/gl/glide-media-player/package.nix b/pkgs/by-name/gl/glide-media-player/package.nix index 792cd1d6c85f03..36b5a37a552644 100644 --- a/pkgs/by-name/gl/glide-media-player/package.nix +++ b/pkgs/by-name/gl/glide-media-player/package.nix @@ -71,6 +71,6 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ aleksana ]; mainProgram = "glide"; # Required gdk4-{wayland,x11} and gstreamer-gl not available on darwin - platforms = subtractLists platforms.darwin platforms.unix; + platforms = lib.subtractLists lib.platforms.darwin lib.platforms.unix; }; } diff --git a/pkgs/by-name/gn/gnome-console/package.nix b/pkgs/by-name/gn/gnome-console/package.nix index 45d3f1a899dc87..7bd43c2dfdbbb1 100644 --- a/pkgs/by-name/gn/gnome-console/package.nix +++ b/pkgs/by-name/gn/gnome-console/package.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { description = "Simple user-friendly terminal emulator for the GNOME desktop"; homepage = "https://gitlab.gnome.org/GNOME/console"; license = lib.licenses.gpl3Plus; - maintainers = lib.teams.gnome.members ++ (with maintainers; [ zhaofengli ]); + maintainers = lib.teams.gnome.members ++ (with lib.maintainers; [ zhaofengli ]); platforms = lib.platforms.unix; mainProgram = "kgx"; }; diff --git a/pkgs/by-name/go/go-motion/package.nix b/pkgs/by-name/go/go-motion/package.nix index a3a1bfb5d3a3bb..9dea2f7ac91738 100644 --- a/pkgs/by-name/go/go-motion/package.nix +++ b/pkgs/by-name/go/go-motion/package.nix @@ -37,6 +37,6 @@ buildGoModule rec { homepage = "https://github.com/fatih/motion"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ kalbasit ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/go/go-passbolt-cli/package.nix b/pkgs/by-name/go/go-passbolt-cli/package.nix index a5ce7800bc02ac..db2e6c3a56662d 100644 --- a/pkgs/by-name/go/go-passbolt-cli/package.nix +++ b/pkgs/by-name/go/go-passbolt-cli/package.nix @@ -53,6 +53,6 @@ buildGoModule rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ pbek ]; mainProgram = "passbolt"; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/go/goaccess/package.nix b/pkgs/by-name/go/goaccess/package.nix index 4234e6a2d44acf..2a7d74867d2f2c 100644 --- a/pkgs/by-name/go/goaccess/package.nix +++ b/pkgs/by-name/go/goaccess/package.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { changelog = "https://github.com/allinurl/goaccess/raw/v${version}/ChangeLog"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ ederoyd46 ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; mainProgram = "goaccess"; }; } diff --git a/pkgs/by-name/go/goconst/package.nix b/pkgs/by-name/go/goconst/package.nix index 84618892cdf93b..1048c65c97efe6 100644 --- a/pkgs/by-name/go/goconst/package.nix +++ b/pkgs/by-name/go/goconst/package.nix @@ -30,6 +30,6 @@ buildGoModule rec { homepage = "https://github.com/jgautheron/goconst"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ kalbasit ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/go/gogetdoc/package.nix b/pkgs/by-name/go/gogetdoc/package.nix index bcee2769fdffd4..9b45540a4fabb7 100644 --- a/pkgs/by-name/go/gogetdoc/package.nix +++ b/pkgs/by-name/go/gogetdoc/package.nix @@ -27,6 +27,6 @@ buildGoModule rec { homepage = "https://github.com/zmb3/gogetdoc"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ kalbasit ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/go/google-fonts/package.nix b/pkgs/by-name/go/google-fonts/package.nix index b95ba01c4cc0f0..27b13cd5c053f1 100644 --- a/pkgs/by-name/go/google-fonts/package.nix +++ b/pkgs/by-name/go/google-fonts/package.nix @@ -80,6 +80,6 @@ stdenvNoCC.mkDerivation { platforms = lib.platforms.all; hydraPlatforms = [ ]; maintainers = with lib.maintainers; [ manveru ]; - sourceProvenance = [ sourceTypes.binaryBytecode ]; + sourceProvenance = [ lib.sourceTypes.binaryBytecode ]; }; } diff --git a/pkgs/by-name/go/goss/package.nix b/pkgs/by-name/go/goss/package.nix index 085370d9127357..cd2eaf2be2429d 100644 --- a/pkgs/by-name/go/goss/package.nix +++ b/pkgs/by-name/go/goss/package.nix @@ -67,6 +67,6 @@ buildGoModule rec { license = lib.licenses.asl20; mainProgram = "goss"; maintainers = with lib.maintainers; [ hyzual jk anthonyroussel ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/gp/gpodder/package.nix b/pkgs/by-name/gp/gpodder/package.nix index bcafe15ae1b6f2..64addb2eed4e30 100644 --- a/pkgs/by-name/gp/gpodder/package.nix +++ b/pkgs/by-name/gp/gpodder/package.nix @@ -94,7 +94,7 @@ python311Packages.buildPythonApplication rec { ''; homepage = "http://gpodder.org/"; license = lib.licenses.gpl3; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ mic92 ]; }; } diff --git a/pkgs/by-name/gr/graphene/package.nix b/pkgs/by-name/gr/graphene/package.nix index 73720d57b158d9..249d1957bf8dc3 100644 --- a/pkgs/by-name/gr/graphene/package.nix +++ b/pkgs/by-name/gr/graphene/package.nix @@ -151,7 +151,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Thin layer of graphic data types"; homepage = "https://github.com/ebassi/graphene"; license = lib.licenses.mit; - maintainers = lib.teams.gnome.members ++ (with maintainers; [ ]); + maintainers = lib.teams.gnome.members ++ (with lib.maintainers; [ ]); platforms = lib.platforms.unix; pkgConfigModules = [ "graphene-1.0" diff --git a/pkgs/by-name/gr/grass-sass/package.nix b/pkgs/by-name/gr/grass-sass/package.nix index a346db4f918bd2..1321db54b3f37a 100644 --- a/pkgs/by-name/gr/grass-sass/package.nix +++ b/pkgs/by-name/gr/grass-sass/package.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { 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 = with lib.maintainers; [ figsoda ]; diff --git a/pkgs/by-name/gr/greybird/package.nix b/pkgs/by-name/gr/greybird/package.nix index 60a26dfa960c34..0e10432ed1071c 100644 --- a/pkgs/by-name/gr/greybird/package.nix +++ b/pkgs/by-name/gr/greybird/package.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meta = { description = "Grey and blue theme from the Shimmer Project for GTK-based environments"; homepage = "https://github.com/shimmerproject/Greybird"; - license = [ licenses.gpl2Plus ]; # or alternatively: cc-by-nc-sa-30 or later + license = [ lib.licenses.gpl2Plus ]; # or alternatively: cc-by-nc-sa-30 or later platforms = lib.platforms.linux; maintainers = [ lib.maintainers.romildo ]; }; diff --git a/pkgs/by-name/gr/grpcui/package.nix b/pkgs/by-name/gr/grpcui/package.nix index 4ca0d760d02991..c072896ace0c77 100644 --- a/pkgs/by-name/gr/grpcui/package.nix +++ b/pkgs/by-name/gr/grpcui/package.nix @@ -32,7 +32,7 @@ buildGoModule rec { homepage = "https://github.com/fullstorydev/grpcui"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ pradyuman ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; mainProgram = "grpcui"; }; } diff --git a/pkgs/by-name/gr/grub2_pvgrub_image/package.nix b/pkgs/by-name/gr/grub2_pvgrub_image/package.nix index cde7687639a620..fb3f2249615c66 100644 --- a/pkgs/by-name/gr/grub2_pvgrub_image/package.nix +++ b/pkgs/by-name/gr/grub2_pvgrub_image/package.nix @@ -48,7 +48,7 @@ in Xen guests ''; - platforms = lib.platforms.gnu ++ platforms.linux; + platforms = lib.platforms.gnu ++ lib.platforms.linux; }; } ) diff --git a/pkgs/by-name/gt/gtk-doc/package.nix b/pkgs/by-name/gt/gtk-doc/package.nix index ff114d5851e3a0..c9990edc2ed9ee 100644 --- a/pkgs/by-name/gt/gtk-doc/package.nix +++ b/pkgs/by-name/gt/gtk-doc/package.nix @@ -96,6 +96,6 @@ python3.pkgs.buildPythonApplication rec { description = "Tools to extract documentation embedded in GTK and GNOME source code"; homepage = "https://gitlab.gnome.org/GNOME/gtk-doc"; license = lib.licenses.gpl2Plus; - maintainers = lib.teams.gnome.members ++ (with maintainers; [ pSub ]); + maintainers = lib.teams.gnome.members ++ (with lib.maintainers; [ pSub ]); }; } diff --git a/pkgs/by-name/gt/gtypist/package.nix b/pkgs/by-name/gt/gtypist/package.nix index 9f68be5e792907..6692690d40c87a 100644 --- a/pkgs/by-name/gt/gtypist/package.nix +++ b/pkgs/by-name/gt/gtypist/package.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { homepage = "https://www.gnu.org/software/gtypist"; description = "Universal typing tutor"; license = lib.licenses.gpl3Plus; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ pSub ]; }; } diff --git a/pkgs/by-name/gu/guake/package.nix b/pkgs/by-name/gu/guake/package.nix index 059e3b6beb27da..c9aaab7791e915 100644 --- a/pkgs/by-name/gu/guake/package.nix +++ b/pkgs/by-name/gu/guake/package.nix @@ -98,9 +98,9 @@ python311Packages.buildPythonApplication rec { description = "Drop-down terminal for GNOME"; homepage = "http://guake-project.org"; license = lib.licenses.gpl2Plus; - maintainers = [ - maintainers.msteen - maintainers.heywoodlh + maintainers = with lib.maintainers; [ + msteen + heywoodlh ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/gu/guilt/package.nix b/pkgs/by-name/gu/guilt/package.nix index ac4bf078c341f9..41dc93d5332a9b 100644 --- a/pkgs/by-name/gu/guilt/package.nix +++ b/pkgs/by-name/gu/guilt/package.nix @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/jeffpc/guilt"; maintainers = with lib.maintainers; [ javimerino ]; - license = [ licenses.gpl2 ]; + license = [ lib.licenses.gpl2 ]; platforms = lib.platforms.all; mainProgram = "guilt"; }; diff --git a/pkgs/by-name/gv/gvfs/package.nix b/pkgs/by-name/gv/gvfs/package.nix index e899ad0d21d0be..d6332cae8f74db 100644 --- a/pkgs/by-name/gv/gvfs/package.nix +++ b/pkgs/by-name/gv/gvfs/package.nix @@ -158,7 +158,7 @@ stdenv.mkDerivation (finalAttrs: { 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; maintainers = lib.teams.gnome.members; diff --git a/pkgs/by-name/ha/hamrs/package.nix b/pkgs/by-name/ha/hamrs/package.nix index 27dca5f43d6277..73cf7b772d8826 100644 --- a/pkgs/by-name/ha/hamrs/package.nix +++ b/pkgs/by-name/ha/hamrs/package.nix @@ -51,6 +51,6 @@ appimageTools.wrapType2 rec { "i686-linux" ]; mainProgram = "hamrs"; - sourceProvenance = [ sourceTypes.binaryNativeCode ]; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; }; } diff --git a/pkgs/by-name/ha/hanazono/package.nix b/pkgs/by-name/ha/hanazono/package.nix index 2993b391c5bbee..8735ecb89c6420 100644 --- a/pkgs/by-name/ha/hanazono/package.nix +++ b/pkgs/by-name/ha/hanazono/package.nix @@ -39,9 +39,9 @@ stdenvNoCC.mkDerivation rec { # Unlimited permission is granted to use, copy, and distribute it, with # or without modification, either commercially and noncommercially. # THIS FONT IS PROVIDED "AS IS" WITHOUT WARRANTY. - license = [ - licenses.ofl - licenses.free + license = with lib.licenses; [ + ofl + free ]; maintainers = with lib.maintainers; [ mathnerd314 ]; platforms = lib.platforms.all; diff --git a/pkgs/by-name/hi/hikounomizu/package.nix b/pkgs/by-name/hi/hikounomizu/package.nix index 8e77b803ca9eb1..25e9c60d51a62e 100644 --- a/pkgs/by-name/hi/hikounomizu/package.nix +++ b/pkgs/by-name/hi/hikounomizu/package.nix @@ -76,9 +76,9 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://hikounomizu.org/"; downloadPage = "https://hikounomizu.org/download.html"; maintainers = with lib.maintainers; [ fgaz ]; - license = [ - licenses.gpl3Plus - licenses.lal13 + license = with lib.licenses; [ + gpl3Plus + lal13 ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/ho/homebank/package.nix b/pkgs/by-name/ho/homebank/package.nix index c3ee2b5ef943c3..5c9290a6010152 100644 --- a/pkgs/by-name/ho/homebank/package.nix +++ b/pkgs/by-name/ho/homebank/package.nix @@ -40,6 +40,6 @@ stdenv.mkDerivation rec { pSub frlan ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/hp/hplip/package.nix b/pkgs/by-name/hp/hplip/package.nix index 9a1d505c0c6ed5..683d0a6065f9fd 100644 --- a/pkgs/by-name/hp/hplip/package.nix +++ b/pkgs/by-name/hp/hplip/package.nix @@ -340,9 +340,9 @@ python311Packages.buildPythonApplication { downloadPage = "https://sourceforge.net/projects/hplip/files/hplip/"; license = if withPlugin then - licenses.unfree + lib.licenses.unfree else - with licenses; + with lib.licenses; [ mit bsd2 diff --git a/pkgs/by-name/ib/ibm-sw-tpm2/package.nix b/pkgs/by-name/ib/ibm-sw-tpm2/package.nix index 5ed1706a459e4d..a5132d6f7c3c2c 100644 --- a/pkgs/by-name/ib/ibm-sw-tpm2/package.nix +++ b/pkgs/by-name/ib/ibm-sw-tpm2/package.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { description = "IBM's Software TPM 2.0, an implementation of the TCG TPM 2.0 specification"; mainProgram = "tpm_server"; homepage = "https://sourceforge.net/projects/ibmswtpm2/"; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ tomfitzhenry ]; license = lib.licenses.bsd3; }; diff --git a/pkgs/by-name/ik/ikill/package.nix b/pkgs/by-name/ik/ikill/package.nix index 0e9a58bf2089d8..6620d45a06fc23 100644 --- a/pkgs/by-name/ik/ikill/package.nix +++ b/pkgs/by-name/ik/ikill/package.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { description = "Interactively kill running processes"; homepage = "https://github.com/pjmp/ikill"; maintainers = with lib.maintainers; [ zendo ]; - license = [ licenses.mit ]; + license = [ lib.licenses.mit ]; platforms = lib.platforms.linux; mainProgram = "ikill"; }; diff --git a/pkgs/by-name/in/ink/package.nix b/pkgs/by-name/in/ink/package.nix index 3d36b1002c4b61..dd63340c1decd1 100644 --- a/pkgs/by-name/in/ink/package.nix +++ b/pkgs/by-name/in/ink/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://ink.sourceforge.net/"; license = lib.licenses.gpl2Only; - platforms = lib.platforms.linux ++ platforms.freebsd; + platforms = lib.platforms.linux ++ lib.platforms.freebsd; maintainers = with lib.maintainers; [ samb96 ]; mainProgram = "ink"; }; diff --git a/pkgs/by-name/is/isabelle/package.nix b/pkgs/by-name/is/isabelle/package.nix index 77816ea657fb17..1f2a1e90ab066a 100644 --- a/pkgs/by-name/is/isabelle/package.nix +++ b/pkgs/by-name/is/isabelle/package.nix @@ -217,7 +217,7 @@ in stdenv.mkDerivation (finalAttrs: rec { binaryNativeCode # source bundles binary dependencies ]; license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.jwiegley maintainers.jvanbruegge ]; + maintainers = [ lib.maintainers.jwiegley lib.maintainers.jvanbruegge ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/is/iso-flags/package.nix b/pkgs/by-name/is/iso-flags/package.nix index 96e64a6ee1c4ef..20f49ca0e3c4fd 100644 --- a/pkgs/by-name/is/iso-flags/package.nix +++ b/pkgs/by-name/is/iso-flags/package.nix @@ -45,7 +45,7 @@ stdenvNoCC.mkDerivation { meta = { homepage = "https://github.com/joielechong/iso-country-flags-svg-collection"; description = "248 country flag SVG & PNG icons with different icon styles"; - license = [ licenses.publicDomain ]; + license = [ lib.licenses.publicDomain ]; platforms = lib.platforms.linux; # the output assets should work anywhere, but unsure about the tools to build them... maintainers = [ lib.maintainers.mkg20001 ]; }; diff --git a/pkgs/by-name/it/iterm2/package.nix b/pkgs/by-name/it/iterm2/package.nix index c3ee96aa6ac775..a230398447e141 100644 --- a/pkgs/by-name/it/iterm2/package.nix +++ b/pkgs/by-name/it/iterm2/package.nix @@ -53,6 +53,6 @@ stdenvNoCC.mkDerivation rec { "x86_64-darwin" "aarch64-darwin" ]; - sourceProvenance = [ sourceTypes.binaryNativeCode ]; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; }; } diff --git a/pkgs/by-name/ja/jay/package.nix b/pkgs/by-name/ja/jay/package.nix index 7973ffdd47846c..2894134a3589f2 100644 --- a/pkgs/by-name/ja/jay/package.nix +++ b/pkgs/by-name/ja/jay/package.nix @@ -56,7 +56,7 @@ rustPlatform.buildRustPackage rec { description = "Wayland compositor written in Rust"; homepage = "https://github.com/mahkoh/jay"; license = lib.licenses.gpl3; - platforms = platforms.linux; + platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ dit7ya ]; mainProgram = "jay"; }; diff --git a/pkgs/by-name/ji/jitsi-meet-electron/package.nix b/pkgs/by-name/ji/jitsi-meet-electron/package.nix index f76b47a21b7799..f0a02d0e2801df 100644 --- a/pkgs/by-name/ji/jitsi-meet-electron/package.nix +++ b/pkgs/by-name/ji/jitsi-meet-electron/package.nix @@ -141,7 +141,7 @@ buildNpmPackage rec { homepage = "https://github.com/jitsi/jitsi-meet-electron"; license = lib.licenses.asl20; mainProgram = "jitsi-meet-electron"; - maintainers = lib.teams.jitsi.members ++ [ maintainers.tomasajt ]; + maintainers = lib.teams.jitsi.members ++ [ lib.maintainers.tomasajt ]; inherit (electron.meta) platforms; }; } diff --git a/pkgs/by-name/ji/jitterentropy-rngd/package.nix b/pkgs/by-name/ji/jitterentropy-rngd/package.nix index cac0794b7bd83d..82a2d8b2a50dcf 100644 --- a/pkgs/by-name/ji/jitterentropy-rngd/package.nix +++ b/pkgs/by-name/ji/jitterentropy-rngd/package.nix @@ -30,9 +30,9 @@ stdenv.mkDerivation rec { description = ''A random number generator, which injects entropy to the kernel''; homepage = "https://github.com/smuellerDD/jitterentropy-rngd"; changelog = "https://github.com/smuellerDD/jitterentropy-rngd/releases/tag/v${version}"; - license = [ - licenses.gpl2Only - licenses.bsd3 + license = with lib.licenses; [ + gpl2Only + bsd3 ]; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ thillux ]; diff --git a/pkgs/by-name/jn/jna/package.nix b/pkgs/by-name/jn/jna/package.nix index 9f05e91a57de47..cece5b984f7a52 100644 --- a/pkgs/by-name/jn/jna/package.nix +++ b/pkgs/by-name/jn/jna/package.nix @@ -46,6 +46,6 @@ stdenv.mkDerivation (finalAttrs: { asl20 ]; maintainers = with lib.maintainers; [ nagy ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; }) diff --git a/pkgs/by-name/jo/john/package.nix b/pkgs/by-name/jo/john/package.nix index f3fce308d6cab2..8446fba7ee15d3 100644 --- a/pkgs/by-name/jo/john/package.nix +++ b/pkgs/by-name/jo/john/package.nix @@ -23,7 +23,7 @@ makeWrapper, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "john"; version = "rolling-2404"; @@ -133,7 +133,7 @@ stdenv.mkDerivation rec { meta = { description = "John the Ripper password cracker"; - license = [ licenses.gpl2Plus ] ++ lib.optionals enableUnfree [ licenses.unfreeRedistributable ]; + license = [ lib.licenses.gpl2Plus ] ++ lib.optionals enableUnfree [ lib.licenses.unfreeRedistributable ]; homepage = "https://github.com/openwall/john/"; maintainers = with lib.maintainers; [ offline diff --git a/pkgs/by-name/jo/joypixels/package.nix b/pkgs/by-name/jo/joypixels/package.nix index 5ae51d2829674b..b8c15b6675d65c 100644 --- a/pkgs/by-name/jo/joypixels/package.nix +++ b/pkgs/by-name/jo/joypixels/package.nix @@ -17,13 +17,13 @@ let fontFile = "JoyPixels-SBIX.ttf"; }; } - .${kernel.name} or rec { + .${kernel.name} or { systemTag = "nixos"; capitalized = "NixOS"; fontFile = "joypixels-android.ttf"; }; - joypixels-free-license = with systemSpecific; { + joypixels-free-license = { spdxId = "LicenseRef-JoyPixels-Free"; fullName = "JoyPixels Free License Agreement"; url = "https://cdn.joypixels.com/free-license.pdf"; @@ -122,6 +122,6 @@ stdenv.mkDerivation rec { ]; # Not quite accurate since it's a font, not a program, but clearly # indicates we're not actually building it from source. - sourceProvenance = [ sourceTypes.binaryNativeCode ]; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; }; } diff --git a/pkgs/by-name/jx/jx/package.nix b/pkgs/by-name/jx/jx/package.nix index 9225493add9bf2..db419ad834e96e 100644 --- a/pkgs/by-name/jx/jx/package.nix +++ b/pkgs/by-name/jx/jx/package.nix @@ -45,6 +45,6 @@ buildGoModule rec { ''; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ kalbasit ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/k3/k3d/package.nix b/pkgs/by-name/k3/k3d/package.nix index 69012d1ba1300f..46cf2c9c6b166a 100644 --- a/pkgs/by-name/k3/k3d/package.nix +++ b/pkgs/by-name/k3/k3d/package.nix @@ -71,6 +71,6 @@ buildGoModule rec { ''; license = lib.licenses.mit; maintainers = with lib.maintainers; [ kuznero jlesquembre ngerstle jk ricochet ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/ka/kalibrate-rtl/package.nix b/pkgs/by-name/ka/kalibrate-rtl/package.nix index 5d21946261dd38..9410e279b9d610 100644 --- a/pkgs/by-name/ka/kalibrate-rtl/package.nix +++ b/pkgs/by-name/ka/kalibrate-rtl/package.nix @@ -47,6 +47,6 @@ stdenv.mkDerivation { viraptor ]; mainProgram = "kal"; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/ka/kanji-stroke-order-font/package.nix b/pkgs/by-name/ka/kanji-stroke-order-font/package.nix index 7bd5f199ead710..316c2436e333ca 100644 --- a/pkgs/by-name/ka/kanji-stroke-order-font/package.nix +++ b/pkgs/by-name/ka/kanji-stroke-order-font/package.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { description = "Font containing stroke order diagrams for over 6500 kanji, 180 kana and other characters"; homepage = "https://www.nihilist.org.uk/"; - license = [ licenses.bsd3 ]; + license = [ lib.licenses.bsd3 ]; maintainers = with lib.maintainers; [ ptrhlm stephen-huan diff --git a/pkgs/by-name/kc/kcat/package.nix b/pkgs/by-name/kc/kcat/package.nix index 59ffb6d0d9e2ad..b01def6c0f97c7 100644 --- a/pkgs/by-name/kc/kcat/package.nix +++ b/pkgs/by-name/kc/kcat/package.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { mainProgram = "kcat"; homepage = "https://github.com/edenhill/kcat"; license = lib.licenses.bsd2; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ nyarly ]; }; } diff --git a/pkgs/by-name/kc/kclvm/package.nix b/pkgs/by-name/kc/kclvm/package.nix index b33f245bce4c10..8e91eae9beae8f 100644 --- a/pkgs/by-name/kc/kclvm/package.nix +++ b/pkgs/by-name/kc/kclvm/package.nix @@ -54,7 +54,7 @@ rustPlatform.buildRustPackage rec { description = "A high-performance implementation of KCL written in Rust that uses LLVM as the compiler backend"; homepage = "https://github.com/kcl-lang/kcl"; license = lib.licenses.asl20; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ selfuryon peefy diff --git a/pkgs/by-name/kc/kclvm_cli/package.nix b/pkgs/by-name/kc/kclvm_cli/package.nix index 6bf985d9bc5d86..cca837641c8693 100644 --- a/pkgs/by-name/kc/kclvm_cli/package.nix +++ b/pkgs/by-name/kc/kclvm_cli/package.nix @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec { description = "A high-performance implementation of KCL written in Rust that uses LLVM as the compiler backend"; homepage = "https://github.com/kcl-lang/kcl"; license = lib.licenses.asl20; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ selfuryon peefy diff --git a/pkgs/by-name/ko/kolla/package.nix b/pkgs/by-name/ko/kolla/package.nix index 00c55a8adaf793..8c46011bb1291b 100644 --- a/pkgs/by-name/ko/kolla/package.nix +++ b/pkgs/by-name/ko/kolla/package.nix @@ -73,6 +73,6 @@ pythonPackages.buildPythonApplication rec { mainProgram = "kolla-build"; homepage = "https://opendev.org/openstack/kolla"; license = lib.licenses.asl20; - maintainers = lib.teams.openstack.members ++ [ maintainers.astro ]; + maintainers = lib.teams.openstack.members ++ [ lib.maintainers.astro ]; }; } diff --git a/pkgs/by-name/ks/kstart/package.nix b/pkgs/by-name/ks/kstart/package.nix index 793b0da7a327a7..c00a33ba954615 100644 --- a/pkgs/by-name/ks/kstart/package.nix +++ b/pkgs/by-name/ks/kstart/package.nix @@ -61,6 +61,6 @@ stdenv.mkDerivation (finalAttrs: { ]; description = "Modified version of kerberos tools that support automatic ticket refresh"; license = lib.licenses.mit; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; }) diff --git a/pkgs/by-name/le/lensfun/package.nix b/pkgs/by-name/le/lensfun/package.nix index 5a7dd5c539f2b2..9063d767e68d42 100644 --- a/pkgs/by-name/le/lensfun/package.nix +++ b/pkgs/by-name/le/lensfun/package.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation { cmakeFlags = [ "-DINSTALL_HELPER_SCRIPTS=OFF" ]; meta = { - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ flokli paperdigits diff --git a/pkgs/by-name/li/lib2geom/package.nix b/pkgs/by-name/li/lib2geom/package.nix index 7f64972384aec6..11717e79fb81ed 100644 --- a/pkgs/by-name/li/lib2geom/package.nix +++ b/pkgs/by-name/li/lib2geom/package.nix @@ -103,9 +103,9 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Easy to use 2D geometry library in C++"; homepage = "https://gitlab.com/inkscape/lib2geom"; - license = [ - licenses.lgpl21Only - licenses.mpl11 + license = with lib.licenses; [ + lgpl21Only + mpl11 ]; maintainers = with lib.maintainers; [ jtojnar ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/li/libGDSII/package.nix b/pkgs/by-name/li/libGDSII/package.nix index cae8de3dae3df8..97cacb2160142a 100644 --- a/pkgs/by-name/li/libGDSII/package.nix +++ b/pkgs/by-name/li/libGDSII/package.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { description = "Library and command-line utility for reading GDSII geometry files"; mainProgram = "GDSIIConvert"; homepage = "https://github.com/HomerReid/libGDSII"; - license = [ licenses.gpl2Only ]; + license = [ lib.licenses.gpl2Only ]; maintainers = with lib.maintainers; [ sheepforce markuskowa diff --git a/pkgs/by-name/li/libad9361/package.nix b/pkgs/by-name/li/libad9361/package.nix index 243a24d6572794..6ddb6f3b25f618 100644 --- a/pkgs/by-name/li/libad9361/package.nix +++ b/pkgs/by-name/li/libad9361/package.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { homepage = "http://analogdevicesinc.github.io/libad9361-iio/"; license = lib.licenses.lgpl21Plus; maintainers = with lib.maintainers; [ sikmir ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/li/libamplsolver/package.nix b/pkgs/by-name/li/libamplsolver/package.nix index 2dbaabf9241798..096d6b82b12e5b 100644 --- a/pkgs/by-name/li/libamplsolver/package.nix +++ b/pkgs/by-name/li/libamplsolver/package.nix @@ -5,7 +5,7 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libamplsolver"; version = "20211109"; @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { meta = { description = "Library of routines that help solvers work with AMPL"; homepage = "https://ampl.com/netlib/ampl/"; - license = [ licenses.mit ]; + license = [ lib.licenses.mit ]; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ aanderse ]; # generates header at compile time diff --git a/pkgs/by-name/li/libass/package.nix b/pkgs/by-name/li/libass/package.nix index e3f0ae7e2bc795..f752a012e22e16 100644 --- a/pkgs/by-name/li/libass/package.nix +++ b/pkgs/by-name/li/libass/package.nix @@ -40,8 +40,8 @@ stdenv.mkDerivation rec { meta = { description = "Portable ASS/SSA subtitle renderer"; homepage = "https://github.com/libass/libass"; - license = licenses.isc; - platforms = platforms.unix; + license = lib.licenses.isc; + platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ codyopel ]; }; } diff --git a/pkgs/by-name/li/libayatana-appindicator/package.nix b/pkgs/by-name/li/libayatana-appindicator/package.nix index 7b59b078790a51..79cdcc4f50474f 100644 --- a/pkgs/by-name/li/libayatana-appindicator/package.nix +++ b/pkgs/by-name/li/libayatana-appindicator/package.nix @@ -51,9 +51,9 @@ stdenv.mkDerivation rec { description = "Ayatana Application Indicators Shared Library"; homepage = "https://github.com/AyatanaIndicators/libayatana-appindicator"; changelog = "https://github.com/AyatanaIndicators/libayatana-appindicator/blob/${version}/ChangeLog"; - license = [ - licenses.lgpl3Plus - licenses.lgpl21Plus + license = with lib.licenses; [ + lgpl3Plus + lgpl21Plus ]; maintainers = [ lib.maintainers.nickhu ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/li/libchamplain/package.nix b/pkgs/by-name/li/libchamplain/package.nix index 5289d8ca9b03e9..3ca5d23a271bd9 100644 --- a/pkgs/by-name/li/libchamplain/package.nix +++ b/pkgs/by-name/li/libchamplain/package.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { OpenCycleMap, OpenAerialMap, and Maps for free. ''; - maintainers = lib.teams.gnome.members ++ teams.pantheon.members; + maintainers = lib.teams.gnome.members ++ lib.teams.pantheon.members; platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/li/libchop/package.nix b/pkgs/by-name/li/libchop/package.nix index fca4eafff4ecc3..69dffdb32b4ca8 100644 --- a/pkgs/by-name/li/libchop/package.nix +++ b/pkgs/by-name/li/libchop/package.nix @@ -83,6 +83,6 @@ stdenv.mkDerivation rec { homepage = "https://www.nongnu.org/libchop/"; license = lib.licenses.gpl3Plus; maintainers = [ ]; - platforms = lib.platforms.gnu ++ platforms.linux; + platforms = lib.platforms.gnu ++ lib.platforms.linux; }; } diff --git a/pkgs/by-name/li/libcollectdclient/package.nix b/pkgs/by-name/li/libcollectdclient/package.nix index c2dbe84fbbcdb8..d50620e4256ca9 100644 --- a/pkgs/by-name/li/libcollectdclient/package.nix +++ b/pkgs/by-name/li/libcollectdclient/package.nix @@ -17,9 +17,9 @@ collectd.overrideAttrs (oldAttrs: { homepage = "http://collectd.org"; license = lib.licenses.gpl2; platforms = lib.platforms.linux; # TODO: collectd may be linux but the C client may be more portable? - maintainers = [ - maintainers.sheenobu - maintainers.bjornfor + maintainers = with lib.maintainers; [ + sheenobu + bjornfor ]; }; }) diff --git a/pkgs/by-name/li/libconfuse/package.nix b/pkgs/by-name/li/libconfuse/package.nix index 6a9a26cd246d1a..4780f7e4d337ac 100644 --- a/pkgs/by-name/li/libconfuse/package.nix +++ b/pkgs/by-name/li/libconfuse/package.nix @@ -61,6 +61,6 @@ stdenv.mkDerivation rec { quick to integrate with your code. ''; license = lib.licenses.isc; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/li/libdatachannel/package.nix b/pkgs/by-name/li/libdatachannel/package.nix index 7e8ac48220a873..5a37ddf03160ac 100644 --- a/pkgs/by-name/li/libdatachannel/package.nix +++ b/pkgs/by-name/li/libdatachannel/package.nix @@ -61,6 +61,6 @@ stdenv.mkDerivation rec { homepage = "https://libdatachannel.org/"; license = with lib.licenses; [ mpl20 ]; maintainers = with lib.maintainers; [ erdnaxe ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/li/libdex/package.nix b/pkgs/by-name/li/libdex/package.nix index f8ca2957d6d4b7..b8c828c79ac241 100644 --- a/pkgs/by-name/li/libdex/package.nix +++ b/pkgs/by-name/li/libdex/package.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Library supporting deferred execution for GNOME and GTK"; homepage = "https://gitlab.gnome.org/GNOME/libdex"; maintainers = lib.teams.gnome.members; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; license = lib.licenses.lgpl21Plus; }; }) diff --git a/pkgs/by-name/li/libdrm/package.nix b/pkgs/by-name/li/libdrm/package.nix index 05297a033b8d37..2fab99facfd462 100644 --- a/pkgs/by-name/li/libdrm/package.nix +++ b/pkgs/by-name/li/libdrm/package.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { the Mesa drivers, the X drivers, libva and similar projects. ''; license = lib.licenses.mit; - platforms = lib.subtractLists platforms.darwin platforms.unix; + platforms = lib.subtractLists lib.platforms.darwin lib.platforms.unix; maintainers = with lib.maintainers; [ primeos ]; }; } diff --git a/pkgs/by-name/li/libfixposix/package.nix b/pkgs/by-name/li/libfixposix/package.nix index f802e2b88f29fd..ec6a2ffb8dab78 100644 --- a/pkgs/by-name/li/libfixposix/package.nix +++ b/pkgs/by-name/li/libfixposix/package.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { orivej raskin ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/li/libfm/package.nix b/pkgs/by-name/li/libfm/package.nix index 385eee4ec8aaf7..46b9dfcc4c029e 100644 --- a/pkgs/by-name/li/libfm/package.nix +++ b/pkgs/by-name/li/libfm/package.nix @@ -65,6 +65,6 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl21Plus; description = "Glib-based library for file management"; maintainers = [ lib.maintainers.ttuegel ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/li/libhugetlbfs/package.nix b/pkgs/by-name/li/libhugetlbfs/package.nix index ff437f6032d409..348a33c81add0c 100644 --- a/pkgs/by-name/li/libhugetlbfs/package.nix +++ b/pkgs/by-name/li/libhugetlbfs/package.nix @@ -64,9 +64,9 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ qyliss ]; license = lib.licenses.lgpl21Plus; platforms = lib.platforms.linux; - badPlatforms = flatten [ - systems.inspect.platformPatterns.isStatic - systems.inspect.patterns.isMusl + badPlatforms = lib.flatten [ + lib.systems.inspect.platformPatterns.isStatic + lib.systems.inspect.patterns.isMusl ]; }; } diff --git a/pkgs/by-name/li/libinklevel/package.nix b/pkgs/by-name/li/libinklevel/package.nix index deac1cb3693d07..16f8ab9d5259c0 100644 --- a/pkgs/by-name/li/libinklevel/package.nix +++ b/pkgs/by-name/li/libinklevel/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://libinklevel.sourceforge.net/"; license = lib.licenses.gpl2; - platforms = lib.platforms.linux ++ platforms.freebsd; + platforms = lib.platforms.linux ++ lib.platforms.freebsd; maintainers = with lib.maintainers; [ samb96 ]; }; } diff --git a/pkgs/by-name/li/libmemcached/package.nix b/pkgs/by-name/li/libmemcached/package.nix index 2cdac84ab00685..507816afab6b48 100644 --- a/pkgs/by-name/li/libmemcached/package.nix +++ b/pkgs/by-name/li/libmemcached/package.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { homepage = "https://libmemcached.org"; description = "Open source C/C++ client library and tools for the memcached server"; license = lib.licenses.bsd3; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/li/libmng/package.nix b/pkgs/by-name/li/libmng/package.nix index 3bbf990b4a708d..f8f9b87080feaf 100644 --- a/pkgs/by-name/li/libmng/package.nix +++ b/pkgs/by-name/li/libmng/package.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { homepage = "http://www.libmng.com"; license = lib.licenses.zlib; maintainers = with lib.maintainers; [ marcweber ]; - platforms = lib.platforms.unix ++ platforms.windows; + platforms = lib.platforms.unix ++ lib.platforms.windows; }; } diff --git a/pkgs/by-name/li/libmodulemd/package.nix b/pkgs/by-name/li/libmodulemd/package.nix index 336e6715f7cf1c..9cec43d2a7556b 100644 --- a/pkgs/by-name/li/libmodulemd/package.nix +++ b/pkgs/by-name/li/libmodulemd/package.nix @@ -94,6 +94,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/fedora-modularity/libmodulemd"; license = lib.licenses.mit; maintainers = [ ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/li/libmpack/package.nix b/pkgs/by-name/li/libmpack/package.nix index 762856c3e30948..c852ac0736a955 100644 --- a/pkgs/by-name/li/libmpack/package.nix +++ b/pkgs/by-name/li/libmpack/package.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/tarruda/libmpack/"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ lovek323 ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/li/libpfm/package.nix b/pkgs/by-name/li/libpfm/package.nix index 61f76c4b6217ae..00731b43913682 100644 --- a/pkgs/by-name/li/libpfm/package.nix +++ b/pkgs/by-name/li/libpfm/package.nix @@ -51,6 +51,6 @@ stdenv.mkDerivation (finalAttrs: { pierron t4ccer ]; - platforms = lib.platforms.linux ++ platforms.windows; + platforms = lib.platforms.linux ++ lib.platforms.windows; }; }) diff --git a/pkgs/by-name/li/libpsl/package.nix b/pkgs/by-name/li/libpsl/package.nix index b86607f8a3ed89..7e27206543575f 100644 --- a/pkgs/by-name/li/libpsl/package.nix +++ b/pkgs/by-name/li/libpsl/package.nix @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.c0bw3b ]; mainProgram = "psl"; - platforms = lib.platforms.unix ++ platforms.windows; + platforms = lib.platforms.unix ++ lib.platforms.windows; pkgConfigModules = [ "libpsl" ]; }; } diff --git a/pkgs/by-name/li/libreswan/package.nix b/pkgs/by-name/li/libreswan/package.nix index 729a9f7be9c0fb..2dcc8294c79f29 100644 --- a/pkgs/by-name/li/libreswan/package.nix +++ b/pkgs/by-name/li/libreswan/package.nix @@ -16,7 +16,6 @@ curl, nspr, bash, - runtimeShell, iproute2, iptables, procps, @@ -127,7 +126,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://libreswan.org"; description = "Free software implementation of the VPN protocol based on IPSec and the Internet Key Exchange"; - platforms = lib.platforms.linux ++ platforms.freebsd; + platforms = lib.platforms.linux ++ lib.platforms.freebsd; license = with lib.licenses; [ gpl2Plus mpl20 diff --git a/pkgs/by-name/li/librime/package.nix b/pkgs/by-name/li/librime/package.nix index e3d97971f6fe4e..5ccd883af0b7c4 100644 --- a/pkgs/by-name/li/librime/package.nix +++ b/pkgs/by-name/li/librime/package.nix @@ -62,6 +62,6 @@ stdenv.mkDerivation rec { description = "Rime Input Method Engine, the core library"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ vonfry ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/li/libserialport/package.nix b/pkgs/by-name/li/libserialport/package.nix index 984864288f0b67..e7279b2814fd21 100644 --- a/pkgs/by-name/li/libserialport/package.nix +++ b/pkgs/by-name/li/libserialport/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { description = "Cross-platform shared library for serial port access"; homepage = "https://sigrok.org/"; license = lib.licenses.gpl3Plus; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = [ lib.maintainers.bjornfor ]; }; } diff --git a/pkgs/by-name/li/libsigrokdecode/package.nix b/pkgs/by-name/li/libsigrokdecode/package.nix index e3c22f08a43e83..aac1bdfa8ec028 100644 --- a/pkgs/by-name/li/libsigrokdecode/package.nix +++ b/pkgs/by-name/li/libsigrokdecode/package.nix @@ -10,7 +10,7 @@ libxcrypt, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libsigrokdecode"; version = "0.5.3-unstable-2024-10-01"; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { description = "Protocol decoding library for the sigrok signal analysis software suite"; homepage = "https://sigrok.org/"; license = lib.licenses.gpl3Plus; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ bjornfor vifino diff --git a/pkgs/by-name/li/libsolv/package.nix b/pkgs/by-name/li/libsolv/package.nix index 0b13062460347c..3b1b8919408ab8 100644 --- a/pkgs/by-name/li/libsolv/package.nix +++ b/pkgs/by-name/li/libsolv/package.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { description = "Free package dependency solver"; homepage = "https://github.com/openSUSE/libsolv"; license = lib.licenses.bsd3; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ copumpkin ]; }; } diff --git a/pkgs/by-name/li/libsystemtap/package.nix b/pkgs/by-name/li/libsystemtap/package.nix index c3323dcc98bcab..f58a1427a0ee4f 100644 --- a/pkgs/by-name/li/libsystemtap/package.nix +++ b/pkgs/by-name/li/libsystemtap/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { description = "Statically defined probes development files"; homepage = "https://sourceware.org/systemtap/"; license = lib.licenses.bsd3; - platforms = elfutils.meta.platforms or platforms.unix; + platforms = elfutils.meta.platforms or lib.platforms.unix; badPlatforms = elfutils.meta.badPlatforms or [ ]; maintainers = [ lib.maintainers.farlion ]; }; diff --git a/pkgs/by-name/li/libtiff/package.nix b/pkgs/by-name/li/libtiff/package.nix index 3c9d0e9c83eb21..a6d973b8593b42 100644 --- a/pkgs/by-name/li/libtiff/package.nix +++ b/pkgs/by-name/li/libtiff/package.nix @@ -121,7 +121,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://libtiff.gitlab.io/libtiff"; changelog = "https://libtiff.gitlab.io/libtiff/releases/v${finalAttrs.version}.html"; license = lib.licenses.libtiff; - platforms = lib.platforms.unix ++ platforms.windows; + platforms = lib.platforms.unix ++ lib.platforms.windows; pkgConfigModules = [ "libtiff-4" ]; maintainers = lib.teams.geospatial.members; }; diff --git a/pkgs/by-name/li/libudev-zero/package.nix b/pkgs/by-name/li/libudev-zero/package.nix index cbb94ec75b22ad..8d7630fe6bf22e 100644 --- a/pkgs/by-name/li/libudev-zero/package.nix +++ b/pkgs/by-name/li/libudev-zero/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/illiliti/libudev-zero"; description = "Daemonless replacement for libudev"; - changelog = "https://github.com/illiliti/libudev-zero/releases/tag/${version}"; + changelog = "https://github.com/illiliti/libudev-zero/releases/tag/${finalAttrs.version}"; maintainers = with lib.maintainers; [ qyliss shamilton diff --git a/pkgs/by-name/li/liburcu/package.nix b/pkgs/by-name/li/liburcu/package.nix index 024d3ecce581ed..4192064ba20553 100644 --- a/pkgs/by-name/li/liburcu/package.nix +++ b/pkgs/by-name/li/liburcu/package.nix @@ -31,15 +31,15 @@ stdenv.mkDerivation rec { changelog = "https://github.com/urcu/userspace-rcu/raw/v${version}/ChangeLog"; license = lib.licenses.lgpl21Plus; # https://git.liburcu.org/?p=userspace-rcu.git;a=blob;f=include/urcu/arch.h - platforms = intersectLists platforms.unix ( - platforms.x86 - ++ platforms.power - ++ platforms.s390 - ++ platforms.arm - ++ platforms.aarch64 - ++ platforms.mips - ++ platforms.m68k - ++ platforms.riscv + platforms = lib.intersectLists lib.platforms.unix ( + lib.platforms.x86 + ++ lib.platforms.power + ++ lib.platforms.s390 + ++ lib.platforms.arm + ++ lib.platforms.aarch64 + ++ lib.platforms.mips + ++ lib.platforms.m68k + ++ lib.platforms.riscv ); maintainers = [ lib.maintainers.bjornfor ]; }; diff --git a/pkgs/by-name/li/licensure/package.nix b/pkgs/by-name/li/licensure/package.nix index ef3b10720dc0c8..7329e093010b69 100644 --- a/pkgs/by-name/li/licensure/package.nix +++ b/pkgs/by-name/li/licensure/package.nix @@ -44,6 +44,6 @@ rustPlatform.buildRustPackage rec { license = lib.licenses.gpl3Plus; mainProgram = "licensure"; maintainers = [ lib.maintainers.soispha ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/li/lighttpd/package.nix b/pkgs/by-name/li/lighttpd/package.nix index 367c0aa58d58da..6bee8df4ecc062 100644 --- a/pkgs/by-name/li/lighttpd/package.nix +++ b/pkgs/by-name/li/lighttpd/package.nix @@ -110,7 +110,7 @@ stdenv.mkDerivation rec { description = "Lightweight high-performance web server"; homepage = "http://www.lighttpd.net/"; license = lib.licenses.bsd3; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ bjornfor brecht diff --git a/pkgs/by-name/li/likwid/package.nix b/pkgs/by-name/li/likwid/package.nix index 5f48621cca219f..ae9e8567023512 100644 --- a/pkgs/by-name/li/likwid/package.nix +++ b/pkgs/by-name/li/likwid/package.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { description = "Performance monitoring and benchmarking suite"; license = lib.licenses.gpl3Only; # Might work on ARM by appropriately setting COMPILER in config.mk - platforms = intersectLists platforms.linux platforms.x86; + platforms = lib.intersectLists lib.platforms.linux lib.platforms.x86; maintainers = [ lib.maintainers.vbgl ]; mainProgram = "likwid-perfctr"; }; diff --git a/pkgs/by-name/li/limine/package.nix b/pkgs/by-name/li/limine/package.nix index f5ba4a3ab86d5e..5d1277e85aba01 100644 --- a/pkgs/by-name/li/limine/package.nix +++ b/pkgs/by-name/li/limine/package.nix @@ -101,17 +101,17 @@ stdenv.mkDerivation { badPlatforms = lib.platforms.darwin; # Caution. Some submodules have different licenses. license = [ - licenses.asl20 # cc-runtime - licenses.bsd0 # freestanding-toolchain, freestanding-headers - licenses.bsd2 # limine, flanterm - licenses.mit # limine-efi, stb - licenses.zlib # tinf + lib.licenses.asl20 # cc-runtime + lib.licenses.bsd0 # freestanding-toolchain, freestanding-headers + lib.licenses.bsd2 # limine, flanterm + lib.licenses.mit # limine-efi, stb + lib.licenses.zlib # tinf ]; maintainers = [ - maintainers._48cf - maintainers.phip1611 - maintainers.sanana - maintainers.surfaceflinger + lib.maintainers._48cf + lib.maintainers.phip1611 + lib.maintainers.sanana + lib.maintainers.surfaceflinger ]; }; } diff --git a/pkgs/by-name/li/livedl/package.nix b/pkgs/by-name/li/livedl/package.nix index 0164aef53e8fbe..bc9ea3fc539107 100644 --- a/pkgs/by-name/li/livedl/package.nix +++ b/pkgs/by-name/li/livedl/package.nix @@ -26,7 +26,7 @@ buildGoModule rec { homepage = "https://github.com/himananiito/livedl"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ wakira ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; broken = stdenv.hostPlatform.isDarwin; # build fails with go > 1.17 mainProgram = "livedl"; }; diff --git a/pkgs/by-name/ll/llpp/package.nix b/pkgs/by-name/ll/llpp/package.nix index fb1a9f87dcac58..e07bb02e5b37d2 100644 --- a/pkgs/by-name/ll/llpp/package.nix +++ b/pkgs/by-name/ll/llpp/package.nix @@ -95,11 +95,11 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/criticic/llpp"; description = "MuPDF based PDF pager written in OCaml"; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ pSub ]; license = [ - licenses.publicDomain - licenses.bsd3 + lib.licenses.publicDomain + lib.licenses.bsd3 ]; }; } diff --git a/pkgs/by-name/ll/lls/package.nix b/pkgs/by-name/ll/lls/package.nix index 76ff0709fe8b00..b98843f50c4cf4 100644 --- a/pkgs/by-name/ll/lls/package.nix +++ b/pkgs/by-name/ll/lls/package.nix @@ -20,8 +20,8 @@ rustPlatform.buildRustPackage rec { description = "Tool to list listening sockets"; license = lib.licenses.mit; maintainers = [ - maintainers.k900 - maintainers.jcaesar + lib.maintainers.k900 + lib.maintainers.jcaesar ]; platforms = lib.platforms.linux; homepage = "https://github.com/jcaesar/lls"; diff --git a/pkgs/by-name/lo/logstalgia/package.nix b/pkgs/by-name/lo/logstalgia/package.nix index d9737d946ab598..dcf5242cffc862 100644 --- a/pkgs/by-name/lo/logstalgia/package.nix +++ b/pkgs/by-name/lo/logstalgia/package.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { a Miscellaneous section. ''; - platforms = lib.platforms.gnu ++ platforms.linux; + platforms = lib.platforms.gnu ++ lib.platforms.linux; maintainers = with lib.maintainers; [ pSub ]; mainProgram = "logstalgia"; }; diff --git a/pkgs/by-name/ls/lsb-release/package.nix b/pkgs/by-name/ls/lsb-release/package.nix index 52647299c7b959..47f2f543177b90 100644 --- a/pkgs/by-name/ls/lsb-release/package.nix +++ b/pkgs/by-name/ls/lsb-release/package.nix @@ -12,7 +12,7 @@ runCommand "lsb_release" meta = { description = "Prints certain LSB (Linux Standard Base) and Distribution information"; mainProgram = "lsb_release"; - license = [ licenses.mit ]; + license = [ lib.licenses.mit ]; maintainers = with lib.maintainers; [ primeos ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/lt/lttoolbox/package.nix b/pkgs/by-name/lt/lttoolbox/package.nix index c75f785b7f46c1..5e9925aecc6a29 100644 --- a/pkgs/by-name/lt/lttoolbox/package.nix +++ b/pkgs/by-name/lt/lttoolbox/package.nix @@ -61,6 +61,6 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ onthestairs ]; changelog = "https://github.com/apertium/lttoolbox/releases/tag/v${version}"; license = lib.licenses.gpl2; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/lu/luanti/package.nix b/pkgs/by-name/lu/luanti/package.nix index d22d53070587b9..4d73a1911cd386 100644 --- a/pkgs/by-name/lu/luanti/package.nix +++ b/pkgs/by-name/lu/luanti/package.nix @@ -157,7 +157,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://www.luanti.org/"; description = "An open source voxel game engine (formerly Minetest)"; license = lib.licenses.lgpl21Plus; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ fpletz fgaz diff --git a/pkgs/by-name/lu/luigi/package.nix b/pkgs/by-name/lu/luigi/package.nix index c3d6f0e66019c6..373e3ed0f63bf2 100644 --- a/pkgs/by-name/lu/luigi/package.nix +++ b/pkgs/by-name/lu/luigi/package.nix @@ -32,7 +32,7 @@ python3.pkgs.buildPythonApplication rec { ''; homepage = "https://github.com/spotify/luigi"; changelog = "https://github.com/spotify/luigi/releases/tag/${version}"; - license = [ licenses.asl20 ]; + license = [ lib.licenses.asl20 ]; maintainers = [ lib.maintainers.bhipple ]; }; } diff --git a/pkgs/by-name/ma/maa-assistant-arknights/fastdeploy-ppocr.nix b/pkgs/by-name/ma/maa-assistant-arknights/fastdeploy-ppocr.nix index 15aab1a1624a5e..b04e8a50be6c21 100644 --- a/pkgs/by-name/ma/maa-assistant-arknights/fastdeploy-ppocr.nix +++ b/pkgs/by-name/ma/maa-assistant-arknights/fastdeploy-ppocr.nix @@ -72,7 +72,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { meta = { description = "MaaAssistantArknights stripped-down version of FastDeploy"; homepage = "https://github.com/MaaAssistantArknights/FastDeploy"; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; license = lib.licenses.asl20; broken = cudaSupport && stdenv.hostPlatform.system != "x86_64-linux"; }; diff --git a/pkgs/by-name/ma/maa-assistant-arknights/package.nix b/pkgs/by-name/ma/maa-assistant-arknights/package.nix index 5efce03eb23c0c..acecb13e69f361 100644 --- a/pkgs/by-name/ma/maa-assistant-arknights/package.nix +++ b/pkgs/by-name/ma/maa-assistant-arknights/package.nix @@ -85,6 +85,6 @@ in homepage = "https://github.com/MaaAssistantArknights/MaaAssistantArknights"; license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ Cryolitia ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; }) diff --git a/pkgs/by-name/ma/maa-cli/package.nix b/pkgs/by-name/ma/maa-cli/package.nix index 99f3548e4076c3..660a1da5401f55 100644 --- a/pkgs/by-name/ma/maa-cli/package.nix +++ b/pkgs/by-name/ma/maa-cli/package.nix @@ -79,7 +79,7 @@ rustPlatform.buildRustPackage rec { description = "Simple CLI for MAA by Rust"; homepage = "https://github.com/MaaAssistantArknights/maa-cli"; license = lib.licenses.agpl3Only; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ Cryolitia ]; mainProgram = "maa"; }; diff --git a/pkgs/by-name/ma/maelstrom-clj/package.nix b/pkgs/by-name/ma/maelstrom-clj/package.nix index d957f3bd4f9b4a..0c9920460360a7 100644 --- a/pkgs/by-name/ma/maelstrom-clj/package.nix +++ b/pkgs/by-name/ma/maelstrom-clj/package.nix @@ -50,9 +50,9 @@ stdenv.mkDerivation rec { homepage = "https://github.com/jepsen-io/maelstrom"; changelog = "https://github.com/jepsen-io/maelstrom/releases/tag/${version}"; mainProgram = "maelstrom"; - sourceProvenance = [ sourceTypes.binaryBytecode ]; + sourceProvenance = [ lib.sourceTypes.binaryBytecode ]; license = lib.licenses.epl10; maintainers = [ lib.maintainers.emilioziniades ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/ma/magic-vlsi/package.nix b/pkgs/by-name/ma/magic-vlsi/package.nix index c40dfd3ffc8631..e52c9e6bf57131 100644 --- a/pkgs/by-name/ma/magic-vlsi/package.nix +++ b/pkgs/by-name/ma/magic-vlsi/package.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meta = { description = "VLSI layout tool written in Tcl"; homepage = "http://opencircuitdesign.com/magic/"; - license = licenses.mit; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ thoughtpolice ]; }; } diff --git a/pkgs/by-name/ma/manta/package.nix b/pkgs/by-name/ma/manta/package.nix index 3d7740946c656e..225404af6abd9f 100644 --- a/pkgs/by-name/ma/manta/package.nix +++ b/pkgs/by-name/ma/manta/package.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3; homepage = "https://github.com/Illumina/manta"; maintainers = with lib.maintainers; [ jbedo ]; - platforms = platforms.x86_64; + platforms = lib.platforms.x86_64; }; } diff --git a/pkgs/by-name/ma/maxcso/package.nix b/pkgs/by-name/ma/maxcso/package.nix index 93e97372bb4d9a..32089efefaae79 100644 --- a/pkgs/by-name/ma/maxcso/package.nix +++ b/pkgs/by-name/ma/maxcso/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/unknownbrackets/maxcso"; description = "A fast ISO to CSO compression program for use with PSP and PS2 emulators, which uses multiple algorithms for best compression ratio"; maintainers = with lib.maintainers; [ david-sawatzke ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; license = lib.licenses.isc; mainProgram = "maxcso"; }; diff --git a/pkgs/by-name/md/mdbook-open-on-gh/package.nix b/pkgs/by-name/md/mdbook-open-on-gh/package.nix index 697fb7e3237dab..7b7d273c76d912 100644 --- a/pkgs/by-name/md/mdbook-open-on-gh/package.nix +++ b/pkgs/by-name/md/mdbook-open-on-gh/package.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { description = "mdbook preprocessor to add a open-on-github link on every page"; mainProgram = "mdbook-open-on-gh"; homepage = "https://github.com/badboy/mdbook-open-on-gh"; - license = [ licenses.mpl20 ]; + license = [ lib.licenses.mpl20 ]; maintainers = with lib.maintainers; [ matthiasbeyer ]; }; } diff --git a/pkgs/by-name/me/meld/package.nix b/pkgs/by-name/me/meld/package.nix index 25b119eac79cac..9a34368dd2f04a 100644 --- a/pkgs/by-name/me/meld/package.nix +++ b/pkgs/by-name/me/meld/package.nix @@ -71,7 +71,7 @@ python3.pkgs.buildPythonApplication rec { description = "Visual diff and merge tool"; homepage = "https://meld.app/"; license = lib.licenses.gpl2Plus; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ jtojnar mimame diff --git a/pkgs/by-name/me/meli/package.nix b/pkgs/by-name/me/meli/package.nix index c63ddfd40afc95..bf814980a5ac58 100644 --- a/pkgs/by-name/me/meli/package.nix +++ b/pkgs/by-name/me/meli/package.nix @@ -2,7 +2,6 @@ stdenv, lib, fetchzip, - fetchpatch, rustPlatform, # native build inputs @@ -86,6 +85,6 @@ rustPlatform.buildRustPackage rec { _0x4A6F matthiasbeyer ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/me/memcached/package.nix b/pkgs/by-name/me/memcached/package.nix index 03f28877153086..cb7956d1cdef38 100644 --- a/pkgs/by-name/me/memcached/package.nix +++ b/pkgs/by-name/me/memcached/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { homepage = "http://memcached.org/"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.coconnor ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; mainProgram = "memcached"; }; passthru.tests = { diff --git a/pkgs/by-name/me/menu-cache/package.nix b/pkgs/by-name/me/menu-cache/package.nix index 74801d28bfcdfd..ba099e3655a4c3 100644 --- a/pkgs/by-name/me/menu-cache/package.nix +++ b/pkgs/by-name/me/menu-cache/package.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { homepage = "https://blog.lxde.org/tag/menu-cache/"; license = lib.licenses.gpl2Plus; maintainers = [ lib.maintainers.ttuegel ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/mi/millet/package.nix b/pkgs/by-name/mi/millet/package.nix index fb488604317370..5435375c6be3cc 100644 --- a/pkgs/by-name/mi/millet/package.nix +++ b/pkgs/by-name/mi/millet/package.nix @@ -42,8 +42,8 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/azdavis/millet"; changelog = "https://github.com/azdavis/millet/blob/v${version}/docs/CHANGELOG.md"; license = [ - licenses.mit # or - licenses.asl20 + lib.licenses.mit # or + lib.licenses.asl20 ]; maintainers = [ ]; mainProgram = "millet-ls"; diff --git a/pkgs/by-name/mi/mimeo/package.nix b/pkgs/by-name/mi/mimeo/package.nix index ae11337a48cb2e..eec170b7af8b0f 100644 --- a/pkgs/by-name/mi/mimeo/package.nix +++ b/pkgs/by-name/mi/mimeo/package.nix @@ -43,7 +43,7 @@ python3Packages.buildPythonApplication { meta = { description = "Open files by MIME-type or file name using regular expressions"; homepage = "https://xyne.dev/projects/mimeo/"; - license = [ licenses.gpl2Only ]; + license = [ lib.licenses.gpl2Only ]; maintainers = [ lib.maintainers.rycee ]; platforms = lib.platforms.unix; mainProgram = "mimeo"; diff --git a/pkgs/by-name/mi/minivmac/package.nix b/pkgs/by-name/mi/minivmac/package.nix index cf80ecd60ab17b..4943cd7f445bc1 100644 --- a/pkgs/by-name/mi/minivmac/package.nix +++ b/pkgs/by-name/mi/minivmac/package.nix @@ -48,6 +48,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2; maintainers = [ lib.maintainers.flokli ]; platforms = lib.platforms.linux; - sourceProvenance = [ sourceTypes.fromSource ]; + sourceProvenance = [ lib.sourceTypes.fromSource ]; }; } diff --git a/pkgs/by-name/mi/misc-gitology/package.nix b/pkgs/by-name/mi/misc-gitology/package.nix index 2e850e117f5dc1..2b6c9f735544bd 100644 --- a/pkgs/by-name/mi/misc-gitology/package.nix +++ b/pkgs/by-name/mi/misc-gitology/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { meta = { description = "Assortment of scripts around Git"; homepage = "https://github.com/da-x/misc-gitology"; - license = [ licenses.bsd2 ]; + license = [ lib.licenses.bsd2 ]; maintainers = [ lib.maintainers._9999years ]; }; diff --git a/pkgs/by-name/mo/mod/package.nix b/pkgs/by-name/mo/mod/package.nix index 12cd77dfe66f74..4c6f514a3662c7 100644 --- a/pkgs/by-name/mo/mod/package.nix +++ b/pkgs/by-name/mo/mod/package.nix @@ -31,6 +31,6 @@ buildGoModule rec { homepage = "https://github.com/marwan-at-work/mod"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ kalbasit ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/mo/monoid/package.nix b/pkgs/by-name/mo/monoid/package.nix index a98f9f143bbd47..7ee69cf5e8a121 100644 --- a/pkgs/by-name/mo/monoid/package.nix +++ b/pkgs/by-name/mo/monoid/package.nix @@ -52,8 +52,8 @@ stdenv.mkDerivation { homepage = "http://larsenwork.com/monoid"; description = "Customisable coding font with alternates, ligatures and contextual positioning"; license = [ - licenses.ofl - licenses.mit + lib.licenses.ofl + lib.licenses.mit ]; platforms = lib.platforms.all; maintainers = [ lib.maintainers.romildo ]; diff --git a/pkgs/by-name/mo/monosat/package.nix b/pkgs/by-name/mo/monosat/package.nix index 0f6e5c351abf97..5436a89c92a54f 100644 --- a/pkgs/by-name/mo/monosat/package.nix +++ b/pkgs/by-name/mo/monosat/package.nix @@ -75,7 +75,7 @@ let description = "SMT solver for Monotonic Theories"; mainProgram = "monosat"; platforms = lib.platforms.unix; - license = if includeGplCode then licenses.gpl2 else licenses.mit; + license = if includeGplCode then lib.licenses.gpl2 else lib.licenses.mit; homepage = "https://github.com/sambayless/monosat"; maintainers = [ lib.maintainers.acairncross ]; }; diff --git a/pkgs/by-name/ms/msgpack-tools/package.nix b/pkgs/by-name/ms/msgpack-tools/package.nix index c78d48ee2dac3b..c66360f0dc2a85 100644 --- a/pkgs/by-name/ms/msgpack-tools/package.nix +++ b/pkgs/by-name/ms/msgpack-tools/package.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { description = "Command-line tools for converting between MessagePack and JSON"; homepage = "https://github.com/ludocode/msgpack-tools"; license = lib.licenses.mit; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = [ ]; }; } diff --git a/pkgs/by-name/mu/mullvad-browser/package.nix b/pkgs/by-name/mu/mullvad-browser/package.nix index aeb353b06d954e..d8a4a5c88ca00d 100644 --- a/pkgs/by-name/mu/mullvad-browser/package.nix +++ b/pkgs/by-name/mu/mullvad-browser/package.nix @@ -300,7 +300,7 @@ stdenv.mkDerivation rec { description = "Privacy-focused browser made in a collaboration between The Tor Project and Mullvad"; mainProgram = "mullvad-browser"; homepage = "https://mullvad.net/en/browser"; - platforms = attrNames sources; + platforms = lib.attrNames sources; maintainers = with lib.maintainers; [ felschr panicgh diff --git a/pkgs/by-name/mu/munge/package.nix b/pkgs/by-name/mu/munge/package.nix index 17c635c5511d3c..9ff01b30f57ab3 100644 --- a/pkgs/by-name/mu/munge/package.nix +++ b/pkgs/by-name/mu/munge/package.nix @@ -68,9 +68,9 @@ stdenv.mkDerivation (finalAttrs: { ''; license = [ # MUNGE - licenses.gpl3Plus + lib.licenses.gpl3Plus # libmunge - licenses.lgpl3Plus + lib.licenses.lgpl3Plus ]; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.rickynils ]; diff --git a/pkgs/by-name/mu/mustache-go/package.nix b/pkgs/by-name/mu/mustache-go/package.nix index 0a907a21aa84a5..c42aa2bc13e1fa 100644 --- a/pkgs/by-name/mu/mustache-go/package.nix +++ b/pkgs/by-name/mu/mustache-go/package.nix @@ -26,7 +26,7 @@ buildGoModule rec { meta = { homepage = "https://github.com/cbroglie/mustache"; description = "Mustache template language in Go"; - license = [ licenses.mit ]; + license = [ lib.licenses.mit ]; maintainers = with lib.maintainers; [ Zimmi48 ]; mainProgram = "mustache"; }; diff --git a/pkgs/by-name/my/myks/package.nix b/pkgs/by-name/my/myks/package.nix index 969dd8e609672f..486272d6cff505 100644 --- a/pkgs/by-name/my/myks/package.nix +++ b/pkgs/by-name/my/myks/package.nix @@ -50,8 +50,8 @@ buildGoModule rec { license = lib.licenses.mit; homepage = "https://github.com/mykso/myks"; maintainers = [ - maintainers.kbudde - maintainers.zebradil + lib.maintainers.kbudde + lib.maintainers.zebradil ]; mainProgram = "myks"; }; diff --git a/pkgs/by-name/nb/nbxplorer/package.nix b/pkgs/by-name/nb/nbxplorer/package.nix index f359e207943464..fa0735cac2a01c 100644 --- a/pkgs/by-name/nb/nbxplorer/package.nix +++ b/pkgs/by-name/nb/nbxplorer/package.nix @@ -34,7 +34,7 @@ buildDotnetModule rec { erikarvstedt ]; license = lib.licenses.mit; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; mainProgram = "nbxplorer"; }; } diff --git a/pkgs/by-name/nd/ndjbdns/package.nix b/pkgs/by-name/nd/ndjbdns/package.nix index 527c202d04b265..4f0adf8d29d6b4 100644 --- a/pkgs/by-name/nd/ndjbdns/package.nix +++ b/pkgs/by-name/nd/ndjbdns/package.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { homepage = "http://pjp.dgplug.org/ndjbdns/"; license = lib.licenses.gpl2Plus; maintainers = [ ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/ne/neko/package.nix b/pkgs/by-name/ne/neko/package.nix index cb44b2274d5865..69fb46cd8b4c7e 100644 --- a/pkgs/by-name/ne/neko/package.nix +++ b/pkgs/by-name/ne/neko/package.nix @@ -84,18 +84,18 @@ stdenv.mkDerivation rec { homepage = "https://nekovm.org"; license = [ # list based on https://github.com/HaxeFoundation/neko/blob/v2-3-0/LICENSE - licenses.gpl2Plus # nekoc, nekoml - licenses.lgpl21Plus # mysql.ndll - licenses.bsd3 # regexp.ndll - licenses.zlib # zlib.ndll - licenses.asl20 # mod_neko, mod_tora, mbedTLS - licenses.mit # overall, other libs + lib.licenses.gpl2Plus # nekoc, nekoml + lib.licenses.lgpl21Plus # mysql.ndll + lib.licenses.bsd3 # regexp.ndll + lib.licenses.zlib # zlib.ndll + lib.licenses.asl20 # mod_neko, mod_tora, mbedTLS + lib.licenses.mit # overall, other libs "https://github.com/HaxeFoundation/neko/blob/v2-3-0/LICENSE#L24-L40" # boehm gc ]; maintainers = [ - maintainers.marcweber - maintainers.locallycompact + lib.maintainers.marcweber + lib.maintainers.locallycompact ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/ne/nemo/package.nix b/pkgs/by-name/ne/nemo/package.nix index 124789dbd7f576..fb02c41d7af647 100644 --- a/pkgs/by-name/ne/nemo/package.nix +++ b/pkgs/by-name/ne/nemo/package.nix @@ -105,8 +105,8 @@ stdenv.mkDerivation rec { homepage = "https://github.com/linuxmint/nemo"; description = "File browser for Cinnamon"; license = [ - licenses.gpl2 - licenses.lgpl2 + lib.licenses.gpl2 + lib.licenses.lgpl2 ]; platforms = lib.platforms.linux; maintainers = lib.teams.cinnamon.members; diff --git a/pkgs/by-name/ng/ngt/package.nix b/pkgs/by-name/ng/ngt/package.nix index 031a36464f6906..b0aa42e27b05c5 100644 --- a/pkgs/by-name/ng/ngt/package.nix +++ b/pkgs/by-name/ng/ngt/package.nix @@ -7,7 +7,7 @@ enableAVX ? stdenv.hostPlatform.avxSupport, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "NGT"; version = "1.12.3-alpha"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/yahoojapan/NGT"; description = "Nearest Neighbor Search with Neighborhood Graph and Tree for High-dimensional Data"; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ tomberek ]; }; diff --git a/pkgs/by-name/ni/nitrokey-udev-rules/package.nix b/pkgs/by-name/ni/nitrokey-udev-rules/package.nix index 5e3a0f143fb880..b2f6306e25af40 100644 --- a/pkgs/by-name/ni/nitrokey-udev-rules/package.nix +++ b/pkgs/by-name/ni/nitrokey-udev-rules/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "udev rules for Nitrokey devices"; homepage = "https://github.com/Nitrokey/nitrokey-udev-rules"; - license = [ licenses.cc0 ]; + license = [ lib.licenses.cc0 ]; maintainers = with lib.maintainers; [ frogamic robinkrahl diff --git a/pkgs/by-name/ni/nixdoc/package.nix b/pkgs/by-name/ni/nixdoc/package.nix index b82fd1c520fb56..84781920d19887 100644 --- a/pkgs/by-name/ni/nixdoc/package.nix +++ b/pkgs/by-name/ni/nixdoc/package.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { description = "Generate documentation for Nix functions"; mainProgram = "nixdoc"; homepage = "https://github.com/nix-community/nixdoc"; - license = [ licenses.gpl3 ]; + license = [ lib.licenses.gpl3 ]; maintainers = with lib.maintainers; [ infinisil hsjobeki diff --git a/pkgs/by-name/ni/nixos-anywhere/package.nix b/pkgs/by-name/ni/nixos-anywhere/package.nix index ae9ce1abd5ceda..fd63ac9f332a6b 100644 --- a/pkgs/by-name/ni/nixos-anywhere/package.nix +++ b/pkgs/by-name/ni/nixos-anywhere/package.nix @@ -56,9 +56,9 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.mit; platforms = lib.platforms.all; maintainers = [ - maintainers.mic92 - maintainers.lassulus - maintainers.phaer + lib.maintainers.mic92 + lib.maintainers.lassulus + lib.maintainers.phaer ]; }; }) diff --git a/pkgs/by-name/no/nofi/package.nix b/pkgs/by-name/no/nofi/package.nix index f2d84d9f4d5a8a..3c444226be1dcb 100644 --- a/pkgs/by-name/no/nofi/package.nix +++ b/pkgs/by-name/no/nofi/package.nix @@ -27,8 +27,8 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/ellsclytn/nofi/"; changelog = "https://github.com/ellsclytn/nofi/raw/v${version}/CHANGELOG.md"; license = [ - licenses.asl20 # or - licenses.mit + lib.licenses.asl20 # or + lib.licenses.mit ]; mainProgram = "nofi"; maintainers = [ lib.maintainers.magnetophon ]; diff --git a/pkgs/by-name/no/nom/package.nix b/pkgs/by-name/no/nom/package.nix index ab02d619405721..6ccbfb952fa575 100644 --- a/pkgs/by-name/no/nom/package.nix +++ b/pkgs/by-name/no/nom/package.nix @@ -19,7 +19,7 @@ buildGoModule rec { meta = { homepage = "https://github.com/guyfedwards/nom"; description = "RSS reader for the terminal"; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ nadir-ishiguro 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 285837a599cb5a..d8ff63ef572727 100644 --- a/pkgs/by-name/nr/nrf-command-line-tools/package.nix +++ b/pkgs/by-name/nr/nrf-command-line-tools/package.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation { 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/nr/nrfutil/package.nix b/pkgs/by-name/nr/nrfutil/package.nix index dd0d773c6d33aa..80a5276febe353 100644 --- a/pkgs/by-name/nr/nrfutil/package.nix +++ b/pkgs/by-name/nr/nrfutil/package.nix @@ -52,7 +52,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { homepage = "https://www.nordicsemi.com/Products/Development-tools/nRF-Util"; changelog = "https://docs.nordicsemi.com/bundle/nrfutil/page/guides/revision_history.html"; license = lib.licenses.unfree; - platforms = attrNames supported; + platforms = lib.attrNames supported; maintainers = with lib.maintainers; [ h7x4 ]; mainProgram = "nrfutil"; }; diff --git a/pkgs/by-name/ns/nsh/package.nix b/pkgs/by-name/ns/nsh/package.nix index 00ba53e01a5eaf..33842b4eb9acd3 100644 --- a/pkgs/by-name/ns/nsh/package.nix +++ b/pkgs/by-name/ns/nsh/package.nix @@ -25,8 +25,8 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/nuta/nsh"; changelog = "https://github.com/nuta/nsh/raw/v${version}/docs/changelog.md"; license = [ - licenses.cc0 # or - licenses.mit + lib.licenses.cc0 # or + lib.licenses.mit ]; maintainers = with lib.maintainers; [ cafkafk ]; }; diff --git a/pkgs/by-name/nt/ntopng/package.nix b/pkgs/by-name/nt/ntopng/package.nix index 19b364f3278ec4..c5bf8d91544bb9 100644 --- a/pkgs/by-name/nt/ntopng/package.nix +++ b/pkgs/by-name/nt/ntopng/package.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://www.ntop.org/products/traffic-analysis/ntop/"; changelog = "https://github.com/ntop/ntopng/blob/${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.gpl3Plus; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ bjornfor ]; mainProgram = "ntopng"; }; diff --git a/pkgs/by-name/nu/nuget/package.nix b/pkgs/by-name/nu/nuget/package.nix index 7aeaf9652ce496..fd28bbc90ba1bb 100644 --- a/pkgs/by-name/nu/nuget/package.nix +++ b/pkgs/by-name/nu/nuget/package.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation (attrs: { ''; # https://learn.microsoft.com/en-us/nuget/resources/nuget-faq#what-is-the-license-for-nuget-exe- license = lib.licenses.mit; - sourceProvenance = [ sourceTypes.binaryBytecode ]; + sourceProvenance = [ lib.sourceTypes.binaryBytecode ]; maintainers = [ lib.maintainers.mdarocha ]; inherit (mono.meta) platforms; }; diff --git a/pkgs/by-name/oa/oauth2c/package.nix b/pkgs/by-name/oa/oauth2c/package.nix index 0271b3861ce1f5..850945050297e6 100644 --- a/pkgs/by-name/oa/oauth2c/package.nix +++ b/pkgs/by-name/oa/oauth2c/package.nix @@ -31,6 +31,6 @@ buildGoModule rec { ''; license = lib.licenses.asl20; maintainers = [ lib.maintainers.flokli ]; - platforms = lib.platforms.darwin ++ platforms.linux; + platforms = lib.platforms.darwin ++ lib.platforms.linux; }; } diff --git a/pkgs/by-name/ob/obs-cli/package.nix b/pkgs/by-name/ob/obs-cli/package.nix index 94d3508c8e62c8..53d52131ade8d5 100644 --- a/pkgs/by-name/ob/obs-cli/package.nix +++ b/pkgs/by-name/ob/obs-cli/package.nix @@ -35,7 +35,7 @@ buildGoModule rec { changelog = "https://github.com/muesli/obs-cli/releases/tag/v${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ flexiondotorg ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; mainProgram = "obs-cli"; }; } diff --git a/pkgs/by-name/oc/ocis-bin/package.nix b/pkgs/by-name/oc/ocis-bin/package.nix index 0d3e94e1a21d0b..f134b0c1148a05 100644 --- a/pkgs/by-name/oc/ocis-bin/package.nix +++ b/pkgs/by-name/oc/ocis-bin/package.nix @@ -72,12 +72,12 @@ stdenv.mkDerivation (finalAttrs: { ]; platforms = - (lib.intersectLists platforms.linux ( + (lib.intersectLists lib.platforms.linux ( lib.platforms.arm ++ lib.platforms.aarch64 ++ lib.platforms.x86 )) - ++ (lib.intersectLists platforms.darwin (lib.platforms.aarch64 ++ lib.platforms.x86_64)); + ++ (lib.intersectLists lib.platforms.darwin (lib.platforms.aarch64 ++ lib.platforms.x86_64)); - sourceProvenance = [ sourceTypes.binaryNativeCode ]; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; mainProgram = "ocis"; }; }) diff --git a/pkgs/by-name/oc/ocl-icd/package.nix b/pkgs/by-name/oc/ocl-icd/package.nix index 3e4ba81b5c4e37..17e1eb23dab4b1 100644 --- a/pkgs/by-name/oc/ocl-icd/package.nix +++ b/pkgs/by-name/oc/ocl-icd/package.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { mainProgram = "cllayerinfo"; homepage = "https://github.com/OCL-dev/ocl-icd"; license = lib.licenses.bsd2; - platforms = lib.platforms.unix ++ platforms.windows; + platforms = lib.platforms.unix ++ lib.platforms.windows; maintainers = with lib.maintainers; [ r-burns ]; }; } diff --git a/pkgs/by-name/on/onagre/package.nix b/pkgs/by-name/on/onagre/package.nix index 2739149187dd01..35c0c8dc761b66 100644 --- a/pkgs/by-name/on/onagre/package.nix +++ b/pkgs/by-name/on/onagre/package.nix @@ -15,7 +15,7 @@ libGL, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { pname = "onagre"; version = "1.1.1"; @@ -66,8 +66,8 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/onagre-launcher/onagre"; license = lib.licenses.mit; maintainers = [ - maintainers.jfvillablanca - maintainers.ilya-epifanov + lib.maintainers.jfvillablanca + lib.maintainers.ilya-epifanov ]; platforms = lib.platforms.linux; mainProgram = "onagre"; diff --git a/pkgs/by-name/on/onlyoffice-documentserver/package.nix b/pkgs/by-name/on/onlyoffice-documentserver/package.nix index 2627a11a0ade46..731b8114e9a210 100644 --- a/pkgs/by-name/on/onlyoffice-documentserver/package.nix +++ b/pkgs/by-name/on/onlyoffice-documentserver/package.nix @@ -158,7 +158,7 @@ let "x86_64-linux" "aarch64-linux" ]; - sourceProvenance = [ sourceTypes.binaryNativeCode ]; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; maintainers = with lib.maintainers; [ SuperSandro2000 ]; }; }; diff --git a/pkgs/by-name/op/opencl-headers/package.nix b/pkgs/by-name/op/opencl-headers/package.nix index 12451a10b75179..f7572c34f9c3cf 100644 --- a/pkgs/by-name/op/opencl-headers/package.nix +++ b/pkgs/by-name/op/opencl-headers/package.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Khronos OpenCL headers version ${finalAttrs.version}"; homepage = "https://www.khronos.org/registry/cl/"; license = lib.licenses.asl20; - platforms = lib.platforms.unix ++ platforms.windows; + platforms = lib.platforms.unix ++ lib.platforms.windows; maintainers = [ ]; }; }) diff --git a/pkgs/by-name/op/openclonk/package.nix b/pkgs/by-name/op/openclonk/package.nix index b961a8dd2c2d46..b1a5a52571e7eb 100644 --- a/pkgs/by-name/op/openclonk/package.nix +++ b/pkgs/by-name/op/openclonk/package.nix @@ -30,7 +30,7 @@ let sha256 = "1ckj0dlpp5zsnkbb5qxxfxpkiq76jj2fgj91fyf3ll7n0gbwcgw5"; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "unstable-2023-10-30"; pname = "openclonk"; @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { meta = { description = "Free multiplayer action game in which you control clonks, small but witty and nimble humanoid beings"; homepage = "https://www.openclonk.org"; - license = if enableSoundtrack then licenses.unfreeRedistributable else licenses.isc; + license = if enableSoundtrack then lib.licenses.unfreeRedistributable else lib.licenses.isc; mainProgram = "openclonk"; maintainers = [ ]; platforms = [ diff --git a/pkgs/by-name/op/openimagedenoise/package.nix b/pkgs/by-name/op/openimagedenoise/package.nix index aca0731c286c43..91120dc35c0f1a 100644 --- a/pkgs/by-name/op/openimagedenoise/package.nix +++ b/pkgs/by-name/op/openimagedenoise/package.nix @@ -66,6 +66,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.asl20; maintainers = [ lib.maintainers.leshainc ]; platforms = lib.platforms.unix; - changelog = "https://github.com/OpenImageDenoise/oidn/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/OpenImageDenoise/oidn/blob/v${finalAttrs.version}/CHANGELOG.md"; }; }) diff --git a/pkgs/by-name/op/openocd/package.nix b/pkgs/by-name/op/openocd/package.nix index be5ef26963ae54..aa20eac0758153 100644 --- a/pkgs/by-name/op/openocd/package.nix +++ b/pkgs/by-name/op/openocd/package.nix @@ -96,6 +96,6 @@ stdenv.mkDerivation rec { bjornfor prusnak ]; - platforms = lib.platforms.unix ++ platforms.windows; + platforms = lib.platforms.unix ++ lib.platforms.windows; }; } diff --git a/pkgs/by-name/op/opensmt/package.nix b/pkgs/by-name/op/opensmt/package.nix index 35ccd3a60afbc4..7f0c4ab0642bde 100644 --- a/pkgs/by-name/op/opensmt/package.nix +++ b/pkgs/by-name/op/opensmt/package.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { mainProgram = "opensmt"; maintainers = [ lib.maintainers.raskin ]; platforms = lib.platforms.linux; - license = if enableReadline then licenses.gpl2Plus else licenses.mit; + license = if enableReadline then lib.licenses.gpl2Plus else lib.licenses.mit; homepage = "https://github.com/usi-verification-and-security/opensmt"; }; } diff --git a/pkgs/by-name/op/opensoldat/package.nix b/pkgs/by-name/op/opensoldat/package.nix index b98fd54672b41b..4eaa7187f7b91d 100644 --- a/pkgs/by-name/op/opensoldat/package.nix +++ b/pkgs/by-name/op/opensoldat/package.nix @@ -103,7 +103,7 @@ stdenv.mkDerivation rec { meta = { description = "Opensoldat is a unique 2D (side-view) multiplayer action game"; license = [ - licenses.mit + lib.licenses.mit base.meta.license ]; inherit (src.meta) homepage; diff --git a/pkgs/by-name/op/openttd-ttf/package.nix b/pkgs/by-name/op/openttd-ttf/package.nix index 095a1093db2e55..af25e7c37906c0 100644 --- a/pkgs/by-name/op/openttd-ttf/package.nix +++ b/pkgs/by-name/op/openttd-ttf/package.nix @@ -50,7 +50,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { homepage = "https://github.com/zephyris/openttd-ttf"; changelog = "https://github.com/zephyris/openttd-ttf/releases/tag/${finalAttrs.version}"; description = "TrueType typefaces for text in a pixel art style, designed for use in OpenTTD"; - license = [ licenses.gpl2 ]; + license = [ lib.licenses.gpl2 ]; platforms = lib.platforms.all; maintainers = [ lib.maintainers.sfrijters ]; }; diff --git a/pkgs/by-name/op/openwsman/package.nix b/pkgs/by-name/op/openwsman/package.nix index c7e574aa44a843..b17cd16a2a4d2d 100644 --- a/pkgs/by-name/op/openwsman/package.nix +++ b/pkgs/by-name/op/openwsman/package.nix @@ -32,8 +32,8 @@ stdenv.mkDerivation rec { description = "Openwsman server implementation and client API with bindings"; downloadPage = "https://github.com/Openwsman/openwsman/releases"; homepage = "https://openwsman.github.io"; - license = licenses.bsd3; - maintainers = with maintainers; [ deepfire ]; - platforms = platforms.linux; # PAM is not available on Darwin + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ deepfire ]; + platforms = lib.platforms.linux; # PAM is not available on Darwin }; } diff --git a/pkgs/by-name/op/openxr-loader/package.nix b/pkgs/by-name/op/openxr-loader/package.nix index 3b5dd32d4f8ef5..dec1884941549f 100644 --- a/pkgs/by-name/op/openxr-loader/package.nix +++ b/pkgs/by-name/op/openxr-loader/package.nix @@ -38,8 +38,8 @@ stdenv.mkDerivation rec { meta = { description = "Khronos OpenXR loader"; homepage = "https://www.khronos.org/openxr"; - platforms = platforms.linux; - license = licenses.asl20; + platforms = lib.platforms.linux; + license = lib.licenses.asl20; maintainers = [ lib.maintainers.ralith ]; }; } diff --git a/pkgs/by-name/op/operator-sdk/package.nix b/pkgs/by-name/op/operator-sdk/package.nix index c5723597288eb6..1b1375363eca43 100644 --- a/pkgs/by-name/op/operator-sdk/package.nix +++ b/pkgs/by-name/op/operator-sdk/package.nix @@ -47,6 +47,6 @@ buildGoModule rec { changelog = "https://github.com/operator-framework/operator-sdk/releases/tag/v${version}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ arnarg ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/os/osm-gps-map/package.nix b/pkgs/by-name/os/osm-gps-map/package.nix index 8ffdd88d0795c1..3732f3e2297897 100644 --- a/pkgs/by-name/os/osm-gps-map/package.nix +++ b/pkgs/by-name/os/osm-gps-map/package.nix @@ -44,6 +44,6 @@ stdenv.mkDerivation rec { homepage = "https://nzjrs.github.io/osm-gps-map"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ hrdinka ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/pa/paper-gtk-theme/package.nix b/pkgs/by-name/pa/paper-gtk-theme/package.nix index 5da6909a285a3e..137aa5243d5d56 100644 --- a/pkgs/by-name/pa/paper-gtk-theme/package.nix +++ b/pkgs/by-name/pa/paper-gtk-theme/package.nix @@ -33,8 +33,8 @@ stdenv.mkDerivation { license = lib.licenses.gpl3; platforms = lib.platforms.linux; maintainers = [ - maintainers.simonvandel - maintainers.romildo + lib.maintainers.simonvandel + lib.maintainers.romildo ]; }; } diff --git a/pkgs/by-name/pa/passt/package.nix b/pkgs/by-name/pa/passt/package.nix index 666b95fd63e70a..0a9d7c3d33a28f 100644 --- a/pkgs/by-name/pa/passt/package.nix +++ b/pkgs/by-name/pa/passt/package.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { interfaces on the host, hence not requiring any capabilities or privileges. ''; - license = [ licenses.bsd3 /* and */ licenses.gpl2Plus ]; + license = [ lib.licenses.bsd3 /* and */ lib.licenses.gpl2Plus ]; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ _8aed ]; mainProgram = "passt"; diff --git a/pkgs/by-name/pc/pcem/package.nix b/pkgs/by-name/pc/pcem/package.nix index c03c2f93dab525..612819c4fbaafd 100644 --- a/pkgs/by-name/pc/pcem/package.nix +++ b/pkgs/by-name/pc/pcem/package.nix @@ -49,6 +49,6 @@ stdenv.mkDerivation rec { homepage = "https://pcem-emulator.co.uk/"; license = lib.licenses.gpl2Only; maintainers = [ lib.maintainers.terin ]; - platforms = lib.platforms.linux ++ platforms.windows; + platforms = lib.platforms.linux ++ lib.platforms.windows; }; } diff --git a/pkgs/by-name/pd/pdfmm/package.nix b/pkgs/by-name/pd/pdfmm/package.nix index c21dd442894c6b..301c926d72a7e9 100644 --- a/pkgs/by-name/pd/pdfmm/package.nix +++ b/pkgs/by-name/pd/pdfmm/package.nix @@ -55,6 +55,6 @@ resholve.mkDerivation rec { license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ urandom ]; mainProgram = "pdfmm"; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/pe/pet/package.nix b/pkgs/by-name/pe/pet/package.nix index e6c2a1ecd68d0d..27c67fe2ce7ab6 100644 --- a/pkgs/by-name/pe/pet/package.nix +++ b/pkgs/by-name/pe/pet/package.nix @@ -43,6 +43,6 @@ buildGoModule rec { homepage = "https://github.com/knqyf263/pet"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ kalbasit ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/pg/pgbouncer/package.nix b/pkgs/by-name/pg/pgbouncer/package.nix index 39b0dc62b49801..0c56ee19364252 100644 --- a/pkgs/by-name/pg/pgbouncer/package.nix +++ b/pkgs/by-name/pg/pgbouncer/package.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { 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/pg/pgf1/package.nix b/pkgs/by-name/pg/pgf1/package.nix index bd828dca7785ca..cfb763d6f5bd27 100644 --- a/pkgs/by-name/pg/pgf1/package.nix +++ b/pkgs/by-name/pg/pgf1/package.nix @@ -30,7 +30,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/pgf-tikz/pgf"; description = "Portable Graphic Format for TeX - version ${finalAttrs.version}"; - branch = lib.versions.major version; + branch = lib.versions.major finalAttrs.version; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ AndersonTorres ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/pg/pgf2/package.nix b/pkgs/by-name/pg/pgf2/package.nix index 972d66595db389..460667cf5f173d 100644 --- a/pkgs/by-name/pg/pgf2/package.nix +++ b/pkgs/by-name/pg/pgf2/package.nix @@ -30,7 +30,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/pgf-tikz/pgf"; description = "Portable Graphic Format for TeX"; - branch = lib.versions.major version; + branch = lib.versions.major finalAttrs.version; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ AndersonTorres ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/pg/pgf3/package.nix b/pkgs/by-name/pg/pgf3/package.nix index 1b0336640e2bba..53a69991829361 100644 --- a/pkgs/by-name/pg/pgf3/package.nix +++ b/pkgs/by-name/pg/pgf3/package.nix @@ -30,7 +30,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/pgf-tikz/pgf"; description = "Portable Graphic Format for TeX - version ${finalAttrs.version}"; - branch = lib.versions.major version; + branch = lib.versions.major finalAttrs.version; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ AndersonTorres ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/pg/pgformatter/package.nix b/pkgs/by-name/pg/pgformatter/package.nix index 71511e8b4371d3..17b890df30139e 100644 --- a/pkgs/by-name/pg/pgformatter/package.nix +++ b/pkgs/by-name/pg/pgformatter/package.nix @@ -55,8 +55,8 @@ perlPackages.buildPerlPackage rec { changelog = "https://github.com/darold/pgFormatter/releases/tag/v${version}"; maintainers = [ ]; license = [ - licenses.postgresql - licenses.artistic2 + lib.licenses.postgresql + lib.licenses.artistic2 ]; mainProgram = "pg_format"; }; diff --git a/pkgs/by-name/pg/pgtop/package.nix b/pkgs/by-name/pg/pgtop/package.nix index f2b48f64734447..f34ae6c2e4f4b2 100644 --- a/pkgs/by-name/pg/pgtop/package.nix +++ b/pkgs/by-name/pg/pgtop/package.nix @@ -38,6 +38,6 @@ perlPackages.buildPerlPackage rec { homepage = "https://github.com/cosimo/pgtop"; changelog = "https://github.com/cosimo/pgtop/releases/tag/v${version}"; maintainers = [ lib.maintainers.hagl ]; - license = [ licenses.gpl2Only ]; + license = [ lib.licenses.gpl2Only ]; }; } diff --git a/pkgs/by-name/pi/pick/package.nix b/pkgs/by-name/pi/pick/package.nix index f6eeae1ee13b09..bd31862361ef5e 100644 --- a/pkgs/by-name/pi/pick/package.nix +++ b/pkgs/by-name/pi/pick/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { description = "Fuzzy text selection utility"; license = lib.licenses.mit; maintainers = [ lib.maintainers.womfoo ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; mainProgram = "pick"; }; diff --git a/pkgs/by-name/pl/plog/package.nix b/pkgs/by-name/pl/plog/package.nix index 166f9e2412937f..69f40411f0084f 100644 --- a/pkgs/by-name/pl/plog/package.nix +++ b/pkgs/by-name/pl/plog/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { description = "Portable, simple and extensible C++ logging library"; homepage = "https://github.com/SergiusTheBest/plog"; license = lib.licenses.mit; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ raphaelr erdnaxe diff --git a/pkgs/by-name/pm/pmacct/package.nix b/pkgs/by-name/pm/pmacct/package.nix index 1ab57445be4672..bf0a5dbc915274 100644 --- a/pkgs/by-name/pm/pmacct/package.nix +++ b/pkgs/by-name/pm/pmacct/package.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation (finalAttrs: { [NetFlow IPFIX sFlow libpcap BGP BMP RPKI IGP Streaming Telemetry] ''; homepage = "http://www.pmacct.net/"; - changelog = "https://github.com/pmacct/pmacct/blob/v${version}/ChangeLog"; + changelog = "https://github.com/pmacct/pmacct/blob/v${finalAttrs.version}/ChangeLog"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ _0x4A6F ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/pm/pmtiles/package.nix b/pkgs/by-name/pm/pmtiles/package.nix index 146451308f9d24..27eb6af66e12c9 100644 --- a/pkgs/by-name/pm/pmtiles/package.nix +++ b/pkgs/by-name/pm/pmtiles/package.nix @@ -31,7 +31,7 @@ buildGoModule rec { description = "Single-file utility for creating and working with PMTiles archives"; homepage = "https://github.com/protomaps/go-pmtiles"; license = lib.licenses.bsd3; - maintainers = lib.teams.geospatial.members ++ (with maintainers; [ theaninova ]); + maintainers = lib.teams.geospatial.members ++ (with lib.maintainers; [ theaninova ]); mainProgram = "pmtiles"; }; } diff --git a/pkgs/by-name/po/polari/package.nix b/pkgs/by-name/po/polari/package.nix index e03f6c5314bc7c..176e534e4ee474 100644 --- a/pkgs/by-name/po/polari/package.nix +++ b/pkgs/by-name/po/polari/package.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { homepage = "https://apps.gnome.org/Polari/"; description = "IRC chat client designed to integrate with the GNOME desktop"; mainProgram = "polari"; - maintainers = lib.teams.gnome.members ++ teams.gnome-circle.members; + maintainers = lib.teams.gnome.members ++ lib.teams.gnome-circle.members; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/po/polkit/package.nix b/pkgs/by-name/po/polkit/package.nix index acede7190c9cd4..df0133d9f4c705 100644 --- a/pkgs/by-name/po/polkit/package.nix +++ b/pkgs/by-name/po/polkit/package.nix @@ -212,6 +212,6 @@ stdenv.mkDerivation rec { # mandatory libpolkit-gobject shared library lib.systems.inspect.platformPatterns.isStatic ]; - maintainers = lib.teams.freedesktop.members ++ (with maintainers; [ ]); + maintainers = lib.teams.freedesktop.members ++ (with lib.maintainers; [ ]); }; } diff --git a/pkgs/by-name/po/positron-bin/package.nix b/pkgs/by-name/po/positron-bin/package.nix index ed3c75aeb4d27b..9dad732427a463 100644 --- a/pkgs/by-name/po/positron-bin/package.nix +++ b/pkgs/by-name/po/positron-bin/package.nix @@ -126,6 +126,6 @@ stdenv.mkDerivation { detroyejr ]; mainProgram = "positron"; - platforms = [ "x86_64-linux" ] ++ platforms.darwin; + platforms = [ "x86_64-linux" ] ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/pr/pridefetch/package.nix b/pkgs/by-name/pr/pridefetch/package.nix index ac6a66d0227217..594546623b5b0f 100644 --- a/pkgs/by-name/pr/pridefetch/package.nix +++ b/pkgs/by-name/pr/pridefetch/package.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation { homepage = "https://github.com/SpyHoodle/pridefetch"; license = lib.licenses.mit; maintainers = [ - maintainers.minion3665 + lib.maintainers.minion3665 ]; platforms = lib.platforms.all; mainProgram = "pridefetch"; diff --git a/pkgs/by-name/pr/progress/package.nix b/pkgs/by-name/pr/progress/package.nix index 70115a6714051f..4917a581e85d11 100644 --- a/pkgs/by-name/pr/progress/package.nix +++ b/pkgs/by-name/pr/progress/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Xfennec/progress"; description = "Tool that shows the progress of coreutils programs"; license = lib.licenses.gpl3; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ pSub ]; mainProgram = "progress"; }; diff --git a/pkgs/by-name/pr/proj-datumgrid/package.nix b/pkgs/by-name/pr/proj-datumgrid/package.nix index 42dfd91e2ab9ec..d802aa21a9502d 100644 --- a/pkgs/by-name/pr/proj-datumgrid/package.nix +++ b/pkgs/by-name/pr/proj-datumgrid/package.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; maintainers = [ ]; mainProgram = "nad2bin"; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/pr/protoc-gen-js/package.nix b/pkgs/by-name/pr/protoc-gen-js/package.nix index 2f3ca1c4594ac5..1872db98da6767 100644 --- a/pkgs/by-name/pr/protoc-gen-js/package.nix +++ b/pkgs/by-name/pr/protoc-gen-js/package.nix @@ -30,9 +30,9 @@ buildBazelPackage rec { description = "Protobuf plugin for generating JavaScript code"; mainProgram = "protoc-gen-js"; homepage = "https://github.com/protocolbuffers/protobuf-javascript"; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; license = with lib.licenses; [ asl20 bsd3 ]; - sourceProvenance = [ sourceTypes.fromSource ]; + sourceProvenance = [ lib.sourceTypes.fromSource ]; maintainers = [ ]; }; } diff --git a/pkgs/by-name/ps/pssh/package.nix b/pkgs/by-name/ps/pssh/package.nix index b71b87badded2e..de4577b10c01af 100644 --- a/pkgs/by-name/ps/pssh/package.nix +++ b/pkgs/by-name/ps/pssh/package.nix @@ -37,7 +37,7 @@ python3Packages.buildPythonApplication rec { ''; inherit (src.meta) homepage; license = lib.licenses.bsd3; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ chris-martin ]; }; } diff --git a/pkgs/by-name/pu/pulseaudio-module-xrdp/package.nix b/pkgs/by-name/pu/pulseaudio-module-xrdp/package.nix index bbec85972aed1e..1f5ca1034487c7 100644 --- a/pkgs/by-name/pu/pulseaudio-module-xrdp/package.nix +++ b/pkgs/by-name/pu/pulseaudio-module-xrdp/package.nix @@ -60,6 +60,6 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl21; maintainers = with lib.maintainers; [ lucasew ]; platforms = lib.platforms.linux; - sourceProvenance = [ sourceTypes.fromSource ]; + sourceProvenance = [ lib.sourceTypes.fromSource ]; }; } diff --git a/pkgs/by-name/pu/pulumi/package.nix b/pkgs/by-name/pu/pulumi/package.nix index fd10b87580f35d..c891b1cbb50583 100644 --- a/pkgs/by-name/pu/pulumi/package.nix +++ b/pkgs/by-name/pu/pulumi/package.nix @@ -149,7 +149,7 @@ buildGo122Module rec { meta = { homepage = "https://pulumi.io/"; description = "Pulumi is a cloud development platform that makes creating cloud programs easy and productive"; - sourceProvenance = [ sourceTypes.fromSource ]; + sourceProvenance = [ lib.sourceTypes.fromSource ]; license = lib.licenses.asl20; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ diff --git a/pkgs/by-name/ra/raider/package.nix b/pkgs/by-name/ra/raider/package.nix index 1fb2e9615925f4..34063b2fbbe178 100644 --- a/pkgs/by-name/ra/raider/package.nix +++ b/pkgs/by-name/ra/raider/package.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; mainProgram = "raider"; maintainers = - with maintainers; + with lib.maintainers; [ benediktbroich ] diff --git a/pkgs/by-name/rd/rdkafka/package.nix b/pkgs/by-name/rd/rdkafka/package.nix index fa152daa291bbb..53c3a156da5035 100644 --- a/pkgs/by-name/rd/rdkafka/package.nix +++ b/pkgs/by-name/rd/rdkafka/package.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { description = "librdkafka - Apache Kafka C/C++ client library"; homepage = "https://github.com/confluentinc/librdkafka"; license = lib.licenses.bsd2; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ commandodev ]; }; }) diff --git a/pkgs/by-name/re/revolt-desktop/package.nix b/pkgs/by-name/re/revolt-desktop/package.nix index 6459a154d9abb5..91632bcbb8c422 100644 --- a/pkgs/by-name/re/revolt-desktop/package.nix +++ b/pkgs/by-name/re/revolt-desktop/package.nix @@ -7,7 +7,7 @@ makeWrapper, electron, }: -(stdenvNoCC.mkDerivation { +(stdenvNoCC.mkDerivation ( finalAttrs: { pname = "revolt-desktop"; version = "1.0.6"; dontConfigure = true; @@ -15,22 +15,22 @@ meta = { description = "Open source user-first chat platform"; homepage = "https://revolt.chat/"; - changelog = "https://github.com/revoltchat/desktop/releases/tag/v${version}"; + changelog = "https://github.com/revoltchat/desktop/releases/tag/v${finalAttrs.version}"; license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ heyimnova caralice ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; mainProgram = "revolt-desktop"; }; nativeBuildInputs = [ makeWrapper ]; -}).overrideAttrs +})).overrideAttrs ( final: prev: let - inherit (prev) pname version; + inherit (prev) version; in if stdenvNoCC.hostPlatform.isLinux then { diff --git a/pkgs/by-name/rm/rmg/package.nix b/pkgs/by-name/rm/rmg/package.nix index 3dfd17741ad1d8..2f9b9ccf8860be 100644 --- a/pkgs/by-name/rm/rmg/package.nix +++ b/pkgs/by-name/rm/rmg/package.nix @@ -94,7 +94,7 @@ stdenv.mkDerivation rec { Rosalie's Mupen GUI is a free and open-source mupen64plus front-end written in C++. It offers a simple-to-use user interface. ''; - license = if withAngrylionRdpPlus then licenses.unfree else licenses.gpl3Only; + license = if withAngrylionRdpPlus then lib.licenses.unfree else lib.licenses.gpl3Only; platforms = lib.platforms.linux; mainProgram = "RMG"; maintainers = with lib.maintainers; [ slam-bert ]; diff --git a/pkgs/by-name/ro/root/package.nix b/pkgs/by-name/ro/root/package.nix index ef380ad0561c56..5aee4844e180ea 100644 --- a/pkgs/by-name/ro/root/package.nix +++ b/pkgs/by-name/ro/root/package.nix @@ -258,8 +258,8 @@ stdenv.mkDerivation rec { description = "Data analysis framework"; platforms = lib.platforms.unix; maintainers = [ - maintainers.guitargeek - maintainers.veprbl + lib.maintainers.guitargeek + lib.maintainers.veprbl ]; license = lib.licenses.lgpl21; }; diff --git a/pkgs/by-name/ro/root/tests/test-thisroot.nix b/pkgs/by-name/ro/root/tests/test-thisroot.nix index 14d4ebb7a9365f..be72dea14444f6 100644 --- a/pkgs/by-name/ro/root/tests/test-thisroot.nix +++ b/pkgs/by-name/ro/root/tests/test-thisroot.nix @@ -11,7 +11,7 @@ runCommand "test-thisroot" { meta = { description = "Test for root thisroot.* sourcing"; - maintainers = unique ((with maintainers; [ ShamrockLee ]) ++ root.meta.maintainers); + maintainers = lib.unique ((with lib.maintainers; [ ShamrockLee ]) ++ root.meta.maintainers); }; } '' diff --git a/pkgs/by-name/rr/rrdtool/package.nix b/pkgs/by-name/rr/rrdtool/package.nix index 50b34323c0cffc..17f62941813c93 100644 --- a/pkgs/by-name/rr/rrdtool/package.nix +++ b/pkgs/by-name/rr/rrdtool/package.nix @@ -62,7 +62,7 @@ perl.pkgs.toPerlModule ( homepage = "https://oss.oetiker.ch/rrdtool/"; description = "High performance logging in Round Robin Databases"; license = lib.licenses.gpl2Only; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ pSub ]; }; } diff --git a/pkgs/by-name/ru/ruffle/package.nix b/pkgs/by-name/ru/ruffle/package.nix index 0da1e6f71468dd..dca114d85364f5 100644 --- a/pkgs/by-name/ru/ruffle/package.nix +++ b/pkgs/by-name/ru/ruffle/package.nix @@ -116,7 +116,7 @@ rustPlatform.buildRustPackage { govanify jchw ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; mainProgram = "ruffle_desktop"; }; } diff --git a/pkgs/by-name/ru/runit/package.nix b/pkgs/by-name/ru/runit/package.nix index 20355b0511df5c..2574cf836eaa53 100644 --- a/pkgs/by-name/ru/runit/package.nix +++ b/pkgs/by-name/ru/runit/package.nix @@ -69,6 +69,6 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd3; homepage = "http://smarden.org/runit"; maintainers = with lib.maintainers; [ joachifm ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/ru/rusti-cal/package.nix b/pkgs/by-name/ru/rusti-cal/package.nix index eb6921dbc24d31..d1b4274de8586f 100644 --- a/pkgs/by-name/ru/rusti-cal/package.nix +++ b/pkgs/by-name/ru/rusti-cal/package.nix @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { description = "Minimal command line calendar, similar to cal"; mainProgram = "rusti-cal"; homepage = "https://github.com/arthurhenrique/rusti-cal"; - license = [ licenses.mit ]; + license = [ lib.licenses.mit ]; maintainers = [ lib.maintainers.detegr ]; }; } diff --git a/pkgs/by-name/ru/rutabaga_gfx/package.nix b/pkgs/by-name/ru/rutabaga_gfx/package.nix index 68cac1d57496c0..82879b84518384 100644 --- a/pkgs/by-name/ru/rutabaga_gfx/package.nix +++ b/pkgs/by-name/ru/rutabaga_gfx/package.nix @@ -85,6 +85,6 @@ stdenv.mkDerivation (finalAttrs: { description = "cross-platform abstraction for GPU and display virtualization"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ qyliss ]; - platforms = lib.platforms.darwin ++ platforms.linux; + platforms = lib.platforms.darwin ++ lib.platforms.linux; }; }) diff --git a/pkgs/by-name/rv/rvvm/package.nix b/pkgs/by-name/rv/rvvm/package.nix index ed0a9c9b7e3211..a368da3cd974b3 100644 --- a/pkgs/by-name/rv/rvvm/package.nix +++ b/pkgs/by-name/rv/rvvm/package.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { gpl3 # or mpl20 ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ kamillaova ]; mainProgram = "rvvm"; }; diff --git a/pkgs/by-name/s5/s5/package.nix b/pkgs/by-name/s5/s5/package.nix index 71c031b1773871..bd69ab0d511d09 100644 --- a/pkgs/by-name/s5/s5/package.nix +++ b/pkgs/by-name/s5/s5/package.nix @@ -30,7 +30,7 @@ buildGoModule rec { mainProgram = "s5"; homepage = "https://github.com/mvisonneau/s5"; license = lib.licenses.asl20; - platforms = lib.platforms.unix ++ platforms.darwin; + platforms = lib.platforms.unix ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ mvisonneau ]; }; } diff --git a/pkgs/by-name/sa/saga/package.nix b/pkgs/by-name/sa/saga/package.nix index 5b18a5d0e7e10d..09b0d1571bffab 100644 --- a/pkgs/by-name/sa/saga/package.nix +++ b/pkgs/by-name/sa/saga/package.nix @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { changelog = "https://sourceforge.net/p/saga-gis/wiki/Changelog ${version}/"; license = lib.licenses.gpl2Plus; maintainers = - with maintainers; + with lib.maintainers; teams.geospatial.members ++ [ michelk diff --git a/pkgs/by-name/sa/saleae-logic/package.nix b/pkgs/by-name/sa/saleae-logic/package.nix index 07cb0eba838627..2a63da77a311e3 100644 --- a/pkgs/by-name/sa/saleae-logic/package.nix +++ b/pkgs/by-name/sa/saleae-logic/package.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { homepage = "https://www.saleae.com/"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; - platforms = intersectLists platforms.x86_64 platforms.linux; + platforms = lib.intersectLists lib.platforms.x86_64 lib.platforms.linux; maintainers = [ lib.maintainers.bjornfor ]; }; } diff --git a/pkgs/by-name/se/segger-jlink/package.nix b/pkgs/by-name/se/segger-jlink/package.nix index dfd3f869199a8c..3fa8d9681788b2 100644 --- a/pkgs/by-name/se/segger-jlink/package.nix +++ b/pkgs/by-name/se/segger-jlink/package.nix @@ -162,7 +162,7 @@ stdenv.mkDerivation { homepage = "https://www.segger.com/downloads/jlink/#J-LinkSoftwareAndDocumentationPack"; changelog = "https://www.segger.com/downloads/jlink/ReleaseNotes_JLink.html"; license = lib.licenses.unfree; - platforms = attrNames supported; + platforms = lib.attrNames supported; maintainers = with lib.maintainers; [ FlorianFranzen h7x4 diff --git a/pkgs/by-name/se/serf/package.nix b/pkgs/by-name/se/serf/package.nix index 874807cfb90771..7a47b164e9e674 100644 --- a/pkgs/by-name/se/serf/package.nix +++ b/pkgs/by-name/se/serf/package.nix @@ -67,6 +67,6 @@ stdenv.mkDerivation rec { orivej raskin ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/sh/sha2wordlist/package.nix b/pkgs/by-name/sh/sha2wordlist/package.nix index 5f7eb86ed90a66..f82e70c0646efd 100644 --- a/pkgs/by-name/sh/sha2wordlist/package.nix +++ b/pkgs/by-name/sh/sha2wordlist/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { description = "Display SHA-256 as PGP words"; homepage = "https://github.com/kirei/sha2wordlist"; maintainers = with lib.maintainers; [ baloo ]; - license = [ licenses.bsd2 ]; + license = [ lib.licenses.bsd2 ]; platforms = lib.platforms.all; mainProgram = "sha2wordlist"; }; diff --git a/pkgs/by-name/sh/shared-mime-info/package.nix b/pkgs/by-name/sh/shared-mime-info/package.nix index 27146803153898..ab97b93923e0cc 100644 --- a/pkgs/by-name/sh/shared-mime-info/package.nix +++ b/pkgs/by-name/sh/shared-mime-info/package.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { homepage = "http://freedesktop.org/wiki/Software/shared-mime-info"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; - maintainers = lib.teams.freedesktop.members ++ [ maintainers.mimame ]; + maintainers = lib.teams.freedesktop.members ++ [ lib.maintainers.mimame ]; mainProgram = "update-mime-database"; }; } diff --git a/pkgs/by-name/si/sigrok-cli/package.nix b/pkgs/by-name/si/sigrok-cli/package.nix index b9516378695828..102f6a98539660 100644 --- a/pkgs/by-name/si/sigrok-cli/package.nix +++ b/pkgs/by-name/si/sigrok-cli/package.nix @@ -9,7 +9,7 @@ libsigrokdecode, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "sigrok-cli"; version = "0.7.2-unstable-2023-04-10"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { mainProgram = "sigrok-cli"; homepage = "https://sigrok.org/"; license = lib.licenses.gpl3Plus; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ bjornfor vifino diff --git a/pkgs/by-name/si/simde/package.nix b/pkgs/by-name/si/simde/package.nix index 5f556a103dc531..1cf764508965c8 100644 --- a/pkgs/by-name/si/simde/package.nix +++ b/pkgs/by-name/si/simde/package.nix @@ -27,8 +27,8 @@ stdenv.mkDerivation rec { 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 ( - with platforms; + platforms = lib.flatten ( + with lib.platforms; [ arm armv7 diff --git a/pkgs/by-name/si/singular/package.nix b/pkgs/by-name/si/singular/package.nix index a9783e3207862d..d06d37fa315341 100644 --- a/pkgs/by-name/si/singular/package.nix +++ b/pkgs/by-name/si/singular/package.nix @@ -190,7 +190,7 @@ stdenv.mkDerivation rec { maintainers = lib.teams.sage.members; # 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 platforms.i686 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/sk/skopeo/package.nix b/pkgs/by-name/sk/skopeo/package.nix index 6b9f653a07928e..8be635f2ec58e3 100644 --- a/pkgs/by-name/sk/skopeo/package.nix +++ b/pkgs/by-name/sk/skopeo/package.nix @@ -90,7 +90,7 @@ buildGoModule rec { mainProgram = "skopeo"; homepage = "https://github.com/containers/skopeo"; maintainers = - with maintainers; + with lib.maintainers; [ lewo developer-guy diff --git a/pkgs/by-name/sl/slimserver/package.nix b/pkgs/by-name/sl/slimserver/package.nix index d6747bb15234d8..52a5d147b5f748 100644 --- a/pkgs/by-name/sl/slimserver/package.nix +++ b/pkgs/by-name/sl/slimserver/package.nix @@ -173,7 +173,7 @@ perlPackages.buildPerlPackage rec { description = "Lyrion Music Server (formerly Logitech Media Server) is open-source server software which controls a wide range of Squeezebox audio players"; # the firmware is not under a free license, so we do not include firmware in the default package # https://github.com/LMS-Community/slimserver/blob/public/8.3/License.txt - license = if enableUnfreeFirmware then licenses.unfree else licenses.gpl2Only; + license = if enableUnfreeFirmware then lib.licenses.unfree else lib.licenses.gpl2Only; mainProgram = "slimserver"; maintainers = with lib.maintainers; [ adamcstephens diff --git a/pkgs/by-name/sm/smimesign/package.nix b/pkgs/by-name/sm/smimesign/package.nix index ed5a678035aaeb..33d71c20946ccc 100644 --- a/pkgs/by-name/sm/smimesign/package.nix +++ b/pkgs/by-name/sm/smimesign/package.nix @@ -30,7 +30,7 @@ buildGoModule rec { description = "S/MIME signing utility for macOS and Windows that is compatible with Git"; homepage = "https://github.com/github/smimesign"; license = lib.licenses.mit; - platforms = lib.platforms.darwin ++ platforms.windows; + platforms = lib.platforms.darwin ++ lib.platforms.windows; maintainers = [ lib.maintainers.enorris ]; }; } diff --git a/pkgs/by-name/sn/sn0int/package.nix b/pkgs/by-name/sn/sn0int/package.nix index 786ee91c3f6f89..0b4170f294d4cc 100644 --- a/pkgs/by-name/sn/sn0int/package.nix +++ b/pkgs/by-name/sn/sn0int/package.nix @@ -61,7 +61,7 @@ rustPlatform.buildRustPackage rec { fab xrelkd ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; mainProgram = "sn0int"; }; } diff --git a/pkgs/by-name/sn/sniffglue/package.nix b/pkgs/by-name/sn/sniffglue/package.nix index 1cfdfa6bcd7074..966597d9a5e9f7 100644 --- a/pkgs/by-name/sn/sniffglue/package.nix +++ b/pkgs/by-name/sn/sniffglue/package.nix @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/kpcyrd/sniffglue"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ xrelkd ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; mainProgram = "sniffglue"; }; } diff --git a/pkgs/by-name/sn/snipes/package.nix b/pkgs/by-name/sn/snipes/package.nix index 516b7747703eef..be86d1e97f0ddc 100644 --- a/pkgs/by-name/sn/snipes/package.nix +++ b/pkgs/by-name/sn/snipes/package.nix @@ -40,7 +40,7 @@ in stdenv.mkDerivation { description = "Modern port of the classic 1982 text-mode game Snipes"; mainProgram = "snipes"; homepage = "https://www.vogons.org/viewtopic.php?f=7&t=49073"; - license = licenses.free; # This reverse-engineered source code is released with the original authors' permission. + license = lib.licenses.free; # This reverse-engineered source code is released with the original authors' permission. maintainers = with lib.maintainers; [ peterhoeg cybershadow ]; broken = stdenv.hostPlatform.isDarwin; # not supported upstream - https://github.com/Davidebyzero/Snipes/issues/8#issuecomment-433720046 }; diff --git a/pkgs/by-name/sn/snis-assets/package.nix b/pkgs/by-name/sn/snis-assets/package.nix index 43f04775bb29f0..dec91e1cd13f96 100644 --- a/pkgs/by-name/sn/snis-assets/package.nix +++ b/pkgs/by-name/sn/snis-assets/package.nix @@ -43,10 +43,10 @@ stdenv.mkDerivation { description = "Assets for Space Nerds In Space, a multi-player spaceship bridge simulator"; homepage = "https://smcameron.github.io/space-nerds-in-space/"; license = [ - licenses.cc-by-sa-30 - licenses.cc-by-30 - licenses.cc0 - licenses.publicDomain + lib.licenses.cc-by-sa-30 + lib.licenses.cc-by-30 + lib.licenses.cc0 + lib.licenses.publicDomain ]; maintainers = with lib.maintainers; [ alyaeanyx ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/so/solo5/package.nix b/pkgs/by-name/so/solo5/package.nix index 64ddf170d35b57..ac94bf8f3c9b2c 100644 --- a/pkgs/by-name/so/solo5/package.nix +++ b/pkgs/by-name/so/solo5/package.nix @@ -96,7 +96,7 @@ stdenv.mkDerivation { homepage = "https://github.com/solo5/solo5"; license = lib.licenses.isc; maintainers = [ lib.maintainers.ehmry ]; - platforms = mapCartesianProduct ({ arch, os }: "${arch}-${os}") { + platforms = lib.mapCartesianProduct ({ arch, os }: "${arch}-${os}") { arch = [ "aarch64" "x86_64" diff --git a/pkgs/by-name/so/soundtracker/package.nix b/pkgs/by-name/so/soundtracker/package.nix index 239cc08f8a05f7..02fc6bf139fc4c 100644 --- a/pkgs/by-name/so/soundtracker/package.nix +++ b/pkgs/by-name/so/soundtracker/package.nix @@ -79,6 +79,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ fgaz ]; platforms = lib.platforms.all; - hydraPlatforms = platforms.linux; # sdl-config times out on darwin + hydraPlatforms = lib.platforms.linux; # sdl-config times out on darwin }; }) diff --git a/pkgs/by-name/so/soxr/package.nix b/pkgs/by-name/so/soxr/package.nix index 2d4acf8414c175..a2cde1f674a235 100644 --- a/pkgs/by-name/so/soxr/package.nix +++ b/pkgs/by-name/so/soxr/package.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { description = "Audio resampling library"; homepage = "https://soxr.sourceforge.net"; license = lib.licenses.lgpl21Plus; - platforms = lib.platforms.unix ++ platforms.windows; + platforms = lib.platforms.unix ++ lib.platforms.windows; maintainers = [ ]; }; } diff --git a/pkgs/by-name/sp/spdlog/package.nix b/pkgs/by-name/sp/spdlog/package.nix index 500d1e13eb5c62..be54b5b5d5ccab 100644 --- a/pkgs/by-name/sp/spdlog/package.nix +++ b/pkgs/by-name/sp/spdlog/package.nix @@ -57,8 +57,8 @@ stdenv.mkDerivation rec { meta = { description = "Very fast, header only, C++ logging library"; homepage = "https://github.com/gabime/spdlog"; - license = licenses.mit; - maintainers = with maintainers; [ obadz ]; - platforms = platforms.all; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ obadz ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/by-name/sp/spice-up/package.nix b/pkgs/by-name/sp/spice-up/package.nix index 78d7dcdd851e7e..b58a6be0333429 100644 --- a/pkgs/by-name/sp/spice-up/package.nix +++ b/pkgs/by-name/sp/spice-up/package.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { description = "Create simple and beautiful presentations"; homepage = "https://github.com/Philip-Scott/Spice-up"; maintainers = - with maintainers; + with lib.maintainers; [ samdroid-apps xiorcale diff --git a/pkgs/by-name/sq/sqlitecpp/package.nix b/pkgs/by-name/sq/sqlitecpp/package.nix index 4626dd8a649d88..c702ef6d553ac9 100644 --- a/pkgs/by-name/sq/sqlitecpp/package.nix +++ b/pkgs/by-name/sq/sqlitecpp/package.nix @@ -38,8 +38,8 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.mit; platforms = lib.platforms.unix; maintainers = [ - maintainers.jbedo - maintainers.doronbehar + lib.maintainers.jbedo + lib.maintainers.doronbehar ]; }; }) diff --git a/pkgs/by-name/sq/squeezelite/package.nix b/pkgs/by-name/sq/squeezelite/package.nix index 93d1c8c82c40eb..bb235a7d9f8c14 100644 --- a/pkgs/by-name/sq/squeezelite/package.nix +++ b/pkgs/by-name/sq/squeezelite/package.nix @@ -124,6 +124,6 @@ stdenv.mkDerivation { mainProgram = binName; maintainers = with lib.maintainers; [ adamcstephens ]; platforms = - if (audioBackend == "pulse") then platforms.linux else platforms.linux ++ platforms.darwin; + if (audioBackend == "pulse") then lib.platforms.linux else lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/ss/ssl-proxy/package.nix b/pkgs/by-name/ss/ssl-proxy/package.nix index a8da325e3c1f00..0177143881ed86 100644 --- a/pkgs/by-name/ss/ssl-proxy/package.nix +++ b/pkgs/by-name/ss/ssl-proxy/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, }: -buildGoModule rec { +buildGoModule { pname = "ssl-proxy"; version = "0.2.7-unstable-2024-02-05"; @@ -30,6 +30,6 @@ buildGoModule rec { license = lib.licenses.mit; mainProgram = "ssl-proxy"; maintainers = [ lib.maintainers.konst-aa ]; - platforms = lib.platforms.linux ++ platforms.darwin ++ platforms.windows; + platforms = lib.platforms.linux ++ lib.platforms.darwin ++ lib.platforms.windows; }; } diff --git a/pkgs/by-name/st/string-machine/package.nix b/pkgs/by-name/st/string-machine/package.nix index cb4d3b893c0ba4..4c119f4bec7e10 100644 --- a/pkgs/by-name/st/string-machine/package.nix +++ b/pkgs/by-name/st/string-machine/package.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/jpcima/string-machine"; description = "Digital model of electronic string ensemble instrument"; maintainers = [ lib.maintainers.magnetophon ]; - platforms = intersectLists platforms.linux platforms.x86; + platforms = lib.intersectLists lib.platforms.linux lib.platforms.x86; license = lib.licenses.boost; }; } diff --git a/pkgs/by-name/su/sudo/package.nix b/pkgs/by-name/su/sudo/package.nix index 8d6b17badd3762..0979fe170c27b7 100644 --- a/pkgs/by-name/su/sudo/package.nix +++ b/pkgs/by-name/su/sudo/package.nix @@ -92,7 +92,7 @@ stdenv.mkDerivation (finalAttrs: { zlib ]; maintainers = with lib.maintainers; [ rhendric ]; - platforms = lib.platforms.linux ++ platforms.freebsd; + platforms = lib.platforms.linux ++ lib.platforms.freebsd; mainProgram = "sudo"; }; }) diff --git a/pkgs/by-name/su/supersonic/package.nix b/pkgs/by-name/su/supersonic/package.nix index 1d317438420228..6c3d63e671090a 100644 --- a/pkgs/by-name/su/supersonic/package.nix +++ b/pkgs/by-name/su/supersonic/package.nix @@ -105,7 +105,7 @@ buildGoModule rec { mainProgram = "supersonic" + lib.optionalString waylandSupport "-wayland"; description = "A lightweight cross-platform desktop client for Subsonic music servers"; homepage = "https://github.com/dweymouth/supersonic"; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ zane diff --git a/pkgs/by-name/sy/symengine/package.nix b/pkgs/by-name/sy/symengine/package.nix index 12b4a1e3410b1e..0c00fe0e23009e 100644 --- a/pkgs/by-name/sy/symengine/package.nix +++ b/pkgs/by-name/sy/symengine/package.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { meta = { description = "Fast symbolic manipulation library"; homepage = "https://github.com/symengine/symengine"; - platforms = lib.platforms.unix ++ platforms.windows; + platforms = lib.platforms.unix ++ lib.platforms.windows; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.costrouc ]; }; diff --git a/pkgs/by-name/sy/synfigstudio/package.nix b/pkgs/by-name/sy/synfigstudio/package.nix index b6d91e06c2cd19..7c06e5b1460365 100644 --- a/pkgs/by-name/sy/synfigstudio/package.nix +++ b/pkgs/by-name/sy/synfigstudio/package.nix @@ -156,6 +156,6 @@ stdenv.mkDerivation { homepage = "http://www.synfig.org"; license = lib.licenses.gpl3Plus; maintainers = [ ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/ta/tahoe-lafs/package.nix b/pkgs/by-name/ta/tahoe-lafs/package.nix index 813b4c7043b6cb..255ab554aae849 100644 --- a/pkgs/by-name/ta/tahoe-lafs/package.nix +++ b/pkgs/by-name/ta/tahoe-lafs/package.nix @@ -165,7 +165,7 @@ python3Packages.buildPythonApplication rec { ''; homepage = "https://tahoe-lafs.org/"; license = [ - licenses.gpl2Plus # or + lib.licenses.gpl2Plus # or "TGPPLv1+" ]; maintainers = with lib.maintainers; [ MostAwesomeDude ]; diff --git a/pkgs/by-name/ta/tangram/package.nix b/pkgs/by-name/ta/tangram/package.nix index d10b422db299c5..c8033f045c4fab 100644 --- a/pkgs/by-name/ta/tangram/package.nix +++ b/pkgs/by-name/ta/tangram/package.nix @@ -95,7 +95,7 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Only; platforms = lib.platforms.linux; maintainers = - with maintainers; + with lib.maintainers; [ austinbutler chuangzhu diff --git a/pkgs/by-name/ta/tarssh/package.nix b/pkgs/by-name/ta/tarssh/package.nix index 87eb45ed0da6a2..107c8649a27855 100644 --- a/pkgs/by-name/ta/tarssh/package.nix +++ b/pkgs/by-name/ta/tarssh/package.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { meta = { description = "Simple SSH tarpit inspired by endlessh"; homepage = "https://github.com/Freaky/tarssh"; - license = [ licenses.mit ]; + license = [ lib.licenses.mit ]; maintainers = with lib.maintainers; [ sohalt ]; platforms = lib.platforms.unix; mainProgram = "tarssh"; diff --git a/pkgs/by-name/ta/tauon/package.nix b/pkgs/by-name/ta/tauon/package.nix index 8ed878265823a0..58533aafabe1a8 100644 --- a/pkgs/by-name/ta/tauon/package.nix +++ b/pkgs/by-name/ta/tauon/package.nix @@ -147,6 +147,6 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/Taiko2k/TauonMusicBox/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ jansol ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; }) diff --git a/pkgs/by-name/tc/tcb/package.nix b/pkgs/by-name/tc/tcb/package.nix index 12e8e0890f4ddd..605fdd73166052 100644 --- a/pkgs/by-name/tc/tcb/package.nix +++ b/pkgs/by-name/tc/tcb/package.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { ''; 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/td/tdlib/package.nix b/pkgs/by-name/td/tdlib/package.nix index 22c42622563527..614e33da7289e7 100644 --- a/pkgs/by-name/td/tdlib/package.nix +++ b/pkgs/by-name/td/tdlib/package.nix @@ -75,11 +75,11 @@ stdenv.mkDerivation { meta = { description = "Cross-platform library for building Telegram clients"; homepage = "https://core.telegram.org/tdlib/"; - license = [ licenses.boost ]; + license = [ lib.licenses.boost ]; platforms = lib.platforms.unix; maintainers = [ - maintainers.vyorkin - maintainers.vonfry + lib.maintainers.vyorkin + lib.maintainers.vonfry ]; }; } diff --git a/pkgs/by-name/te/tela-icon-theme/package.nix b/pkgs/by-name/te/tela-icon-theme/package.nix index a1befe1f52715f..c315fbfa34f617 100644 --- a/pkgs/by-name/te/tela-icon-theme/package.nix +++ b/pkgs/by-name/te/tela-icon-theme/package.nix @@ -48,7 +48,7 @@ stdenvNoCC.mkDerivation rec { 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 platforms.darwin platforms.unix; + platforms = lib.subtractLists lib.platforms.darwin lib.platforms.unix; maintainers = with lib.maintainers; [ figsoda ]; }; } diff --git a/pkgs/by-name/te/tendermint/package.nix b/pkgs/by-name/te/tendermint/package.nix index 1c1649cb4a636a..4d292f727aa405 100644 --- a/pkgs/by-name/te/tendermint/package.nix +++ b/pkgs/by-name/te/tendermint/package.nix @@ -30,7 +30,7 @@ buildGoModule rec { homepage = "https://tendermint.com/"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ alexfmpe ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; mainProgram = "tendermint"; }; } diff --git a/pkgs/by-name/th/thrift/package.nix b/pkgs/by-name/th/thrift/package.nix index f345d4ffb85f32..dbccff73ec6dba 100644 --- a/pkgs/by-name/th/thrift/package.nix +++ b/pkgs/by-name/th/thrift/package.nix @@ -150,7 +150,7 @@ stdenv.mkDerivation rec { mainProgram = "thrift"; homepage = "https://thrift.apache.org/"; license = lib.licenses.asl20; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ bjornfor ]; }; } diff --git a/pkgs/by-name/ti/tilem/package.nix b/pkgs/by-name/ti/tilem/package.nix index e0015465e156cc..e537cd8522b73f 100644 --- a/pkgs/by-name/ti/tilem/package.nix +++ b/pkgs/by-name/ti/tilem/package.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { siraben clevor ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; mainProgram = "tilem2"; }; } diff --git a/pkgs/by-name/ti/timewarrior/package.nix b/pkgs/by-name/ti/timewarrior/package.nix index ee9a68236950f1..3917ea6341fdf9 100644 --- a/pkgs/by-name/ti/timewarrior/package.nix +++ b/pkgs/by-name/ti/timewarrior/package.nix @@ -41,6 +41,6 @@ stdenv.mkDerivation rec { mrVanDalo ]; mainProgram = "timew"; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/ti/tiny-dfr/package.nix b/pkgs/by-name/ti/tiny-dfr/package.nix index bd9f5e831221a8..e384d1b22330ce 100644 --- a/pkgs/by-name/ti/tiny-dfr/package.nix +++ b/pkgs/by-name/ti/tiny-dfr/package.nix @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { meta = { homepage = "https://github.com/WhatAmISupposedToPutHere/tiny-dfr"; description = "Most basic dynamic function row daemon possible"; - license = [ licenses.asl20 licenses.mit ]; + license = [ lib.licenses.asl20 lib.licenses.mit ]; mainProgram = "tiny-dfr"; maintainers = [ lib.maintainers.qyliss ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/tm/tmuxinator/package.nix b/pkgs/by-name/tm/tmuxinator/package.nix index 85fd66cdd4e912..676393bb432855 100644 --- a/pkgs/by-name/tm/tmuxinator/package.nix +++ b/pkgs/by-name/tm/tmuxinator/package.nix @@ -46,9 +46,9 @@ buildRubyGem rec { meta = { description = "Manage complex tmux sessions easily"; homepage = "https://github.com/tmuxinator/tmuxinator"; - license = licenses.mit; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ auntie ericsagnes ]; - platforms = platforms.unix; + platforms = lib.platforms.unix; mainProgram = "tmuxinator"; }; } diff --git a/pkgs/by-name/to/toml11/package.nix b/pkgs/by-name/to/toml11/package.nix index 0383928de6f9bd..98081ad83be79e 100644 --- a/pkgs/by-name/to/toml11/package.nix +++ b/pkgs/by-name/to/toml11/package.nix @@ -41,6 +41,6 @@ stdenv.mkDerivation (finalAttrs: { ''; license = lib.licenses.mit; maintainers = with lib.maintainers; [ ]; - platforms = lib.platforms.unix ++ platforms.windows; + platforms = lib.platforms.unix ++ lib.platforms.windows; }; }) diff --git a/pkgs/by-name/to/tor-browser/package.nix b/pkgs/by-name/to/tor-browser/package.nix index 82218dac328354..12d5db99ec1d17 100644 --- a/pkgs/by-name/to/tor-browser/package.nix +++ b/pkgs/by-name/to/tor-browser/package.nix @@ -358,7 +358,7 @@ lib.warnIf (useHardenedMalloc != null) mainProgram = "tor-browser"; homepage = "https://www.torproject.org/"; changelog = "https://gitweb.torproject.org/builders/tor-browser-build.git/plain/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt?h=maint-${version}"; - platforms = attrNames sources; + platforms = lib.attrNames sources; maintainers = with lib.maintainers; [ felschr panicgh diff --git a/pkgs/by-name/to/tox-node/package.nix b/pkgs/by-name/to/tox-node/package.nix index 8d4aa4f60cfa2f..b6e9829ca25d0f 100644 --- a/pkgs/by-name/to/tox-node/package.nix +++ b/pkgs/by-name/to/tox-node/package.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { meta = { description = "Server application to run tox node written in pure Rust"; homepage = "https://github.com/tox-rs/tox"; - license = [ licenses.gpl3Plus ]; + license = [ lib.licenses.gpl3Plus ]; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ suhr diff --git a/pkgs/by-name/tr/tracy/package.nix b/pkgs/by-name/tr/tracy/package.nix index cd9ce9ea67598c..b0c78c0fa47ef9 100644 --- a/pkgs/by-name/tr/tracy/package.nix +++ b/pkgs/by-name/tr/tracy/package.nix @@ -136,6 +136,6 @@ stdenv.mkDerivation rec { nagisa paveloom ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/tr/trillian/package.nix b/pkgs/by-name/tr/trillian/package.nix index e85ec8404dee68..76f5c3d6ff9709 100644 --- a/pkgs/by-name/tr/trillian/package.nix +++ b/pkgs/by-name/tr/trillian/package.nix @@ -27,7 +27,7 @@ buildGoModule rec { meta = { homepage = "https://github.com/google/trillian"; description = "Transparent, highly scalable and cryptographically verifiable data store"; - license = [ licenses.asl20 ]; + license = [ lib.licenses.asl20 ]; maintainers = [ ]; }; } diff --git a/pkgs/by-name/ub/ubridge/package.nix b/pkgs/by-name/ub/ubridge/package.nix index a2d74cfd7a9b5d..3ff1884291f90f 100644 --- a/pkgs/by-name/ub/ubridge/package.nix +++ b/pkgs/by-name/ub/ubridge/package.nix @@ -59,6 +59,6 @@ stdenv.mkDerivation rec { primeos anthonyroussel ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/un/unbound/package.nix b/pkgs/by-name/un/unbound/package.nix index 02b2a394ff870e..c6f1ab7c722024 100644 --- a/pkgs/by-name/un/unbound/package.nix +++ b/pkgs/by-name/un/unbound/package.nix @@ -171,6 +171,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.bsd3; homepage = "https://www.unbound.net"; maintainers = [ ]; - platforms = lib.platforms.unix ++ platforms.windows; + platforms = lib.platforms.unix ++ lib.platforms.windows; }; }) diff --git a/pkgs/by-name/un/unibilium/package.nix b/pkgs/by-name/un/unibilium/package.nix index 3a274ab148fba7..65dac13e56bf2e 100644 --- a/pkgs/by-name/un/unibilium/package.nix +++ b/pkgs/by-name/un/unibilium/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = { description = "Very basic terminfo library"; license = lib.licenses.lgpl3Plus; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ pSub ]; }; } diff --git a/pkgs/by-name/un/unshield/package.nix b/pkgs/by-name/un/unshield/package.nix index 24c827f13adf0e..32969b22974f2a 100644 --- a/pkgs/by-name/un/unshield/package.nix +++ b/pkgs/by-name/un/unshield/package.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { description = "Tool and library to extract CAB files from InstallShield installers"; homepage = "https://github.com/twogood/unshield"; license = lib.licenses.mit; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; mainProgram = "unshield"; }; } diff --git a/pkgs/by-name/ut/ut1999/package.nix b/pkgs/by-name/ut/ut1999/package.nix index 73eb9d61c0001e..372a83e009e001 100644 --- a/pkgs/by-name/ut/ut1999/package.nix +++ b/pkgs/by-name/ut/ut1999/package.nix @@ -154,7 +154,7 @@ stdenv.mkDerivation { 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 ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; mainProgram = "ut1999"; diff --git a/pkgs/by-name/ut/utf8proc/package.nix b/pkgs/by-name/ut/utf8proc/package.nix index 961f7152f1e578..3c737c84088972 100644 --- a/pkgs/by-name/ut/utf8proc/package.nix +++ b/pkgs/by-name/ut/utf8proc/package.nix @@ -39,8 +39,8 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; platforms = lib.platforms.all; maintainers = [ - maintainers.ftrvxmtrx - maintainers.sternenseemann + lib.maintainers.ftrvxmtrx + lib.maintainers.sternenseemann ]; }; } diff --git a/pkgs/by-name/va/vault-bin/package.nix b/pkgs/by-name/va/vault-bin/package.nix index fa32994badcb12..63eafe920121fb 100644 --- a/pkgs/by-name/va/vault-bin/package.nix +++ b/pkgs/by-name/va/vault-bin/package.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.bsl11; maintainers = - with maintainers; + with lib.maintainers; teams.serokell.members ++ [ offline diff --git a/pkgs/by-name/ve/velero/package.nix b/pkgs/by-name/ve/velero/package.nix index a01b0e243efc95..da91a15989963e 100644 --- a/pkgs/by-name/ve/velero/package.nix +++ b/pkgs/by-name/ve/velero/package.nix @@ -54,8 +54,8 @@ buildGoModule rec { changelog = "https://github.com/vmware-tanzu/velero/releases/tag/v${version}"; license = lib.licenses.asl20; maintainers = [ - maintainers.mbode - maintainers.bryanasdev000 + lib.maintainers.mbode + lib.maintainers.bryanasdev000 ]; }; } diff --git a/pkgs/by-name/vi/viewnior/package.nix b/pkgs/by-name/vi/viewnior/package.nix index 660e29bf73bad3..ba1cc1df6c4317 100644 --- a/pkgs/by-name/vi/viewnior/package.nix +++ b/pkgs/by-name/vi/viewnior/package.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { smironov artturin ]; - platforms = lib.platforms.gnu ++ platforms.linux; + platforms = lib.platforms.gnu ++ lib.platforms.linux; mainProgram = "viewnior"; }; } diff --git a/pkgs/by-name/vi/vifm/package.nix b/pkgs/by-name/vi/vifm/package.nix index bb7295461968c4..b7c6e570218798 100644 --- a/pkgs/by-name/vi/vifm/package.nix +++ b/pkgs/by-name/vi/vifm/package.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { meta = { description = "Vi-like file manager${lib.optionalString isFullPackage "; Includes support for optional features"}"; maintainers = with lib.maintainers; [ raskin ]; - platforms = if mediaSupport then platforms.linux else platforms.unix; + platforms = if mediaSupport then lib.platforms.linux else lib.platforms.unix; license = lib.licenses.gpl2; downloadPage = "https://vifm.info/downloads.shtml"; homepage = "https://vifm.info/"; diff --git a/pkgs/by-name/vi/virtio-win/package.nix b/pkgs/by-name/vi/virtio-win/package.nix index b9a4a47dd05a4c..2836bb24953ee0 100644 --- a/pkgs/by-name/vi/virtio-win/package.nix +++ b/pkgs/by-name/vi/virtio-win/package.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { description = "Windows VirtIO Drivers"; homepage = "https://docs.fedoraproject.org/en-US/quick-docs/creating-windows-virtual-machines-using-virtio-drivers/index.html"; changelog = "https://fedorapeople.org/groups/virt/virtio-win/CHANGELOG"; - license = [ licenses.bsd3 ]; + license = [ lib.licenses.bsd3 ]; maintainers = with lib.maintainers; [ anthonyroussel ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/vp/vpcs/package.nix b/pkgs/by-name/vp/vpcs/package.nix index 64bf66992666d1..f70cba5ea0438d 100644 --- a/pkgs/by-name/vp/vpcs/package.nix +++ b/pkgs/by-name/vp/vpcs/package.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { ''; inherit (finalAttrs.src.meta) homepage; license = lib.licenses.bsd2; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; mainProgram = "vpcs"; maintainers = with lib.maintainers; [ anthonyroussel ]; }; diff --git a/pkgs/by-name/vp/vpnc-scripts/package.nix b/pkgs/by-name/vp/vpnc-scripts/package.nix index 389c3831493276..3dd7e9de08c0ee 100644 --- a/pkgs/by-name/vp/vpnc-scripts/package.nix +++ b/pkgs/by-name/vp/vpnc-scripts/package.nix @@ -63,6 +63,6 @@ stdenv.mkDerivation { mainProgram = "vpnc-script"; license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ jerith666 ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/vp/vpnc/package.nix b/pkgs/by-name/vp/vpnc/package.nix index eac6ffaa81f28c..ef4bd99205736b 100644 --- a/pkgs/by-name/vp/vpnc/package.nix +++ b/pkgs/by-name/vp/vpnc/package.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation { meta = { homepage = "https://davidepucci.it/doc/vpnc/"; description = "Virtual private network (VPN) client for Cisco's VPN concentrators"; - license = if opensslSupport then licenses.unfree else licenses.gpl2Plus; + license = if opensslSupport then lib.licenses.unfree else lib.licenses.gpl2Plus; platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/vr/vrpn/package.nix b/pkgs/by-name/vr/vrpn/package.nix index df687df77735a4..7285b54f981b58 100644 --- a/pkgs/by-name/vr/vrpn/package.nix +++ b/pkgs/by-name/vr/vrpn/package.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/vrpn/vrpn"; license = lib.licenses.boost; # see https://github.com/vrpn/vrpn/wiki/License - platforms = lib.platforms.darwin ++ platforms.linux; + platforms = lib.platforms.darwin ++ lib.platforms.linux; maintainers = with lib.maintainers; [ ludo ]; }; } diff --git a/pkgs/by-name/vt/vte/package.nix b/pkgs/by-name/vt/vte/package.nix index e34a1e375dd21c..28aa260d750823 100644 --- a/pkgs/by-name/vt/vte/package.nix +++ b/pkgs/by-name/vt/vte/package.nix @@ -181,7 +181,7 @@ stdenv.mkDerivation (finalAttrs: { ''; license = lib.licenses.lgpl3Plus; maintainers = - with maintainers; + with lib.maintainers; [ astsmtl antono diff --git a/pkgs/by-name/vu/vul/package.nix b/pkgs/by-name/vu/vul/package.nix index ac7b10c066df49..720713db7ce844 100644 --- a/pkgs/by-name/vu/vul/package.nix +++ b/pkgs/by-name/vu/vul/package.nix @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { homepage = "https://github.com/LukeSmithxyz/vul"; license = lib.licenses.publicDomain; maintainers = [ - maintainers.j0hax - maintainers.cafkafk + lib.maintainers.j0hax + lib.maintainers.cafkafk ]; mainProgram = "vul"; }; diff --git a/pkgs/by-name/vu/vulkan-loader/package.nix b/pkgs/by-name/vu/vulkan-loader/package.nix index 25d47a10d3d8c1..eefcef133e637f 100644 --- a/pkgs/by-name/vu/vulkan-loader/package.nix +++ b/pkgs/by-name/vu/vulkan-loader/package.nix @@ -52,8 +52,8 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "LunarG Vulkan loader"; homepage = "https://www.lunarg.com"; - platforms = platforms.unix ++ platforms.windows; - license = licenses.asl20; + platforms = lib.platforms.unix ++ lib.platforms.windows; + license = lib.licenses.asl20; maintainers = [ lib.maintainers.ralith ]; broken = finalAttrs.version != vulkan-headers.version; pkgConfigModules = [ "vulkan" ]; diff --git a/pkgs/by-name/wa/wayfarer/package.nix b/pkgs/by-name/wa/wayfarer/package.nix index 71a3d2ce672475..00f7e4dd138c44 100644 --- a/pkgs/by-name/wa/wayfarer/package.nix +++ b/pkgs/by-name/wa/wayfarer/package.nix @@ -60,6 +60,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ fgaz ]; mainProgram = "wayfarer"; - platforms = subtractLists platforms.darwin platforms.unix; + platforms = lib.subtractLists lib.platforms.darwin lib.platforms.unix; }; }) diff --git a/pkgs/by-name/wa/wayland-proxy-virtwl/package.nix b/pkgs/by-name/wa/wayland-proxy-virtwl/package.nix index f1685a3de04548..cfef1983182bd9 100644 --- a/pkgs/by-name/wa/wayland-proxy-virtwl/package.nix +++ b/pkgs/by-name/wa/wayland-proxy-virtwl/package.nix @@ -46,8 +46,8 @@ ocamlPackages.buildDunePackage rec { license = lib.licenses.asl20; mainProgram = "wayland-proxy-virtwl"; maintainers = [ - maintainers.qyliss - maintainers.sternenseemann + lib.maintainers.qyliss + lib.maintainers.sternenseemann ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/we/webp-pixbuf-loader/package.nix b/pkgs/by-name/we/webp-pixbuf-loader/package.nix index 27ef6d457e4cc8..d38471b590d17f 100644 --- a/pkgs/by-name/we/webp-pixbuf-loader/package.nix +++ b/pkgs/by-name/we/webp-pixbuf-loader/package.nix @@ -70,6 +70,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/aruiz/webp-pixbuf-loader"; license = lib.licenses.lgpl2Plus; platforms = lib.platforms.unix; - maintainers = lib.teams.gnome.members ++ [ maintainers.cwyc ]; + maintainers = lib.teams.gnome.members ++ [ lib.maintainers.cwyc ]; }; } diff --git a/pkgs/by-name/wi/widelands/package.nix b/pkgs/by-name/wi/widelands/package.nix index 4fb43cb1986ae3..23463f8b3e5dd8 100644 --- a/pkgs/by-name/wi/widelands/package.nix +++ b/pkgs/by-name/wi/widelands/package.nix @@ -116,7 +116,7 @@ stdenv.mkDerivation rec { raskin jcumming ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; hydraPlatforms = [ ]; }; } diff --git a/pkgs/by-name/wi/win-spice/package.nix b/pkgs/by-name/wi/win-spice/package.nix index 700f321bc3a8df..42001872fadbc8 100644 --- a/pkgs/by-name/wi/win-spice/package.nix +++ b/pkgs/by-name/wi/win-spice/package.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation { meta = { description = "Windows SPICE Drivers"; homepage = "https://www.spice-space.org/"; - license = [ licenses.asl20 ]; # See https://github.com/vrozenfe/qxl-dod + license = [ lib.licenses.asl20 ]; # See https://github.com/vrozenfe/qxl-dod maintainers = [ ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/wi/wiredtiger/package.nix b/pkgs/by-name/wi/wiredtiger/package.nix index b255f292bc0e4d..91f160fd984f5a 100644 --- a/pkgs/by-name/wi/wiredtiger/package.nix +++ b/pkgs/by-name/wi/wiredtiger/package.nix @@ -79,6 +79,6 @@ stdenv.mkDerivation rec { description = ""; mainProgram = "wt"; license = lib.licenses.gpl2; - platforms = intersectLists platforms.unix platforms.x86_64; + platforms = lib.intersectLists lib.platforms.unix lib.platforms.x86_64; }; } diff --git a/pkgs/by-name/wi/wireguard-vanity-keygen/package.nix b/pkgs/by-name/wi/wireguard-vanity-keygen/package.nix index aae59b7a28a6fd..11f1d506d112e9 100644 --- a/pkgs/by-name/wi/wireguard-vanity-keygen/package.nix +++ b/pkgs/by-name/wi/wireguard-vanity-keygen/package.nix @@ -26,7 +26,7 @@ buildGoModule rec { 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 ab556d9180ea88..e1b28c7ca7dcd5 100644 --- a/pkgs/by-name/wl/wlr-layout-ui/package.nix +++ b/pkgs/by-name/wl/wlr-layout-ui/package.nix @@ -36,6 +36,6 @@ python3.pkgs.buildPythonApplication rec { maintainers = with lib.maintainers; [ bnlrnz ]; license = lib.licenses.mit; mainProgram = "wlrlui"; - platforms = subtractLists platforms.darwin platforms.unix; + platforms = lib.subtractLists lib.platforms.darwin lib.platforms.unix; }; } diff --git a/pkgs/by-name/ws/wsysmon/package.nix b/pkgs/by-name/ws/wsysmon/package.nix index 5f64a4569ce740..206f547e0d4079 100644 --- a/pkgs/by-name/ws/wsysmon/package.nix +++ b/pkgs/by-name/ws/wsysmon/package.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = { description = "Windows task manager clone for Linux"; homepage = "https://github.com/SlyFabi/WSysMon"; - license = [ licenses.mit ]; + license = [ lib.licenses.mit ]; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ totoroot ]; mainProgram = "WSysMon"; diff --git a/pkgs/by-name/wt/wtf/package.nix b/pkgs/by-name/wt/wtf/package.nix index f31dc68d2cf5ba..fff07bff28482f 100644 --- a/pkgs/by-name/wt/wtf/package.nix +++ b/pkgs/by-name/wt/wtf/package.nix @@ -44,6 +44,6 @@ buildGoModule rec { license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ kalbasit ]; mainProgram = "wtfutil"; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/x2/x264/package.nix b/pkgs/by-name/x2/x264/package.nix index 64fbecb99da5b8..82ce78e1da36ea 100644 --- a/pkgs/by-name/x2/x264/package.nix +++ b/pkgs/by-name/x2/x264/package.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { mainProgram = "x264"; homepage = "http://www.videolan.org/developers/x264.html"; license = lib.licenses.gpl2Plus; - platforms = lib.platforms.unix ++ platforms.windows; + platforms = lib.platforms.unix ++ lib.platforms.windows; maintainers = [ ]; }; } diff --git a/pkgs/by-name/xa/xavs/package.nix b/pkgs/by-name/xa/xavs/package.nix index 2757f4d99ff71f..bb273781251b5d 100644 --- a/pkgs/by-name/xa/xavs/package.nix +++ b/pkgs/by-name/xa/xavs/package.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { mainProgram = "xavs"; homepage = "https://xavs.sourceforge.net/"; license = lib.licenses.lgpl2; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ codyopel ]; }; } diff --git a/pkgs/by-name/xm/xmedcon/package.nix b/pkgs/by-name/xm/xmedcon/package.nix index c0e8d34690e398..3e44cb5e7343c0 100644 --- a/pkgs/by-name/xm/xmedcon/package.nix +++ b/pkgs/by-name/xm/xmedcon/package.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { homepage = "https://xmedcon.sourceforge.net/"; license = lib.licenses.lgpl2Plus; maintainers = with lib.maintainers; [ arianvp flokli ]; - platforms = lib.platforms.darwin ++ platforms.linux; + platforms = lib.platforms.darwin ++ lib.platforms.linux; }; } diff --git a/pkgs/by-name/xo/xosd/package.nix b/pkgs/by-name/xo/xosd/package.nix index fbc639982b3c98..5accd27643c6d9 100644 --- a/pkgs/by-name/xo/xosd/package.nix +++ b/pkgs/by-name/xo/xosd/package.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { description = "Displays text on your screen"; homepage = "https://sourceforge.net/projects/libxosd"; license = lib.licenses.gpl2Only; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ pSub ]; }; } diff --git a/pkgs/by-name/xp/xpipe/package.nix b/pkgs/by-name/xp/xpipe/package.nix index 461185e0e47110..2c553d9de75202 100644 --- a/pkgs/by-name/xp/xpipe/package.nix +++ b/pkgs/by-name/xp/xpipe/package.nix @@ -150,8 +150,8 @@ stdenvNoCC.mkDerivation rec { sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; changelog = "https://github.com/xpipe-io/${pname}/releases/tag/${version}"; license = [ - licenses.asl20 - licenses.unfree + lib.licenses.asl20 + lib.licenses.unfree ]; maintainers = with lib.maintainers; [ crschnick ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/by-name/ye/yelp-tools/package.nix b/pkgs/by-name/ye/yelp-tools/package.nix index 3da2f53c98485c..a11b43e7df4da3 100644 --- a/pkgs/by-name/ye/yelp-tools/package.nix +++ b/pkgs/by-name/ye/yelp-tools/package.nix @@ -56,7 +56,7 @@ python3.pkgs.buildPythonApplication rec { meta = { homepage = "https://gitlab.gnome.org/GNOME/yelp-tools"; description = "Small programs that help you create, edit, manage, and publish your Mallard or DocBook documentation"; - maintainers = lib.teams.gnome.members ++ (with maintainers; [ domenkozar ]); + maintainers = lib.teams.gnome.members ++ (with lib.maintainers; [ domenkozar ]); license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/yo/yourkit-java/package.nix b/pkgs/by-name/yo/yourkit-java/package.nix index 3cab0722a6426a..1af9f5ae7234ff 100644 --- a/pkgs/by-name/yo/yourkit-java/package.nix +++ b/pkgs/by-name/yo/yourkit-java/package.nix @@ -88,7 +88,7 @@ stdenvNoCC.mkDerivation { 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/yq/yq-go/package.nix b/pkgs/by-name/yq/yq-go/package.nix index 58c2571840b5e6..2d9a6322e21756 100644 --- a/pkgs/by-name/yq/yq-go/package.nix +++ b/pkgs/by-name/yq/yq-go/package.nix @@ -41,7 +41,7 @@ buildGoModule rec { homepage = "https://mikefarah.gitbook.io/yq/"; changelog = "https://github.com/mikefarah/yq/raw/v${version}/release_notes.txt"; mainProgram = "yq"; - license = [ licenses.mit ]; + license = [ lib.licenses.mit ]; maintainers = with lib.maintainers; [ lewo SuperSandro2000 diff --git a/pkgs/by-name/yu/yubikey-agent/package.nix b/pkgs/by-name/yu/yubikey-agent/package.nix index 4217c82cb41d7b..17e5c4e40b9e9a 100644 --- a/pkgs/by-name/yu/yubikey-agent/package.nix +++ b/pkgs/by-name/yu/yubikey-agent/package.nix @@ -57,6 +57,6 @@ buildGoModule rec { philandstuff rawkode ]; - platforms = lib.platforms.darwin ++ platforms.linux; + platforms = lib.platforms.darwin ++ lib.platforms.linux; }; } diff --git a/pkgs/by-name/ze/zeitgeist/package.nix b/pkgs/by-name/ze/zeitgeist/package.nix index 64f32b504eba1d..7c042178e17d52 100644 --- a/pkgs/by-name/ze/zeitgeist/package.nix +++ b/pkgs/by-name/ze/zeitgeist/package.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { meta = { description = "Service which logs the users’s activities and events"; homepage = "https://zeitgeist.freedesktop.org/"; - maintainers = lib.teams.freedesktop.members ++ (with maintainers; [ ]); + maintainers = lib.teams.freedesktop.members ++ (with lib.maintainers; [ ]); license = lib.licenses.lgpl21Plus; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/zi/zitadel/package.nix b/pkgs/by-name/zi/zitadel/package.nix index 1df533e842071d..779c8fa755910d 100644 --- a/pkgs/by-name/zi/zitadel/package.nix +++ b/pkgs/by-name/zi/zitadel/package.nix @@ -151,9 +151,9 @@ buildGoModule rec { description = "Identity and access management platform"; homepage = "https://zitadel.com/"; downloadPage = "https://github.com/zitadel/zitadel/releases"; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; license = lib.licenses.asl20; - sourceProvenance = [ sourceTypes.fromSource ]; + sourceProvenance = [ lib.sourceTypes.fromSource ]; maintainers = [ lib.maintainers.nrabulinski ]; }; } diff --git a/pkgs/by-name/zm/zmqpp/package.nix b/pkgs/by-name/zm/zmqpp/package.nix index aa0b48fa47fd62..0a539fe07393e8 100644 --- a/pkgs/by-name/zm/zmqpp/package.nix +++ b/pkgs/by-name/zm/zmqpp/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { inherit (src.meta) homepage; description = "C++ wrapper for czmq. Aims to be minimal, simple and consistent"; license = lib.licenses.lgpl3; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ chris-martin ]; }; } diff --git a/pkgs/desktops/enlightenment/efl/default.nix b/pkgs/desktops/enlightenment/efl/default.nix index 933a924a66d3f7..5253ebfef898ef 100644 --- a/pkgs/desktops/enlightenment/efl/default.nix +++ b/pkgs/desktops/enlightenment/efl/default.nix @@ -219,7 +219,7 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.linux; maintainers = - with maintainers; + with lib.maintainers; [ matejc ftrvxmtrx diff --git a/pkgs/desktops/enlightenment/enlightenment/default.nix b/pkgs/desktops/enlightenment/enlightenment/default.nix index 5c1ad8663a1c21..7bc0a6529376a1 100644 --- a/pkgs/desktops/enlightenment/enlightenment/default.nix +++ b/pkgs/desktops/enlightenment/enlightenment/default.nix @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd2; platforms = lib.platforms.linux; maintainers = - with maintainers; + with lib.maintainers; [ matejc ftrvxmtrx diff --git a/pkgs/desktops/enlightenment/rage/default.nix b/pkgs/desktops/enlightenment/rage/default.nix index 9fd5f1e0af6b82..64dbb699d59d57 100644 --- a/pkgs/desktops/enlightenment/rage/default.nix +++ b/pkgs/desktops/enlightenment/rage/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd2; platforms = lib.platforms.linux; maintainers = - with maintainers; + with lib.maintainers; [ matejc ftrvxmtrx diff --git a/pkgs/desktops/enlightenment/terminology/default.nix b/pkgs/desktops/enlightenment/terminology/default.nix index fd2276bdaad84a..bd88d2a1b70e69 100644 --- a/pkgs/desktops/enlightenment/terminology/default.nix +++ b/pkgs/desktops/enlightenment/terminology/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd2; platforms = lib.platforms.linux; maintainers = - with maintainers; + with lib.maintainers; [ matejc ftrvxmtrx diff --git a/pkgs/desktops/gnome/extensions/clock-override/default.nix b/pkgs/desktops/gnome/extensions/clock-override/default.nix index 7b81ffa3f74c0d..2092cd7f17130a 100644 --- a/pkgs/desktops/gnome/extensions/clock-override/default.nix +++ b/pkgs/desktops/gnome/extensions/clock-override/default.nix @@ -45,6 +45,6 @@ stdenv.mkDerivation rec { 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/gsconnect/default.nix b/pkgs/desktops/gnome/extensions/gsconnect/default.nix index b4968430fb15df..d2baf5943fecb5 100644 --- a/pkgs/desktops/gnome/extensions/gsconnect/default.nix +++ b/pkgs/desktops/gnome/extensions/gsconnect/default.nix @@ -115,7 +115,7 @@ stdenv.mkDerivation rec { description = "KDE Connect implementation for Gnome Shell"; homepage = "https://github.com/GSConnect/gnome-shell-extension-gsconnect/wiki"; license = lib.licenses.gpl2Plus; - maintainers = lib.teams.gnome.members ++ [ maintainers.doronbehar ]; + maintainers = lib.teams.gnome.members ++ [ lib.maintainers.doronbehar ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/desktops/gnome/extensions/icon-hider/default.nix b/pkgs/desktops/gnome/extensions/icon-hider/default.nix index 3fa910a02b9853..18406b30778a87 100644 --- a/pkgs/desktops/gnome/extensions/icon-hider/default.nix +++ b/pkgs/desktops/gnome/extensions/icon-hider/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ ]; platforms = gnome-shell.meta.platforms; homepage = "https://github.com/ikalnytskyi/gnome-shell-extension-icon-hider"; - 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/pidgin-im-integration/default.nix b/pkgs/desktops/gnome/extensions/pidgin-im-integration/default.nix index 31bd95f22d25d9..ecad4292232ade 100644 --- a/pkgs/desktops/gnome/extensions/pidgin-im-integration/default.nix +++ b/pkgs/desktops/gnome/extensions/pidgin-im-integration/default.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - glib, gnome-shell, }: @@ -40,6 +39,6 @@ stdenv.mkDerivation rec { 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 93337aa38995d1..49017b07829089 100644 --- a/pkgs/desktops/gnome/extensions/unite/default.nix +++ b/pkgs/desktops/gnome/extensions/unite/default.nix @@ -45,6 +45,6 @@ stdenv.mkDerivation rec { 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/mate/marco/default.nix b/pkgs/desktops/mate/marco/default.nix index 05984072105209..8e12758de583e6 100644 --- a/pkgs/desktops/mate/marco/default.nix +++ b/pkgs/desktops/mate/marco/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { meta = { description = "MATE default window manager"; homepage = "https://github.com/mate-desktop/marco"; - license = [ licenses.gpl2Plus ]; + license = [ lib.licenses.gpl2Plus ]; platforms = lib.platforms.unix; maintainers = lib.teams.mate.members; }; diff --git a/pkgs/desktops/mate/mate-calc/default.nix b/pkgs/desktops/mate/mate-calc/default.nix index d82fddee49d8ca..1b7df3a89e1a06 100644 --- a/pkgs/desktops/mate/mate-calc/default.nix +++ b/pkgs/desktops/mate/mate-calc/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { meta = { description = "Calculator for the MATE desktop"; homepage = "https://mate-desktop.org"; - license = [ licenses.gpl2Plus ]; + license = [ lib.licenses.gpl2Plus ]; platforms = lib.platforms.linux; maintainers = lib.teams.mate.members; }; diff --git a/pkgs/desktops/mate/mate-media/default.nix b/pkgs/desktops/mate/mate-media/default.nix index 7944cf7cc9b961..34e8f3507a4de8 100644 --- a/pkgs/desktops/mate/mate-media/default.nix +++ b/pkgs/desktops/mate/mate-media/default.nix @@ -55,6 +55,6 @@ stdenv.mkDerivation rec { homepage = "https://mate-desktop.org"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; - maintainers = lib.teams.mate.members ++ (with maintainers; [ chpatrick ]); + maintainers = lib.teams.mate.members ++ (with lib.maintainers; [ chpatrick ]); }; } diff --git a/pkgs/desktops/mate/mate-polkit/default.nix b/pkgs/desktops/mate/mate-polkit/default.nix index 208aeb47a2dcff..3b71bef0eb7d5f 100644 --- a/pkgs/desktops/mate/mate-polkit/default.nix +++ b/pkgs/desktops/mate/mate-polkit/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = { description = "Integrates polkit authentication for MATE desktop"; homepage = "https://mate-desktop.org"; - license = [ licenses.gpl2Plus ]; + license = [ lib.licenses.gpl2Plus ]; platforms = lib.platforms.unix; maintainers = lib.teams.mate.members; }; diff --git a/pkgs/desktops/mate/mate-power-manager/default.nix b/pkgs/desktops/mate/mate-power-manager/default.nix index 02137eee864ecd..f8580c97eaced2 100644 --- a/pkgs/desktops/mate/mate-power-manager/default.nix +++ b/pkgs/desktops/mate/mate-power-manager/default.nix @@ -66,6 +66,6 @@ stdenv.mkDerivation rec { fdl11Plus ]; platforms = lib.platforms.unix; - maintainers = lib.teams.mate.members ++ (with maintainers; [ chpatrick ]); + maintainers = lib.teams.mate.members ++ (with lib.maintainers; [ chpatrick ]); }; } diff --git a/pkgs/desktops/mate/mate-system-monitor/default.nix b/pkgs/desktops/mate/mate-system-monitor/default.nix index 17b1028a59c483..a0adf2bbff35fc 100644 --- a/pkgs/desktops/mate/mate-system-monitor/default.nix +++ b/pkgs/desktops/mate/mate-system-monitor/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { description = "System monitor for the MATE desktop"; mainProgram = "mate-system-monitor"; homepage = "https://mate-desktop.org"; - license = [ licenses.gpl2Plus ]; + license = [ lib.licenses.gpl2Plus ]; platforms = lib.platforms.unix; maintainers = lib.teams.mate.members; }; diff --git a/pkgs/desktops/mate/mate-tweak/default.nix b/pkgs/desktops/mate/mate-tweak/default.nix index 264e8ce7a8b2e3..a965a971426a54 100644 --- a/pkgs/desktops/mate/mate-tweak/default.nix +++ b/pkgs/desktops/mate/mate-tweak/default.nix @@ -80,7 +80,7 @@ python3Packages.buildPythonApplication rec { description = "Tweak tool for the MATE Desktop"; homepage = "https://github.com/ubuntu-mate/mate-tweak"; changelog = "https://github.com/ubuntu-mate/mate-tweak/releases/tag/${version}"; - license = [ licenses.gpl2Plus ]; + license = [ lib.licenses.gpl2Plus ]; platforms = lib.platforms.linux; maintainers = lib.teams.mate.members; }; diff --git a/pkgs/desktops/mate/python-caja/default.nix b/pkgs/desktops/mate/python-caja/default.nix index c535468e107f2e..4dc9c0e6af4278 100644 --- a/pkgs/desktops/mate/python-caja/default.nix +++ b/pkgs/desktops/mate/python-caja/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = { description = "Python binding for Caja components"; homepage = "https://github.com/mate-desktop/python-caja"; - license = [ licenses.gpl2Plus ]; + license = [ lib.licenses.gpl2Plus ]; platforms = lib.platforms.unix; maintainers = lib.teams.mate.members; }; diff --git a/pkgs/desktops/xfce/core/thunar/wrapper.nix b/pkgs/desktops/xfce/core/thunar/wrapper.nix index 888af41b523c0c..bdcbffb3412a69 100644 --- a/pkgs/desktops/xfce/core/thunar/wrapper.nix +++ b/pkgs/desktops/xfce/core/thunar/wrapper.nix @@ -48,7 +48,7 @@ symlinkJoin { 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 b32a5f00f1c1c4..2010136566f7bd 100644 --- a/pkgs/development/compilers/ccl/default.nix +++ b/pkgs/development/compilers/ccl/default.nix @@ -116,6 +116,6 @@ stdenv.mkDerivation rec { license = lib.licenses.asl20; mainProgram = "ccl"; maintainers = lib.teams.lisp.members; - platforms = attrNames options; + platforms = lib.attrNames options; }; } diff --git a/pkgs/development/compilers/factor-lang/factor99.nix b/pkgs/development/compilers/factor-lang/factor99.nix index 53f573e89f4682..266cd86e92e964 100644 --- a/pkgs/development/compilers/factor-lang/factor99.nix +++ b/pkgs/development/compilers/factor-lang/factor99.nix @@ -218,7 +218,7 @@ stdenv.mkDerivation { ''; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ spacefrogg ]; - platforms = lib.intersectLists platforms.x86_64 platforms.linux; + platforms = lib.intersectLists lib.platforms.x86_64 lib.platforms.linux; mainProgram = "factor"; }; } diff --git a/pkgs/development/compilers/flutter/flutter.nix b/pkgs/development/compilers/flutter/flutter.nix index 2cda9b52d9d6b4..f332ccf1f45ed4 100644 --- a/pkgs/development/compilers/flutter/flutter.nix +++ b/pkgs/development/compilers/flutter/flutter.nix @@ -197,8 +197,8 @@ let "aarch64-darwin" ]; maintainers = - teams.flutter.members - ++ (with maintainers; [ + lib.teams.flutter.members + ++ (with lib.maintainers; [ ericdallo ]); }; diff --git a/pkgs/development/compilers/gerbil/glow-lang.nix b/pkgs/development/compilers/gerbil/glow-lang.nix index f3e7aacd9898b2..6c037059e02875 100644 --- a/pkgs/development/compilers/gerbil/glow-lang.nix +++ b/pkgs/development/compilers/gerbil/glow-lang.nix @@ -49,8 +49,8 @@ rec { meta = { description = "Glow: language for safe Decentralized Applications (DApps)"; homepage = "https://glow-lang.org"; - license = licenses.asl20; - platforms = platforms.unix; + license = lib.licenses.asl20; + platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ fare ]; }; } diff --git a/pkgs/development/compilers/go/1.22.nix b/pkgs/development/compilers/go/1.22.nix index f7f3b7d7dd69a7..6b0c50ed4013d2 100644 --- a/pkgs/development/compilers/go/1.22.nix +++ b/pkgs/development/compilers/go/1.22.nix @@ -197,7 +197,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://go.dev/"; license = lib.licenses.bsd3; maintainers = lib.teams.golang.members; - platforms = lib.platforms.darwin ++ platforms.linux ++ platforms.wasi ++ platforms.freebsd; + platforms = lib.platforms.darwin ++ lib.platforms.linux ++ lib.platforms.wasi ++ lib.platforms.freebsd; mainProgram = "go"; }; }) diff --git a/pkgs/development/compilers/go/1.23.nix b/pkgs/development/compilers/go/1.23.nix index 00e103de80d589..17cab050eff1cf 100644 --- a/pkgs/development/compilers/go/1.23.nix +++ b/pkgs/development/compilers/go/1.23.nix @@ -197,7 +197,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://go.dev/"; license = lib.licenses.bsd3; maintainers = lib.teams.golang.members; - platforms = lib.platforms.darwin ++ platforms.linux ++ platforms.wasi ++ platforms.freebsd; + platforms = lib.platforms.darwin ++ lib.platforms.linux ++ lib.platforms.wasi ++ lib.platforms.freebsd; mainProgram = "go"; }; }) diff --git a/pkgs/development/compilers/go/1.24.nix b/pkgs/development/compilers/go/1.24.nix index 45911008f01b57..741997b5f12c55 100644 --- a/pkgs/development/compilers/go/1.24.nix +++ b/pkgs/development/compilers/go/1.24.nix @@ -195,7 +195,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://go.dev/"; license = lib.licenses.bsd3; maintainers = lib.teams.golang.members; - platforms = lib.platforms.darwin ++ platforms.linux ++ platforms.wasi ++ platforms.freebsd; + platforms = lib.platforms.darwin ++ lib.platforms.linux ++ lib.platforms.wasi ++ lib.platforms.freebsd; mainProgram = "go"; }; }) diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix index cf910e71f58afe..d4a6881fbf583a 100644 --- a/pkgs/development/compilers/haxe/default.nix +++ b/pkgs/development/compilers/haxe/default.nix @@ -144,12 +144,12 @@ let mit ]; # based on upstream opam file maintainers = [ - maintainers.marcweber - maintainers.locallycompact - maintainers.logo - maintainers.bwkam + lib.maintainers.marcweber + lib.maintainers.locallycompact + lib.maintainers.logo + lib.maintainers.bwkam ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; }; in diff --git a/pkgs/development/compilers/mit-scheme/default.nix b/pkgs/development/compilers/mit-scheme/default.nix index 6794542ba2dee8..9b31c05ccc2bde 100644 --- a/pkgs/development/compilers/mit-scheme/default.nix +++ b/pkgs/development/compilers/mit-scheme/default.nix @@ -123,6 +123,6 @@ stdenv.mkDerivation { # Build fails on Cygwin and Darwin: # . - platforms = lib.platforms.gnu ++ platforms.linux ++ platforms.freebsd; + platforms = lib.platforms.gnu ++ lib.platforms.linux ++ lib.platforms.freebsd; }; } diff --git a/pkgs/development/compilers/mozart/binary.nix b/pkgs/development/compilers/mozart/binary.nix index dce52cab2aa1a2..48f9baad899177 100644 --- a/pkgs/development/compilers/mozart/binary.nix +++ b/pkgs/development/compilers/mozart/binary.nix @@ -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/rust/binary.nix b/pkgs/development/compilers/rust/binary.nix index 50f737b029a40a..8847219de85782 100644 --- a/pkgs/development/compilers/rust/binary.nix +++ b/pkgs/development/compilers/rust/binary.nix @@ -37,8 +37,8 @@ rec { description = "Safe, concurrent, practical language"; maintainers = with lib.maintainers; [ qknight ]; license = [ - licenses.mit - licenses.asl20 + lib.licenses.mit + lib.licenses.asl20 ]; }; @@ -141,8 +141,8 @@ rec { description = "Rust package manager"; maintainers = with lib.maintainers; [ qknight ]; license = [ - licenses.mit - licenses.asl20 + lib.licenses.mit + lib.licenses.asl20 ]; }; diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index 29fa655540cca4..62fba549cf6992 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -74,7 +74,7 @@ rustPlatform.buildRustPackage.override { description = "Downloads your Rust project's dependencies and builds your project"; mainProgram = "cargo"; maintainers = lib.teams.rust.members; - license = [ licenses.mit licenses.asl20 ]; + license = [ lib.licenses.mit lib.licenses.asl20 ]; platforms = lib.platforms.unix; # https://github.com/alexcrichton/nghttp2-rs/issues/2 broken = stdenv.hostPlatform.isx86 && stdenv.buildPlatform != stdenv.hostPlatform; diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 0d58104dd98a6f..28c48b795d9c7e 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -414,8 +414,8 @@ stdenv.mkDerivation (finalAttrs: { description = "Safe, concurrent, practical language"; maintainers = with lib.maintainers; [ havvy ] ++ teams.rust.members; license = [ - licenses.mit - licenses.asl20 + lib.licenses.mit + lib.licenses.asl20 ]; platforms = rustc.tier1TargetPlatforms; # If rustc can't target a platform, we also can't build rustc for diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index c307bd20de4ce0..6248dc57b12be3 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -244,7 +244,7 @@ stdenv.mkDerivation (self: { license = lib.licenses.publicDomain; # and FreeBSD mainProgram = "sbcl"; maintainers = lib.teams.lisp.members; - 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/shaderc/default.nix b/pkgs/development/compilers/shaderc/default.nix index 855392c737121f..25a02ea77951e3 100644 --- a/pkgs/development/compilers/shaderc/default.nix +++ b/pkgs/development/compilers/shaderc/default.nix @@ -85,6 +85,6 @@ stdenv.mkDerivation rec { inherit (src.meta) homepage; description = "Collection of tools, libraries and tests for shader compilation"; platforms = lib.platforms.all; - license = [ licenses.asl20 ]; + license = [ lib.licenses.asl20 ]; }; } diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 1a8b77044db981..7ebee03675fd1f 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -119,7 +119,7 @@ let license = lib.licenses.lgpl21Plus; platforms = lib.platforms.unix; maintainers = - with maintainers; + with lib.maintainers; [ antono jtojnar diff --git a/pkgs/development/compilers/yosys/plugins/synlig.nix b/pkgs/development/compilers/yosys/plugins/synlig.nix index cc5b00486394df..1945cebb2e4fdd 100644 --- a/pkgs/development/compilers/yosys/plugins/synlig.nix +++ b/pkgs/development/compilers/yosys/plugins/synlig.nix @@ -84,8 +84,8 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "SystemVerilog support plugin for Yosys"; homepage = "https://github.com/chipsalliance/synlig"; - license = licenses.asl20; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ hzeller ]; - platforms = platforms.all; + platforms = lib.platforms.all; }; }) diff --git a/pkgs/development/coq-modules/iris/default.nix b/pkgs/development/coq-modules/iris/default.nix index c16f9ff9cb426a..aa7efed01085fe 100644 --- a/pkgs/development/coq-modules/iris/default.nix +++ b/pkgs/development/coq-modules/iris/default.nix @@ -6,7 +6,7 @@ version ? null, }: -mkCoqDerivation rec { +mkCoqDerivation { pname = "iris"; domain = "gitlab.mpi-sws.org"; owner = "iris"; @@ -65,8 +65,8 @@ mkCoqDerivation rec { description = "Coq development of the Iris Project"; license = lib.licenses.bsd3; maintainers = [ - maintainers.vbgl - maintainers.ineol + lib.maintainers.vbgl + lib.maintainers.ineol ]; }; } diff --git a/pkgs/development/coq-modules/stdpp/default.nix b/pkgs/development/coq-modules/stdpp/default.nix index 4b30f666226ba7..0f1c16be0715c3 100644 --- a/pkgs/development/coq-modules/stdpp/default.nix +++ b/pkgs/development/coq-modules/stdpp/default.nix @@ -6,7 +6,7 @@ version ? null, }: -mkCoqDerivation rec { +mkCoqDerivation { pname = "stdpp"; inherit version; domain = "gitlab.mpi-sws.org"; @@ -65,8 +65,8 @@ mkCoqDerivation rec { description = "Extended “Standard Library” for Coq"; license = lib.licenses.bsd3; maintainers = [ - maintainers.vbgl - maintainers.ineol + lib.maintainers.vbgl + lib.maintainers.ineol ]; }; } diff --git a/pkgs/development/coq-modules/vscoq-language-server/default.nix b/pkgs/development/coq-modules/vscoq-language-server/default.nix index df188790c23f43..283ab5d2473620 100644 --- a/pkgs/development/coq-modules/vscoq-language-server/default.nix +++ b/pkgs/development/coq-modules/vscoq-language-server/default.nix @@ -39,5 +39,5 @@ ocamlPackages.buildDunePackage { 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; }; + } // lib.optionalAttrs (fetched.broken or false) { coqFilter = true; broken = true; }; } diff --git a/pkgs/development/cuda-modules/nccl/default.nix b/pkgs/development/cuda-modules/nccl/default.nix index c59864b726fef1..9a9dde4ac50244 100644 --- a/pkgs/development/cuda-modules/nccl/default.nix +++ b/pkgs/development/cuda-modules/nccl/default.nix @@ -105,7 +105,7 @@ backendStdenv.mkDerivation (finalAttrs: { # https://forums.developer.nvidia.com/t/can-jetson-orin-support-nccl/232845/9 badPlatforms = lib.optionals cudaFlags.isJetsonBuild [ "aarch64-linux" ]; maintainers = - with maintainers; + with lib.maintainers; [ mdaiter orivej diff --git a/pkgs/development/embedded/arduino/arduino-core/default.nix b/pkgs/development/embedded/arduino/arduino-core/default.nix index dba2ab5854227e..e149c7eba2931c 100644 --- a/pkgs/development/embedded/arduino/arduino-core/default.nix +++ b/pkgs/development/embedded/arduino/arduino-core/default.nix @@ -278,7 +278,7 @@ stdenv.mkDerivation rec { description = "Open-source electronics prototyping platform"; mainProgram = "arduino"; homepage = "https://www.arduino.cc/"; - license = if withTeensyduino then licenses.unfreeRedistributable else licenses.gpl2; + license = if withTeensyduino then lib.licenses.unfreeRedistributable else lib.licenses.gpl2; sourceProvenance = with lib.sourceTypes; [ binaryBytecode binaryNativeCode diff --git a/pkgs/development/interpreters/acl2/default.nix b/pkgs/development/interpreters/acl2/default.nix index 118c5038fa3334..2edcafc539efd6 100644 --- a/pkgs/development/interpreters/acl2/default.nix +++ b/pkgs/development/interpreters/acl2/default.nix @@ -7,8 +7,6 @@ runCommandLocal, makeWrapper, substituteAll, - sbcl, - bash, which, perl, hostname, @@ -189,7 +187,7 @@ stdenv.mkDerivation rec { homepage = "https://www.cs.utexas.edu/users/moore/acl2/"; downloadPage = "https://github.com/acl2-devel/acl2-devel/releases"; license = - with licenses; + with lib.licenses; [ # ACL2 itself is bsd3 bsd3 diff --git a/pkgs/development/interpreters/spidermonkey/common.nix b/pkgs/development/interpreters/spidermonkey/common.nix index ca599d6966efc2..24c6ffd5382fb5 100644 --- a/pkgs/development/interpreters/spidermonkey/common.nix +++ b/pkgs/development/interpreters/spidermonkey/common.nix @@ -244,7 +244,7 @@ stdenv.mkDerivation (finalAttrs: rec { lostnet catap ]; - broken = stdenv.hostPlatform.isDarwin && versionAtLeast version "115"; # Requires SDK 13.3 (see #242666). + broken = stdenv.hostPlatform.isDarwin && lib.versionAtLeast version "115"; # Requires SDK 13.3 (see #242666). platforms = lib.platforms.unix; }; }) diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix index e91e8803931ddf..d32c7a6a565c85 100644 --- a/pkgs/development/libraries/allegro/5.nix +++ b/pkgs/development/libraries/allegro/5.nix @@ -102,6 +102,6 @@ stdenv.mkDerivation rec { homepage = "https://liballeg.org/"; license = lib.licenses.zlib; maintainers = [ lib.maintainers.raskin ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/development/libraries/audio/cubeb/default.nix b/pkgs/development/libraries/audio/cubeb/default.nix index c86ddc7eca9830..d569f91f551e16 100644 --- a/pkgs/development/libraries/audio/cubeb/default.nix +++ b/pkgs/development/libraries/audio/cubeb/default.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation { mainProgram = "cubeb-test"; homepage = "https://github.com/mozilla/cubeb"; license = lib.licenses.isc; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ zhaofengli ]; }; } diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index b81acde7c91002..ea04247c59e12e 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -228,7 +228,7 @@ stdenv.mkDerivation { homepage = "http://boost.org/"; description = "Collection of C++ libraries"; license = lib.licenses.boost; - platforms = lib.platforms.unix ++ platforms.windows; + platforms = lib.platforms.unix ++ lib.platforms.windows; # boost-context lacks support for the N32 ABI on mips64. The build # will succeed, but packages depending on boost-context will fail with # a very cryptic error message. diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index 11d68e1ec06836..0ca263bf52e834 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -140,7 +140,7 @@ stdenv.mkDerivation rec { homepage = "https://www.freedesktop.org/wiki/Software/dbus/"; changelog = "https://gitlab.freedesktop.org/dbus/dbus/-/blob/dbus-${version}/NEWS"; license = lib.licenses.gpl2Plus; # most is also under AFL-2.1 - maintainers = lib.teams.freedesktop.members ++ (with maintainers; [ ]); + maintainers = lib.teams.freedesktop.members ++ (with lib.maintainers; [ ]); platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 1a5a9389805d8e..7421911aeb688e 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -313,7 +313,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://www.gdal.org/"; license = lib.licenses.mit; maintainers = - with maintainers; + with lib.maintainers; teams.geospatial.members ++ [ marcweber diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/development/libraries/glew/default.nix index b4803b2e40ab26..dc230ba8aea3f3 100644 --- a/pkgs/development/libraries/glew/default.nix +++ b/pkgs/development/libraries/glew/default.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation (finalAttrs: { ]; # For full details, see https://github.com/nigels-com/glew#copyright-and-licensing pkgConfigModules = [ "glew" ]; platforms = - with platforms; + with lib.platforms; if enableEGL then subtractLists darwin mesa.meta.platforms else mesa.meta.platforms; }; }) diff --git a/pkgs/development/libraries/glibmm/2.68.nix b/pkgs/development/libraries/glibmm/2.68.nix index 42e9e59e22983c..ceac5f558d87cf 100644 --- a/pkgs/development/libraries/glibmm/2.68.nix +++ b/pkgs/development/libraries/glibmm/2.68.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { description = "C++ interface to the GLib library"; homepage = "https://gtkmm.org/"; license = lib.licenses.lgpl2Plus; - maintainers = lib.teams.gnome.members ++ (with maintainers; [ raskin ]); + maintainers = lib.teams.gnome.members ++ (with lib.maintainers; [ raskin ]); platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index ba5efc631ea86e..70c0d5ab4a53b6 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -175,8 +175,8 @@ stdenv.mkDerivation (finalAttrs: { description = "Middleware layer between C libraries and language bindings"; homepage = "https://gi.readthedocs.io/"; maintainers = - teams.gnome.members - ++ (with maintainers; [ + lib.teams.gnome.members + ++ (with lib.maintainers; [ lovek323 artturin ]); diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index 055231e7f719c4..599b6e867ab489 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -374,8 +374,8 @@ stdenv.mkDerivation rec { something - be it a good code review, some documentation, a set of tests, a real live maintainer, or some actual wide use. ''; - license = if enableGplPlugins then licenses.gpl2Plus else licenses.lgpl2Plus; - platforms = lib.platforms.linux ++ platforms.darwin; + license = if enableGplPlugins then lib.licenses.gpl2Plus else lib.licenses.lgpl2Plus; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ matthewbauer ]; }; } diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index 088470c64fabb9..c7302f8812df4a 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -216,7 +216,7 @@ stdenv.mkDerivation rec { code, LGPL or LGPL-compatible for the supporting library). ''; license = lib.licenses.lgpl2Plus; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ matthewbauer ]; }; } diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix index 25c4ae895b3029..2a43d4b3c0c5b6 100644 --- a/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { the plug-ins or the supporting libraries might not be how we'd like. The code might be widely known to present patent problems. ''; - license = if enableGplPlugins then licenses.gpl2Plus else licenses.lgpl2Plus; + license = if enableGplPlugins then lib.licenses.gpl2Plus else lib.licenses.lgpl2Plus; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ matthewbauer ]; }; diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix index 188e6b70185dcb..154c31763e014e 100644 --- a/pkgs/development/libraries/gtk/4.x.nix +++ b/pkgs/development/libraries/gtk/4.x.nix @@ -269,7 +269,7 @@ stdenv.mkDerivation (finalAttrs: { ''; homepage = "https://www.gtk.org/"; license = lib.licenses.lgpl2Plus; - maintainers = lib.teams.gnome.members ++ (with maintainers; [ raskin ]); + maintainers = lib.teams.gnome.members ++ (with lib.maintainers; [ raskin ]); platforms = lib.platforms.all; changelog = "https://gitlab.gnome.org/GNOME/gtk/-/raw/${finalAttrs.version}/NEWS"; pkgConfigModules = [ diff --git a/pkgs/development/libraries/gtkd/default.nix b/pkgs/development/libraries/gtkd/default.nix index d39f21d586b65d..f08ef787b612f5 100644 --- a/pkgs/development/libraries/gtkd/default.nix +++ b/pkgs/development/libraries/gtkd/default.nix @@ -161,6 +161,6 @@ stdenv.mkDerivation rec { description = "D binding and OO wrapper for GTK"; homepage = "https://gtkd.org"; license = lib.licenses.lgpl3Plus; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/development/libraries/gtkmm/4.x.nix b/pkgs/development/libraries/gtkmm/4.x.nix index 30f0de24af9236..9dfa16c9089d3f 100644 --- a/pkgs/development/libraries/gtkmm/4.x.nix +++ b/pkgs/development/libraries/gtkmm/4.x.nix @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://gtkmm.org/"; license = lib.licenses.lgpl2Plus; - maintainers = lib.teams.gnome.members ++ (with maintainers; [ raskin ]); + maintainers = lib.teams.gnome.members ++ (with lib.maintainers; [ raskin ]); platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index 880fe92b55c15c..afc4302d83a25a 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -139,7 +139,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/harfbuzz/harfbuzz/raw/${finalAttrs.version}/NEWS"; maintainers = [ ]; license = lib.licenses.mit; - platforms = lib.platforms.unix ++ platforms.windows; + platforms = lib.platforms.unix ++ lib.platforms.windows; pkgConfigModules = [ "harfbuzz" "harfbuzz-gobject" diff --git a/pkgs/development/libraries/hidapi/default.nix b/pkgs/development/libraries/hidapi/default.nix index fee565c90113af..dad9ef00580b88 100644 --- a/pkgs/development/libraries/hidapi/default.nix +++ b/pkgs/development/libraries/hidapi/default.nix @@ -58,6 +58,6 @@ stdenv.mkDerivation (finalAttrs: { "hidapi-hidraw" "hidapi-libusb" ]; - platforms = lib.platforms.unix ++ platforms.windows; + platforms = lib.platforms.unix ++ lib.platforms.windows; }; }) diff --git a/pkgs/development/libraries/java/rhino/default.nix b/pkgs/development/libraries/java/rhino/default.nix index 26b7a663e38064..67eaa2a6dab2cc 100644 --- a/pkgs/development/libraries/java/rhino/default.nix +++ b/pkgs/development/libraries/java/rhino/default.nix @@ -14,7 +14,7 @@ let sha256 = "1pb08d9j81d0wz5wj31idz198iwhqb7mch872n08jh1354rjlqwk"; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "rhino"; version = "1.7R2"; @@ -69,6 +69,6 @@ stdenv.mkDerivation rec { mpl11 # or gpl2Plus ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix index dad67c1ce5d740..754107a60f4137 100644 --- a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix +++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix @@ -27,7 +27,7 @@ mkDerivation { setupHook = ./setup-hook.sh; meta = { - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; homepage = "https://invent.kde.org/frameworks/extra-cmake-modules"; license = lib.licenses.bsd2; }; diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix index 174d0290361d21..dfb05171c44664 100644 --- a/pkgs/development/libraries/kerberos/krb5.nix +++ b/pkgs/development/libraries/kerberos/krb5.nix @@ -156,7 +156,7 @@ stdenv.mkDerivation rec { description = "MIT Kerberos 5"; homepage = "http://web.mit.edu/kerberos/"; license = lib.licenses.mit; - platforms = lib.platforms.unix ++ platforms.windows; + platforms = lib.platforms.unix ++ lib.platforms.windows; }; passthru = { diff --git a/pkgs/development/libraries/kf5gpgmepp/default.nix b/pkgs/development/libraries/kf5gpgmepp/default.nix index 8569e2d77b18bf..c084bbe278ee45 100644 --- a/pkgs/development/libraries/kf5gpgmepp/default.nix +++ b/pkgs/development/libraries/kf5gpgmepp/default.nix @@ -29,7 +29,7 @@ mkDerivation { nativeBuildInputs = [ cmake ]; meta = { - license = [ licenses.lgpl2 ]; + license = [ lib.licenses.lgpl2 ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/development/libraries/kuserfeedback/default.nix b/pkgs/development/libraries/kuserfeedback/default.nix index 410837d285d1c3..f4da50b1fabbc6 100644 --- a/pkgs/development/libraries/kuserfeedback/default.nix +++ b/pkgs/development/libraries/kuserfeedback/default.nix @@ -20,7 +20,7 @@ mkDerivation rec { ]; meta = { - license = [ licenses.mit ]; + license = [ lib.licenses.mit ]; maintainers = [ lib.maintainers.k900 ]; description = "Framework for collecting user feedback for apps via telemetry and surveys"; }; diff --git a/pkgs/development/libraries/kweathercore/default.nix b/pkgs/development/libraries/kweathercore/default.nix index 3c5e62df274713..b2a3d9c3442661 100644 --- a/pkgs/development/libraries/kweathercore/default.nix +++ b/pkgs/development/libraries/kweathercore/default.nix @@ -29,7 +29,7 @@ mkDerivation rec { nativeBuildInputs = [ extra-cmake-modules ]; meta = { - license = [ licenses.cc0 ]; + license = [ lib.licenses.cc0 ]; maintainers = [ ]; description = '' Library to facilitate retrieval of weather information including forecasts and alerts diff --git a/pkgs/development/libraries/libadwaita/default.nix b/pkgs/development/libraries/libadwaita/default.nix index cebc8777a06c2a..6554ea79e2079e 100644 --- a/pkgs/development/libraries/libadwaita/default.nix +++ b/pkgs/development/libraries/libadwaita/default.nix @@ -142,7 +142,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "adwaita-1-demo"; homepage = "https://gitlab.gnome.org/GNOME/libadwaita"; license = lib.licenses.lgpl21Plus; - maintainers = lib.teams.gnome.members ++ (with maintainers; [ dotlambda ]); + maintainers = lib.teams.gnome.members ++ (with lib.maintainers; [ dotlambda ]); platforms = lib.platforms.unix; pkgConfigModules = [ "libadwaita-1" ]; }; diff --git a/pkgs/development/libraries/libdeflate/default.nix b/pkgs/development/libraries/libdeflate/default.nix index e6d76a9ea2502c..6802b0d506ba01 100644 --- a/pkgs/development/libraries/libdeflate/default.nix +++ b/pkgs/development/libraries/libdeflate/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.mit; homepage = "https://github.com/ebiggers/libdeflate"; changelog = "https://github.com/ebiggers/libdeflate/blob/v${finalAttrs.version}/NEWS.md"; - platforms = lib.platforms.unix ++ platforms.windows; + platforms = lib.platforms.unix ++ lib.platforms.windows; maintainers = with lib.maintainers; [ orivej kaction diff --git a/pkgs/development/libraries/libiio/default.nix b/pkgs/development/libraries/libiio/default.nix index 0049709cf4ac91..cdfdd91cfa41ad 100644 --- a/pkgs/development/libraries/libiio/default.nix +++ b/pkgs/development/libraries/libiio/default.nix @@ -100,7 +100,7 @@ stdenv.mkDerivation rec { description = "API for interfacing with the Linux Industrial I/O Subsystem"; homepage = "https://github.com/analogdevicesinc/libiio"; license = lib.licenses.lgpl21Plus; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ thoughtpolice ]; }; } diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix index 6f0255a2fe4b58..af9421b6e9443d 100644 --- a/pkgs/development/libraries/libproxy/default.nix +++ b/pkgs/development/libraries/libproxy/default.nix @@ -134,7 +134,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Library that provides automatic proxy configuration management"; homepage = "https://libproxy.github.io/libproxy/"; license = lib.licenses.lgpl21Plus; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; mainProgram = "proxy"; }; }) diff --git a/pkgs/development/libraries/lief/default.nix b/pkgs/development/libraries/lief/default.nix index a31db33e59fe36..1dc68c63d0523d 100644 --- a/pkgs/development/libraries/lief/default.nix +++ b/pkgs/development/libraries/lief/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { meta = { description = "Library to Instrument Executable Formats"; homepage = "https://lief.quarkslab.com/"; - license = [ licenses.asl20 ]; + license = [ lib.licenses.asl20 ]; platforms = with lib.platforms; linux ++ darwin; maintainers = with lib.maintainers; [ lassulus genericnerdyusername ]; }; diff --git a/pkgs/development/libraries/mapnik/default.nix b/pkgs/development/libraries/mapnik/default.nix index b2ec06d89f77f0..166f2be04c307e 100644 --- a/pkgs/development/libraries/mapnik/default.nix +++ b/pkgs/development/libraries/mapnik/default.nix @@ -126,7 +126,7 @@ stdenv.mkDerivation rec { description = "Open source toolkit for developing mapping applications"; homepage = "https://mapnik.org"; maintainers = - with maintainers; + with lib.maintainers; teams.geospatial.members ++ [ hrdinka diff --git a/pkgs/development/libraries/mbedtls/generic.nix b/pkgs/development/libraries/mbedtls/generic.nix index a1e5c2a17fe76b..9087f26fe05e83 100644 --- a/pkgs/development/libraries/mbedtls/generic.nix +++ b/pkgs/development/libraries/mbedtls/generic.nix @@ -64,8 +64,8 @@ stdenv.mkDerivation rec { changelog = "https://github.com/Mbed-TLS/mbedtls/blob/${pname}-${version}/ChangeLog"; description = "Portable cryptographic and TLS library, formerly known as PolarSSL"; license = [ - licenses.asl20 # or - licenses.gpl2Plus + lib.licenses.asl20 # or + lib.licenses.gpl2Plus ]; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ raphaelr ]; diff --git a/pkgs/development/libraries/medfile/default.nix b/pkgs/development/libraries/medfile/default.nix index b68495856ecaee..8d9f70b78e3536 100644 --- a/pkgs/development/libraries/medfile/default.nix +++ b/pkgs/development/libraries/medfile/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Library to read and write MED files"; homepage = "https://salome-platform.org/"; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; license = lib.licenses.lgpl3Plus; }; }) diff --git a/pkgs/development/libraries/pangomm/2.48.nix b/pkgs/development/libraries/pangomm/2.48.nix index 066e936eaa9ca5..94a963ff05509b 100644 --- a/pkgs/development/libraries/pangomm/2.48.nix +++ b/pkgs/development/libraries/pangomm/2.48.nix @@ -66,8 +66,8 @@ stdenv.mkDerivation rec { homepage = "https://www.pango.org/"; license = lib.licenses.lgpl21Plus; maintainers = - teams.gnome.members - ++ (with maintainers; [ + lib.teams.gnome.members + ++ (with lib.maintainers; [ lovek323 raskin ]); diff --git a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix index 871bbbf30606d1..b58e69a20e8c21 100644 --- a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix +++ b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix @@ -325,6 +325,6 @@ stdenv.mkDerivation rec { nickcao LunNova ]; - platforms = lib.platforms.unix ++ platforms.windows; + platforms = lib.platforms.unix ++ lib.platforms.windows; }; } diff --git a/pkgs/development/libraries/qtforkawesome/default.nix b/pkgs/development/libraries/qtforkawesome/default.nix index 94f4ed60f66409..54813019ff3220 100644 --- a/pkgs/development/libraries/qtforkawesome/default.nix +++ b/pkgs/development/libraries/qtforkawesome/default.nix @@ -57,6 +57,6 @@ stdenv.mkDerivation (finalAttrs: { description = "Library that bundles ForkAwesome for use within Qt applications"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ doronbehar ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; }) diff --git a/pkgs/development/libraries/qtutilities/default.nix b/pkgs/development/libraries/qtutilities/default.nix index 053ed68f018f9d..ebbca4d71ee93f 100644 --- a/pkgs/development/libraries/qtutilities/default.nix +++ b/pkgs/development/libraries/qtutilities/default.nix @@ -40,6 +40,6 @@ stdenv.mkDerivation (finalAttrs: { description = "Common Qt related C++ classes and routines used by @Martchus' applications such as dialogs, widgets and models Topics"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ doronbehar ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; }) diff --git a/pkgs/development/libraries/quarto/default.nix b/pkgs/development/libraries/quarto/default.nix index a9a6f5dd56ea55..0c7192fd2bcc44 100644 --- a/pkgs/development/libraries/quarto/default.nix +++ b/pkgs/development/libraries/quarto/default.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation (final: { Quarto documents are authored using markdown, an easy to write plain text format. ''; homepage = "https://quarto.org/"; - changelog = "https://github.com/quarto-dev/quarto-cli/releases/tag/v${version}"; + changelog = "https://github.com/quarto-dev/quarto-cli/releases/tag/v${final.version}"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ minijackson mrtarantoga ]; platforms = lib.platforms.all; diff --git a/pkgs/development/libraries/readline/8.2.nix b/pkgs/development/libraries/readline/8.2.nix index 6954afc4c1da2e..0f0eee54661f06 100644 --- a/pkgs/development/libraries/readline/8.2.nix +++ b/pkgs/development/libraries/readline/8.2.nix @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ dtzWill ]; - platforms = lib.platforms.unix ++ platforms.windows; + platforms = lib.platforms.unix ++ lib.platforms.windows; branch = "8.2"; }; } diff --git a/pkgs/development/libraries/schroedinger/default.nix b/pkgs/development/libraries/schroedinger/default.nix index 2c3a1766861cfa..8b6696e64990ef 100644 --- a/pkgs/development/libraries/schroedinger/default.nix +++ b/pkgs/development/libraries/schroedinger/default.nix @@ -44,9 +44,9 @@ stdenv.mkDerivation rec { homepage = "https://sourceforge.net/projects/schrodinger/"; maintainers = [ ]; license = [ - licenses.mpl11 - licenses.lgpl2 - licenses.mit + lib.licenses.mpl11 + lib.licenses.lgpl2 + lib.licenses.mit ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index 9d7c08fb6270cf..9434f70f42b93d 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -306,7 +306,7 @@ stdenv.mkDerivation rec { 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/libraries/silgraphite/graphite2.nix b/pkgs/development/libraries/silgraphite/graphite2.nix index 76c06d7b8887c4..0c6cdd265551ca 100644 --- a/pkgs/development/libraries/silgraphite/graphite2.nix +++ b/pkgs/development/libraries/silgraphite/graphite2.nix @@ -75,6 +75,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = [ lib.maintainers.raskin ]; pkgConfigModules = [ "graphite2" ]; mainProgram = "gr2fonttest"; - platforms = lib.platforms.unix ++ platforms.windows; + platforms = lib.platforms.unix ++ lib.platforms.windows; }; }) diff --git a/pkgs/development/libraries/speex/default.nix b/pkgs/development/libraries/speex/default.nix index d04ddeddab897e..c5aeae255f151f 100644 --- a/pkgs/development/libraries/speex/default.nix +++ b/pkgs/development/libraries/speex/default.nix @@ -45,6 +45,6 @@ stdenv.mkDerivation rec { homepage = "https://www.speex.org/"; description = "Open Source/Free Software patent-free audio compression format designed for speech"; license = lib.licenses.bsd3; - platforms = lib.platforms.unix ++ platforms.windows; + platforms = lib.platforms.unix ++ lib.platforms.windows; }; } diff --git a/pkgs/development/libraries/speexdsp/default.nix b/pkgs/development/libraries/speexdsp/default.nix index c41dd59b451a8d..7a91105ec47696 100644 --- a/pkgs/development/libraries/speexdsp/default.nix +++ b/pkgs/development/libraries/speexdsp/default.nix @@ -40,6 +40,6 @@ stdenv.mkDerivation rec { homepage = "https://www.speex.org/"; description = "Open Source/Free Software patent-free audio compression format designed for speech"; license = lib.licenses.bsd3; - platforms = lib.platforms.unix ++ platforms.windows; + platforms = lib.platforms.unix ++ lib.platforms.windows; }; } diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 8b775d772199d3..d124bd0ad00ec9 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -116,7 +116,7 @@ stdenv.mkDerivation rec { license = lib.licenses.publicDomain; mainProgram = "sqlite3"; maintainers = with lib.maintainers; [ np ]; - platforms = lib.platforms.unix ++ platforms.windows; + platforms = lib.platforms.unix ++ lib.platforms.windows; pkgConfigModules = [ "sqlite3" ]; }; } diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix index 506ac8069bb819..ac1e4883059c0b 100644 --- a/pkgs/development/libraries/unixODBCDrivers/default.nix +++ b/pkgs/development/libraries/unixODBCDrivers/default.nix @@ -94,7 +94,7 @@ description = "MariaDB ODBC database driver"; homepage = "https://downloads.mariadb.org/connector-odbc/"; license = lib.licenses.gpl2; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; }; diff --git a/pkgs/development/libraries/vtk/generic.nix b/pkgs/development/libraries/vtk/generic.nix index 4d46b6af322587..69851fa0ba73ef 100644 --- a/pkgs/development/libraries/vtk/generic.nix +++ b/pkgs/development/libraries/vtk/generic.nix @@ -143,6 +143,6 @@ stdenv.mkDerivation { tfmoraes ]; platforms = lib.platforms.unix; - badPlatforms = optionals enableEgl platforms.darwin; + badPlatforms = optionals enableEgl lib.platforms.darwin; }; } diff --git a/pkgs/development/libraries/vulkan-headers/default.nix b/pkgs/development/libraries/vulkan-headers/default.nix index 56db3a72ce333f..c01bfc6ee6b763 100644 --- a/pkgs/development/libraries/vulkan-headers/default.nix +++ b/pkgs/development/libraries/vulkan-headers/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = { description = "Vulkan Header files and API registry"; homepage = "https://www.lunarg.com"; - platforms = lib.platforms.unix ++ platforms.windows; + platforms = lib.platforms.unix ++ lib.platforms.windows; license = lib.licenses.asl20; maintainers = [ lib.maintainers.ralith ]; }; diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 012a3fc0774bb4..9a53a020fb5e75 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -1,8 +1,6 @@ { lib, clangStdenv, - buildPackages, - runCommand, fetchurl, perl, python3, @@ -258,7 +256,7 @@ clangStdenv.mkDerivation (finalAttrs: { "webkit2gtk-4.0" "webkit2gtk-web-extension-4.0" ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = lib.teams.gnome.members; broken = clangStdenv.hostPlatform.isDarwin; }; diff --git a/pkgs/development/libraries/webrtc-audio-processing/0.3.nix b/pkgs/development/libraries/webrtc-audio-processing/0.3.nix index 51b24922f3bcdc..c046360e1b5996 100644 --- a/pkgs/development/libraries/webrtc-audio-processing/0.3.nix +++ b/pkgs/development/libraries/webrtc-audio-processing/0.3.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd3; # https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/blob/v0.3.1/webrtc/typedefs.h # + our patches - platforms = intersectLists platforms.unix (platforms.arm ++ platforms.aarch64 ++ platforms.mips ++ platforms.power ++ platforms.riscv ++ platforms.x86); + platforms = lib.intersectLists lib.platforms.unix (lib.platforms.arm ++ lib.platforms.aarch64 ++ lib.platforms.mips ++ lib.platforms.power ++ lib.platforms.riscv ++ lib.platforms.x86); }; } diff --git a/pkgs/development/libraries/webrtc-audio-processing/default.nix b/pkgs/development/libraries/webrtc-audio-processing/default.nix index 9bca0ac4c5c09b..566afa3b9d4318 100644 --- a/pkgs/development/libraries/webrtc-audio-processing/default.nix +++ b/pkgs/development/libraries/webrtc-audio-processing/default.nix @@ -64,17 +64,17 @@ stdenv.mkDerivation rec { 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 - (platforms.darwin ++ platforms.linux ++ platforms.windows) + (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 ( - platforms.arm - ++ platforms.aarch64 - ++ platforms.mips - ++ platforms.power - ++ platforms.riscv - ++ platforms.x86 + lib.platforms.arm + ++ lib.platforms.aarch64 + ++ lib.platforms.mips + ++ lib.platforms.power + ++ lib.platforms.riscv + ++ lib.platforms.x86 ); # BE platforms are unsupported # https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/issues/31 diff --git a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix index ca320332d3bfdb..d5a2c74d131096 100644 --- a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix +++ b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { homepage = "https://cgit.freedesktop.org/xcb/util-cursor"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ lovek323 ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; outputs = [ diff --git a/pkgs/development/misc/msp430/mspds/binary.nix b/pkgs/development/misc/msp430/mspds/binary.nix index de68b777d37c5d..36f5413e3b6b16 100644 --- a/pkgs/development/misc/msp430/mspds/binary.nix +++ b/pkgs/development/misc/msp430/mspds/binary.nix @@ -11,7 +11,7 @@ let stdenv.hostPlatform.is64bit && !stdenv.hostPlatform.isDarwin ) "_64"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "msp-debug-stack-bin"; version = "3.15.1.1"; src = fetchurl { @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { homepage = "https://www.ti.com/tool/MSPDS"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ aerialx ]; }; } diff --git a/pkgs/development/misc/msp430/mspds/default.nix b/pkgs/development/misc/msp430/mspds/default.nix index 571c3f3642c063..5d8ec5105a6f4d 100644 --- a/pkgs/development/misc/msp430/mspds/default.nix +++ b/pkgs/development/misc/msp430/mspds/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation { description = "TI MSP430 FET debug driver"; homepage = "https://www.ti.com/tool/MSPDS"; license = lib.licenses.bsd3; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ aerialx ]; }; } diff --git a/pkgs/development/ocaml-modules/camlimages/default.nix b/pkgs/development/ocaml-modules/camlimages/default.nix index 54a82014c3ce59..0d0f2cc9988b95 100644 --- a/pkgs/development/ocaml-modules/camlimages/default.nix +++ b/pkgs/development/ocaml-modules/camlimages/default.nix @@ -41,8 +41,8 @@ buildDunePackage rec { description = "OCaml image processing library"; license = lib.licenses.lgpl2; maintainers = [ - maintainers.vbgl - maintainers.mt-caret + lib.maintainers.vbgl + lib.maintainers.mt-caret ]; }; } diff --git a/pkgs/development/ocaml-modules/mirage-crypto/default.nix b/pkgs/development/ocaml-modules/mirage-crypto/default.nix index 7798ac421de7b8..cdb0f9e82fceef 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/default.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/default.nix @@ -40,9 +40,9 @@ buildDunePackage rec { homepage = "https://github.com/mirage/mirage-crypto"; description = "Simple symmetric cryptography for the modern age"; license = [ - licenses.isc # default license - licenses.bsd2 # mirage-crypto-rng-mirage - licenses.mit # mirage-crypto-ec + lib.licenses.isc # default license + lib.licenses.bsd2 # mirage-crypto-rng-mirage + lib.licenses.mit # mirage-crypto-ec ]; maintainers = with lib.maintainers; [ sternenseemann ]; }; diff --git a/pkgs/development/ocaml-modules/ocaml-freestanding/default.nix b/pkgs/development/ocaml-modules/ocaml-freestanding/default.nix index 51ec6c2d3db180..1cc35089351716 100644 --- a/pkgs/development/ocaml-modules/ocaml-freestanding/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-freestanding/default.nix @@ -71,7 +71,7 @@ else maintainers = [ lib.maintainers.sternenseemann ]; homepage = "https://github.com/mirage/ocaml-freestanding"; platforms = builtins.map ({ arch, os }: "${arch}-${os}") ( - cartesianProduct { + lib.cartesianProduct { arch = [ "aarch64" "x86_64" diff --git a/pkgs/development/ocaml-modules/vchan/default.nix b/pkgs/development/ocaml-modules/vchan/default.nix index 92b10c85389a23..b66d63c17f559c 100644 --- a/pkgs/development/ocaml-modules/vchan/default.nix +++ b/pkgs/development/ocaml-modules/vchan/default.nix @@ -40,6 +40,6 @@ buildDunePackage rec { description = "Xen Vchan implementation"; homepage = "https://github.com/mirage/ocaml-vchan"; license = lib.licenses.isc; - maintainers = lib.teams.xen.members ++ [ maintainers.sternenseemann ]; + maintainers = lib.teams.xen.members ++ [ lib.maintainers.sternenseemann ]; }; } diff --git a/pkgs/development/ocaml-modules/xenstore/default.nix b/pkgs/development/ocaml-modules/xenstore/default.nix index 9e0e0f8095ffa4..67273a0fbbc729 100644 --- a/pkgs/development/ocaml-modules/xenstore/default.nix +++ b/pkgs/development/ocaml-modules/xenstore/default.nix @@ -25,7 +25,7 @@ buildDunePackage rec { meta = { description = "Xenstore protocol in pure OCaml"; license = lib.licenses.lgpl21Only; - maintainers = lib.teams.xen.members ++ [ maintainers.sternenseemann ]; + maintainers = lib.teams.xen.members ++ [ lib.maintainers.sternenseemann ]; homepage = "https://github.com/mirage/ocaml-xenstore"; }; } diff --git a/pkgs/development/php-packages/ioncube-loader/default.nix b/pkgs/development/php-packages/ioncube-loader/default.nix index 8bccba22ce8a4b..e3bc199f926e19 100644 --- a/pkgs/development/php-packages/ioncube-loader/default.nix +++ b/pkgs/development/php-packages/ioncube-loader/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation { description = "Use ionCube-encoded files on a web server"; changelog = "https://www.ioncube.com/loaders.php"; homepage = "https://www.ioncube.com"; - sourceProvenance = [ sourceTypes.binaryNativeCode ]; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; license = lib.licenses.unfree; maintainers = with lib.maintainers; [ neverbehave ]; platforms = [ diff --git a/pkgs/development/php-packages/maxminddb/default.nix b/pkgs/development/php-packages/maxminddb/default.nix index 8ab91838fe5f8a..f608025a6434b0 100644 --- a/pkgs/development/php-packages/maxminddb/default.nix +++ b/pkgs/development/php-packages/maxminddb/default.nix @@ -28,6 +28,6 @@ buildPecl { description = "C extension that is a drop-in replacement for MaxMind\\Db\\Reader"; license = with lib.licenses; [ asl20 ]; homepage = "https://github.com/maxmind/MaxMind-DB-Reader-php"; - maintainers = lib.teams.helsinki-systems.members ++ teams.php.members; + maintainers = lib.teams.helsinki-systems.members ++ lib.teams.php.members; }; } diff --git a/pkgs/development/php-packages/memcache/default.nix b/pkgs/development/php-packages/memcache/default.nix index 58fc631b9d3139..cd5e9c7f80bd1e 100644 --- a/pkgs/development/php-packages/memcache/default.nix +++ b/pkgs/development/php-packages/memcache/default.nix @@ -29,6 +29,6 @@ buildPecl rec { description = "PHP extension for interfacing with memcached"; license = lib.licenses.php301; homepage = "https://github.com/websupport-sk/pecl-memcache"; - maintainers = lib.teams.php.members ++ [ maintainers.krzaczek ]; + maintainers = lib.teams.php.members ++ [ lib.maintainers.krzaczek ]; }; } diff --git a/pkgs/development/php-packages/phalcon/default.nix b/pkgs/development/php-packages/phalcon/default.nix index a252cf99a7a38b..934d122403e182 100644 --- a/pkgs/development/php-packages/phalcon/default.nix +++ b/pkgs/development/php-packages/phalcon/default.nix @@ -32,7 +32,7 @@ buildPecl rec { description = "Phalcon is a full stack PHP framework offering low resource consumption and high performance"; license = lib.licenses.bsd3; homepage = "https://phalcon.io"; - maintainers = lib.teams.php.members ++ [ maintainers.krzaczek ]; + maintainers = lib.teams.php.members ++ [ lib.maintainers.krzaczek ]; broken = lib.versionAtLeast php.version "8.4"; }; } diff --git a/pkgs/development/php-packages/relay/default.nix b/pkgs/development/php-packages/relay/default.nix index 155afcb928ec07..49b64ba31069f1 100644 --- a/pkgs/development/php-packages/relay/default.nix +++ b/pkgs/development/php-packages/relay/default.nix @@ -175,7 +175,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Next-generation Redis extension for PHP"; changelog = "https://github.com/cachewerk/relay/releases/tag/v${version}"; homepage = "https://relay.so/"; - sourceProvenance = [ sourceTypes.binaryNativeCode ]; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; license = lib.licenses.unfree; maintainers = with lib.maintainers; [ tillkruss diff --git a/pkgs/development/php-packages/ssh2/default.nix b/pkgs/development/php-packages/ssh2/default.nix index cdc5558871d18d..8253634dcdc27a 100644 --- a/pkgs/development/php-packages/ssh2/default.nix +++ b/pkgs/development/php-packages/ssh2/default.nix @@ -18,6 +18,6 @@ buildPecl rec { description = "PHP bindings for the libssh2 library"; license = lib.licenses.php301; homepage = "https://github.com/php/pecl-networking-ssh2"; - maintainers = lib.teams.php.members ++ [ maintainers.ostrolucky ]; + maintainers = lib.teams.php.members ++ [ lib.maintainers.ostrolucky ]; }; } diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index 814646aa0598b6..92723113fea38b 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -118,6 +118,6 @@ buildPythonPackage rec { license = with lib.licenses; [ bsd2 ]; maintainers = with lib.maintainers; [ fab ]; # angr is pining unicorn - broken = versionAtLeast unicorn.version "2.0.1.post1"; + broken = lib.versionAtLeast unicorn.version "2.0.1.post1"; }; } diff --git a/pkgs/development/python-modules/anytree/default.nix b/pkgs/development/python-modules/anytree/default.nix index 5d7d811471ed72..55b1f761a9c683 100644 --- a/pkgs/development/python-modules/anytree/default.nix +++ b/pkgs/development/python-modules/anytree/default.nix @@ -54,6 +54,6 @@ buildPythonPackage rec { homepage = "https://github.com/c0fec0de/anytree"; changelog = "https://github.com/c0fec0de/anytree/releases/tag/${version}"; license = lib.licenses.asl20; - maintainers = with maitnainers; [ ]; + maintainers = with lib.maitnainers; [ ]; }; } diff --git a/pkgs/development/python-modules/avro-python3/default.nix b/pkgs/development/python-modules/avro-python3/default.nix index 8eb1f996fa182b..0555833e777267 100644 --- a/pkgs/development/python-modules/avro-python3/default.nix +++ b/pkgs/development/python-modules/avro-python3/default.nix @@ -31,8 +31,8 @@ buildPythonPackage rec { license = lib.licenses.asl20; maintainers = [ - maintainers.shlevy - maintainers.timma + lib.maintainers.shlevy + lib.maintainers.timma ]; }; } diff --git a/pkgs/development/python-modules/bentoml/default.nix b/pkgs/development/python-modules/bentoml/default.nix index 6dbace8dc19a5b..e07482ae45b19a 100644 --- a/pkgs/development/python-modules/bentoml/default.nix +++ b/pkgs/development/python-modules/bentoml/default.nix @@ -237,6 +237,6 @@ buildPythonPackage { ]; # AttributeError: 'dict' object has no attribute 'schemas' # https://github.com/bentoml/BentoML/issues/4290 - broken = versionAtLeast cattrs.version "23.2"; + broken = lib.versionAtLeast cattrs.version "23.2"; }; } diff --git a/pkgs/development/python-modules/breezy/default.nix b/pkgs/development/python-modules/breezy/default.nix index cea7dc8896ece8..108d30a713e2f6 100644 --- a/pkgs/development/python-modules/breezy/default.nix +++ b/pkgs/development/python-modules/breezy/default.nix @@ -118,7 +118,7 @@ buildPythonPackage rec { 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/build/default.nix b/pkgs/development/python-modules/build/default.nix index 7526ca4de88977..d6fd248bafbd57 100644 --- a/pkgs/development/python-modules/build/default.nix +++ b/pkgs/development/python-modules/build/default.nix @@ -110,6 +110,6 @@ buildPythonPackage rec { homepage = "https://github.com/pypa/build"; changelog = "https://github.com/pypa/build/blob/${version}/CHANGELOG.rst"; license = lib.licenses.mit; - maintainers = lib.teams.python.members ++ [ maintainers.fab ]; + maintainers = lib.teams.python.members ++ [ lib.maintainers.fab ]; }; } diff --git a/pkgs/development/python-modules/bundlewrap-teamvault/default.nix b/pkgs/development/python-modules/bundlewrap-teamvault/default.nix index 0bdf5228778b0d..cdff1290a573ad 100644 --- a/pkgs/development/python-modules/bundlewrap-teamvault/default.nix +++ b/pkgs/development/python-modules/bundlewrap-teamvault/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { meta = { homepage = "https://github.com/trehn/bundlewrap-teamvault"; description = "Pull secrets from TeamVault into your BundleWrap repo"; - license = [ licenses.gpl3 ]; + license = [ lib.licenses.gpl3 ]; maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/bundlewrap/default.nix b/pkgs/development/python-modules/bundlewrap/default.nix index 9358775fab694f..b1a1d621171a54 100644 --- a/pkgs/development/python-modules/bundlewrap/default.nix +++ b/pkgs/development/python-modules/bundlewrap/default.nix @@ -56,7 +56,7 @@ buildPythonPackage rec { homepage = "https://bundlewrap.org/"; description = "Easy, Concise and Decentralized Config management with Python"; mainProgram = "bw"; - license = [ licenses.gpl3 ]; + license = [ lib.licenses.gpl3 ]; maintainers = with lib.maintainers; [ wamserma ]; }; } diff --git a/pkgs/development/python-modules/clifford/default.nix b/pkgs/development/python-modules/clifford/default.nix index 529e453f46e5cd..48d6fff862cd3b 100644 --- a/pkgs/development/python-modules/clifford/default.nix +++ b/pkgs/development/python-modules/clifford/default.nix @@ -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/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index 69a261365d7d18..b311764fe8aba1 100644 --- a/pkgs/development/python-modules/cryptography/default.nix +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -94,7 +94,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/development/python-modules/deepwave/default.nix b/pkgs/development/python-modules/deepwave/default.nix index 9a8f4cdc28db86..f19006516f964f 100644 --- a/pkgs/development/python-modules/deepwave/default.nix +++ b/pkgs/development/python-modules/deepwave/default.nix @@ -67,7 +67,7 @@ buildPythonPackage rec { description = "Wave propagation modules for PyTorch"; homepage = "https://github.com/ar4/deepwave"; license = lib.licenses.mit; - platforms = intersectLists platforms.x86_64 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 f04b46c1fd837f..50dc80305f8d64 100644 --- a/pkgs/development/python-modules/dependency-injector/default.nix +++ b/pkgs/development/python-modules/dependency-injector/default.nix @@ -67,6 +67,6 @@ buildPythonPackage rec { 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 0510cde039c366..08bee16a7b50fd 100644 --- a/pkgs/development/python-modules/dirigera/default.nix +++ b/pkgs/development/python-modules/dirigera/default.nix @@ -43,6 +43,6 @@ buildPythonPackage rec { 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-auth-ldap/default.nix b/pkgs/development/python-modules/django-auth-ldap/default.nix index 16f30ba53bb038..47f81b680f18f6 100644 --- a/pkgs/development/python-modules/django-auth-ldap/default.nix +++ b/pkgs/development/python-modules/django-auth-ldap/default.nix @@ -52,6 +52,6 @@ buildPythonPackage rec { homepage = "https://github.com/django-auth-ldap/django-auth-ldap"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ mmai ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/development/python-modules/dtschema/default.nix b/pkgs/development/python-modules/dtschema/default.nix index 32e930b287c4a0..3bfec544bde99f 100644 --- a/pkgs/development/python-modules/dtschema/default.nix +++ b/pkgs/development/python-modules/dtschema/default.nix @@ -60,7 +60,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/flask-babel/default.nix b/pkgs/development/python-modules/flask-babel/default.nix index ab5c76633d3a0b..81b9675bacdba7 100644 --- a/pkgs/development/python-modules/flask-babel/default.nix +++ b/pkgs/development/python-modules/flask-babel/default.nix @@ -67,7 +67,7 @@ buildPythonPackage rec { installed automatically for you if you install this library. ''; license = lib.licenses.bsd2; - maintainers = lib.teams.sage.members ++ (with maintainers; [ matejc ]); + maintainers = lib.teams.sage.members ++ (with lib.maintainers; [ matejc ]); homepage = "https://github.com/python-babel/flask-babel"; }; } diff --git a/pkgs/development/python-modules/flask/default.nix b/pkgs/development/python-modules/flask/default.nix index 5220f7449c9913..7d7ab83ffc7816 100644 --- a/pkgs/development/python-modules/flask/default.nix +++ b/pkgs/development/python-modules/flask/default.nix @@ -20,7 +20,6 @@ python-dotenv, # tests - greenlet, pytestCheckHook, # reverse dependencies @@ -67,8 +66,8 @@ buildPythonPackage rec { }; meta = { - changelog = "https://flask.palletsprojects.com/en/${versions.majorMinor version}.x/changes/#version-${ - replaceStrings [ "." ] [ "-" ] version + changelog = "https://flask.palletsprojects.com/en/${lib.versions.majorMinor version}.x/changes/#version-${ + lib.replaceStrings [ "." ] [ "-" ] version }"; homepage = "https://flask.palletsprojects.com/"; description = "Python micro framework for building web applications"; diff --git a/pkgs/development/python-modules/geometric/default.nix b/pkgs/development/python-modules/geometric/default.nix index 2cd3696599b90c..8478eb4ce180e4 100644 --- a/pkgs/development/python-modules/geometric/default.nix +++ b/pkgs/development/python-modules/geometric/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { description = "Geometry optimization code for molecular structures"; mainProgram = "geometric-optimize"; homepage = "https://github.com/leeping/geomeTRIC"; - license = [ licenses.bsd3 ]; + license = [ lib.licenses.bsd3 ]; maintainers = [ lib.maintainers.markuskowa ]; }; } diff --git a/pkgs/development/python-modules/haystack-ai/default.nix b/pkgs/development/python-modules/haystack-ai/default.nix index aa0b242ff49893..98bdd528a9b9ad 100644 --- a/pkgs/development/python-modules/haystack-ai/default.nix +++ b/pkgs/development/python-modules/haystack-ai/default.nix @@ -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/i2c-tools/default.nix b/pkgs/development/python-modules/i2c-tools/default.nix index 1b773f4a50155f..8277bcef3490d8 100644 --- a/pkgs/development/python-modules/i2c-tools/default.nix +++ b/pkgs/development/python-modules/i2c-tools/default.nix @@ -4,7 +4,7 @@ i2c-tools, }: -buildPythonPackage rec { +buildPythonPackage { inherit (i2c-tools) pname version src; format = "setuptools"; @@ -18,7 +18,7 @@ buildPythonPackage rec { description = "wrapper for i2c-tools' smbus stuff"; # from py-smbus/smbusmodule.c - license = [ licenses.gpl2Only ]; + license = [ lib.licenses.gpl2Only ]; maintainers = [ lib.maintainers.evils ]; }; } diff --git a/pkgs/development/python-modules/impacket/default.nix b/pkgs/development/python-modules/impacket/default.nix index fead30ec8378e2..6acf3f630c9c96 100644 --- a/pkgs/development/python-modules/impacket/default.nix +++ b/pkgs/development/python-modules/impacket/default.nix @@ -62,7 +62,7 @@ buildPythonPackage rec { 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/installer/default.nix b/pkgs/development/python-modules/installer/default.nix index d85dbf3da29802..44da2987a84ada 100644 --- a/pkgs/development/python-modules/installer/default.nix +++ b/pkgs/development/python-modules/installer/default.nix @@ -55,6 +55,6 @@ buildPythonPackage rec { homepage = "https://github.com/pypa/installer"; changelog = "https://github.com/pypa/installer/blob/${src.rev}/docs/changelog.md"; license = lib.licenses.mit; - maintainers = lib.teams.python.members ++ [ maintainers.cpcloud ]; + maintainers = lib.teams.python.members ++ [ lib.maintainers.cpcloud ]; }; } diff --git a/pkgs/development/python-modules/intervaltree/default.nix b/pkgs/development/python-modules/intervaltree/default.nix index db7e9f14d9681b..ed18a50246e05c 100644 --- a/pkgs/development/python-modules/intervaltree/default.nix +++ b/pkgs/development/python-modules/intervaltree/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = { description = "Editable interval tree data structure for Python 2 and 3"; homepage = "https://github.com/chaimleib/intervaltree"; - license = [ licenses.asl20 ]; + license = [ lib.licenses.asl20 ]; maintainers = [ lib.maintainers.bennofs ]; }; } diff --git a/pkgs/development/python-modules/m2r/default.nix b/pkgs/development/python-modules/m2r/default.nix index c97d00d9dafb70..d93d2dc6cea3ac 100644 --- a/pkgs/development/python-modules/m2r/default.nix +++ b/pkgs/development/python-modules/m2r/default.nix @@ -45,6 +45,6 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.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 f2aada1e4d04ef..aae0f1b1952441 100644 --- a/pkgs/development/python-modules/markupsafe/default.nix +++ b/pkgs/development/python-modules/markupsafe/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { 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 05bb30bab930a4..d61a7077885189 100644 --- a/pkgs/development/python-modules/md2gemini/default.nix +++ b/pkgs/development/python-modules/md2gemini/default.nix @@ -31,6 +31,6 @@ buildPythonPackage rec { 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/mplfinance/default.nix b/pkgs/development/python-modules/mplfinance/default.nix index e26d1b7845d21f..797aa6ac77680d 100644 --- a/pkgs/development/python-modules/mplfinance/default.nix +++ b/pkgs/development/python-modules/mplfinance/default.nix @@ -30,6 +30,6 @@ buildPythonPackage rec { meta = { description = "Matplotlib utilities for the visualization, and visual analysis, of financial data"; homepage = "https://github.com/matplotlib/mplfinance"; - license = [ licenses.bsd3 ]; + license = [ lib.licenses.bsd3 ]; }; } diff --git a/pkgs/development/python-modules/opentelemetry-api/default.nix b/pkgs/development/python-modules/opentelemetry-api/default.nix index 31b5afe4b820a5..411884efed7da9 100644 --- a/pkgs/development/python-modules/opentelemetry-api/default.nix +++ b/pkgs/development/python-modules/opentelemetry-api/default.nix @@ -65,7 +65,7 @@ let description = "OpenTelemetry Python API"; changelog = "https://github.com/open-telemetry/opentelemetry-python/releases/tag/v${version}"; license = lib.licenses.asl20; - maintainers = lib.teams.deshaw.members ++ [ maintainers.natsukium ]; + maintainers = lib.teams.deshaw.members ++ [ lib.maintainers.natsukium ]; }; }; in diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix index 0859fa93558336..7b6849dc0a3f1f 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix @@ -58,6 +58,6 @@ buildPythonPackage rec { homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/opentelemetry-instrumentation"; changelog = "https://github.com/open-telemetry/opentelemetry-python-contrib/releases/tag/v${version}"; license = lib.licenses.asl20; - maintainers = lib.teams.deshaw.members ++ [ maintainers.natsukium ]; + maintainers = lib.teams.deshaw.members ++ [ lib.maintainers.natsukium ]; }; } diff --git a/pkgs/development/python-modules/packaging/default.nix b/pkgs/development/python-modules/packaging/default.nix index 22b95469df24a3..d6511cb4a9497f 100644 --- a/pkgs/development/python-modules/packaging/default.nix +++ b/pkgs/development/python-modules/packaging/default.nix @@ -57,7 +57,7 @@ let bsd2 asl20 ]; - maintainers = lib.teams.python.members ++ (with maintainers; [ bennofs ]); + maintainers = lib.teams.python.members ++ (with lib.maintainers; [ bennofs ]); }; }; in diff --git a/pkgs/development/python-modules/packbits/default.nix b/pkgs/development/python-modules/packbits/default.nix index d51d0b361db7ed..95f72c2909dbda 100644 --- a/pkgs/development/python-modules/packbits/default.nix +++ b/pkgs/development/python-modules/packbits/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = { description = "PackBits encoder/decoder for Python"; homepage = "https://github.com/psd-tools/packbits"; - license = [ licenses.mit ]; + license = [ lib.licenses.mit ]; maintainers = with lib.maintainers; [ grahamc ]; }; } diff --git a/pkgs/development/python-modules/paddlepaddle/default.nix b/pkgs/development/python-modules/paddlepaddle/default.nix index 63f1eefd5a3480..6cd9e3313ed8e1 100644 --- a/pkgs/development/python-modules/paddlepaddle/default.nix +++ b/pkgs/development/python-modules/paddlepaddle/default.nix @@ -113,7 +113,7 @@ buildPythonPackage { maintainers = with lib.maintainers; [ happysalada ]; platforms = [ "x86_64-linux" ] - ++ optionals (!cudaSupport) [ + ++ lib.optionals (!cudaSupport) [ "x86_64-darwin" "aarch64-darwin" ]; diff --git a/pkgs/development/python-modules/prometrix/default.nix b/pkgs/development/python-modules/prometrix/default.nix index 754786a279074d..a83be5ddf2e2cd 100644 --- a/pkgs/development/python-modules/prometrix/default.nix +++ b/pkgs/development/python-modules/prometrix/default.nix @@ -14,7 +14,7 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage { pname = "prometrix"; version = "0.1.18-unstable-2024-04-30"; pyproject = true; @@ -63,6 +63,6 @@ buildPythonPackage rec { maintainers = with lib.maintainers; [ azahi ]; # 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/pulumi/default.nix b/pkgs/development/python-modules/pulumi/default.nix index 914b70e2097bf8..eebec84a18b4e8 100644 --- a/pkgs/development/python-modules/pulumi/default.nix +++ b/pkgs/development/python-modules/pulumi/default.nix @@ -66,6 +66,6 @@ buildPythonPackage rec { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ teto ]; # https://github.com/pulumi/pulumi/issues/16828 - broken = versionAtLeast protobuf.version "5"; + broken = lib.versionAtLeast protobuf.version "5"; }; } diff --git a/pkgs/development/python-modules/pycmarkgfm/default.nix b/pkgs/development/python-modules/pycmarkgfm/default.nix index fa396d49e2787e..80a3fefcb45c4c 100644 --- a/pkgs/development/python-modules/pycmarkgfm/default.nix +++ b/pkgs/development/python-modules/pycmarkgfm/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { homepage = "https://github.com/zopieux/pycmarkgfm"; description = "Bindings to GitHub's Flavored Markdown (cmark-gfm), with enhanced support for task lists"; changelog = "https://github.com/zopieux/pycmarkgfm/raw/v${version}/CHANGELOG.md"; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ zopieux ]; }; diff --git a/pkgs/development/python-modules/pycurl/default.nix b/pkgs/development/python-modules/pycurl/default.nix index ce5924da81ee65..35e5d18569f609 100644 --- a/pkgs/development/python-modules/pycurl/default.nix +++ b/pkgs/development/python-modules/pycurl/default.nix @@ -100,7 +100,7 @@ buildPythonPackage rec { 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/pyfronius/default.nix b/pkgs/development/python-modules/pyfronius/default.nix index c299c2f607a99a..f18fedc6ec4f2a 100644 --- a/pkgs/development/python-modules/pyfronius/default.nix +++ b/pkgs/development/python-modules/pyfronius/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; # https://github.com/nielstron/pyfronius/issues/18 - broken = versionAtLeast aiohttp.version "3.10.1"; + broken = lib.versionAtLeast aiohttp.version "3.10.1"; }; } diff --git a/pkgs/development/python-modules/pyproj/default.nix b/pkgs/development/python-modules/pyproj/default.nix index 43134375c64b41..337e825e20a4c1 100644 --- a/pkgs/development/python-modules/pyproj/default.nix +++ b/pkgs/development/python-modules/pyproj/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, pytestCheckHook, pythonOlder, substituteAll, @@ -111,7 +110,7 @@ buildPythonPackage rec { changelog = "https://github.com/pyproj4/pyproj/blob/${src.rev}/docs/history.rst"; license = lib.licenses.mit; maintainers = - with maintainers; + with lib.maintainers; teams.geospatial.members ++ [ lsix diff --git a/pkgs/development/python-modules/python-efl/default.nix b/pkgs/development/python-modules/python-efl/default.nix index d1b7388065556b..b169ceacfd075b 100644 --- a/pkgs/development/python-modules/python-efl/default.nix +++ b/pkgs/development/python-modules/python-efl/default.nix @@ -56,7 +56,7 @@ buildPythonPackage rec { lgpl3 ]; maintainers = - with maintainers; + with lib.maintainers; [ matejc ftrvxmtrx diff --git a/pkgs/development/python-modules/pytradfri/default.nix b/pkgs/development/python-modules/pytradfri/default.nix index a1b4ff2dfd9b0d..269acb0fa0eaff 100644 --- a/pkgs/development/python-modules/pytradfri/default.nix +++ b/pkgs/development/python-modules/pytradfri/default.nix @@ -43,6 +43,6 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ dotlambda ]; # https://github.com/home-assistant-libs/pytradfri/issues/720 - broken = versionAtLeast pydantic.version "2"; + broken = lib.versionAtLeast pydantic.version "2"; }; } diff --git a/pkgs/development/python-modules/pytrends/default.nix b/pkgs/development/python-modules/pytrends/default.nix index d28e5d37f870a4..35935564020850 100644 --- a/pkgs/development/python-modules/pytrends/default.nix +++ b/pkgs/development/python-modules/pytrends/default.nix @@ -53,7 +53,7 @@ buildPythonPackage rec { meta = { description = "Pseudo API for Google Trends"; homepage = "https://github.com/GeneralMills/pytrends"; - license = [ licenses.asl20 ]; + license = [ lib.licenses.asl20 ]; maintainers = [ lib.maintainers.mmahut ]; }; } diff --git a/pkgs/development/python-modules/range-typed-integers/default.nix b/pkgs/development/python-modules/range-typed-integers/default.nix index 7cb38e4d6f8b37..ed595423079dbf 100644 --- a/pkgs/development/python-modules/range-typed-integers/default.nix +++ b/pkgs/development/python-modules/range-typed-integers/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { meta = { description = "Package provides integer types that have a specific range of valid values"; homepage = "https://github.com/theCapypara/range-typed-integers"; - license = [ licenses.mit ]; + license = [ lib.licenses.mit ]; maintainers = with lib.maintainers; [ marius851000 ]; }; } diff --git a/pkgs/development/python-modules/repoze-sphinx-autointerface/default.nix b/pkgs/development/python-modules/repoze-sphinx-autointerface/default.nix index 72d97804b8a7d9..6f0d87f3043f93 100644 --- a/pkgs/development/python-modules/repoze-sphinx-autointerface/default.nix +++ b/pkgs/development/python-modules/repoze-sphinx-autointerface/default.nix @@ -49,6 +49,6 @@ buildPythonPackage rec { license = lib.licenses.bsd0; maintainers = with lib.maintainers; [ domenkozar ]; # 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/requirements-detector/default.nix b/pkgs/development/python-modules/requirements-detector/default.nix index b62aa20aa9fee8..7854bbf92839eb 100644 --- a/pkgs/development/python-modules/requirements-detector/default.nix +++ b/pkgs/development/python-modules/requirements-detector/default.nix @@ -46,6 +46,6 @@ buildPythonPackage rec { maintainers = with lib.maintainers; [ kamadorueda ]; mainProgram = "detect-requirements"; # https://github.com/landscapeio/requirements-detector/issues/48 - broken = versionAtLeast astroid.version "3"; + broken = lib.versionAtLeast astroid.version "3"; }; } diff --git a/pkgs/development/python-modules/rfc7464/default.nix b/pkgs/development/python-modules/rfc7464/default.nix index 90c3f29962ace9..16ea67efcf54c8 100644 --- a/pkgs/development/python-modules/rfc7464/default.nix +++ b/pkgs/development/python-modules/rfc7464/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = { homepage = "https://github.com/moshez/rfc7464"; description = "RFC 7464 is a proposed standard for streaming JSON documents"; - license = [ licenses.mit ]; + license = [ lib.licenses.mit ]; maintainers = with lib.maintainers; [ shlevy ]; }; } diff --git a/pkgs/development/python-modules/scikit-learn/default.nix b/pkgs/development/python-modules/scikit-learn/default.nix index 08666ef9257e4b..5283bfe139892b 100644 --- a/pkgs/development/python-modules/scikit-learn/default.nix +++ b/pkgs/development/python-modules/scikit-learn/default.nix @@ -113,9 +113,9 @@ buildPythonPackage rec { description = "Set of python modules for machine learning and data mining"; changelog = let - major = versions.major version; - minor = versions.minor version; - dashVer = replaceStrings [ "." ] [ "-" ] version; + major = lib.versions.major version; + minor = lib.versions.minor version; + dashVer = lib.replaceStrings [ "." ] [ "-" ] version; in "https://scikit-learn.org/stable/whats_new/v${major}.${minor}.html#version-${dashVer}"; homepage = "https://scikit-learn.org"; diff --git a/pkgs/development/python-modules/selenium-wire/default.nix b/pkgs/development/python-modules/selenium-wire/default.nix index 2a143c0fd388b6..31a8f8a43caf10 100644 --- a/pkgs/development/python-modules/selenium-wire/default.nix +++ b/pkgs/development/python-modules/selenium-wire/default.nix @@ -73,6 +73,6 @@ buildPythonPackage rec { 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 aee2231ae2a548..de39281dfc9666 100644 --- a/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix +++ b/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix @@ -35,6 +35,6 @@ buildPythonPackage rec { 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 9feb465bb7fe92..3f109ab50ac5c3 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { 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 d887f1e097543c..764e777d9c3068 100644 --- a/pkgs/development/python-modules/shazamio/default.nix +++ b/pkgs/development/python-modules/shazamio/default.nix @@ -74,6 +74,6 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ figsoda ]; # 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/simpy/default.nix b/pkgs/development/python-modules/simpy/default.nix index 0d83e842563127..848be9269fe23e 100644 --- a/pkgs/development/python-modules/simpy/default.nix +++ b/pkgs/development/python-modules/simpy/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { downloadPage = "https://github.com/simpx/simpy"; homepage = "https://simpy.readthedocs.io/en/${version}/"; description = "Process-based discrete-event simulation framework based on standard Python"; - license = [ licenses.mit ]; + license = [ lib.licenses.mit ]; maintainers = with lib.maintainers; [ dmrauh shlevy diff --git a/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix b/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix index 8c4cd4f0fcf7d8..54157dd5032a36 100644 --- a/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { maintainers = [ ]; # https://github.com/snowflakedb/snowflake-sqlalchemy/issues/380 - broken = versionAtLeast sqlalchemy.version "2"; + broken = lib.versionAtLeast sqlalchemy.version "2"; }; } diff --git a/pkgs/development/python-modules/solo-python/default.nix b/pkgs/development/python-modules/solo-python/default.nix index 4ac142553daff1..46b56b8a421ab0 100644 --- a/pkgs/development/python-modules/solo-python/default.nix +++ b/pkgs/development/python-modules/solo-python/default.nix @@ -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/sphinx-version-warning/default.nix b/pkgs/development/python-modules/sphinx-version-warning/default.nix index a2ba015f04a5b5..890d70ccb53a0d 100644 --- a/pkgs/development/python-modules/sphinx-version-warning/default.nix +++ b/pkgs/development/python-modules/sphinx-version-warning/default.nix @@ -62,7 +62,7 @@ buildPythonPackage { meta = { description = "Sphinx extension to show a warning banner at the top of your documentation"; homepage = "https://github.com/humitos/sphinx-version-warning"; - changelog = "https://github.com/humitos/sphinx-version-warning/blob/${version}/CHANGELOG.rst"; + # changelog = "https://github.com/humitos/sphinx-version-warning/blob/${version}/CHANGELOG.rst"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ kaction ]; }; diff --git a/pkgs/development/python-modules/steamship/default.nix b/pkgs/development/python-modules/steamship/default.nix index b3d657b87fb411..304bca446d71bf 100644 --- a/pkgs/development/python-modules/steamship/default.nix +++ b/pkgs/development/python-modules/steamship/default.nix @@ -54,6 +54,6 @@ buildPythonPackage rec { 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/stevedore/default.nix b/pkgs/development/python-modules/stevedore/default.nix index 06a2e5b96d25b6..be3af2ee20b228 100644 --- a/pkgs/development/python-modules/stevedore/default.nix +++ b/pkgs/development/python-modules/stevedore/default.nix @@ -44,6 +44,6 @@ buildPythonPackage rec { description = "Manage dynamic plugins for Python applications"; homepage = "https://docs.openstack.org/stevedore/"; license = lib.licenses.asl20; - maintainers = lib.teams.openstack.members ++ (with maintainers; [ fab ]); + maintainers = lib.teams.openstack.members ++ (with lib.maintainers; [ fab ]); }; } diff --git a/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix b/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix index b7f1e54e4e626b..5e50ffe4572013 100644 --- a/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix @@ -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/textx/tests.nix b/pkgs/development/python-modules/textx/tests.nix index 14b7ab46888660..0125daca021618 100644 --- a/pkgs/development/python-modules/textx/tests.nix +++ b/pkgs/development/python-modules/textx/tests.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, attrs, click, @@ -53,6 +52,6 @@ buildPythonPackage { meta = { inherit (textx.meta) license maintainers; description = "passthru.tests for textx"; - homepage = textx.homepage + "tree/${version}/" + "tests/"; + homepage = textx.homepage + "tree/${textx.version}/" + "tests/"; }; } diff --git a/pkgs/development/python-modules/tlslite-ng/default.nix b/pkgs/development/python-modules/tlslite-ng/default.nix index 062be5f1276739..b49aae41506d14 100644 --- a/pkgs/development/python-modules/tlslite-ng/default.nix +++ b/pkgs/development/python-modules/tlslite-ng/default.nix @@ -36,7 +36,7 @@ buildPythonPackage { ]; meta = { - changelog = "https://github.com/tlsfuzzer/tlslite-ng/releases/tag/v${version}"; + # changelog = "https://github.com/tlsfuzzer/tlslite-ng/releases/tag/v${version}"; description = "Pure python implementation of SSL and TLS"; homepage = "https://github.com/tlsfuzzer/tlslite-ng"; license = lib.licenses.lgpl21Only; diff --git a/pkgs/development/python-modules/tree-sitter-languages/default.nix b/pkgs/development/python-modules/tree-sitter-languages/default.nix index da7ddc1ee66c92..4231315ce1f9a7 100644 --- a/pkgs/development/python-modules/tree-sitter-languages/default.nix +++ b/pkgs/development/python-modules/tree-sitter-languages/default.nix @@ -59,6 +59,6 @@ buildPythonPackage rec { 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/wand/default.nix b/pkgs/development/python-modules/wand/default.nix index 02c5037dc39044..b23620e0191b4e 100644 --- a/pkgs/development/python-modules/wand/default.nix +++ b/pkgs/development/python-modules/wand/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { changelog = "https://docs.wand-py.org/en/${version}/changes.html"; description = "Ctypes-based simple MagickWand API binding for Python"; homepage = "http://wand-py.org/"; - license = [ licenses.mit ]; + license = [ lib.licenses.mit ]; maintainers = with lib.maintainers; [ dotlambda ]; }; } diff --git a/pkgs/development/python-modules/ward/default.nix b/pkgs/development/python-modules/ward/default.nix index 30b22a2c805e22..56c465fa3cb4d8 100644 --- a/pkgs/development/python-modules/ward/default.nix +++ b/pkgs/development/python-modules/ward/default.nix @@ -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 4d6e87962a4d3b..2b10dd020d3717 100644 --- a/pkgs/development/python-modules/withings-api/default.nix +++ b/pkgs/development/python-modules/withings-api/default.nix @@ -51,6 +51,6 @@ buildPythonPackage rec { homepage = "https://github.com/vangorra/python_withings_api"; 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/python-modules/xcffib/default.nix b/pkgs/development/python-modules/xcffib/default.nix index 4014f12e412b44..69cf3c14a60ca0 100644 --- a/pkgs/development/python-modules/xcffib/default.nix +++ b/pkgs/development/python-modules/xcffib/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { homepage = "https://github.com/tych0/xcffib"; changelog = "https://github.com/tych0/xcffib/releases/tag/v${version}"; license = lib.licenses.asl20; - platforms = lib.platforms.linux ++ platforms.darwin ++ platforms.windows; + platforms = lib.platforms.linux ++ lib.platforms.darwin ++ lib.platforms.windows; maintainers = with lib.maintainers; [ kamilchm ]; }; } diff --git a/pkgs/development/python-modules/ydiff/default.nix b/pkgs/development/python-modules/ydiff/default.nix index 6da910738506c2..376c15288fa943 100644 --- a/pkgs/development/python-modules/ydiff/default.nix +++ b/pkgs/development/python-modules/ydiff/default.nix @@ -53,6 +53,6 @@ buildPythonPackage rec { ''; homepage = "https://github.com/ymattw/ydiff"; license = lib.licenses.bsd3; - maintainers = (with maintainers; [ leenaars ]) ++ teams.deshaw.members; + maintainers = (with lib.maintainers; [ leenaars ]) ++ lib.teams.deshaw.members; }; } diff --git a/pkgs/development/python2-modules/packaging/default.nix b/pkgs/development/python2-modules/packaging/default.nix index 60173409be2a48..f5a0f459bd4e63 100644 --- a/pkgs/development/python2-modules/packaging/default.nix +++ b/pkgs/development/python2-modules/packaging/default.nix @@ -38,8 +38,8 @@ buildPythonPackage rec { description = "Core utilities for Python packages"; homepage = "https://github.com/pypa/packaging"; license = [ - licenses.bsd2 - licenses.asl20 + lib.licenses.bsd2 + lib.licenses.asl20 ]; maintainers = with lib.maintainers; [ bennofs ]; }; diff --git a/pkgs/development/rocm-modules/5/clang-ocl/default.nix b/pkgs/development/rocm-modules/5/clang-ocl/default.nix index 4f8ce8f10a0e5d..304891efbf4f0b 100644 --- a/pkgs/development/rocm-modules/5/clang-ocl/default.nix +++ b/pkgs/development/rocm-modules/5/clang-ocl/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = lib.teams.rocm.members; platforms = lib.platforms.linux; broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; + lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version + || lib.versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/clr/default.nix b/pkgs/development/rocm-modules/5/clr/default.nix index 3b8a060d8c1626..3b5132e50eb710 100644 --- a/pkgs/development/rocm-modules/5/clr/default.nix +++ b/pkgs/development/rocm-modules/5/clr/default.nix @@ -188,7 +188,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ lovesegfault ] ++ teams.rocm.members; platforms = lib.platforms.linux; broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; + lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version + || lib.versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/composable_kernel/default.nix b/pkgs/development/rocm-modules/5/composable_kernel/default.nix index 5b6d5c8bbd3df1..2422affd6230e0 100644 --- a/pkgs/development/rocm-modules/5/composable_kernel/default.nix +++ b/pkgs/development/rocm-modules/5/composable_kernel/default.nix @@ -96,7 +96,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = lib.teams.rocm.members; platforms = lib.platforms.linux; broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; + lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version + || lib.versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/half/default.nix b/pkgs/development/rocm-modules/5/half/default.nix index b9969c5d174b1f..b307a34f9be976 100644 --- a/pkgs/development/rocm-modules/5/half/default.nix +++ b/pkgs/development/rocm-modules/5/half/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = lib.teams.rocm.members; platforms = lib.platforms.unix; broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; + lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version + || lib.versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/hip-common/default.nix b/pkgs/development/rocm-modules/5/hip-common/default.nix index b5c57346c774aa..ee68d7aca171fb 100644 --- a/pkgs/development/rocm-modules/5/hip-common/default.nix +++ b/pkgs/development/rocm-modules/5/hip-common/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ lovesegfault ] ++ teams.rocm.members; platforms = lib.platforms.linux; broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; + lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version + || lib.versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/hipblas/default.nix b/pkgs/development/rocm-modules/5/hipblas/default.nix index 67805a87e44612..17152e2644d55c 100644 --- a/pkgs/development/rocm-modules/5/hipblas/default.nix +++ b/pkgs/development/rocm-modules/5/hipblas/default.nix @@ -111,7 +111,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = lib.teams.rocm.members; platforms = lib.platforms.linux; broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; + lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version + || lib.versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/hipcc/default.nix b/pkgs/development/rocm-modules/5/hipcc/default.nix index 19d240f00fcd15..5ca0fc9c593202 100644 --- a/pkgs/development/rocm-modules/5/hipcc/default.nix +++ b/pkgs/development/rocm-modules/5/hipcc/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ lovesegfault ] ++ teams.rocm.members; platforms = lib.platforms.linux; broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; + lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version + || lib.versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/hipcub/default.nix b/pkgs/development/rocm-modules/5/hipcub/default.nix index b7a6cc17f940b8..eda1dd7314476d 100644 --- a/pkgs/development/rocm-modules/5/hipcub/default.nix +++ b/pkgs/development/rocm-modules/5/hipcub/default.nix @@ -100,7 +100,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = lib.teams.rocm.members; platforms = lib.platforms.linux; broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; + lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version + || lib.versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/hipfft/default.nix b/pkgs/development/rocm-modules/5/hipfft/default.nix index 0b2f3fccbc0235..dd49a210623f25 100644 --- a/pkgs/development/rocm-modules/5/hipfft/default.nix +++ b/pkgs/development/rocm-modules/5/hipfft/default.nix @@ -122,7 +122,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = lib.teams.rocm.members; platforms = lib.platforms.linux; broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; + lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version + || lib.versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/hipfort/default.nix b/pkgs/development/rocm-modules/5/hipfort/default.nix index 6d65901f091885..245fe5704d36de 100644 --- a/pkgs/development/rocm-modules/5/hipfort/default.nix +++ b/pkgs/development/rocm-modules/5/hipfort/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = lib.teams.rocm.members; platforms = lib.platforms.linux; broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; + lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version + || lib.versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/hipify/default.nix b/pkgs/development/rocm-modules/5/hipify/default.nix index 2ec55f0e74b8cb..194873612e8e38 100644 --- a/pkgs/development/rocm-modules/5/hipify/default.nix +++ b/pkgs/development/rocm-modules/5/hipify/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = lib.teams.rocm.members; platforms = lib.platforms.linux; broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; + lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version + || lib.versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/hipsolver/default.nix b/pkgs/development/rocm-modules/5/hipsolver/default.nix index 59d8beab9f83a7..ed85efa5521205 100644 --- a/pkgs/development/rocm-modules/5/hipsolver/default.nix +++ b/pkgs/development/rocm-modules/5/hipsolver/default.nix @@ -112,7 +112,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = lib.teams.rocm.members; platforms = lib.platforms.linux; broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; + lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version + || lib.versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/hipsparse/default.nix b/pkgs/development/rocm-modules/5/hipsparse/default.nix index 571b88ed495477..d211bef9878f5f 100644 --- a/pkgs/development/rocm-modules/5/hipsparse/default.nix +++ b/pkgs/development/rocm-modules/5/hipsparse/default.nix @@ -151,7 +151,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = lib.teams.rocm.members; platforms = lib.platforms.linux; broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; + lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version + || lib.versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/hsa-amd-aqlprofile-bin/default.nix b/pkgs/development/rocm-modules/5/hsa-amd-aqlprofile-bin/default.nix index d1f60210b981c3..c80993a275465c 100644 --- a/pkgs/development/rocm-modules/5/hsa-amd-aqlprofile-bin/default.nix +++ b/pkgs/development/rocm-modules/5/hsa-amd-aqlprofile-bin/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = lib.teams.rocm.members; platforms = lib.platforms.linux; broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; + lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version + || lib.versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/llvm/base.nix b/pkgs/development/rocm-modules/5/llvm/base.nix index dd06404612ea24..6713250626b96b 100644 --- a/pkgs/development/rocm-modules/5/llvm/base.nix +++ b/pkgs/development/rocm-modules/5/llvm/base.nix @@ -196,13 +196,13 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/ROCm/llvm-project"; license = with lib.licenses; [ ncsa ] ++ extraLicenses; maintainers = - with maintainers; + with lib.maintainers; [ acowley lovesegfault ] ++ teams.rocm.members; platforms = lib.platforms.linux; - broken = isBroken || versionAtLeast finalAttrs.version "6.0.0"; + broken = isBroken || lib.versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/migraphx/default.nix b/pkgs/development/rocm-modules/5/migraphx/default.nix index 3f3949382d62c4..9784b0808d77e9 100644 --- a/pkgs/development/rocm-modules/5/migraphx/default.nix +++ b/pkgs/development/rocm-modules/5/migraphx/default.nix @@ -183,7 +183,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = lib.teams.rocm.members; platforms = lib.platforms.linux; broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; + lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version + || lib.versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/miopen/default.nix b/pkgs/development/rocm-modules/5/miopen/default.nix index b1715c74ccce07..a1ca42fb5f6e0b 100644 --- a/pkgs/development/rocm-modules/5/miopen/default.nix +++ b/pkgs/development/rocm-modules/5/miopen/default.nix @@ -267,7 +267,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = lib.teams.rocm.members; platforms = lib.platforms.linux; broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; + lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version + || lib.versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/miopengemm/default.nix b/pkgs/development/rocm-modules/5/miopengemm/default.nix index 6a0abd7d673747..382f22d42ba406 100644 --- a/pkgs/development/rocm-modules/5/miopengemm/default.nix +++ b/pkgs/development/rocm-modules/5/miopengemm/default.nix @@ -144,7 +144,7 @@ stdenv.mkDerivation (finalAttrs: { # They are not making tags or releases, this may break other derivations in the future # Use version major instead of minor, 6.0 will HOPEFULLY have a release or tag broken = - versions.major finalAttrs.version != versions.major stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; + lib.versions.major finalAttrs.version != lib.versions.major stdenv.cc.version + || lib.versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/mivisionx/default.nix b/pkgs/development/rocm-modules/5/mivisionx/default.nix index a359f6e7253f55..a3317c5552f6c6 100644 --- a/pkgs/development/rocm-modules/5/mivisionx/default.nix +++ b/pkgs/development/rocm-modules/5/mivisionx/default.nix @@ -158,7 +158,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = lib.teams.rocm.members; platforms = lib.platforms.linux; broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; + lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version + || lib.versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/rccl/default.nix b/pkgs/development/rocm-modules/5/rccl/default.nix index 6e6dd6705c3529..4bb95839f1b9c2 100644 --- a/pkgs/development/rocm-modules/5/rccl/default.nix +++ b/pkgs/development/rocm-modules/5/rccl/default.nix @@ -98,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = lib.teams.rocm.members; platforms = lib.platforms.linux; broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; + lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version + || lib.versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/rocalution/default.nix b/pkgs/development/rocm-modules/5/rocalution/default.nix index dbc0a0e1121e64..264b6d5e1c634a 100644 --- a/pkgs/development/rocm-modules/5/rocalution/default.nix +++ b/pkgs/development/rocm-modules/5/rocalution/default.nix @@ -126,7 +126,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = lib.teams.rocm.members; platforms = lib.platforms.linux; broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; + lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version + || lib.versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/rocblas/default.nix b/pkgs/development/rocm-modules/5/rocblas/default.nix index f54ba2bf19768f..29c3b30b46b9f2 100644 --- a/pkgs/development/rocm-modules/5/rocblas/default.nix +++ b/pkgs/development/rocm-modules/5/rocblas/default.nix @@ -242,7 +242,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = lib.teams.rocm.members; platforms = lib.platforms.linux; broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; + lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version + || lib.versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/rocdbgapi/default.nix b/pkgs/development/rocm-modules/5/rocdbgapi/default.nix index 31553457268c72..ff01b589ac62e6 100644 --- a/pkgs/development/rocm-modules/5/rocdbgapi/default.nix +++ b/pkgs/development/rocm-modules/5/rocdbgapi/default.nix @@ -119,7 +119,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = lib.teams.rocm.members; platforms = lib.platforms.linux; broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; + lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version + || lib.versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/rocfft/default.nix b/pkgs/development/rocm-modules/5/rocfft/default.nix index cba185acde114d..d7d46edfeed098 100644 --- a/pkgs/development/rocm-modules/5/rocfft/default.nix +++ b/pkgs/development/rocm-modules/5/rocfft/default.nix @@ -1,5 +1,4 @@ { - rocfft, lib, stdenv, fetchFromGitHub, @@ -170,7 +169,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ kira-bruneau ] ++ teams.rocm.members; platforms = lib.platforms.linux; broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; + lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version + || lib.versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/rocgdb/default.nix b/pkgs/development/rocm-modules/5/rocgdb/default.nix index 2710a1b7feccd6..a474d4124f41e8 100644 --- a/pkgs/development/rocm-modules/5/rocgdb/default.nix +++ b/pkgs/development/rocm-modules/5/rocgdb/default.nix @@ -59,6 +59,6 @@ stdenv.mkDerivation (finalAttrs: { ]; maintainers = lib.teams.rocm.members; platforms = lib.platforms.linux; - broken = versionAtLeast finalAttrs.version "6.0.0"; + broken = lib.versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/rocm-cmake/default.nix b/pkgs/development/rocm-modules/5/rocm-cmake/default.nix index 2cfa48e0ff9c92..3ef6e2bbe358d8 100644 --- a/pkgs/development/rocm-modules/5/rocm-cmake/default.nix +++ b/pkgs/development/rocm-modules/5/rocm-cmake/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = lib.teams.rocm.members; platforms = lib.platforms.unix; broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; + lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version + || lib.versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/rocm-comgr/default.nix b/pkgs/development/rocm-modules/5/rocm-comgr/default.nix index 89c73ad3cf78b1..d0c83e00208475 100644 --- a/pkgs/development/rocm-modules/5/rocm-comgr/default.nix +++ b/pkgs/development/rocm-modules/5/rocm-comgr/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ lovesegfault ] ++ teams.rocm.members; platforms = lib.platforms.linux; broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; + lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version + || lib.versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/rocm-core/default.nix b/pkgs/development/rocm-modules/5/rocm-core/default.nix index bb5ec347e61c37..e6da10b568edb1 100644 --- a/pkgs/development/rocm-modules/5/rocm-core/default.nix +++ b/pkgs/development/rocm-modules/5/rocm-core/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = lib.teams.rocm.members; platforms = lib.platforms.linux; broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; + lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version + || lib.versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/rocm-device-libs/default.nix b/pkgs/development/rocm-modules/5/rocm-device-libs/default.nix index c031f6f355957a..428ccde5310d85 100644 --- a/pkgs/development/rocm-modules/5/rocm-device-libs/default.nix +++ b/pkgs/development/rocm-modules/5/rocm-device-libs/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ lovesegfault ] ++ teams.rocm.members; platforms = lib.platforms.linux; broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; + lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version + || lib.versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/rocm-runtime/default.nix b/pkgs/development/rocm-modules/5/rocm-runtime/default.nix index b9ac5df40fe0ba..96f00801af6744 100644 --- a/pkgs/development/rocm-modules/5/rocm-runtime/default.nix +++ b/pkgs/development/rocm-modules/5/rocm-runtime/default.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ lovesegfault ] ++ teams.rocm.members; platforms = lib.platforms.linux; broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; + lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version + || lib.versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/rocm-smi/default.nix b/pkgs/development/rocm-modules/5/rocm-smi/default.nix index 3280d303473633..1fc4e3aaeaee76 100644 --- a/pkgs/development/rocm-modules/5/rocm-smi/default.nix +++ b/pkgs/development/rocm-modules/5/rocm-smi/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ lovesegfault ] ++ teams.rocm.members; platforms = [ "x86_64-linux" ]; broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; + lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version + || lib.versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/rocm-thunk/default.nix b/pkgs/development/rocm-modules/5/rocm-thunk/default.nix index 3a45f83b14c129..1be7a216dc30c0 100644 --- a/pkgs/development/rocm-modules/5/rocm-thunk/default.nix +++ b/pkgs/development/rocm-modules/5/rocm-thunk/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ lovesegfault ] ++ teams.rocm.members; platforms = lib.platforms.linux; broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; + lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version + || lib.versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/rocminfo/default.nix b/pkgs/development/rocm-modules/5/rocminfo/default.nix index bb29a117faa4cf..a4b0d0e087318e 100644 --- a/pkgs/development/rocm-modules/5/rocminfo/default.nix +++ b/pkgs/development/rocm-modules/5/rocminfo/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { platforms = lib.platforms.linux; broken = stdenv.hostPlatform.isAarch64 - || versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; + || lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version + || lib.versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/rocmlir/default.nix b/pkgs/development/rocm-modules/5/rocmlir/default.nix index 3d504d7aef2598..cc51bba8309e00 100644 --- a/pkgs/development/rocm-modules/5/rocmlir/default.nix +++ b/pkgs/development/rocm-modules/5/rocmlir/default.nix @@ -143,7 +143,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = lib.teams.rocm.members; platforms = lib.platforms.linux; broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; + lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version + || lib.versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/rocprim/default.nix b/pkgs/development/rocm-modules/5/rocprim/default.nix index 5d4de9ee836233..598092ad70f5a9 100644 --- a/pkgs/development/rocm-modules/5/rocprim/default.nix +++ b/pkgs/development/rocm-modules/5/rocprim/default.nix @@ -95,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = lib.teams.rocm.members; platforms = lib.platforms.linux; broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; + lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version + || lib.versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/rocprofiler/default.nix b/pkgs/development/rocm-modules/5/rocprofiler/default.nix index 35686350c63aef..dc2954cdd6b9bd 100644 --- a/pkgs/development/rocm-modules/5/rocprofiler/default.nix +++ b/pkgs/development/rocm-modules/5/rocprofiler/default.nix @@ -134,7 +134,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = lib.teams.rocm.members; platforms = lib.platforms.linux; broken = - versions.minor finalAttrs.version != versions.minor clr.version - || versionAtLeast finalAttrs.version "6.0.0"; + lib.versions.minor finalAttrs.version != lib.versions.minor clr.version + || lib.versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/rocr-debug-agent/default.nix b/pkgs/development/rocm-modules/5/rocr-debug-agent/default.nix index 4274b7befe4197..de765615d99351 100644 --- a/pkgs/development/rocm-modules/5/rocr-debug-agent/default.nix +++ b/pkgs/development/rocm-modules/5/rocr-debug-agent/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = lib.teams.rocm.members; platforms = lib.platforms.linux; broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; + lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version + || lib.versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/rocrand/default.nix b/pkgs/development/rocm-modules/5/rocrand/default.nix index 553e68d6640b1a..9e9e70a801e04f 100644 --- a/pkgs/development/rocm-modules/5/rocrand/default.nix +++ b/pkgs/development/rocm-modules/5/rocrand/default.nix @@ -97,7 +97,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = lib.teams.rocm.members; platforms = lib.platforms.linux; broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; + lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version + || lib.versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/rocsolver/default.nix b/pkgs/development/rocm-modules/5/rocsolver/default.nix index f9b4e6825b9ccb..29333e9560526a 100644 --- a/pkgs/development/rocm-modules/5/rocsolver/default.nix +++ b/pkgs/development/rocm-modules/5/rocsolver/default.nix @@ -112,7 +112,7 @@ stdenv.mkDerivation (finalAttrs: { timeout = 14400; # 4 hours maxSilent = 14400; # 4 hours broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; + lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version + || lib.versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/rocsparse/default.nix b/pkgs/development/rocm-modules/5/rocsparse/default.nix index 02d2ed4759cc9b..1d9492cff7ce68 100644 --- a/pkgs/development/rocm-modules/5/rocsparse/default.nix +++ b/pkgs/development/rocm-modules/5/rocsparse/default.nix @@ -157,7 +157,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = lib.teams.rocm.members; platforms = lib.platforms.linux; broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; + lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version + || lib.versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/rocthrust/default.nix b/pkgs/development/rocm-modules/5/rocthrust/default.nix index 801e8be1813235..7ce44cf591be0d 100644 --- a/pkgs/development/rocm-modules/5/rocthrust/default.nix +++ b/pkgs/development/rocm-modules/5/rocthrust/default.nix @@ -95,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = lib.teams.rocm.members; platforms = lib.platforms.linux; broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; + lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version + || lib.versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/roctracer/default.nix b/pkgs/development/rocm-modules/5/roctracer/default.nix index 6ebfb5357fbf83..20934f54af3ca4 100644 --- a/pkgs/development/rocm-modules/5/roctracer/default.nix +++ b/pkgs/development/rocm-modules/5/roctracer/default.nix @@ -117,7 +117,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = lib.teams.rocm.members; platforms = lib.platforms.linux; broken = - versions.minor finalAttrs.version != versions.minor clr.version - || versionAtLeast finalAttrs.version "6.0.0"; + lib.versions.minor finalAttrs.version != lib.versions.minor clr.version + || lib.versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/rocwmma/default.nix b/pkgs/development/rocm-modules/5/rocwmma/default.nix index a061e0a745385d..cd411535bf7c2c 100644 --- a/pkgs/development/rocm-modules/5/rocwmma/default.nix +++ b/pkgs/development/rocm-modules/5/rocwmma/default.nix @@ -116,7 +116,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = lib.teams.rocm.members; platforms = lib.platforms.linux; broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; + lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version + || lib.versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/rpp/default.nix b/pkgs/development/rocm-modules/5/rpp/default.nix index 68ac25f2f90b79..dfd678231bd872 100644 --- a/pkgs/development/rocm-modules/5/rpp/default.nix +++ b/pkgs/development/rocm-modules/5/rpp/default.nix @@ -97,7 +97,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = lib.teams.rocm.members; platforms = lib.platforms.linux; broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; + lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version + || lib.versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/tensile/default.nix b/pkgs/development/rocm-modules/5/tensile/default.nix index 37d40477621835..e8096edf88d7ce 100644 --- a/pkgs/development/rocm-modules/5/tensile/default.nix +++ b/pkgs/development/rocm-modules/5/tensile/default.nix @@ -62,6 +62,6 @@ buildPythonPackage rec { maintainers = lib.teams.rocm.members; platforms = lib.platforms.linux; broken = - versions.minor version != versions.minor stdenv.cc.version || versionAtLeast version "6.0.0"; + lib.versions.minor version != lib.versions.minor stdenv.cc.version || lib.versionAtLeast version "6.0.0"; }; } diff --git a/pkgs/development/rocm-modules/6/clang-ocl/default.nix b/pkgs/development/rocm-modules/6/clang-ocl/default.nix index f7e0f296ebeb54..afb7c72016b454 100644 --- a/pkgs/development/rocm-modules/6/clang-ocl/default.nix +++ b/pkgs/development/rocm-modules/6/clang-ocl/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = lib.teams.rocm.members; platforms = lib.platforms.linux; broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "7.0.0"; + lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version + || lib.versionAtLeast finalAttrs.version "7.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/6/clr/default.nix b/pkgs/development/rocm-modules/6/clr/default.nix index b28b920602809a..dfd02eba21d5fe 100644 --- a/pkgs/development/rocm-modules/6/clr/default.nix +++ b/pkgs/development/rocm-modules/6/clr/default.nix @@ -216,7 +216,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ lovesegfault ] ++ teams.rocm.members; platforms = lib.platforms.linux; broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "7.0.0"; + lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version + || lib.versionAtLeast finalAttrs.version "7.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/6/composable_kernel/default.nix b/pkgs/development/rocm-modules/6/composable_kernel/default.nix index df477e14e744d8..a200565b2a3212 100644 --- a/pkgs/development/rocm-modules/6/composable_kernel/default.nix +++ b/pkgs/development/rocm-modules/6/composable_kernel/default.nix @@ -106,7 +106,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = lib.teams.rocm.members; platforms = lib.platforms.linux; broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "7.0.0"; + lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version + || lib.versionAtLeast finalAttrs.version "7.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/6/half/default.nix b/pkgs/development/rocm-modules/6/half/default.nix index 2344753286716a..399314b5abdadb 100644 --- a/pkgs/development/rocm-modules/6/half/default.nix +++ b/pkgs/development/rocm-modules/6/half/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation (finalAttrs: { license = with lib.licenses; [ mit ]; maintainers = lib.teams.rocm.members; platforms = lib.platforms.unix; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "7.0.0"; + broken = lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version || lib.versionAtLeast finalAttrs.version "7.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/6/hip-common/default.nix b/pkgs/development/rocm-modules/6/hip-common/default.nix index 2361a14875618c..9a0810a8846835 100644 --- a/pkgs/development/rocm-modules/6/hip-common/default.nix +++ b/pkgs/development/rocm-modules/6/hip-common/default.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation (finalAttrs: { license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ lovesegfault ] ++ teams.rocm.members; platforms = lib.platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "7.0.0"; + broken = lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version || lib.versionAtLeast finalAttrs.version "7.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/6/hipblas/default.nix b/pkgs/development/rocm-modules/6/hipblas/default.nix index d9c869809ba93c..bdfaeb7d30adbc 100644 --- a/pkgs/development/rocm-modules/6/hipblas/default.nix +++ b/pkgs/development/rocm-modules/6/hipblas/default.nix @@ -111,7 +111,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = lib.teams.rocm.members; platforms = lib.platforms.linux; broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "7.0.0"; + lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version + || lib.versionAtLeast finalAttrs.version "7.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/6/hipcc/default.nix b/pkgs/development/rocm-modules/6/hipcc/default.nix index 410f44059d9f5e..14033d5e906959 100644 --- a/pkgs/development/rocm-modules/6/hipcc/default.nix +++ b/pkgs/development/rocm-modules/6/hipcc/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ lovesegfault ] ++ teams.rocm.members; platforms = lib.platforms.linux; broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "7.0.0"; + lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version + || lib.versionAtLeast finalAttrs.version "7.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/6/hipcub/default.nix b/pkgs/development/rocm-modules/6/hipcub/default.nix index 71e01d73305e91..3dd9b6e04fd199 100644 --- a/pkgs/development/rocm-modules/6/hipcub/default.nix +++ b/pkgs/development/rocm-modules/6/hipcub/default.nix @@ -85,6 +85,6 @@ stdenv.mkDerivation (finalAttrs: { license = with lib.licenses; [ bsd3 ]; maintainers = lib.teams.rocm.members; platforms = lib.platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "7.0.0"; + broken = lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version || lib.versionAtLeast finalAttrs.version "7.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/6/hipfft/default.nix b/pkgs/development/rocm-modules/6/hipfft/default.nix index 2f19fb1286aecf..991fd4a28cf6c0 100644 --- a/pkgs/development/rocm-modules/6/hipfft/default.nix +++ b/pkgs/development/rocm-modules/6/hipfft/default.nix @@ -122,7 +122,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = lib.teams.rocm.members; platforms = lib.platforms.linux; broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "7.0.0"; + lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version + || lib.versionAtLeast finalAttrs.version "7.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/6/hipfort/default.nix b/pkgs/development/rocm-modules/6/hipfort/default.nix index a29010ffa9e0db..d38a553ae815b7 100644 --- a/pkgs/development/rocm-modules/6/hipfort/default.nix +++ b/pkgs/development/rocm-modules/6/hipfort/default.nix @@ -61,6 +61,6 @@ stdenv.mkDerivation (finalAttrs: { license = with lib.licenses; [ mit ]; # mitx11 maintainers = lib.teams.rocm.members; platforms = lib.platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "7.0.0"; + broken = lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version || lib.versionAtLeast finalAttrs.version "7.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/6/hipify/default.nix b/pkgs/development/rocm-modules/6/hipify/default.nix index 6582b0cc35e776..8e8e48cb560c71 100644 --- a/pkgs/development/rocm-modules/6/hipify/default.nix +++ b/pkgs/development/rocm-modules/6/hipify/default.nix @@ -42,6 +42,6 @@ stdenv.mkDerivation (finalAttrs: { license = with lib.licenses; [ mit ]; maintainers = lib.teams.rocm.members; platforms = lib.platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "7.0.0"; + broken = lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version || lib.versionAtLeast finalAttrs.version "7.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/6/hiprand/default.nix b/pkgs/development/rocm-modules/6/hiprand/default.nix index 7f612d37e764bd..43942a7b47b9da 100644 --- a/pkgs/development/rocm-modules/6/hiprand/default.nix +++ b/pkgs/development/rocm-modules/6/hiprand/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = lib.teams.rocm.members; platforms = lib.platforms.linux; broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "7.0.0"; + lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version + || lib.versionAtLeast finalAttrs.version "7.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/6/hipsolver/default.nix b/pkgs/development/rocm-modules/6/hipsolver/default.nix index aacd256d7def28..3f1c427e97f496 100644 --- a/pkgs/development/rocm-modules/6/hipsolver/default.nix +++ b/pkgs/development/rocm-modules/6/hipsolver/default.nix @@ -112,7 +112,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = lib.teams.rocm.members; platforms = lib.platforms.linux; broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "7.0.0"; + lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version + || lib.versionAtLeast finalAttrs.version "7.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/6/hipsparse/default.nix b/pkgs/development/rocm-modules/6/hipsparse/default.nix index 75018cb8edbee5..f3de2e629ff8a3 100644 --- a/pkgs/development/rocm-modules/6/hipsparse/default.nix +++ b/pkgs/development/rocm-modules/6/hipsparse/default.nix @@ -151,7 +151,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = lib.teams.rocm.members; platforms = lib.platforms.linux; broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "7.0.0"; + lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version + || lib.versionAtLeast finalAttrs.version "7.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/6/hsa-amd-aqlprofile-bin/default.nix b/pkgs/development/rocm-modules/6/hsa-amd-aqlprofile-bin/default.nix index 706c479eab22b1..db14bc88c46663 100644 --- a/pkgs/development/rocm-modules/6/hsa-amd-aqlprofile-bin/default.nix +++ b/pkgs/development/rocm-modules/6/hsa-amd-aqlprofile-bin/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = lib.teams.rocm.members; platforms = lib.platforms.linux; broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "7.0.0"; + lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version + || lib.versionAtLeast finalAttrs.version "7.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/6/llvm/base.nix b/pkgs/development/rocm-modules/6/llvm/base.nix index 45db60481ae231..f33eea49f44ba4 100644 --- a/pkgs/development/rocm-modules/6/llvm/base.nix +++ b/pkgs/development/rocm-modules/6/llvm/base.nix @@ -204,13 +204,13 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/ROCm/llvm-project"; license = with lib.licenses; [ ncsa ] ++ extraLicenses; maintainers = - with maintainers; + with lib.maintainers; [ acowley lovesegfault ] ++ teams.rocm.members; platforms = lib.platforms.linux; - broken = isBroken || versionAtLeast finalAttrs.version "7.0.0"; + broken = isBroken || lib.versionAtLeast finalAttrs.version "7.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/6/miopen/default.nix b/pkgs/development/rocm-modules/6/miopen/default.nix index 0923644e36866a..dd0fe55c726686 100644 --- a/pkgs/development/rocm-modules/6/miopen/default.nix +++ b/pkgs/development/rocm-modules/6/miopen/default.nix @@ -265,7 +265,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = lib.teams.rocm.members; platforms = lib.platforms.linux; broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "7.0.0"; + lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version + || lib.versionAtLeast finalAttrs.version "7.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/6/mivisionx/default.nix b/pkgs/development/rocm-modules/6/mivisionx/default.nix index e78f90c2e6a229..b833b40c50bad7 100644 --- a/pkgs/development/rocm-modules/6/mivisionx/default.nix +++ b/pkgs/development/rocm-modules/6/mivisionx/default.nix @@ -155,7 +155,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = lib.teams.rocm.members; platforms = lib.platforms.linux; broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "7.0.0"; + lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version + || lib.versionAtLeast finalAttrs.version "7.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/6/rccl/default.nix b/pkgs/development/rocm-modules/6/rccl/default.nix index abbd4acdd42a76..31239d49937511 100644 --- a/pkgs/development/rocm-modules/6/rccl/default.nix +++ b/pkgs/development/rocm-modules/6/rccl/default.nix @@ -100,7 +100,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = lib.teams.rocm.members; platforms = lib.platforms.linux; broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "7.0.0"; + lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version + || lib.versionAtLeast finalAttrs.version "7.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/6/rocalution/default.nix b/pkgs/development/rocm-modules/6/rocalution/default.nix index 05a81b03522172..05a153ec5b64f9 100644 --- a/pkgs/development/rocm-modules/6/rocalution/default.nix +++ b/pkgs/development/rocm-modules/6/rocalution/default.nix @@ -126,7 +126,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = lib.teams.rocm.members; platforms = lib.platforms.linux; broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "7.0.0"; + lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version + || lib.versionAtLeast finalAttrs.version "7.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/6/rocblas/default.nix b/pkgs/development/rocm-modules/6/rocblas/default.nix index b7743b31a87277..9e82e7897861e7 100644 --- a/pkgs/development/rocm-modules/6/rocblas/default.nix +++ b/pkgs/development/rocm-modules/6/rocblas/default.nix @@ -152,7 +152,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = lib.teams.rocm.members; platforms = lib.platforms.linux; broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "7.0.0"; + lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version + || lib.versionAtLeast finalAttrs.version "7.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/6/rocdbgapi/default.nix b/pkgs/development/rocm-modules/6/rocdbgapi/default.nix index e54c0ce4b921ef..cba73fa81a4b23 100644 --- a/pkgs/development/rocm-modules/6/rocdbgapi/default.nix +++ b/pkgs/development/rocm-modules/6/rocdbgapi/default.nix @@ -106,6 +106,6 @@ in stdenv.mkDerivation (finalAttrs: { license = with lib.licenses; [ mit ]; maintainers = lib.teams.rocm.members; platforms = lib.platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "7.0.0"; + broken = lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version || lib.versionAtLeast finalAttrs.version "7.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/6/rocfft/default.nix b/pkgs/development/rocm-modules/6/rocfft/default.nix index 148c28e8bb7347..2c2fca06ccdc3c 100644 --- a/pkgs/development/rocm-modules/6/rocfft/default.nix +++ b/pkgs/development/rocm-modules/6/rocfft/default.nix @@ -1,5 +1,4 @@ { - rocfft, lib, stdenv, fetchFromGitHub, @@ -170,7 +169,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ kira-bruneau ] ++ teams.rocm.members; platforms = lib.platforms.linux; broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "7.0.0"; + lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version + || lib.versionAtLeast finalAttrs.version "7.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/6/rocgdb/default.nix b/pkgs/development/rocm-modules/6/rocgdb/default.nix index 10e5933cf2cf86..2615055b5600a5 100644 --- a/pkgs/development/rocm-modules/6/rocgdb/default.nix +++ b/pkgs/development/rocm-modules/6/rocgdb/default.nix @@ -101,6 +101,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl3Plus; maintainers = lib.teams.rocm.members; platforms = lib.platforms.linux; - broken = versionAtLeast finalAttrs.version "7.0.0"; + broken = lib.versionAtLeast finalAttrs.version "7.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/6/rocm-cmake/default.nix b/pkgs/development/rocm-modules/6/rocm-cmake/default.nix index 2782b15fad4782..e1ba0720d73b77 100644 --- a/pkgs/development/rocm-modules/6/rocm-cmake/default.nix +++ b/pkgs/development/rocm-modules/6/rocm-cmake/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.mit; maintainers = lib.teams.rocm.members; platforms = lib.platforms.unix; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "7.0.0"; + broken = lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version || lib.versionAtLeast finalAttrs.version "7.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/6/rocm-comgr/default.nix b/pkgs/development/rocm-modules/6/rocm-comgr/default.nix index 2f5a564b8221e4..e5803e2ae28fb1 100644 --- a/pkgs/development/rocm-modules/6/rocm-comgr/default.nix +++ b/pkgs/development/rocm-modules/6/rocm-comgr/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ lovesegfault ] ++ teams.rocm.members; platforms = lib.platforms.linux; broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "7.0.0"; + lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version + || lib.versionAtLeast finalAttrs.version "7.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/6/rocm-core/default.nix b/pkgs/development/rocm-modules/6/rocm-core/default.nix index aaa1d61b3bc306..725766f4855ccd 100644 --- a/pkgs/development/rocm-modules/6/rocm-core/default.nix +++ b/pkgs/development/rocm-modules/6/rocm-core/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = lib.teams.rocm.members; platforms = lib.platforms.linux; broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "7.0.0"; + lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version + || lib.versionAtLeast finalAttrs.version "7.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/6/rocm-device-libs/default.nix b/pkgs/development/rocm-modules/6/rocm-device-libs/default.nix index 93142c912f7bac..2e153dd9320626 100644 --- a/pkgs/development/rocm-modules/6/rocm-device-libs/default.nix +++ b/pkgs/development/rocm-modules/6/rocm-device-libs/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ lovesegfault ] ++ teams.rocm.members; platforms = lib.platforms.linux; broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "7.0.0"; + lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version + || lib.versionAtLeast finalAttrs.version "7.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/6/rocm-runtime/default.nix b/pkgs/development/rocm-modules/6/rocm-runtime/default.nix index dce02084f2fc2b..4f703597b5beea 100644 --- a/pkgs/development/rocm-modules/6/rocm-runtime/default.nix +++ b/pkgs/development/rocm-modules/6/rocm-runtime/default.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ lovesegfault ] ++ teams.rocm.members; platforms = lib.platforms.linux; broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "7.0.0"; + lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version + || lib.versionAtLeast finalAttrs.version "7.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/6/rocm-smi/default.nix b/pkgs/development/rocm-modules/6/rocm-smi/default.nix index 8d4d43e654fc29..45e3ea2267ffe7 100644 --- a/pkgs/development/rocm-modules/6/rocm-smi/default.nix +++ b/pkgs/development/rocm-modules/6/rocm-smi/default.nix @@ -49,6 +49,6 @@ stdenv.mkDerivation (finalAttrs: { license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ lovesegfault ] ++ teams.rocm.members; platforms = [ "x86_64-linux" ]; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "7.0.0"; + broken = lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version || lib.versionAtLeast finalAttrs.version "7.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/6/rocm-thunk/default.nix b/pkgs/development/rocm-modules/6/rocm-thunk/default.nix index 031abea1274acc..b892bf9d317a54 100644 --- a/pkgs/development/rocm-modules/6/rocm-thunk/default.nix +++ b/pkgs/development/rocm-modules/6/rocm-thunk/default.nix @@ -49,6 +49,6 @@ stdenv.mkDerivation (finalAttrs: { license = with lib.licenses; [ bsd2 mit ]; maintainers = with lib.maintainers; [ lovesegfault ] ++ teams.rocm.members; platforms = lib.platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "7.0.0"; + broken = lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version || lib.versionAtLeast finalAttrs.version "7.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/6/rocminfo/default.nix b/pkgs/development/rocm-modules/6/rocminfo/default.nix index cafe831493227a..b17daffbce521c 100644 --- a/pkgs/development/rocm-modules/6/rocminfo/default.nix +++ b/pkgs/development/rocm-modules/6/rocminfo/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { platforms = lib.platforms.linux; broken = stdenv.hostPlatform.isAarch64 - || versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "7.0.0"; + || lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version + || lib.versionAtLeast finalAttrs.version "7.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/6/rocmlir/default.nix b/pkgs/development/rocm-modules/6/rocmlir/default.nix index 09ba3b4a3ed4b9..25cc6d269bf0c8 100644 --- a/pkgs/development/rocm-modules/6/rocmlir/default.nix +++ b/pkgs/development/rocm-modules/6/rocmlir/default.nix @@ -149,7 +149,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = lib.teams.rocm.members; platforms = lib.platforms.linux; broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "7.0.0"; + lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version + || lib.versionAtLeast finalAttrs.version "7.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/6/rocprim/default.nix b/pkgs/development/rocm-modules/6/rocprim/default.nix index cec02918177599..8187e65fc14ce6 100644 --- a/pkgs/development/rocm-modules/6/rocprim/default.nix +++ b/pkgs/development/rocm-modules/6/rocprim/default.nix @@ -90,6 +90,6 @@ stdenv.mkDerivation (finalAttrs: { license = with lib.licenses; [ mit ]; maintainers = lib.teams.rocm.members; platforms = lib.platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "7.0.0"; + broken = lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version || lib.versionAtLeast finalAttrs.version "7.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/6/rocprofiler/default.nix b/pkgs/development/rocm-modules/6/rocprofiler/default.nix index 811ca23500075b..6cd446c8a9c8e6 100644 --- a/pkgs/development/rocm-modules/6/rocprofiler/default.nix +++ b/pkgs/development/rocm-modules/6/rocprofiler/default.nix @@ -138,7 +138,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = lib.teams.rocm.members; platforms = lib.platforms.linux; broken = - versions.minor finalAttrs.version != versions.minor clr.version - || versionAtLeast finalAttrs.version "7.0.0"; + lib.versions.minor finalAttrs.version != lib.versions.minor clr.version + || lib.versionAtLeast finalAttrs.version "7.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/6/rocr-debug-agent/default.nix b/pkgs/development/rocm-modules/6/rocr-debug-agent/default.nix index 15f4f33c206b63..8a9b7cc6a2965d 100644 --- a/pkgs/development/rocm-modules/6/rocr-debug-agent/default.nix +++ b/pkgs/development/rocm-modules/6/rocr-debug-agent/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = lib.teams.rocm.members; platforms = lib.platforms.linux; broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "7.0.0"; + lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version + || lib.versionAtLeast finalAttrs.version "7.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/6/rocrand/default.nix b/pkgs/development/rocm-modules/6/rocrand/default.nix index 9e55af4326ca12..357baed4f7dba6 100644 --- a/pkgs/development/rocm-modules/6/rocrand/default.nix +++ b/pkgs/development/rocm-modules/6/rocrand/default.nix @@ -84,6 +84,6 @@ stdenv.mkDerivation (finalAttrs: { license = with lib.licenses; [ mit ]; maintainers = lib.teams.rocm.members; platforms = lib.platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "7.0.0"; + broken = lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version || lib.versionAtLeast finalAttrs.version "7.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/6/rocsolver/default.nix b/pkgs/development/rocm-modules/6/rocsolver/default.nix index b38aafaa10a405..30241151ba45a9 100644 --- a/pkgs/development/rocm-modules/6/rocsolver/default.nix +++ b/pkgs/development/rocm-modules/6/rocsolver/default.nix @@ -112,7 +112,7 @@ stdenv.mkDerivation (finalAttrs: { timeout = 14400; # 4 hours maxSilent = 14400; # 4 hours broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "7.0.0"; + lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version + || lib.versionAtLeast finalAttrs.version "7.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/6/rocsparse/default.nix b/pkgs/development/rocm-modules/6/rocsparse/default.nix index 768a0712b03ab1..5a904198dd61a9 100644 --- a/pkgs/development/rocm-modules/6/rocsparse/default.nix +++ b/pkgs/development/rocm-modules/6/rocsparse/default.nix @@ -157,7 +157,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = lib.teams.rocm.members; platforms = lib.platforms.linux; broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "7.0.0"; + lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version + || lib.versionAtLeast finalAttrs.version "7.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/6/rocthrust/default.nix b/pkgs/development/rocm-modules/6/rocthrust/default.nix index 11024ede1db8e7..64934f5c8b3614 100644 --- a/pkgs/development/rocm-modules/6/rocthrust/default.nix +++ b/pkgs/development/rocm-modules/6/rocthrust/default.nix @@ -95,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = lib.teams.rocm.members; platforms = lib.platforms.linux; broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "7.0.0"; + lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version + || lib.versionAtLeast finalAttrs.version "7.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/6/roctracer/default.nix b/pkgs/development/rocm-modules/6/roctracer/default.nix index 3b1898762389bb..d0579b027f7d95 100644 --- a/pkgs/development/rocm-modules/6/roctracer/default.nix +++ b/pkgs/development/rocm-modules/6/roctracer/default.nix @@ -117,7 +117,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = lib.teams.rocm.members; platforms = lib.platforms.linux; broken = - versions.minor finalAttrs.version != versions.minor clr.version - || versionAtLeast finalAttrs.version "7.0.0"; + lib.versions.minor finalAttrs.version != lib.versions.minor clr.version + || lib.versionAtLeast finalAttrs.version "7.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/6/rocwmma/default.nix b/pkgs/development/rocm-modules/6/rocwmma/default.nix index d976b7631e362a..5945dc3f60d105 100644 --- a/pkgs/development/rocm-modules/6/rocwmma/default.nix +++ b/pkgs/development/rocm-modules/6/rocwmma/default.nix @@ -116,7 +116,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = lib.teams.rocm.members; platforms = lib.platforms.linux; broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "7.0.0"; + lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version + || lib.versionAtLeast finalAttrs.version "7.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/6/rpp/default.nix b/pkgs/development/rocm-modules/6/rpp/default.nix index 9e3f92bab672d2..9a81993b6b166d 100644 --- a/pkgs/development/rocm-modules/6/rpp/default.nix +++ b/pkgs/development/rocm-modules/6/rpp/default.nix @@ -97,7 +97,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = lib.teams.rocm.members; platforms = lib.platforms.linux; broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "7.0.0"; + lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version + || lib.versionAtLeast finalAttrs.version "7.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/6/tensile/default.nix b/pkgs/development/rocm-modules/6/tensile/default.nix index c9701cd0d8b58c..74b6293db8ec8c 100644 --- a/pkgs/development/rocm-modules/6/tensile/default.nix +++ b/pkgs/development/rocm-modules/6/tensile/default.nix @@ -76,6 +76,6 @@ buildPythonPackage rec { maintainers = lib.teams.rocm.members; platforms = lib.platforms.linux; broken = - versions.minor version != versions.minor stdenv.cc.version || versionAtLeast version "7.0.0"; + lib.versions.minor version != lib.versions.minor stdenv.cc.version || lib.versionAtLeast version "7.0.0"; }; } diff --git a/pkgs/development/tools/analysis/brakeman/default.nix b/pkgs/development/tools/analysis/brakeman/default.nix index 1ee7863181549b..e1b3bdd1b2c773 100644 --- a/pkgs/development/tools/analysis/brakeman/default.nix +++ b/pkgs/development/tools/analysis/brakeman/default.nix @@ -5,7 +5,7 @@ bundlerUpdateScript, }: -bundlerApp rec { +bundlerApp { pname = "brakeman"; exes = [ "brakeman" ]; gemdir = ./.; @@ -15,8 +15,8 @@ bundlerApp rec { meta = { description = "Static analysis security scanner for Ruby on Rails"; homepage = "https://brakemanscanner.org/"; - changelog = "https://github.com/presidentbeef/brakeman/blob/v${version}/CHANGES.md"; - license = [ licenses.unfreeRedistributable ]; + # changelog = "https://github.com/presidentbeef/brakeman/blob/v${version}/CHANGES.md"; + license = [ lib.licenses.unfreeRedistributable ]; platforms = ruby.meta.platforms; maintainers = [ ]; mainProgram = "brakeman"; diff --git a/pkgs/development/tools/analysis/rr/zen_workaround.nix b/pkgs/development/tools/analysis/rr/zen_workaround.nix index d4290af7eb2af5..6da5dab0749be4 100644 --- a/pkgs/development/tools/analysis/rr/zen_workaround.nix +++ b/pkgs/development/tools/analysis/rr/zen_workaround.nix @@ -45,6 +45,6 @@ stdenv.mkDerivation { 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/bashate/default.nix b/pkgs/development/tools/bashate/default.nix index f275bb7b2ed068..83fef72651351b 100644 --- a/pkgs/development/tools/bashate/default.nix +++ b/pkgs/development/tools/bashate/default.nix @@ -44,6 +44,6 @@ python3Packages.buildPythonApplication rec { mainProgram = "bashate"; homepage = "https://opendev.org/openstack/bashate"; license = with lib.licenses; [ asl20 ]; - maintainers = lib.teams.openstack.members ++ (with maintainers; [ fab ]); + maintainers = lib.teams.openstack.members ++ (with lib.maintainers; [ fab ]); }; } diff --git a/pkgs/development/tools/continuous-integration/buildbot/plugins.nix b/pkgs/development/tools/continuous-integration/buildbot/plugins.nix index 7b9425a74790f4..8533090c1595fb 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/plugins.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/plugins.nix @@ -152,7 +152,7 @@ meta = { homepage = "https://buildbot.net/"; description = "Buildbot Badges Plugin"; - maintainers = lib.teams.buildbot.members ++ [ maintainers.julienmalka ]; + maintainers = lib.teams.buildbot.members ++ [ lib.maintainers.julienmalka ]; license = lib.licenses.gpl2; }; }; diff --git a/pkgs/development/tools/electron/binary/generic.nix b/pkgs/development/tools/electron/binary/generic.nix index 5fe9edb85741cd..e4993113d0b114 100644 --- a/pkgs/development/tools/electron/binary/generic.nix +++ b/pkgs/development/tools/electron/binary/generic.nix @@ -49,11 +49,11 @@ let "armv7l-linux" "aarch64-linux" ] - ++ optionals (versionAtLeast version "11.0.0") [ "aarch64-darwin" ] - ++ optionals (versionOlder version "19.0.0") [ "i686-linux" ]; + ++ lib.optionals (lib.versionAtLeast version "11.0.0") [ "aarch64-darwin" ] + ++ lib.optionals (lib.versionOlder version "19.0.0") [ "i686-linux" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; # https://www.electronjs.org/docs/latest/tutorial/electron-timelines - knownVulnerabilities = optional (versionOlder version "31.0.0") "Electron version ${version} is EOL"; + knownVulnerabilities = lib.optional (lib.versionOlder version "31.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 16fa5b718efbf0..a072d038e92acb 100644 --- a/pkgs/development/tools/electron/common.nix +++ b/pkgs/development/tools/electron/common.nix @@ -300,7 +300,7 @@ in ]; 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/tools/fable/default.nix b/pkgs/development/tools/fable/default.nix index 99ddef1d1a6e9d..8b09847ce0f43c 100644 --- a/pkgs/development/tools/fable/default.nix +++ b/pkgs/development/tools/fable/default.nix @@ -21,7 +21,7 @@ buildDotnetGlobalTool (finalAttrs: { description = "Fable is an F# to JavaScript compiler"; mainProgram = "fable"; homepage = "https://github.com/fable-compiler/fable"; - changelog = "https://github.com/fable-compiler/fable/releases/tag/v${version}"; + changelog = "https://github.com/fable-compiler/fable/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ diff --git a/pkgs/development/tools/hotdoc/default.nix b/pkgs/development/tools/hotdoc/default.nix index fb83630e1077f8..9d1bc1fa4ea3f1 100644 --- a/pkgs/development/tools/hotdoc/default.nix +++ b/pkgs/development/tools/hotdoc/default.nix @@ -126,7 +126,7 @@ buildPythonApplication rec { meta = { description = "Tastiest API documentation system"; homepage = "https://hotdoc.github.io/"; - license = [ licenses.lgpl21Plus ]; + license = [ lib.licenses.lgpl21Plus ]; maintainers = [ ]; }; } diff --git a/pkgs/development/tools/infisical/default.nix b/pkgs/development/tools/infisical/default.nix index b2dea0258a49ba..b543a01dc2d77b 100644 --- a/pkgs/development/tools/infisical/default.nix +++ b/pkgs/development/tools/infisical/default.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/infisical/infisical/releases/tag/infisical-cli%2Fv${version}"; license = lib.licenses.mit; mainProgram = "infisical"; - maintainers = lib.teams.infisical.members ++ (with maintainers; [ hausken ]); + maintainers = lib.teams.infisical.members ++ (with lib.maintainers; [ hausken ]); platforms = [ "x86_64-linux" "aarch64-linux" diff --git a/pkgs/development/tools/language-servers/ccls/default.nix b/pkgs/development/tools/language-servers/ccls/default.nix index ef38ab4978a728..fad950a73be088 100644 --- a/pkgs/development/tools/language-servers/ccls/default.nix +++ b/pkgs/development/tools/language-servers/ccls/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { mainProgram = "ccls"; homepage = "https://github.com/MaskRay/ccls"; license = lib.licenses.asl20; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ mic92 tobim diff --git a/pkgs/development/tools/language-servers/fortls/default.nix b/pkgs/development/tools/language-servers/fortls/default.nix index c2d557e32919ee..713ee602200764 100644 --- a/pkgs/development/tools/language-servers/fortls/default.nix +++ b/pkgs/development/tools/language-servers/fortls/default.nix @@ -32,7 +32,7 @@ buildPythonApplication rec { description = "Fortran Language Server"; mainProgram = "fortls"; homepage = "https://github.com/fortran-lang/fortls"; - license = [ licenses.mit ]; + license = [ lib.licenses.mit ]; maintainers = [ lib.maintainers.sheepforce ]; }; } diff --git a/pkgs/development/tools/language-servers/fortran-language-server/default.nix b/pkgs/development/tools/language-servers/fortran-language-server/default.nix index 69157fedb653a5..7ec61bd2c22eb2 100644 --- a/pkgs/development/tools/language-servers/fortran-language-server/default.nix +++ b/pkgs/development/tools/language-servers/fortran-language-server/default.nix @@ -20,7 +20,7 @@ buildPythonApplication rec { description = "FORTRAN Language Server for the Language Server Protocol"; mainProgram = "fortls"; homepage = "https://pypi.org/project/fortran-language-server/"; - license = [ licenses.mit ]; + license = [ lib.licenses.mit ]; maintainers = [ lib.maintainers.sheepforce ]; }; } diff --git a/pkgs/development/tools/libsigrok/default.nix b/pkgs/development/tools/libsigrok/default.nix index acb30ea78dde48..ca7c56213100c4 100644 --- a/pkgs/development/tools/libsigrok/default.nix +++ b/pkgs/development/tools/libsigrok/default.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { description = "Core library of the sigrok signal analysis software suite"; homepage = "https://sigrok.org/"; license = lib.licenses.gpl3Plus; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ bjornfor vifino diff --git a/pkgs/development/tools/misc/lttng-ust/generic.nix b/pkgs/development/tools/misc/lttng-ust/generic.nix index 5859a87764829c..1b1c107abb954a 100644 --- a/pkgs/development/tools/misc/lttng-ust/generic.nix +++ b/pkgs/development/tools/misc/lttng-ust/generic.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { gpl2Only mit ]; - platforms = lib.intersectLists platforms.linux liburcu.meta.platforms; + platforms = lib.intersectLists lib.platforms.linux liburcu.meta.platforms; maintainers = [ lib.maintainers.bjornfor ]; }; diff --git a/pkgs/development/tools/misc/luarocks/default.nix b/pkgs/development/tools/misc/luarocks/default.nix index 96294a0329b04f..918fba4c31aff0 100644 --- a/pkgs/development/tools/misc/luarocks/default.nix +++ b/pkgs/development/tools/misc/luarocks/default.nix @@ -134,7 +134,7 @@ stdenv.mkDerivation (finalAttrs: { teto ]; mainProgram = "luarocks"; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; downloadPage = "http://luarocks.org/releases/"; }; }) diff --git a/pkgs/development/tools/misc/stlink/default.nix b/pkgs/development/tools/misc/stlink/default.nix index 94da2fde07e2cf..e0480104a33b03 100644 --- a/pkgs/development/tools/misc/stlink/default.nix +++ b/pkgs/development/tools/misc/stlink/default.nix @@ -67,8 +67,8 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; badPlatforms = lib.platforms.darwin; maintainers = [ - maintainers.bjornfor - maintainers.rongcuid + lib.maintainers.bjornfor + lib.maintainers.rongcuid ]; }; } diff --git a/pkgs/development/tools/ocaml/merlin/4.x.nix b/pkgs/development/tools/ocaml/merlin/4.x.nix index 3f5504fc863699..cdd14d188ca1fe 100644 --- a/pkgs/development/tools/ocaml/merlin/4.x.nix +++ b/pkgs/development/tools/ocaml/merlin/4.x.nix @@ -95,8 +95,8 @@ buildDunePackage { homepage = "https://github.com/ocaml/merlin"; license = lib.licenses.mit; maintainers = [ - maintainers.vbgl - maintainers.sternenseemann + lib.maintainers.vbgl + lib.maintainers.sternenseemann ]; }; } diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix index a3c8519862d646..194d952ee42fed 100644 --- a/pkgs/development/tools/ocaml/opam/default.nix +++ b/pkgs/development/tools/ocaml/opam/default.nix @@ -4,7 +4,7 @@ assert lib.versionAtLeast ocaml.version "4.08.0"; -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "opam"; version = "2.3.0"; @@ -50,9 +50,9 @@ stdenv.mkDerivation { meta = { description = "Package manager for OCaml"; homepage = "https://opam.ocaml.org/"; - changelog = "https://github.com/ocaml/opam/raw/${version}/CHANGES"; + changelog = "https://github.com/ocaml/opam/raw/${finalAttrs.version}/CHANGES"; maintainers = [ ]; license = lib.licenses.lgpl21Only; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/development/tools/parsing/antlr/3.4.nix b/pkgs/development/tools/parsing/antlr/3.4.nix index 62cbae4bc006bf..8406695bbce02c 100644 --- a/pkgs/development/tools/parsing/antlr/3.4.nix +++ b/pkgs/development/tools/parsing/antlr/3.4.nix @@ -40,6 +40,6 @@ stdenv.mkDerivation rec { homepage = "https://www.antlr.org/"; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.bsd3; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/development/tools/rbspy/default.nix b/pkgs/development/tools/rbspy/default.nix index eb67145d720175..6570fdc55a2398 100644 --- a/pkgs/development/tools/rbspy/default.nix +++ b/pkgs/development/tools/rbspy/default.nix @@ -63,6 +63,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/rbspy/rbspy/releases/tag/v${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ viraptor ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/development/tools/rover/default.nix b/pkgs/development/tools/rover/default.nix index 49186fc6bf2167..287c6ff4251113 100644 --- a/pkgs/development/tools/rover/default.nix +++ b/pkgs/development/tools/rover/default.nix @@ -61,8 +61,8 @@ rustPlatform.buildRustPackage rec { homepage = "https://www.apollographql.com/docs/rover"; license = lib.licenses.mit; maintainers = [ - maintainers.ivanbrennan - maintainers.aaronarinder + lib.maintainers.ivanbrennan + lib.maintainers.aaronarinder ]; }; } diff --git a/pkgs/development/tools/tabnine/default.nix b/pkgs/development/tools/tabnine/default.nix index 0b35cb06b95a01..0d95b9d197245b 100644 --- a/pkgs/development/tools/tabnine/default.nix +++ b/pkgs/development/tools/tabnine/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation { 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/development/tools/tailwindcss/default.nix b/pkgs/development/tools/tailwindcss/default.nix index 11ff898505d4f6..234adc82b334f6 100644 --- a/pkgs/development/tools/tailwindcss/default.nix +++ b/pkgs/development/tools/tailwindcss/default.nix @@ -58,9 +58,9 @@ stdenv.mkDerivation rec { description = "Command-line tool for the CSS framework with composable CSS classes, standalone CLI"; homepage = "https://tailwindcss.com/blog/standalone-cli"; license = lib.licenses.mit; - sourceProvenance = [ sourceTypes.binaryNativeCode ]; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; maintainers = [ lib.maintainers.adamcstephens ]; mainProgram = "tailwindcss"; - platforms = lib.platforms.darwin ++ platforms.linux; + platforms = lib.platforms.darwin ++ lib.platforms.linux; }; } diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index 3b3f90800b18a4..335fdb2fc35599 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -420,9 +420,9 @@ let changelog = "https://github.com/nodejs/node/releases/tag/v${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ aduh95 ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; 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/misc/arm-trusted-firmware/default.nix b/pkgs/misc/arm-trusted-firmware/default.nix index 42cab4f0ade636..a5f9fdca36f567 100644 --- a/pkgs/misc/arm-trusted-firmware/default.nix +++ b/pkgs/misc/arm-trusted-firmware/default.nix @@ -80,7 +80,7 @@ let meta = { homepage = "https://github.com/ARM-software/arm-trusted-firmware"; description = "Reference implementation of secure world software for ARMv8-A"; - license = [ licenses.bsd3 ] ++ lib.optionals (!deleteHDCPBlobBeforeBuild) [ licenses.unfreeRedistributable ]; + license = [ lib.licenses.bsd3 ] ++ lib.optionals (!deleteHDCPBlobBeforeBuild) [ lib.licenses.unfreeRedistributable ]; maintainers = with lib.maintainers; [ lopsided98 ]; } // extraMeta; } // builtins.removeAttrs args [ "extraMeta" ]); @@ -88,7 +88,7 @@ let in { inherit buildArmTrustedFirmware; - armTrustedFirmwareTools = buildArmTrustedFirmware rec { + armTrustedFirmwareTools = buildArmTrustedFirmware { # Normally, arm-trusted-firmware builds the build tools for buildPlatform # using CC_FOR_BUILD (or as it calls it HOSTCC). Since want to build them # for the hostPlatform here, we trick it by overriding the HOSTCC setting diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libspl.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libspl.nix index 8a72436d464127..131836c0fd56ae 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/libspl.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libspl.nix @@ -16,7 +16,7 @@ mkDerivation { ''; meta = { - platform = platforms.freebsd; + platform = lib.platforms.freebsd; license = lib.licenses.cddl; }; } diff --git a/pkgs/os-specific/darwin/noah/default.nix b/pkgs/os-specific/darwin/noah/default.nix index 772ad75ef2f527..e3ccad74b4eba5 100644 --- a/pkgs/os-specific/darwin/noah/default.nix +++ b/pkgs/os-specific/darwin/noah/default.nix @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { description = "Bash on Ubuntu on macOS"; homepage = "https://github.com/linux-noah/noah"; license = [ - licenses.mit - licenses.gpl2Only + lib.licenses.mit + lib.licenses.gpl2Only ]; maintainers = [ ]; platforms = lib.platforms.darwin; diff --git a/pkgs/os-specific/darwin/xcode/default.nix b/pkgs/os-specific/darwin/xcode/default.nix index 29ea05310c7fc8..749ff7fb12994f 100644 --- a/pkgs/os-specific/darwin/xcode/default.nix +++ b/pkgs/os-specific/darwin/xcode/default.nix @@ -45,8 +45,8 @@ let homepage = "https://developer.apple.com/downloads/"; description = "Apple's XCode SDK"; license = lib.licenses.unfree; - platforms = lib.platforms.darwin ++ platforms.linux; - sourceProvenance = [ sourceTypes.binaryNativeCode ]; + platforms = lib.platforms.darwin ++ lib.platforms.linux; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; }; in diff --git a/pkgs/os-specific/linux/asus-wmi-sensors/default.nix b/pkgs/os-specific/linux/asus-wmi-sensors/default.nix index aea8736f5c147f..f3273d3c323a9c 100644 --- a/pkgs/os-specific/linux/asus-wmi-sensors/default.nix +++ b/pkgs/os-specific/linux/asus-wmi-sensors/default.nix @@ -40,6 +40,6 @@ stdenv.mkDerivation rec { "i686-linux" ]; maintainers = with lib.maintainers; [ Frostman ]; - broken = versionOlder kernel.version "4.12"; + broken = lib.versionOlder kernel.version "4.12"; }; } diff --git a/pkgs/os-specific/linux/gasket/default.nix b/pkgs/os-specific/linux/gasket/default.nix index 3823feee09dcb5..9e061cc4fe59bb 100644 --- a/pkgs/os-specific/linux/gasket/default.nix +++ b/pkgs/os-specific/linux/gasket/default.nix @@ -53,6 +53,6 @@ stdenv.mkDerivation rec { 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 5771748b7b4888..6a299d97dea538 100644 --- a/pkgs/os-specific/linux/ixgbevf/default.nix +++ b/pkgs/os-specific/linux/ixgbevf/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { 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/mstflint_access/default.nix b/pkgs/os-specific/linux/mstflint_access/default.nix index 373c24a42bf83e..5c0090d1c99d3d 100644 --- a/pkgs/os-specific/linux/mstflint_access/default.nix +++ b/pkgs/os-specific/linux/mstflint_access/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "Kernel module for Nvidia NIC firmware update"; homepage = "https://github.com/Mellanox/mstflint"; - license = [ licenses.gpl2Only ]; + license = [ lib.licenses.gpl2Only ]; maintainers = with lib.maintainers; [ thillux ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/os-specific/linux/ply/default.nix b/pkgs/os-specific/linux/ply/default.nix index 29de6c803f518f..fec55a51ecac81 100644 --- a/pkgs/os-specific/linux/ply/default.nix +++ b/pkgs/os-specific/linux/ply/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { description = "Dynamic tracing in Linux"; mainProgram = "ply"; homepage = "https://wkz.github.io/ply/"; - license = [ licenses.gpl2Only ]; + license = [ lib.licenses.gpl2Only ]; maintainers = with lib.maintainers; [ mic92 mbbx6spp diff --git a/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix b/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix index 81cbb390a26b55..83d109f064c797 100644 --- a/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix +++ b/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix @@ -5,7 +5,7 @@ kernel, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "rtl88xxau-aircrack"; version = "${kernel.version}-unstable-2024-04-09"; @@ -40,8 +40,8 @@ stdenv.mkDerivation rec { homepage = "https://github.com/aircrack-ng/rtl8812au"; license = lib.licenses.gpl2Only; maintainers = [ - maintainers.ja1den - maintainers.jethro + lib.maintainers.ja1den + lib.maintainers.jethro ]; platforms = [ "x86_64-linux" diff --git a/pkgs/os-specific/linux/system76-acpi/default.nix b/pkgs/os-specific/linux/system76-acpi/default.nix index 34334ca6c1108f..dec8b75e35ae47 100644 --- a/pkgs/os-specific/linux/system76-acpi/default.nix +++ b/pkgs/os-specific/linux/system76-acpi/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { ''; meta = { - license = [ licenses.gpl2Only ]; + license = [ lib.licenses.gpl2Only ]; platforms = [ "i686-linux" "x86_64-linux" diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix index 79e594baaf7fa4..08178f164765b3 100644 --- a/pkgs/os-specific/linux/udisks/2-default.nix +++ b/pkgs/os-specific/linux/udisks/2-default.nix @@ -154,7 +154,7 @@ stdenv.mkDerivation rec { lgpl2Plus gpl2Plus ]; # lgpl2Plus for the library, gpl2Plus for the tools & daemon - maintainers = lib.teams.freedesktop.members ++ (with maintainers; [ johnazoidberg ]); + maintainers = lib.teams.freedesktop.members ++ (with lib.maintainers; [ johnazoidberg ]); platforms = lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/zenpower/default.nix b/pkgs/os-specific/linux/zenpower/default.nix index c5be384f8b8af9..3cdf49ea09e326 100644 --- a/pkgs/os-specific/linux/zenpower/default.nix +++ b/pkgs/os-specific/linux/zenpower/default.nix @@ -36,6 +36,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/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix index f6618154afc077..34d839c035cc00 100644 --- a/pkgs/servers/clickhouse/default.nix +++ b/pkgs/servers/clickhouse/default.nix @@ -16,7 +16,6 @@ rustSupport ? true, - corrosion, rustc, cargo, rustPlatform, @@ -249,7 +248,7 @@ mkDerivation rec { ]; # not supposed to work on 32-bit https://github.com/ClickHouse/ClickHouse/pull/23959#issuecomment-835343685 - platforms = lib.filter (x: (lib.systems.elaborate x).is64bit) (platforms.linux ++ platforms.darwin); + platforms = lib.filter (x: (lib.systems.elaborate x).is64bit) (lib.platforms.linux ++ lib.platforms.darwin); broken = stdenv.buildPlatform != stdenv.hostPlatform; }; } diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index 06c99b886d7436..6d5fb3e9426844 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -154,7 +154,7 @@ let # un-indented, over the whole file license = lib.licenses.gpl3Plus; platforms = lib.platforms.unix; maintainers = [ - maintainers.vcunat # upstream developer + lib.maintainers.vcunat # upstream developer ]; mainProgram = "kresd"; }; diff --git a/pkgs/servers/etcd/3.5/default.nix b/pkgs/servers/etcd/3.5/default.nix index 347d70f3c71dcc..f45d4bbabdef2b 100644 --- a/pkgs/servers/etcd/3.5/default.nix +++ b/pkgs/servers/etcd/3.5/default.nix @@ -30,10 +30,10 @@ let license = lib.licenses.asl20; homepage = "https://etcd.io/"; maintainers = with lib.maintainers; [ offline ]; - platforms = lib.platforms.darwin ++ platforms.linux; + platforms = lib.platforms.darwin ++ lib.platforms.linux; }; - etcdserver = buildGoModule rec { + etcdserver = buildGoModule { pname = "etcdserver"; inherit @@ -58,7 +58,7 @@ let ldflags = [ "-X go.etcd.io/etcd/api/v3/version.GitSHA=GitNotFound" ]; }; - etcdutl = buildGoModule rec { + etcdutl = buildGoModule { pname = "etcdutl"; inherit @@ -73,7 +73,7 @@ let modRoot = "./etcdutl"; }; - etcdctl = buildGoModule rec { + etcdctl = buildGoModule { pname = "etcdctl"; inherit diff --git a/pkgs/servers/foundationdb/cmake.nix b/pkgs/servers/foundationdb/cmake.nix index a7b1d944b2940c..e9be5e64717d26 100644 --- a/pkgs/servers/foundationdb/cmake.nix +++ b/pkgs/servers/foundationdb/cmake.nix @@ -132,7 +132,7 @@ let meta = { description = "Open source, distributed, transactional key-value store"; homepage = "https://www.foundationdb.org"; - license = licenses.asl20; + license = lib.licenses.asl20; platforms = [ "x86_64-linux" ] ++ lib.optionals (!(avxEnabled version)) [ "aarch64-linux" ]; maintainers = with lib.maintainers; [ thoughtpolice lostnet ]; diff --git a/pkgs/servers/gpm/default.nix b/pkgs/servers/gpm/default.nix index 0183ed939bf3f4..764d5d6f7644b2 100644 --- a/pkgs/servers/gpm/default.nix +++ b/pkgs/servers/gpm/default.nix @@ -14,7 +14,7 @@ ncurses, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gpm"; version = "unstable-2020-06-17"; @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { homepage = "https://www.nico.schottelius.org/software/gpm/"; description = "Daemon that provides mouse support on the Linux console"; license = lib.licenses.gpl2Plus; - platforms = lib.platforms.linux ++ platforms.cygwin; + platforms = lib.platforms.linux ++ lib.platforms.cygwin; maintainers = [ ]; }; } diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index e871d41a888bd3..20d0032ac336cc 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -112,8 +112,8 @@ stdenv.mkDerivation rec { meta = { description = "Apache HTTPD, the world's most popular web server"; homepage = "https://httpd.apache.org/"; - license = licenses.asl20; - platforms = platforms.linux ++ platforms.darwin; + license = lib.licenses.asl20; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ lovek323 ]; }; } diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index d3f96148d4a11a..f88b8303b26033 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -169,7 +169,7 @@ stdenv.mkDerivation rec { ]; mainProgram = "dovecot"; maintainers = - with maintainers; + with lib.maintainers; [ fpletz globin diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix index 3dd38533f14d61..83b05ed444c966 100644 --- a/pkgs/servers/metabase/default.nix +++ b/pkgs/servers/metabase/default.nix @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { description = "Easy, open source way for everyone in your company to ask questions and learn from data"; homepage = "https://metabase.com"; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; - license = licenses.agpl3Only; - platforms = platforms.all; + license = lib.licenses.agpl3Only; + platforms = lib.platforms.all; maintainers = with lib.maintainers; [ schneefux thoughtpolice mmahut ]; mainProgram = "metabase"; }; diff --git a/pkgs/servers/sql/postgresql/ext/age.nix b/pkgs/servers/sql/postgresql/ext/age.nix index b032a3b32f3fd7..16de2b446381c4 100644 --- a/pkgs/servers/sql/postgresql/ext/age.nix +++ b/pkgs/servers/sql/postgresql/ext/age.nix @@ -74,7 +74,7 @@ buildPostgresqlExtension rec { }; meta = { - broken = !builtins.elem (versions.major postgresql.version) (builtins.attrNames hashes); + broken = !builtins.elem (lib.versions.major postgresql.version) (builtins.attrNames hashes); description = "Graph database extension for PostgreSQL"; homepage = "https://age.apache.org/"; changelog = "https://github.com/apache/age/raw/v${src.rev}/RELEASE"; diff --git a/pkgs/servers/sql/postgresql/ext/citus.nix b/pkgs/servers/sql/postgresql/ext/citus.nix index 1a9d7968219454..8ed424cffc64fb 100644 --- a/pkgs/servers/sql/postgresql/ext/citus.nix +++ b/pkgs/servers/sql/postgresql/ext/citus.nix @@ -1,6 +1,5 @@ { lib, - stdenv, curl, fetchFromGitHub, lz4, @@ -29,11 +28,11 @@ buildPostgresqlExtension rec { # latest release with Postgres' 3 latest releases." # https://www.citusdata.com/updates/v12-0/#deprecated_features broken = - versionOlder postgresql.version "14" + lib.versionOlder postgresql.version "14" || # PostgreSQL 17 support issue upstream: https://github.com/citusdata/citus/issues/7708 # Check after next package update. - (versionAtLeast postgresql.version "17" && version == "12.1.6"); + (lib.versionAtLeast postgresql.version "17" && version == "12.1.6"); description = "Distributed PostgreSQL as an extension"; homepage = "https://www.citusdata.com/"; changelog = "https://github.com/citusdata/citus/blob/${src.rev}/CHANGELOG.md"; diff --git a/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix b/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix index 377f7847cfe9b9..cd4fa9c572184b 100644 --- a/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix +++ b/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix @@ -1,13 +1,12 @@ { lib, - stdenv, fetchFromGitHub, postgresql, protobufc, buildPostgresqlExtension, }: -buildPostgresqlExtension rec { +buildPostgresqlExtension { pname = "cstore_fdw"; version = "1.7.0-unstable-2021-03-08"; @@ -21,7 +20,7 @@ buildPostgresqlExtension rec { }; meta = { - broken = versionAtLeast postgresql.version "14"; + broken = lib.versionAtLeast postgresql.version "14"; description = "Columnar storage for PostgreSQL"; homepage = "https://github.com/citusdata/cstore_fdw"; maintainers = with lib.maintainers; [ thoughtpolice ]; diff --git a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix index e284543725b2a3..9d3531f3efdc72 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix @@ -1,6 +1,5 @@ { lib, - stdenv, fetchFromGitHub, postgresql, buildPostgresqlExtension, @@ -29,6 +28,6 @@ buildPostgresqlExtension rec { license = lib.licenses.postgresql; # PostgreSQL 17 support issue upstream: https://github.com/hapostgres/pg_auto_failover/issues/1048 # Check after next package update. - broken = versionAtLeast postgresql.version "17" && version == "2.1"; + broken = lib.versionAtLeast postgresql.version "17" && version == "2.1"; }; } diff --git a/pkgs/servers/sql/postgresql/ext/pg_ivm.nix b/pkgs/servers/sql/postgresql/ext/pg_ivm.nix index c87f1173653021..fc3caa1dda8769 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_ivm.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_ivm.nix @@ -1,6 +1,5 @@ { lib, - stdenv, fetchFromGitHub, postgresql, buildPostgresqlExtension, @@ -24,6 +23,6 @@ buildPostgresqlExtension rec { maintainers = with lib.maintainers; [ ivan ]; platforms = postgresql.meta.platforms; license = lib.licenses.postgresql; - broken = versionOlder postgresql.version "13"; + broken = lib.versionOlder postgresql.version "13"; }; } diff --git a/pkgs/servers/sql/postgresql/ext/pg_partman.nix b/pkgs/servers/sql/postgresql/ext/pg_partman.nix index 691787fc01c5f9..84b9da8b262946 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_partman.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_partman.nix @@ -1,6 +1,5 @@ { lib, - stdenv, fetchFromGitHub, postgresql, buildPostgresqlExtension, @@ -24,6 +23,6 @@ buildPostgresqlExtension rec { maintainers = with lib.maintainers; [ ggpeti ]; platforms = postgresql.meta.platforms; license = lib.licenses.postgresql; - broken = versionOlder postgresql.version "14"; + broken = lib.versionOlder postgresql.version "14"; }; } diff --git a/pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix b/pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix index 3caf71ea634b37..3306f3430fddc8 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix @@ -1,6 +1,5 @@ { lib, - stdenv, fetchFromGitHub, postgresql, buildPostgresqlExtension, @@ -24,6 +23,6 @@ buildPostgresqlExtension rec { maintainers = with lib.maintainers; [ gaelreyrol ]; platforms = postgresql.meta.platforms; license = lib.licenses.mpl20; - broken = versionOlder postgresql.version "13"; + broken = lib.versionOlder postgresql.version "13"; }; } diff --git a/pkgs/servers/sql/postgresql/ext/pgvecto-rs/default.nix b/pkgs/servers/sql/postgresql/ext/pgvecto-rs/default.nix index 61f8c810b9db32..1cbc5b2743f6a5 100644 --- a/pkgs/servers/sql/postgresql/ext/pgvecto-rs/default.nix +++ b/pkgs/servers/sql/postgresql/ext/pgvecto-rs/default.nix @@ -10,7 +10,6 @@ pkg-config, postgresql, rustPlatform, - stdenv, replaceVars, }: @@ -93,11 +92,11 @@ in meta = { # Upstream removed support for PostgreSQL 13 on 0.3.0: https://github.com/tensorchord/pgvecto.rs/issues/343 broken = - (versionOlder postgresql.version "14") + (lib.versionOlder postgresql.version "14") || # PostgreSQL 17 support issue upstream: https://github.com/tensorchord/pgvecto.rs/issues/607 # Check after next package update. - versionAtLeast postgresql.version "17" && version == "0.3.0"; + lib.versionAtLeast postgresql.version "17" && version == "0.3.0"; description = "Scalable, Low-latency and Hybrid-enabled Vector Search in Postgres"; homepage = "https://github.com/tensorchord/pgvecto.rs"; license = lib.licenses.asl20; diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix index 20f31c4ce5a31a..d777e0dccc293a 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -60,6 +60,6 @@ buildPostgresqlExtension rec { maintainers = [ lib.maintainers.kirillrdy ]; platforms = postgresql.meta.platforms; license = with lib.licenses; if enableUnfree then tsl else asl20; - broken = versionOlder postgresql.version "14"; + broken = lib.versionOlder postgresql.version "14"; }; } diff --git a/pkgs/servers/teleport/generic.nix b/pkgs/servers/teleport/generic.nix index 56e8b5581ca414..89461ebfbf3b09 100644 --- a/pkgs/servers/teleport/generic.nix +++ b/pkgs/servers/teleport/generic.nix @@ -236,7 +236,7 @@ buildGoModule rec { meta = { description = "Certificate authority and access plane for SSH, Kubernetes, web applications, and databases"; homepage = "https://goteleport.com/"; - license = if lib.versionAtLeast version "15" then licenses.agpl3Plus else licenses.asl20; + license = if lib.versionAtLeast version "15" then lib.licenses.agpl3Plus else lib.licenses.asl20; maintainers = with lib.maintainers; [ arianvp justinas diff --git a/pkgs/servers/web-apps/matomo/default.nix b/pkgs/servers/web-apps/matomo/default.nix index 97b33e80cfbb83..ffc55cc1645238 100644 --- a/pkgs/servers/web-apps/matomo/default.nix +++ b/pkgs/servers/web-apps/matomo/default.nix @@ -121,7 +121,7 @@ let homepage = "https://matomo.org/"; platforms = lib.platforms.all; maintainers = - with maintainers; + with lib.maintainers; [ florianjacob sebbel diff --git a/pkgs/servers/web-apps/outline/default.nix b/pkgs/servers/web-apps/outline/default.nix index 8b53168c1fc69c..f615d2c2a442c4 100644 --- a/pkgs/servers/web-apps/outline/default.nix +++ b/pkgs/servers/web-apps/outline/default.nix @@ -94,7 +94,7 @@ stdenv.mkDerivation rec { changelog = "https://github.com/outline/outline/releases"; license = lib.licenses.bsl11; maintainers = - with maintainers; + with lib.maintainers; [ cab404 yrd diff --git a/pkgs/servers/web-apps/wordpress/generic.nix b/pkgs/servers/web-apps/wordpress/generic.nix index 04c84d9faaf892..a41887c0aaf738 100644 --- a/pkgs/servers/web-apps/wordpress/generic.nix +++ b/pkgs/servers/web-apps/wordpress/generic.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://wordpress.org"; description = "WordPress is open source software you can use to create a beautiful website, blog, or app"; - license = [ licenses.gpl2Plus ]; + license = [ lib.licenses.gpl2Plus ]; maintainers = [ lib.maintainers.basvandijk ]; platforms = lib.platforms.all; }; diff --git a/pkgs/tools/admin/awsume/default.nix b/pkgs/tools/admin/awsume/default.nix index 208e12dbf01f31..c0d4bd1cbcd4bb 100644 --- a/pkgs/tools/admin/awsume/default.nix +++ b/pkgs/tools/admin/awsume/default.nix @@ -55,7 +55,7 @@ buildPythonApplication rec { meta = { description = "Utility for easily assuming AWS IAM roles from the command line"; homepage = "https://github.com/trek10inc/awsume"; - license = [ licenses.mit ]; + license = [ lib.licenses.mit ]; mainProgram = "awsume"; maintainers = [ lib.maintainers.nilp0inter ]; }; diff --git a/pkgs/tools/admin/ibmcloud-cli/default.nix b/pkgs/tools/admin/ibmcloud-cli/default.nix index 34308c740563a7..f81a7314d26365 100644 --- a/pkgs/tools/admin/ibmcloud-cli/default.nix +++ b/pkgs/tools/admin/ibmcloud-cli/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://cloud.ibm.com/docs/cli"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ emilytrau ]; - platforms = [ "x86_64-linux" "aarch64-linux" "i686-linux" "powerpc64le-linux" "s390x-linux" ] ++ platforms.darwin; + platforms = [ "x86_64-linux" "aarch64-linux" "i686-linux" "powerpc64le-linux" "s390x-linux" ] ++ lib.platforms.darwin; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; mainProgram = "ibmcloud"; }; diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix index 44feeed413c942..0a0c9930486b60 100644 --- a/pkgs/tools/archivers/p7zip/default.nix +++ b/pkgs/tools/archivers/p7zip/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/p7zip-project/p7zip"; description = "New p7zip fork with additional codecs and improvements (forked from https://sourceforge.net/projects/p7zip/)"; license = - with licenses; + with lib.licenses; # p7zip code is largely lgpl2Plus # CPP/7zip/Compress/LzfseDecoder.cpp is bsd3 [ diff --git a/pkgs/tools/backup/percona-xtrabackup/generic.nix b/pkgs/tools/backup/percona-xtrabackup/generic.nix index a0f0bb5c87218c..d3b3ea388e9b39 100644 --- a/pkgs/tools/backup/percona-xtrabackup/generic.nix +++ b/pkgs/tools/backup/percona-xtrabackup/generic.nix @@ -111,6 +111,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "http://www.percona.com/software/percona-xtrabackup"; license = lib.licenses.gpl2Only; platforms = lib.platforms.linux; - maintainers = lib.teams.flyingcircus.members ++ [ maintainers.izorkin ]; + maintainers = lib.teams.flyingcircus.members ++ [ lib.maintainers.izorkin ]; }; }) diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix index c1fa4d8a7e8a35..fc639a08a4646a 100644 --- a/pkgs/tools/backup/restic/default.nix +++ b/pkgs/tools/backup/restic/default.nix @@ -63,11 +63,11 @@ buildGoModule rec { homepage = "https://restic.net"; changelog = "https://github.com/restic/restic/blob/${src.rev}/CHANGELOG.md"; description = "Backup program that is fast, efficient and secure"; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; license = lib.licenses.bsd2; maintainers = [ - maintainers.mbrgm - maintainers.dotlambda + lib.maintainers.mbrgm + lib.maintainers.dotlambda ]; mainProgram = "restic"; }; diff --git a/pkgs/tools/filesystems/ceph/old-python-packages/cryptography.nix b/pkgs/tools/filesystems/ceph/old-python-packages/cryptography.nix index 73b6f186591691..c4827ee87dfd69 100644 --- a/pkgs/tools/filesystems/ceph/old-python-packages/cryptography.nix +++ b/pkgs/tools/filesystems/ceph/old-python-packages/cryptography.nix @@ -124,7 +124,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/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index 19c8b73247ec93..d6bb8997612734 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -201,6 +201,6 @@ stdenv.mkDerivation (finalAttrs: { description = "Tool for programming graphics intended to replace Metapost"; license = lib.licenses.gpl3Plus; maintainers = [ lib.maintainers.raskin ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; }) diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index 6b59304ef51a43..0352f40f5aa889 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -125,7 +125,7 @@ in meta = { homepage = "http://www.gnuplot.info/"; description = "Portable command-line driven graphing utility for many platforms"; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; license = { # Essentially a BSD license with one modifaction: # Permission to modify the software is granted, but not the right to diff --git a/pkgs/tools/misc/archi/default.nix b/pkgs/tools/misc/archi/default.nix index 59d733b86c6ce9..6497a0197033c3 100644 --- a/pkgs/tools/misc/archi/default.nix +++ b/pkgs/tools/misc/archi/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { homepage = "https://www.archimatetool.com/"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.mit; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ earldouglas paumr ]; mainProgram = "Archi"; }; diff --git a/pkgs/tools/misc/contacts/default.nix b/pkgs/tools/misc/contacts/default.nix index 2efa174e5a6fd2..296edd8dd00ad2 100644 --- a/pkgs/tools/misc/contacts/default.nix +++ b/pkgs/tools/misc/contacts/default.nix @@ -40,6 +40,6 @@ stdenv.mkDerivation { license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ jwiegley ]; platforms = lib.platforms.darwin; - hydraPlatforms = platforms.darwin; + hydraPlatforms = lib.platforms.darwin; }; } diff --git a/pkgs/tools/misc/grub/default.nix b/pkgs/tools/misc/grub/default.nix index 9516529be3ea2b..f44519dd9aeea3 100644 --- a/pkgs/tools/misc/grub/default.nix +++ b/pkgs/tools/misc/grub/default.nix @@ -200,7 +200,7 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; - platforms = if xenSupport then [ "x86_64-linux" "i686-linux" ] else platforms.gnu ++ platforms.linux; + platforms = if xenSupport then [ "x86_64-linux" "i686-linux" ] else lib.platforms.gnu ++ lib.platforms.linux; maintainers = [ ]; }; diff --git a/pkgs/tools/misc/logstash/7.x.nix b/pkgs/tools/misc/logstash/7.x.nix index f3ac75b85e0b83..d472a4a3362c85 100644 --- a/pkgs/tools/misc/logstash/7.x.nix +++ b/pkgs/tools/misc/logstash/7.x.nix @@ -73,7 +73,7 @@ let binaryBytecode # source bundles dependencies as jars binaryNativeCode # bundled jruby includes native code ]; - license = if enableUnfree then licenses.elastic20 else licenses.asl20; + license = if enableUnfree then lib.licenses.elastic20 else lib.licenses.asl20; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ offline diff --git a/pkgs/tools/networking/dd-agent/datadog-agent.nix b/pkgs/tools/networking/dd-agent/datadog-agent.nix index 13dd65746471f1..68a0670f6e0e10 100644 --- a/pkgs/tools/networking/dd-agent/datadog-agent.nix +++ b/pkgs/tools/networking/dd-agent/datadog-agent.nix @@ -116,7 +116,7 @@ in buildGo122Module rec { -- v6 new golang implementation. ''; homepage = "https://www.datadoghq.com"; - license = licenses.bsd3; + license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ thoughtpolice domenkozar ]; }; } diff --git a/pkgs/tools/networking/http-prompt/default.nix b/pkgs/tools/networking/http-prompt/default.nix index b410e387a5ff07..a4235d3bb7401d 100644 --- a/pkgs/tools/networking/http-prompt/default.nix +++ b/pkgs/tools/networking/http-prompt/default.nix @@ -36,6 +36,6 @@ python3Packages.buildPythonApplication rec { homepage = "https://github.com/eliangcs/http-prompt"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ matthiasbeyer ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/tools/networking/isync/default.nix b/pkgs/tools/networking/isync/default.nix index 25cff8e0db6e73..d7d192526e6f3d 100644 --- a/pkgs/tools/networking/isync/default.nix +++ b/pkgs/tools/networking/isync/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "http://isync.sourceforge.net/"; # https://sourceforge.net/projects/isync/ - changelog = "https://sourceforge.net/p/isync/isync/ci/v${version}/tree/NEWS"; + changelog = "https://sourceforge.net/p/isync/isync/ci/v${finalAttrs.version}/tree/NEWS"; description = "Free IMAP and MailDir mailbox synchronizer"; longDescription = '' mbsync (formerly isync) is a command line application which synchronizes diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix index a672b9edb57a6c..d368d7b5b76e4f 100644 --- a/pkgs/tools/networking/mailutils/default.nix +++ b/pkgs/tools/networking/mailutils/default.nix @@ -157,6 +157,6 @@ stdenv.mkDerivation rec { changelog = "https://git.savannah.gnu.org/cgit/mailutils.git/tree/NEWS"; # Some of the dependencies fail to build on {cyg,dar}win. - platforms = lib.platforms.gnu ++ platforms.unix; + platforms = lib.platforms.gnu ++ lib.platforms.unix; }; } diff --git a/pkgs/tools/networking/maphosts/default.nix b/pkgs/tools/networking/maphosts/default.nix index a652830218f8e6..b62176f5f9e549 100644 --- a/pkgs/tools/networking/maphosts/default.nix +++ b/pkgs/tools/networking/maphosts/default.nix @@ -13,7 +13,7 @@ let gemdir = ./.; }; in -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "maphosts"; version = env.gems.maphosts.version; @@ -29,7 +29,7 @@ stdenv.mkDerivation { meta = { description = "Small command line application for keeping your project hostnames in sync with /etc/hosts"; homepage = "https://github.com/mpscholten/maphosts"; - changelog = "https://github.com/mpscholten/maphosts/releases/tag/v${version}"; + changelog = "https://github.com/mpscholten/maphosts/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ mpscholten @@ -38,4 +38,4 @@ stdenv.mkDerivation { platforms = lib.platforms.all; mainProgram = "maphosts"; }; -} +}) diff --git a/pkgs/tools/networking/networkmanager/default.nix b/pkgs/tools/networking/networkmanager/default.nix index 1b7057af4928b7..aeea193ab9fa4f 100644 --- a/pkgs/tools/networking/networkmanager/default.nix +++ b/pkgs/tools/networking/networkmanager/default.nix @@ -224,7 +224,7 @@ stdenv.mkDerivation rec { description = "Network configuration and management tool"; license = lib.licenses.gpl2Plus; changelog = "https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/raw/${version}/NEWS"; - maintainers = lib.teams.freedesktop.members ++ (with maintainers; [ domenkozar obadz ]); + maintainers = lib.teams.freedesktop.members ++ (with lib.maintainers; [ domenkozar obadz ]); platforms = lib.platforms.linux; badPlatforms = [ # Mandatory shared libraries. diff --git a/pkgs/tools/networking/openvpn/openvpn-auth-ldap.nix b/pkgs/tools/networking/openvpn/openvpn-auth-ldap.nix index 17454e797bd450..223a0e120d544d 100644 --- a/pkgs/tools/networking/openvpn/openvpn-auth-ldap.nix +++ b/pkgs/tools/networking/openvpn/openvpn-auth-ldap.nix @@ -63,8 +63,8 @@ stdenv.mkDerivation rec { description = "LDAP authentication plugin for OpenVPN"; homepage = "https://github.com/threerings/openvpn-auth-ldap"; license = [ - licenses.asl20 - licenses.bsd3 + lib.licenses.asl20 + lib.licenses.bsd3 ]; maintainers = [ lib.maintainers.benley ]; platforms = lib.platforms.unix; diff --git a/pkgs/tools/package-management/nix/common.nix b/pkgs/tools/package-management/nix/common.nix index 8c26d38a17c2f9..19f35b35ab7dfc 100644 --- a/pkgs/tools/package-management/nix/common.nix +++ b/pkgs/tools/package-management/nix/common.nix @@ -300,7 +300,7 @@ self = stdenv.mkDerivation { license = lib.licenses.lgpl21Plus; inherit maintainers; platforms = lib.platforms.unix; - outputsToInstall = [ "out" ] ++ optional enableDocumentation "man"; + outputsToInstall = [ "out" ] ++ lib.optional enableDocumentation "man"; mainProgram = "nix"; }; }; diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index 7215af0a6333a8..f615dc12178ca0 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -129,6 +129,6 @@ stdenv.mkDerivation rec { ]; description = "RPM Package Manager"; maintainers = with lib.maintainers; [ copumpkin ]; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index 4ab7087ac7c782..4f4aa12ce34bb2 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -61,7 +61,7 @@ buildGoModule rec { meta = { homepage = "https://www.keybase.io/"; description = "Keybase official command-line utility and service"; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ avaq np diff --git a/pkgs/tools/security/rblake2sum/default.nix b/pkgs/tools/security/rblake2sum/default.nix index 5f693d52040c7e..0164f540da2be9 100644 --- a/pkgs/tools/security/rblake2sum/default.nix +++ b/pkgs/tools/security/rblake2sum/default.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage { meta = { description = "Recursive blake2 digest (hash) of a file-system path"; homepage = "https://github.com/crev-dev/rblake2sum"; - license = [ licenses.mit ]; + license = [ lib.licenses.mit ]; maintainers = with lib.maintainers; [ dpc ]; mainProgram = "rblake2sum"; }; diff --git a/pkgs/tools/security/rblake3sum/default.nix b/pkgs/tools/security/rblake3sum/default.nix index fa5a29eeb4cdad..2f0c9ff8abe732 100644 --- a/pkgs/tools/security/rblake3sum/default.nix +++ b/pkgs/tools/security/rblake3sum/default.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage { meta = { description = "Recursive blake3 digest (hash) of a file-system path"; homepage = "https://github.com/rustshop/rblake3sum"; - license = [ licenses.mit ]; + license = [ lib.licenses.mit ]; maintainers = with lib.maintainers; [ dpc ]; mainProgram = "rblake3sum"; }; diff --git a/pkgs/tools/system/btop/default.nix b/pkgs/tools/system/btop/default.nix index 5a91d3906ebc49..d1df6b98b7c461 100644 --- a/pkgs/tools/system/btop/default.nix +++ b/pkgs/tools/system/btop/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/aristocratos/btop"; changelog = "https://github.com/aristocratos/btop/blob/v${version}/CHANGELOG.md"; license = lib.licenses.asl20; - platforms = lib.platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ khaneliman rmcgibbo diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index 58b6416042a450..6939ec15d93454 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -278,8 +278,8 @@ stdenv'.mkDerivation (finalAttrs: { 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}"; - license = [ licenses.gpl3Plus ] ++ lib.optionals (withCloudUi) [ licenses.ncul1 ]; + changelog = "https://github.com/netdata/netdata/releases/tag/v${finalAttrs.version}"; + license = [ lib.licenses.gpl3Plus ] ++ lib.optionals (withCloudUi) [ lib.licenses.ncul1 ]; platforms = lib.platforms.unix; maintainers = [ ]; }; diff --git a/pkgs/tools/system/nvtop/build-nvtop.nix b/pkgs/tools/system/nvtop/build-nvtop.nix index f4149200dec783..c5319efd1f9ac6 100644 --- a/pkgs/tools/system/nvtop/build-nvtop.nix +++ b/pkgs/tools/system/nvtop/build-nvtop.nix @@ -98,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/Syllo/nvtop"; changelog = "https://github.com/Syllo/nvtop/releases/tag/${finalAttrs.version}"; license = lib.licenses.gpl3Only; - platforms = if apple then platforms.darwin else platforms.linux; + platforms = if apple then lib.platforms.darwin else lib.platforms.linux; maintainers = with lib.maintainers; [ willibutz gbtb diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix index 27c116fc9d29c5..a2f04a0e1f2017 100644 --- a/pkgs/tools/text/gnugrep/default.nix +++ b/pkgs/tools/text/gnugrep/default.nix @@ -67,8 +67,8 @@ stdenv.mkDerivation { license = lib.licenses.gpl3Plus; maintainers = [ - maintainers.das_j - maintainers.m00wl + lib.maintainers.das_j + lib.maintainers.m00wl ]; platforms = lib.platforms.all; mainProgram = "grep"; diff --git a/pkgs/tools/text/mdbook-graphviz/default.nix b/pkgs/tools/text/mdbook-graphviz/default.nix index e62b46f8790a67..5d296377afad1b 100644 --- a/pkgs/tools/text/mdbook-graphviz/default.nix +++ b/pkgs/tools/text/mdbook-graphviz/default.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { mainProgram = "mdbook-graphviz"; homepage = "https://github.com/dylanowen/mdbook-graphviz"; changelog = "https://github.com/dylanowen/mdbook-graphviz/releases/tag/v${version}"; - license = [ licenses.mpl20 ]; + license = [ lib.licenses.mpl20 ]; maintainers = with lib.maintainers; [ lovesegfault matthiasbeyer diff --git a/pkgs/tools/text/mdbook-katex/default.nix b/pkgs/tools/text/mdbook-katex/default.nix index 5972b8a4968c02..670dc184ac11f8 100644 --- a/pkgs/tools/text/mdbook-katex/default.nix +++ b/pkgs/tools/text/mdbook-katex/default.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { description = "Preprocessor for mdbook, rendering LaTeX equations to HTML at build time"; mainProgram = "mdbook-katex"; homepage = "https://github.com/lzanini/${pname}"; - license = [ licenses.mit ]; + license = [ lib.licenses.mit ]; maintainers = with lib.maintainers; [ lovesegfault matthiasbeyer diff --git a/pkgs/tools/text/mdbook-plantuml/default.nix b/pkgs/tools/text/mdbook-plantuml/default.nix index 0685abb446813a..b6dc30022b665f 100644 --- a/pkgs/tools/text/mdbook-plantuml/default.nix +++ b/pkgs/tools/text/mdbook-plantuml/default.nix @@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec { description = "mdBook preprocessor to render PlantUML diagrams to png images in the book output directory"; mainProgram = "mdbook-plantuml"; homepage = "https://github.com/sytsereitsma/mdbook-plantuml"; - license = [ licenses.mit ]; + license = [ lib.licenses.mit ]; maintainers = with lib.maintainers; [ jcouyang matthiasbeyer diff --git a/pkgs/tools/text/mdbook-toc/default.nix b/pkgs/tools/text/mdbook-toc/default.nix index 61a7e26ee595a5..6bad3d372b5576 100644 --- a/pkgs/tools/text/mdbook-toc/default.nix +++ b/pkgs/tools/text/mdbook-toc/default.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { description = "Preprocessor for mdbook to add inline Table of Contents support"; mainProgram = "mdbook-toc"; homepage = "https://github.com/badboy/mdbook-toc"; - license = [ licenses.mpl20 ]; + license = [ lib.licenses.mpl20 ]; maintainers = with lib.maintainers; [ matthiasbeyer ]; }; } diff --git a/pkgs/tools/typesetting/htmldoc/default.nix b/pkgs/tools/typesetting/htmldoc/default.nix index 2666b77543f483..ba6947a3cb8d0f 100644 --- a/pkgs/tools/typesetting/htmldoc/default.nix +++ b/pkgs/tools/typesetting/htmldoc/default.nix @@ -29,9 +29,9 @@ stdenv.mkDerivation rec { description = "Converts HTML files to PostScript and PDF"; homepage = "https://michaelrsweet.github.io/htmldoc"; changelog = "https://github.com/michaelrsweet/htmldoc/releases/tag/v${version}"; - license = licenses.gpl2Only; + license = lib.licenses.gpl2Only; maintainers = [ ]; - platforms = platforms.unix; + platforms = lib.platforms.unix; longDescription = '' HTMLDOC is a program that reads HTML source files or web pages and diff --git a/pkgs/tools/typesetting/tikzit/default.nix b/pkgs/tools/typesetting/tikzit/default.nix index d1e5f816f93f0c..e084c56b00a1a2 100644 --- a/pkgs/tools/typesetting/tikzit/default.nix +++ b/pkgs/tools/typesetting/tikzit/default.nix @@ -47,8 +47,8 @@ mkDerivation { license = lib.licenses.gpl3Plus; platforms = lib.platforms.all; maintainers = [ - maintainers.iblech - maintainers.mgttlinger + lib.maintainers.iblech + lib.maintainers.mgttlinger ]; mainProgram = "tikzit"; };