treewide: manual fixes of lsp failures

Signed-off-by: lucasew <[email protected]>

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;

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;
   };
 }

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";
   };
 }

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
     ];
   };
 }

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
     ];
   };
 }

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 ];
   };
 })

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";

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;
   };
 }

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
     );
   };
 }

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";
   };

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

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 = [

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";

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";
   };
 }

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 ];
   };
 }

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;

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

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 ];
   };
 }

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 ];
   };
 }

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 = [ ];
   };

pkgs/applications/kde/kpublictransport.nix

@@ -9,15 +9,17 @@
 
 mkDerivation {
   pname = "kpublictransport";
-  meta = {
-    license = [ licenses.cc0 ];
-    maintainers = [ ];
-  };
+
   nativeBuildInputs = [ extra-cmake-modules ];
 
   buildInputs = [
     qtquickcontrols2
     networkmanager-qt
     ki18n
   ];
+
+  meta = {
+    license = [ lib.licenses.cc0 ];
+    maintainers = [ ];
+  };
 }

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;
   };
 }

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 ];
   };
 })

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;
   };
 }

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";
   };

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 ];

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;
   };
 })

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";

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 ];

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";
   };

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);
   };
 })

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 ];
   };
 }

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";

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
   };
 }

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 ];
   };
 })

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