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

Merge branch 'master.upstream' into staging.upstream

Browse Source
This commit is contained in:
William A. Kennington III
2015-09-29 15:54:33 -07:00
parent 48a791d270 ea4850ca64
commit 271972de0a
546 changed files with 25528 additions and 2488 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/tools/audio/beets/default.nix
View File

@@ -136,7 +136,7 @@ in buildPythonPackage rec {
runHook preCheck
LANG=en_US.UTF-8 \
LOCALE_ARCHIVE=${glibcLocales}/lib/locale/locale-archive \
LOCALE_ARCHIVE=${assert stdenv.isLinux; glibcLocales}/lib/locale/locale-archive \
BEETS_TEST_SHELL="${testShell}" \
BASH_COMPLETION_SCRIPT="${completion}" \
HOME="$(mktemp -d)" \
@@ -168,5 +168,6 @@ in buildPythonPackage rec {
homepage = http://beets.radbox.org;
license = licenses.mit;
maintainers = with maintainers; [ aszlig iElectric pjones ];
platforms = platforms.linux;
};
}

4
pkgs/tools/backup/obnam/default.nix
View File

@@ -2,13 +2,13 @@
pythonPackages.buildPythonPackage rec {
name = "obnam-${version}";
version = "1.16";
version = "1.17";
namePrefix = "";
src = fetchurl rec {
url = "http://code.liw.fi/debian/pool/main/o/obnam/obnam_${version}.orig.tar.xz";
sha256 = "0fv9pxilg0mjs6pw80c3sm23p5smpapyc49zgcm839qarl90fqz5";
sha256 = "01h1la07ra9v5zaqbs1qzsri2pdc9qrk2pz8y07msqg850w59k3v";
};
buildInputs = [ pythonPackages.sphinx attr ];

16
pkgs/tools/filesystems/bonnie/default.nix Normal file
View File

@@ -0,0 +1,16 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation {
name = "bonnie++-1.03e";
src = fetchurl {
url = http://www.coker.com.au/bonnie++/bonnie++-1.03e.tgz;
sha256 = "1jz2l8dz08c7vxvchigisv5a293yz95bw1k81dv6bgrlcq8ncf6b";
};
enableParallelBuilding = true;
meta = {
homepage = "http://www.coker.com.au/bonnie++/";
description = "Hard drive and file system benchmark suite";
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux;
};
}

5
pkgs/tools/filesystems/exfat/default.nix
View File

@@ -1,11 +1,11 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, fuse }:
let version = "1.2.0"; in
let version = "1.2.1"; in
stdenv.mkDerivation rec {
name = "exfat-${version}";
src = fetchFromGitHub {
sha256 = "1fsm082g8phqcdg5md6yll06jijnbvqrdy0638psa8kr159h4dv8";
sha256 = "1k716civkxszkzpc7bcqqcmfik8lpwk3zwp2nl4v844b8g7r5xz9";
rev = "v${version}";
repo = "exfat";
owner = "relan";
@@ -23,4 +23,3 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ nckx ];
};
}

8
pkgs/tools/misc/colord-kde/default.nix
View File

@@ -1,4 +1,6 @@
{ stdenv, fetchurl, cmake, colord, libX11, libXrandr, lcms2, pkgconfig, kdelibs}:
{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig
, colord, libX11, libXrandr, lcms2, kdelibs
}:
stdenv.mkDerivation {
name = "colord-kde-0.3.0";
@@ -8,7 +10,9 @@ stdenv.mkDerivation {
sha256 = "ab3cdb7c8c98aa2ee8de32a92f87770e1fbd58eade6471f3f24d932b50b4cf09";
};
buildInputs = [ cmake colord libX11 libXrandr lcms2 pkgconfig kdelibs ];
nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
buildInputs = [ colord libX11 libXrandr lcms2 kdelibs ];
enableParallelBuilding = true;

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

@@ -2,7 +2,7 @@
let
version = "2.1.2.0";
version = "2.1.4.0";
in stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
src = fetchgit {
url = "git://git.skarnet.org/execline";
rev = "refs/tags/v${version}";
sha256 = "0p9wp1rq8010k5yxlvamajhi6m24r9v7ikb7scvznf6zb2b0d9hf";
sha256 = "1ih0mmkra3aa697nz7haaifq2hfy3wjj39npxzg9zr37m7yw67yz";
};
dontDisableStatic = true;

20
pkgs/tools/misc/kde-gtk-config/default.nix
View File

@@ -1,5 +1,7 @@
{ stdenv, fetchurl, cmake, gettext, gtk2, gtk3, kdelibs
, libxcb, libpthreadstubs, libXdmcp, pkgconfig, glib, gdk_pixbuf }:
{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig
, gtk2, gtk3, kdelibs, libxcb, libpthreadstubs, libXdmcp
, glib, gdk_pixbuf
}:
stdenv.mkDerivation {
name = "kde-gtk-config-2.2.1";
@@ -9,19 +11,11 @@ stdenv.mkDerivation {
};
buildInputs = [
cmake
gdk_pixbuf
gettext
glib
gtk2
gtk3
kdelibs
libxcb
libpthreadstubs
libXdmcp
pkgconfig
gdk_pixbuf glib gtk2 gtk3 kdelibs libxcb libpthreadstubs libXdmcp
];
nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ];
patches = [
./kde-gtk-config-2.2.1-install-paths.patch
./kde-gtk-config-follow-symlinks.patch

6
pkgs/tools/misc/multitail/default.nix
View File

@@ -1,11 +1,12 @@
{ stdenv, fetchurl, ncurses }:
stdenv.mkDerivation rec {
name = "multitail-6.2.1";
version = "6.4.2";
name = "multitail-${version}";
src = fetchurl {
url = "http://www.vanheusden.com/multitail/${name}.tgz";
sha256 = "049fv5cyl5f7vcc8n2q3z3i5k0sqv2k715ic0s4q1nrw5kb6qn0y";
sha256 = "1zd1r89xkxngl1pdrvsc877838nwkfqkbcgfqm3vglwalxc587dg";
};
buildInputs = [ ncurses ];
@@ -20,5 +21,6 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://www.vanheusden.com/multitail/;
description = "tail on Steroids";
maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ];
};
}

7
pkgs/tools/misc/opentsdb/default.nix
View File

@@ -1,11 +1,12 @@
{ stdenv, autoconf, automake, curl, fetchurl, jdk, jre, makeWrapper, nettools, python }:
with stdenv.lib;
stdenv.mkDerivation rec {
name = "opentsdb-2.1.0";
name = "opentsdb-${version}";
version = "2.1.1";
src = fetchurl {
url = https://github.com/OpenTSDB/opentsdb/releases/download/v2.1.0/opentsdb-2.1.0.tar.gz;
sha256 = "0msijwzdwisqmdd8ikmrzbcqvrnb6ywz6zyd1vg0s5s4syi3cvmp";
url = "https://github.com/OpenTSDB/opentsdb/releases/download/${version}/opentsdb-${version}.tar.gz";
sha256 = "17wbdvrv83dr18dqxxsk73c1a7jlbw19algvz0hsz9a1k7aiy29b";
};
buildInputs = [ autoconf automake curl jdk makeWrapper nettools python ];

4
pkgs/tools/misc/s6-portable-utils/default.nix
View File

@@ -2,7 +2,7 @@
let
version = "2.0.5.0";
version = "2.0.5.2";
in stdenv.mkDerivation rec {
@@ -10,7 +10,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "http://www.skarnet.org/software/s6-portable-utils/${name}.tar.gz";
sha256 = "099c7isi5vynis4iaiz362rvr73w4rvjhv3c2f7ddxgfyvd2331l";
sha256 = "0d5dvqz61abr4m2n10by8hccvw51jdvyckvpbbq0c57viri54jzm";
};
dontDisableStatic = true;

20
pkgs/tools/misc/toilet/default.nix Normal file
View File

@@ -0,0 +1,20 @@
{ stdenv, fetchurl, pkgconfig, libcaca, figlet }:
stdenv.mkDerivation rec {
name = "toilet-${version}";
version = "0.3";
src = fetchurl {
url = "http://caca.zoy.org/raw-attachment/wiki/toilet/${name}.tar.gz";
sha256 = "1pl118qb7g0frpgl9ps43w4sd0psjirpmq54yg1kqcclqcqbbm49";
};
buildInputs = [ pkgconfig libcaca ];
meta = {
description = "Display large colourful characters in text mode";
homepage = "http://caca.zoy.org/wiki/toilet";
license = stdenv.lib.licenses.wtfpl;
platforms = stdenv.lib.platforms.all;
};
}

11
pkgs/tools/networking/bwm-ng/default.nix
View File

@@ -1,11 +1,14 @@
{ stdenv, fetchurl, ncurses }:
let
version = "0.6.1";
in
stdenv.mkDerivation rec {
name = "bwm-ng-0.6";
name = "bwm-ng-${version}";
src = fetchurl {
url = "http://www.gropp.org/bwm-ng/${name}.tar.gz";
sha256 = "1pgzc8y2y73n72qvbd2g0dkbkw5h0f83k5h9id1rsck8w9c464y1";
sha256 = "1w0dwpjjm9pqi613i8glxrgca3rdyqyp3xydzagzr5ndc34z6z02";
};
buildInputs = [ ncurses ];
@@ -42,7 +45,7 @@ stdenv.mkDerivation rec {
This was influenced by the old bwm util written by Barney (barney@freewill.tzo.com) which had some issues with faster interfaces and was very simple. Since i had almost all code done anyway for other projects, i decided to create my own version.
I actually don't know if netstat input is useful at all. I saw this elsewhere, so i added it. Its target is "netstat 1.42 (2001-04-15)" linux or Free/Open/netBSD. If there are other formats i would be happy to add them.
(from homepage)
'';
};

14
pkgs/tools/networking/mu/default.nix
View File

@@ -3,18 +3,18 @@
, gtk3, webkit, libsoup, icu, withMug ? false /* doesn't build with current gtk3 */ }:
stdenv.mkDerivation rec {
version = "0.9.12";
version = "0.9.13";
name = "mu-${version}";
src = fetchurl {
url = "https://github.com/djcb/mu/archive/v${version}.tar.gz";
sha256 = "1bxryacmas2llj68m2dv8dr1vwx8f5k2i2azh69jajkpqx7i4wdq";
sha256 = "0wj33pma8xgjvn2akk7khzbycwn4c9sshxvzdph9dnpy7gyqxj51";
};
buildInputs =
[ sqlite pkgconfig autoconf automake xapian
glib gmime texinfo emacs guile libsoup icu ]
++ stdenv.lib.optional withMug [ gtk3 webkit ];
++ stdenv.lib.optionals withMug [ gtk3 webkit ];
preConfigure = ''
autoreconf -i
@@ -36,11 +36,11 @@ stdenv.mkDerivation rec {
cp -v toys/mug/mug $out/bin/
'';
meta = {
meta = with stdenv.lib; {
description = "A collection of utilties for indexing and searching Maildirs";
license = stdenv.lib.licenses.gpl3Plus;
license = licenses.gpl3Plus;
homepage = "http://www.djcbsoftware.nl/code/mu/";
platforms = stdenv.lib.platforms.mesaPlatforms;
maintainers = with stdenv.lib.maintainers; [ antono the-kenny ];
platforms = platforms.mesaPlatforms;
maintainers = with maintainers; [ antono the-kenny ];
};
}

27
pkgs/tools/networking/networkmanagement/default.nix
View File

@@ -1,27 +0,0 @@
{ stdenv, fetchurl, gettext, kdelibs, kde_workspace, networkmanager, pkgconfig }:
let
pname = "networkmanagement";
version = "0.9.0.9";
name = "${pname}-${version}";
in
stdenv.mkDerivation {
inherit name;
src = fetchurl {
url = "mirror://kde/unstable/${pname}/${version}/src/${name}.tar.bz2";
sha256 = "1jiij9iz8v9mgcq811svmlyfvmvkazpclkf4yk7193m4y8yn19yn";
};
buildInputs = [ kdelibs kde_workspace networkmanager ];
nativeBuildInputs = [ gettext pkgconfig ];
NIX_CFLAGS_COMPILE="-I${kde_workspace}/include/solid/control";
meta = {
homepage = https://projects.kde.org/projects/extragear/base/networkmanagement;
description = "KDE Plasmoid for controlling NetworkManager";
inherit (kdelibs.meta) platforms;
maintainers = [ stdenv.lib.maintainers.urkud ];
};
}

14
pkgs/tools/networking/plasma-nm/default.nix
View File

@@ -1,4 +1,5 @@
{ stdenv, fetchurl, pkgconfig, cmake, gettext, kdelibs, networkmanager, libnm-qt }:
{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig
, kdelibs, networkmanager, libnm-qt }:
let
pname = "plasma-nm";
@@ -13,14 +14,9 @@ stdenv.mkDerivation {
sha256 = "0xj14isvjq8ll70b6q66n8adm8ff4j9ng195ndk2gmavjf6bb751";
};
buildInputs = [
cmake
pkgconfig
gettext
kdelibs
networkmanager
libnm-qt
];
nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ];
buildInputs = [ kdelibs networkmanager libnm-qt ];
meta = with stdenv.lib; {
homepage = "https://projects.kde.org/projects/kde/workspace/plasma-nm";

4
pkgs/tools/networking/s6-dns/default.nix
View File

@@ -2,7 +2,7 @@
let
version = "2.0.0.3";
version = "2.0.0.4";
in stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
src = fetchgit {
url = "git://git.skarnet.org/s6-dns";
rev = "refs/tags/v${version}";
sha256 = "0kabv1k5xn2vhwlq42913d22kd1f79nssmi7jkncgvsgv1zs0sym";
sha256 = "0h2s0r0g0qi74aw04c0jap09yjzzprwc6ihknx8bqgbzv08yv03w";
};
dontDisableStatic = true;

37
pkgs/tools/networking/tgt/default.nix Normal file
View File

@@ -0,0 +1,37 @@
{ stdenv, fetchFromGitHub, libxslt, libaio, systemd, perl, perlPackages }:
let
version = "1.0.60";
in stdenv.mkDerivation rec {
name = "tgt-${version}";
src = fetchFromGitHub {
owner = "fujita";
repo = "tgt";
rev = "ab51727a361bf296b1c2036375b5e45479059921";
sha256 = "1bf8rn3mavjrzkp5k23akqn5ilw43g8mpfr68z1bi8s9lr2gkf37";
};
buildInputs = [ libxslt systemd libaio ];
DESTDIR = "$(out)";
PREFIX = "/";
SD_NOTIFY="1";
preConfigure = ''
sed -i 's|/usr/bin/||' doc/Makefile
sed -i 's|/usr/include/libaio.h|${libaio}/include/libaio.h|' usr/Makefile
sed -i 's|/usr/include/sys/|${stdenv.glibc}/include/sys/|' usr/Makefile
sed -i 's|/usr/include/linux/|${stdenv.glibc}/include/linux/|' usr/Makefile
'';
postInstall = ''
sed -i 's|#!/usr/bin/perl|#! ${perl}/bin/perl -I${perlPackages.ConfigGeneral}/${perl.libPrefix}|' $out/sbin/tgt-admin
'';
enableParallelBuilding = true;
meta = {
description = "iSCSI Target daemon with rdma support";
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux;
};
}

8
pkgs/tools/networking/wget/default.nix
View File

@@ -1,6 +1,6 @@
{ stdenv, fetchurl, gettext, libidn, pkgconfig
, perl, perlPackages, LWP, python3
, libiconv, libpsl, gnutls ? null }:
, libiconv, libpsl, openssl ? null }:
stdenv.mkDerivation rec {
name = "wget-1.16.3";
@@ -27,13 +27,13 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ gettext pkgconfig ];
buildInputs = [ libidn libiconv libpsl ]
++ stdenv.lib.optionals doCheck [ perl perlPackages.IOSocketSSL LWP python3 ]
++ stdenv.lib.optional (gnutls != null) gnutls
++ stdenv.lib.optional (openssl != null) openssl
++ stdenv.lib.optional stdenv.isDarwin perl;
configureFlags =
if gnutls != null then "--with-ssl=gnutls" else "--without-ssl";
if openssl != null then "--with-ssl=openssl" else "--without-ssl";
doCheck = (perl != null && python3 != null && !stdenv.isDarwin);
doCheck = false;
meta = with stdenv.lib; {
description = "Tool for retrieving files using HTTP, HTTPS, and FTP";

8
pkgs/tools/package-management/nixops/default.nix
View File

@@ -1,12 +1,12 @@
{ lib, pythonPackages, fetchurl, libxslt, docbook5_xsl, openssh }:
pythonPackages.buildPythonPackage rec {
name = "nixops-1.2";
name = "nixops-1.3";
namePrefix = "";
src = fetchurl {
url = "http://nixos.org/releases/nixops/${name}/${name}.tar.bz2";
sha256 = "06cf54c62a810cac5013d57d31707f0a6381b409485503a94a57ce6d8a1ac12b";
sha256 = "d80b0fe3bb31bb84a8545f9ea804ec8137172c8df44f03326ed7639e5a4bad55";
};
buildInputs = [ libxslt ];
@@ -16,15 +16,13 @@ pythonPackages.buildPythonPackage rec {
pythonPackages.boto
pythonPackages.sqlite3
pythonPackages.hetzner
pythonPackages.libcloud
];
doCheck = false;
postInstall =
''
# Backward compatibility symlink.
ln -s nixops $out/bin/charon
make -C doc/manual install nixops.1 docbookxsl=${docbook5_xsl}/xml/xsl/docbook \
docdir=$out/share/doc/nixops mandir=$out/share/man

6
pkgs/tools/security/ksshaskpass/default.nix
View File

@@ -1,4 +1,6 @@
{stdenv, fetchurl, kdelibs}:
{ stdenv, fetchurl, kdelibs
, automoc4, cmake, perl, pkgconfig
}:
stdenv.mkDerivation {
name = "ksshaskpass-0.5.3";
@@ -8,6 +10,8 @@ stdenv.mkDerivation {
sha256 = "0911i8jr0nzqah8xidb8wba55a2skaidj3klv3cw6bm5fjx7x953";
};
nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
buildInputs = [ kdelibs ];
patchPhase = ''

45
pkgs/tools/security/modsecurity/default.nix Normal file
View File

@@ -0,0 +1,45 @@
{ stdenv, lib, fetchurl
, curl, apacheHttpd, pcre, apr, aprutil, libxml2 }:
with lib;
stdenv.mkDerivation rec {
name = "modsecurity-${version}";
version = "2.9.0";
src = fetchurl {
url = "https://www.modsecurity.org/tarball/${version}/${name}.tar.gz";
sha256 = "e2bbf789966c1f80094d88d9085a81bde082b2054f8e38e0db571ca49208f434";
};
buildInputs = [ curl apacheHttpd pcre apr aprutil libxml2 ];
configureFlags = [
"--enable-standalone-module"
"--enable-static"
"--with-curl=${curl}"
"--with-apxs=${apacheHttpd}/bin/apxs"
"--with-pcre=${pcre}"
"--with-apr=${apr}"
"--with-apu=${aprutil}/bin/apu-1-config"
"--with-libxml=${libxml2}"
];
outputs = ["out" "nginx"];
preBuild = ''
substituteInPlace apache2/Makefile.in --replace "install -D " "# install -D"
'';
postInstall = ''
mkdir -p $nginx
cp -R * $nginx
'';
meta = {
description = "Open source, cross-platform web application firewall (WAF)";
license = licenses.asl20;
homepage = https://www.modsecurity.org/;
maintainers = with maintainers; [offline];
platforms = with platforms; linux;
};
}

5
pkgs/tools/security/polkit-kde-agent/default.nix
View File

@@ -1,4 +1,5 @@
{ stdenv, fetchurl, kdelibs, polkit_qt4, gettext }:
{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig
, kdelibs, polkit_qt4 }:
stdenv.mkDerivation rec {
name = "polkit-kde-agent-1-0.99.0";
@@ -10,7 +11,7 @@ stdenv.mkDerivation rec {
buildInputs = [ kdelibs polkit_qt4 ];
nativeBuildInputs = [ gettext ];
nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ];
patchPhase = "sed -e s/KDE4_AUTOSTART/AUTOSTART/ -i CMakeLists.txt";

32
pkgs/tools/security/sshuttle/default.nix
View File

@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, makeWrapper, pandoc
, coreutils, iptables, nettools, openssh, procps, python }:
{ stdenv, fetchFromGitHub, fetchpatch, makeWrapper, pandoc
, coreutils, iptables, nettools, openssh, procps, pythonPackages }:
let version = "0.71"; in
stdenv.mkDerivation rec {
@@ -12,21 +12,41 @@ stdenv.mkDerivation rec {
owner = "sshuttle";
};
patches = [
(fetchpatch {
sha256 = "1yrjyvdz6k6zk020dmbagf8w49w8vhfbzgfpsq9jqdh2hbykv3m3";
url = https://github.com/sshuttle/sshuttle/commit/3cf5002b62650c26a50e18af8d8c5c91d754bab9.patch;
})
(fetchpatch {
sha256 = "091gg28cnmx200q46bcnxpp9ih9p5qlq0r3bxfm0f4qalg8rmp2g";
url = https://github.com/sshuttle/sshuttle/commit/d70b5f2b89e593506834cf8ea10785d96c801dfc.patch;
})
(fetchpatch {
sha256 = "17l9h8clqlbyxdkssavxqpb902j7b3yabrrdalybfpkhj69x8ghk";
url = https://github.com/sshuttle/sshuttle/commit/a38963301e9c29fbe3232f0a41ea080b642c5ad2.patch;
})
];
nativeBuildInputs = [ makeWrapper pandoc ];
buildInputs = [ coreutils iptables nettools openssh procps python ];
buildInputs =
[ coreutils iptables nettools openssh procps pythonPackages.python ];
pythonPaths = with pythonPackages; [ PyXAPI ];
preConfigure = ''
cd src
'';
installPhase = ''
installPhase = let
mapPath = f: x: stdenv.lib.concatStringsSep ":" (map f x);
in ''
mkdir -p $out/share/sshuttle
cp -R sshuttle *.py compat $out/share/sshuttle
mkdir -p $out/bin
ln -s $out/share/sshuttle/sshuttle $out/bin
wrapProgram $out/bin/sshuttle --prefix PATH : \
"${stdenv.lib.concatStringsSep ":" (map (x: "${x}/bin") buildInputs)}"
wrapProgram $out/bin/sshuttle \
--prefix PATH : "${mapPath (x: "${x}/bin") buildInputs}" \
--prefix PYTHONPATH : "${mapPath (x: "$(toPythonPath ${x})") pythonPaths}"
install -Dm644 sshuttle.8 $out/share/man/man8/sshuttle.8
'';

19
pkgs/tools/system/fio/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, libaio, zlib }:
{ stdenv, fetchFromGitHub, libaio, python, zlib }:
let version = "2.2.10"; in
@@ -12,23 +12,18 @@ stdenv.mkDerivation rec {
sha256 = "0hg72k8cifw6lc46kyiic7ai4gqn2819d6g998vmx01jnlcixp8q";
};
buildInputs = [ libaio zlib ];
buildInputs = [ libaio python zlib ];
enableParallelBuilding = true;
configurePhase = ''
substituteInPlace tools/plot/fio2gnuplot \
--replace /usr/share/fio $out/share/fio
./configure
postPatch = ''
substituteInPlace tools/plot/fio2gnuplot --replace /usr/share/fio $out/share/fio
'';
installPhase = ''
make install prefix=$out
'';
meta = {
meta = with stdenv.lib; {
homepage = "http://git.kernel.dk/?p=fio.git;a=summary";
description = "Flexible IO Tester - an IO benchmark tool";
license = stdenv.lib.licenses.gpl2;
license = licenses.gpl2;
platforms = platforms.linux;
};
}

6
pkgs/tools/text/kdiff3/default.nix
View File

@@ -1,4 +1,6 @@
{ stdenv, fetchurl, cmake, kdelibs, gettext }:
{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig
, kdelibs, gettext
}:
stdenv.mkDerivation rec {
name = "kdiff3-0.9.98";
@@ -8,7 +10,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [ kdelibs ];
nativeBuildInputs = [ cmake gettext ];
nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ];
meta = {
homepage = http://kdiff3.sourceforge.net/;

4
pkgs/tools/text/xurls/default.nix
View File

@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, go }:
stdenv.mkDerivation rec {
version = "0.7.0";
version = "0.8.0";
name = "xurls-${version}";
src = fetchFromGitHub {
owner = "mvdan";
repo = "xurls";
rev = "v${version}";
sha256 = "1sdxz1vqm9kidva7lilway69n4fdkqa4kdldx47jriq2hr96s7n0";
sha256 = "0j35x6hl5hiwzpi6vjw9d2sn83rrsd9w07ql9kndhkngz8n6yr98";
};
buildInputs = [ go ];

2
pkgs/tools/typesetting/tex/texlive-new/default.nix
View File

@@ -129,7 +129,7 @@ let
urlPrefix = args.urlPrefix or
("${mirror}/pub/tex/historic/systems/texlive/${bin.texliveYear}/tlnet-final/archive");
# beware: standard mirrors http://mirror.ctan.org/ don't have releases
mirror = "ftp://tug.ctan.org"; # also works: ftp.math.utah.edu
mirror = "ftp://tug.ctan.org"; # also works: ftp.math.utah.edu but same IP
in ''
tar -xf '${ fetchurl { inherit url md5; } }' \
'--strip-components=${toString stripPrefix}' \

4
pkgs/tools/virtualization/ec2-ami-tools/default.nix
View File

@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "ec2-ami-tools-${version}";
version = "1.5.6";
version = "1.5.7";
buildInputs = [ unzip makeWrapper ];
src = fetchurl {
url = "http://s3.amazonaws.com/ec2-downloads/${name}.zip";
sha256 = "0227370qbm26qaqvscqxv6002bqwy2i5fdhbhpwfnbymh7jz59ks";
sha256 = "17xj7xmdbcwdbzalhfs6yyiwa64978mk3li39l949qfjjgrxjias";
};
# Amazon EC2 requires that disk images are writable. If they're

4
pkgs/tools/virtualization/ec2-api-tools/default.nix
View File

@@ -1,11 +1,11 @@
{ stdenv, fetchurl, unzip, makeWrapper, jre }:
stdenv.mkDerivation rec {
name = "ec2-api-tools-1.6.5.1";
name = "ec2-api-tools-1.7.5.1";
src = fetchurl {
url = "http://tarballs.nixos.org/${name}.zip";
sha256 = "1j2pc20vggi4hv950999mhh7dl6475yma76nyj6k0hzkd1lf5hda";
sha256 = "0figmvcm82ghmpz3018ihysz8zpxpysgbpdx7rmciq9y80qbw6l5";
};
buildInputs = [ unzip makeWrapper ];