add code formatter and reformat

This commit is contained in:
Tim Schubert 2022-08-04 21:05:37 +02:00
parent a055f4fa40
commit 8cd6ed1502
Signed by: dadada
GPG key ID: EEB8D1CE62C4DFEA
69 changed files with 1016 additions and 797 deletions

View file

@ -1,7 +1,6 @@
let
python3Packages = import ./python3-packages.nix;
in
{
in {
kanboard = final: prev: {
kanboard = prev.kanboard.overrideAttrs (oldAttrs: {
src = prev.fetchFromGitHub {

View file

@ -1,6 +1,7 @@
self: super:
{
python3Packages = super.python3Packages // super.recurseIntoAttrs (
super.python3Packages.callPackage ../pkgs/python-pkgs { }
);
self: super: {
python3Packages =
super.python3Packages
// super.recurseIntoAttrs (
super.python3Packages.callPackage ../pkgs/python-pkgs {}
);
}

View file

@ -1,26 +1,28 @@
self: super:
{
self: super: {
# Based on https://gist.github.com/clefru/9ed1186bf0b76d27e0ad20cbd9966b87
tubslatex = super.lib.overrideDerivation
tubslatex =
super.lib.overrideDerivation
(super.texlive.combine {
inherit (super.texlive) scheme-full;
tubslatex.pkgs = [ (super.callPackage ../pkgs/tubslatex { }) ];
tubslatex.pkgs = [(super.callPackage ../pkgs/tubslatex {})];
})
(oldAttrs: {
postBuild = ''
# Save the udpmap.cfg because texlive.combine removes it.
cat $out/share/texmf/web2c/updmap.cfg > $out/share/texmf/web2c/updmap.cfg.1
'' + oldAttrs.postBuild + ''
# Move updmap.cfg into its original place and rerun mktexlsr, so that kpsewhich finds it
rm $out/share/texmf/web2c/updmap.cfg || true
cat $out/share/texmf/web2c/updmap.cfg.1 > $out/share/texmf/web2c/updmap.cfg
rm $out/share/texmf/web2c/updmap.cfg.1
perl `type -P mktexlsr.pl` $out/share/texmf
yes | perl `type -P updmap.pl` --sys --syncwithtrees --force || true
perl `type -P updmap.pl` --sys --enable Map=NexusProSerif.map --enable Map=NexusProSans.map
# Regenerate .map files.
perl `type -P updmap.pl` --sys
'';
postBuild =
''
# Save the udpmap.cfg because texlive.combine removes it.
cat $out/share/texmf/web2c/updmap.cfg > $out/share/texmf/web2c/updmap.cfg.1
''
+ oldAttrs.postBuild
+ ''
# Move updmap.cfg into its original place and rerun mktexlsr, so that kpsewhich finds it
rm $out/share/texmf/web2c/updmap.cfg || true
cat $out/share/texmf/web2c/updmap.cfg.1 > $out/share/texmf/web2c/updmap.cfg
rm $out/share/texmf/web2c/updmap.cfg.1
perl `type -P mktexlsr.pl` $out/share/texmf
yes | perl `type -P updmap.pl` --sys --syncwithtrees --force || true
perl `type -P updmap.pl` --sys --enable Map=NexusProSerif.map --enable Map=NexusProSans.map
# Regenerate .map files.
perl `type -P updmap.pl` --sys
'';
});
}