diff options
Diffstat (limited to 'pkgs/tools')
23 files changed, 360 insertions, 139 deletions
diff --git a/pkgs/tools/filesystems/netatalk/default.nix b/pkgs/tools/filesystems/netatalk/default.nix new file mode 100644 index 00000000000..21a93774758 --- /dev/null +++ b/pkgs/tools/filesystems/netatalk/default.nix @@ -0,0 +1,27 @@ +{ fetchurl, stdenv, pkgconfig, db48, libgcrypt, avahi, libiconv, pam, openssl }: + +stdenv.mkDerivation rec { + name = "netatalk-3.0.5"; + + src = fetchurl { + url = "mirror://sourceforge/netatalk/netatalk/${name}.tar.bz2"; + sha256 = "1adlcj509czxsx60r1s96qlznspp5nz7dxc5fws11danidr4fhl8"; + }; + + buildInputs = [ pkgconfig db48 libgcrypt avahi libiconv pam openssl ]; + + configureFlags = [ + "--with-bdb=${db48}" + "--with-openssl=${openssl}" + ]; + + enableParallelBuild = true; + + meta = { + description = "Apple File Protocl Server"; + homepage = http://netatalk.sourceforge.net/; + license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ jcumming ]; + }; +} diff --git a/pkgs/tools/graphics/ditaa/default.nix b/pkgs/tools/graphics/ditaa/default.nix new file mode 100644 index 00000000000..86ff9ec8fae --- /dev/null +++ b/pkgs/tools/graphics/ditaa/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, unzip, jre }: + +stdenv.mkDerivation rec { + name = "ditaa-0.9"; + + src = fetchurl { + name = "${name}.zip"; + url = "mirror://sourceforge/project/ditaa/ditaa/0.9/ditaa0_9.zip"; + sha256 = "12g6k3hacvyw3s9pijli7vfnkspyp37qkr29qgbmq1hbp0ryk2fn"; + }; + + buildInputs = [ unzip ]; + + phases = [ "installPhase" ]; + + installPhase = '' + unzip "$src" + + mkdir -p "$out/bin" + mkdir -p "$out/lib" + mkdir -p "$out/share/ditaa" + + cp dita*.jar "$out/lib/ditaa.jar" + cp COPYING HISTORY "$out/share/ditaa" + + cat > "$out/bin/ditaa" << EOF + #!${stdenv.shell} + exec ${jre}/bin/java -jar "$out/lib/ditaa.jar" "\$@" + EOF + + chmod a+x "$out/bin/ditaa" + ''; + + meta = with stdenv.lib; { + description = "Convert ascii art diagrams into proper bitmap graphics"; + homepage = http://ditaa.sourceforge.net/; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index 5dee1079ae2..23d57f5b652 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -32,8 +32,6 @@ stdenv.mkDerivation rec { configureFlags = if libX11 != null then ["--with-x"] else ["--without-x"]; - NIX_CFLAGS_COMPILE = "-I${cairo}/include/cairo"; - postInstall = stdenv.lib.optionalString (libX11 != null) '' wrapProgram $out/bin/gnuplot \ --prefix PATH : '${gnused}/bin' \ diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix new file mode 100644 index 00000000000..e6787ec76c8 --- /dev/null +++ b/pkgs/tools/misc/colord/default.nix @@ -0,0 +1,57 @@ +{ stdenv, fetchurl, fetchgit +, glib, polkit, pkgconfig, intltool, gusb, libusb1, lcms2, sqlite, systemd, dbus + +, automake, autoconf, libtool, gtk_doc, which, gobjectIntrospection +, version ? "git" +}: + +# colord wants to write to the etc/colord.conf and var/run/colord/mapping.db +# thus they get symlinked to /etc and /var + +stdenv.mkDerivation (stdenv.lib.mergeAttrsByVersion "colord" version { + "0.1.33" = { + name = "colord-0.1.33"; + src = fetchurl { + url = http://www.freedesktop.org/software/colord/releases/colord-0.1.32.tar.xz; + sha256 = "1smbkh4z1c2jjwxg626f12sslv7ff3yzak1zqrc493cl467ll0y7"; + }; + }; + "git" = { + name = "colord-git-11dca"; + src = fetchgit { + url = "https://github.com/hughsie/colord.git"; + rev = "11dcaba034edff3955ceff53795df82c57c34adc"; + sha256 = "1280q7zbfm5wqql872kcxmk5rmwjs7cv7cgz8nx0i9g4ac8j2mrf"; + }; + + preConfigure = '' + ./autogen.sh + ''; + buildInputs = [ automake autoconf libtool gtk_doc which gobjectIntrospection ]; + }; +} { + + enableParallelBuilding = true; + + preConfigure = '' + configureFlags="$configureFlags --with-udevrulesdir=$out/lib/udev/rules.d --with-systemdsystemunitdir=$out/lib/udev/rules.d" + ''; + + buildInputs = [glib polkit pkgconfig intltool gusb libusb1 lcms2 sqlite systemd dbus]; + + postInstall = '' + sed -i '/usb_id\|usb-db/d' $out/lib/udev/rules.d/69-cd-sensors.rules + mv $out/etc/colord.conf{,.default} + ln -s /etc/colord.conf $out/etc/colord.conf + rm -fr $out/var/lib/colord + ln -s /var/lib/colord $out/var/lib/colord + ''; + + meta = { + description = "system service that makes it easy to manage, install and generate color profiles to accurately color manage input and output devices"; + homepage = http://www.freedesktop.org/software/colord/intro.html; + license = stdenv.lib.licenses.lgpl2Plus; + maintainers = [stdenv.lib.maintainers.marcweber]; + platforms = stdenv.lib.platforms.linux; + }; +}) diff --git a/pkgs/tools/misc/coreutils/8.19.nix b/pkgs/tools/misc/coreutils/8.19.nix deleted file mode 100644 index 23db167f307..00000000000 --- a/pkgs/tools/misc/coreutils/8.19.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ stdenv, fetchurl, perl, gmp ? null -, aclSupport ? false, acl ? null -, selinuxSupport? false, libselinux ? null, libsepol ? null -}: - -assert aclSupport -> acl != null; -assert selinuxSupport -> libselinux != null && libsepol != null; - -stdenv.mkDerivation rec { - name = "coreutils-8.19"; - - src = fetchurl { - url = "mirror://gnu/coreutils/${name}.tar.xz"; - sha256 = "1rx9x3fp848w4nny7irdkcpkan9fcx24d99v5dkwgkyq7wc76f5d"; - }; - - nativeBuildInputs = [ perl ]; - buildInputs = [ gmp ] - ++ stdenv.lib.optional aclSupport acl - ++ stdenv.lib.optional selinuxSupport libselinux - ++ stdenv.lib.optional selinuxSupport libsepol; - - crossAttrs = ({ - buildInputs = [ gmp ] - ++ stdenv.lib.optional aclSupport acl.crossDrv - ++ stdenv.lib.optional selinuxSupport libselinux.crossDrv - ++ stdenv.lib.optional selinuxSupport libsepol.crossDrv - ++ stdenv.lib.optional (stdenv.gccCross.libc ? libiconv) - stdenv.gccCross.libc.libiconv.crossDrv; - - # Needed for fstatfs() - # I don't know why it is not properly detected cross building with glibc. - configureFlags = [ "fu_cv_sys_stat_statfs2_bsize=yes" ]; - doCheck = false; - } - - // - - # XXX: Temporary workaround to allow GNU/Hurd builds with newer libcs. - (stdenv.lib.optionalAttrs (stdenv.cross.config == "i586-pc-gnu") { - patches = [ ./gets-undeclared.patch ]; - })); - - # The tests are known broken on Cygwin - # (http://thread.gmane.org/gmane.comp.gnu.core-utils.bugs/19025), - # Darwin (http://thread.gmane.org/gmane.comp.gnu.core-utils.bugs/19351), - # and {Open,Free}BSD. - doCheck = stdenv ? glibc; - - enableParallelBuilding = true; - - NIX_LDFLAGS = stdenv.lib.optionalString selinuxSupport "-lsepol"; - - meta = { - homepage = http://www.gnu.org/software/coreutils/; - description = "The basic file, shell and text manipulation utilities of the GNU operating system"; - - longDescription = '' - The GNU Core Utilities are the basic file, shell and text - manipulation utilities of the GNU operating system. These are - the core utilities which are expected to exist on every - operating system. - ''; - - license = "GPLv3+"; - - maintainers = [ ]; - }; -} - diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index da3e8d09a23..65a3bec555e 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -6,8 +6,11 @@ assert aclSupport -> acl != null; assert selinuxSupport -> libselinux != null && libsepol != null; + +with { inherit (stdenv.lib) optional optionals optionalString optionalAttrs; }; + let - self = stdenv.mkDerivation rec { + self = stdenv.mkDerivation (rec { name = "coreutils-8.21"; src = fetchurl { @@ -17,16 +20,14 @@ let nativeBuildInputs = [ perl ]; buildInputs = [ gmp ] - ++ stdenv.lib.optional aclSupport acl - ++ stdenv.lib.optional selinuxSupport libselinux - ++ stdenv.lib.optional selinuxSupport libsepol; + ++ optional aclSupport acl + ++ optionals selinuxSupport [ libselinux libsepol ]; crossAttrs = { buildInputs = [ gmp ] - ++ stdenv.lib.optional aclSupport acl.crossDrv - ++ stdenv.lib.optional selinuxSupport libselinux.crossDrv - ++ stdenv.lib.optional selinuxSupport libsepol.crossDrv - ++ stdenv.lib.optional (stdenv.gccCross.libc ? libiconv) + ++ optional aclSupport acl.crossDrv + ++ optionals selinuxSupport [ libselinux.crossDrv libsepol.crossDrv ] + ++ optional (stdenv.gccCross.libc ? libiconv) stdenv.gccCross.libc.libiconv.crossDrv; buildPhase = '' @@ -57,7 +58,7 @@ let enableParallelBuilding = true; - NIX_LDFLAGS = stdenv.lib.optionalString selinuxSupport "-lsepol"; + NIX_LDFLAGS = optionalString selinuxSupport "-lsepol"; meta = { homepage = http://www.gnu.org/software/coreutils/; @@ -74,6 +75,8 @@ let maintainers = [ ]; }; - }; + } // optionalAttrs stdenv.isDarwin { + makeFlags = "CFLAGS=-D_FORTIFY_SOURCE=0"; + }); in self diff --git a/pkgs/tools/misc/expect/default.nix b/pkgs/tools/misc/expect/default.nix index d9f9b09271b..2b1108846d7 100644 --- a/pkgs/tools/misc/expect/default.nix +++ b/pkgs/tools/misc/expect/default.nix @@ -1,14 +1,16 @@ -{stdenv, fetchurl, tcl, tk, xproto, libX11}: +{ stdenv, fetchurl, tcl }: +let version = "5.45"; +in stdenv.mkDerivation { - name = "expect-5.44.1"; + name = "expect-${version}"; src = fetchurl { - url = http://expect.nist.gov/old/expect-5.44.1.tar.gz; - sha256 = "13zxqiclzk1paxc0mr2vwp9nhfyr2mkwk9gs73fg0l3iss16n6p4"; + url = "mirror://sourceforge/expect/Expect/${version}/expect${version}.tar.gz"; + sha256 = "0h60bifxj876afz4im35rmnbnxjx4lbdqp2ja3k30fwa8a8cm3dj"; }; - buildInputs = [tcl tk xproto libX11]; + buildInputs = [ tcl ]; #NIX_CFLAGS_COMPILE = "-DHAVE_UNISTD_H"; @@ -21,16 +23,21 @@ stdenv.mkDerivation { substituteInPlace configure --replace /bin/stty "$(type -tP stty)" sed -e '1i\#include <tclInt.h>' -i exp_inter.c export NIX_LDFLAGS="-rpath $out/lib $NIX_LDFLAGS" + '' + stdenv.lib.optionalString stdenv.isFreeBSD '' + ln -s libexpect.so.1 libexpect545.so ''; - configureFlags = ["--with-tcl=${tcl}/lib" + configureFlags = [ + "--with-tcl=${tcl}/lib" "--with-tclinclude=${tcl}/include" - "--with-tk=${tk}/lib" - "--exec-prefix=$out"]; + "--exec-prefix=$out" + ]; + + postInstall = let libSuff = if stdenv.isDarwin then "dylib" else "so"; + in "cp expect $out/bin; mkdir -p $out/lib; cp *.${libSuff} $out/lib"; meta = { description = "A tool for automating interactive applications"; homepage = http://expect.nist.gov/; }; - postInstall="cp expect{,k} $out/bin; mkdir -p $out/lib; cp *.so $out/lib"; } diff --git a/pkgs/tools/misc/megacli/default.nix b/pkgs/tools/misc/megacli/default.nix new file mode 100644 index 00000000000..2b15d4470c3 --- /dev/null +++ b/pkgs/tools/misc/megacli/default.nix @@ -0,0 +1,35 @@ +{ stdenv, rpm, cpio, ncurses, patchelf, makeWrapper, requireFile, unzip }: + +assert stdenv.system == "x86_64-linux"; + +stdenv.mkDerivation rec { + name = "megacli-8.07.07"; + + src = + requireFile { + name = "8.07.07_MegaCLI.zip"; + url = http://www.lsi.com/downloads/Public/MegaRAID%20Common%20Files/8.07.07_MegaCLI.zip; + sha256 = "11jzvh25mlygflazd37gi05xv67im4rgq7sbs5nwgw3gxdh4xfjj"; + }; + + buildInputs = [rpm cpio ncurses unzip makeWrapper]; + libPath = + stdenv.lib.makeLibraryPath + [ stdenv.gcc.gcc stdenv.gcc.libc ncurses ]; + + buildCommand = '' + ensureDir $out/bin + cd $out + unzip ${src} + rpm2cpio linux/MegaCli-8.07.07-1.noarch.rpm | cpio -idmv + ${patchelf}/bin/patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" --set-rpath ${libPath}:$out/opt/lsi/3rdpartylibs/x86_64:$out/opt/lsi/3rdpartylibs:${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib opt/MegaRAID/MegaCli/MegaCli64 + wrapProgram $out/opt/MegaRAID/MegaCli/MegaCli64 --set LD_LIBRARY_PATH $out/opt/lsi/3rdpartylibs/x86_64 + ln -s $out/opt/MegaRAID/MegaCli/MegaCli64 $out/bin/MegaCli64 + eval fixupPhase + ''; + + meta = { + description = "CLI program for LSI MegaRAID cards, which also works with some Dell PERC RAID cards"; + license = "unfree"; + }; +} diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix index c5636c6e6ee..653bec89747 100644 --- a/pkgs/tools/networking/nbd/default.nix +++ b/pkgs/tools/networking/nbd/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, glib }: let - name = "nbd-3.3"; + name = "nbd-3.4"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "mirror://sourceforge/nbd/${name}.tar.bz2"; - sha256 = "068cm0lkw67g7vj95kqxwb9z15c0jbsfbmjjl5zfx7mbvhc5f443"; + sha256 = "1krj185fagnqsqpcfig7zkqa3cqgyyn956241ix224wssvynsajm"; }; buildInputs = [ pkgconfig glib ] ++ stdenv.lib.optional (stdenv ? glibc) stdenv.glibc.kernelHeaders; diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix index 69c7b77e3f9..81bf7c908ef 100644 --- a/pkgs/tools/networking/network-manager-applet/default.nix +++ b/pkgs/tools/networking/network-manager-applet/default.nix @@ -27,6 +27,8 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ GConf gnome_keyring hicolor_icon_theme ]; + configureFlags = [ "--disable-introspection" ]; # not needed anywhere AFAIK + makeFlags = [ ''CFLAGS=-DMOBILE_BROADBAND_PROVIDER_INFO=\"${mobile_broadband_provider_info}/share/mobile-broadband-provider-info/serviceproviders.xml\"'' ]; diff --git a/pkgs/tools/networking/tinc/default.nix b/pkgs/tools/networking/tinc/default.nix index dd6bfb82aab..c2b25e863f2 100644 --- a/pkgs/tools/networking/tinc/default.nix +++ b/pkgs/tools/networking/tinc/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, lzo, openssl, zlib}: stdenv.mkDerivation rec { - version = "1.0.21"; + version = "1.0.22"; name = "tinc-${version}"; src = fetchurl { url = "http://www.tinc-vpn.org/packages/tinc-${version}.tar.gz"; - sha256 = "12v1x9p4f8y9967ypwxhkr10q6pk4cdallr0k4lic0kcfsmmxhba"; + sha256 = "0b2w5jic0zs8smfq2a9w99ql7lspb7jph3psmqaflw0hq4gdsfa7"; }; buildInputs = [ lzo openssl zlib ]; diff --git a/pkgs/tools/package-management/cabal-install/1.18.0.nix b/pkgs/tools/package-management/cabal-install/1.18.0.1.nix index 8b093bc925c..ceb54effdd9 100644 --- a/pkgs/tools/package-management/cabal-install/1.18.0.nix +++ b/pkgs/tools/package-management/cabal-install/1.18.0.1.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "cabal-install"; - version = "1.18.0"; - sha256 = "14c4i8cy2rnvjj2krv3swna53k2674xhpzqkmcr56lxnyzych5wh"; + version = "1.18.0.1"; + sha256 = "0b44w4iqzaq5119zjkpagd3a2279kz6xq5pk5rqnlnfn8a8ihdbb"; isLibrary = false; isExecutable = true; buildDepends = [ diff --git a/pkgs/tools/package-management/nix-repl/default.nix b/pkgs/tools/package-management/nix-repl/default.nix new file mode 100644 index 00000000000..648abe882c4 --- /dev/null +++ b/pkgs/tools/package-management/nix-repl/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchgit, nix, readline, boehmgc }: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "nix-repl-${getVersion nix}-${substring 0 7 src.rev}"; + + src = fetchgit { + url = https://github.com/edolstra/nix-repl.git; + rev = "81d658fe4afda234028cd4551e12491db4303957"; + sha256 = "067mj8as99n0hkrr2qss3y3hnr8c5zy4n8bqx3z900n3j43cwzyc"; + }; + + buildInputs = [ nix readline boehmgc ]; + + buildPhase = "true"; + + # FIXME: unfortunate cut&paste. + installPhase = + '' + mkdir -p $out/bin + g++ -O3 -Wall -std=c++0x \ + -o $out/bin/nix-repl nix-repl.cc \ + -I${nix}/include/nix -L${nix}/lib/nix \ + -lformat -lutil -lstore -lexpr -lmain -lreadline -lgc + ''; + + meta = { + homepage = https://github.com/edolstra/nix-repl; + description = "An interactive environment for evaluating and building Nix expressions"; + maintainers = [ maintainers.eelco ]; + license = licenses.gpl3; + platforms = nix.meta.platforms; + }; +} diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index b6f8d5000a1..7b4bb3c6193 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "nix-1.5.3"; + name = "nix-1.6"; src = fetchurl { url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; - sha256 = "070e82a155851900768eb4a638aa50a6df9a8475c6dbc78a3b4a7dea75d64201"; + sha256 = "2e451a6ad0b43997d8df71d29a7d20ef42f7715fe16efbf4b53bdcdd1d5227fe"; }; nativeBuildInputs = [ perl pkgconfig ]; @@ -69,5 +69,7 @@ stdenv.mkDerivation rec { description = "The Nix Deployment System"; homepage = http://nixos.org/; license = "LGPLv2+"; + maintainers = [ stdenv.lib.maintainers.eelco ]; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index f61f5e2b95a..ba0353e4507 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "nix-1.6pre3215_2c1ecf8"; + name = "nix-1.6pre3220_fecad91"; src = fetchurl { - url = "http://hydra.nixos.org/build/5940181/download/5/${name}.tar.xz"; - sha256 = "404fe856ae534b09e9a81d69751127e0987fea6bf2d0ec01acac3a9ea4ce72ae"; + url = "http://hydra.nixos.org/build/6038922/download/5/${name}.tar.xz"; + sha256 = "0251b8cb7ad2a4974a9c8002c65f1c6e1b334be082d3dd2f085929594637f947"; }; nativeBuildInputs = [ perl pkgconfig ]; @@ -69,5 +69,7 @@ stdenv.mkDerivation rec { description = "The Nix Deployment System"; homepage = http://nixos.org/; license = "LGPLv2+"; + maintainers = [ stdenv.lib.maintainers.eelco ]; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/tools/package-management/nixops/default.nix b/pkgs/tools/package-management/nixops/default.nix index 7f2b533383e..3381e3644fe 100644 --- a/pkgs/tools/package-management/nixops/default.nix +++ b/pkgs/tools/package-management/nixops/default.nix @@ -1,12 +1,12 @@ -{ lib, pythonPackages, fetchurl, libxslt, docbook5_xsl }: +{ lib, pythonPackages, fetchurl, libxslt, docbook5_xsl, openssh }: pythonPackages.buildPythonPackage rec { - name = "nixops-1.0.1"; + name = "nixops-1.1"; namePrefix = ""; src = fetchurl { url = "http://nixos.org/releases/nixops/${name}/${name}.tar.bz2"; - sha256 = "c6dda2597ba0ab2f60c984d4715163c02940f20803619668d6c16eba8570a394"; + sha256 = "1i0v4v83s663izw6al63avhs0378rp3nxchy8nkb1zam5rj097z2"; }; buildInputs = [ libxslt ]; @@ -15,6 +15,7 @@ pythonPackages.buildPythonPackage rec { [ pythonPackages.prettytable pythonPackages.boto pythonPackages.sqlite3 + pythonPackages.hetzner ]; doCheck = false; @@ -29,6 +30,10 @@ pythonPackages.buildPythonPackage rec { mkdir -p $out/share/nix/nixops cp -av nix/* $out/share/nix/nixops + + # Add openssh to nixops' PATH. On some platforms, e.g. CentOS and RHEL + # the version of openssh is causing errors when have big networks (40+) + wrapProgram $out/bin/nixops --prefix PATH : "${openssh}/bin" ''; meta = { diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix index 5ac05907080..dd869714e05 100644 --- a/pkgs/tools/security/fail2ban/default.nix +++ b/pkgs/tools/security/fail2ban/default.nix @@ -7,47 +7,46 @@ pythonPackages.buildPythonPackage { namePrefix = ""; src = fetchurl { - url = "https://github.com/fail2ban/fail2ban/zipball/${version}"; - name = "fail2ban-${version}.zip"; - sha256 = "1linfz5qxmm4225lzi9vawsa79y41d3rcdahvrzlyqlhb02ipd55"; + url = "https://github.com/fail2ban/fail2ban/zipball/${version}"; + name = "fail2ban-${version}.zip"; + sha256 = "0lbanfshr8kasa1bb7861w3mrm2d0c1bvv4s5703265s8zp5m284"; }; buildInputs = [ unzip ]; pythonPath = [ gamin ]; - preConfigure = - '' - substituteInPlace setup.cfg \ - --replace /usr $out - - substituteInPlace setup.py \ - --replace /etc $out/etc \ - --replace /var $TMPDIR/var \ - - for i in fail2ban-client fail2ban-regex fail2ban-server; do - substituteInPlace $i \ - --replace /usr/share/fail2ban $out/share/fail2ban - done - - for i in config/action.d/sendmail*.conf; do - substituteInPlace $i \ - --replace /usr/sbin/sendmail sendmail \ - --replace /usr/bin/whois whois - done - ''; + preConfigure = '' + substituteInPlace setup.cfg \ + --replace /usr $out + + substituteInPlace setup.py \ + --replace /etc $out/etc \ + --replace /var $TMPDIR/var \ + + for i in fail2ban-client fail2ban-regex fail2ban-server; do + substituteInPlace $i \ + --replace /usr/share/fail2ban $out/share/fail2ban + done + + for i in config/action.d/sendmail*.conf; do + substituteInPlace $i \ + --replace /usr/sbin/sendmail sendmail \ + --replace /usr/bin/whois whois + done + ''; doCheck = false; - installCommand = - '' - python setup.py install --prefix=$out - ''; + installCommand = '' + python setup.py install --prefix=$out + ''; - meta = { - homepage = http://www.fail2ban.org/; + meta = with stdenv.lib; { + homepage = http://www.fail2ban.org/; description = "A program that scans log files for repeated failing login attempts and bans IP addresses"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.eelco ]; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ eelco lovek323 ]; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/security/mkpasswd/default.nix b/pkgs/tools/security/mkpasswd/default.nix index f131fcef4ce..b27707a0015 100644 --- a/pkgs/tools/security/mkpasswd/default.nix +++ b/pkgs/tools/security/mkpasswd/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "mkpasswd-${version}"; - version = "5.0.25"; + version = "5.0.26"; src = fetchurl { url = "http://ftp.debian.org/debian/pool/main/w/whois/whois_${version}.tar.xz"; - sha256 = "0qb859vwd6g93cb5zbf19gpw2g2b9s1qlq4nqia1a966pjkvw1qj"; + sha256 = "729625ef81425f4771e06492bb4f3e9f24bff75b8176044ce8d2f605f7ad6af5"; }; preConfigure = '' diff --git a/pkgs/tools/security/tcpcrypt/0001-Run-tcpcryptd-under-uid-93-instead-of-666.patch b/pkgs/tools/security/tcpcrypt/0001-Run-tcpcryptd-under-uid-93-instead-of-666.patch new file mode 100644 index 00000000000..addf00796a8 --- /dev/null +++ b/pkgs/tools/security/tcpcrypt/0001-Run-tcpcryptd-under-uid-93-instead-of-666.patch @@ -0,0 +1,25 @@ +From 4ef50d76a2da61be60fea448690e24f35bc37299 Mon Sep 17 00:00:00 2001 +From: Peter Simons <simons@cryp.to> +Date: Wed, 11 Sep 2013 17:19:29 +0200 +Subject: [PATCH] Run tcpcryptd under uid 93 instead of 666. + +--- + user/src/linux.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/user/src/linux.c b/user/src/linux.c +index b51e6b2..8199193 100644 +--- a/user/src/linux.c ++++ b/user/src/linux.c +@@ -198,7 +198,7 @@ void linux_drop_privs(void) + + cap_free(caps); + +- if (setuid(666) == -1) ++ if (setuid(93) == -1) + err(1, "setuid()"); + + caps = cap_init(); +-- +1.8.3.4 + diff --git a/pkgs/tools/security/tcpcrypt/default.nix b/pkgs/tools/security/tcpcrypt/default.nix new file mode 100644 index 00000000000..17c6993826d --- /dev/null +++ b/pkgs/tools/security/tcpcrypt/default.nix @@ -0,0 +1,32 @@ +{ fetchurl, stdenv, autoconf, automake, libtool +, openssl, libcap, libnfnetlink, libnetfilter_queue +}: + +let + rev = "0e07772316061ad67b8770e7d98d5dd099c9c7c7"; +in +stdenv.mkDerivation rec { + name = "tcpcrypt-2011.07.22"; + + src = fetchurl { + url = "https://github.com/sorbo/tcpcrypt/archive/${rev}.tar.gz"; + sha256 = "1f1f1iawlvipnccwh31fxnb8yam1fgh36m0qcbc29qk1ggwrfnkk"; + name = "${name}.tar.gz"; + }; + + dontStrip = true; + + buildInputs = [ autoconf automake libtool openssl libcap libnfnetlink libnetfilter_queue ]; + + patches = [ ./0001-Run-tcpcryptd-under-uid-93-instead-of-666.patch ]; + + preConfigure = "cd user; autoreconf -i"; + + meta = { + homepage = "http://tcpcrypt.org/"; + description = "enable opportunistic encryption of all TCP traffic"; + + maintainers = [ stdenv.lib.maintainers.simons ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix index 7da45c596ef..37283fc18a4 100644 --- a/pkgs/tools/system/collectd/default.nix +++ b/pkgs/tools/system/collectd/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0gljf5c60q6i0nrii6addxy1p76qqixww8zy17a7a1zil6a3i5wh"; }; + NIX_LDFLAGS = "-lgcc_s"; # for pthread_cancel + meta = { homepage = http://collectd.org; description = "collectd is a daemon which collects system performance statistics periodically"; diff --git a/pkgs/tools/text/poedit/default.nix b/pkgs/tools/text/poedit/default.nix new file mode 100644 index 00000000000..10822f1809f --- /dev/null +++ b/pkgs/tools/text/poedit/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, wxGTK29, boost }: + +stdenv.mkDerivation rec { + name = "poedit-1.5.7"; + + src = fetchurl { + url = "http://prdownloads.sourceforge.net/poedit/${name}.tar.gz"; + sha256 = "0y0gbkb1jvp61qhh8sh7ar8849mwirizc42pk57zpxy84an5qlr4"; + }; + + buildInputs = [ wxGTK29 boost ]; + + meta = with stdenv.lib; { + description = "Cross-platform gettext catalogs (.po files) editor"; + homepage = http://www.poedit.net/; + license = licenses.mit; + platforms = with platforms; unix; + maintainers = with maintainers; [ iElectric ]; + }; +} diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index 540ab07c286..f119dbd1e4a 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -37,7 +37,6 @@ rec { sed -e s@ncurses/curses.h@curses.h@g -i $(grep ncurses/curses.h -rl . ) sed -e '1i\#include <string.h>\n\#include <stdlib.h>' -i $( find libs/teckit -name '*.cpp' -o -name '*.c' ) - NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${freetype}/include/freetype2" NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${icu}/include/layout"; ./Build --prefix="$out" --datadir="$out/share" --mandir "$out/share/man" --infodir "$out/share/info" \ |