diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/misc/ranger/default.nix index e3a3a5e80d6..33b8c33033e 100644 --- a/pkgs/applications/misc/ranger/default.nix +++ b/pkgs/applications/misc/ranger/default.nix @@ -43,7 +43,7 @@ python3Packages.buildPythonApplication rec { # give image previews out of the box when building with w3m 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; { diff --git a/pkgs/build-support/release/binary-tarball.nix b/pkgs/build-support/release/binary-tarball.nix index f691b1bf735..dad65a0e7eb 100644 --- a/pkgs/build-support/release/binary-tarball.nix +++ b/pkgs/build-support/release/binary-tarball.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation ( postPhases = "finalPhase"; } - // args // + // args // { name = name + (if src ? version then "-" + src.version else ""); - + postHook = '' mkdir -p $out/nix-support echo "$system" > $out/nix-support/system @@ -43,7 +43,7 @@ stdenv.mkDerivation ( if test -e $origSrc/nix-support/hydra-release-name; then releaseName=$(cat $origSrc/nix-support/hydra-release-name) fi - + installFlagsArray=(DESTDIR=$TMPDIR/inst) # 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 . ''; - + finalPhase = '' for i in $out/tarballs/*; do echo "file binary-dist $i" >> $out/nix-support/hydra-build-products done - + # Propagate the release name of the source tarball. This is # to get nice package names in channels. test -n "$releaseName" && (echo "$releaseName" >> $out/nix-support/hydra-release-name) ''; - + meta = (if args ? meta then args.meta else {}) // { description = "Build of a generic binary distribution"; diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index e763e5c1159..4bb995ff074 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -194,11 +194,11 @@ stdenv.mkDerivation rec { description = "A complete, cross-platform solution to record, convert and stream audio and video"; homepage = http://www.ffmpeg.org/; longDescription = '' - FFmpeg is the leading multimedia framework, able to decode, encode, transcode, - 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. - No matter if they were designed by some standards committee, the community or - a corporation. + FFmpeg is the leading multimedia framework, able to decode, encode, transcode, + 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. + No matter if they were designed by some standards committee, the community or + a corporation. ''; license = licenses.gpl3; platforms = platforms.all; diff --git a/pkgs/development/python-modules/arxiv2bib/default.nix b/pkgs/development/python-modules/arxiv2bib/default.nix index 1182c36fc0c..99725bcfa61 100644 --- a/pkgs/development/python-modules/arxiv2bib/default.nix +++ b/pkgs/development/python-modules/arxiv2bib/default.nix @@ -14,7 +14,6 @@ buildPythonPackage rec { sha256 = "1kp2iyx20lpc9dv4qg5fgwf83a1wx6f7hj1ldqyncg0kn9xcrhbg"; }; - # Required for tests only checkInputs = [ mock ]; checkPhase = "${python.interpreter} -m unittest discover -s tests"; diff --git a/pkgs/development/python-modules/markdown/default.nix b/pkgs/development/python-modules/markdown/default.nix index 515dee0e766..f2397138771 100644 --- a/pkgs/development/python-modules/markdown/default.nix +++ b/pkgs/development/python-modules/markdown/default.nix @@ -25,4 +25,4 @@ buildPythonPackage rec { homepage = https://github.com/Python-Markdown/markdown; license = lib.licenses.bsd3; }; -} \ No newline at end of file +} diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index 6d48ed20e0a..715e32874ac 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -83,4 +83,3 @@ wrapped-full = with luajitPackages; let ''; in result -