diff options
Diffstat (limited to 'pkgs/tools')
70 files changed, 602 insertions, 246 deletions
diff --git a/pkgs/tools/X11/nitrogen/default.nix b/pkgs/tools/X11/nitrogen/default.nix index 070152427f29..06a7630c7bc0 100644 --- a/pkgs/tools/X11/nitrogen/default.nix +++ b/pkgs/tools/X11/nitrogen/default.nix @@ -1,20 +1,25 @@ { stdenv, fetchurl, pkgconfig, glib, gtkmm2 }: -let version = "1.5.2"; +let version = "1.6.0"; in stdenv.mkDerivation rec { name = "nitrogen-${version}"; src = fetchurl { - url = "http://projects.l3ib.org/nitrogen/files/nitrogen-${version}.tar.gz"; - sha256 = "60a2437ce6a6c0ba44505fc8066c1973140d4bb48e1e5649f525c7b0b8bf9fd2"; + url = "http://projects.l3ib.org/nitrogen/files/${name}.tar.gz"; + sha256 = "1pil2qa3v7x56zh9xvba8v96abnf9qgglbsdlrlv0kfjlhzl4jhr"; }; - buildInputs = [ glib gtkmm2 pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; - NIX_LDFLAGS = "-lX11"; + buildInputs = [ glib gtkmm2 ]; - patchPhase = "patchShebangs data/icon-theme-installer"; + NIX_CXXFLAGS_COMPILE = "-std=c++11"; + + patchPhase = '' + substituteInPlace data/Makefile.in --replace /usr/share $out/share + patchShebangs data/icon-theme-installer + ''; meta = { description = "A wallpaper browser and setter for X11"; diff --git a/pkgs/tools/X11/virtualgl/lib.nix b/pkgs/tools/X11/virtualgl/lib.nix index 5707679c03c1..c9530a5cdd98 100644 --- a/pkgs/tools/X11/virtualgl/lib.nix +++ b/pkgs/tools/X11/virtualgl/lib.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "virtualgl-lib-${version}"; - version = "2.5"; + version = "2.5.1"; src = fetchurl { url = "mirror://sourceforge/virtualgl/VirtualGL-${version}.tar.gz"; - sha256 = "1mnpljmx8nxnmpbx4ja430b3y535wkz185qknsxmk27yz4dbmm8l"; + sha256 = "0n9ngwji9k0hqy81ridndf7z4lwq5dzmqw66r6vxfz15aw0jwd6s"; }; cmakeFlags = [ "-DVGL_SYSTEMFLTK=1" "-DTJPEG_LIBRARY=${libjpeg_turbo.out}/lib/libturbojpeg.so" ]; diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 871d5a9dbd8c..4ae367abf612 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pythonPackages, pkgconfig +{ stdenv, lib, fetchurl, python2Packages, pkgconfig , xorg, gtk2, glib, pango, cairo, gdk_pixbuf, atk , makeWrapper, xkbcomp, xorgserver, getopt, xauth, utillinux, which, fontsConf, xkeyboard_config , ffmpeg, x264, libvpx, libwebp @@ -8,7 +8,7 @@ with lib; let - inherit (pythonPackages) python cython buildPythonApplication; + inherit (python2Packages) python cython buildPythonApplication; in buildPythonApplication rec { name = "xpra-0.17.6"; namePrefix = ""; @@ -39,7 +39,7 @@ in buildPythonApplication rec { makeWrapper ]; - propagatedBuildInputs = with pythonPackages; [ + propagatedBuildInputs = with python2Packages; [ pillow pygtk pygobject2 rencode pycrypto cryptography pycups lz4 dbus-python netifaces numpy websockify pygobject3 gst-python ]; diff --git a/pkgs/tools/admin/certbot/default.nix b/pkgs/tools/admin/certbot/default.nix index 80805666a3a4..998b8d2e13de 100644 --- a/pkgs/tools/admin/certbot/default.nix +++ b/pkgs/tools/admin/certbot/default.nix @@ -1,6 +1,8 @@ -{ stdenv, pythonPackages, fetchFromGitHub, dialog }: +{ stdenv, python2Packages, fetchFromGitHub, dialog }: -pythonPackages.buildPythonApplication rec { +# Latest version of certbot supports python3 and python3 version of pythondialog + +python2Packages.buildPythonApplication rec { name = "certbot-${version}"; version = "0.6.0"; @@ -11,7 +13,7 @@ pythonPackages.buildPythonApplication rec { sha256 = "1x0prlldkgg0hxmya4m5h3k3c872wr0jylmzpr3m04mk339yiw0c"; }; - propagatedBuildInputs = with pythonPackages; [ + propagatedBuildInputs = with python2Packages; [ ConfigArgParse acme configobj @@ -26,7 +28,7 @@ pythonPackages.buildPythonApplication rec { zope_component zope_interface ]; - buildInputs = [ dialog ] ++ (with pythonPackages; [ nose mock gnureadline ]); + buildInputs = [ dialog ] ++ (with python2Packages; [ nose mock gnureadline ]); patchPhase = '' substituteInPlace certbot/notify.py --replace "/usr/sbin/sendmail" "/var/setuid-wrappers/sendmail" diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index eeefd4d99b5c..d0eb9e8fb15a 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -7,13 +7,13 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "1.6.0"; + version = "1.7.0"; name = "tigervnc-${version}"; src = fetchgit { url = "https://github.com/TigerVNC/tigervnc/"; - sha256 = "1plljv1cxsax88kv52g02n8c1hzwgp6j1p8z1aqhskw36shg4pij"; - rev = "5a727f25990d05c9a1f85457b45d6aed66409cb3"; + sha256 = "1b6n2gq6078x8dwz471a68jrkgpcxmbiivmlsakr42vrndm7niz3"; + rev = "e25272fc74ef09987ccaa33b9bf1736397c76fdf"; }; inherit fontDirectories; diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix index 80c84236b8db..447ef1f623fc 100644 --- a/pkgs/tools/archivers/gnutar/default.nix +++ b/pkgs/tools/archivers/gnutar/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "097hx7sbzp8qirl4m930lw84kn0wmxhmq7v1qpra3mrg0b8cyba0"; }; - patches = [ ./CVE-2016-6321.patch ]; # FIXME: remove on another stdenv rebuild + patches = [ ./CVE-2016-6321.patch ]; # avoid retaining reference to CF during stdenv bootstrap configureFlags = stdenv.lib.optionals stdenv.isDarwin [ diff --git a/pkgs/tools/backup/bup/default.nix b/pkgs/tools/backup/bup/default.nix index 075f1653adf8..4e035ab67acb 100644 --- a/pkgs/tools/backup/bup/default.nix +++ b/pkgs/tools/backup/bup/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, fetchurl, makeWrapper -, perl, pandoc, pythonPackages, git +, perl, pandoc, python2Packages, git , par2cmdline ? null, par2Support ? false }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "1hsxzrjvqa3pd74vmz8agiiwynrzynp1i726h0fzdsakc4adya4l"; }; - buildInputs = [ git pythonPackages.python ]; + buildInputs = [ git python2Packages.python ]; nativeBuildInputs = [ pandoc perl makeWrapper ]; postPatch = '' @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/bup \ --prefix PATH : ${git}/bin \ --prefix PYTHONPATH : ${concatStringsSep ":" (map (x: "$(toPythonPath ${x})") - (with pythonPackages; + (with python2Packages; [ setuptools tornado ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ pyxattr pylibacl fuse ]))} ''; diff --git a/pkgs/tools/compression/lbzip2/default.nix b/pkgs/tools/compression/lbzip2/default.nix index cf616a21e0aa..cc6453e801e6 100644 --- a/pkgs/tools/compression/lbzip2/default.nix +++ b/pkgs/tools/compression/lbzip2/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = http://lbzip2.org/; + homepage = "http://lbzip2.org/"; description = "Parallel bzip2 compression utility"; license = licenses.gpl3; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index 0e7e6fbcdec2..525aa2fec28a 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -2,14 +2,14 @@ , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt }: -let version = "4.8.3"; in +let version = "4.8.2"; in stdenv.mkDerivation rec { name = "btrfs-progs-${version}"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "1wlflrygnpndppil9g12pk184f75g9qx1lkr0x1gijigglqhr9n1"; + sha256 = "0pswcfmdnfc586770h74abp67gn2xv8fd46vxlimnmn837sj7h41"; }; buildInputs = [ diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix index f00a80603f97..8ff100394494 100644 --- a/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libuuid }: stdenv.mkDerivation rec { - name = "e2fsprogs-1.42.13"; + name = "e2fsprogs-1.43.3"; src = fetchurl { url = "mirror://sourceforge/e2fsprogs/${name}.tar.gz"; - sha256 = "1m72lk90b5i3h9qnmss6aygrzyn8x2avy3hyaq2fb0jglkrkz6ar"; + sha256 = "09wrn60rlqdgjkmm09yv32zxdjba2pd4ya3704bhywyln2xz33nf"; }; outputs = [ "bin" "dev" "out" "man" ]; diff --git a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix index edb2978001b2..b207eeeb9c3d 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix @@ -28,7 +28,6 @@ buildPythonApplication rec { }' blivet/formats/__init__.py sed -i -e 's|"lsof"|"${lsof}/bin/lsof"|' blivet/formats/fs.py sed -i -r -e 's|"(u?mount)"|"${utillinux.bin}/bin/\1"|' blivet/util.py - sed -i '/pvscan/s/, *"--cache"//' blivet/devicelibs/lvm.py '' + stdenv.lib.optionalString useNixUdev '' sed -i -e '/find_library/,/find_library/ { c libudev = "${systemd.lib}/lib/libudev.so.1" diff --git a/pkgs/tools/filesystems/snapraid/default.nix b/pkgs/tools/filesystems/snapraid/default.nix index 3946d6fcef84..bbaad516ebe0 100644 --- a/pkgs/tools/filesystems/snapraid/default.nix +++ b/pkgs/tools/filesystems/snapraid/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "snapraid-${version}"; - version = "10.0"; + version = "11.0"; src = fetchurl { url = "https://github.com/amadvance/snapraid/releases/download/v${version}/snapraid-${version}.tar.gz"; - sha256 = "1mhs0gl285a5y2bw6k04lrnyg1pp2am7dfcsvg0w4vr5h2ag3p7p"; + sha256 = "0wapbi8ph7qcyh1jwyrn2r5slzsznlxvg137r4l02xgaaf42p9rh"; }; doCheck = true; diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/tools/graphics/gmic/default.nix index 606e049703df..ccee4f213141 100644 --- a/pkgs/tools/graphics/gmic/default.nix +++ b/pkgs/tools/graphics/gmic/default.nix @@ -1,14 +1,16 @@ -{ stdenv, fetchurl, fftw, zlib, libjpeg, libtiff, libpng }: +{ stdenv, fetchurl, fftw, zlib, libjpeg, libtiff, libpng, pkgconfig }: stdenv.mkDerivation rec { name = "gmic-${version}"; - version = "1.7.7"; + version = "1.7.8"; src = fetchurl { url = "http://gmic.eu/files/source/gmic_${version}.tar.gz"; - sha256 = "0shcxgq8nc391c0y0zh3l87g3p7fvsmgshi1x1jvvwwq1b9nf6vp"; + sha256 = "1921s0n2frj8q95l8lm8was64cypnychgcgcavx9q8qljzbk4brs"; }; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fftw zlib libjpeg libtiff libpng ]; sourceRoot = "${name}/src"; diff --git a/pkgs/tools/graphics/graphviz/2.0.nix b/pkgs/tools/graphics/graphviz/2.0.nix index 255ec2d536f6..32cc283bc3c9 100644 --- a/pkgs/tools/graphics/graphviz/2.0.nix +++ b/pkgs/tools/graphics/graphviz/2.0.nix @@ -26,6 +26,8 @@ stdenv.mkDerivation rec { "--with-jpeglibdir=${libjpeg.out}/lib" "--with-expatincludedir=${expat.dev}/include" "--with-expatlibdir=${expat.out}/lib" + "--with-ltdl-include=${libtool}/include" + "--with-ltdl-lib=${libtool.lib}/lib" ] ++ stdenv.lib.optional (xlibsWrapper == null) "--without-x"; diff --git a/pkgs/tools/graphics/graphviz/2.32.nix b/pkgs/tools/graphics/graphviz/2.32.nix index 9c125433c3a6..a09d60f788c7 100644 --- a/pkgs/tools/graphics/graphviz/2.32.nix +++ b/pkgs/tools/graphics/graphviz/2.32.nix @@ -26,6 +26,8 @@ stdenv.mkDerivation rec { "--with-jpeglibdir=${libjpeg.out}/lib" "--with-expatincludedir=${expat.dev}/include" "--with-expatlibdir=${expat.out}/lib" + "--with-ltdl-include=${libtool}/include" + "--with-ltdl-lib=${libtool.lib}/lib" "--with-cgraph=no" "--with-sparse=no" ] diff --git a/pkgs/tools/misc/aptly/default.nix b/pkgs/tools/misc/aptly/default.nix new file mode 100644 index 000000000000..a39b4247109b --- /dev/null +++ b/pkgs/tools/misc/aptly/default.nix @@ -0,0 +1,33 @@ +{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, gnupg1compat, bzip2, xz, graphviz }: + +buildGoPackage rec { + name = "aptly-${version}"; + version = "0.9.7"; + rev = "v${version}"; + + src = fetchFromGitHub { + inherit rev; + owner = "smira"; + repo = "aptly"; + sha256 = "0j1bmqdah4i83r2cf8zcq87aif1qg90yasgf82yygk3hj0gw1h00"; + }; + + goPackagePath = "github.com/smira/aptly"; + goDeps = ./deps.nix; + + nativeBuildInputs = [ makeWrapper ]; + + postInstall = '' + rm $bin/bin/man + wrapProgram "$bin/bin/aptly" \ + --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnupg1compat bzip2 xz graphviz ]}" + ''; + + meta = with stdenv.lib; { + homepage = https://www.aptly.info; + description = "Debian repository management tool"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = [ maintainers.montag451 ]; + }; +} diff --git a/pkgs/tools/misc/aptly/deps.nix b/pkgs/tools/misc/aptly/deps.nix new file mode 100644 index 000000000000..f0163f34ae8b --- /dev/null +++ b/pkgs/tools/misc/aptly/deps.nix @@ -0,0 +1,245 @@ +[ + { + goPackagePath = "github.com/AlekSi/pointer"; + fetch = { + type = "git"; + url = https://github.com/AlekSi/pointer.git; + rev = "5f6d527dae3d678b46fbb20331ddf44e2b841943"; + sha256 = "127n71d8y1d8hxv9fq9z1midw3vk5xa6aq45gffjvwabx4cgha1l"; + }; + } + { + goPackagePath = "github.com/awalterschulze/gographviz"; + fetch = { + type = "git"; + url = https://github.com/awalterschulze/gographviz.git; + rev = "20d1f693416d9be045340150094aa42035a41c9e"; + sha256 = "1q4796nzanikqmz77jdc2xrq30n93w6ljcfsbhij3yj3s698bcaf"; + }; + } + { + goPackagePath = "github.com/aws/aws-sdk-go"; + fetch = { + type = "git"; + url = https://github.com/aws/aws-sdk-go.git; + rev = "a170e9cb76475a0da7c0326a13cc2b39e9244b3b"; + sha256 = "0z7pgb9q0msvdkrvjwi95cbl9k9w8f3n2liwkl6fli0nx9jyamqw"; + }; + } + { + goPackagePath = "github.com/cheggaaa/pb"; + fetch = { + type = "git"; + url = https://github.com/cheggaaa/pb.git; + rev = "2c1b74620cc58a81ac152ee2d322e28c806d81ed"; + sha256 = "148fv6a0ranzcc1lv4v5lmvgbfx05dhzpwsg8vxi9ggn51n496ny"; + }; + } + { + goPackagePath = "github.com/DisposaBoy/JsonConfigReader"; + fetch = { + type = "git"; + url = https://github.com/DisposaBoy/JsonConfigReader.git; + rev = "33a99fdf1d5ee1f79b5077e9c06f955ad356d5f4"; + sha256 = "1rq7hp1xk8lzvn9bv9jfkszw8p2qia8prvrx540gb2y93jw9i847"; + }; + } + { + goPackagePath = "github.com/gin-gonic/gin"; + fetch = { + type = "git"; + url = https://github.com/gin-gonic/gin.git; + rev = "b1758d3bfa09e61ddbc1c9a627e936eec6a170de"; + sha256 = "0y3v5vi68xafcvz9yz6ffww96xs2qalklnaab7vrwpax3brlkipk"; + }; + } + { + goPackagePath = "github.com/go-ini/ini"; + fetch = { + type = "git"; + url = https://github.com/go-ini/ini.git; + rev = "afbd495e5aaea13597b5e14fe514ddeaa4d76fc3"; + sha256 = "0xi8zr9qw38sdbv95c2ip31yczbm4axdvmj3ljyivn9xh2nbxfia"; + }; + } + { + goPackagePath = "github.com/jlaffaye/ftp"; + fetch = { + type = "git"; + url = https://github.com/jlaffaye/ftp.git; + rev = "fec71e62e457557fbe85cefc847a048d57815d76"; + sha256 = "08ivzsfswgl4xlr6wmqpbf77jclh8ivhwxlhj59allp27lic1kgm"; + }; + } + { + goPackagePath = "github.com/jmespath/go-jmespath"; + fetch = { + type = "git"; + url = https://github.com/jmespath/go-jmespath.git; + rev = "0b12d6b521d83fc7f755e7cfc1b1fbdd35a01a74"; + sha256 = "1vv6hph8j6xgv7gwl9vvhlsaaqsm22sxxqmgmldi4v11783pc1ld"; + }; + } + { + goPackagePath = "github.com/julienschmidt/httprouter"; + fetch = { + type = "git"; + url = https://github.com/julienschmidt/httprouter.git; + rev = "46807412fe50aaceb73bb57061c2230fd26a1640"; + sha256 = "0mvzjpzlb1gkb6lp0nwni3vid6fw33dkzl6s9gj7gp2wsbwzcdhd"; + }; + } + { + goPackagePath = "github.com/mattn/go-shellwords"; + fetch = { + type = "git"; + url = https://github.com/mattn/go-shellwords.git; + rev = "c7ca6f94add751566a61cf2199e1de78d4c3eee4"; + sha256 = "1714ca0p0mwijck0vxdssizxyjjjki1dpc5bl51ayw5sa7s6d4n2"; + }; + } + { + goPackagePath = "github.com/mkrautz/goar"; + fetch = { + type = "git"; + url = https://github.com/mkrautz/goar.git; + rev = "282caa8bd9daba480b51f1d5a988714913b97aad"; + sha256 = "0b6nmgyh5lmm8d1psm5yqqmshkqi87di1191c9q95z1gkkfi16b2"; + }; + } + { + goPackagePath = "github.com/mxk/go-flowrate"; + fetch = { + type = "git"; + url = https://github.com/mxk/go-flowrate.git; + rev = "cca7078d478f8520f85629ad7c68962d31ed7682"; + sha256 = "0zqs39923ja0yypdmiqk6x8pgmfs3ms5x5sl1dqv9z6zyx2xy541"; + }; + } + { + goPackagePath = "github.com/ncw/swift"; + fetch = { + type = "git"; + url = https://github.com/ncw/swift.git; + rev = "384ef27c70645e285f8bb9d02276bf654d06027e"; + sha256 = "1is9z6pbn55yr5b7iizfyi8y19nc9xprd87cwab4i54bxkqqp5hg"; + }; + } + { + goPackagePath = "github.com/smira/go-aws-auth"; + fetch = { + type = "git"; + url = https://github.com/smira/go-aws-auth.git; + rev = "0070896e9d7f4f9f2d558532b2d896ce2239992a"; + sha256 = "0ic7fgpgr8n1gvhwab1isbm82azy8kb9bzjxsch5i2dpvnz03rvh"; + }; + } + { + goPackagePath = "github.com/smira/go-xz"; + fetch = { + type = "git"; + url = https://github.com/smira/go-xz.git; + rev = "0c531f070014e218b21f3cfca801cc992d52726d"; + sha256 = "1wpgw8y6xjyf75dfcirx58cr1c277avdb6hr7xvcddhcfn01qzma"; + }; + } + { + goPackagePath = "github.com/smira/commander"; + fetch = { + type = "git"; + url = https://github.com/smira/commander.git; + rev = "f408b00e68d5d6e21b9f18bd310978dafc604e47"; + sha256 = "0gzhxjni17qq0z4zhakjrp98qd0qmf6wlyrx5xwwsqgh07nyzssa"; + }; + } + { + goPackagePath = "github.com/smira/flag"; + fetch = { + type = "git"; + url = https://github.com/smira/flag.git; + rev = "357ed3e599ffcbd4aeaa828e1d10da2df3ea5107"; + sha256 = "0wh77lz7z23rs9mbyi89l28i16gp1zx2312zxs4ngqdvjvinsiri"; + }; + } + { + goPackagePath = "github.com/smira/go-ftp-protocol"; + fetch = { + type = "git"; + url = https://github.com/smira/go-ftp-protocol.git; + rev = "066b75c2b70dca7ae10b1b88b47534a3c31ccfaa"; + sha256 = "1az9p44fa7bcw92ywcyrqch2j1781b96rpid2qggyp3nhjivx8rx"; + }; + } + { + goPackagePath = "github.com/smira/go-uuid"; + fetch = { + type = "git"; + url = https://github.com/smira/go-uuid.git; + rev = "ed3ca8a15a931b141440a7e98e4f716eec255f7d"; + sha256 = "1vasidfa2pqrawk4zm5bqsi5q7f3qx3xm159hs36r0h0kj0c7sz4"; + }; + } + { + goPackagePath = "github.com/smira/lzma"; + fetch = { + type = "git"; + url = https://github.com/smira/lzma.git; + rev = "7f0af6269940baa2c938fabe73e0d7ba41205683"; + sha256 = "0ka8mbyg2dj076aslbi1hiahw5n5gjyn7s4w3x4ws9ak5chw5zif"; + }; + } + { + goPackagePath = "github.com/golang/snappy"; + fetch = { + type = "git"; + url = https://github.com/golang/snappy.git; + rev = "723cc1e459b8eea2dea4583200fd60757d40097a"; + sha256 = "0bprq0qb46f5511b5scrdqqzskqqi2z8b4yh3216rv0n1crx536h"; + }; + } + { + goPackagePath = "github.com/syndtr/goleveldb"; + fetch = { + type = "git"; + url = https://github.com/syndtr/goleveldb.git; + rev = "917f41c560270110ceb73c5b38be2a9127387071"; + sha256 = "0ybpcizg2gn3ln9rycqbaqlclci3k2q8mipcwq7927ym113d7q32"; + }; + } + { + goPackagePath = "github.com/ugorji/go"; + fetch = { + type = "git"; + url = https://github.com/ugorji/go.git; + rev = "71c2886f5a673a35f909803f38ece5810165097b"; + sha256 = "157f24xnkhclrjwwa1b7lmpj112ynlbf7g1cfw0c657iqny5720j"; + }; + } + { + goPackagePath = "github.com/vaughan0/go-ini"; + fetch = { + type = "git"; + url = https://github.com/vaughan0/go-ini.git; + rev = "a98ad7ee00ec53921f08832bc06ecf7fd600e6a1"; + sha256 = "1l1isi3czis009d9k5awsj4xdxgbxn4n9yqjc1ac7f724x6jacfa"; + }; + } + { + goPackagePath = "github.com/wsxiaoys/terminal"; + fetch = { + type = "git"; + url = https://github.com/wsxiaoys/terminal.git; + rev = "5668e431776a7957528361f90ce828266c69ed08"; + sha256 = "0dirblp3lwijsrx590qfp8zn5xspkjzq7ihkv05806mpncg5ivxd"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = https://go.googlesource.com/crypto.git; + rev = "a7ead6ddf06233883deca151dffaef2effbf498f"; + sha256 = "0gyvja1kh6xkxy7mg5y72zpvmi6hfix34kmzg4sry1x7bycw3dfc"; + }; + } +] diff --git a/pkgs/tools/misc/aspcud/default.nix b/pkgs/tools/misc/aspcud/default.nix index 0bdcfa76fec1..577c0a33b3ee 100644 --- a/pkgs/tools/misc/aspcud/default.nix +++ b/pkgs/tools/misc/aspcud/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, - boost, clasp, cmake, clingo, re2c + boost, clasp, cmake, gringo, re2c }: let @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { sha256 = "029035vcdk527ssf126i8ipi5zs73gqpbrg019pvm9r24rf0m373"; }; - buildInputs = [ boost clasp cmake clingo re2c ]; + buildInputs = [ boost clasp cmake gringo re2c ]; buildPhase = '' cmake -DCMAKE_BUILD_TYPE=Release \ - -DGRINGO_LOC=${clingo}/bin/gringo \ + -DGRINGO_LOC=${gringo}/bin/gringo \ -DCLASP_LOC=${clasp}/bin/clasp \ -DENCODING_LOC=$out/share/aspcud/specification.lp \ . diff --git a/pkgs/tools/misc/autojump/default.nix b/pkgs/tools/misc/autojump/default.nix index ea486dd5154f..817510bfb761 100644 --- a/pkgs/tools/misc/autojump/default.nix +++ b/pkgs/tools/misc/autojump/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, python, bash }: let - version = "22.2.4"; + version = "22.5.0"; in stdenv.mkDerivation rec { name = "autojump-${version}"; @@ -9,7 +9,7 @@ in src = fetchurl { url = "http://github.com/joelthelion/autojump/archive/release-v${version}.tar.gz"; name = "autojump-${version}.tar.gz"; - sha256 = "816badb0721f735e2b86bdfa8b333112f3867343c7c2263c569f75b4ec91f475"; + sha256 = "00ai0j37ka3557a8m7ig44dby7v01pckwi8gl479vz5b5pw1z8cd"; }; buildInputs = [ python bash ]; diff --git a/pkgs/tools/misc/bibtex2html/default.nix b/pkgs/tools/misc/bibtex2html/default.nix index 068d3e3866e0..74894da54182 100644 --- a/pkgs/tools/misc/bibtex2html/default.nix +++ b/pkgs/tools/misc/bibtex2html/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { 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; + license = licenses.gpl2; platforms = ocaml.meta.platforms or []; maintainers = [ maintainers.scolobb ]; }; diff --git a/pkgs/tools/misc/clingo/default.nix b/pkgs/tools/misc/clingo/default.nix deleted file mode 100644 index 6ab0a68920f7..000000000000 --- a/pkgs/tools/misc/clingo/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, fetchFromGitHub, - bison, re2c, scons -}: - -let - version = "5.1.0"; -in - -stdenv.mkDerivation rec { - name = "clingo-${version}"; - - src = fetchFromGitHub { - owner = "potassco"; - repo = "clingo"; - rev = "v${version}"; - sha256 = "1rvaqqa8xfagsqxk45lax3l29sksijd3zvl662vpvdi1sy0d71xv"; - }; - - buildInputs = [ bison re2c scons ]; - - buildPhase = '' - scons --build-dir=release - ''; - - installPhase = '' - mkdir -p $out/bin - cp build/release/{gringo,clingo,reify,lpconvert} $out/bin/ - ''; - - meta = with stdenv.lib; { - description = "A grounder and solver for logic programs."; - homepage = http://potassco.org; - platforms = platforms.linux; - maintainers = [ maintainers.hakuch ]; - license = licenses.gpl3Plus; - }; -} diff --git a/pkgs/tools/misc/cloud-utils/default.nix b/pkgs/tools/misc/cloud-utils/default.nix index 8bba00b564d9..af518e7efa98 100644 --- a/pkgs/tools/misc/cloud-utils/default.nix +++ b/pkgs/tools/misc/cloud-utils/default.nix @@ -1,20 +1,25 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, makeWrapper, gawk, gnused, utillinux }: stdenv.mkDerivation { - name = "cloud-utils-0.27"; + # NOTICE: if you bump this, make sure to run + # $ nix-build nixos/release-combined.nix -A nixos.tests.ec2-nixops + name = "cloud-utils-0.29"; src = fetchurl { - url = "https://launchpad.net/cloud-utils/trunk/0.27/+download/cloud-utils-0.27.tar.gz"; - sha256 = "16shlmg36lidp614km41y6qk3xccil02f5n3r4wf6d1zr5n4v8vd"; + url = "https://launchpad.net/cloud-utils/trunk/0.29/+download/cloud-utils-0.29.tar.gz"; + sha256 = "0z15gs8gmpy5gqxl7yiyjj7a6s8iw44djj6axvbci627b9pvd8cy"; }; - patches = [ ./growpart-util-linux-2.26.patch ]; + buildInputs = [ makeWrapper ]; buildPhase = '' mkdir -p $out/bin cp bin/growpart $out/bin/growpart sed -i 's|awk|gawk|' $out/bin/growpart sed -i 's|sed|gnused|' $out/bin/growpart + ln -s sed $out/bin/gnused + wrapProgram $out/bin/growpart --prefix PATH : "${stdenv.lib.makeBinPath [ gnused gawk utillinux ]}:$out/bin" ''; dontInstall = true; dontPatchShebangs = true; + dontStrip = true; meta = { platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/misc/contacts/default.nix b/pkgs/tools/misc/contacts/default.nix index 2bfe0eb42665..d146cd93343e 100644 --- a/pkgs/tools/misc/contacts/default.nix +++ b/pkgs/tools/misc/contacts/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, xcbuild, Foundation, AddressBook }: stdenv.mkDerivation rec { version = "1.1a-3"; @@ -9,15 +9,16 @@ stdenv.mkDerivation rec { sha256 = "0wdqc1ndgrdhqapvvgx5xihc750szv08lp91x4l6n0gh59cpxpg3"; }; - preBuild = '' - substituteInPlace Makefile --replace "xcodebuild" "/usr/bin/xcodebuild" - ''; + buildInputs = [ xcbuild Foundation AddressBook ]; installPhase = '' mkdir -p $out/bin - cp ./build/Deployment/contacts $out/bin + cp ./contacts-*/Build/Products/Default/contacts $out/bin ''; + ## FIXME: the framework setup hook isn't adding these correctly + NIX_LDFLAGS = " -F${Foundation}/Library/Frameworks/ -F${AddressBook}/Library/Frameworks/"; + meta = with stdenv.lib; { description = "Access contacts from the Mac address book from command-line"; homepage = http://www.gnufoo.org/contacts/contacts.html; diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix index ece9c5ed3824..2fe9ec2fbe79 100644 --- a/pkgs/tools/misc/debian-devscripts/default.nix +++ b/pkgs/tools/misc/debian-devscripts/default.nix @@ -8,12 +8,12 @@ let inherit (python3Packages) python setuptools; in stdenv.mkDerivation rec { - version = "2.16.6"; + version = "2.16.8"; name = "debian-devscripts-${version}"; src = fetchurl { url = "mirror://debian/pool/main/d/devscripts/devscripts_${version}.tar.xz"; - sha256 = "0lkhilwb1gsnk8q14wkrl78s0w3l8aghsaz00vprmkmcc3j1x14h"; + sha256 = "0xy1nvqrnifx46g8ch69pk31by0va6hn10wpi1fkrsrgncanjjh1"; }; buildInputs = [ perl CryptSSLeay LWP unzip xz dpkg TimeDate DBFile diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix index d60b47ca0116..e70efe6c4f11 100644 --- a/pkgs/tools/misc/debootstrap/default.nix +++ b/pkgs/tools/misc/debootstrap/default.nix @@ -1,38 +1,16 @@ { stdenv, fetchurl, dpkg, gettext, gawk, perl, wget, coreutils, fakeroot }: -let # USAGE like this: debootstrap sid /tmp/target-chroot-directory # There is also cdebootstrap now. Is that easier to maintain? - makedev = stdenv.mkDerivation { - name = "makedev-for-debootstrap"; - src = fetchurl { - url = mirror://debian/pool/main/m/makedev/makedev_2.3.1.orig.tar.gz; - sha256 = "1yhxlj2mhn1nqkx1f0sn0bl898nf28arxxa4lgp7hdrb5cpp36c5"; - }; - patches = [ - (fetchurl { - url = "mirror://debian/pool/main/m/makedev/makedev_2.3.1-93.diff.gz"; - sha256 = "08328779mc0b20xkj76ilpf9c8bw6zkz5xiw5l2kwm690dxp9nvw"; - }) - ]; - # TODO install man - installPhase = '' - mkdir -p $out/sbin - ls -l - t=$out/sbin/MAKEDEV - cp MAKEDEV $t - chmod +x $t - ''; - }; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "debootstrap-${version}"; - version = "1.0.80"; + version = "1.0.87"; src = fetchurl { # git clone git://git.debian.org/d-i/debootstrap.git # I'd like to use the source. However it's lacking the lanny script ? (still true?) url = "mirror://debian/pool/main/d/debootstrap/debootstrap_${version}.tar.gz"; - sha256 = "06gigscd2327wsvc7n7w2m8xmaixvp4kyqhayn00qrgd9i9w34x6"; + sha256 = "1amk3wghx4f7zfp7d8r0hgqn5gvph50qa6nvh32q2j8aihdr7374"; }; buildInputs = [ dpkg gettext gawk perl ]; @@ -72,8 +50,6 @@ in stdenv.mkDerivation rec { d=$out/share/debootstrap mkdir -p $out/{share/debootstrap,bin} - ${fakeroot}/bin/fakeroot -- make devices.tar.gz MAKEDEV=${makedev}/sbin/MAKEDEV - cp -r . $d cat >> $out/bin/debootstrap << EOF @@ -90,10 +66,6 @@ in stdenv.mkDerivation rec { mv debootstrap.8 $out/man/man8 ''; - passthru = { - inherit makedev; - }; - meta = { description = "Tool to create a Debian system in a chroot"; homepage = http://packages.debian.org/de/lenny/debootstrap; # http://code.erisian.com.au/Wiki/debootstrap diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix index 0e3922d2928a..d26eb8f45aea 100644 --- a/pkgs/tools/misc/exa/default.nix +++ b/pkgs/tools/misc/exa/default.nix @@ -36,5 +36,6 @@ buildRustPackage rec { homepage = http://bsago.me/exa; license = licenses.mit; maintainer = [ maintainers.ehegnes ]; + broken = true; }; } diff --git a/pkgs/tools/misc/gringo/default.nix b/pkgs/tools/misc/gringo/default.nix new file mode 100644 index 000000000000..00879d9505b8 --- /dev/null +++ b/pkgs/tools/misc/gringo/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchurl, + bison, re2c, scons +}: + +let + version = "4.5.4"; +in + +stdenv.mkDerivation rec { + name = "gringo-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/project/potassco/gringo/${version}/gringo-${version}-source.tar.gz"; + sha256 = "16k4pkwyr2mh5w8j91vhxh9aff7f4y31npwf09w6f8q63fxvpy41"; + }; + + buildInputs = [ bison re2c scons ]; + + patches = [ + ./gringo-4.5.4-cmath.patch + ./gringo-4.5.4-to_string.patch + ]; + + buildPhase = '' + scons WITH_PYTHON= --build-dir=release + ''; + + installPhase = '' + mkdir -p $out/bin + cp build/release/gringo $out/bin/gringo + ''; + + meta = with stdenv.lib; { + description = "Converts input programs with first-order variables to equivalent ground programs"; + homepage = http://potassco.sourceforge.net/; + platforms = platforms.linux; + maintainers = [ maintainers.hakuch ]; + license = licenses.gpl3Plus; + }; +} diff --git a/pkgs/tools/misc/gringo/gringo-4.5.4-cmath.patch b/pkgs/tools/misc/gringo/gringo-4.5.4-cmath.patch new file mode 100644 index 000000000000..7b5510e2344b --- /dev/null +++ b/pkgs/tools/misc/gringo/gringo-4.5.4-cmath.patch @@ -0,0 +1,11 @@ +--- gringo/libgringo/src/term.cc~ 2016-07-12 23:56:10.593577749 -0400 ++++ gringo/libgringo/src/term.cc 2016-07-12 23:52:35.169968338 -0400 +@@ -22,6 +22,8 @@ + #include "gringo/logger.hh" + #include "gringo/graph.hh" + ++#include <cmath> ++ + namespace Gringo { + + // {{{ definition of Defines diff --git a/pkgs/tools/misc/gringo/gringo-4.5.4-to_string.patch b/pkgs/tools/misc/gringo/gringo-4.5.4-to_string.patch new file mode 100644 index 000000000000..b81eab4cd678 --- /dev/null +++ b/pkgs/tools/misc/gringo/gringo-4.5.4-to_string.patch @@ -0,0 +1,11 @@ +--- gringo/libgringo/gringo/bug.hh~ 2014-03-10 12:19:26.000000000 -0400 ++++ gringo/libgringo/gringo/bug.hh 2016-11-12 07:51:55.288563663 -0500 +@@ -32,7 +32,7 @@ + #define _GLIBCXX_MAKE_MOVE_ITERATOR(_Iter) std::make_move_iterator(_Iter) + #define _GLIBCXX_MAKE_MOVE_IF_NOEXCEPT_ITERATOR(_Iter) std::make_move_iterator(_Iter) + +-#ifdef MISSING_STD_TO_STRING ++#if 0 + + #include <sstream> + diff --git a/pkgs/tools/misc/grub4dos/default.nix b/pkgs/tools/misc/grub4dos/default.nix index 7e9b82a6a3f9..fabefb810313 100644 --- a/pkgs/tools/misc/grub4dos/default.nix +++ b/pkgs/tools/misc/grub4dos/default.nix @@ -6,13 +6,13 @@ let arch = else abort "Unknown architecture"; in stdenv.mkDerivation rec { name = "grub4dos-${version}"; - version = "0.4.6a-2016-08-06"; + version = "0.4.6a-2016-11-09"; src = fetchFromGitHub { owner = "chenall"; repo = "grub4dos"; - rev = "99d6ddbe7611f942d2708d77a620d6aa94a284d1"; - sha256 = "0gnllk0qkx6d0azf7v9cr0b23gp577avksz0f4dl3v3ldgi0dksq"; + rev = "4cdcd3c1aa4907e7775aa8816ca9cf0175b78bcd"; + sha256 = "17y5wsiqcb2qk1vr8n1wlhcsj668735hj8l759n8aiydw408bl55"; }; nativeBuildInputs = [ nasm ]; diff --git a/pkgs/tools/misc/ltunify/default.nix b/pkgs/tools/misc/ltunify/default.nix index cf28fa051326..8066cdd9bc5a 100644 --- a/pkgs/tools/misc/ltunify/default.nix +++ b/pkgs/tools/misc/ltunify/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tool for working with Logitech Unifying receivers and devices"; - homepage = https://lekensteyn.nl/logitech-unifying.html; + homepage = "https://lekensteyn.nl/logitech-unifying.html"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = [ maintainers.abbradar ]; diff --git a/pkgs/tools/misc/magic-wormhole/default.nix b/pkgs/tools/misc/magic-wormhole/default.nix new file mode 100644 index 000000000000..c35d3b666acb --- /dev/null +++ b/pkgs/tools/misc/magic-wormhole/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, pythonPackages }: + +with stdenv.lib; + +pythonPackages.buildPythonApplication rec { + name = "magic-wormhole-${version}"; + version = "0.8.1"; + + src = fetchurl { + url = "mirror://pypi/m/magic-wormhole/${name}.tar.gz"; + sha256 = "1yh5nbhh9z1am2pqnb5qqyq1zjl1m7z6jnkmvry2q14qwspw9had"; + }; + checkPhase = '' + ${pythonPackages.python.interpreter} -m wormhole.test.run_trial wormhole + ''; + + propagatedBuildInputs = with pythonPackages; [ autobahn cffi click hkdf pynacl spake2 tqdm ]; + meta = { + description = "Securely transfer data between computers"; + homepage = "https://github.com/warner/magic-wormhole"; + license = licenses.mit; + maintainers = with maintainers; [ asymmetric ]; + }; +} diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix index e840aa15ec20..0c9ac20fcc3e 100644 --- a/pkgs/tools/misc/mc/default.nix +++ b/pkgs/tools/misc/mc/default.nix @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1kmysm1x7smxs9k483nin6bx1rx0av8xrqjx9yf73hc7r4anhqzp"; }; - buildInputs = [ pkgconfig perl glib gpm slang zip unzip file gettext libX11 libICE e2fsprogs - libssh2 openssl ]; + buildInputs = [ pkgconfig perl glib slang zip unzip file gettext libX11 libICE + libssh2 openssl ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ e2fsprogs gpm ]; configureFlags = [ "--enable-vfs-smb" ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { repositories.git = git://github.com/MidnightCommander/mc.git; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.sander ]; - platforms = stdenv.lib.platforms.linux; + platforms = with stdenv.lib.platforms; linux ++ darwin; updateWalker = true; }; } diff --git a/pkgs/tools/misc/mimeo/default.nix b/pkgs/tools/misc/mimeo/default.nix index 66e91ed14240..aff329e04b69 100644 --- a/pkgs/tools/misc/mimeo/default.nix +++ b/pkgs/tools/misc/mimeo/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { name = "mimeo-${version}"; - version = "2016.2"; + version = "2016.11"; src = fetchurl { url = "http://xyne.archlinux.ca/projects/mimeo/src/${name}.tar.xz"; - sha256 = "1y3a60983ind2cakjwxq3cgc76xhcdqz5lcpnyii34s6wviybkn1"; + sha256 = "1yygdxqnkh506fknxsp9xa3rnxn0901dzqc7c7qjjj80lk6xnfxb"; }; buildInputs = [ file desktop_file_utils ]; diff --git a/pkgs/tools/misc/ncdu/default.nix b/pkgs/tools/misc/ncdu/default.nix index 6ea9d71bddc7..c309c8229747 100644 --- a/pkgs/tools/misc/ncdu/default.nix +++ b/pkgs/tools/misc/ncdu/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ncdu-${version}"; - version = "1.11"; + version = "1.12"; src = fetchurl { url = "http://dev.yorhel.nl/download/${name}.tar.gz"; - sha256 = "0yxv87hpal05p6nii6rlnai5a8958689l9vz020w4qvlwiragbnh"; + sha256 = "16j9fyw73y1lk05a35i4q9i66laklgsx41lz5rxfr8m28x3lw3l2"; }; buildInputs = [ ncurses ]; diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index 023498de371c..d74f27700302 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-20160722"; + name = "parallel-20161022"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "e391ebd081e8ba13e870be68106d1beb5def2b001fa5881f46df0ab95304f521"; + sha256 = "1mz82chm5qav6h64rcckxzabr7w4ma0sjx61xav85x0swgcbjdsr"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/progress/default.nix b/pkgs/tools/misc/progress/default.nix index ab72dc69fa47..0b48a5a66c6e 100644 --- a/pkgs/tools/misc/progress/default.nix +++ b/pkgs/tools/misc/progress/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchFromGitHub, pkgconfig, ncurses }: +{ stdenv, fetchFromGitHub, pkgconfig, ncurses, which }: stdenv.mkDerivation rec { name = "progress-${version}"; - version = "0.13"; + version = "0.13.1"; src = fetchFromGitHub { owner = "Xfennec"; repo = "progress"; rev = "v${version}"; - sha256 = "0xzpcvz4n0h8m0mhxgpvn1qg8993naip3asjbk3nmk3d4lbyh0b3"; + sha256 = "13nhczzb0zqg5zfpf5vcfi6aahyb8lrr52pvpjgi1zfkh2m9vnig"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig which ]; buildInputs = [ ncurses ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/tools/misc/pws/default.nix b/pkgs/tools/misc/pws/default.nix index 811e57c0a084..ac4f4524b992 100644 --- a/pkgs/tools/misc/pws/default.nix +++ b/pkgs/tools/misc/pws/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { description = "Command-line password safe"; homepage = https://github.com/janlelis/pws; license = licenses.mit; - maintainers = maintainers.swistak35; + maintainers = [ maintainers.swistak35 ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index 7eba2d2f939c..c5f017564af5 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.7"; + version = "1.8"; src = fetchFromGitHub { owner = "spaam"; repo = "svtplay-dl"; rev = version; - sha256 = "15vadnyah51pk4d0lx11bymxhfq47l5ijn72pjqr9yjx3pkgpd7w"; + sha256 = "1cn79kbz9fhhbajxg1fqd8xlab9jz4x1n9w7n42w0j8c627q0rlv"; }; pythonPaths = [ pycrypto requests2 ]; diff --git a/pkgs/tools/misc/tlp/default.nix b/pkgs/tools/misc/tlp/default.nix index 1e39ddf481bc..9a2f9b65e8c2 100644 --- a/pkgs/tools/misc/tlp/default.nix +++ b/pkgs/tools/misc/tlp/default.nix @@ -1,45 +1,54 @@ -{ stdenv, lib, fetchFromGitHub, perl, makeWrapper, systemd, iw, rfkill, hdparm, ethtool, inetutils -, kmod, pciutils, smartmontools, x86_energy_perf_policy, gawk, gnugrep, coreutils +{ stdenv, lib, fetchFromGitHub, perl, makeWrapper, file, systemd, iw, rfkill +, hdparm, ethtool, inetutils , kmod, pciutils, smartmontools +, x86_energy_perf_policy, gawk, gnugrep, coreutils, utillinux , enableRDW ? false, networkmanager }: let paths = lib.makeBinPath ([ iw rfkill hdparm ethtool inetutils systemd kmod pciutils smartmontools - x86_energy_perf_policy gawk gnugrep coreutils + x86_energy_perf_policy gawk gnugrep coreutils utillinux ] ++ lib.optional enableRDW networkmanager ); in stdenv.mkDerivation rec { name = "tlp-${version}"; - version = "0.8"; + version = "0.9"; src = fetchFromGitHub { owner = "linrunner"; repo = "TLP"; rev = "${version}"; - sha256 = "19fvk0xz6i2ryf41akk4jg1c4sb4rcyxdl9fr0w4lja7g76d5zww"; + sha256 = "1gwi0h9klhdvqfqvmn297l1vyhj4g9dqvf50lcbswry02mvnd2vn"; }; makeFlags = [ "DESTDIR=$(out)" - "TLP_LIBDIR=/lib" - "TLP_SBIN=/bin" - "TLP_BIN=/bin" + "TLP_SBIN=$(out)/bin" + "TLP_BIN=$(out)/bin" + "TLP_TLIB=$(out)/share/tlp-pm" + "TLP_PLIB=$(out)/lib/pm-utils" + "TLP_ULIB=$(out)/lib/udev" + "TLP_NMDSP=$(out)/etc/NetworkManager/dispatcher.d" + "TLP_SHCPL=$(out)/share/bash-completion/completions" + "TLP_MAN=$(out)/share/man" + "TLP_NO_INIT=1" "TLP_NO_PMUTILS=1" ]; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper file ]; buildInputs = [ perl ]; - installTargets = [ "install-tlp" ] ++ stdenv.lib.optional enableRDW "install-rdw"; + installTargets = [ "install-tlp" "install-man" ] ++ stdenv.lib.optional enableRDW "install-rdw"; postInstall = '' - for i in $out/bin/* $out/lib/udev/tlp-*; do - sed -i "s,/usr/lib/,$out/lib/,g" "$i" - if [[ "$(basename "$i")" = tlp-*list ]]; then + cp -r $out/$out/* $out + rm -rf $out/$(echo "$NIX_STORE" | cut -d "/" -f2) + + for i in $out/bin/* $out/lib/udev/tlp-* ${lib.optionalString enableRDW "$out/etc/NetworkManager/dispatcher.d/*"}; do + if file "$i" | grep -q Perl; then # Perl script; use wrapProgram wrapProgram "$i" \ --prefix PATH : "${paths}" @@ -48,21 +57,6 @@ in stdenv.mkDerivation rec { sed -i '2iexport PATH=${paths}:$PATH' "$i" fi done - - for i in $out/lib/udev/rules.d/*; do - sed -i "s,RUN+=\",\\0$out,g; s,/usr/sbin,/bin,g" "$i" - done - - for i in man/*; do - install -D $i $out/share/man/man''${i##*.}/$(basename $i) - done - '' + lib.optionalString enableRDW '' - for i in $out/etc/NetworkManager/dispatcher.d/*; do - sed -i \ - -e "s,/usr/lib/,$out/lib/,g" \ - -e '2iexport PATH=${paths}:$PATH' \ - "$i" - done ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix index 9052c5ce6d53..95d1a7275d9b 100644 --- a/pkgs/tools/misc/tmux/default.nix +++ b/pkgs/tools/misc/tmux/default.nix @@ -3,10 +3,10 @@ let bashCompletion = fetchFromGitHub { - owner = "przepompownia"; + owner = "imomaliev"; repo = "tmux-bash-completion"; - rev = "678a27616b70c649c6701cae9cd8c92b58cc051b"; - sha256 = "1d2myrh4xiay9brsxafb02pi922760sdkyyy5xjm4sfh4iimc4zf"; + rev = "fcda450d452f07d36d2f9f27e7e863ba5241200d"; + sha256 = "092jpkhggjqspmknw7h3icm0154rg21mkhbc71j5bxfmfjdxmya8"; }; in diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index a2dd91e83bc9..70719bdfdf1f 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -15,11 +15,11 @@ with stdenv.lib; buildPythonApplication rec { name = "youtube-dl-${version}"; - version = "2016.11.08.1"; + version = "2016.11.22"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "95d45438254c949952127b269451da861682fb06a7ef62b5f5dc75bc40bfaeeb"; + sha256 = "e8d599c512ce56a6ea46955e2bb8f4471ae8a6f757183212cc49b6dd48d9a282"; }; buildInputs = [ makeWrapper zip ] ++ optional generateManPage pandoc; diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix index eec84e103867..ab82851f178f 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.28.0"; + version = "1.29.0"; src = fetchFromGitHub { owner = "aria2"; repo = "aria2"; rev = "release-${version}"; - sha256 = "196prs98sxwwxiszw2m1kbcra7n7fxf758y5dcj2jkddrr37hdkw"; + sha256 = "1ivxz2ld4cl9z29kdicban9dir6s0si2jqn4g11gz587x7pagbim"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://aria2.github.io; description = "A lightweight, multi-protocol, multi-source, command-line download utility"; - maintainers = with maintainers; [ koral jgeerds ]; license = licenses.gpl2Plus; platforms = platforms.unix; + maintainers = with maintainers; [ koral jgeerds ]; }; } diff --git a/pkgs/tools/networking/axel/default.nix b/pkgs/tools/networking/axel/default.nix index 4f05220232fc..af5d8309507d 100644 --- a/pkgs/tools/networking/axel/default.nix +++ b/pkgs/tools/networking/axel/default.nix @@ -1,15 +1,17 @@ -{ stdenv, fetchurl, gettext, autoreconfHook }: +{ stdenv, fetchurl, autoreconfHook, gettext, libssl }: stdenv.mkDerivation rec { name = "axel-${version}"; - version = "2.7"; + version = "2.11"; src = fetchurl { url = "mirror://debian/pool/main/a/axel/axel_${version}.orig.tar.gz"; - sha256 = "174x4bp4gcwmpf94hdsdxlpk7q7ldgpsicry7x2pa9zw4yz86wl0"; + sha256 = "05askz9pi8kvjyn66rszjfg9arwdzl72jwd38q9h9n5s37vqslky"; }; - buildInputs = [ gettext autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ]; + + buildInputs = [ gettext libssl ]; installFlags = [ "ETCDIR=$(out)/etc" ]; diff --git a/pkgs/tools/networking/logmein-hamachi/default.nix b/pkgs/tools/networking/logmein-hamachi/default.nix index 7b441c72cbf4..74dd91316800 100644 --- a/pkgs/tools/networking/logmein-hamachi/default.nix +++ b/pkgs/tools/networking/logmein-hamachi/default.nix @@ -10,14 +10,14 @@ let else if stdenv.system == "i686-linux" then "x86" else abort "Unsupported architecture"; sha256 = - if stdenv.system == "x86_64-linux" then "0l8y8z8fqvxrypx3dp83mm3qr9shgpcn5h7x2k2z13gp4aq0yw6g" - else if stdenv.system == "i686-linux" then "00nl442k4pij9fm8inlk4qrcvbnz55fbwf3sm3dgbzvd5jcgsa0f" + if stdenv.system == "x86_64-linux" then "011xg1frhjavv6zj1y3da0yh7rl6v1ax6xy2g8fk3sry9bi2p4j3" + else if stdenv.system == "i686-linux" then "03ml9xv19km99f0z7fpr21b1zkxvw7q39kjzd8wpb2pds51wnc62" else abort "Unsupported architecture"; libraries = stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]; in stdenv.mkDerivation rec { name = "logmein-hamachi-${version}"; - version = "2.1.0.165"; + version = "2.1.0.174"; src = fetchurl { url = "https://www.vpn.net/installers/${name}-${arch}.tgz"; diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index d96bc08495f0..0bd79890dc02 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { sha256 = "a864e347ddf6da8dabd40e0185b8c10a655d4a94b45cbaa2b3bb4b5e8360d204"; }; + outputs = [ "out" "dev" ]; + preConfigure = '' substituteInPlace configure --replace /usr/bin/uname ${coreutils}/bin/uname substituteInPlace configure --replace /usr/bin/file ${file}/bin/file diff --git a/pkgs/tools/networking/network-manager/l2tp.nix b/pkgs/tools/networking/network-manager/l2tp.nix index 5e09bb7229f8..591994ddccf6 100644 --- a/pkgs/tools/networking/network-manager/l2tp.nix +++ b/pkgs/tools/networking/network-manager/l2tp.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "L2TP plugin for NetworkManager"; inherit (networkmanager.meta) platforms; - homepage = https://github.com/seriyps/NetworkManager-l2tp; + homepage = "https://github.com/seriyps/NetworkManager-l2tp"; license = licenses.gpl2; maintainers = with maintainers; [ abbradar obadz ]; }; diff --git a/pkgs/tools/networking/ntp/default.nix b/pkgs/tools/networking/ntp/default.nix index 4c42771be170..a37b1bdbd98a 100644 --- a/pkgs/tools/networking/ntp/default.nix +++ b/pkgs/tools/networking/ntp/default.nix @@ -1,23 +1,28 @@ -{ stdenv, fetchurl, autoreconfHook, libcap ? null, openssl ? null }: +{ stdenv, fetchurl, openssl, perl, libcap ? null, libseccomp ? null }: assert stdenv.isLinux -> libcap != null; +assert stdenv.isLinux -> libseccomp != null; stdenv.mkDerivation rec { - name = "ntp-4.2.8p8"; + name = "ntp-4.2.8p9"; src = fetchurl { url = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${name}.tar.gz"; - sha256 = "1vlpgd0dk2wkpmmf869sfxi8f46sfnmjgk51vl8n6vj5y2sx1cra"; + sha256 = "0whbyf82lrczbri4adbsa4hg1ppfa6c7qcj7nhjwdfp1g1vjh95p"; }; configureFlags = [ "--sysconfdir=/etc" "--localstatedir=/var" + "--with-openssl-libdir=${openssl.out}/lib" + "--with-openssl-incdir=${openssl.dev}/include" "--enable-ignore-dns-errors" - ] ++ stdenv.lib.optional (libcap != null) "--enable-linuxcaps"; + ] ++ stdenv.lib.optionals stdenv.isLinux [ + "--enable-linuxcaps" + "--enable-libseccomp" + ]; - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ libcap openssl ]; + buildInputs = [ libcap openssl libseccomp perl ]; hardeningEnable = [ "pie" ]; diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix index 93541bd06039..a11b34ef9914 100644 --- a/pkgs/tools/networking/offlineimap/default.nix +++ b/pkgs/tools/networking/offlineimap/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pythonPackages, }: pythonPackages.buildPythonApplication rec { - version = "7.0.6"; + version = "7.0.9"; name = "offlineimap-${version}"; namePrefix = ""; @@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication rec { owner = "OfflineIMAP"; repo = "offlineimap"; rev = "v${version}"; - sha256 = "14hmr4f9zv1hhl6azh78rg4csincxzkp1sl4wydd4gwyb74cfpkc"; + sha256 = "1jrg6n4fpww98vj7gfp2li9ab4pbnrpb249cqa1bs8jjwpmrsqac"; }; doCheck = false; diff --git a/pkgs/tools/networking/openntpd/default.nix b/pkgs/tools/networking/openntpd/default.nix index 202cb4c6ba61..47d1dbbcbe69 100644 --- a/pkgs/tools/networking/openntpd/default.nix +++ b/pkgs/tools/networking/openntpd/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "openntpd-${version}"; - version = "5.7p4"; + version = "6.0p1"; src = fetchurl { url = "mirror://openbsd/OpenNTPD/${name}.tar.gz"; - sha256 = "08ybpi351284wj53qqrmg13j8l7md397yrqsmg0aqxg3frcxk4x9"; + sha256 = "1s3plmxmybwpfrimq6sc54wxnn6ca7rb2g5k2bdjm4c88w4q1axi"; }; configureFlags = [ diff --git a/pkgs/tools/networking/openvpn/update-resolv-conf.nix b/pkgs/tools/networking/openvpn/update-resolv-conf.nix index f59e70ed3187..186d5109b94a 100644 --- a/pkgs/tools/networking/openvpn/update-resolv-conf.nix +++ b/pkgs/tools/networking/openvpn/update-resolv-conf.nix @@ -1,16 +1,16 @@ -{ stdenv, lib, fetchFromGitHub, makeWrapper, openresolv, coreutils, which, systemd }: +{ stdenv, lib, fetchFromGitHub, makeWrapper, openresolv, coreutils, systemd }: let - binPath = lib.makeBinPath [ coreutils openresolv which systemd ]; + binPath = lib.makeBinPath [ coreutils openresolv systemd ]; in stdenv.mkDerivation rec { - name = "update-resolv-conf-2016-04-24"; + name = "update-resolv-conf-2016-09-30"; src = fetchFromGitHub { owner = "masterkorp"; repo = "openvpn-update-resolv-conf"; - rev = "994574f36b9147cc78674a5f13874d503a625c98"; - sha256 = "1rvzlaj53k8s09phg4clsyzlmf44dmwwyvg0nbg966sxp3xsqlxc"; + rev = "09cb5ab5a50dfd6e77e852749d80bef52d7a6b34"; + sha256 = "0s5cilph0p0wiixj7nlc7f3hqmr1mhvbfyapd0060n3y6xgps9y9"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix index a01c39743fe6..6bcf2b80a136 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.36"; + version = "5.37"; src = fetchurl { url = "http://www.stunnel.org/downloads/${name}.tar.gz"; - sha256 = "1smmwkzr0i6w4jwrjxazbyf82jq1qlg8x9zil5b51pzwzpy552gb"; + sha256 = "0hfjs3f2crdvqsalismrsf5nnz4ksj8igiwjqzg4zipz7q757qyh"; }; buildInputs = [ openssl ]; diff --git a/pkgs/tools/networking/vtun/default.nix b/pkgs/tools/networking/vtun/default.nix index 09f48d9fa1ad..fb0ee64cc2c0 100644 --- a/pkgs/tools/networking/vtun/default.nix +++ b/pkgs/tools/networking/vtun/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, fetchpatch, openssl, lzo, zlib, yacc, flex }: stdenv.mkDerivation rec { - name = "vtun-3.0.3"; + name = "vtun-3.0.4"; src = fetchurl { url = "mirror://sourceforge/vtun/${name}.tar.gz"; - sha256 = "1jxrxp3klhc8az54d5qn84cbc0vdafg319jh84dxkrswii7vxp39"; + sha256 = "1fcqzn2bdjw31j1hvv6lg99v2phhszm29kp2xambxzp32mmxzy5b"; }; patches = [ diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix index c1d4cd319b8f..103ef8d77765 100644 --- a/pkgs/tools/package-management/dpkg/default.nix +++ b/pkgs/tools/package-management/dpkg/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "dpkg-${version}"; - version = "1.18.14"; + version = "1.18.15"; src = fetchurl { url = "mirror://debian/pool/main/d/dpkg/dpkg_${version}.tar.xz"; - sha256 = "0njd8pdq1vx70sjlgymi79lijg05fmd8vxnqndzhjjb0a8cf920p"; + sha256 = "0wd3rl1wi2d22jyavxg1ljzkymilg7p338y0c0ql0fcw7djkdsdf"; }; configureFlags = [ diff --git a/pkgs/tools/package-management/nixops/generic.nix b/pkgs/tools/package-management/nixops/generic.nix index 9c4c2600fb40..87ed6295977f 100644 --- a/pkgs/tools/package-management/nixops/generic.nix +++ b/pkgs/tools/package-management/nixops/generic.nix @@ -14,6 +14,7 @@ python2Packages.buildPythonApplication { pythonPath = with python2Packages; [ prettytable boto + boto3 hetzner libcloud azure-storage @@ -22,6 +23,8 @@ python2Packages.buildPythonApplication { azure-mgmt-resource azure-mgmt-storage adal + pysqlite # Go back to builtin sqlite once Python 2.7.13 is released + datadog ]; doCheck = false; diff --git a/pkgs/tools/package-management/nixops/unstable.nix b/pkgs/tools/package-management/nixops/unstable.nix index bba392e30e76..fb5791be2397 100644 --- a/pkgs/tools/package-management/nixops/unstable.nix +++ b/pkgs/tools/package-management/nixops/unstable.nix @@ -1,9 +1,10 @@ { callPackage, fetchurl }: callPackage ./generic.nix (rec { - version = "1.4"; + version = "2016-11-23"; src = fetchurl { - url = "http://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2"; - sha256 = "1a6vkn8rh5lgalxh6cwr4894n3yp7f2qxcbcjv42nnmy5g4fy5fd"; + # Hydra doesn't serve production outputs anymore :( + url = "https://static.domenkozar.com/nixops-1.5pre0_abcdef.tar.bz2"; + sha256 = "1a4cyd3zvkdjg9rf9ssr7p4i6r89zr483v5nlr5jzjdjjyi3j2bz"; }; }) diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix index 0cb34b2e73c9..88df4d78d26b 100644 --- a/pkgs/tools/security/clamav/default.nix +++ b/pkgs/tools/security/clamav/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, zlib, bzip2, libiconv, libxml2, openssl, ncurses, curl -, libmilter, pcre, freshclamConf ? null }: +, libmilter, pcre }: stdenv.mkDerivation rec { name = "clamav-${version}"; @@ -10,9 +10,17 @@ stdenv.mkDerivation rec { sha256 = "0yh2q318bnmf2152g2h1yvzgqbswn0wvbzb8p4kf7v057shxcyqn"; }; - buildInputs = [ zlib bzip2 libxml2 openssl ncurses curl libiconv libmilter pcre ]; + # don't install sample config files into the absolute sysconfdir folder + postPatch = '' + substituteInPlace Makefile.in --replace ' etc ' ' ' + ''; + + buildInputs = [ + zlib bzip2 libxml2 openssl ncurses curl libiconv libmilter pcre + ]; configureFlags = [ + "--sysconfdir=/etc/clamav" "--with-zlib=${zlib.dev}" "--with-libbz2-prefix=${bzip2.dev}" "--with-iconv-dir=${libiconv}" @@ -22,10 +30,12 @@ stdenv.mkDerivation rec { "--with-libcurl=${curl.dev}" "--with-pcre=${pcre.dev}" "--enable-milter" - "--disable-clamav" ]; - fixupPhase = if (freshclamConf != null) then ''echo "${freshclamConf}" > $out/etc/freshclam.conf'' else ""; + postInstall = '' + mkdir $out/etc + cp etc/*.sample $out/etc + ''; meta = with stdenv.lib; { homepage = http://www.clamav.net; diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix index 5ee630539b69..f26b2d3308b7 100644 --- a/pkgs/tools/security/eid-mw/default.nix +++ b/pkgs/tools/security/eid-mw/default.nix @@ -4,10 +4,10 @@ stdenv.mkDerivation rec { name = "eid-mw-${version}"; - version = "4.1.18"; + version = "4.1.19"; src = fetchFromGitHub { - sha256 = "049rxrlcwcb9yir8q2inmqlslp49alpgm4pccl138xl34cg1hyhl"; + sha256 = "191c74kxfrfb894v8y4vi2iygyffjy9jjq5fj7cnnddgwai5n3c5"; rev = "v${version}"; repo = "eid-mw"; owner = "Fedict"; diff --git a/pkgs/tools/security/fprintd/default.nix b/pkgs/tools/security/fprintd/default.nix index fb72782abee6..e5bf5a08afc7 100644 --- a/pkgs/tools/security/fprintd/default.nix +++ b/pkgs/tools/security/fprintd/default.nix @@ -2,11 +2,12 @@ , libfprint, glib, dbus_glib, polkit, nss, pam, systemd }: stdenv.mkDerivation rec { - name = "fprintd-0.6.0"; + name = "fprintd-${version}"; + version = "0.7.0"; src = fetchurl { url = "http://people.freedesktop.org/~hadess/${name}.tar.xz"; - sha256 = "1by6nvlrqkwzcz2v2kyq6avi3h384vmlr42vj9s2yzcinkp64m1z"; + sha256 = "05915i0bv7q62fqrs5diqwr8dz3pwqa1c1ivcgggkjyw0xk4ldp5"; }; buildInputs = [ libfprint glib dbus_glib polkit nss pam systemd ]; diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix index b7a71332e772..a4b47843583f 100644 --- a/pkgs/tools/security/gnupg/21.nix +++ b/pkgs/tools/security/gnupg/21.nix @@ -15,11 +15,11 @@ assert guiSupport -> pinentry != null; stdenv.mkDerivation rec { name = "gnupg-${version}"; - version = "2.1.15"; + version = "2.1.16"; src = fetchurl { url = "mirror://gnupg/gnupg/${name}.tar.bz2"; - sha256 = "1pgz02gd84ab94w4xdg67p9z8kvkyr9d523bvcxxd2hviwh1m362"; + sha256 = "0i483m9q032a0s50f1izb213g4h5i7pcgn395m6hvl3sg2kadfa9"; }; buildInputs = [ @@ -27,6 +27,8 @@ stdenv.mkDerivation rec { readline libusb gnutls adns openldap zlib bzip2 ]; + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; + patches = [ ./fix-libusb-include-path.patch ]; postPatch = stdenv.lib.optionalString stdenv.isLinux '' sed -i 's,"libpcsclite\.so[^"]*","${pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c diff --git a/pkgs/tools/security/kbfs/default.nix b/pkgs/tools/security/kbfs/default.nix index fb7b8cc9fe74..a38e70df6323 100644 --- a/pkgs/tools/security/kbfs/default.nix +++ b/pkgs/tools/security/kbfs/default.nix @@ -1,8 +1,8 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "kbfs-2016-08-02-git"; - version = "1.0.16"; + name = "kbfs-2016-11-18-git"; + version = "1.0.2"; goPackagePath = "github.com/keybase/kbfs"; subPackages = [ "kbfsfuse" ]; @@ -12,8 +12,8 @@ buildGoPackage rec { src = fetchFromGitHub { owner = "keybase"; repo = "kbfs"; - rev = "a8f0714536d15668e0f561ec4d3324762c8cf030"; - sha256 = "0m4k55akd8cv5k8mfpm3rb3fz13z31l49pml7mgviv0hi3mnisqd"; + rev = "aac615d7c50e7512a51a133c14cb699d9941ba8c"; + sha256 = "0vah6x37g2w1f7mb5x16f1815608mvv2d1mrpkpnhz2gz7qzz6bv"; }; buildFlags = [ "-tags production" ]; diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index c4d0f20d6c2d..fbed233b090d 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "keybase-${version}"; - version = "1.0.17"; + version = "1.0.18"; rev = "v${version}"; goPackagePath = "github.com/keybase/client"; @@ -14,7 +14,7 @@ buildGoPackage rec { owner = "keybase"; repo = "client"; inherit rev; - sha256 = "14cj0npsvnc3whw7gashgd7lhj3lvjdkivsnvsjg7dp3hifvqxnx"; + sha256 = "16n9fwx8v3jradp1l2564872akq6npib794jadfl5d122cll0n7h"; }; buildFlags = [ "-tags production" ]; diff --git a/pkgs/tools/security/phrasendrescher/default.nix b/pkgs/tools/security/phrasendrescher/default.nix new file mode 100644 index 000000000000..814bc0d85302 --- /dev/null +++ b/pkgs/tools/security/phrasendrescher/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, openssl }: + +stdenv.mkDerivation rec { + name = "phrasendrescher-${version}"; + version = "1.0"; + + src = fetchurl { + url = "http://leidecker.info/projects/phrasendrescher/${name}.tar.gz"; + sha256 = "1r0j7ms3i324p6if9cg8i0q900zqfjpvfr8pwj181x8ascysbbf2"; + }; + + buildInputs = [ openssl ]; + + meta = with stdenv.lib; { + description = "Cracking tool that finds passphrases of SSH keys"; + homepage = "http://leidecker.info/projects/phrasendrescher.shtml"; + license = licenses.gpl2Plus; + platforms = platforms.all; + maintainers = with maintainers; [ bjornfor ]; + }; +} diff --git a/pkgs/tools/security/softhsm/default.nix b/pkgs/tools/security/softhsm/default.nix index 4bd199686763..5f282dd378a5 100644 --- a/pkgs/tools/security/softhsm/default.nix +++ b/pkgs/tools/security/softhsm/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { postInstall = "rm -rf $out/var"; - meta = { + meta = with stdenv.lib; { homepage = https://www.opendnssec.org/softhsm; description = "Cryptographic store accessible through a PKCS #11 interface"; - license = stdenv.lib.licenses.bsd2; - maintainers = stdenv.lib.maintainers.leenaars; - platforms = stdenv.lib.platforms.linux; + license = licenses.bsd2; + maintainers = [ maintainers.leenaars ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix index 900ad39ecb23..be93b291dcc2 100644 --- a/pkgs/tools/security/tor/torbrowser.nix +++ b/pkgs/tools/security/tor/torbrowser.nix @@ -12,13 +12,13 @@ in stdenv.mkDerivation rec { name = "tor-browser-${version}"; - version = "6.0.5"; + version = "6.0.6"; src = fetchurl { 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 - "fc917bd702b1275cae3f7fa8036c3c44af9b4f003f3d4a8fbb9f6c0974277ad4" else - "e0c3ce406b6de082692ce3db52b6e04053e205194b26fbf0eee9014be543d98d"; + "0ydcbkpyrdwsqn841cxzpbr05nzly720xhsin89gjc1sirvmlxmx" else + "0q8ygkgs47wjq12l37kwm93v1420gzrlacwqc0yz4b3b58aa1d4z"; }; desktopItem = makeDesktopItem { diff --git a/pkgs/tools/system/monit/default.nix b/pkgs/tools/system/monit/default.nix index eed5c06552b2..055a480f92ad 100644 --- a/pkgs/tools/system/monit/default.nix +++ b/pkgs/tools/system/monit/default.nix @@ -1,15 +1,15 @@ -{stdenv, fetchurl, openssl, bison, flex, pam, usePAM ? stdenv.isLinux }: +{stdenv, fetchurl, openssl, bison, flex, pam, zlib, usePAM ? stdenv.isLinux }: stdenv.mkDerivation rec { - name = "monit-5.19.0"; + name = "monit-5.20.0"; src = fetchurl { url = "${meta.homepage}dist/${name}.tar.gz"; - sha256 = "1f32dz7zzp575d35m8xkgjgrqs2vbls0q6vdzm7wwashcm1xbz5y"; + sha256 = "13drg4k9r9drn7bpj3n04kkf1l29q05jdccdar6yc6hcqmg3kb7b"; }; nativeBuildInputs = [ bison flex ]; - buildInputs = [ openssl ] ++ stdenv.lib.optionals usePAM [ pam ]; + buildInputs = [ openssl zlib.dev ] ++ stdenv.lib.optionals usePAM [ pam ]; configureFlags = [ "--with-ssl-incl-dir=${openssl.dev}/include" diff --git a/pkgs/tools/system/thermald/default.nix b/pkgs/tools/system/thermald/default.nix index baa18aacdfb8..d5936b00806e 100644 --- a/pkgs/tools/system/thermald/default.nix +++ b/pkgs/tools/system/thermald/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "thermald-${version}"; - version = "1.5.3"; + version = "1.5.4"; src = fetchFromGitHub { owner = "01org"; repo = "thermal_daemon"; rev = "v${version}"; - sha256 = "0k10sl262d9slrln1vkgsxlr1pnfxzd3ycs552bl7ynf0zxpl48h"; + sha256 = "0yrlnm1blfxi97af4dbx6xm5w1p8r20raiim1ng08gbqbgnjg56g"; }; buildInputs = [ autoconf automake libtool pkgconfig dbus_libs dbus_glib libxml2 ]; @@ -28,7 +28,6 @@ stdenv.mkDerivation rec { preInstall = "sysconfdir=$out/etc"; - meta = with stdenv.lib; { description = "Thermal Daemon"; homepage = "https://01.org/linux-thermal-daemon"; diff --git a/pkgs/tools/text/aha/default.nix b/pkgs/tools/text/aha/default.nix index b83f97a4b8d7..9851f9596c36 100644 --- a/pkgs/tools/text/aha/default.nix +++ b/pkgs/tools/text/aha/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "aha-${version}"; - version = "0.4.9"; + version = "0.4.10.2"; src = fetchFromGitHub { - sha256 = "0g7awnh7z4cj3kkmldg6kl8dsvdvs46vbf273crmpswk0r4hzj80"; + sha256 = "14n0py8dzlvirawb8brq143nq0sy9s2z6in5589krrya0frlrlkj"; rev = version; repo = "aha"; owner = "theZiz"; diff --git a/pkgs/tools/text/reckon/default.nix b/pkgs/tools/text/reckon/default.nix index 370fcf265d51..b6340fd2df46 100644 --- a/pkgs/tools/text/reckon/default.nix +++ b/pkgs/tools/text/reckon/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Flexibly import bank account CSV files into Ledger for command line accounting"; license = licenses.mit; - maintainers = "mckean.kylej@gmail.com"; + maintainers = [ "mckean.kylej@gmail.com" ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/text/xidel/default.nix b/pkgs/tools/text/xidel/default.nix index c76e0f49734e..91cecce61225 100644 --- a/pkgs/tools/text/xidel/default.nix +++ b/pkgs/tools/text/xidel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dpkg, patchelf }: +{ stdenv, fetchurl, dpkg }: stdenv.mkDerivation rec { name = "xidel-${version}"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { } else throw "xidel is not supported on ${stdenv.system}"; - buildInputs = [ dpkg patchelf ]; + buildInputs = [ dpkg ]; unpackPhase = '' dpkg-deb -x ${src} ./ @@ -34,9 +34,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p "$out/bin" cp -a usr/* "$out/" - interpreter="$(echo ${stdenv.glibc.out}/lib/ld-linux*)" - patchelf --set-interpreter "$interpreter" "$out/bin/xidel" - patchelf --set-rpath "${stdenv.lib.makeLibraryPath [stdenv.glibc]}" "$out/bin/xidel" + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/bin/xidel" ''; meta = with stdenv.lib; { @@ -45,7 +43,7 @@ stdenv.mkDerivation rec { # source contains no license info (AFAICS), but sourceforge says GPLv2 license = licenses.gpl2; # more platforms will be supported when we switch to source build - platforms = [ "i686-linux" "x86_64-linux" ]; + platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; }; } |