diff options
Diffstat (limited to 'pkgs/tools')
23 files changed, 399 insertions, 86 deletions
diff --git a/pkgs/tools/admin/dehydrated/default.nix b/pkgs/tools/admin/dehydrated/default.nix new file mode 100644 index 00000000000..6bd915e7050 --- /dev/null +++ b/pkgs/tools/admin/dehydrated/default.nix @@ -0,0 +1,31 @@ +{ stdenv, bash, coreutils, curl, diffutils, gawk, gnugrep, gnused, openssl, makeWrapper, fetchFromGitHub }: +let + pkgName = "dehydrated"; + version = "0.3.1"; +in +stdenv.mkDerivation rec { + name = pkgName + "-" + version; + + src = fetchFromGitHub { + owner = "lukas2511"; + repo = "dehydrated"; + rev = "v${version}"; + sha256 = "0prg940ykbsfb4w48bc03j5abycg8v7f9rg9x3kcva37y8ml0jsp"; + }; + + buildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/bin + cp -a dehydrated $out/bin + wrapProgram "$out/bin/dehydrated" --prefix PATH : "${stdenv.lib.makeBinPath [ openssl coreutils gnused gnugrep diffutils curl gawk ]}" + ''; + + meta = with stdenv.lib; { + inherit (src.meta) homepage; + description = "Letsencrypt/acme client implemented as a shell-script"; + license = licenses.mit; + platforms = platforms.all; + maintainers = [ maintainers.pstn ]; + }; +} diff --git a/pkgs/tools/filesystems/vmfs-tools/default.nix b/pkgs/tools/filesystems/vmfs-tools/default.nix new file mode 100644 index 00000000000..d563f438020 --- /dev/null +++ b/pkgs/tools/filesystems/vmfs-tools/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, pkgconfig +, asciidoc, docbook_xml_xslt, fuse, libuuid, libxslt }: + +stdenv.mkDerivation rec { + name = "vmfs-tools"; + + src = fetchFromGitHub { + owner = "glandium"; + repo = "vmfs-tools"; + rev = "4ab76ef5b074bdf06e4b518ff6d50439de05ae7f"; + sha256 = "14y412ww5hxk336ils62s3fwykfh6mx1j0iiaa5cwc615pi6qvi4"; + }; + + nativeBuildInputs = [ asciidoc docbook_xml_xslt fuse libuuid libxslt pkgconfig ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = https://github.com/glandium/vmfs-tools; + description = "FUSE-based VMFS (vmware) mounting tools"; + maintainers = with maintainers; [ peterhoeg ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix index 3ca6f3ffcfe..161982ac618 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix @@ -4,24 +4,20 @@ stdenv.mkDerivation rec { name = "ibus-uniemoji-${version}"; - version = "2016-09-20"; + version = "0.6.0"; src = fetchFromGitHub { owner = "salty-horse"; repo = "ibus-uniemoji"; - rev = "c8931a4807a721168e45463ecba00805adb3fe8d"; - sha256 = "0fydxkdjsbfbrbb8238rfnshmhp11c38hsa7y2gp1ii6mkjngb1j"; + rev = "v${version}"; + sha256 = "121zh3q0li1k537fcvbd4ns4jgl9bbb9gm9ihy8cfxgirv38lcfa"; }; propagatedBuildInputs = with python3Packages; [ pyxdg python-Levenshtein ]; makeFlags = [ "PREFIX=$(out)" "SYSCONFDIR=$(out)/etc" - "PYTHON=${python3Packages.python.interpreter}" ]; - - postPatch = '' - sed -i "s,/etc/xdg/,$out/etc/xdg/," uniemoji.py - sed -i "s,/usr/share/,$out/share/,g" uniemoji.xml.in - ''; + "PYTHON=${python3Packages.python.interpreter}" + ]; meta = with stdenv.lib; { isIbusEngine = true; diff --git a/pkgs/tools/misc/bibtex2html/default.nix b/pkgs/tools/misc/bibtex2html/default.nix new file mode 100644 index 00000000000..068d3e3866e --- /dev/null +++ b/pkgs/tools/misc/bibtex2html/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, ocaml }: + +stdenv.mkDerivation rec { + name = "bibtex2html-${version}"; + version = "1.98"; + + src = fetchurl { + url = http://www.lri.fr/~filliatr/ftp/bibtex2html/bibtex2html-1.98.tar.gz; + sha256 = "1mh6hxmc9qv05hgjc11m2zh5mk9mk0kaqp59pny18ypqgfws09g9"; + }; + + buildInputs = [ ocaml ]; + + meta = with stdenv.lib; { + description = "A collection of tools for translating from BibTeX to HTML"; + homepage = https://www.lri.fr/~filliatr/bibtex2html/; + licence = licenses.gpl2; + platforms = ocaml.meta.platforms or []; + maintainers = [ maintainers.scolobb ]; + }; +} diff --git a/pkgs/tools/misc/ipxe/default.nix b/pkgs/tools/misc/ipxe/default.nix index 1efac3b7844..6cd451264ab 100644 --- a/pkgs/tools/misc/ipxe/default.nix +++ b/pkgs/tools/misc/ipxe/default.nix @@ -27,8 +27,12 @@ stdenv.mkDerivation { ]; + enabledOptions = [ "DOWNLOAD_PROTO_HTTPS" ]; + configurePhase = '' - echo "#define DOWNLOAD_PROTO_HTTPS" >> src/config/general.h + runHook preConfigure + for opt in $enabledOptions; do echo "#define $opt" >> src/config/general.h; done + runHook postConfigure ''; preBuild = "cd src"; diff --git a/pkgs/tools/misc/peruse/default.nix b/pkgs/tools/misc/peruse/default.nix new file mode 100644 index 00000000000..865c6b1e842 --- /dev/null +++ b/pkgs/tools/misc/peruse/default.nix @@ -0,0 +1,42 @@ +{ + kdeDerivation, kdeWrapper, fetchFromGitHub, fetchurl, lib, + ecm, kdoctools, + baloo, kconfig, kfilemetadata, kinit, kirigami, plasma-framework +}: + +let + pname = "peruse"; + version = "1.1"; + unarr = fetchFromGitHub { + owner = "zeniko"; + repo = "unarr"; + rev = "d1be8c43a82a4320306c8e835a86fdb7b2574ca7"; + sha256 = "03ds5da69zipa25rsp76l6xqivrh3wcgygwyqa5x2rgcz3rjnlpr"; + }; + unwrapped = kdeDerivation rec { + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://kde/stable/${pname}/${name}.tar.xz"; + sha256 = "1akk9hg12y6iis0rb5kdkznm3xk7hk04r9ccqyz8lr6y073n5f9j"; + }; + + nativeBuildInputs = [ ecm kdoctools ]; + + propagatedBuildInputs = [ baloo kconfig kfilemetadata kinit kirigami plasma-framework ]; + + preConfigure = '' + rmdir src/qtquick/karchive-rar/external/unarr + ln -s ${unarr} src/qtquick/karchive-rar/external/unarr + ''; + + meta = with lib; { + license = licenses.gpl2; + maintainers = with maintainers; [ peterhoeg ]; + }; + + }; + +in kdeWrapper unwrapped { + targets = [ "bin/peruse" ]; +} diff --git a/pkgs/tools/misc/screenfetch/default.nix b/pkgs/tools/misc/screenfetch/default.nix index 972e1049278..a6891886664 100644 --- a/pkgs/tools/misc/screenfetch/default.nix +++ b/pkgs/tools/misc/screenfetch/default.nix @@ -1,14 +1,15 @@ -{ stdenv, fetchgit, makeWrapper -, coreutils, gawk, procps, gnused, findutils, xdpyinfo, xprop, gnugrep +{ stdenv, fetchFromGitHub, makeWrapper, coreutils, gawk, procps, gnused +, findutils, xdpyinfo, xprop, gnugrep, ncurses }: stdenv.mkDerivation { - name = "screenFetch-2016-01-13"; + name = "screenFetch-2016-10-11"; - src = fetchgit { - url = git://github.com/KittyKatt/screenFetch.git; - rev = "22e5bee7647453d45ec82f543f37b8a6a062835d"; - sha256 = "0xdiz02bqg7ajj547j496qq9adysm1f6zymcy3yyfgw3prnzvdir"; + src = fetchFromGitHub { + owner = "KittyKatt"; + repo = "screenFetch"; + rev = "89e51f24018c89b3647deb24406a9af3a78bbe99"; + sha256 = "0i2k261jj2s4sfhav7vbsd362pa0gghw6qhwafhmicmf8hq2a18v"; }; nativeBuildInputs = [ makeWrapper ]; @@ -28,7 +29,8 @@ stdenv.mkDerivation { --prefix PATH : "${findutils}/bin" \ --prefix PATH : "${xdpyinfo}/bin" \ --prefix PATH : "${xprop}/bin" \ - --prefix PATH : "${gnugrep}/bin" + --prefix PATH : "${gnugrep}/bin" \ + --prefix PATH : "${ncurses}/bin" ''; meta = { diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index 5a5d8df26ce..7eba2d2f939 100644 --- a/pkgs/tools/misc/svtplay-dl/default.nix +++ b/pkgs/tools/misc/svtplay-dl/default.nix @@ -5,13 +5,13 @@ let inherit (pythonPackages) python nose pycrypto requests2 mock; in stdenv.mkDerivation rec { name = "svtplay-dl-${version}"; - version = "1.6"; + version = "1.7"; src = fetchFromGitHub { owner = "spaam"; repo = "svtplay-dl"; rev = version; - sha256 = "12r4yazsxk09sampiz9j1jqgzm3136h5fgbbdaiwg43b0y1sjg3d"; + sha256 = "15vadnyah51pk4d0lx11bymxhfq47l5ijn72pjqr9yjx3pkgpd7w"; }; pythonPaths = [ pycrypto requests2 ]; diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 3f07ed87433..6b49a8120a4 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -14,11 +14,11 @@ with stdenv.lib; buildPythonApplication rec { name = "youtube-dl-${version}"; - version = "2016.10.07"; + version = "2016.10.19"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "56be6107275cbdc867e89caf9d20f351d184fdc4fb06d915945fef708086dbce"; + sha256 = "ed8d4a247c4cfffe2a1171b4f9c20be19e84d96bcf3716f46988c8503b1b7713"; }; buildInputs = [ makeWrapper zip ] ++ optional generateManPage pandoc; diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix index 19e87d3a88b..eec84e10386 100644 --- a/pkgs/tools/networking/aria2/default.nix +++ b/pkgs/tools/networking/aria2/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "aria2-${version}"; - version = "1.27.1"; + version = "1.28.0"; src = fetchFromGitHub { owner = "aria2"; repo = "aria2"; rev = "release-${version}"; - sha256 = "003m80gdcqfxi5jjzwiszql5y8lrj7a59gjygy0ya72fa9j4l9mi"; + sha256 = "196prs98sxwwxiszw2m1kbcra7n7fxf758y5dcj2jkddrr37hdkw"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; diff --git a/pkgs/tools/networking/cmst/default.nix b/pkgs/tools/networking/cmst/default.nix index 08bdb052d63..91472b7c61e 100644 --- a/pkgs/tools/networking/cmst/default.nix +++ b/pkgs/tools/networking/cmst/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "cmst-${version}"; - version = "2016.04.03"; + version = "2016.10.03"; src = fetchFromGitHub { repo = "cmst"; owner = "andrew-bibb"; rev = name; - sha256 = "1334ynhq1lxcfqln3bq17hy1awyfnn3zhzpsnymlyp0z3h4ydpp9"; + sha256 = "1pvk1jg0fiw0j4f1wrnhgirgziliwa44sxfdmcq9ans4zbig4izh"; }; nativeBuildInputs = [ makeWrapper qmakeHook ]; @@ -19,16 +19,14 @@ stdenv.mkDerivation rec { preConfigure = '' substituteInPlace ./cmst.pro \ - --replace "/usr/bin" "$out/bin" \ - --replace "/usr/share" "$out/usr/share" + --replace "/usr/share" "$out/share" substituteInPlace ./cmst.pri \ --replace "/usr/lib" "$out/lib" \ --replace "/usr/share" "$out/share" substituteInPlace ./apps/cmstapp/cmstapp.pro \ - --replace "/usr/bin" "$out/bin" \ - --replace "/usr/share" "$out/share" + --replace "/usr/bin" "$out/bin" substituteInPlace ./apps/rootapp/rootapp.pro \ --replace "/etc" "$out/etc" \ diff --git a/pkgs/tools/networking/httpie/default.nix b/pkgs/tools/networking/httpie/default.nix index a3c0d47d3e7..a5c7353905b 100644 --- a/pkgs/tools/networking/httpie/default.nix +++ b/pkgs/tools/networking/httpie/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pythonPackages }: pythonPackages.buildPythonApplication rec { - name = "httpie-0.9.3"; + name = "httpie-0.9.6"; namePrefix = ""; src = fetchurl { url = "mirror://pypi/h/httpie/${name}.tar.gz"; - sha256 = "0jvzxr8r6cy6ipknkw95qf8rz69nqdv5nky87h1vcp5pf8mgza1h"; + sha256 = "1cch5y0hr9qpfn9m4nw5796c2x7v3m1ni4psjm26ajsl8pw90jx6"; }; propagatedBuildInputs = with pythonPackages; [ pygments requests2 ]; diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index fabcda902be..064f68947b8 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -50,6 +50,7 @@ stdenv.mkDerivation rec { # See discussion in https://github.com/NixOS/nixpkgs/pull/16966 ./dont_create_privsep_path.patch + ./fix-CVE-2016-8858.patch ] ++ optional withGssapiPatches gssapiSrc; @@ -92,7 +93,7 @@ stdenv.mkDerivation rec { description = "An implementation of the SSH protocol"; license = stdenv.lib.licenses.bsd2; platforms = platforms.unix; - maintainers = with maintainers; [ eelco ]; + maintainers = with maintainers; [ eelco aneeshusa ]; broken = hpnSupport; # probably after 6.7 update }; } diff --git a/pkgs/tools/networking/openssh/fix-CVE-2016-8858.patch b/pkgs/tools/networking/openssh/fix-CVE-2016-8858.patch new file mode 100644 index 00000000000..e526161083c --- /dev/null +++ b/pkgs/tools/networking/openssh/fix-CVE-2016-8858.patch @@ -0,0 +1,11 @@ +diff -u -r1.126 -r1.127 +--- ssh/kex.c 2016/09/28 21:44:52 1.126 ++++ ssh/kex.c 2016/10/10 19:28:48 1.127 +@@ -461,6 +461,7 @@ + if (kex == NULL) + return SSH_ERR_INVALID_ARGUMENT; + ++ ssh_dispatch_set(ssh, SSH2_MSG_KEXINIT, NULL); + ptr = sshpkt_ptr(ssh, &dlen); + if ((r = sshbuf_put(kex->peer, ptr, dlen)) != 0) + return r; diff --git a/pkgs/tools/networking/shadowsocks-libev/default.nix b/pkgs/tools/networking/shadowsocks-libev/default.nix index 0ac8dca770a..46fd9e54950 100644 --- a/pkgs/tools/networking/shadowsocks-libev/default.nix +++ b/pkgs/tools/networking/shadowsocks-libev/default.nix @@ -11,12 +11,13 @@ , docbook_xml_dtd_45 , docbook_xsl , libxslt +, pcre }: let - version = "2.5.0"; - sha256 = "6841e0efa1c01caef5a827f463ee304dc9e48fb4751cc9256316df5ab4490ae0"; + version = "2.5.5"; + sha256 = "46a72367b7301145906185f1e4136e39d6792d27643826e409ab708351b6d0dd"; in @@ -29,7 +30,7 @@ stdenv.mkDerivation rec { inherit sha256; }; - buildInputs = [ zlib asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt ] + buildInputs = [ zlib asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt pcre ] ++ optional (!withMbedTLS) openssl ++ optional withMbedTLS mbedtls ++ optionals enableSystemSharedLib [libev libsodium udns]; diff --git a/pkgs/tools/networking/ssldump/default.nix b/pkgs/tools/networking/ssldump/default.nix new file mode 100644 index 00000000000..dcc78560fa3 --- /dev/null +++ b/pkgs/tools/networking/ssldump/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, openssl, libpcap }: + +stdenv.mkDerivation rec { + name = "ssldump"; + version = "0.9b3"; + + src = fetchFromGitHub { + owner = "adulau"; + repo = "ssldump"; + rev = "4529d03a50d39d3697c3e39a3d6f6c9b29448aa0"; + sha256 = "0wwsamzxabfxcil5y2g4v2261vdspxlp12wz4xhji8607jbyjwr1"; + }; + + buildInputs = [ libpcap openssl ]; + prePatch = '' + sed -i -e 's|#include.*net/bpf.h|#include <pcap/bpf.h>|' \ + base/pcap-snoop.c + ''; + configureFlags = [ "--with-pcap-lib=${libpcap}/lib" + "--with-pcap-inc=${libpcap}/include" + "--with-openssl-lib=${openssl}/lib" + "--with-openssl-inc=${openssl}/include" ]; + meta = { + description = "ssldump is an SSLv3/TLS network protocol analyzer"; + homepage = http://ssldump.sourceforge.net; + license = "BSD-style"; + maintainers = with stdenv.lib.maintainers; [ aycanirican ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/networking/statsd/node-packages.nix b/pkgs/tools/networking/statsd/node-packages.nix index 6cf9e8478d7..fd196c249ae 100644 --- a/pkgs/tools/networking/statsd/node-packages.nix +++ b/pkgs/tools/networking/statsd/node-packages.nix @@ -8,7 +8,7 @@ version = "1.3.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/commander/-/commander-1.3.1.tgz"; + url = "https://registry.npmjs.org/commander/-/commander-1.3.1.tgz"; name = "commander-1.3.1.tgz"; sha1 = "02443e02db96f4b32b674225451abb6e9510000e"; }; @@ -28,7 +28,7 @@ version = "0.0.7"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/connection-parse/-/connection-parse-0.0.7.tgz"; + url = "https://registry.npmjs.org/connection-parse/-/connection-parse-0.0.7.tgz"; name = "connection-parse-0.0.7.tgz"; sha1 = "18e7318aab06a699267372b10c5226d25a1c9a69"; }; @@ -40,16 +40,35 @@ 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"; + by-spec."generic-pool"."2.2.0" = + self.by-version."generic-pool"."2.2.0"; + by-version."generic-pool"."2.2.0" = self.buildNodePackage { + name = "generic-pool-2.2.0"; + version = "2.2.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/hashring/-/hashring-1.0.1.tgz"; - name = "hashring-1.0.1.tgz"; - sha1 = "b6a7b8c675a0c715ac0d0071786eb241a28d0a7c"; + url = "https://registry.npmjs.org/generic-pool/-/generic-pool-2.2.0.tgz"; + name = "generic-pool-2.2.0.tgz"; + sha1 = "8b465c1a7588ea9dd2bb133bda0bb66bfef8a63e"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."hashring"."3.2.0" = + self.by-version."hashring"."3.2.0"; + by-version."hashring"."3.2.0" = self.buildNodePackage { + name = "hashring-3.2.0"; + version = "3.2.0"; + bin = false; + src = fetchurl { + url = "https://registry.npmjs.org/hashring/-/hashring-3.2.0.tgz"; + name = "hashring-3.2.0.tgz"; + sha1 = "fda4efde8aa22cdb97fb1d2a65e88401e1c144ce"; }; deps = { "connection-parse-0.0.7" = self.by-version."connection-parse"."0.0.7"; @@ -68,7 +87,7 @@ version = "0.1.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/keypress/-/keypress-0.1.0.tgz"; + url = "https://registry.npmjs.org/keypress/-/keypress-0.1.0.tgz"; name = "keypress-0.1.0.tgz"; sha1 = "4a3188d4291b66b4f65edb99f806aa9ae293592a"; }; @@ -80,16 +99,36 @@ 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"; + by-spec."modern-syslog"."1.1.2" = + self.by-version."modern-syslog"."1.1.2"; + by-version."modern-syslog"."1.1.2" = self.buildNodePackage { + name = "modern-syslog-1.1.2"; + version = "1.1.2"; + bin = false; + src = fetchurl { + url = "https://registry.npmjs.org/modern-syslog/-/modern-syslog-1.1.2.tgz"; + name = "modern-syslog-1.1.2.tgz"; + sha1 = "f1fa58899f3f452d788f1573401212a4ef898de5"; + }; + deps = { + "nan-2.4.0" = self.by-version."nan"."2.4.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ "!win32" ]; + cpu = [ ]; + }; + by-spec."nan"."^2.0.5" = + self.by-version."nan"."2.4.0"; + by-version."nan"."2.4.0" = self.buildNodePackage { + name = "nan-2.4.0"; + version = "2.4.0"; 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"; + url = "https://registry.npmjs.org/nan/-/nan-2.4.0.tgz"; + name = "nan-2.4.0.tgz"; + sha1 = "fb3c59d45fe4effe215f0b890f8adf6eb32d2232"; }; deps = { }; @@ -106,7 +145,7 @@ version = "2.2.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/sequence/-/sequence-2.2.1.tgz"; + url = "https://registry.npmjs.org/sequence/-/sequence-2.2.1.tgz"; name = "sequence-2.2.1.tgz"; sha1 = "7f5617895d44351c0a047e764467690490a16b03"; }; @@ -125,7 +164,7 @@ version = "0.0.2"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/simple-lru-cache/-/simple-lru-cache-0.0.2.tgz"; + url = "https://registry.npmjs.org/simple-lru-cache/-/simple-lru-cache-0.0.2.tgz"; name = "simple-lru-cache-0.0.2.tgz"; sha1 = "d59cc3a193c1a5d0320f84ee732f6e4713e511dd"; }; @@ -144,7 +183,7 @@ version = "0.2.3"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/stackdriver-statsd-backend/-/stackdriver-statsd-backend-0.2.3.tgz"; + url = "https://registry.npmjs.org/stackdriver-statsd-backend/-/stackdriver-statsd-backend-0.2.3.tgz"; name = "stackdriver-statsd-backend-0.2.3.tgz"; sha1 = "6ffead71e5655d4d787c39da8d1c9eaaa59c91d7"; }; @@ -158,28 +197,29 @@ }; "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"; + self.by-version."statsd"."0.8.0"; + by-version."statsd"."0.8.0" = self.buildNodePackage { + name = "statsd-0.8.0"; + version = "0.8.0"; bin = true; src = fetchurl { - url = "http://registry.npmjs.org/statsd/-/statsd-0.7.2.tgz"; - name = "statsd-0.7.2.tgz"; - sha1 = "88901c5f30fa51da5fa3520468c94d7992ef576e"; + url = "https://registry.npmjs.org/statsd/-/statsd-0.8.0.tgz"; + name = "statsd-0.8.0.tgz"; + sha1 = "92041479e174a214df7147f2fab1348af0839052"; }; deps = { + "generic-pool-2.2.0" = self.by-version."generic-pool"."2.2.0"; }; 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"; + "modern-syslog-1.1.2" = self.by-version."modern-syslog"."1.1.2"; + "hashring-3.2.0" = self.by-version."hashring"."3.2.0"; "winser-0.1.6" = self.by-version."winser"."0.1.6"; }; peerDependencies = []; os = [ ]; cpu = [ ]; }; - "statsd" = self.by-version."statsd"."0.7.2"; + "statsd" = self.by-version."statsd"."0.8.0"; by-spec."statsd-influxdb-backend"."*" = self.by-version."statsd-influxdb-backend"."0.6.0"; by-version."statsd-influxdb-backend"."0.6.0" = self.buildNodePackage { @@ -187,7 +227,7 @@ version = "0.6.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/statsd-influxdb-backend/-/statsd-influxdb-backend-0.6.0.tgz"; + url = "https://registry.npmjs.org/statsd-influxdb-backend/-/statsd-influxdb-backend-0.6.0.tgz"; name = "statsd-influxdb-backend-0.6.0.tgz"; sha1 = "25fb83cf0b3af923dfc7d506eb1208def8790d78"; }; @@ -207,7 +247,7 @@ version = "0.1.7"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/statsd-librato-backend/-/statsd-librato-backend-0.1.7.tgz"; + url = "https://registry.npmjs.org/statsd-librato-backend/-/statsd-librato-backend-0.1.7.tgz"; name = "statsd-librato-backend-0.1.7.tgz"; sha1 = "270dc406481c0e6a6f4e72957681a73015f478f6"; }; @@ -227,7 +267,7 @@ version = "0.1.6"; bin = true; src = fetchurl { - url = "http://registry.npmjs.org/winser/-/winser-0.1.6.tgz"; + url = "https://registry.npmjs.org/winser/-/winser-0.1.6.tgz"; name = "winser-0.1.6.tgz"; sha1 = "08663dc32878a12bbce162d840da5097b48466c9"; }; diff --git a/pkgs/tools/package-management/nixops/generic.nix b/pkgs/tools/package-management/nixops/generic.nix index 666efaecfc9..9c4c2600fb4 100644 --- a/pkgs/tools/package-management/nixops/generic.nix +++ b/pkgs/tools/package-management/nixops/generic.nix @@ -1,9 +1,9 @@ -{ lib, pythonPackages, fetchurl, libxslt, docbook5_xsl, openssh +{ lib, python2Packages, fetchurl, libxslt, docbook5_xsl, openssh # version args , src, version }: -pythonPackages.buildPythonApplication { +python2Packages.buildPythonApplication { name = "nixops-${version}"; namePrefix = ""; @@ -11,17 +11,17 @@ pythonPackages.buildPythonApplication { buildInputs = [ libxslt ]; - pythonPath = - [ pythonPackages.prettytable - pythonPackages.boto - pythonPackages.hetzner - pythonPackages.libcloud - pythonPackages.azure-storage - pythonPackages.azure-mgmt-compute - pythonPackages.azure-mgmt-network - pythonPackages.azure-mgmt-resource - pythonPackages.azure-mgmt-storage - pythonPackages.adal + pythonPath = with python2Packages; + [ prettytable + boto + hetzner + libcloud + azure-storage + azure-mgmt-compute + azure-mgmt-network + azure-mgmt-resource + azure-mgmt-storage + adal ]; doCheck = false; diff --git a/pkgs/tools/security/fpm2/default.nix b/pkgs/tools/security/fpm2/default.nix new file mode 100644 index 00000000000..8bb3cba15c4 --- /dev/null +++ b/pkgs/tools/security/fpm2/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, pkgconfig, gnupg, gtk2 +, libxml2, intltool +}: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "fpm2-${version}"; + version = "0.79"; + + src = fetchurl { + url = "http://als.regnet.cz/fpm2/download/fpm2-${version}.tar.bz2"; + sha256 = "d55e9ce6be38a44fc1053d82db2d117cf3991a51898bd86d7913bae769f04da7"; + }; + + buildInputs = [ pkgconfig gnupg gtk2 libxml2 intltool ]; + + meta = { + description = "FPM2 is GTK2 port from Figaro's Password Manager originally developed by John Conneely, with some new enhancements."; + homepage = http://als.regnet.cz/fpm2/; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ hce ]; + }; +} diff --git a/pkgs/tools/security/nitrokey-app/FixInstallDestination.patch b/pkgs/tools/security/nitrokey-app/FixInstallDestination.patch new file mode 100644 index 00000000000..c9de63a320b --- /dev/null +++ b/pkgs/tools/security/nitrokey-app/FixInstallDestination.patch @@ -0,0 +1,35 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 16393a8..3991d2a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -219,18 +219,18 @@ IF(NOT WIN32) + # Install Nitrokey udev rules + install(FILES + ${CMAKE_SOURCE_DIR}/data/40-nitrokey.rules +- DESTINATION /etc/udev/rules.d ++ DESTINATION etc/udev/rules.d + ) + + # Install autocompletion scripts + install(FILES + ${CMAKE_SOURCE_DIR}/data//bash-autocomplete/nitrokey-app +- DESTINATION /etc/bash_completion.d ++ DESTINATION etc/bash_completion.d + ) + + install(FILES + ${CMAKE_SOURCE_DIR}/po/de_DE/nitrokey-app.mo +- DESTINATION /usr/share/locale/de_DE/LC_MESSAGES ++ DESTINATION share/locale/de_DE/LC_MESSAGES + ) + + install(FILES +@@ -238,7 +238,7 @@ IF(NOT WIN32) + ${CMAKE_SOURCE_DIR}/images/quit.png + ${CMAKE_SOURCE_DIR}/images/safe_zahlenkreis.png + ${CMAKE_SOURCE_DIR}/images/settings.png +- DESTINATION /usr/share/nitrokey ++ DESTINATION share/nitrokey + ) + + ENDIF () # NOT WIN32 diff --git a/pkgs/tools/security/nitrokey-app/HeaderPath.patch b/pkgs/tools/security/nitrokey-app/HeaderPath.patch new file mode 100644 index 00000000000..695b7559116 --- /dev/null +++ b/pkgs/tools/security/nitrokey-app/HeaderPath.patch @@ -0,0 +1,13 @@ +diff --git a/src/utils/hid_libusb.c b/src/utils/hid_libusb.c +index bd8c14e..537292d 100644 +--- a/src/utils/hid_libusb.c ++++ b/src/utils/hid_libusb.c +@@ -44,7 +44,7 @@ + #include <wchar.h> + + /* GNU / LibUSB */ +-#include "libusb.h" ++#include "libusb-1.0/libusb.h" + #include "iconv.h" + + #include "hidapi.h" diff --git a/pkgs/tools/security/nitrokey-app/default.nix b/pkgs/tools/security/nitrokey-app/default.nix new file mode 100644 index 00000000000..38e083ba131 --- /dev/null +++ b/pkgs/tools/security/nitrokey-app/default.nix @@ -0,0 +1,39 @@ +{ stdenv, cmake, fetchFromGitHub, libappindicator-gtk2, libnotify, libusb1, pkgconfig +, qt5 }: + +stdenv.mkDerivation rec { + name = "nitrokey-app"; + version = "0.4"; + + src = fetchFromGitHub { + owner = "Nitrokey"; + repo = "nitrokey-app"; + rev = "v${version}"; + sha256 = "0h131847pllsr7rk7nn8vlj74byb5f14cl9h3g3pmlq5zj8ylfkx"; + }; + + buildInputs = [ + cmake + libappindicator-gtk2 + libnotify + libusb1 + pkgconfig + qt5.qtbase + ]; + patches = [ + ./FixInstallDestination.patch + ./HeaderPath.patch + ]; + meta = { + description = "Provides extra functionality for the Nitrokey Pro and Storage"; + longDescription = '' + The nitrokey-app provides a QT system tray widget with wich you can + access the extra functionality of a Nitrokey Storage or Nitrokey Pro. + See https://www.nitrokey.com/ for more information. + ''; + homepage = https://github.com/Nitrokey/nitrokey-app; + repositories.git = https://github.com/Nitrokey/nitrokey-app.git; + license = stdenv.lib.licenses.gpl3; + maintainer = stdenv.lib.maintainers.kaiha; + }; +} diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index 0e69729a226..8fbf35caf1d 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "tor-0.2.8.8"; + name = "tor-0.2.8.9"; src = fetchurl { url = "https://archive.torproject.org/tor-package-archive/${name}.tar.gz"; - sha256 = "1pp3h0a1cl25fv04b3j6wp8aw1sfpbd2lmag397dpp2k2b305bxi"; + sha256 = "3f5c273bb887be4aff11f4d99b9e2e52d293b81ff4f6302b730161ff16dc5316"; }; nativeBuildInputs = [ pkgconfig ]; |