public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'staging' (older one)

Browse Source 
Hydra seems OK-ish, except that some aarch64 jobs need restarting
after qt4 timing out for the first time:
https://hydra.nixos.org/eval/1412641?compare=1412561
This commit is contained in:
Vladimír Čunát
2017-11-24 18:29:15 +01:00
parent 1743953cc5 9ae72f2715
commit 7dfa97969a
106 changed files with 2055 additions and 1571 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/misc/diffoscope/default.nix
View File

@@ -1,5 +1,5 @@
{ lib, stdenv, fetchgit, python3Packages, docutils
, acl, apktool, binutils, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, diffutils, dtc
, acl, apktool, libbfd, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, diffutils, dtc
, e2fsprogs, file, findutils, fontforge-fonttools, fpc, gettext, ghc, ghostscriptX, giflib, gnupg1, gnutar
, gzip, imagemagick, jdk, libarchive, libcaca, llvm, mono, openssh, pdftk, pgpdump, poppler_utils, sng, sqlite
, squashfsTools, tcpdump, unoconv, unzip, xxd, xz
@@ -28,7 +28,7 @@ python3Packages.buildPythonApplication rec {
# Still missing these tools: docx2txt enjarify js-beautify oggDump Rscript
# Also these libraries: python3-guestfs
pythonPath = with python3Packages; [ debian libarchive-c python_magic tlsh rpm ] ++ [
acl binutils bzip2 cdrkit colordiff coreutils cpio diffutils dtc e2fsprogs file findutils
acl libbfd bzip2 cdrkit colordiff coreutils cpio diffutils dtc e2fsprogs file findutils
fontforge-fonttools gettext gnutar gzip libarchive libcaca pgpdump sng sqlite
squashfsTools unzip xxd xz
] ++ lib.optionals enableBloat [

4
pkgs/tools/misc/man-db/default.nix
View File

@@ -28,6 +28,10 @@ stdenv.mkDerivation rec {
"--with-systemdtmpfilesdir=\${out}/lib/tmpfiles.d"
];
preConfigure = ''
configureFlagsArray+=("--with-sections=1 n l 8 3 0 2 5 4 9 6 7")
'';
postInstall = ''
# apropos/whatis uses program name to decide whether to act like apropos or whatis
# (multi-call binary). `apropos` is actually just a symlink to whatis. So we need to