steveej/msc-thesis
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases 4 Packages Wiki Activity Actions

shell&build: update to minted 2.5 and adapt shell

Browse source
This commit is contained in:
steveej 2017-09-14 17:59:52 +02:00
parent ebc4bcb8bb
commit d4709f72dc
2 changed files with 55 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

41
build/update-minted-2.5.patch Normal file
View file

@ -0,0 +1,41 @@
diff --git a/pkgs/tools/typesetting/tex/texlive/pkgs.nix b/pkgs/tools/typesetting/tex/texlive/pkgs.nix
index 4d891c0758..09c413559f 100644
--- a/pkgs/tools/typesetting/tex/texlive/pkgs.nix
+++ b/pkgs/tools/typesetting/tex/texlive/pkgs.nix
@@ -5713,6 +5713,7 @@ tl: { # no indentation
deps."fundus-calligra" = tl."fundus-calligra";
deps."fundus-cyr" = tl."fundus-cyr";
deps."fundus-sueterlin" = tl."fundus-sueterlin";
+ deps."fvextra" = tl."fvextra";
deps."fwlw" = tl."fwlw";
deps."g-brief" = tl."g-brief";
deps."gauss" = tl."gauss";
@@ -16203,13 +16204,24 @@ tl: { # no indentation
hasRunfiles = true;
version = "1.1";
};
+"fvextra" = {
+ stripPrefix = 0;
+ sha512.run = "3526c3656124b15217161792f14f914dad2ec84af7ffd85f95654701c82e3be6bde304df0ca1ba8b4eb943122e731fe7c059a0d8ba7554f49a5401be6b709d8a";
+ sha512.doc = "919cff94f930cb624723fdca66033df39fee4dfe391df4ec592ded2a5c9ae59a9f29594ebdb09c9d9e54b5afc9dd77591258155530aa7c8fc45361b8dc31e8c3";
+ sha512.source = "934d419ca8e4c748f0d7d41f520abd07df4682295c6eef3390b9d2d628469d0d84ff7ffb707f1ee70b83b0fdf42b16ad9ad350c4b5166b28117543dde9d7d049";
+ urlPrefix = "http://213.136.89.14/texlive-mirror";
+ hasRunfiles = true;
+ version = "1.3.1";
+};
"minted" = {
+ deps."fvextra" = tl."fvextra";
stripPrefix = 0;
- sha512.run = "";
- sha512.doc = "";
- sha512.source = "";
+ sha512.run = "6bfff77120a70214f492f34b31bc7354f75173e742b0d40b76116e78f18d471946175e7cae1d51d0f2b948bf566c8e44c755f1d98a338b8a0b1b0cfb6b77f462";
+ sha512.doc = "013bab6a7abfff35d5316ec335ddb13e8c91e918ef78d9e49bc393be3cc6e71f22c740ff862045a5d20bbfc1a508bbc272f0dbc668db3ffc657dafb0ddfbc45c";
+ sha512.source = "3ae1e00adeff4ff117be3c35120d0c94569f62c7e4b6c8640236fbd52a9ceb20fce24b87faf0d5cc2b9295fd5a3689cda5eb01dc2c3897e8a2f228326ae6cdb6";
+ urlPrefix = "http://213.136.89.14/texlive-mirror";
hasRunfiles = true;
- version = "2.2.1";
+ version = "2.5";
};
"mintspirit" = {
stripPrefix = 0;

16
shell.nix
View file

@ -7,8 +7,13 @@ let
repo = "nixpkgs-channels";
rev = "81fceb255448415e70b9e7775d590b6def45f861";
sha256 = "0sfx21b9rb6qxjm7li3krk6ik0xxph1il7r5l69n8b9agp72yjfx";
# rev = "1b1fc6550559f9d73ddf7cea611c387a847bf03b";
# sha256 = "0gipwxghvwnv2n7csp8ks3l2g1z7hwqn96bljikkm7p8jjpfb5ds";
};
patches = [ ./build/texlive-url-mirror.patch ];
patches = [
#./build/texlive-url-mirror.patch
./build/update-minted-2.5.patch
];
buildPhase = "";
installPhase = ''
cp -a . $out
@ -19,7 +24,7 @@ let
pkgs = import patchedPkgsSrc {};
mytexlive = (pkgs.texlive.combine {
inherit (pkgs.texlive) scheme-full;
inherit (pkgs.texlive) scheme-full minted pygmentex fvextra;
});
in pkgs.stdenv.mkDerivation {
@ -136,6 +141,8 @@ in pkgs.stdenv.mkDerivation {
let g:vimtex_fold_comments = 1
let g:vimtex_fold_preamble = 1
let g:vimtex_latexmk_options = '-verbose -pdf -shell-escape -file-line-error -synctex=1 -interaction=nonstopmode'
if !exists('g:ycm_semantic_triggers')
let g:ycm_semantic_triggers = {}
endif
@ -173,7 +180,12 @@ in pkgs.stdenv.mkDerivation {
};
})
pkgs.bashInteractive
mytexlive
pkgs.biber
pkgs.pygmentex
pkgs.python27Packages.pygments-markdown-lexer
pkgs.zathura
];
}