diff options
Diffstat (limited to 'pkgs/tools')
32 files changed, 300 insertions, 87 deletions
diff --git a/pkgs/tools/X11/dex/default.nix b/pkgs/tools/X11/dex/default.nix new file mode 100644 index 00000000000..d147ef4a70c --- /dev/null +++ b/pkgs/tools/X11/dex/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, python3 }: + +stdenv.mkDerivation rec { + program = "dex"; + name = "${program}-${version}"; + version = "0.7"; + + src = fetchFromGitHub { + owner = "jceb"; + repo = program; + rev = "v${version}"; + sha256 = "041ms01snalapapaniabr92d8iim1qrxian626nharjmp2rd69v5"; + }; + + propagatedBuildInputs = [ python3 ]; + makeFlags = [ "PREFIX=$(out)" "VERSION=$(version)" ]; + + meta = { + description = "A program to generate and execute DesktopEntry files of the Application type"; + homepage = https://github.com/jceb/dex; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix index f9a949f4d3f..df3523322e8 100644 --- a/pkgs/tools/backup/borg/default.nix +++ b/pkgs/tools/backup/borg/default.nix @@ -1,21 +1,23 @@ -{ stdenv, fetchzip, python3Packages, openssl, acl }: +{ stdenv, fetchurl, python3Packages, openssl, acl, lz4 }: python3Packages.buildPythonPackage rec { - name = "borg-${version}"; - version = "0.23.0"; + name = "borgbackup-${version}"; + version = "0.27.0"; namePrefix = ""; - src = fetchzip { - name = "${name}-src"; - url = "https://github.com/borgbackup/borg/archive/${version}.tar.gz"; - sha256 = "1ns00bhrh4zm1s70mm32gnahj7yh4jdpkb8ziarhvcnknz7aga67"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/b/borgbackup/borgbackup-${version}.tar.gz"; + sha256 = "04iizidag4fwy6kx1747d633s1amr81slgk743qsfbwixaxfjq9b"; }; propagatedBuildInputs = with python3Packages; - [ cython msgpack openssl acl llfuse tox detox ]; + [ cython msgpack openssl acl llfuse tox detox lz4 setuptools_scm ]; preConfigure = '' export BORG_OPENSSL_PREFIX="${openssl}" + export BORG_LZ4_PREFIX="${lz4}" + # note: fix for this issue already upstream and probably in 0.27.1 (or whatever the next release is called) + substituteInPlace setup.py --replace "possible_openssl_prefixes.insert(0, os.environ.get('BORG_LZ4_PREFIX'))" "possible_lz4_prefixes.insert(0, os.environ.get('BORG_LZ4_PREFIX'))" ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index 79f394c2aac..556b9651200 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, python, librsync, ncftp, gnupg, boto, makeWrapper -, lockfile, setuptools }: +, lockfile, setuptools, paramiko, pycrypto, ecdsa +}: let version = "0.7.02"; @@ -15,10 +16,10 @@ stdenv.mkDerivation { installPhase = '' python setup.py install --prefix=$out wrapProgram $out/bin/duplicity \ - --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${boto}):$(toPythonPath ${lockfile})" \ + --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pycrypto}):$(toPythonPath ${ecdsa}):$(toPythonPath ${paramiko}):$(toPythonPath ${boto}):$(toPythonPath ${lockfile})" \ --prefix PATH : "${gnupg}/bin:${ncftp}/bin" wrapProgram $out/bin/rdiffdir \ - --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${boto}):$(toPythonPath ${lockfile})" \ + --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pycrypto}):$(toPythonPath ${ecdsa}):$(toPythonPath ${paramiko}):$(toPythonPath ${boto}):$(toPythonPath ${lockfile})" ''; buildInputs = [ python librsync makeWrapper setuptools ]; diff --git a/pkgs/tools/backup/zbackup/default.nix b/pkgs/tools/backup/zbackup/default.nix new file mode 100644 index 00000000000..25bd7236e68 --- /dev/null +++ b/pkgs/tools/backup/zbackup/default.nix @@ -0,0 +1,17 @@ +{ stdenv, fetchurl, cmake, zlib, openssl, protobuf, protobufc, lzo, libunwind } : +stdenv.mkDerivation rec { + name = "zbackup-${version}"; + version = "1.4.4"; + src = fetchurl { + url = "https://github.com/zbackup/zbackup/archive/1.4.4.tar.gz"; + sha256 = "11csla7n44lg7x6yqg9frb21vnkr8cvnh6ardibr3nj5l39crk7g"; + }; + buildInputs = [ zlib openssl protobuf lzo libunwind ]; + nativeBuildInputs = [ cmake protobufc ]; + meta = { + description = "A versatile deduplicating backup tool"; + homepage = "http://zbackup.org/"; + platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2Plus; + }; +} diff --git a/pkgs/tools/filesystems/djmount/default.nix b/pkgs/tools/filesystems/djmount/default.nix new file mode 100644 index 00000000000..7010a60bcbc --- /dev/null +++ b/pkgs/tools/filesystems/djmount/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, pkgconfig, fuse }: + +stdenv.mkDerivation rec { + name = "djmount-${version}"; + version = "0.71"; + src = fetchurl { + url = "mirror://sourceforge/djmount/${version}/${name}.tar.gz"; + sha256 = "0kqf0cy3h4cfiy5a2sigmisx0lvvsi1n0fbyb9ll5gacmy1b8nxa"; + }; + + buildInputs = [ pkgconfig fuse]; + + meta = { + homepage = http://djmount.sourceforge.net/; + description = "UPnP AV client, mounts as a Linux filesystem the media content of compatible UPnP AV devices"; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; + license = stdenv.lib.licenses.gpl2; + }; +} diff --git a/pkgs/tools/filesystems/yandex-disk/default.nix b/pkgs/tools/filesystems/yandex-disk/default.nix index 97d70d1a45b..42308947c07 100644 --- a/pkgs/tools/filesystems/yandex-disk/default.nix +++ b/pkgs/tools/filesystems/yandex-disk/default.nix @@ -6,18 +6,18 @@ let p = if stdenv.is64bit then { arch = "x86_64"; gcclib = "${stdenv.cc.cc}/lib64"; - sha256 = "08mmjz061b0hrqp8zg31w089n5bk3sq4r3w84zr33d8pnvkgq2wk"; + sha256 = "1dr976z0zgg5jk477hrnfmpcx4llh5xi1493k0pkp28m6ypbxy2q"; } else { arch = "i386"; gcclib = "${stdenv.cc.cc}/lib"; - sha256 = "1zb6cnldd43nr4k2qg9hnrkgj0iik2gpxqrjypbhwv75hnvjma93"; + sha256 = "01v0caf194y6yb0zc0d3ywx3y0rwb7sxkav4ickd4l968jpi8p91"; }; in stdenv.mkDerivation rec { name = "yandex-disk-${version}"; - version = "0.1.5.905"; + version = "0.1.5.940"; src = fetchurl { url = "http://repo.yandex.ru/yandex-disk/rpm/stable/${p.arch}/${name}-1.fedora.${p.arch}.rpm"; diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index 97a8c3e7d1c..3e17e721f7b 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "ibus-${version}"; - version = "1.5.10"; + version = "1.5.11"; src = fetchurl { url = "https://github.com/ibus/ibus/releases/download/${version}/${name}.tar.gz"; - sha256 = "152mdzi9hr246spnn7bkb4gy16x30082xwq460gmm1q2cs0bf08x"; + sha256 = "1g26llizd26h9sfz4xdq8krhz19hn08pirvfbkk3g89ri8lmm6a9"; }; configureFlags = "--disable-gconf --enable-dconf --disable-memconf --enable-ui --enable-python-library"; diff --git a/pkgs/tools/misc/goaccess/default.nix b/pkgs/tools/misc/goaccess/default.nix index e73bc487f21..8ce93f6bb66 100644 --- a/pkgs/tools/misc/goaccess/default.nix +++ b/pkgs/tools/misc/goaccess/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, pkgconfig, geoip, ncurses, glib }: let - version = "0.9"; + version = "0.9.4"; mainSrc = fetchurl { url = "http://tar.goaccess.io/goaccess-${version}.tar.gz"; - sha256 = "1yi7bxrmhvd11ha405bqpz7q442l9bnnx317iy22xzxjl96frn29"; + sha256 = "1kn5yvgzrzjlxd0zhr2d2gbjdin9j9vmfbk5gkrwqc4kd9zicvla"; }; in diff --git a/pkgs/tools/misc/grub/trusted.nix b/pkgs/tools/misc/grub/trusted.nix index 315c7145cbe..87c551db4e3 100644 --- a/pkgs/tools/misc/grub/trusted.nix +++ b/pkgs/tools/misc/grub/trusted.nix @@ -11,7 +11,7 @@ let inPCSystems = any (system: stdenv.system == system) (mapAttrsToList (name: _: name) pcSystems); - version = "1.2.0"; + version = "1.2.1"; unifont_bdf = fetchurl { url = "http://unifoundry.com/unifont-5.1.20080820.bdf.gz"; @@ -32,8 +32,8 @@ stdenv.mkDerivation rec { src = fetchgit { url = "https://github.com/Sirrix-AG/TrustedGRUB2"; - rev = "1ff54a5fbe02ea01df5a7de59b1e0201e08d4f76"; - sha256 = "8c17bd7e14dd96ae9c4e98723f4e18ec6b21d45ac486ecf771447649829d0b34"; + rev = "ab483d389bda3115ca0ae4202fd71f2e4a31ad41"; + sha256 = "4b715837f8632278720d8b29aec06332f5302c6ba78183ced5f48d3c376d89c0"; }; nativeBuildInputs = [ autogen flex bison python autoconf automake ]; diff --git a/pkgs/tools/misc/less/default.nix b/pkgs/tools/misc/less/default.nix index 8c0f0e96d21..af8a0dd7d81 100644 --- a/pkgs/tools/misc/less/default.nix +++ b/pkgs/tools/misc/less/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { - name = "less-475"; + name = "less-481"; src = fetchurl { url = "http://www.greenwoodsoftware.com/less/${name}.tar.gz"; - sha256 = "16703m6g5l97af3jwpypgac7gpmh3yjkdpqygf5a2scfip0hxm2g"; + sha256 = "19fxj0h10y5bhr3a1xa7kqvnwl44db3sdypz8jxl1q79yln8z8rz"; }; # Look for ‘sysless’ in /etc. diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index 1d3d14d7e23..c44aabbb416 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, perl, makeWrapper, procps }: stdenv.mkDerivation rec { - name = "parallel-20150822"; + name = "parallel-20150922"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "1ij7bjxhk2866mzh0v0v2m629b6d39r5ivwdzmh72s471m9hg45d"; + sha256 = "05zf3jhjmswfr63lgxw8q26kysd72b8m0zy5jbc94r6appx8bd7j"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix index 1fe71ae9616..8c132d5ba02 100644 --- a/pkgs/tools/misc/screen/default.nix +++ b/pkgs/tools/misc/screen/default.nix @@ -13,6 +13,12 @@ stdenv.mkDerivation rec { sed -i -e "s|/usr/local|/non-existent|g" -e "s|/usr|/non-existent|g" configure Makefile.in */Makefile.in ''; + # TODO: remove when updating the version of screen. Only a patch for 4.3.1 + patches = stdenv.lib.optional stdenv.isDarwin (fetchurl { + url = "http://savannah.gnu.org/file/screen-utmp.patch\?file_id=34815"; + sha256 = "192dsa8hm1zw8m638avzhwhnrddgizhyrwaxgwa96zr9vwai2nvc"; + }); + buildInputs = [ ncurses ] ++ stdenv.lib.optional stdenv.isLinux pam; doCheck = true; diff --git a/pkgs/tools/misc/sdl-jstest/default.nix b/pkgs/tools/misc/sdl-jstest/default.nix index cf62039fc03..677f52c2c32 100644 --- a/pkgs/tools/misc/sdl-jstest/default.nix +++ b/pkgs/tools/misc/sdl-jstest/default.nix @@ -1,11 +1,11 @@ { fetchgit, stdenv, cmake, pkgconfig, SDL, SDL2, ncurses, docbook_xsl }: stdenv.mkDerivation rec { - name = "sdl-jstest-20150625"; + name = "sdl-jstest-20150806"; src = fetchgit { url = "https://github.com/Grumbel/sdl-jstest"; - rev = "3f54b86ebe0d2f95e9c1d034bc4ed02d6d2b6409"; - sha256 = "d33e0a2c66b551ecf333590f1a6e1730093af31cee1be8757748624d42e14df1"; + rev = "7b792376178c9656c851ddf106c7d57b2495e8b9"; + sha256 = "3aa9a002de9c9999bd7c6248b94148f15dba6106489e418b2a1a410324f75eb8"; }; buildInputs = [ SDL SDL2 ncurses ]; diff --git a/pkgs/tools/misc/tlp/default.nix b/pkgs/tools/misc/tlp/default.nix index 1e90ecfee32..4f90b432d04 100644 --- a/pkgs/tools/misc/tlp/default.nix +++ b/pkgs/tools/misc/tlp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, makeWrapper, perl, systemd, iw, rfkill, hdparm, ethtool, inetutils, kmod , enableRDW ? true, networkmanager }: -let version = "0.7"; +let version = "0.8"; in stdenv.mkDerivation { inherit enableRDW; @@ -11,7 +11,7 @@ in stdenv.mkDerivation { owner = "linrunner"; repo = "TLP"; rev = "${version}"; - sha256 = "0vgx2jnk9gp41fw992l9dmv462jpcrnwqkzsa8z0lh0l77ax2jcg"; + sha256 = "19fvk0xz6i2ryf41akk4jg1c4sb4rcyxdl9fr0w4lja7g76d5zww"; }; makeFlags = [ "DESTDIR=$(out)" diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index e9f7eadc914..7cc58bee2b7 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { name = "youtube-dl-${version}"; - version = "2015.08.28"; + version = "2015.10.06.2"; src = fetchurl { url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "0iahbynd6fw097a4cc57w26szlbqsmhb8v5ny6qrcil0d4wdqqvp"; + sha256 = "0pxj1z5ay97iqh086qz7rxlp197py71f2mdmshz8rrhcjd6vw1sr"; }; buildInputs = [ makeWrapper zip pandoc ]; diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix index 9ccc91b7bc1..27175c9ed23 100644 --- a/pkgs/tools/networking/netsniff-ng/default.nix +++ b/pkgs/tools/networking/netsniff-ng/default.nix @@ -2,7 +2,7 @@ , libnetfilter_conntrack, libnl, libpcap, libsodium, liburcu, ncurses, perl , pkgconfig, zlib }: -let version = "0.5.9-98-gb3a9f17"; in +let version = "0.5.9-106-g895377c"; in stdenv.mkDerivation { name = "netsniff-ng-${version}"; @@ -10,8 +10,8 @@ stdenv.mkDerivation { src = fetchFromGitHub rec { repo = "netsniff-ng"; owner = repo; - rev = "b3a9f17eb9c7a47e6c4aee3649179b2a54d17eca"; - sha256 = "05nwi5ksijv42w7km08dhymiyyvcj43b5lrpdf9x5j725l79yqdb"; + rev = "895377c6e96ec8ac853568eb275043741a7621cd"; + sha256 = "092jzakldpqram26dccd5k5hv4jc396c3l7iaf9r3139dx83plag"; }; buildInputs = [ bison flex geoip geolite-legacy libcli libnet libnl diff --git a/pkgs/tools/networking/openvpn/update-resolv-conf.nix b/pkgs/tools/networking/openvpn/update-resolv-conf.nix index de04c1419e2..f5937f05004 100644 --- a/pkgs/tools/networking/openvpn/update-resolv-conf.nix +++ b/pkgs/tools/networking/openvpn/update-resolv-conf.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, makeWrapper, openresolv, coreutils }: stdenv.mkDerivation rec { - name = "update-resolv-conf-2014-10-03"; + name = "update-resolv-conf-20141003"; src = fetchgit { url = https://github.com/masterkorp/openvpn-update-resolv-conf/; diff --git a/pkgs/tools/networking/reaver-wps/default.nix b/pkgs/tools/networking/reaver-wps/default.nix index afce95fbd44..9efe3df7520 100644 --- a/pkgs/tools/networking/reaver-wps/default.nix +++ b/pkgs/tools/networking/reaver-wps/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { description = "Brute force attack against Wifi Protected Setup"; homepage = http://code.google.com/p/reaver-wps; license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/smbldaptools/default.nix b/pkgs/tools/networking/smbldaptools/default.nix index af1849565fe..9ca5c3be177 100644 --- a/pkgs/tools/networking/smbldaptools/default.nix +++ b/pkgs/tools/networking/smbldaptools/default.nix @@ -27,5 +27,7 @@ stdenv.mkDerivation { homepage = http://gna.org/projects/smbldap-tools/; description = "SAMBA LDAP tools"; license = stdenv.lib.licenses.gpl2Plus; + # pod2man: unable to format smbldap-config.cmd + broken = true; }; } diff --git a/pkgs/tools/networking/snabb/default.nix b/pkgs/tools/networking/snabb/default.nix new file mode 100644 index 00000000000..9ca8b56491d --- /dev/null +++ b/pkgs/tools/networking/snabb/default.nix @@ -0,0 +1,32 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation rec { + name = "snabb-2015.10"; + + src = fetchurl { + url = "https://github.com/SnabbCo/snabbswitch/archive/v2015.10.tar.gz"; + sha256 = "15cmw7k2siy9m7s1383l1h8kix8cwb143yvwhxdahbnx4lfnzfz8"; + }; + + installPhase = '' + mkdir -p $out/bin + cp src/snabb $out/bin + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/SnabbCo/snabbswitch; + description = "Simple and fast packet networking toolkit"; + longDescription = '' + Snabb Switch is a LuaJIT-based toolkit for writing high-speed + packet networking code (such as routing, switching, firewalling, + and so on). It includes both a scripting inteface for creating + new applications and also some built-in applications that are + ready to run. + It is especially intended for ISPs and other network operators. + ''; + platforms = [ "x86_64-linux" ]; + license = licenses.asl20; + maintainers = [ maintainers.lukego ]; + }; +} + diff --git a/pkgs/tools/networking/tgt/default.nix b/pkgs/tools/networking/tgt/default.nix index b5acdce800a..f870b5463b6 100644 --- a/pkgs/tools/networking/tgt/default.nix +++ b/pkgs/tools/networking/tgt/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, libxslt, libaio, systemd, perl, perlPackages }: +{ stdenv, fetchFromGitHub, libxslt, libaio, systemd, perl, perlPackages +, docbook_xsl }: let version = "1.0.60"; @@ -11,7 +12,7 @@ in stdenv.mkDerivation rec { sha256 = "1bf8rn3mavjrzkp5k23akqn5ilw43g8mpfr68z1bi8s9lr2gkf37"; }; - buildInputs = [ libxslt systemd libaio ]; + buildInputs = [ libxslt systemd libaio docbook_xsl ]; DESTDIR = "$(out)"; PREFIX = "/"; @@ -34,4 +35,4 @@ in stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/networking/tinc/pre.nix b/pkgs/tools/networking/tinc/pre.nix index f7d74b6a39a..81b14392137 100644 --- a/pkgs/tools/networking/tinc/pre.nix +++ b/pkgs/tools/networking/tinc/pre.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit, autoreconfHook, texinfo, ncurses, readline, zlib, lzo, openssl }: stdenv.mkDerivation rec { - name = "tinc-1.1pre-2015-07-22"; + name = "tinc-1.1pre-2015-09-25"; src = fetchgit { url = "git://tinc-vpn.org/tinc"; - rev = "56a8b90d863171d62e0a337b5635fbfc53a67fb0"; - sha256 = "081z4xs5l988g1s0yr7fvnysajd05bx6s54sh84jvq7ij8af71dm"; + rev = "73068238436d8a22abb86e67b08f573b09fd04e1"; + sha256 = "1j8bvvzvciy21s24jdpi089svy7wipg9pm84s98xjlp2plchj5dj"; }; nativeBuildInputs = [ autoreconfHook texinfo ]; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 71c47c97d60..e74daade3b8 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -88,21 +88,18 @@ in rec { nixStable = common rec { name = "nix-1.10"; - src = fetchurl { - url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; - sha256 = "5612ca7a549dd1ee20b208123e041aaa95a414a0e8f650ea88c672dc023d10f6"; - }; + src = fetchurl { + url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; + sha256 = "5612ca7a549dd1ee20b208123e041aaa95a414a0e8f650ea88c672dc023d10f6"; + }; }; - nixUnstable = nix; - /* nixUnstable = lib.lowPrio (common rec { - name = "nix-1.10pre4212_e12cf82"; - src = fetchurl { - url = "http://hydra.nixos.org/build/24982847/download/4/${name}.tar.xz"; - sha256 = "4165db0ea9bb6b5cd96d294348299f20ac045fc18db680104ff98fe9ac893f72"; - }; + name = "nix-1.11pre4244_133a421"; + src = fetchurl { + url = "http://hydra.nixos.org/build/26680779/download/4/${name}.tar.xz"; + sha256 = "cb98e3e0791c3f5a508990e8ddba02ce7fe9282a9fe151c743206c1410cdfd93"; + }; }); - */ } diff --git a/pkgs/tools/security/chkrootkit/default.nix b/pkgs/tools/security/chkrootkit/default.nix index 36a203a7b50..2dad4b3e43a 100644 --- a/pkgs/tools/security/chkrootkit/default.nix +++ b/pkgs/tools/security/chkrootkit/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "chkrootkit-0.50"; src = fetchurl { - url = ftp://ftp.pangeia.com.br/pub/seg/pac/chkrootkit.tar.gz; + url = ftp://ftp.pangeia.com.br/pub/seg/pac/chkrootkit-0.50.tar.gz; sha256 = "1ivclp7ixndacjmf7xgj8lfa6h7ihx44mzzsapqdvf0c5f9gqj4m"; }; diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix index fbb8f0321ef..cdafb560565 100644 --- a/pkgs/tools/security/eid-mw/default.nix +++ b/pkgs/tools/security/eid-mw/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub, autoreconfHook, gtk2, nssTools, pcsclite , pkgconfig }: -let version = "4.1.6"; in +let version = "4.1.7"; in stdenv.mkDerivation { name = "eid-mw-${version}"; src = fetchFromGitHub { - sha256 = "006s7093wqmk36mrlakjv89bqddyh599rvmgv0zgsp15vf9160zi"; + sha256 = "1m44s8mzz8gg97xdmbng40279hc4i7q7i7yd45hbagacny0wxi1k"; rev = "v${version}"; repo = "eid-mw"; owner = "Fedict"; @@ -29,10 +29,11 @@ stdenv.mkDerivation { --replace "modutil" "${nssTools}/bin/modutil" # Only provides a useless "about-eid-mw.desktop" that segfaults anyway: - rm -rf $out/share/applications $out/bin/about-eid-mw + rm -r $out/share/applications $out/bin/about-eid-mw ''; meta = with stdenv.lib; { + inherit version; description = "Belgian electronic identity card (eID) middleware"; homepage = http://eid.belgium.be/en/using_your_eid/installing_the_eid_software/linux/; license = licenses.lgpl3; diff --git a/pkgs/tools/security/gpgstats/default.nix b/pkgs/tools/security/gpgstats/default.nix new file mode 100644 index 00000000000..a04b87c8e31 --- /dev/null +++ b/pkgs/tools/security/gpgstats/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, ncurses, gpgme }: + +stdenv.mkDerivation rec { + name = "gpgstats-${version}"; + version = "0.5"; + + src = fetchurl { + url = "http://www.vanheusden.com/gpgstats/${name}.tgz"; + sha256 = "1n3njqhjwgfllcxs0xmk89dzgirrpfpfzkj71kqyvq97gc1wbcxy"; + }; + + buildInputs = [ ncurses gpgme ]; + + installPhase = '' + mkdir -p $out/bin + cp gpgstats $out/bin + ''; + + meta = with stdenv.lib; { + description = "Calculates statistics on the keys in your gpg key-ring"; + longDescription = '' + GPGstats calculates statistics on the keys in your key-ring. + ''; + homepage = http://www.vanheusden.com/gpgstats/; + license = licenses.gpl2; + maintainers = with maintainers; [ davidak ]; + platforms = with platforms; unix; + }; +} + diff --git a/pkgs/tools/security/john/default.nix b/pkgs/tools/security/john/default.nix index 4ef9b8f65b6..24a6782c206 100644 --- a/pkgs/tools/security/john/default.nix +++ b/pkgs/tools/security/john/default.nix @@ -1,29 +1,54 @@ -{ stdenv, fetchgit, openssl, nss, nspr, kerberos, gmp, zlib, libpcap, re2 }: +{ stdenv, fetchurl, openssl, nss, nspr, kerberos, gmp, zlib, libpcap, re2 +, writeText +}: with stdenv.lib; stdenv.mkDerivation rec { - name = "JohnTheRipper-${version}"; - version = "8a3e3c1d"; + name = "john-${version}"; + version = "1.8.0-jumbo-1"; + + src = fetchurl { + url = "http://www.openwall.com/john/j/${name}.tar.xz"; + sha256 = "08q92sfdvkz47rx6qjn7qv57cmlpy7i7rgddapq5384mb413vjds"; + }; + + postPatch = '' + sed -ri -e ' + s!^(#define\s+CFG_[A-Z]+_NAME\s+).*/!\1"'"$out"'/etc/john/! + /^#define\s+JOHN_SYSTEMWIDE/s!/usr!'"$out"'! + ' src/params.h + sed -ri -e '/^\.include/ { + s!\$JOHN!'"$out"'/etc/john! + s!^(\.include\s*)<([^./]+\.conf)>!\1"'"$out"'/etc/john/\2"! + }' run/*.conf + ''; + + preConfigure = "cd src"; + configureFlags = [ "--disable-native-macro" ]; + buildInputs = [ openssl nss nspr kerberos gmp zlib libpcap re2 ]; - NIX_CFLAGS_COMPILE = "-DJOHN_SYSTEMWIDE=1"; - preConfigure = ''cd src''; + enableParallelBuilding = true; + + NIX_CFLAGS_COMPILE = [ "-DJOHN_SYSTEMWIDE=1" ]; + installPhase = '' - ensureDir $out/share/john/ - ensureDir $out/bin - cp -R ../run/* $out/share/john - ln -s $out/share/john/john $out/bin/john + mkdir -p "$out/etc/john" "$out/share/john" "$out/share/doc/john" + find ../run -mindepth 1 -maxdepth 1 -type f -executable \ + -exec "${stdenv.shell}" "${writeText "john-binary-install.sh" '' + filename="$(basename "$1")" + install -vD "$1" "$out/bin/''${filename%.*}" + ''}" {} \; + cp -vt "$out/etc/john" ../run/*.conf + cp -vt "$out/share/john" ../run/*.chr ../run/password.lst + cp -vrt "$out/share/doc/john" ../doc/* ''; - src = fetchgit { - url = https://github.com/magnumripper/JohnTheRipper.git; - rev = "93f061bc41652c94ae049b52572aac709d18aa4c"; - sha256 = "1rnfi09830n34jcqaxmsam54p4zsq9a49ic2ljh44lahcipympvy"; - }; + meta = { description = "John the Ripper password cracker"; license = licenses.gpl2; homepage = https://github.com/magnumripper/JohnTheRipper/; - maintainers = with maintainers; [offline]; + maintainers = with maintainers; [ offline ]; platforms = with platforms; unix; }; } diff --git a/pkgs/tools/security/nasty/default.nix b/pkgs/tools/security/nasty/default.nix new file mode 100644 index 00000000000..099547c2f32 --- /dev/null +++ b/pkgs/tools/security/nasty/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, gpgme }: + +stdenv.mkDerivation rec { + name = "nasty-${version}"; + version = "0.6"; + + src = fetchurl { + url = "http://www.vanheusden.com/nasty/${name}.tgz"; + sha256 = "1dznlxr728k1pgy1kwmlm7ivyl3j3rlvkmq34qpwbwbj8rnja1vn"; + }; + + buildInputs = [ gpgme ]; + + installPhase = '' + mkdir -p $out/bin + cp nasty $out/bin + ''; + + meta = with stdenv.lib; { + description = "Recover the passphrase of your PGP or GPG-key"; + longDescription = '' + Nasty is a program that helps you to recover the passphrase of your PGP or GPG-key + in case you forget or lost it. It is mostly a proof-of-concept: with a different implementation + this program could be at least 100x faster. + ''; + homepage = http://www.vanheusden.com/nasty/; + license = licenses.gpl2; + maintainers = with maintainers; [ davidak ]; + platforms = with platforms; unix; + }; +} + diff --git a/pkgs/tools/security/sslscan/default.nix b/pkgs/tools/security/sslscan/default.nix new file mode 100644 index 00000000000..dd124c4efe6 --- /dev/null +++ b/pkgs/tools/security/sslscan/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, openssl }: + +stdenv.mkDerivation rec { + name = "sslscan-${version}"; + version = "1.11.0"; + + src = fetchurl { + url = "https://github.com/rbsec/sslscan/archive/${version}-rbsec.tar.gz"; + sha256 = "19d6vpcihfqs35hni4vigcpqabbnd3sndr5wyvfsladgp40vz3b9"; + }; + + buildInputs = [ openssl ]; + + installFlags = [ + "BINPATH=$(out)/bin" + "MANPATH=$(out)/share/man" + ]; + + meta = with stdenv.lib; { + description = "Tests SSL/TLS services and discover supported cipher suites"; + homepage = https://github.com/rbsec/sslscan; + license = licenses.gpl3; + maintainers = with maintainers; [ fpletz globin ]; + platforms = platforms.all; + }; +} + diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix index bd7531af18f..6e8f638c8b0 100644 --- a/pkgs/tools/security/tor/torbrowser.nix +++ b/pkgs/tools/security/tor/torbrowser.nix @@ -2,9 +2,6 @@ , 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" - else "32"; - # isolated tor environment torEnv = buildEnv { name = "tor-env"; @@ -15,18 +12,17 @@ let ]; }; - ldLibraryPath = if bits == "64" then torEnv+"/lib:"+torEnv+"/lib64" - else torEnv+"/lib"; + ldLibraryPath = ''${torEnv}/lib${stdenv.lib.optionalString stdenv.is64bit ":${torEnv}/lib64"}''; in stdenv.mkDerivation rec { name = "tor-browser-${version}"; - version = "4.5.3"; + version = "5.0.3"; src = fetchurl { - url = "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux${bits}-${version}_en-US.tar.xz"; - sha256 = if bits == "64" then - "24c517d2aeb15ba5eeda1eb87f483ed4fb0c22b07a95ca26af9f692e0d4d9b7c" else - "154d659583048e91870c40921561f0519babf6d3c9ac439f6fb74ed66824463f"; + url = "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux${if stdenv.is64bit then "64" else "32"}-${version}_en-US.tar.xz"; + sha256 = if stdenv.is64bit then + "1lqsiidnlrh0dlwzc93d0vbjclkb1zq3mwfcjxadjpwik6afszsb" else + "1ajn1bw1j63h3yblh06mmp7xhwdhqg9pdkxyz1dqj1rsp264k50f"; }; patchPhase = '' diff --git a/pkgs/tools/system/dd_rescue/default.nix b/pkgs/tools/system/dd_rescue/default.nix index a0ff9b063dd..d90b5d1d2f0 100644 --- a/pkgs/tools/system/dd_rescue/default.nix +++ b/pkgs/tools/system/dd_rescue/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoconf }: stdenv.mkDerivation rec { - version = "1.98"; + version = "1.99"; name = "dd_rescue-${version}"; src = fetchurl { - sha256 = "14lf2pv52sr16977qjq1rsr42rfd3ywsss2xw9svgaa14g49ss6b"; + sha256 = "0gkbwssn134fjyyvjvylyvassw4fwv5mbis9gcb969xdc64dfhg1"; url="http://www.garloff.de/kurt/linux/ddrescue/${name}.tar.bz2"; }; diff --git a/pkgs/tools/typesetting/pdf2djvu/default.nix b/pkgs/tools/typesetting/pdf2djvu/default.nix index eb8b30381ce..5278d4f5d9b 100644 --- a/pkgs/tools/typesetting/pdf2djvu/default.nix +++ b/pkgs/tools/typesetting/pdf2djvu/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, djvulibre, poppler, fontconfig, libjpeg }: stdenv.mkDerivation rec { - version = "0.8.2"; + version = "0.9.1"; name = "pdf2djvu-${version}"; src = fetchurl { url = "https://bitbucket.org/jwilk/pdf2djvu/downloads/${name}.tar.xz"; - sha256 = "1mlkprbq02yyaqfdziif79i48rvgg195kfwdpl24fdsgjlp83c20"; + sha256 = "1x9xqqwq024k2y8jmwrrkcvrfcy0rwh421x4kz2g8i72gzlik6cz"; }; buildInputs = [ pkgconfig djvulibre poppler fontconfig libjpeg ]; |