mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-28 14:22:50 +03:00
Merge pull request #103035 from nh2/texmacs-1.99.14
texmacs: 1.99.13 -> 1.99.14
This commit is contained in:
commit
ca94c1f0cb
@ -16,7 +16,7 @@
|
|||||||
|
|
||||||
let
|
let
|
||||||
pname = "TeXmacs";
|
pname = "TeXmacs";
|
||||||
version = "1.99.13";
|
version = "1.99.14";
|
||||||
common = callPackage ./common.nix {
|
common = callPackage ./common.nix {
|
||||||
inherit tex extraFonts chineseFonts japaneseFonts koreanFonts;
|
inherit tex extraFonts chineseFonts japaneseFonts koreanFonts;
|
||||||
};
|
};
|
||||||
@ -26,22 +26,9 @@ mkDerivation {
|
|||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-${version}-src.tar.gz";
|
url = "https://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-${version}-src.tar.gz";
|
||||||
sha256 = "Aq0cS47QqmFQHelxRjANeJlgXCXagnYRykpAq7wHqbQ=";
|
sha256 = "1zbl1ddhppgnn3j213jl1b9mn8zmwnknxiqswm25p4llj0mqcgna";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
|
||||||
# Minor patch for Qt 5.15 support, should be included in next release.
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://github.com/texmacs/texmacs/commit/3cf56af92326b74538f5e943928199ba6e963d0b.patch";
|
|
||||||
sha256 = "+OBQmnKgvQZZkLx6ea773Dwq0o7L92Sex/kcVUhmg6Q=";
|
|
||||||
})
|
|
||||||
# Fix returned version, lets hope they remember to bump the version next release.
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://github.com/texmacs/texmacs/commit/da5b67005d2fc31bb32ea1ead882c26af12d8cbb.patch";
|
|
||||||
sha256 = "czMgdraQErrdvN83jY76P673L52BpQkDwntmKvF0Ykg=";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake pkgconfig ];
|
nativeBuildInputs = [ cmake pkgconfig ];
|
||||||
|
Loading…
Reference in New Issue
Block a user