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-23 14:44:21 -07:00
parent 3c8b92f4b3 5cfe893cc4
commit d3f4ba9d6f
351 changed files with 12549 additions and 1699 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/X11/arandr/default.nix
View File

@@ -1,11 +1,11 @@
{ stdenv, fetchurl, python, xrandr, pythonPackages }:
pythonPackages.buildPythonPackage rec {
name = "arandr-0.1.7.1";
name = "arandr-0.1.8";
src = fetchurl {
url = "http://christian.amsuess.com/tools/arandr/files/${name}.tar.gz";
sha256 = "1nj84ww1kf024n5xgxwqmzscv8i1gixx7nmg05dbjj2xs28alwxb";
sha256 = "0d574mbmhaqmh7kivaryj2hpghz6xkvic9ah43s1hf385y7c33kd";
};
buildPhase = ''

4
pkgs/tools/X11/primus/lib.nix
View File

@@ -1,5 +1,5 @@
{ stdenv, fetchgit
, x11, mesa
, xlibsWrapper, mesa
, nvidia
}:
let
@@ -15,6 +15,6 @@ stdenv.mkDerivation {
inherit nvidia mesa;
buildInputs = [ x11 mesa ];
buildInputs = [ xlibsWrapper mesa ];
builder = ./builder.sh;
}

2
pkgs/tools/X11/vdpauinfo/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, xlibs, libvdpau }:
{ stdenv, fetchurl, pkgconfig, xorg, libvdpau }:
stdenv.mkDerivation rec {
name = "vdpauinfo-1.0";

16
pkgs/tools/X11/xbrightness/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, xlibs }:
{ stdenv, fetchurl, xorg }:
stdenv.mkDerivation {
@@ -9,13 +9,13 @@ stdenv.mkDerivation {
};
buildInputs = [
xlibs.imake
xlibs.libX11
xlibs.libXaw
xlibs.libXext
xlibs.libXmu
xlibs.libXpm
xlibs.libXxf86vm
xorg.imake
xorg.libX11
xorg.libXaw
xorg.libXext
xorg.libXmu
xorg.libXpm
xorg.libXxf86vm
];
configurePhase = "xmkmf";

4
pkgs/tools/X11/xinput_calibrator/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, libXi, inputproto, autoconf, automake, libtool, m4, x11, pkgconfig }:
{ stdenv, fetchurl, libXi, inputproto, autoconf, automake, libtool, m4, xlibsWrapper, pkgconfig }:
stdenv.mkDerivation rec {
version = "0.7.5";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
preConfigure = "./autogen.sh --with-gui=X11";
buildInputs = [ inputproto libXi autoconf automake libtool m4 x11 pkgconfig ];
buildInputs = [ inputproto libXi autoconf automake libtool m4 xlibsWrapper pkgconfig ];
meta = {
homepage = https://github.com/tias/xinput_calibrator;

4
pkgs/tools/X11/xrestop/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, xlibs, pkgconfig, ncurses }:
{ stdenv, fetchurl, xorg, pkgconfig, ncurses }:
stdenv.mkDerivation rec {
name = "xrestop-${version}";
@@ -9,5 +9,5 @@ stdenv.mkDerivation rec {
sha256 = "0mz27jpij8am1s32i63mdm58znfijcpfhdqq1npbmvgclyagrhk7";
};
buildInputs = [ pkgconfig xlibs.libX11 xlibs.libXres xlibs.libXext ncurses ];
buildInputs = [ pkgconfig xorg.libX11 xorg.libXres xorg.libXext ncurses ];
}

4
pkgs/tools/admin/tightvnc/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, x11, zlib, libjpeg, imake, gccmakedep, libXmu
{ stdenv, fetchurl, xlibsWrapper, zlib, libjpeg, imake, gccmakedep, libXmu
, libXaw, libXpm, libXp , perl, xauth, fontDirectories, openssh }:
stdenv.mkDerivation {
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
inherit xauth fontDirectories perl;
gcc = stdenv.cc.cc;
buildInputs = [ x11 zlib libjpeg imake gccmakedep libXmu libXaw
buildInputs = [ xlibsWrapper zlib libjpeg imake gccmakedep libXmu libXaw
libXpm libXp xauth openssh ];
patchPhase = ''

4
pkgs/tools/audio/pasystray/default.nix
View File

@@ -1,5 +1,5 @@
{stdenv, fetchFromGitHub, autoconf, automake, makeWrapper, pkgconfig
, gnome3, avahi, gtk3, libnotify, libpulseaudio, x11}:
, gnome3, avahi, gtk3, libnotify, libpulseaudio, xlibsWrapper}:
stdenv.mkDerivation rec {
name = "pasystray-0.5.2";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
buildInputs = [ autoconf automake makeWrapper pkgconfig
gnome3.defaultIconTheme
avahi gtk3 libnotify libpulseaudio x11 ];
avahi gtk3 libnotify libpulseaudio xlibsWrapper ];
preConfigure = ''
aclocal

4
pkgs/tools/filesystems/btrfsprogs/default.nix
View File

@@ -2,14 +2,14 @@
, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt
}:
let version = "4.2"; in
let version = "4.2.1"; in
stdenv.mkDerivation rec {
name = "btrfs-progs-${version}";
src = fetchurl {
url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";
sha256 = "1glglnglwz1rz6zy54xwdm601n5csbd1g73lx0rz8ay5jhz3q8r5";
sha256 = "1nzyyfj84q98n7lf798k6695pbsd02hg2ffd1kgn8g3qcbwqhwar";
};
buildInputs = [

6
pkgs/tools/filesystems/ceph/git.nix
View File

@@ -1,12 +1,12 @@
{ callPackage, fetchgit, ... } @ args:
callPackage ./generic.nix (args // rec {
version = "2015-09-11";
version = "2015-09-22";
src = fetchgit {
url = "git://github.com/ceph/ceph.git";
rev = "78de6fd61d5c0422f18c2f683b2cc489f3cbb4d3";
sha256 = "1kbrsr6vzvprcdq0hg7cgcmvqc61w3i1yzgrmjdmy3jcsmc979xi";
rev = "f1ead76f80cc3d078778080c35a6427256874062";
sha256 = "16c01b9v04slp80dlgw8n9a5ndjqxi6lv0pnklh1ykh4xb248gjh";
};
patches = [ ./fix-pythonpath.patch ];

119
pkgs/tools/filesystems/xtreemfs/default.nix
View File

@@ -1,80 +1,65 @@
x@{builderDefsPackage
, boost, fuse, openssl, cmake, attr, jdk, ant, which, python, file
, ...}:
builderDefsPackage
(a :
let
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
[];
{ stdenv, boost, fuse, openssl, cmake, attr, jdk, ant, which, file, python
, fetchurl, lib, valgrind, makeWrapper, fetchFromGitHub }:
buildInputs = map (n: builtins.getAttr n x)
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
sourceInfo = rec {
baseName="XtreemFS";
version="1.4";
name="${baseName}-${version}";
url="http://xtreemfs.googlecode.com/files/${name}.tar.gz";
hash="1hzd6anplxdcl4cg6xwriqk9b34541r7ah1ab2xavv149a2ll25s";
};
in
rec {
src = a.fetchurl {
url = sourceInfo.url;
sha256 = sourceInfo.hash;
stdenv.mkDerivation rec {
src = fetchFromGitHub {
# using unstable release because stable (v1.5.1) has broken repl java plugin
rev = "7ddcb081aa125b0cfb008dc98addd260b8353ab3";
owner = "xtreemfs";
repo = "xtreemfs";
sha256 = "1hjmd32pla27zf98ghzz6r5ml8ry86m9dsryv1z01kxv5l95b3m0";
};
inherit (sourceInfo) name version;
inherit buildInputs;
name = "XtreemFS-${version}";
version = "1.5.1.81";
/* doConfigure should be removed if not needed */
phaseNames = ["setVars" "fixMakefile" "doMakeInstall" "fixInterpreterBin"
"fixInterpreterEtc"
"usrIsOut"];
buildInputs = [ which attr makeWrapper python ];
setVars = a.noDepEntry ''
export JAVA_HOME="${jdk}"
export ANT_HOME="${ant}"
export CMAKE_HOME=${cmake}
preConfigure = ''
export JAVA_HOME=${jdk}
export ANT_HOME=${ant}
export BOOST_INCLUDEDIR=${boost.dev}/include
export BOOST_LIBRARYDIR=${boost.lib}/lib
export OPENSSL_ROOT_DIR=${openssl}
substituteInPlace cpp/cmake/FindValgrind.cmake \
--replace "/usr/local" "${valgrind}"
substituteInPlace cpp/CMakeLists.txt \
--replace '"/lib64" "/usr/lib64"' '"${attr}/lib" "${fuse}/lib"'
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${fuse}/include"
export NIX_CFLAGS_LINK="$NIX_CFLAGS_LINK -L${fuse}/lib"
export DESTDIR=$out
substituteInPlace Makefile \
--replace "/usr/share/" "/share/" \
--replace 'BIN_DIR=$(DESTDIR)/usr/bin' "BIN_DIR=$out/bin"
substituteInPlace etc/init.d/generate_initd_scripts.sh \
--replace "/bin/bash" "${stdenv.shell}"
# do not put cmake into buildInputs
export PATH="$PATH:${cmake}/bin"
'';
fixMakefile = a.fullDepEntry ''
sed -e 's@DESTDIR)/usr@DESTDIR)@g' -i Makefile
preBuild = ''
substituteInPlace configure \
--replace "/usr/bin/file" "${file}/bin/file"
'';
sed -e 's@/usr/bin/@@g' -i cpp/thirdparty/protobuf-*/configure
sed -e 's@/usr/bin/@@g' -i cpp/thirdparty/protobuf-*/gtest/configure
sed -e 's@/usr/bin/@@g' -i cpp/thirdparty/gtest-*/configure
'' ["doUnpack" "minInit"];
doCheck = false;
fixInterpreterBin = a.doPatchShebangs "$out/bin";
fixInterpreterEtc = a.doPatchShebangs "$out/etc/xos/xtreemfs";
postInstall = ''
rm -r $out/sbin
'';
usrIsOut = a.fullDepEntry ''
sed -e "s@/usr/@$out/@g" -i \
"$out"/{bin/xtfs_*,etc/xos/xtreemfs/*.*,etc/xos/xtreemfs/*/*,etc/init.d/*}
sed -e "s@JAVA_HOME=/usr@JAVA_HOME=${jdk}@g" -i \
"$out"/{bin/xtfs_*,etc/init.d/*}
'' ["minInit"];
makeFlags = [
''DESTDIR="$out"''
''SHELL="${a.stdenv.shell}"''
];
meta = {
description = "A distributed filesystem";
maintainers = with a.lib.maintainers;
[
raskin
];
platforms = with a.lib.platforms;
linux;
license = a.lib.licenses.bsd3;
broken = true;
maintainers = with lib.maintainers; [ raskin matejc ];
platforms = lib.platforms.linux;
license = lib.licenses.bsd3;
};
passthru = {
updateInfo = {
downloadPage = "http://xtreemfs.org/download_sources.php";
};
};
}) x
}

4
pkgs/tools/graphics/glmark2/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, libjpeg, libpng12, xlibs, libX11, mesa, libdrm, python27 }:
{ stdenv, fetchurl, pkgconfig, libjpeg, libpng12, xorg, libX11, mesa, libdrm, python27 }:
stdenv.mkDerivation rec {
name = "glmark2-${version}";
version = "2014.03";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
pkgconfig libjpeg libpng12 xlibs.libxcb libX11 mesa libdrm python27
pkgconfig libjpeg libpng12 xorg.libxcb libX11 mesa libdrm python27
];
buildPhase = ''

4
pkgs/tools/graphics/glxinfo/default.nix
View File

@@ -1,4 +1,4 @@
{stdenv, fetchurl, x11, mesa}:
{stdenv, fetchurl, xlibsWrapper, mesa}:
let version = "8.1.0"; in
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
sha256 = "0a58hw5850731p4smz4zqsbvyxvgjf7n5xdbs9l1wamk8q3gl0wp";
};
buildInputs = [x11 mesa];
buildInputs = [xlibsWrapper mesa];
configurePhase = "true";

6
pkgs/tools/graphics/graphviz/2.0.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, x11, libpng, libjpeg, expat, libXaw
{ stdenv, fetchurl, pkgconfig, xlibsWrapper, libpng, libjpeg, expat, libXaw
, yacc, libtool, fontconfig, pango, gd
}:
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "39b8e1f2ba4cc1f5bdc8e39c7be35e5f831253008e4ee2c176984f080416676c";
};
buildInputs = [pkgconfig x11 libpng libjpeg expat libXaw yacc libtool fontconfig pango gd];
buildInputs = [pkgconfig xlibsWrapper libpng libjpeg expat libXaw yacc libtool fontconfig pango gd];
configureFlags =
[ "--with-pngincludedir=${libpng}/include"
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
"--with-expatincludedir=${expat}/include"
"--with-expatlibdir=${expat}/lib"
]
++ stdenv.lib.optional (x11 == null) "--without-x";
++ stdenv.lib.optional (xlibsWrapper == null) "--without-x";
meta = {
description = "A program for visualising graphs";

6
pkgs/tools/graphics/graphviz/2.32.nix
View File

@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, libpng, libjpeg, expat, libXaw
, yacc, libtool, fontconfig, pango, gd, xlibs, gts, gettext, cairo
, yacc, libtool, fontconfig, pango, gd, xorg, gts, gettext, cairo
}:
stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
buildInputs =
[ pkgconfig libpng libjpeg expat libXaw yacc libtool fontconfig
pango gd gts
] ++ stdenv.lib.optionals (xlibs != null) [ xlibs.xlibs xlibs.libXrender ]
] ++ stdenv.lib.optionals (xorg != null) [ xorg.xlibsWrapper xorg.libXrender ]
++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") gettext;
CPPFLAGS = stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") "-I${cairo}/include/cairo";
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
"--with-cgraph=no"
"--with-sparse=no"
]
++ stdenv.lib.optional (xlibs == null) "--without-x";
++ stdenv.lib.optional (xorg == null) "--without-x";
preBuild = ''
sed -e 's@am__append_5 *=.*@am_append_5 =@' -i lib/gvc/Makefile

10
pkgs/tools/graphics/graphviz/default.nix
View File

@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, libpng, libjpeg, expat, libXaw
, yacc, libtool, fontconfig, pango, gd, xlibs, gts, libdevil, gettext, cairo
, yacc, libtool, fontconfig, pango, gd, xorg, gts, libdevil, gettext, cairo
, flex
}:
@@ -22,10 +22,10 @@ stdenv.mkDerivation rec {
buildInputs =
[ pkgconfig libpng libjpeg expat yacc libtool fontconfig gd gts libdevil flex
] ++ stdenv.lib.optionals (xlibs != null) [ xlibs.xlibs xlibs.libXrender pango libXaw ]
] ++ stdenv.lib.optionals (xorg != null) [ xorg.xlibsWrapper xorg.libXrender pango libXaw ]
++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") gettext;
CPPFLAGS = stdenv.lib.optionalString (xlibs != null && stdenv.system == "x86_64-darwin")
CPPFLAGS = stdenv.lib.optionalString (xorg != null && stdenv.system == "x86_64-darwin")
"-I${cairo}/include/cairo";
configureFlags =
@@ -36,14 +36,14 @@ stdenv.mkDerivation rec {
"--with-expatincludedir=${expat}/include"
"--with-expatlibdir=${expat}/lib"
]
++ stdenv.lib.optional (xlibs == null) "--without-x";
++ stdenv.lib.optional (xorg == null) "--without-x";
preBuild = ''
sed -e 's@am__append_5 *=.*@am_append_5 =@' -i lib/gvc/Makefile
'';
# "command -v" is POSIX, "which" is not
postInstall = stdenv.lib.optionalString (xlibs != null) ''
postInstall = stdenv.lib.optionalString (xorg != null) ''
sed -i 's|`which lefty`|"'$out'/bin/lefty"|' $out/bin/dotty
sed -i 's|which|command -v|' $out/bin/vimdot
'';

4
pkgs/tools/graphics/maim/default.nix
View File

@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "maim-${version}";
version = "3.3.41";
version = "3.4.46";
src = fetchurl {
url = "https://github.com/naelstrof/maim/archive/v${version}.tar.gz";
sha256 = "12p9zd4skxds26hicy6hrxkxnhbqv1c5ys1h6jchaypvwdggcgnc";
sha256 = "04gb858g0rrvdiva2dxwsfd7dmq62r67irnc8cpd0r02hr92dr6n";
};
buildInputs = [ cmake gengetopt imlib2 libXrandr libXfixes ]

4
pkgs/tools/graphics/scrot/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, giblib, x11 }:
{ stdenv, fetchurl, giblib, xlibsWrapper }:
stdenv.mkDerivation rec {
name = "scrot-0.8";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "1wll744rhb49lvr2zs6m93rdmiq59zm344jzqvijrdn24ksiqgb1";
};
buildInputs = [ giblib x11 ];
buildInputs = [ giblib xlibsWrapper ];
meta = {
homepage = http://linuxbrit.co.uk/scrot/;

4
pkgs/tools/inputmethods/touchegg/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, xlibs, xorgserver, qt4, mesa, geis }:
{ stdenv, fetchurl, xorg, xorgserver, qt4, mesa, geis }:
stdenv.mkDerivation rec {
name = "touchegg-${version}";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "95734815c7219d9a71282f3144b3526f2542b4fa270a8e69d644722d024b4038";
};
buildInputs = [ xorgserver mesa xlibs.libX11 xlibs.libXtst xlibs.libXext qt4 geis ];
buildInputs = [ xorgserver mesa xorg.libX11 xorg.libXtst xorg.libXext qt4 geis ];
configurePhase = ''
sed -e "s@/usr/@$out/@g" -i $(find . -name touchegg.pro)

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

@@ -1,4 +1,4 @@
{ stdenv, cmake, pkgconfig, SDL2, qt5, xlibs, fetchzip }:
{ stdenv, cmake, pkgconfig, SDL2, qt5, xorg, fetchzip }:
stdenv.mkDerivation rec {
name = "antimicro-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
cmake pkgconfig SDL2 qt5.base qt5.tools xlibs.libXtst
cmake pkgconfig SDL2 qt5.base qt5.tools xorg.libXtst
];
meta = with stdenv.lib; {

12
pkgs/tools/misc/ocz-ssd-guru/default.nix
View File

@@ -1,4 +1,4 @@
{ fetchurl, stdenv, xlibs, freetype, fontconfig, mesa, glibc, makeWrapper }:
{ fetchurl, stdenv, xorg, freetype, fontconfig, mesa, glibc, makeWrapper }:
let
system = if stdenv.system == "x86_64-linux" then "linux64" else "linux32";
@@ -15,13 +15,13 @@ stdenv.mkDerivation rec {
buildInputs = [ makeWrapper ];
libPath = stdenv.lib.makeLibraryPath [
xlibs.libX11
xlibs.libxcb
xorg.libX11
xorg.libxcb
freetype
fontconfig
xlibs.libXext
xlibs.libXi
xlibs.libXrender
xorg.libXext
xorg.libXi
xorg.libXrender
stdenv.cc.cc
glibc
mesa

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

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchgit, autoconf, automake, wineStaging, perl, xlibs
{ stdenv, fetchurl, fetchgit, autoconf, automake, wineStaging, perl, xorg
, gnupg, gcc_multi, mesa, curl, bash, cacert, cabextract, utillinux, attr
}:
@@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
sha256 = "1i440rf22fmd2w86dlm1mpi3nb7410rfczc0yldnhgsvp5p3sm5f";
};
buildInputs = [ wine_custom xlibs.libX11 gcc_multi mesa curl ];
buildInputs = [ wine_custom xorg.libX11 gcc_multi mesa curl ];
propagatedbuildInputs = [ curl cabextract ];
patches = [ ./pipelight.patch ];

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

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "slop-${version}";
version = "4.1.15";
version = "4.1.16";
src = fetchurl {
url = "https://github.com/naelstrof/slop/archive/v${version}.tar.gz";
sha256 = "e20fd47de898abcb537c8100faed859eef4955d7784dbc52470570dae403f02e";
sha256 = "0679ax0jr97x91hmp9qrspdka8cvl3xa77z92k4qgicbnb6hr7y2";
};
buildInputs = [ cmake gengetopt libX11 libXext ]

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

@@ -1,4 +1,4 @@
{stdenv, fetchurl, x11}:
{stdenv, fetchurl, xlibsWrapper}:
stdenv.mkDerivation {
name = "unclutter-8";
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
sha256 = "33a78949a7dedf2e8669ae7b5b2c72067896497820292c96afaa60bb71d1f2a6";
};
buildInputs = [x11];
buildInputs = [xlibsWrapper];
installPhase = ''
mkdir -pv "$out/bin"

28
pkgs/tools/misc/urjtag/default.nix
View File

@@ -1,31 +1,33 @@
{ stdenv, autoconf, automake, pkgconfig, gettext, intltool, libtool, bison
, flex, fetchgit, makeWrapper
, flex, which, subversion, fetchsvn, makeWrapper, libftdi, libusb, readline
, python3
, svfSupport ? false
, bsdlSupport ? false
, staplSupport ? false
, jedecSupport ? false
, pythonBindings ? false
, python3 ? null
}:
stdenv.mkDerivation rec {
version = "0.10";
name = "urjtag-${version}";
src = fetchgit {
url = "git://git.code.sf.net/p/urjtag/git";
rev = "7ba12da7845af7601e014a2a107670edc5d6997d";
sha256 = "834401d851728c48f1c055d24dc83b6173c701bf352d3a964ec7ff1aff3abf6a";
src = fetchsvn {
url = "svn://svn.code.sf.net/p/urjtag/svn/trunk/urjtag";
rev = "2051";
sha256 = "0pyl0y27136nr8mmjdml7zjnfnpbjmgqzkjk99j3hvj38k10wq7f";
};
buildInputs = [ gettext pkgconfig autoconf automake libtool makeWrapper ]
++ stdenv.lib.optional pythonBindings python3;
buildInputs = [ gettext pkgconfig autoconf automake libtool bison flex which
subversion makeWrapper readline libftdi libusb python3 ];
configureFlags = ''
--prefix=/
${if svfSupport then "--enable-svf" else "--disable-svf"}
${if bsdlSupport then "--enable-bsdl" else "--disable-bsdl"}
${if staplSupport then "--enable-stapl" else "--disable-stapl"}
${if jedecSupport then "--enable-jedec-exp" else "--disable-jedec-exp"}
${if pythonBindings then "--enable-python" else "--disable-python"}
'';
preConfigure = "cd urjtag; ./autogen.sh";
makeFlags = [ "DESTDIR=$(out)" ];
preConfigure = "./autogen.sh";
meta = {
description = "Enhanced, modern tool for communicating over JTAG with flash chips, CPUs,and many more";

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

@@ -1,4 +1,4 @@
{ stdenv, fetchsvn, x11, libXmu, autoconf, automake, libtool }:
{ stdenv, fetchsvn, xlibsWrapper, libXmu, autoconf, automake, libtool }:
stdenv.mkDerivation rec {
# The last release from 2012, 0.12, lacks '-targets'
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
preConfigure = "autoreconf -vfi";
buildInputs = [ x11 libXmu autoconf automake libtool ];
buildInputs = [ xlibsWrapper libXmu autoconf automake libtool ];
meta = {
description = "Tool to access the X clipboard from a console application";

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

@@ -1,4 +1,4 @@
{stdenv, fetchurl, x11}:
{stdenv, fetchurl, xlibsWrapper}:
stdenv.mkDerivation {
name = "xsel-1.2.0";
@@ -7,5 +7,5 @@ stdenv.mkDerivation {
sha256 = "070lbcpw77j143jrbkh0y1v10ppn1jwmjf92800w7x42vh4cw9xr";
};
buildInputs = [x11];
buildInputs = [xlibsWrapper];
}

7
pkgs/tools/misc/yubikey-personalization/default.nix
View File

@@ -2,14 +2,15 @@
stdenv.mkDerivation rec {
name = "yubikey-personalization-${version}";
version = "1.17.1";
version = "1.17.2";
src = fetchurl {
url = "https://developers.yubico.com/yubikey-personalization/Releases/ykpers-${version}.tar.gz";
sha256 = "1i399z23skvyfdr3fp7a340qi3ynfcwdqr1y540swjy9pg1awssm";
sha256 = "1z6ybpdhl74phwzg2lhxhipqf7xnfhg52dykkzb3fbx21m0i4jkh";
};
buildInputs = [ pkgconfig libusb libyubikey json_c ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libusb libyubikey json_c ];
configureFlags = [
"--with-backend=libusb-1.0"

6
pkgs/tools/networking/miniupnpc/default.nix
View File

@@ -1,11 +1,12 @@
{ stdenv, fetchurl }:
let version = "1.9.20150430"; in
stdenv.mkDerivation rec {
name = "miniupnpc-1.9.20150917";
name = "miniupnpc-${version}";
src = fetchurl {
url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz";
sha256 = "1nhiixfmlagcv9srni19r95n1v069rlq98fn8x4xpsf154lw71rh";
sha256 = "0ivnvzla0l2pzmy8s0j8ss0fnpsii7z9scvyl4a13g9k911hgmvn";
name = "${name}.tar.gz";
};
@@ -14,6 +15,7 @@ stdenv.mkDerivation rec {
installFlags = "PREFIX=$(out) INSTALLPREFIX=$(out)";
meta = {
inherit version;
homepage = http://miniupnp.free.fr/;
description = "A client that implements the UPnP Internet Gateway Device (IGD) specification";
platforms = stdenv.lib.platforms.linux;

4
pkgs/tools/networking/x11-ssh-askpass/default.nix
View File

@@ -1,4 +1,4 @@
{stdenv, fetchurl, x11, imake}:
{stdenv, fetchurl, xlibsWrapper, imake}:
stdenv.mkDerivation {
name = "x11-ssh-askpass-1.2.4.1";
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
buildPhase = "xmkmf; make includes; make";
buildInputs = [x11 imake];
buildInputs = [xlibsWrapper imake];
meta = {
homepage = "http://www.jmknoble.net/software/x11-ssh-askpass/";

2
pkgs/tools/package-management/nix/default.nix
View File

@@ -43,8 +43,6 @@ let
doInstallCheck = false;
separateDebugInfo = true;
crossAttrs = {
postUnpack =
'' export CPATH="${bzip2.crossDrv}/include"

12
pkgs/tools/security/oath-toolkit/default.nix
View File

@@ -1,5 +1,10 @@
{ stdenv, fetchurl, pam }:
{ stdenv, fetchurl, pam, xmlsec }:
let
securityDependency =
if stdenv.isDarwin then xmlsec
else pam;
in
stdenv.mkDerivation rec {
name = "oath-toolkit-2.4.1";
@@ -8,11 +13,12 @@ stdenv.mkDerivation rec {
sha256 = "094vbq66sn5f2dsy14hajpsfdnaivjxf70xzs91nrsq0q75l5ylv";
};
buildInputs = [ pam ];
buildInputs = [ securityDependency ];
meta = {
homepage = http://www.nongnu.org/oath-toolkit/;
description = "Components for building one-time password authentication systems";
platforms = stdenv.lib.platforms.linux;
platforms = with stdenv.lib.platforms; linux ++ darwin;
};
}

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

@@ -1,34 +1,46 @@
{ stdenv, fetchurl, iptables, python, pythonPackages }:
{ stdenv, fetchFromGitHub, makeWrapper, pandoc
, coreutils, iptables, nettools, openssh, procps, python }:
let version = "0.71"; in
stdenv.mkDerivation rec {
name = "sshuttle-${version}";
version = "0.61";
src = fetchurl {
url = "https://github.com/apenwarr/sshuttle/archive/sshuttle-0.61.tar.gz";
sha256 = "1v2v1kbwnmx6ygzhbgqcmyafx914s2p7vjp7l0pf52sa7qkliy9b";
src = fetchFromGitHub {
sha256 = "0yr8nih97jg6azfj3k7064lfbh3g36l6vwyjlngl4ph6mgcki1cm";
rev = name;
repo = "sshuttle";
owner = "sshuttle";
};
preBuild = ''
substituteInPlace Documentation/all.do --replace "/bin/ls" "$(type -tP ls)";
substituteInPlace Documentation/md2man.py --replace "/usr/bin/env python" "${python}/bin/python"
'';
nativeBuildInputs = [ makeWrapper pandoc ];
buildInputs = [ coreutils iptables nettools openssh procps python ];
phases = "unpackPhase installPhase";
preConfigure = ''
cd src
'';
installPhase = ''
mkdir -p $out/share/sshuttle
cp -R sshuttle *.py compat $out/share/sshuttle
mkdir -p $out/bin
cp -R . $out
ln -s $out/sshuttle $out/bin/sshuttle
ln -s $out/share/sshuttle/sshuttle $out/bin
wrapProgram $out/bin/sshuttle --prefix PATH : \
"${stdenv.lib.concatStringsSep ":" (map (x: "${x}/bin") buildInputs)}"
install -Dm644 sshuttle.8 $out/share/man/man8/sshuttle.8
'';
buildInputs = [ iptables python pythonPackages.markdown pythonPackages.beautifulsoup ];
meta = with stdenv.lib; {
homepage = https://github.com/apenwarr/sshuttle;
inherit version;
inherit (src.meta) homepage;
description = "Transparent proxy server that works as a poor man's VPN";
maintainers = with maintainers; [ iElectric ];
longDescription = ''
Forward connections over SSH, without requiring administrator access to the
target network (though it does require Python 2 at both ends).
Works with Linux and Mac OS and supports DNS tunneling.
'';
maintainers = with maintainers; [ iElectric nckx ];
platforms = platforms.unix;
};
}

6
pkgs/tools/security/tor/torbrowser.nix
View File

@@ -1,5 +1,5 @@
{ stdenv, fetchurl, buildEnv
, xlibs, alsaLib, dbus, dbus_glib, glib, gtk, atk, pango, freetype, fontconfig
, xorg, alsaLib, dbus, dbus_glib, glib, gtk, atk, pango, freetype, fontconfig
, gdk_pixbuf, cairo, zlib}:
let
bits = if stdenv.system == "x86_64-linux" then "64"
@@ -10,8 +10,8 @@ let
name = "tor-env";
paths = [
stdenv.cc.cc zlib glib alsaLib dbus dbus_glib gtk atk pango freetype
fontconfig gdk_pixbuf cairo xlibs.libXrender xlibs.libX11 xlibs.libXext
xlibs.libXt
fontconfig gdk_pixbuf cairo xorg.libXrender xorg.libX11 xorg.libXext
xorg.libXt
];
};

29
pkgs/tools/system/iops/default.nix Normal file
View File

@@ -0,0 +1,29 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "iops-${version}";
version = "0.1";
src = fetchurl {
url = "http://www.vanheusden.com/iops/${name}.tgz";
sha256 = "1knih6dwwiicycp5ml09bj3k8j7air9bng070sfnxwfv786y90bz";
};
installPhase = ''
mkdir -p $out/bin
cp iops $out/bin
'';
meta = with stdenv.lib; {
description = "Measure I/O operations per second of a storage device";
longDescription = ''
Iops lets you measure how many I/O operations per second a storage device can perform.
Usefull for determing e.g. the best RAID-setting of your storage device.
'';
homepage = http://www.vanheusden.com/iops/;
license = licenses.gpl2;
maintainers = with maintainers; davidak;
platforms = with platforms; unix;
};
}

4
pkgs/tools/system/stress-ng/default.nix
View File

@@ -1,13 +1,13 @@
{ stdenv, fetchurl, attr, keyutils }:
let
version = "0.04.19";
version = "0.04.20";
name = "stress-ng-${version}";
in stdenv.mkDerivation {
inherit name;
src = fetchurl {
sha256 = "12qgrr0wd3ppaawn5br0i7q26iy88pxfwg9wiqxf4cav89591syc";
sha256 = "0zzlnqmld804h08iabhcrj3ggm5wiry9g2jrdr33cqp44lrw402v";
url = "http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${name}.tar.gz";
};

33
pkgs/tools/typesetting/tex/dblatex/default.nix
View File

@@ -1,5 +1,14 @@
{ stdenv, fetchurl, python, libxslt, tetex
, enableAllFeatures ? false, imagemagick ? null, transfig ? null, inkscape ? null, fontconfig ? null, ghostscript ? null }:
{ stdenv, fetchurl, python, libxslt, texlive
, enableAllFeatures ? false, imagemagick ? null, transfig ? null, inkscape ? null, fontconfig ? null, ghostscript ? null
, tex ? texlive.combine { # satisfy all packages that ./configure mentions
inherit (texlive) scheme-basic epstopdf anysize appendix changebar
fancybox fancyvrb float footmisc listings jknapltx/*for mathrsfs.sty*/
multirow overpic pdfpages rotating stmaryrd subfigure titlesec wasysym
# pkgs below don't seem requested by dblatex, but our manual fails without them
ec zapfding symbol eepic times rsfs cs tex4ht courier helvetic ly1;
}
}:
# NOTE: enableAllFeatures just purifies the expression, it doesn't actually
# enable any extra features.
@@ -12,14 +21,14 @@ assert enableAllFeatures ->
ghostscript != null;
stdenv.mkDerivation rec {
name = "dblatex-0.3.4";
name = "dblatex-0.3.7";
src = fetchurl {
url = "mirror://sourceforge/dblatex/${name}.tar.bz2";
sha256 = "120w3wm07qx0k1grgdhjwm2vpwil71icshjvqznskp1f6ggch290";
sha256 = "0bkjgrn03dy5c7438s429wnv6z5ynxkr4pbhp2z49kynskgkzkjr";
};
buildInputs = [ python libxslt tetex ]
buildInputs = [ python libxslt tex ]
++ stdenv.lib.optionals enableAllFeatures [ imagemagick transfig ];
# TODO: dblatex tries to execute texindy command, but nixpkgs doesn't have
@@ -31,11 +40,11 @@ stdenv.mkDerivation rec {
sed -e 's|cmd = \["xsltproc|cmd = \["${libxslt}/bin/xsltproc|g' \
-e 's|Popen(\["xsltproc|Popen(\["${libxslt}/bin/xsltproc|g' \
-e 's|cmd = \["texindy|cmd = ["nixpkgs_is_missing_texindy|g' \
-e 's|cmd = "epstopdf|cmd = "${tetex}/bin/epstopdf|g' \
-e 's|cmd = \["makeindex|cmd = ["${tetex}/bin/makeindex|g' \
-e 's|doc.program = "pdflatex"|doc.program = "${tetex}/bin/pdflatex"|g' \
-e 's|self.program = "latex"|self.program = "${tetex}/bin/latex"|g' \
-e 's|Popen("pdflatex|Popen("${tetex}/bin/pdflatex|g' \
-e 's|cmd = "epstopdf|cmd = "${tex}/bin/epstopdf|g' \
-e 's|cmd = \["makeindex|cmd = ["${tex}/bin/makeindex|g' \
-e 's|doc.program = "pdflatex"|doc.program = "${tex}/bin/pdflatex"|g' \
-e 's|self.program = "latex"|self.program = "${tex}/bin/latex"|g' \
-e 's|Popen("pdflatex|Popen("${tex}/bin/pdflatex|g' \
-e 's|"fc-match"|"${fontconfig}/bin/fc-match"|g' \
-e 's|"fc-list"|"${fontconfig}/bin/fc-list"|g' \
-e 's|cmd = "inkscape|cmd = "${inkscape}/bin/inkscape|g' \
@@ -47,11 +56,13 @@ stdenv.mkDerivation rec {
'';
buildPhase = "true";
installPhase = ''
python ./setup.py install --prefix="$out" --use-python-path --verbose
'';
passthru = { inherit tex; };
meta = {
description = "A program to convert DocBook to DVI, PostScript or PDF via LaTeX or ConTeXt";
homepage = http://dblatex.sourceforge.net/;

2
pkgs/tools/typesetting/tex/tetex/default.nix
View File

@@ -48,7 +48,7 @@ stdenv.mkDerivation {
homepage = http://www.tug.org/tetex/;
matintainers = with maintainers; [ lovek323 ];
platforms = platforms.unix;
hydraPlatforms = platforms.linux;
hydraPlatforms = [];
};
}