diff options
Diffstat (limited to 'pkgs/applications/editors')
6 files changed, 58 insertions, 57 deletions
diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index 72814c5edda6f..291a280bdf0f2 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -245,9 +245,9 @@ in runCommand # source-code itself). platforms = [ "x86_64-linux" ]; maintainers = with maintainers; rec { - stable = [ alapshin msfjarvis ]; - beta = [ alapshin msfjarvis ]; - canary = [ alapshin msfjarvis ]; + stable = [ alapshin ]; + beta = [ alapshin ]; + canary = [ alapshin ]; dev = canary; }."${channel}"; mainProgram = pname; diff --git a/pkgs/applications/editors/hexedit/default.nix b/pkgs/applications/editors/hexedit/default.nix index 7f32835fdc84d..efdfac33f09bc 100644 --- a/pkgs/applications/editors/hexedit/default.nix +++ b/pkgs/applications/editors/hexedit/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { homepage = "http://rigaux.org/hexedit.html"; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ delroth ]; + maintainers = with maintainers; [ ]; mainProgram = "hexedit"; }; } diff --git a/pkgs/applications/editors/kile/default.nix b/pkgs/applications/editors/kile/default.nix index 0e1326f50c492..01f8723e8030b 100644 --- a/pkgs/applications/editors/kile/default.nix +++ b/pkgs/applications/editors/kile/default.nix @@ -1,63 +1,43 @@ -{ mkDerivation -, lib +{ lib +, stdenv , fetchurl -, extra-cmake-modules -, kdoctools -, wrapGAppsHook -, qtscript -, kconfig -, kcrash -, kdbusaddons -, kdelibs4support -, kguiaddons -, kiconthemes -, kinit -, khtml -, konsole -, kparts -, ktexteditor -, kwindowsystem -, okular -, poppler +, cmake +, kdePackages +, qt6 }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "kile"; - version = "2.9.93"; + version = "2.9.94"; src = fetchurl { url = "mirror://sourceforge/kile/kile-${version}.tar.bz2"; - sha256 = "BEmSEv/LJPs6aCkUmnyuTGrV15WYXwgIANbfcviMXfA="; + sha256 = "U8Z0K9g/sJXL3ImLA/344Vq2gKgWk8yvnFB2uTrRo8o="; }; nativeBuildInputs = [ - extra-cmake-modules - wrapGAppsHook - kdoctools + cmake + kdePackages.extra-cmake-modules + qt6.wrapQtAppsHook + kdePackages.kdoctools ]; buildInputs = [ - kconfig - kcrash - kdbusaddons - kdelibs4support - kguiaddons - kiconthemes - kinit - khtml - kparts - ktexteditor - kwindowsystem - okular - poppler - qtscript + qt6.qtbase + qt6.qtdeclarative + qt6.qt5compat + kdePackages.kconfig + kdePackages.kcrash + kdePackages.kdbusaddons + kdePackages.kguiaddons + kdePackages.kiconthemes + kdePackages.konsole + kdePackages.kparts + kdePackages.ktexteditor + kdePackages.kwindowsystem + kdePackages.okular + kdePackages.poppler ]; - dontWrapGApps = true; - preFixup = '' - makeWrapperArgs+=("''${gappsWrapperArgs[@]}") - ''; - - propagatedUserEnvPkgs = [ konsole ]; meta = { description = "User-friendly TeX/LaTeX authoring tool for the KDE desktop environment"; diff --git a/pkgs/applications/editors/pulsar/default.nix b/pkgs/applications/editors/pulsar/default.nix index b1af335ec1d49..a2b572ae516b8 100644 --- a/pkgs/applications/editors/pulsar/default.nix +++ b/pkgs/applications/editors/pulsar/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , git +, git-lfs , fetchurl , wrapGAppsHook , alsa-lib @@ -139,14 +140,34 @@ stdenv.mkDerivation rec { patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ $opt/resources/app.asar.unpacked/node_modules/symbol-provider-ctags/vendor/ctags-linux - '' + lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") '' # Replace the bundled git with the one from nixpkgs dugite=$opt/resources/app.asar.unpacked/node_modules/dugite rm -f $dugite/git/bin/git ln -s ${git}/bin/git $dugite/git/bin/git - rm -f $dugite/git/libexec/git-core/git - ln -s ${git}/bin/git $dugite/git/libexec/git-core/git + # Not only do we need to replace the git binary itself, we also need to replace + # all the symlinks in dugite/git/libexec/git-core. + for file in "$dugite/git/libexec/git-core"/*; do + if [ -x "$file" ] && file "$file" | grep -q "ELF"; then + # Remove ELF executable + rm "$file" + + # Get the corresponding filename in nixpkgs's git + filename=$(basename "$file") + git_executable="${git}/libexec/git-core/$filename" + + # Create symlink to $git_executable + ln -s "$git_executable" "$file" + + echo "Replaced $file with symlink to $git_executable" + fi + done + + # Was symlinked in previous loop, but actually, nixpkgs has a separate package for git-lfs + # Unlink to avoid a "File exists" error and relink correctly + unlink $dugite/git/libexec/git-core/git-lfs + ln -s ${git-lfs}/bin/git-lfs $dugite/git/libexec/git-core/git-lfs + '' + lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") '' # We have to patch a prebuilt binary in the asar archive # But asar complains because the node_gyp unpacked dependency uses a prebuilt Python3 itself @@ -208,7 +229,7 @@ stdenv.mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ colamaroro bryango ]; + maintainers = with maintainers; [ bryango ]; knownVulnerabilities = [ "CVE-2023-5217" "CVE-2022-21718" diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 9f4c3299386ce..07d8e5430a7b7 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1911,7 +1911,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=Gleam.gleam"; homepage = "https://github.com/gleam-lang/vscode-gleam#readme"; license = lib.licenses.asl20; - maintainers = [ lib.maintainers.msfjarvis ]; + maintainers = [ ]; }; }; 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 9dbf71b8b1016..3a6d84b24b8a6 100644 --- a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix +++ b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix @@ -12,8 +12,8 @@ vscode-utils.buildVscodeMarketplaceExtension { publisher = "myriad-dreamin"; # Please update the corresponding binary (tinymist) when updating # this extension. - version = "0.11.5"; - hash = "sha256-p97RREGKhTeXO5s4jP8qUsLtYxOj91ddQhsk6Q+50jc="; + version = "0.11.6"; + hash = "sha256-qS+QY9RmJYXWRcohMcorF3SxoniBPE8SFcg0Ka1vvOE="; }; nativeBuildInputs = [ |