mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-19 17:39:34 +00:00
treewide: random cleanups
This commit is contained in:
parent
365e288a28
commit
b135329dc5
pkgs
applications/misc/ranger
build-support/release
development
servers/dns/knot-resolver
|
@ -43,7 +43,7 @@ python3Packages.buildPythonApplication rec {
|
||||||
|
|
||||||
# give image previews out of the box when building with w3m
|
# give image previews out of the box when building with w3m
|
||||||
substituteInPlace ranger/config/rc.conf \
|
substituteInPlace ranger/config/rc.conf \
|
||||||
--replace "set preview_images false" "set preview_images true" \
|
--replace "set preview_images false" "set preview_images true"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
|
|
|
@ -27,11 +27,11 @@ stdenv.mkDerivation (
|
||||||
postPhases = "finalPhase";
|
postPhases = "finalPhase";
|
||||||
}
|
}
|
||||||
|
|
||||||
// args //
|
// args //
|
||||||
|
|
||||||
{
|
{
|
||||||
name = name + (if src ? version then "-" + src.version else "");
|
name = name + (if src ? version then "-" + src.version else "");
|
||||||
|
|
||||||
postHook = ''
|
postHook = ''
|
||||||
mkdir -p $out/nix-support
|
mkdir -p $out/nix-support
|
||||||
echo "$system" > $out/nix-support/system
|
echo "$system" > $out/nix-support/system
|
||||||
|
@ -43,7 +43,7 @@ stdenv.mkDerivation (
|
||||||
if test -e $origSrc/nix-support/hydra-release-name; then
|
if test -e $origSrc/nix-support/hydra-release-name; then
|
||||||
releaseName=$(cat $origSrc/nix-support/hydra-release-name)
|
releaseName=$(cat $origSrc/nix-support/hydra-release-name)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
installFlagsArray=(DESTDIR=$TMPDIR/inst)
|
installFlagsArray=(DESTDIR=$TMPDIR/inst)
|
||||||
|
|
||||||
# Prefix hackery because of a bug in stdenv (it tries to `mkdir
|
# Prefix hackery because of a bug in stdenv (it tries to `mkdir
|
||||||
|
@ -62,18 +62,18 @@ stdenv.mkDerivation (
|
||||||
tar cvfj $out/tarballs/''${releaseName:-binary-dist}.tar.bz2 -C $TMPDIR/inst .
|
tar cvfj $out/tarballs/''${releaseName:-binary-dist}.tar.bz2 -C $TMPDIR/inst .
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|
||||||
finalPhase =
|
finalPhase =
|
||||||
''
|
''
|
||||||
for i in $out/tarballs/*; do
|
for i in $out/tarballs/*; do
|
||||||
echo "file binary-dist $i" >> $out/nix-support/hydra-build-products
|
echo "file binary-dist $i" >> $out/nix-support/hydra-build-products
|
||||||
done
|
done
|
||||||
|
|
||||||
# Propagate the release name of the source tarball. This is
|
# Propagate the release name of the source tarball. This is
|
||||||
# to get nice package names in channels.
|
# to get nice package names in channels.
|
||||||
test -n "$releaseName" && (echo "$releaseName" >> $out/nix-support/hydra-release-name)
|
test -n "$releaseName" && (echo "$releaseName" >> $out/nix-support/hydra-release-name)
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|
||||||
meta = (if args ? meta then args.meta else {}) // {
|
meta = (if args ? meta then args.meta else {}) // {
|
||||||
description = "Build of a generic binary distribution";
|
description = "Build of a generic binary distribution";
|
||||||
|
|
|
@ -194,11 +194,11 @@ stdenv.mkDerivation rec {
|
||||||
description = "A complete, cross-platform solution to record, convert and stream audio and video";
|
description = "A complete, cross-platform solution to record, convert and stream audio and video";
|
||||||
homepage = http://www.ffmpeg.org/;
|
homepage = http://www.ffmpeg.org/;
|
||||||
longDescription = ''
|
longDescription = ''
|
||||||
FFmpeg is the leading multimedia framework, able to decode, encode, transcode,
|
FFmpeg is the leading multimedia framework, able to decode, encode, transcode,
|
||||||
mux, demux, stream, filter and play pretty much anything that humans and machines
|
mux, demux, stream, filter and play pretty much anything that humans and machines
|
||||||
have created. It supports the most obscure ancient formats up to the cutting edge.
|
have created. It supports the most obscure ancient formats up to the cutting edge.
|
||||||
No matter if they were designed by some standards committee, the community or
|
No matter if they were designed by some standards committee, the community or
|
||||||
a corporation.
|
a corporation.
|
||||||
'';
|
'';
|
||||||
license = licenses.gpl3;
|
license = licenses.gpl3;
|
||||||
platforms = platforms.all;
|
platforms = platforms.all;
|
||||||
|
|
|
@ -14,7 +14,6 @@ buildPythonPackage rec {
|
||||||
sha256 = "1kp2iyx20lpc9dv4qg5fgwf83a1wx6f7hj1ldqyncg0kn9xcrhbg";
|
sha256 = "1kp2iyx20lpc9dv4qg5fgwf83a1wx6f7hj1ldqyncg0kn9xcrhbg";
|
||||||
};
|
};
|
||||||
|
|
||||||
# Required for tests only
|
|
||||||
checkInputs = [ mock ];
|
checkInputs = [ mock ];
|
||||||
|
|
||||||
checkPhase = "${python.interpreter} -m unittest discover -s tests";
|
checkPhase = "${python.interpreter} -m unittest discover -s tests";
|
||||||
|
|
|
@ -25,4 +25,4 @@ buildPythonPackage rec {
|
||||||
homepage = https://github.com/Python-Markdown/markdown;
|
homepage = https://github.com/Python-Markdown/markdown;
|
||||||
license = lib.licenses.bsd3;
|
license = lib.licenses.bsd3;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -83,4 +83,3 @@ wrapped-full = with luajitPackages; let
|
||||||
'';
|
'';
|
||||||
|
|
||||||
in result
|
in result
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue