Merge remote-tracking branch 'upstream/staging' into master

Changed files
+24 -6
pkgs
os-specific
linux
util-linux
tools
filesystems
e2fsprogs
typesetting
tex
texlive
+1 -3
pkgs/os-specific/linux/util-linux/default.nix
···
./rtcwake-search-PATH-for-shutdown.patch
];
-
outputs = [ "bin" "out" "man" ]; # TODO: $bin is kept the first for now
-
# due to lots of ${utillinux}/bin occurences and headers being rather small
-
outputDev = "bin";
#FIXME: make it also work on non-nixos?
postPatch = ''
···
./rtcwake-search-PATH-for-shutdown.patch
];
+
outputs = [ "bin" "dev" "out" "man" ];
#FIXME: make it also work on non-nixos?
postPatch = ''
+1 -2
pkgs/tools/filesystems/e2fsprogs/default.nix
···
sha256 = "1m72lk90b5i3h9qnmss6aygrzyn8x2avy3hyaq2fb0jglkrkz6ar";
};
-
outputs = [ "bin" "out" "man" ];
-
outputDev = "bin"; # just for *.pc
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libuuid ];
···
sha256 = "1m72lk90b5i3h9qnmss6aygrzyn8x2avy3hyaq2fb0jglkrkz6ar";
};
+
outputs = [ "bin" "dev" "out" "man" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libuuid ];
+22 -1
pkgs/tools/typesetting/tex/texlive/bin.nix
···
mv ./texmf.cnf "$out/share/texmf-dist/web2c/"
cp ../texk/tests/TeXLive/*.pm "$out/share/texmf-dist/scripts/texlive/TeXLive/"
cp ../texk/texlive/linked_scripts/scripts.lst "$out/share/texmf-dist/scripts/texlive/"
-
'' + /* doc location identical with individual TeX pkgs */ ''
mkdir -p "$doc/doc"
mv "$doc"/share/{man,info} "$doc"/doc
rmdir "$doc"/share
···
mv ./texmf.cnf "$out/share/texmf-dist/web2c/"
cp ../texk/tests/TeXLive/*.pm "$out/share/texmf-dist/scripts/texlive/TeXLive/"
cp ../texk/texlive/linked_scripts/scripts.lst "$out/share/texmf-dist/scripts/texlive/"
+
'' +
+
(let extraScripts =
+
''
+
tex4ht/ht.sh
+
tex4ht/htcontext.sh
+
tex4ht/htcopy.pl
+
tex4ht/htlatex.sh
+
tex4ht/htmex.sh
+
tex4ht/htmove.pl
+
tex4ht/httex.sh
+
tex4ht/httexi.sh
+
tex4ht/htxelatex.sh
+
tex4ht/htxetex.sh
+
tex4ht/mk4ht.pl
+
tex4ht/xhlatex.sh
+
'';
+
in
+
''
+
echo -e 'texmf_scripts="$texmf_scripts\n${extraScripts}"' \
+
>> "$out/share/texmf-dist/scripts/texlive/scripts.lst"
+
'')
+
+ /* doc location identical with individual TeX pkgs */ ''
mkdir -p "$doc/doc"
mv "$doc"/share/{man,info} "$doc"/doc
rmdir "$doc"/share