diff options
Diffstat (limited to 'pkgs/applications/editors')
22 files changed, 401 insertions, 506 deletions
diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index f0863b771eba7..87b7a99833dec 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -1,7 +1,7 @@ { channel, pname, version, sha256Hash }: { alsa-lib -, bash +, runtimeShell , buildFHSEnv , cacert , coreutils @@ -65,6 +65,7 @@ , zlib , makeDesktopItem , tiling_wm # if we are using a tiling wm, need to set _JAVA_AWT_WM_NONREPARENTING in wrapper +, androidenv }: let @@ -214,17 +215,52 @@ let '') ]; }; -in runCommand - drvName - { - startScript = '' - #!${bash}/bin/bash - ${fhsEnv}/bin/${drvName}-fhs-env ${androidStudio}/bin/studio.sh "$@" + mkAndroidStudioWrapper = {androidStudio, androidSdk ? null}: runCommand drvName { + startScript = let + hasAndroidSdk = androidSdk != null; + androidSdkRoot = lib.optionalString hasAndroidSdk "${androidSdk}/libexec/android-sdk"; + in '' + #!${runtimeShell} + ${lib.optionalString hasAndroidSdk '' + echo "=== nixpkgs Android Studio wrapper" >&2 + + # Default ANDROID_SDK_ROOT to the packaged one, if not provided. + ANDROID_SDK_ROOT="''${ANDROID_SDK_ROOT-${androidSdkRoot}}" + + if [ -d "$ANDROID_SDK_ROOT" ]; then + export ANDROID_SDK_ROOT + # Legacy compatibility. + export ANDROID_HOME="$ANDROID_SDK_ROOT" + echo " - ANDROID_SDK_ROOT=$ANDROID_SDK_ROOT" >&2 + + # See if we can export ANDROID_NDK_ROOT too. + ANDROID_NDK_ROOT="$ANDROID_SDK_ROOT/ndk-bundle" + if [ ! -d "$ANDROID_NDK_ROOT" ]; then + ANDROID_NDK_ROOT="$(ls "$ANDROID_SDK_ROOT/ndk/"* 2>/dev/null | head -n1)" + fi + + if [ -d "$ANDROID_NDK_ROOT" ]; then + export ANDROID_NDK_ROOT + echo " - ANDROID_NDK_ROOT=$ANDROID_NDK_ROOT" >&2 + else + unset ANDROID_NDK_ROOT + fi + else + unset ANDROID_SDK_ROOT + unset ANDROID_HOME + fi + ''} + exec ${fhsEnv}/bin/${drvName}-fhs-env ${androidStudio}/bin/studio.sh "$@" ''; preferLocalBuild = true; allowSubstitutes = false; - passthru = { + passthru = let + withSdk = androidSdk: mkAndroidStudioWrapper { inherit androidStudio androidSdk; }; + in { unwrapped = androidStudio; + full = withSdk androidenv.androidPkgs.androidsdk; + inherit withSdk; + sdk = androidSdk; }; meta = with lib; { description = "Official IDE for Android (${channel} channel)"; @@ -245,9 +281,9 @@ in runCommand # source-code itself). platforms = [ "x86_64-linux" ]; maintainers = with maintainers; rec { - stable = [ alapshin ]; - beta = [ alapshin ]; - canary = [ alapshin ]; + stable = [ alapshin numinit ]; + beta = [ alapshin numinit ]; + canary = [ alapshin numinit ]; dev = canary; }."${channel}"; mainProgram = pname; @@ -261,4 +297,5 @@ in runCommand ln -s ${androidStudio}/bin/studio.png $out/share/pixmaps/${pname}.png ln -s ${desktopItem}/share/applications $out/share/applications - '' + ''; +in mkAndroidStudioWrapper { inherit androidStudio; } diff --git a/pkgs/applications/editors/aseprite/default.nix b/pkgs/applications/editors/aseprite/default.nix deleted file mode 100644 index e41edcdd66b89..0000000000000 --- a/pkgs/applications/editors/aseprite/default.nix +++ /dev/null @@ -1,112 +0,0 @@ -{ stdenv, lib, callPackage, fetchFromGitHub, cmake, ninja, pkg-config -, curl, freetype, giflib, libjpeg, libpng, libwebp, pixman, tinyxml, zlib -, harfbuzzFull, glib, fontconfig, pcre -, libX11, libXext, libXcursor, libXxf86vm, libGL, libXi -, cmark -}: - -# Unfree version is not redistributable: -# https://dev.aseprite.org/2016/09/01/new-source-code-license/ -# Consider supporting the developer: https://aseprite.org/#buy - -let - skia = callPackage ./skia.nix {}; -in -stdenv.mkDerivation rec { - pname = "aseprite"; - version = "1.3.6"; - - src = fetchFromGitHub { - owner = "aseprite"; - repo = "aseprite"; - rev = "v${version}"; - fetchSubmodules = true; - hash = "sha256-17f6pIGsOIswnyY63pjHKEEYuCo43kf25mPLBv4vQAs="; - }; - - nativeBuildInputs = [ - cmake pkg-config ninja - ]; - - buildInputs = [ - curl freetype giflib libjpeg libpng libwebp pixman tinyxml zlib - libX11 libXext libXcursor libXxf86vm - cmark - harfbuzzFull glib fontconfig pcre - skia libGL libXi - ]; - - patches = [ - ./shared-libwebp.patch - ./shared-skia-deps.patch - ]; - - postPatch = '' - sed -i src/ver/CMakeLists.txt -e "s-set(VERSION \".*\")-set(VERSION \"$version\")-" - ''; - - cmakeFlags = [ - "-DENABLE_UPDATER=OFF" - "-DUSE_SHARED_CURL=ON" - "-DUSE_SHARED_FREETYPE=ON" - "-DUSE_SHARED_GIFLIB=ON" - "-DUSE_SHARED_JPEGLIB=ON" - "-DUSE_SHARED_LIBPNG=ON" - "-DUSE_SHARED_LIBWEBP=ON" - "-DUSE_SHARED_PIXMAN=ON" - "-DUSE_SHARED_TINYXML=ON" - "-DUSE_SHARED_ZLIB=ON" - "-DUSE_SHARED_CMARK=ON" - "-DUSE_SHARED_HARFBUZZ=ON" - "-DUSE_SHARED_WEBP=ON" - # Disable libarchive programs. - "-DENABLE_CAT=OFF" - "-DENABLE_CPIO=OFF" - "-DENABLE_TAR=OFF" - # UI backend. - "-DLAF_WITH_EXAMPLES=OFF" - "-DLAF_OS_BACKEND=skia" - "-DENABLE_DESKTOP_INTEGRATION=ON" - "-DSKIA_DIR=${skia}" - "-DSKIA_LIBRARY_DIR=${skia}/out/Release" - ]; - - postInstall = '' - # Install desktop icons. - src="$out/share/aseprite/data/icons" - for size in 16 32 48 64; do - dst="$out"/share/icons/hicolor/"$size"x"$size" - install -Dm644 "$src"/ase"$size".png "$dst"/apps/aseprite.png - install -Dm644 "$src"/doc"$size".png "$dst"/mimetypes/aseprite.png - done - # Delete unneeded artifacts of bundled libraries. - rm -rf "$out"/include "$out"/lib - ''; - - passthru = { inherit skia; }; - - meta = with lib; { - homepage = "https://www.aseprite.org/"; - description = "Animated sprite editor & pixel art tool"; - license = licenses.unfree; - longDescription = - ''Aseprite is a program to create animated sprites. Its main features are: - - - Sprites are composed by layers & frames (as separated concepts). - - Supported color modes: RGBA, Indexed (palettes up to 256 colors), and Grayscale. - - Load/save sequence of PNG files and GIF animations (and FLC, FLI, JPG, BMP, PCX, TGA). - - Export/import animations to/from Sprite Sheets. - - Tiled drawing mode, useful to draw patterns and textures. - - Undo/Redo for every operation. - - Real-time animation preview. - - Multiple editors support. - - Pixel-art specific tools like filled Contour, Polygon, Shading mode, etc. - - Onion skinning. - - This version is not redistributable: https://dev.aseprite.org/2016/09/01/new-source-code-license/ - Consider supporting the developer: https://aseprite.org/#buy - ''; - maintainers = with maintainers; [ orivej ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/editors/aseprite/shared-libwebp.patch b/pkgs/applications/editors/aseprite/shared-libwebp.patch deleted file mode 100644 index 20191f46b8b16..0000000000000 --- a/pkgs/applications/editors/aseprite/shared-libwebp.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index af077f6..fed17ff 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -58,6 +58,7 @@ option(USE_SHARED_TINYXML "Use your installed copy of tinyxml" off) - option(USE_SHARED_PIXMAN "Use your installed copy of pixman" off) - option(USE_SHARED_FREETYPE "Use shared FreeType library" off) - option(USE_SHARED_HARFBUZZ "Use shared HarfBuzz library" off) -+option(USE_SHARED_WEBP "Use your installed copy of webp" off) - option(ENABLE_ASEPRITE_EXE "Compile main Aseprite executable" on) - option(ENABLE_MEMLEAK "Enable memory-leaks detector (only for developers)" off) - option(ENABLE_NEWS "Enable the news in Home tab" on) -@@ -328,14 +351,17 @@ add_subdirectory(laf) - # libwebp - if(ENABLE_WEBP) - # Use libwebp from Skia -- if(LAF_BACKEND STREQUAL "skia") -+ if(USE_SHARED_WEBP) -+ find_library(WEBP_LIBRARY NAMES webp) -+ find_library(WEBPDEMUX_LIBRARY NAMES webpdemux) -+ find_library(WEBPMUX_LIBRARY NAMES webpmux) -+ set(WEBP_LIBRARIES ${WEBP_LIBRARY} ${WEBPDEMUX_LIBRARY} ${WEBPMUX_LIBRARY}) -+ find_path(WEBP_INCLUDE_DIRS NAMES decode.h PATH_SUFFIXES webp) -+ else() - find_library(WEBP_LIBRARIES webp - NAMES libwebp # required for Windows - PATHS "${SKIA_LIBRARY_DIR}" NO_DEFAULT_PATH) - set(WEBP_INCLUDE_DIR "${SKIA_DIR}/third_party/externals/libwebp/src") -- else() -- set(WEBP_LIBRARIES webp webpdemux libwebpmux) -- set(WEBP_INCLUDE_DIR ${LIBWEBP_DIR}/src) - endif() - include_directories(${WEBP_INCLUDE_DIR}) - endif() -diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt -index 4839d4097c..e8c3e83cbc 100644 ---- a/third_party/CMakeLists.txt -+++ b/third_party/CMakeLists.txt -@@ -32,7 +32,7 @@ if(NOT USE_SHARED_GIFLIB) - add_subdirectory(giflib) - endif() - --if(ENABLE_WEBP AND NOT LAF_BACKEND STREQUAL "skia") -+if(ENABLE_WEBP AND NOT LAF_BACKEND STREQUAL "skia" AND NOT USE_SHARED_WEBP) - set(WEBP_BUILD_EXTRAS OFF CACHE BOOL "Build extras.") - add_subdirectory(libwebp) - endif() \ No newline at end of file diff --git a/pkgs/applications/editors/aseprite/shared-skia-deps.patch b/pkgs/applications/editors/aseprite/shared-skia-deps.patch deleted file mode 100644 index a6ab472bbe95b..0000000000000 --- a/pkgs/applications/editors/aseprite/shared-skia-deps.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- src/laf/cmake/FindSkia.cmake.orig 2022-01-08 02:15:13.417619266 +0100 -+++ src/laf/cmake/FindSkia.cmake 2022-01-08 02:15:43.603960491 +0100 -@@ -32,14 +32,18 @@ - # SkShaper module + freetype + harfbuzz - find_library(SKSHAPER_LIBRARY skshaper PATH "${SKIA_LIBRARY_DIR}") - -+if(NOT USE_SHARED_FREETYPE) - set(FREETYPE_FOUND ON) - find_library(FREETYPE_LIBRARY freetype2 PATH "${SKIA_LIBRARY_DIR}" NO_DEFAULT_PATH) - set(FREETYPE_LIBRARIES ${FREETYPE_LIBRARY}) - set(FREETYPE_INCLUDE_DIRS "${SKIA_DIR}/third_party/externals/freetype/include") -+endif() - -+if(NOT USE_SHARED_HARFBUZZ) - find_library(HARFBUZZ_LIBRARY harfbuzz PATH "${SKIA_LIBRARY_DIR}" NO_DEFAULT_PATH) - set(HARFBUZZ_LIBRARIES ${HARFBUZZ_LIBRARY}) - set(HARFBUZZ_INCLUDE_DIRS "${SKIA_DIR}/third_party/externals/harfbuzz/src") -+endif() - - set(SKIA_LIBRARIES - ${SKIA_LIBRARY} \ No newline at end of file diff --git a/pkgs/applications/editors/aseprite/skia-deps.nix b/pkgs/applications/editors/aseprite/skia-deps.nix deleted file mode 100644 index 3c92c649bebf3..0000000000000 --- a/pkgs/applications/editors/aseprite/skia-deps.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ fetchgit }: -{ - angle2 = fetchgit { - url = "https://chromium.googlesource.com/angle/angle.git"; - rev = "8718783526307a3fbb35d4c1ad4e8101262a0d73"; - sha256 = "0c90q8f4syvwcayw58743sa332dcpkmblwh3ffkjqn5ygym04xji"; - }; - dng_sdk = fetchgit { - url = "https://android.googlesource.com/platform/external/dng_sdk.git"; - rev = "c8d0c9b1d16bfda56f15165d39e0ffa360a11123"; - sha256 = "1nlq082aij7q197i5646bi4vd2il7fww6sdwhqisv2cs842nyfwm"; - }; - piex = fetchgit { - url = "https://android.googlesource.com/platform/external/piex.git"; - rev = "bb217acdca1cc0c16b704669dd6f91a1b509c406"; - sha256 = "05ipmag6k55jmidbyvg5mkqm69zfw03gfkqhi9jnjlmlbg31y412"; - }; - sfntly = fetchgit { - url = "https://chromium.googlesource.com/external/github.com/googlei18n/sfntly.git"; - rev = "b55ff303ea2f9e26702b514cf6a3196a2e3e2974"; - sha256 = "1qi5rfzmwfrji46x95g6dsb03i1v26700kifl2hpgm3pqhr7afpz"; - }; -} diff --git a/pkgs/applications/editors/aseprite/skia-make-deps.sh b/pkgs/applications/editors/aseprite/skia-make-deps.sh deleted file mode 100755 index bee69cc40d9d8..0000000000000 --- a/pkgs/applications/editors/aseprite/skia-make-deps.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/usr/bin/env bash - -FILTER=$1 -OUT=skia-deps.nix -REVISION=861e4743af6d9bf6077ae6dda7274e5a136ee4e2 -DEPS=$(curl -s https://raw.githubusercontent.com/aseprite/skia/$REVISION/DEPS) -THIRD_PARTY_DEPS=$(echo "$DEPS" | grep third_party | grep "#" -v | sed 's/"//g') - -function write_fetch_defs () -{ - while read -r DEP; do - NAME=$(echo "$DEP" | cut -d: -f1 | cut -d/ -f3 | sed 's/ //g') - URL=$(echo "$DEP" | cut -d: -f2- | cut -d@ -f1 | sed 's/ //g') - REV=$(echo "$DEP" | cut -d: -f2- | cut -d@ -f2 | sed 's/[ ,]//g') - - echo "Fetching $NAME@$REV" - PREFETCH=$(nix-prefetch-git --rev "$REV" "$URL") - -( -cat <<EOF - $NAME = fetchgit { - url = "$URL"; - rev = "$REV"; - sha256 = $(echo $PREFETCH | jq '.sha256'); - }; -EOF -) >> "$OUT" - - echo "----------" - echo - done <<< "$1" -} - -echo "{ fetchgit }:" > "$OUT" -echo "{" >> "$OUT" -write_fetch_defs "$(echo "$THIRD_PARTY_DEPS" | grep -E "$FILTER")" -echo "}" >> "$OUT" diff --git a/pkgs/applications/editors/aseprite/skia.nix b/pkgs/applications/editors/aseprite/skia.nix deleted file mode 100644 index 03487aa8941ef..0000000000000 --- a/pkgs/applications/editors/aseprite/skia.nix +++ /dev/null @@ -1,80 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, fetchgit, python3, gn, ninja -, fontconfig, expat, icu, libglvnd, libjpeg, libpng, libwebp, zlib -, mesa, libX11, harfbuzzFull -}: - -let - # skia-deps.nix is generated by: ./skia-make-deps.sh 'angle2|dng_sdk|piex|sfntly' - depSrcs = import ./skia-deps.nix { inherit fetchgit; }; -in -stdenv.mkDerivation { - pname = "skia"; - version = "aseprite-m102"; - - src = fetchFromGitHub { - owner = "aseprite"; - repo = "skia"; - # latest commit from aseprite-m102 branch - rev = "861e4743af6d9bf6077ae6dda7274e5a136ee4e2"; - hash = "sha256-IlZbalmHl549uDUfPG8hlzub8TLWhG0EsV6HVAPdsl0="; - }; - - nativeBuildInputs = [ python3 gn ninja ]; - - buildInputs = [ - fontconfig expat icu libglvnd libjpeg libpng libwebp zlib - mesa libX11 harfbuzzFull - ]; - - preConfigure = with depSrcs; '' - mkdir -p third_party/externals - ln -s ${angle2} third_party/externals/angle2 - ln -s ${dng_sdk} third_party/externals/dng_sdk - ln -s ${piex} third_party/externals/piex - ln -s ${sfntly} third_party/externals/sfntly - ''; - - configurePhase = '' - runHook preConfigure - gn gen out/Release --args="is_debug=false is_official_build=true extra_cflags=[\"-I${harfbuzzFull.dev}/include/harfbuzz\"]" - runHook postConfigure - ''; - - buildPhase = '' - runHook preBuild - ninja -C out/Release skia modules - runHook postBuild - ''; - - installPhase = '' - mkdir -p $out - - # Glob will match all subdirs. - shopt -s globstar - - # All these paths are used in some way when building aseprite. - cp -r --parents -t $out/ \ - include/codec \ - include/config \ - include/core \ - include/effects \ - include/gpu \ - include/private \ - include/utils \ - include/third_party/skcms/*.h \ - out/Release/*.a \ - src/gpu/**/*.h \ - src/core/*.h \ - modules/skshaper/include/*.h \ - third_party/externals/angle2/include \ - third_party/skcms/**/*.h - ''; - - meta = with lib; { - description = "Skia is a complete 2D graphic library for drawing Text, Geometries, and Images"; - homepage = "https://skia.org/"; - license = licenses.bsd3; - maintainers = with maintainers; [ ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix index 386076cbd7d72..62048d867619c 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix @@ -16,7 +16,7 @@ }: let - rev = "e5cf0b704274d3deae8f4a3b6a3d0664a176bc8b"; + rev = "152431c0b1d731d0302e1849690e2361f3caf7c1"; python = python3.withPackages (ps: with ps; [ epc orjson @@ -28,13 +28,13 @@ let in melpaBuild { pname = "lsp-bridge"; - version = "20240609.1553"; + version = "20240615.2321"; src = fetchFromGitHub { owner = "manateelazycat"; repo = "lsp-bridge"; inherit rev; - hash = "sha256-96GgMJPLFoabhlvjTMWKtEpGuctjlcRuChvzDziaq8g="; + hash = "sha256-LIjqr1IntQ6WTFOO3b6cAuB6LslG1HzVa9C+GYUyQOU="; }; commit = rev; diff --git a/pkgs/applications/editors/neovim/neovim-qt.nix b/pkgs/applications/editors/neovim/neovim-qt.nix deleted file mode 100644 index 75067585653bf..0000000000000 --- a/pkgs/applications/editors/neovim/neovim-qt.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, doxygen, msgpack, neovim, python3Packages, qtbase, qtsvg }: - -mkDerivation rec { - pname = "neovim-qt-unwrapped"; - version = "0.2.18"; - - src = fetchFromGitHub { - owner = "equalsraf"; - repo = "neovim-qt"; - rev = "v${version}"; - sha256 = "sha256-BitFHHwL2aqBUpY/8eHaZIFvnDCeABC6w33Vmbx0z2g="; - }; - - cmakeFlags = [ - "-DUSE_SYSTEM_MSGPACK=1" - "-DENABLE_TESTS=0" # tests fail because xcb platform plugin is not found - ]; - - buildInputs = [ - neovim.unwrapped # only used to generate help tags at build time - qtbase - qtsvg - ] ++ (with python3Packages; [ - jinja2 python msgpack - ]); - - nativeBuildInputs = [ cmake doxygen ]; - - preCheck = '' - # The GUI tests require a running X server, disable them - sed -i ../test/CMakeLists.txt -e '/^add_xtest_gui/d' - ''; - - doCheck = true; - - meta = with lib; { - description = "Neovim client library and GUI, in Qt5"; - homepage = "https://github.com/equalsraf/neovim-qt"; - license = licenses.isc; - mainProgram = "nvim-qt"; - maintainers = with maintainers; [ peterhoeg ]; - inherit (neovim.meta) platforms; - }; -} diff --git a/pkgs/applications/editors/neovim/qt.nix b/pkgs/applications/editors/neovim/qt.nix deleted file mode 100644 index 728c364d40061..0000000000000 --- a/pkgs/applications/editors/neovim/qt.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, makeWrapper, neovim, neovim-qt-unwrapped }: - -let - unwrapped = neovim-qt-unwrapped; -in -stdenv.mkDerivation { - pname = "neovim-qt"; - version = unwrapped.version; - buildCommand = if stdenv.isDarwin then '' - mkdir -p $out/Applications - cp -r ${unwrapped}/bin/nvim-qt.app $out/Applications - - chmod -R a+w $out/Applications/nvim-qt.app/Contents/MacOS - wrapProgram $out/Applications/nvim-qt.app/Contents/MacOS/nvim-qt \ - --prefix PATH : ${neovim}/bin - '' else '' - makeWrapper ${unwrapped}/bin/nvim-qt $out/bin/nvim-qt \ - --prefix PATH : ${neovim}/bin - - # link .desktop file - mkdir -p $out/share/pixmaps - ln -s ${unwrapped}/share/applications $out/share/applications - ln -s ${unwrapped}/share/icons $out/share/icons - ''; - - preferLocalBuild = true; - - nativeBuildInputs = [ - makeWrapper - ]; - - passthru = { - inherit unwrapped; - }; - - inherit (unwrapped) meta; -} diff --git a/pkgs/applications/editors/orbiton/default.nix b/pkgs/applications/editors/orbiton/default.nix deleted file mode 100644 index 1e64c5950798a..0000000000000 --- a/pkgs/applications/editors/orbiton/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles, makeWrapper, pkg-config -, withGui ? true, vte -}: - -buildGoModule rec { - pname = "orbiton"; - version = "2.65.11"; - - src = fetchFromGitHub { - owner = "xyproto"; - repo = "orbiton"; - rev = "v${version}"; - hash = "sha256-eb7Ku1hgvYdmRgemXcEZMl53oNXYcomh4wYHpRzLTUc="; - }; - - vendorHash = null; - - postPatch = lib.optionalString stdenv.isDarwin '' - substituteInPlace Makefile \ - --replace "-Wl,--as-needed" "" - - # Requires impure pbcopy and pbpaste - substituteInPlace v2/pbcopy_test.go \ - --replace TestPBcopy SkipTestPBcopy - ''; - - nativeBuildInputs = [ installShellFiles makeWrapper pkg-config ]; - - buildInputs = lib.optional withGui vte; - - preBuild = "cd v2"; - - postInstall = '' - cd .. - installManPage o.1 - mv $out/bin/{orbiton,o} - '' + lib.optionalString withGui '' - make install-gui PREFIX=$out - wrapProgram $out/bin/og --prefix PATH : $out/bin - ''; - - meta = with lib; { - description = "Config-free text editor and IDE limited to VT100"; - homepage = "https://orbiton.zip"; - license = licenses.bsd3; - maintainers = with maintainers; [ sikmir ]; - mainProgram = "o"; - }; -} diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index c35a968394a5c..7507faa4e81ec 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -5915,6 +5915,18 @@ final: prev: meta.homepage = "https://github.com/mkasa/lushtags/"; }; + lz-n = buildNeovimPlugin { + pname = "lz.n"; + version = "2024-06-16"; + src = fetchFromGitHub { + owner = "nvim-neorocks"; + repo = "lz.n"; + rev = "ffd6633cbe2145177bd522fa340104fa44afbc1c"; + sha256 = "sha256-aV+m4+8oWwIPTQhilXfHOUyYqQGl4NRnk7HvEQYMp0Y="; + }; + meta.homepage = "https://github.com/nvim-neorocks/lz.n/"; + }; + magma-nvim-goose = buildVimPlugin { pname = "magma-nvim-goose"; version = "2023-07-04"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 67ef3f6dc8ffb..2c8147cfce73c 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -457,15 +457,17 @@ dependencies = with self; [ copilot-lua plenary-nvim ]; }; - copilot-vim = super.copilot-vim.overrideAttrs { + copilot-vim = super.copilot-vim.overrideAttrs (old: { postInstall = '' substituteInPlace $out/autoload/copilot/client.vim \ --replace " let node = get(g:, 'copilot_node_command', ''\'''\')" \ " let node = get(g:, 'copilot_node_command', '${nodejs}/bin/node')" ''; - meta.license = lib.licenses.unfree; - }; + meta = old.meta // { + license = lib.licenses.unfree; + }; + }); coq_nvim = super.coq_nvim.overrideAttrs { passthru.python3Dependencies = ps: diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 65f9937deec04..25b19fcf8f8d7 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -1,5 +1,4 @@ repo,branch,alias -https://codeberg.org/FelipeLema/cmp-async-path/,, https://github.com/euclidianAce/BetterLua.vim/,, https://github.com/vim-scripts/BufOnly.vim/,, https://github.com/jackMort/ChatGPT.nvim/,HEAD, @@ -132,11 +131,8 @@ https://github.com/laytan/cloak.nvim/,HEAD, https://github.com/asheq/close-buffers.vim/,HEAD, https://github.com/Civitasv/cmake-tools.nvim/,, https://github.com/winston0410/cmd-parser.nvim/,, -<<<<<<< HEAD https://github.com/tzachar/cmp-ai/,HEAD, https://codeberg.org/FelipeLema/cmp-async-path/,, -======= ->>>>>>> 8c49439301ad (vimPlugins.nvim-genghis: init at 2024-05-21) https://github.com/crispgm/cmp-beancount/,HEAD, https://github.com/hrsh7th/cmp-buffer/,, https://github.com/hrsh7th/cmp-calc/,, @@ -500,6 +496,7 @@ https://github.com/l3mon4d3/luasnip/,, https://github.com/alvarosevilla95/luatab.nvim/,, https://github.com/rktjmp/lush.nvim/,, https://github.com/mkasa/lushtags/,, +https://github.com/nvim-neorocks/lz.n/,, https://github.com/WhiteBlackGoose/magma-nvim-goose/,HEAD, https://github.com/winston0410/mark-radar.nvim/,HEAD, https://github.com/iamcco/markdown-preview.nvim/,, diff --git a/pkgs/applications/editors/vscode/extensions/README.md b/pkgs/applications/editors/vscode/extensions/README.md index 656ea1bdb3ae0..12ac4f5f5bb2e 100644 --- a/pkgs/applications/editors/vscode/extensions/README.md +++ b/pkgs/applications/editors/vscode/extensions/README.md @@ -20,6 +20,11 @@ - `description` should mention it is a Visual Studio Code extension. - `downloadPage` is the VSCode marketplace URL. - `homepage` is the source-code URL. + - `maintainers`: + - optionally consider adding yourself as a maintainer to be notified of updates, breakages and help with upkeep. + - recommended format is: + - a `non-nested with`, such as: `with lib.maintainers; [ your-username ];`. + - maintainers are listed in alphabetical order. - verify `license` in upstream. * On commit messages: diff --git a/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix index 77f122eb2c58b..d0b27457b68a0 100644 --- a/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix +++ b/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix @@ -5,7 +5,7 @@ callPackage, }: let - version = "1.52.0"; + version = "1.54.0"; rescript-editor-analysis = callPackage ./rescript-editor-analysis.nix { inherit version; }; arch = if stdenv.isLinux then @@ -21,7 +21,7 @@ vscode-utils.buildVscodeMarketplaceExtension rec { name = "rescript-vscode"; publisher = "chenglou92"; inherit version; - hash = "sha256-3H7JgdmrGMdirVpT08wmwy4G6QLt0H65d3l7o/DuvpI="; + hash = "sha256-c7TJED5YpHRwn7Ooq8sG+N99b7tH6TOgeC9TTYdb4JA="; }; postPatch = '' rm -r ${analysisDir} diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 1d36707027730..b8ee9984adc4a 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -406,8 +406,8 @@ let mktplcRef = { name = "vscode-neovim"; publisher = "asvetliakov"; - version = "1.15.2"; - hash = "sha256-gurh2DSLH/gM/EZCUACHGlzOf0LPwkc+zYxw7AOcb1E="; + version = "1.17.2"; + hash = "sha256-IA09vUleY7hazu65kadES4iq3XojyJ3sXOOGaw0vJnU="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/asvetliakov.vscode-neovim/changelog"; @@ -542,6 +542,22 @@ let betterthantomorrow.calva = callPackage ./betterthantomorrow.calva { }; + bierner.comment-tagged-templates = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "comment-tagged-templates"; + publisher = "bierner"; + version = "0.3.3"; + hash = "sha256-M2XdMQ2l6oMYiHTdfRJ/n/Ys3LecEPwAozQtLBcn7FY="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/bierner.comment-tagged-templates/changelog"; + description = "VS Code extension that adds basic syntax highlighting for JavaScript and TypeScript tagged template strings using language identifier comments"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=bierner.comment-tagged-templates"; + homepage = "https://github.com/mjbvz/vscode-comment-tagged-templates"; + license = lib.licenses.mit; + }; + }; + bierner.docs-view = buildVscodeMarketplaceExtension { mktplcRef = { name = "docs-view"; @@ -570,6 +586,22 @@ let }; }; + bierner.github-markdown-preview = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "github-markdown-preview"; + publisher = "bierner"; + version = "0.3.0"; + hash = "sha256-7pbl5OgvJ6S0mtZWsEyUzlg+lkUhdq3rkCCpLsvTm4g="; + }; + meta = { + description = "A VSCode extension that changes the markdown preview to support GitHub markdown features"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=bierner.github-markdown-preview"; + homepage = "https://github.com/mjbvz/vscode-github-markdown-preview"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.pandapip1 ]; + }; + }; + bierner.markdown-checkbox = buildVscodeMarketplaceExtension { mktplcRef = { name = "markdown-checkbox"; @@ -594,6 +626,23 @@ let }; }; + bierner.markdown-footnotes = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "markdown-footnotes"; + publisher = "bierner"; + version = "0.1.1"; + hash = "sha256-h/Iyk8CKFr0M5ULXbEbjFsqplnlN7F+ZvnUTy1An5t4="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/bierner.markdown-footnotes/changelog"; + description = "Adds [^1] footnote syntax support to VS Code's built-in Markdown preview"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=bierner.markdown-footnotes"; + homepage = "https://github.com/mjbvz/vscode-markdown-footnotes"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.uncenter ]; + }; + }; + bierner.markdown-mermaid = buildVscodeMarketplaceExtension { mktplcRef = { name = "markdown-mermaid"; @@ -606,14 +655,59 @@ let }; }; + bierner.markdown-preview-github-styles = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "markdown-preview-github-styles"; + publisher = "bierner"; + version = "2.0.4"; + hash = "sha256-jJulxvjMNsqQqmsb5szQIAUuLWuHw824Caa0KArjUVw="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/bierner.markdown-preview-github-styles/changelog"; + description = "Changes VS Code's built-in markdown preview to match GitHub's styling"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=bierner.markdown-preview-github-styles"; + homepage = "https://github.com/mjbvz/vscode-github-markdown-preview-style"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.uncenter ]; + }; + }; + + biomejs.biome = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "biome"; + publisher = "biomejs"; + version = "2024.5.251958"; + hash = "sha256-Pxbvj6e3nRwuLKmPEtE02JdHmZbyuXNh4T+FZKjBkWo="; + }; + meta = { + changelog = "https://github.com/biomejs/biome-vscode/blob/main/CHANGELOG.md"; + description = "Biome LSP extension for Visual Studio Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=biomejs.biome"; + homepage = "https://github.com/biomejs/biome-vscode"; + license = with lib.licenses; [ + mit + # or + asl20 + ]; + maintainers = [ lib.maintainers.uncenter ]; + }; + }; + bmalehorn.vscode-fish = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-fish"; publisher = "bmalehorn"; - version = "1.0.35"; - hash = "sha256-V51Qe6M1CMm9fLOSFEwqeZiC8tWCbVH0AzkLe7kR2vY="; + version = "1.0.38"; + hash = "sha256-QEifCTlzYMX+5H6+k2o1lsQrhW3vxVpn+KFg/3WVVFo="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/bmalehorn.vscode-fish/changelog"; + description = "Fish syntax highlighting and formatting for VS Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=bmalehorn.vscode-fish"; + homepage = "https://github.com/bmalehorn/vscode-fish"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.uncenter ]; }; - meta.license = lib.licenses.mit; }; bmewburn.vscode-intelephense-client = buildVscodeMarketplaceExtension { @@ -948,26 +1042,26 @@ let sources = { "x86_64-linux" = { arch = "linux-x64"; - hash = "sha256-GQH+KKteWbCz18AlTWjLWrVpPRxumi+iDPS5n+5xy/0="; + hash = "sha256-ZlbPRFQwvZNCp8K/rbHqVa3coXa2dT4nOrNChC9naC8="; }; "x86_64-darwin" = { arch = "darwin-x64"; - hash = "sha256-xBwuAtvRdOgYkfxP0JaxhAQZx5AJWymDVQ50piTx608="; + hash = "sha256-hSRdvno8VZNi48rckaqWbAgDXT6RXEcPnkNOT8DV1wA="; }; "aarch64-linux" = { arch = "linux-arm64"; - hash = "sha256-oLLKnNZ+E06PbUrhj5Y0HOdHhUs/fXd+3lZXX/P2C10="; + hash = "sha256-rimE7dKT6zajHo6E42z7IyfP35xBXThIwMHhZjaZwHk="; }; "aarch64-darwin" = { arch = "darwin-arm64"; - hash = "sha256-nWuyqOIELp8MrjzCFH3yu4pWm5KsNxmx3eacgStWKG0="; + hash = "sha256-7TeUAZLiEnqi5i5nHLhtv5aMxIcw7iiABOAkwP1YYqM="; }; }; in { name = "continue"; publisher = "Continue"; - version = "0.8.25"; + version = "0.8.40"; } // sources.${stdenv.system}; nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; @@ -1628,6 +1722,23 @@ let }; }; + fabiospampinato.vscode-open-in-github = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-open-in-github"; + publisher = "fabiospampinato"; + version = "2.3.0"; + hash = "sha256-vrW6uZyeEJipGtfz7BEeeAwiwtBlfQLjC7jAP1v5GoE="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/fabiospampinato.vscode-open-in-github/changelog"; + description = "VS Code extension to open the current project or file in github.com"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=fabiospampinato.vscode-open-in-github"; + homepage = "https://github.com/fabiospampinato/vscode-open-in-github"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.uncenter ]; + }; + }; + file-icons.file-icons = buildVscodeMarketplaceExtension { meta = { changelog = "https://marketplace.visualstudio.com/items/file-icons.file-icons/changelog"; @@ -1731,6 +1842,23 @@ let }; }; + fortran-lang.linter-gfortran = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "linter-gfortran"; + publisher = "fortran-lang"; + version = "3.4.2024061701"; + hash = "sha256-i357EzQ8cm8NPsMBbsV5ToMoBDa59Bh6ylC9tNjMY6s="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/fortran-lang.linter-gfortran/changelog"; + description = "Fortran language support for Visual Studio Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=fortran-lang.linter-gfortran"; + homepage = "https://github.com/fortran-lang/vscode-fortran-support"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.uncenter ]; + }; + }; + foxundermoon.shell-format = callPackage ./foxundermoon.shell-format { }; freebroccolo.reasonml = buildVscodeMarketplaceExtension { @@ -1767,6 +1895,22 @@ let }; }; + garlicbreadcleric.pandoc-markdown-syntax = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "pandoc-markdown-syntax"; + publisher = "garlicbreadcleric"; + version = "0.0.2"; + hash = "sha256-YAMH5smLyBuoTdlxSCTPyMIKOWTSIdf2MQVZuOO2V1w="; + }; + meta = { + description = "A VSCode extension that adds syntax highlighting for Pandoc-flavored Markdown"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=garlicbreadcleric.pandoc-markdown-syntax"; + homepage = "https://github.com/garlicbreadcleric/vscode-pandoc-markdown"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.pandapip1 ]; + }; + }; + gencer.html-slim-scss-css-class-completion = buildVscodeMarketplaceExtension { mktplcRef = { name = "html-slim-scss-css-class-completion"; @@ -2564,6 +2708,23 @@ let }; }; + kravets.vscode-publint = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-publint"; + publisher = "Kravets"; + version = "0.0.1"; + hash = "sha256-6nG5Yqi8liumQ2K9ynV8mNXiXGaGo/cp4Cib1kqdp1c="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/Kravets.vscode-publint/changelog"; + description = "Lint packaging errors in VS Code with publint"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=Kravets.vscode-publint"; + homepage = "https://github.com/kravetsone/vscode-publint"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.uncenter ]; + }; + }; + kubukoz.nickel-syntax = buildVscodeMarketplaceExtension { mktplcRef = { name = "nickel-syntax"; @@ -2576,6 +2737,22 @@ let }; }; + lapo.asn1js = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "asn1js"; + publisher = "lapo"; + version = "0.1.4"; + hash = "sha256-utbIKlwNHnJZj/51f8hEDmUA/A26De/gY73iT4tXKRU="; + }; + meta = { + description = "Decode ASN.1 content inside VSCode"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=lapo.asn1js"; + homepage = "https://github.com/lapo-luchini/vscode-asn1js"; + maintainers = with lib.maintainers; [ katexochen ]; + license = lib.licenses.isc; + }; + }; + llvm-org.lldb-vscode = llvmPackages.lldb; llvm-vs-code-extensions.vscode-clangd = buildVscodeMarketplaceExtension { @@ -2736,6 +2913,23 @@ let }; }; + meganrogge.template-string-converter = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "template-string-converter"; + publisher = "meganrogge"; + version = "0.6.1"; + hash = "sha256-w0ppzh0m/9Hw3BPJbAKsNcMStdzoH9ODf3zweRcCG5k="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/meganrogge.template-string-converter/changelog"; + description = "VS Code extension to autocorrect from quotes to backticks"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=meganrogge.template-string-converter"; + homepage = "https://github.com/meganrogge/template-string-converter"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.uncenter ]; + }; + }; + mgt19937.typst-preview = callPackage ./mgt19937.typst-preview { }; mhutchie.git-graph = buildVscodeMarketplaceExtension { @@ -3118,6 +3312,22 @@ let ms-vscode-remote.remote-ssh = callPackage ./ms-vscode-remote.remote-ssh { }; + ms-vscode-remote.remote-ssh-edit = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "remote-ssh-edit"; + publisher = "ms-vscode-remote"; + version = "0.86.0"; + hash = "sha256-JsbaoIekUo2nKCu+fNbGlh5d1Tt/QJGUuXUGP04TsDI="; + }; + meta = { + description = "A Visual Studio Code extension that complements the Remote SSH extension with syntax colorization, keyword intellisense, and simple snippets when editing SSH configuration files"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-ssh-edit"; + homepage = "https://code.visualstudio.com/docs/remote/ssh"; + license = lib.licenses.unfree; + maintainers = [ lib.maintainers.pandapip1 ]; + }; + }; + ms-vsliveshare.vsliveshare = callPackage ./ms-vsliveshare.vsliveshare { }; mshr-h.veriloghdl = buildVscodeMarketplaceExtension { @@ -3212,6 +3422,23 @@ let }; }; + nefrob.vscode-just-syntax = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-just-syntax"; + publisher = "nefrob"; + version = "0.3.0"; + hash = "sha256-WBoqH9TNco9lyjOJfP54DynjmYZmPUY+YrZ1rQlC518="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/nefrob.vscode-just-syntax/changelog"; + description = "Justfile syntax support for Visual Studio Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=nefrob.vscode-just-syntax"; + homepage = "https://github.com/nefrob/vscode-just"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.uncenter ]; + }; + }; + njpwerner.autodocstring = buildVscodeMarketplaceExtension { mktplcRef = { name = "autodocstring"; @@ -3943,8 +4170,8 @@ let mktplcRef = { name = "code-spell-checker"; publisher = "streetsidesoftware"; - version = "4.0.2"; - hash = "sha256-k3FxRAtW9Fdhm7jD3ingFXONiBsOia1Whs7OPeDmlSw="; + version = "4.0.3"; + hash = "sha256-CEGwbw5RpFsfB/g2inScIqWB7/3oxgxz7Yuc6V3OiHg="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/streetsidesoftware.code-spell-checker/changelog"; @@ -4476,6 +4703,23 @@ let }; }; + vitaliymaz.vscode-svg-previewer = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-svg-previewer"; + publisher = "vitaliymaz"; + version = "0.7.0"; + hash = "sha256-iX+Js2Pqz1gLDwrihuYtDwQG4ek7GiOhL3M0j3jHF/Y="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/vitaliymaz.vscode-svg-previewer/changelog"; + description = "Preview SVGs in VS Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=vitaliymaz.vscode-svg-previewer"; + homepage = "https://github.com/vitaliymaz/vscode-svg-previewer"; + license = lib.licenses.unfree; + maintainers = [ lib.maintainers.uncenter ]; + }; + }; + vlanguage.vscode-vlang = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-vlang"; @@ -4590,8 +4834,8 @@ let mktplcRef = { name = "vscode-icons"; publisher = "vscode-icons-team"; - version = "12.2.0"; - sha256 = "12s5br0s9n99vjn6chivzdsjb71p0lai6vnif7lv13x497dkw4rz"; + version = "12.8.0"; + hash = "sha256-2+Wf0AL9C5xOQCjA9maMt/W/kviNuiyMfaOFDU82KxM="; }; meta = { description = "Bring real icons to your Visual Studio Code"; @@ -4792,6 +5036,22 @@ let }; }; + yoavbls.pretty-ts-errors = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "pretty-ts-errors"; + publisher = "yoavbls"; + version = "0.5.3"; + hash = "sha256-JSCyTzz10eoUNu76wNUuvPVVKq4KaVKobS1CAPqgXUA="; + }; + meta = { + description = "Make TypeScript errors prettier and human-readable in VSCode"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=yoavbls.pretty-ts-errors"; + homepage = "https://github.com/yoavbls/pretty-ts-errors"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.uncenter ]; + }; + }; + yzhang.dictionary-completion = buildVscodeMarketplaceExtension { mktplcRef = { publisher = "yzhang"; @@ -4829,6 +5089,22 @@ let }; }; + zaaack.markdown-editor = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "markdown-editor"; + publisher = "zaaack"; + version = "0.1.10"; + hash = "sha256-K1nczR059BsiHpT1xdtJjpFLl5krt4H9+CrEsIycq9U="; + }; + meta = { + description = "Visual Studio Code extension for WYSIWYG markdown editing"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=zaaack.markdown-editor"; + homepage = "https://github.com/zaaack/vscode-markdown-editor"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.pandapip1 ]; + }; + }; + zainchen.json = buildVscodeMarketplaceExtension { mktplcRef = { name = "json"; @@ -4845,6 +5121,22 @@ let }; }; + zguolee.tabler-icons = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "tabler-icons"; + publisher = "zguolee"; + version = "0.3.4"; + hash = "sha256-0XvB9UXqKHbL/ejUfciSvFzZ3GacaQ7pq6hJqRaxq+8="; + }; + meta = { + description = "Tabler product icon theme for Visual Studio Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=zguolee.tabler-icons"; + homepage = "https://github.com/zguolee/vscode-tabler-icons"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.uncenter ]; + }; + }; + zhuangtongfa.material-theme = buildVscodeMarketplaceExtension { mktplcRef = { name = "material-theme"; diff --git a/pkgs/applications/editors/vscode/extensions/ms-python.vscode-pylance/default.nix b/pkgs/applications/editors/vscode/extensions/ms-python.vscode-pylance/default.nix index 7bcbcc11a89da..780b0e12896ea 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-python.vscode-pylance/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-python.vscode-pylance/default.nix @@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-pylance"; publisher = "MS-python"; - version = "2024.5.1"; - hash = "sha256-w+T4dySTt2RpdBYd1Nnxh8RR9wqEu9pkS4R1Ay7Fn+8="; + version = "2024.6.1"; + hash = "sha256-NOx0WJC32MUm6TmLkiN67FHKwBmB0S3feFVIQNxR2PQ="; }; buildInputs = [ pyright ]; diff --git a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix index ea2276c7e7a3e..99878c88568e7 100644 --- a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix +++ b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix @@ -11,7 +11,7 @@ vscode-utils.buildVscodeMarketplaceExtension { name = "tinymist"; publisher = "myriad-dreamin"; inherit (tinymist) version; - hash = "sha256-etPjbmcBhS1dgq5wEoRIekZlRxYoC6KrsV/+owjHu4I="; + hash = "sha256-Oama8FkRhEY4yza77RpWHg0Aeo9WFhveucJqJvCYMJQ="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix b/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix index a74f934705f7d..07616924d18a0 100644 --- a/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix +++ b/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix @@ -3,15 +3,15 @@ stdenv, vscode-utils, autoPatchelfHook, - libxcrypt-legacy, + zlib, }: vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "sourcery"; publisher = "sourcery"; - version = "1.16.0"; - hash = "sha256-SHgS2C+ElTJW4v90Wg0QcsSL2FoSz+SxZQpgq2J4JiU="; + version = "1.19.0"; + hash = "sha256-Wit2ozgaVwINL3PvPfmZWQ4WN7seQMWfXwXGgEKecn0="; }; postPatch = '' @@ -24,7 +24,7 @@ vscode-utils.buildVscodeMarketplaceExtension { buildInputs = [ stdenv.cc.cc.lib - libxcrypt-legacy + zlib ]; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix index f383ef7dfb4ad..f56f477c8560d 100644 --- a/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix +++ b/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix @@ -13,19 +13,19 @@ let { x86_64-linux = { arch = "linux-x64"; - hash = "sha256-CPUlJ1QzGiZKd4r46Iioc5svw0oLsMsYnc0KxT1p0zM="; + hash = "sha256-fvDzsFOG1pdmpC3RDY8zGP0yL/TzX6i00LnIX+yceVU="; }; aarch64-linux = { arch = "linux-arm64"; - hash = "sha256-qSTCZHL7nfB300qwuqgl/4u+SYNMA2BFCrD+yQEgN/c="; + hash = "sha256-3yRZzOTuiTbkUUz1D3mZo7G5vayM6W9YBbJxTiVou9g="; }; x86_64-darwin = { arch = "darwin-x64"; - hash = "sha256-FcZH2bB5B3wnu6F76kGp9FBdD3yZtr57TQ5xaUfRcmY="; + hash = "sha256-fKvR2bea4UxvnZ+LlWR/ahpKe8mk5f4mZrjqTFpsC5A="; }; aarch64-darwin = { arch = "darwin-arm64"; - hash = "sha256-3HdK4x2WNdb9Zxqjtn9lmbgrMOzz14rH0ZF0x9B0BHY="; + hash = "sha256-nkK3BH+MRi6KdThq4kYR9ZAfnuSkC2r/lKWpEtmD7Ak="; }; } .${system} or (throw "Unsupported system: ${system}"); @@ -37,7 +37,7 @@ vscode-utils.buildVscodeMarketplaceExtension { # Please update the corresponding binary (typos-lsp) # when updating this extension. # See pkgs/by-name/ty/typos-lsp/package.nix - version = "0.1.18"; + version = "0.1.19"; inherit (extInfo) hash arch; }; diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index bf97add669060..3461744ec6ebf 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -15,11 +15,11 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1zmgvadhsnsbmqb559kvf66i7h6iq7vw99m7vdxcfmdl6c1pwyvb"; - x86_64-darwin = "061h423vay3d28d2015llz7pwlqcrjy0lmw47xgy3iy6hfadrra2"; - aarch64-linux = "0n288h6369bazykp6jyapi6yz0k7nivql6wz68fgkagfdyxzl1yb"; - aarch64-darwin = "13k9hvbzj8xyfi29g0x4nz80gmjq3s693zi5fi4lbf4bj7jmcamq"; - armv7l-linux = "19p6k1rgy83vs76hksjx5d4v32jq31r6aw5kzcc8gsq114xj9c2a"; + x86_64-linux = "1r76ikfikagg9v278pgiqhnjsv7pqn0xi372y1l0wsashlxl7kb0"; + x86_64-darwin = "156604xzazmb54p0rdkv5wy9livg0xz2jviycdizablmvsxybs57"; + aarch64-linux = "0cp120pcjpgf9qvmks9f8l2caxqlvnqvmxa7fh9mf83zpkdmnsnl"; + aarch64-darwin = "1k06648jx64irshs0v4qy6xlkd9mk514xf21dlfhvic4aj89kcx9"; + armv7l-linux = "0jy8hkbxh1969kskggg2y86cphly9l9gs7y4plj90jmlvlzjjjxm"; }.${system} or throwSystem; sourceRoot = lib.optionalString (!stdenv.isDarwin) "."; @@ -29,7 +29,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.90.0.24158"; + version = "1.90.1.24165"; pname = "vscodium"; executableName = "codium"; |