Unverified Commit dd1ec904 authored by Pol Dellaiera's avatar Pol Dellaiera Committed by GitHub
Browse files

Merge pull request #246328 from helsinki-systems/upd/texstudio 

texstudio: 4.5.2 -> 4.6.2
parents 3e730502 07347b53

pkgs/applications/editors/texstudio/default.nix

+25 −11
Original line number Diff line number Diff line 
{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase, qtscript, qtsvg,

  wrapQtAppsHook, poppler, zlib, pkg-config }:

{ stdenv, lib, fetchFromGitHub, cmake, qtbase, qttools, qtsvg, qt5compat, quazip

, hunspell

, wrapQtAppsHook, poppler, zlib, pkg-config }:



mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "texstudio";

  version = "4.5.2";

  version = "4.6.2";



  src = fetchFromGitHub {

    owner = "${pname}-org";

    repo = pname;

    rev = version;

    hash = "sha256-L+q4+k4XWywnxIvhfXPCBeCqnGj4E9BhAmgcAZhm7S8=";

    owner = "texstudio-org";

    repo = "texstudio";

    rev = finalAttrs.version;

    hash = "sha256-2bvKB/8HcZoTk2J6FQXXJREqGp6EZ95C2Aqcx9o/eho=";

  };



  nativeBuildInputs = [ cmake wrapQtAppsHook pkg-config ];

  buildInputs = [ qtbase qtscript qtsvg poppler zlib ];

  nativeBuildInputs = [

    cmake

    wrapQtAppsHook

    pkg-config

  ];

  buildInputs = [

    hunspell

    poppler

    qt5compat

    qtbase

    qtsvg

    qttools

    quazip

    zlib

  ];



  meta = with lib; {

    description = "TeX and LaTeX editor";
@@ -28,4 +42,4 @@ mkDerivation rec { 
    platforms = platforms.linux;

    maintainers = with maintainers; [ ajs124 cfouche ];

  };

}
 
})

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -13465,7 +13465,7 @@ with pkgs; 














  texmaker = libsForQt5.callPackage ../applications/editors/texmaker { };



























  texstudio = libsForQt5.callPackage ../applications/editors/texstudio { };













  texstudio = qt6Packages.callPackage ../applications/editors/texstudio { };





























  textadept = callPackage ../applications/editors/textadept { };