diff options
Diffstat (limited to 'pkgs/tools')
37 files changed, 440 insertions, 157 deletions
diff --git a/pkgs/tools/X11/arandr/default.nix b/pkgs/tools/X11/arandr/default.nix index 556de1bd8e82..a6af7b996512 100644 --- a/pkgs/tools/X11/arandr/default.nix +++ b/pkgs/tools/X11/arandr/default.nix @@ -8,15 +8,14 @@ pythonPackages.buildPythonPackage rec { sha256 = "0d574mbmhaqmh7kivaryj2hpghz6xkvic9ah43s1hf385y7c33kd"; }; - buildPhase = '' + patchPhase = '' rm -rf data/po/* - python setup.py build ''; # no tests doCheck = false; - buildInputs = [pythonPackages.docutils]; + buildInputs = [ pythonPackages.docutils ]; propagatedBuildInputs = [ xrandr pythonPackages.pygtk ]; meta = { diff --git a/pkgs/tools/backup/attic/default.nix b/pkgs/tools/backup/attic/default.nix index e04281936870..0e2462c5ec85 100644 --- a/pkgs/tools/backup/attic/default.nix +++ b/pkgs/tools/backup/attic/default.nix @@ -16,6 +16,7 @@ python3Packages.buildPythonPackage rec { preConfigure = '' export ATTIC_OPENSSL_PREFIX="${openssl}" + substituteInPlace setup.py --replace "version=versioneer.get_version()" "version='${version}'" ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/compression/lz4/default.nix b/pkgs/tools/compression/lz4/default.nix index 0ce7e0e33436..e91fae778fdb 100644 --- a/pkgs/tools/compression/lz4/default.nix +++ b/pkgs/tools/compression/lz4/default.nix @@ -15,12 +15,13 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; doCheck = false; # tests take a very long time checkTarget = "test"; meta = with stdenv.lib; { + inherit version; description = "Extremely fast compression algorithm"; longDescription = '' Very fast lossless compression algorithm, providing compression speed diff --git a/pkgs/tools/filesystems/boxfs/default.nix b/pkgs/tools/filesystems/boxfs/default.nix index 30bb8d009a06..3c8c1b6e1809 100644 --- a/pkgs/tools/filesystems/boxfs/default.nix +++ b/pkgs/tools/filesystems/boxfs/default.nix @@ -26,18 +26,18 @@ in stdenv.mkDerivation { name = "boxfs-${version}"; src = srcs.boxfs2; + prePatch = with srcs; '' substituteInPlace Makefile --replace "git pull" "true" cp -a --no-preserve=mode ${libapp} libapp cp -a --no-preserve=mode ${libjson} libjson ''; - patches = [ ./work-around-API-borkage.patch ]; buildInputs = [ curl fuse libxml2 ]; nativeBuildInputs = [ pkgconfig ]; - buildFlags = "static"; + buildFlags = [ "static" ]; installPhase = '' mkdir -p $out/bin @@ -45,6 +45,7 @@ in stdenv.mkDerivation { ''; meta = with stdenv.lib; { + inherit version; description = "FUSE file system for box.com accounts"; longDescription = '' Store files on box.com (an account is required). The first time you run diff --git a/pkgs/tools/filesystems/smbnetfs/default.nix b/pkgs/tools/filesystems/smbnetfs/default.nix index 9936ac0b39ad..3bc13d43a362 100644 --- a/pkgs/tools/filesystems/smbnetfs/default.nix +++ b/pkgs/tools/filesystems/smbnetfs/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A FUSE FS for mounting Samba shares"; maintainers = with maintainers; [ raskin ]; - platforms = with platforms; linux; + platforms = platforms.linux; license = licenses.gpl2; downloadPage = "http://sourceforge.net/projects/smbnetfs/files/smbnetfs"; updateWalker = true; diff --git a/pkgs/tools/filesystems/udftools/default.nix b/pkgs/tools/filesystems/udftools/default.nix index 88153f7cb39c..329950f8969b 100644 --- a/pkgs/tools/filesystems/udftools/default.nix +++ b/pkgs/tools/filesystems/udftools/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "UDF tools"; maintainers = with maintainers; [ raskin ]; - platforms = with platforms; linux; + platforms = platforms.linux; license = licenses.gpl2Plus; }; } diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/tools/graphics/zbar/default.nix index 2f4e3f633747..48e3316a4a24 100644 --- a/pkgs/tools/graphics/zbar/default.nix +++ b/pkgs/tools/graphics/zbar/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { Code. ''; maintainers = with maintainers; [ raskin ]; - platforms = with platforms; linux; + platforms = platforms.linux; license = licenses.lgpl21; homepage = http://zbar.sourceforge.net/; }; diff --git a/pkgs/tools/inputmethods/fcitx/default.nix b/pkgs/tools/inputmethods/fcitx/default.nix index a8b3089c58ac..8cdcabf3693a 100644 --- a/pkgs/tools/inputmethods/fcitx/default.nix +++ b/pkgs/tools/inputmethods/fcitx/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, pkgconfig, cmake, intltool, gettext , libxml2, enchant, isocodes, icu, libpthreadstubs , pango, cairo, libxkbfile, libXau, libXdmcp -, dbus, gtk2, gtk3, qt4 +, dbus, gtk2, gtk3, qt4, kde5 }: stdenv.mkDerivation rec { name = "fcitx-${version}"; - version = "4.2.8.5"; + version = "4.2.9"; src = fetchurl { url = "http://download.fcitx-im.org/fcitx/${name}_dict.tar.xz"; - sha256 = "0whv7mnzig4l5v518r200psa1fp3dyl1jkr5z0q13ijzh1bnyggy"; + sha256 = "0v7wdf3qf74vz8q090w8k574wvfcpj9ksfcfdw93nmzyk1q5p4rs"; }; patchPhase = '' @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = with stdenv.lib; [ cmake enchant pango gettext libxml2 isocodes pkgconfig libxkbfile intltool cairo icu libpthreadstubs libXau libXdmcp - dbus gtk2 gtk3 qt4 + dbus gtk2 gtk3 qt4 kde5.extra-cmake-modules ]; cmakeFlags = '' @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { description = "A Flexible Input Method Framework"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [iyzsong]; + maintainers = with stdenv.lib.maintainers; [iyzsong ericsagnes]; }; } diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix b/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix new file mode 100644 index 000000000000..fad7862cf3b9 --- /dev/null +++ b/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, cmake, fcitx, extra-cmake-modules, qtbase }: + +stdenv.mkDerivation rec { + name = "fcitx-qt5-${version}"; + version = "1.0.4"; + + src = fetchurl { + url = "http://download.fcitx-im.org/fcitx-qt5/${name}.tar.xz"; + sha256 = "070dlmwkim7sg0xwxfcbb46li1jk8yd3rmj0j5fkmgyr12044aml"; + }; + + buildInputs = [ cmake fcitx extra-cmake-modules qtbase ]; + + preInstall = '' + substituteInPlace platforminputcontext/cmake_install.cmake \ + --replace ${qtbase} $out + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/fcitx/fcitx-qt5"; + description = "Qt5 IM Module for Fcitx"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ ericsagnes ]; + }; + +} diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix index 4cefc8a412f8..be5eb0e66214 100644 --- a/pkgs/tools/misc/gparted/default.nix +++ b/pkgs/tools/misc/gparted/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/gparted/${name}.tar.bz2"; }; - configureFlags = "--disable-doc"; + configureFlags = [ "--disable-doc" ]; buildInputs = [ parted gtk glib libuuid gtkmm libxml2 hicolor_icon_theme ]; nativeBuildInputs = [ intltool gettext makeWrapper pkgconfig ]; diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index 48d86f9a5fe1..ca347cfe8425 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -8,13 +8,14 @@ stdenv.mkDerivation rec { sha256 = "0phn9dlkqlq3cq468ypxbbn78bsjcin743pyvf8ip4qg6jz662jm"; }; - nativeBuildInputs = [ makeWrapper perl ]; + nativeBuildInputs = [ makeWrapper ]; preFixup = '' - patchShebangs $out/bin + sed -i 's,#![ ]*/usr/bin/env[ ]*perl,#!${perl}/bin/perl,' $out/bin/* wrapProgram $out/bin/parallel \ - ${if stdenv.isLinux then ("--prefix PATH \":\" ${procps}/bin") else ""} + ${if stdenv.isLinux then ("--prefix PATH \":\" ${procps}/bin") else ""} \ + --prefix PATH : "${perl}/bin" \ ''; doCheck = true; diff --git a/pkgs/tools/networking/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix index 3acf921cd794..dca92c565af9 100644 --- a/pkgs/tools/networking/chrony/default.nix +++ b/pkgs/tools/networking/chrony/default.nix @@ -1,21 +1,21 @@ -{ stdenv, fetchurl, libcap, readline, texinfo }: +{ stdenv, fetchurl, pkgconfig, libcap, readline, texinfo, nss, nspr }: assert stdenv.isLinux -> libcap != null; stdenv.mkDerivation rec { name = "chrony-${version}"; - version = "2.1.1"; - + version = "2.2"; + src = fetchurl { url = "http://download.tuxfamily.org/chrony/${name}.tar.gz"; - sha256 = "b0565148eaa38e971291281d76556c32f0138ec22e9784f8bceab9c65f7ad7d4"; + sha256 = "1194maargy4hpl2a3vy5mbrrswzajjdn92p4w17gbb9vlq7q5zfk"; }; - - buildInputs = [ readline texinfo ] ++ stdenv.lib.optional stdenv.isLinux libcap; + + buildInputs = [ readline texinfo nss nspr ] ++ stdenv.lib.optional stdenv.isLinux libcap; + nativeBuildInputs = [ pkgconfig ]; configureFlags = [ - "--sysconfdir=$(out)/etc" "--chronyvardir=$(out)/var/lib/chrony" ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { repository.git = git://git.tuxfamily.org/gitroot/chrony/chrony.git; license = licenses.gpl2; platforms = with platforms; linux ++ freebsd ++ openbsd; - maintainers = [ maintainers.rickynils ]; + maintainers = with maintainers; [ rickynils fpletz ]; longDescription = '' Chronyd is a daemon which runs in background on the system. It obtains measurements via the network of the system clockâs offset relative to time servers on other systems and adjusts the system time accordingly. For isolated systems, the user can periodically enter the correct time by hand (using Chronyc). In either case, Chronyd determines the rate at which the computer gains or loses time, and compensates for this. Chronyd implements the NTP protocol and can act as either a client or a server. diff --git a/pkgs/tools/networking/dropbear/default.nix b/pkgs/tools/networking/dropbear/default.nix index 98ea4c82304b..6b4c1f556437 100644 --- a/pkgs/tools/networking/dropbear/default.nix +++ b/pkgs/tools/networking/dropbear/default.nix @@ -2,11 +2,11 @@ sftpPath ? "/var/run/current-system/sw/libexec/sftp-server" }: stdenv.mkDerivation rec { - name = "dropbear-2015.68"; + name = "dropbear-2015.70"; src = fetchurl { url = "http://matt.ucc.asn.au/dropbear/releases/${name}.tar.bz2"; - sha256 = "0ii4lq19b3k06fn25zc5sbbk698s56ldrbg1vcf4pzjgj0g7rsjm"; + sha256 = "0mzj1gwamxmk8rab4xmcvldcxdvs5zczim2hdza3dwfhy4ywra32"; }; dontDisableStatic = enableStatic; diff --git a/pkgs/tools/networking/gmvault/default.nix b/pkgs/tools/networking/gmvault/default.nix index e78dfa5b2cae..aa52e4f3ae24 100644 --- a/pkgs/tools/networking/gmvault/default.nix +++ b/pkgs/tools/networking/gmvault/default.nix @@ -12,19 +12,15 @@ buildPythonPackage rec { doCheck = false; - propagatedBuildInputs = [ - pythonPackages.gdata - pythonPackages.IMAPClient - pythonPackages.Logbook - pythonPackages.argparse - ]; + propagatedBuildInputs = with pythonPackages; [ gdata IMAPClient Logbook + argparse ]; startScript = ./gmvault.py; patchPhase = '' cat ${startScript} > etc/scripts/gmvault chmod +x etc/scripts/gmvault - substituteInPlace setup.py --replace "Logbook==0.4.1" "Logbook==0.4.2" + substituteInPlace setup.py --replace "==" ">=" ''; meta = { diff --git a/pkgs/tools/networking/minissdpd/default.nix b/pkgs/tools/networking/minissdpd/default.nix index 82e26ad85c9d..f99a3de90468 100644 --- a/pkgs/tools/networking/minissdpd/default.nix +++ b/pkgs/tools/networking/minissdpd/default.nix @@ -14,7 +14,7 @@ in stdenv.mkDerivation { buildInputs = [ libnfnetlink ]; - installFlags = "PREFIX=$(out) INSTALLPREFIX=$(out)"; + installFlags = [ "PREFIX=$(out)" "INSTALLPREFIX=$(out)" ]; enableParallelBuilding = true; diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix index 07bd9fd8c1a2..3c1d41a133ba 100644 --- a/pkgs/tools/networking/netsniff-ng/default.nix +++ b/pkgs/tools/networking/netsniff-ng/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; # All files installed to /etc are just static data that can go in the store - makeFlags = "PREFIX=$(out) ETCDIR=$(out)/etc"; + makeFlags = [ "PREFIX=$(out)" "ETCDIR=$(out)/etc" ]; postInstall = '' ln -sv ${geolite-legacy}/share/GeoIP/GeoIP.dat $out/etc/netsniff-ng/country4.dat diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix index e7176ba90b3b..e780865ab3b5 100644 --- a/pkgs/tools/networking/openvpn/default.nix +++ b/pkgs/tools/networking/openvpn/default.nix @@ -3,11 +3,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "openvpn-2.3.7"; + name = "openvpn-2.3.8"; src = fetchurl { url = "http://swupdate.openvpn.net/community/releases/${name}.tar.gz"; - sha256 = "0vhl0ddpxqfibc0ah0ci7ix9bs0cn5shhmhijg550qpbdb6s80hz"; + sha256 = "0lbw22qv3m0axhs13razr6b4x1p7jcpvf9rzb15b850wyvpka92k"; }; patches = optional stdenv.isLinux ./systemd-notify.patch; @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { --enable-systemd --enable-iproute2 IPROUTE=${iproute}/sbin/ip + '' + optionalString stdenv.isDarwin '' + --disable-plugin-auth-pam ''; postInstall = '' diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix index e82b7b8050ef..836f3e1e60ca 100644 --- a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix +++ b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix @@ -1,17 +1,14 @@ { fetchurl, lib, unzip, buildPythonPackage, twisted, foolscap, nevow -, simplejson, zfec, pycryptopp, sqlite3, darcsver, setuptoolsTrial -, setuptoolsDarcs, numpy, nettools, pycrypto, pyasn1, mock }: +, simplejson, zfec, pycryptopp, sqlite3, darcsver, setuptoolsTrial, python +, setuptoolsDarcs, numpy, nettools, pycrypto, pyasn1, mock, zope_interface }: # FAILURES: The "running build_ext" phase fails to compile Twisted # plugins, because it tries to write them into Twisted's (immutable) # store path. The problem appears to be non-fatal, but there's probably # some loss of functionality because of it. -let +buildPythonPackage rec { name = "tahoe-lafs-1.10.0"; -in -buildPythonPackage { - inherit name; namePrefix = ""; src = fetchurl { @@ -19,7 +16,7 @@ buildPythonPackage { sha256 = "1qng7j1vykk8zl5da9yklkljvgxfnjky58gcay6dypz91xq1cmcw"; }; - configurePhase = '' + patchPhase = '' sed -i "src/allmydata/util/iputil.py" \ -es"|_linux_path = '/sbin/ifconfig'|_linux_path = '${nettools}/bin/ifconfig'|g" @@ -29,45 +26,43 @@ buildPythonPackage { do sed -i "$i" -e"s/localhost/127.0.0.1/g" done + + sed -i 's/"zope.interface.*"/"zope.interface"/' src/allmydata/_auto_deps.py + sed -i 's/"pycrypto.*"/"pycrypto"/' src/allmydata/_auto_deps.py ''; - buildInputs = [ unzip ] - ++ [ numpy ]; # Some tests want this + http://tahoe-lafs.org/source/tahoe-lafs/deps/tahoe-dep-sdists/mock-0.6.0.tar.bz2 + # Some tests want this + http://tahoe-lafs.org/source/tahoe-lafs/deps/tahoe-dep-sdists/mock-0.6.0.tar.bz2 + buildInputs = [ unzip numpy mock ]; # The `backup' command requires `sqlite3'. propagatedBuildInputs = [ twisted foolscap nevow simplejson zfec pycryptopp sqlite3 - darcsver setuptoolsTrial setuptoolsDarcs pycrypto pyasn1 mock + darcsver setuptoolsTrial setuptoolsDarcs pycrypto pyasn1 zope_interface ]; - # The test suite is run in `postInstall'. - doCheck = false; - postInstall = '' # Install the documentation. mkdir -p "$out/share/doc/${name}" cp -rv "docs/"* "$out/share/doc/${name}" find "$out/share/doc/${name}" -name Makefile -exec rm -v {} \; + ''; - # Run the tests once everything is installed. - export PYTHON_EGG_CACHE="$TMPDIR" - python setup.py build - python setup.py trial + checkPhase = '' + # TODO: broken with wheels + #${python.interpreter} setup.py trial ''; meta = { description = "Tahoe-LAFS, a decentralized, fault-tolerant, distributed storage system"; - longDescription = '' Tahoe-LAFS is a secure, decentralized, fault-tolerant filesystem. This filesystem is encrypted and spread over multiple peers in such a way that it remains available even when some of the peers are unavailable, malfunctioning, or malicious. ''; - homepage = http://allmydata.org/; license = [ lib.licenses.gpl2Plus /* or */ "TGPPLv1+" ]; - maintainers = [ lib.maintainers.simons ]; + maintainers = [ lib.maintainers.simons ]; platforms = lib.platforms.gnu; # arbitrary choice }; } diff --git a/pkgs/tools/networking/philter/default.nix b/pkgs/tools/networking/philter/default.nix index 3d5ed7b34cae..f8f37e05a72e 100644 --- a/pkgs/tools/networking/philter/default.nix +++ b/pkgs/tools/networking/philter/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Mail sorter for Maildirs"; maintainers = with maintainers; [ raskin ]; - platforms = with platforms; linux; + platforms = platforms.linux; }; passthru = { diff --git a/pkgs/tools/networking/ripmime/default.nix b/pkgs/tools/networking/ripmime/default.nix index a0a0efa85baf..2a72a530cab9 100644 --- a/pkgs/tools/networking/ripmime/default.nix +++ b/pkgs/tools/networking/ripmime/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { description = "Attachment extractor for MIME messages"; maintainers = with maintainers; [ raskin ]; homepage = http://www.pldaniels.com/ripmime/; - platforms = with platforms; linux; + platforms = platforms.linux; }; passthru = { diff --git a/pkgs/tools/networking/statsd/default.nix b/pkgs/tools/networking/statsd/default.nix new file mode 100644 index 000000000000..1143d55269f3 --- /dev/null +++ b/pkgs/tools/networking/statsd/default.nix @@ -0,0 +1,13 @@ +{ recurseIntoAttrs, callPackage, nodejs +}: + +let + self = recurseIntoAttrs ( + callPackage <nixpkgs/pkgs/top-level/node-packages.nix> { + inherit nodejs self; + generated = callPackage ./node-packages.nix { inherit self; }; + overrides = { + "statsd" = { passthru.nodePackages = self; }; + }; + }); +in self.statsd diff --git a/pkgs/tools/networking/statsd/node-packages.json b/pkgs/tools/networking/statsd/node-packages.json new file mode 100644 index 000000000000..f75224e79f92 --- /dev/null +++ b/pkgs/tools/networking/statsd/node-packages.json @@ -0,0 +1,6 @@ +[ + "statsd" +, "statsd-librato-backend" +, "stackdriver-statsd-backend" +, "statsd-influxdb-backend" +] diff --git a/pkgs/tools/networking/statsd/node-packages.nix b/pkgs/tools/networking/statsd/node-packages.nix new file mode 100644 index 000000000000..6cf9e8478d78 --- /dev/null +++ b/pkgs/tools/networking/statsd/node-packages.nix @@ -0,0 +1,244 @@ +{ self, fetchurl, fetchgit ? null, lib }: + +{ + by-spec."commander"."1.3.1" = + self.by-version."commander"."1.3.1"; + by-version."commander"."1.3.1" = self.buildNodePackage { + name = "commander-1.3.1"; + version = "1.3.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/commander/-/commander-1.3.1.tgz"; + name = "commander-1.3.1.tgz"; + sha1 = "02443e02db96f4b32b674225451abb6e9510000e"; + }; + deps = { + "keypress-0.1.0" = self.by-version."keypress"."0.1.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."connection-parse"."0.0.x" = + self.by-version."connection-parse"."0.0.7"; + by-version."connection-parse"."0.0.7" = self.buildNodePackage { + name = "connection-parse-0.0.7"; + version = "0.0.7"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/connection-parse/-/connection-parse-0.0.7.tgz"; + name = "connection-parse-0.0.7.tgz"; + sha1 = "18e7318aab06a699267372b10c5226d25a1c9a69"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."hashring"."1.0.1" = + self.by-version."hashring"."1.0.1"; + by-version."hashring"."1.0.1" = self.buildNodePackage { + name = "hashring-1.0.1"; + version = "1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/hashring/-/hashring-1.0.1.tgz"; + name = "hashring-1.0.1.tgz"; + sha1 = "b6a7b8c675a0c715ac0d0071786eb241a28d0a7c"; + }; + deps = { + "connection-parse-0.0.7" = self.by-version."connection-parse"."0.0.7"; + "simple-lru-cache-0.0.2" = self.by-version."simple-lru-cache"."0.0.2"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."keypress"."0.1.x" = + self.by-version."keypress"."0.1.0"; + by-version."keypress"."0.1.0" = self.buildNodePackage { + name = "keypress-0.1.0"; + version = "0.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/keypress/-/keypress-0.1.0.tgz"; + name = "keypress-0.1.0.tgz"; + sha1 = "4a3188d4291b66b4f65edb99f806aa9ae293592a"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."node-syslog"."1.1.7" = + self.by-version."node-syslog"."1.1.7"; + by-version."node-syslog"."1.1.7" = self.buildNodePackage { + name = "node-syslog-1.1.7"; + version = "1.1.7"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/node-syslog/-/node-syslog-1.1.7.tgz"; + name = "node-syslog-1.1.7.tgz"; + sha1 = "f2b1dfce095c39f5a6d056659862ca134a08a4cb"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."sequence"."2.2.1" = + self.by-version."sequence"."2.2.1"; + by-version."sequence"."2.2.1" = self.buildNodePackage { + name = "sequence-2.2.1"; + version = "2.2.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/sequence/-/sequence-2.2.1.tgz"; + name = "sequence-2.2.1.tgz"; + sha1 = "7f5617895d44351c0a047e764467690490a16b03"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."simple-lru-cache"."0.0.x" = + self.by-version."simple-lru-cache"."0.0.2"; + by-version."simple-lru-cache"."0.0.2" = self.buildNodePackage { + name = "simple-lru-cache-0.0.2"; + version = "0.0.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/simple-lru-cache/-/simple-lru-cache-0.0.2.tgz"; + name = "simple-lru-cache-0.0.2.tgz"; + sha1 = "d59cc3a193c1a5d0320f84ee732f6e4713e511dd"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."stackdriver-statsd-backend"."*" = + self.by-version."stackdriver-statsd-backend"."0.2.3"; + by-version."stackdriver-statsd-backend"."0.2.3" = self.buildNodePackage { + name = "stackdriver-statsd-backend-0.2.3"; + version = "0.2.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/stackdriver-statsd-backend/-/stackdriver-statsd-backend-0.2.3.tgz"; + name = "stackdriver-statsd-backend-0.2.3.tgz"; + sha1 = "6ffead71e5655d4d787c39da8d1c9eaaa59c91d7"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "stackdriver-statsd-backend" = self.by-version."stackdriver-statsd-backend"."0.2.3"; + by-spec."statsd"."*" = + self.by-version."statsd"."0.7.2"; + by-version."statsd"."0.7.2" = self.buildNodePackage { + name = "statsd-0.7.2"; + version = "0.7.2"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/statsd/-/statsd-0.7.2.tgz"; + name = "statsd-0.7.2.tgz"; + sha1 = "88901c5f30fa51da5fa3520468c94d7992ef576e"; + }; + deps = { + }; + optionalDependencies = { + "node-syslog-1.1.7" = self.by-version."node-syslog"."1.1.7"; + "hashring-1.0.1" = self.by-version."hashring"."1.0.1"; + "winser-0.1.6" = self.by-version."winser"."0.1.6"; + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "statsd" = self.by-version."statsd"."0.7.2"; + by-spec."statsd-influxdb-backend"."*" = + self.by-version."statsd-influxdb-backend"."0.6.0"; + by-version."statsd-influxdb-backend"."0.6.0" = self.buildNodePackage { + name = "statsd-influxdb-backend-0.6.0"; + version = "0.6.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/statsd-influxdb-backend/-/statsd-influxdb-backend-0.6.0.tgz"; + name = "statsd-influxdb-backend-0.6.0.tgz"; + sha1 = "25fb83cf0b3af923dfc7d506eb1208def8790d78"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "statsd-influxdb-backend" = self.by-version."statsd-influxdb-backend"."0.6.0"; + by-spec."statsd-librato-backend"."*" = + self.by-version."statsd-librato-backend"."0.1.7"; + by-version."statsd-librato-backend"."0.1.7" = self.buildNodePackage { + name = "statsd-librato-backend-0.1.7"; + version = "0.1.7"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/statsd-librato-backend/-/statsd-librato-backend-0.1.7.tgz"; + name = "statsd-librato-backend-0.1.7.tgz"; + sha1 = "270dc406481c0e6a6f4e72957681a73015f478f6"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "statsd-librato-backend" = self.by-version."statsd-librato-backend"."0.1.7"; + by-spec."winser"."=0.1.6" = + self.by-version."winser"."0.1.6"; + by-version."winser"."0.1.6" = self.buildNodePackage { + name = "winser-0.1.6"; + version = "0.1.6"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/winser/-/winser-0.1.6.tgz"; + name = "winser-0.1.6.tgz"; + sha1 = "08663dc32878a12bbce162d840da5097b48466c9"; + }; + deps = { + "sequence-2.2.1" = self.by-version."sequence"."2.2.1"; + "commander-1.3.1" = self.by-version."commander"."1.3.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; +} diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix index 29b920295585..ecd98d8155fa 100644 --- a/pkgs/tools/networking/stunnel/default.nix +++ b/pkgs/tools/networking/stunnel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "stunnel-${version}"; - version = "5.22"; + version = "5.26"; src = fetchurl { url = "http://www.stunnel.org/downloads/${name}.tar.gz"; - sha256 = "0gxqiiksc5p65s67f53yxa2hb8w4hfcgd0s20jrcslw1jjk2imla"; + sha256 = "09i7gizisa04l0gygwbyd3dnzpjmq3ii6c009z4qvv8y05lx941c"; }; buildInputs = [ openssl ]; diff --git a/pkgs/tools/networking/tftp-hpa/default.nix b/pkgs/tools/networking/tftp-hpa/default.nix index 57dd43cbb444..e95cba18e109 100644 --- a/pkgs/tools/networking/tftp-hpa/default.nix +++ b/pkgs/tools/networking/tftp-hpa/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "TFTP tools - a lot of fixes on top of BSD TFTP"; maintainers = with maintainers; [ raskin ]; - platforms = with platforms; linux; + platforms = platforms.linux; license = licenses.bsd3; homepage = http://www.kernel.org/pub/software/network/tftp/; }; diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix index 2357ec77f122..680a8ef1bda0 100644 --- a/pkgs/tools/package-management/dpkg/default.nix +++ b/pkgs/tools/package-management/dpkg/default.nix @@ -17,7 +17,11 @@ stdenv.mkDerivation { --replace "stackprotectorstrong => 1" "stackprotectorstrong => 0" ''; - configureFlags = "--disable-dselect --with-admindir=/var/lib/dpkg PERL_LIBDIR=$(out)/${perl.libPrefix}"; + configureFlags = [ + "--disable-dselect" + "--with-admindir=/var/lib/dpkg" + "PERL_LIBDIR=$(out)/${perl.libPrefix}" + ]; preConfigure = '' # Nice: dpkg has a circular dependency on itself. Its configure diff --git a/pkgs/tools/security/minisign/default.nix b/pkgs/tools/security/minisign/default.nix index 48de14ddce6c..781ca6ca6005 100644 --- a/pkgs/tools/security/minisign/default.nix +++ b/pkgs/tools/security/minisign/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "minisign-${version}"; - version = "0.4"; + version = "0.6"; src = fetchurl { url = "https://github.com/jedisct1/minisign/archive/${version}.tar.gz"; - sha256 = "1k1dk6piaz8pw4b9zg55n4wcpyc301mkxb873njm8mki7r8raxnw"; + sha256 = "029g8ian72fy07k73nf451dw1yggav6crjjc2x6kv4nfpq3pl9pj"; }; buildInputs = [ cmake libsodium ]; diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix index faba4037d3dd..c7d927bdb448 100644 --- a/pkgs/tools/security/nmap/default.nix +++ b/pkgs/tools/security/nmap/default.nix @@ -13,11 +13,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "nmap${optionalString graphicalSupport "-graphical"}-${version}"; - version = "6.49BETA4"; + version = "7.00"; src = fetchurl { url = "http://nmap.org/dist/nmap-${version}.tar.bz2"; - sha256 = "042fg73w7596b3h6ha9y62ckc0hd352zv1shwip3dx14v5igrsna"; + sha256 = "1bh25200jidhb2ig206ibiwv1ngyrl2ka743hnihiihmqq0j6i4z"; }; patches = ./zenmap.patch; diff --git a/pkgs/tools/security/radamsa/default.nix b/pkgs/tools/security/radamsa/default.nix new file mode 100644 index 000000000000..4a770f86e5cb --- /dev/null +++ b/pkgs/tools/security/radamsa/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "radamsa-${version}"; + version = "0.4"; + + src = fetchurl { + url = "http://haltp.org/download/${name}.tar.gz"; + sha256 = "1xs9dsrq6qrf104yi9x21scpr73crfikbi8q9njimiw5c1y6alrv"; + }; + + patchPhase = '' + substituteInPlace ./tests/bd.sh \ + --replace "/bin/echo" echo + substituteInPlace ./Makefile \ + --replace "PREFIX=/usr" "PREFIX=$out" \ + --replace "BINDIR=/bin" "BINDIR=" + ''; + + meta = { + description = "A general purpose fuzzer"; + longDescription = "Radamsa is a general purpose data fuzzer. It reads data from given sample files, or standard input if none are given, and outputs modified data. It is usually used to generate malformed data for testing programs."; + homepage = http://github.com/aoh/radamsa; + maintainers = [ stdenv.lib.maintainers.markWot ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/tools/system/foremost/default.nix b/pkgs/tools/system/foremost/default.nix index 0e502edc2893..af28565f4661 100644 --- a/pkgs/tools/system/foremost/default.nix +++ b/pkgs/tools/system/foremost/default.nix @@ -9,6 +9,16 @@ stdenv.mkDerivation rec { url = "http://foremost.sourceforge.net/pkg/${name}.tar.gz"; }; + patches = [ ./makefile.patch ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + enableParallelBuilding = true; + + preInstall = '' + mkdir -p $out/{bin,share/man/man8} + ''; + meta = with stdenv.lib; { inherit version; description = "Recover files based on their contents"; @@ -26,14 +36,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = with maintainers; [ nckx ]; }; - - patches = [ ./makefile.patch ]; - - makeFlags = "PREFIX=$(out)"; - - enableParallelBuilding = true; - - preInstall = '' - mkdir -p $out/{bin,share/man/man8} - ''; } diff --git a/pkgs/tools/system/smartmontools/default.nix b/pkgs/tools/system/smartmontools/default.nix index 72c8f8d028eb..157b980be8c6 100644 --- a/pkgs/tools/system/smartmontools/default.nix +++ b/pkgs/tools/system/smartmontools/default.nix @@ -1,23 +1,25 @@ { stdenv, fetchurl }: let - dbrev = "3849"; + version = "6.4"; + drivedbBranch = "RELEASE_${builtins.replaceStrings ["."] ["_"] version}_DRIVEDB"; + dbrev = "4167"; driverdb = fetchurl { - url = "http://sourceforge.net/p/smartmontools/code/${dbrev}/tree/trunk/smartmontools/drivedb.h?format=raw"; - sha256 = "06c1cl0x4sq64l3rmd5rk8wsbggjixphpgj0kf4awqhjgsi102xz"; + url = "http://sourceforge.net/p/smartmontools/code/${dbrev}/tree/branches/${drivedbBranch}/smartmontools/drivedb.h?format=raw"; + sha256 = "14rv1cxbpmnq12hjwr3icjiahx5i0ak7j69310c09rah0241l5j1"; name = "smartmontools-drivedb.h"; }; in stdenv.mkDerivation rec { - name = "smartmontools-6.3"; + name = "smartmontools-${version}"; src = fetchurl { url = "mirror://sourceforge/smartmontools/${name}.tar.gz"; - sha256 = "06gy71jh2d3gcfmlbbrsqw7215knkfq59q3j6qdxfrar39fhcxx7"; + sha256 = "11bsxcghh7adzdklcslamlynydxb708vfz892d5w7agdq405ddza"; }; patchPhase = '' - : cp ${driverdb} drivedb.h + cp ${driverdb} drivedb.h sed -i -e 's@which which >/dev/null || exit 1@alias which="type -p"@' update-smart-drivedb.in ''; diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix index 4e6f3ed11e87..12c250788390 100644 --- a/pkgs/tools/system/stress-ng/default.nix +++ b/pkgs/tools/system/stress-ng/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation { enableParallelBuilding = true; - installFlags = "DESTDIR=$(out)"; + installFlags = [ "DESTDIR=$(out)" ]; meta = with stdenv.lib; { inherit version; diff --git a/pkgs/tools/text/aha/default.nix b/pkgs/tools/text/aha/default.nix index 60114b7b3f3a..152a46cd50c4 100644 --- a/pkgs/tools/text/aha/default.nix +++ b/pkgs/tools/text/aha/default.nix @@ -11,6 +11,10 @@ stdenv.mkDerivation { owner = "theZiz"; }; + makeFlags = [ "PREFIX=$(out)" ]; + + enableParallelBuilding = true; + meta = with stdenv.lib; { inherit version; description = "ANSI HTML Adapter"; @@ -22,8 +26,4 @@ stdenv.mkDerivation { platforms = platforms.linux; maintainers = with maintainers; [ nckx ]; }; - - makeFlags = "PREFIX=$(out)"; - - enableParallelBuilding = true; } diff --git a/pkgs/tools/text/html-tidy/default.nix b/pkgs/tools/text/html-tidy/default.nix index 247cb67da56c..062715b83020 100644 --- a/pkgs/tools/text/html-tidy/default.nix +++ b/pkgs/tools/text/html-tidy/default.nix @@ -1,41 +1,31 @@ -{ fetchcvs, stdenv, autoconf, automake, libtool }: +{ stdenv, fetchurl, cmake, libxslt }: -let date = "2009-07-04"; in - stdenv.mkDerivation rec { - name = "html-tidy-20090704"; +let + version = "5.0.0"; +in +stdenv.mkDerivation rec { + name = "html-tidy-${version}"; - # According to http://tidy.sourceforge.net/, there are no new - # release tarballs, so one has to either get the code from CVS or - # use a decade-old tarball. + src = fetchurl { + url = "https://github.com/htacg/tidy-html5/archive/${version}.tar.gz"; + sha256 = "1qz7hgk482496agngp9grz4jqkyxrp29r2ywbccc9i5198yspca4"; + }; - src = fetchcvs { - inherit date; - cvsRoot = ":pserver:anonymous@tidy.cvs.sourceforge.net:/cvsroot/tidy"; - module = "tidy"; - sha256 = "d2e68b4335ebfde65ef66d5684f7693675c98bdd50b7a63c0b04f61db673aa6d"; - }; + nativeBuildInputs = [ cmake libxslt/*manpage*/ ]; - buildInputs = [ autoconf automake libtool ]; + # ATM bin/tidy is statically linked, as upstream provides no other option yet. + # https://github.com/htacg/tidy-html5/issues/326#issuecomment-160322107 - preConfigure = '' - cp -rv build/gnuauto/* . - AUTOMAKE="automake --foreign" autoreconf -vfi + meta = with stdenv.lib; { + description = "A HTML validator and `tidier'"; + longDescription = '' + HTML Tidy is a command-line tool and C library that can be + used to validate and fix HTML data. ''; + license = licenses.libpng; # very close to it - the 3 clauses are identical + homepage = http://html-tidy.org; + platforms = platforms.all; + maintainers = with maintainers; [ edwtjo ]; + }; +} - doCheck = true; - - meta = { - description = "HTML Tidy, an HTML validator and `tidier'"; - - longDescription = '' - HTML Tidy is a command-line tool and C library that can be - used to validate and fix HTML data. - ''; - - license = stdenv.lib.licenses.mit; - - homepage = http://tidy.sourceforge.net/; - - maintainers = [ ]; - }; - } diff --git a/pkgs/tools/text/tidy-html5/default.nix b/pkgs/tools/text/tidy-html5/default.nix deleted file mode 100644 index ef3bcc46ba73..000000000000 --- a/pkgs/tools/text/tidy-html5/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, lib, cmake, fetchFromGitHub, libxslt, ... }: - -stdenv.mkDerivation rec { - - name = "tidy-html5"; - version = "4.9.30"; - - src = fetchFromGitHub { - owner = "htacg"; - repo = "tidy-html5"; - rev = version; - sha256 = "0hd4c23352r5lnh23mx137wb4mkxcjdrl1dy8kgghszik5fprs3s"; - }; - - buildInputs = [ cmake libxslt ]; - - meta = with stdenv.lib; { - description = "The granddaddy of HTML tools, with support for modern standards"; - homepage = "http://www.html-tidy.org/"; - license = licenses.w3c; - platforms = platforms.all; - maintainers = with maintainers; [ edwtjo ]; - }; - -} diff --git a/pkgs/tools/text/xml/basex/default.nix b/pkgs/tools/text/xml/basex/default.nix index c67444838b24..e2b59bdb115a 100644 --- a/pkgs/tools/text/xml/basex/default.nix +++ b/pkgs/tools/text/xml/basex/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, unzip, jre, coreutils, makeDesktopItem }: stdenv.mkDerivation rec { - name = "basex-7.8.2"; + name = "basex-8.3.1"; src = fetchurl { - url = "http://files.basex.org/releases/7.8.2/BaseX782.zip"; - sha256 = "0i9h7fsvn8cy1g44f23iyqndwamvx4kvyc4y3i00j15qm6qd2kbm"; + url = "http://files.basex.org/releases/8.3.1/BaseX831.zip"; + sha256 = "08ba0qvfaa1560hy0nsiq9y6slgdj46j9rdssigf2vvkc5ngkgg0"; }; buildInputs = [ unzip jre ]; diff --git a/pkgs/tools/virtualization/cloud-init/default.nix b/pkgs/tools/virtualization/cloud-init/default.nix index 48eb68242e1e..af2779e59e36 100644 --- a/pkgs/tools/virtualization/cloud-init/default.nix +++ b/pkgs/tools/virtualization/cloud-init/default.nix @@ -3,7 +3,7 @@ let version = "0.7.6"; in pythonPackages.buildPythonPackage rec { - name = "cloud-init-0.7.6"; + name = "cloud-init-${version}"; namePrefix = ""; src = fetchurl { @@ -11,20 +11,19 @@ in pythonPackages.buildPythonPackage rec { sha256 = "1mry5zdkfaq952kn1i06wiggc66cqgfp6qgnlpk0mr7nnwpd53wy"; }; - preBuild = '' + patchPhase = '' patchShebangs ./tools substituteInPlace setup.py \ --replace /usr $out \ --replace /etc $out/etc \ --replace /lib/systemd $out/lib/systemd \ + --replace 'self.init_system = ""' 'self.init_system = "systemd"' ''; - pythonPath = with pythonPackages; [ cheetah jinja2 prettytable + propagatedBuildInputs = with pythonPackages; [ cheetah jinja2 prettytable oauth pyserial configobj pyyaml argparse requests jsonpatch ]; - setupPyInstallFlags = ["--init-system systemd"]; - meta = { homepage = http://cloudinit.readthedocs.org; description = "provides configuration and customization of cloud instance"; |