diff options
Diffstat (limited to 'pkgs/tools')
41 files changed, 426 insertions, 131 deletions
diff --git a/pkgs/tools/X11/primus/default.nix b/pkgs/tools/X11/primus/default.nix index f0a971dde18f..88589a058783 100644 --- a/pkgs/tools/X11/primus/default.nix +++ b/pkgs/tools/X11/primus/default.nix @@ -4,6 +4,7 @@ # same LD_LIBRARY_PATH. # Other distributions do the same. { stdenv +, stdenv_i686 , primusLib , writeScriptBin , primusLib_i686 ? null @@ -11,8 +12,12 @@ }: let - primus = if useNvidia then primusLib else primusLib.override { nvidia_x11 = null; }; - primus_i686 = if useNvidia then primusLib_i686 else primusLib_i686.override { nvidia_x11 = null; }; + # We override stdenv in case we need different ABI for libGL + primusLib_ = primusLib.override { inherit stdenv; }; + primusLib_i686_ = primusLib_i686.override { stdenv = stdenv_i686; }; + + primus = if useNvidia then primusLib_ else primusLib_.override { nvidia_x11 = null; }; + primus_i686 = if useNvidia then primusLib_i686_ else primusLib_i686_.override { nvidia_x11 = null; }; ldPath = stdenv.lib.makeLibraryPath ([primus] ++ stdenv.lib.optional (primusLib_i686 != null) primus_i686); in writeScriptBin "primusrun" '' diff --git a/pkgs/tools/admin/salt/default.nix b/pkgs/tools/admin/salt/default.nix new file mode 100644 index 000000000000..254b7b9374eb --- /dev/null +++ b/pkgs/tools/admin/salt/default.nix @@ -0,0 +1,51 @@ +{ + stdenv, fetchurl, pythonPackages, openssl, + + # Many Salt modules require various Python modules to be installed, + # passing them in this array enables Salt to find them. + extraInputs ? [] +}: + +pythonPackages.buildPythonApplication rec { + name = "salt-${version}"; + version = "2015.8.8"; + + disabled = pythonPackages.isPy3k; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/s/salt/${name}.tar.gz"; + sha256 = "1xcfcs50pyammb60myph4f8bi2r6iwkxwsnnhrjwvkv2ymxwxv5j"; + }; + + propagatedBuildInputs = with pythonPackages; [ + futures + jinja2 + markupsafe + msgpack + pycrypto + pyyaml + pyzmq + requests + salttesting + tornado + ] ++ extraInputs; + + patches = [ ./fix-libcrypto-loading.patch ]; + + postPatch = '' + substituteInPlace "salt/utils/rsax931.py" \ + --subst-var-by "libcrypto" "${openssl}/lib/libcrypto.so" + ''; + + # The tests fail due to socket path length limits at the very least; + # possibly there are more issues but I didn't leave the test suite running + # as is it rather long. + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://saltstack.com/; + description = "Portable, distributed, remote execution and configuration management system"; + maintainers = with maintainers; [ aneeshusa ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/tools/admin/salt/fix-libcrypto-loading.patch b/pkgs/tools/admin/salt/fix-libcrypto-loading.patch new file mode 100644 index 000000000000..c5cc1bde5d07 --- /dev/null +++ b/pkgs/tools/admin/salt/fix-libcrypto-loading.patch @@ -0,0 +1,11 @@ +diff --git a/salt/utils/rsax931.py b/salt/utils/rsax931.py +index 9eb1f4a..d764f7a 100644 +--- a/salt/utils/rsax931.py ++++ b/salt/utils/rsax931.py +@@ -36,7 +36,7 @@ def _load_libcrypto(): + 'libcrypto.so*')) + lib = lib[0] if len(lib) > 0 else None + if lib: +- return cdll.LoadLibrary(lib) ++ return cdll.LoadLibrary('@libcrypto@') + raise OSError('Cannot locate OpenSSL libcrypto') diff --git a/pkgs/tools/admin/salt/testing.nix b/pkgs/tools/admin/salt/testing.nix new file mode 100644 index 000000000000..8c65defcab58 --- /dev/null +++ b/pkgs/tools/admin/salt/testing.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, pythonPackages }: + +pythonPackages.buildPythonApplication rec { + name = "SaltTesting-${version}"; + version = "2015.7.10"; + + disabled = pythonPackages.isPy3k; + + propagatedBuildInputs = with pythonPackages; [ + six + ]; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/S/SaltTesting/${name}.tar.gz"; + sha256 = "0p0y8kb77pis18rcig1kf9dnns4bnfa3mr91q40lq4mw63l1b34h"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/saltstack/salt-testing; + description = "Common testing tools used in the Salt Stack projects"; + maintainers = with maintainers; [ aneeshusa ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix index 6769540d8dfb..a0f3bcb0ebb9 100644 --- a/pkgs/tools/archivers/p7zip/default.nix +++ b/pkgs/tools/archivers/p7zip/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl }: let - version = "9.38"; + version = "15.14.1"; in stdenv.mkDerivation rec { name = "p7zip-${version}"; src = fetchurl { url = "mirror://sourceforge/p7zip/p7zip_${version}_src_all.tar.bz2"; - sha256 = "0mxribb9a3lz3bifz6002hg7vyy8h9piinypian533hw8qvswfx7"; + sha256 = "1m15iwglyjpiw82m7dbpykz8s55imch34w20w09l34116vdb97b9"; }; preConfigure = '' diff --git a/pkgs/tools/archivers/zpaq/default.nix b/pkgs/tools/archivers/zpaq/default.nix index 011793248cd7..8a0a3ef4ccaf 100644 --- a/pkgs/tools/archivers/zpaq/default.nix +++ b/pkgs/tools/archivers/zpaq/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="zpaq"; - version="707"; + version="709"; name="${baseName}-${version}"; - hash="0xbisphv318a33px47vriirdp2jhf99y6hx6gcbfhbhkaqpggjg3"; - url="http://mattmahoney.net/dc/zpaq707.zip"; - sha256="0xbisphv318a33px47vriirdp2jhf99y6hx6gcbfhbhkaqpggjg3"; + hash="105lwd9cckmmhg5v9ddf873wzbkdsl7wfqyd30kn0q78sg3c0avh"; + url="http://mattmahoney.net/dc/zpaq709.zip"; + sha256="105lwd9cckmmhg5v9ddf873wzbkdsl7wfqyd30kn0q78sg3c0avh"; }; in stdenv.mkDerivation { diff --git a/pkgs/tools/audio/playerctl/default.nix b/pkgs/tools/audio/playerctl/default.nix index 0e2b11a1f06d..bd5a6b1d592f 100644 --- a/pkgs/tools/audio/playerctl/default.nix +++ b/pkgs/tools/audio/playerctl/default.nix @@ -2,14 +2,14 @@ pkgconfig, gobjectIntrospection }: stdenv.mkDerivation rec { - name = "playerctl"; - version = "0.4.2"; + name = "playerctl-${version}"; + version = "0.5.0"; src = fetchFromGitHub { owner = "acrisci"; repo = "playerctl"; rev = "v${version}"; - sha256 = "0dy6wc7qr00p53hlhpbg9x40w4ag95r2i7r1nsyb4ym3wzrvskzh"; + sha256 = "0b4pg5pwblgbf6kvvynzh9dshfikxy5c2ks7733n7wza5wkpgmng"; }; buildInputs = [ diff --git a/pkgs/tools/backup/partimage/default.nix b/pkgs/tools/backup/partimage/default.nix index 009dc90576b3..18e8bb400253 100644 --- a/pkgs/tools/backup/partimage/default.nix +++ b/pkgs/tools/backup/partimage/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, bzip2, zlib, newt, openssl, pkgconfig, slang +{stdenv, fetchurl, fetchpatch, bzip2, zlib, newt, openssl, pkgconfig, slang , automake, autoconf, libtool, gettext }: stdenv.mkDerivation { @@ -17,6 +17,12 @@ stdenv.mkDerivation { patches = [ ./gentoos-zlib.patch + (fetchpatch { + name = "no-SSLv2.patch"; + url = "https://projects.archlinux.org/svntogit/community.git/plain/trunk" + + "/use-SSLv3-by-default.patch?h=packages/partimage&id=7e95d1c6614e"; + sha256 = "1zfixa6g1nb1hqfzn2wvyvxsr38gm7908zfml2iaqnwy6iz6jd8v"; + }) ]; meta = { diff --git a/pkgs/tools/filesystems/bindfs/default.nix b/pkgs/tools/filesystems/bindfs/default.nix index 7d79eefb122c..80027c7a0474 100644 --- a/pkgs/tools/filesystems/bindfs/default.nix +++ b/pkgs/tools/filesystems/bindfs/default.nix @@ -12,6 +12,9 @@ stdenv.mkDerivation rec { dontStrip = true; buildInputs = [ fuse pkgconfig ]; + postFixup = '' + ln -s $out/bin/bindfs $out/bin/mount.fuse.bindfs + ''; meta = { description = "A FUSE filesystem for mounting a directory to another location"; diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index 59935af0a5d4..d0fda2da4142 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.5"; in +let version = "4.5.1"; 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 = "04d8w1wqaij6kxhxcirwvy1bkvc7aikkyw981ciwlznblzc16y7f"; + sha256 = "1znf2zhb56zbmdjk3lq107678xwsqwc5gczspypmc5i31qnppy7f"; }; buildInputs = [ diff --git a/pkgs/tools/filesystems/grive2/default.nix b/pkgs/tools/filesystems/grive2/default.nix new file mode 100644 index 000000000000..a3ee1b67bab2 --- /dev/null +++ b/pkgs/tools/filesystems/grive2/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, pkgconfig, fetchurl, yajl, cmake, libgcrypt, curl, expat, boost, binutils }: + +stdenv.mkDerivation rec { + version = "0.5.0"; + name = "grive2-${version}"; + + src = fetchFromGitHub { + owner = "vitalif"; + repo = "grive2"; + rev = "v${version}"; + sha256 = "0gyic9228j25l5x8qj9xxxp2cgbw6y4skxqx0xrq6qilhv4lj23c"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + + buildInputs = [ libgcrypt yajl curl expat stdenv boost binutils ]; + + meta = with stdenv.lib; { + description = "A console Google Drive client"; + homepage = https://github.com/vitalif/grive2; + license = licenses.gpl2; + platforms = platforms.linux; + }; + +} diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix index 78784580eacc..ce620cf30177 100644 --- a/pkgs/tools/graphics/graphviz/default.nix +++ b/pkgs/tools/graphics/graphviz/default.nix @@ -21,9 +21,9 @@ stdenv.mkDerivation rec { ]; buildInputs = - [ pkgconfig libpng libjpeg expat yacc libtool fontconfig gd gts libdevil flex + [ pkgconfig libpng libjpeg expat yacc libtool fontconfig gd gts libdevil flex pango ] ++ stdenv.lib.optionals (xorg != null) - (with xorg; [ xlibsWrapper libXrender pango libXaw libXpm ]) + (with xorg; [ xlibsWrapper libXrender libXaw libXpm ]) ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") gettext; CPPFLAGS = stdenv.lib.optionalString (xorg != null && stdenv.system == "x86_64-darwin") diff --git a/pkgs/tools/graphics/optipng/default.nix b/pkgs/tools/graphics/optipng/default.nix index 08f99469d255..767ea0e54254 100644 --- a/pkgs/tools/graphics/optipng/default.nix +++ b/pkgs/tools/graphics/optipng/default.nix @@ -5,11 +5,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "optipng-0.7.5"; + name = "optipng-0.7.6"; src = fetchurl { url = "mirror://sourceforge/optipng/${name}.tar.gz"; - sha256 = "17b197437z5wn29llpwklk7ihgx8bhc913gvjf4zyb81idwlprbl"; + sha256 = "105yk5qykvhiahzag67gm36s2kplxf6qn5hay02md0nkrcgn6w28"; }; buildInputs = [ libpng ]; diff --git a/pkgs/tools/graphics/wkhtmltopdf/default.nix b/pkgs/tools/graphics/wkhtmltopdf/default.nix index 89ea0e944440..bcb7803785b0 100644 --- a/pkgs/tools/graphics/wkhtmltopdf/default.nix +++ b/pkgs/tools/graphics/wkhtmltopdf/default.nix @@ -1,72 +1,114 @@ -{ stdenv, fetchgit, qt4, fontconfig, freetype, libpng, zlib, libjpeg +{ stdenv, fetchFromGitHub, qt4, fontconfig, freetype, libpng, zlib, libjpeg , openssl, libX11, libXext, libXrender, overrideDerivation }: stdenv.mkDerivation rec { - version = "0.12.2.4"; + version = "0.12.3.2"; name = "wkhtmltopdf-${version}"; - src = fetchgit { - url = "https://github.com/wkhtmltopdf/wkhtmltopdf.git"; - rev = "refs/tags/${version}"; - sha256 = "0g96vgi3s633j4myjfzakkyiml1zspvdvbc0q1vhw8fp5n1xdknm"; - fetchSubmodules = false; + src = fetchFromGitHub { + owner = "wkhtmltopdf"; + repo = "wkhtmltopdf"; + rev = "${version}"; + sha256 = "1yyqjhxv4dvpkad79scs7xdx4iz8jpyidr9ya86k3zpfyvh4gq3s"; }; wkQt = overrideDerivation qt4 (deriv: { - name = "qt-mod-4.8.6"; + name = "qt-mod-4.8.7"; enableParallelBuilding = true; - src = fetchgit { - url = "https://github.com/wkhtmltopdf/qt.git"; - rev = "48e71c19c7fc67517fb3dca6d42eacb57341c9ba"; # From git submodule spec in wkhtml repo. - sha256 = "1ygr7g3k900zjf54ji6kkfppqnxaqwbh8npr53g2krdw3bmny6fx"; + src = fetchFromGitHub { + owner = "wkhtmltopdf"; + repo = "qt"; + rev = "fe194f9dac0b515757392a18f7fc9527c91d45ab"; # From git submodule spec in wkhtml repo. + sha256 = "1j2ld2bfacnn3vm2l1870v55sj82bq4y8zkawmlx2y5j63d8vr23"; }; configureFlags = '' - -v -no-separate-debug-info -release -confirm-license -opensource - -qdbus -glib -dbus-linked -openssl-linked + -dbus-linked + -glib + -no-separate-debug-info + -openssl-linked + -qdbus + -v '' + # This is taken from the wkhtml build script that we don't run '' - -fast - -static + -confirm-license -exceptions - -xmlpatterns - -webkit - -system-zlib - -system-libpng - -system-libjpeg + -fast + -graphicssystem raster + -iconv + -largefile + -no-3dnow + -no-accessibility + -no-audio-backend + -no-avx + -no-cups + -no-dbus + -no-declarative + -no-glib + -no-gstreamer + -no-gtkstyle + -no-icu + -no-javascript-jit -no-libmng -no-libtiff - -no-accessibility - -no-stl - -no-qt3support + -nomake demos + -nomake docs + -nomake examples + -nomake tests + -nomake tools + -nomake translations + -no-mitshm + -no-mmx + -no-multimedia + -no-nas-sound + -no-neon + -no-nis + -no-opengl + -no-openvg + -no-pch -no-phonon -no-phonon-backend - -no-opengl - -no-declarative + -no-qt3support + -no-rpath + -no-scripttools + -no-sm -no-sql-ibase -no-sql-mysql -no-sql-odbc -no-sql-psql -no-sql-sqlite -no-sql-sqlite2 - -no-mmx - -no-3dnow -no-sse -no-sse2 - -no-multimedia - -nomake demos - -nomake docs - -nomake examples - -nomake tools - -nomake tests - -nomake translations + -no-sse3 + -no-sse4.1 + -no-sse4.2 + -no-ssse3 + -no-stl + -no-xcursor + -no-xfixes + -no-xinerama + -no-xinput + -no-xkb + -no-xrandr + -no-xshape + -no-xsync + -opensource + -openssl + -release + -static + -system-libjpeg + -system-libpng + -system-zlib + -webkit + -xmlpatterns ''; }); buildInputs = [ wkQt fontconfig freetype libpng zlib libjpeg openssl - libX11 libXext libXrender - ]; + libX11 libXext libXrender + ]; configurePhase = "qmake wkhtmltopdf.pro INSTALLBASE=$out"; diff --git a/pkgs/tools/misc/bandwidth/default.nix b/pkgs/tools/misc/bandwidth/default.nix index ff5e47336d3c..853c619859d4 100644 --- a/pkgs/tools/misc/bandwidth/default.nix +++ b/pkgs/tools/misc/bandwidth/default.nix @@ -10,11 +10,13 @@ let else null; in stdenv.mkDerivation rec { - name = "bandwidth-1.1b"; + name = "bandwidth-${version}"; + version = "1.2.0"; src = fetchurl { - url = "http://zsmith.co/archives/${name}.tar.gz"; - sha256 = "01c3ca0x3rh65j1s2g6cg5xr9fvm0lp2wpmv71vhz55xwqqqmiz8"; + url = "https://mutineer.org/file.php?id=ee10698c6a675ece26f08ddb5e6001323d6305c1&p=bandwidth"; + name = "${name}.tar.gz"; + sha256 = "1jq6a4n77gcx68bkr8l79agsmgv8saw9nv183297gnah1g67nvw6"; }; buildInputs = [ nasm ]; @@ -30,9 +32,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://zsmith.co/bandwidth.html; - description = "and artificial benchmark for identifying weaknesses in the memory subsystem"; + description = "Artificial benchmark for identifying weaknesses in the memory subsystem"; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington ]; + maintainers = with maintainers; [ nckx wkennington ]; }; } diff --git a/pkgs/tools/misc/duc/default.nix b/pkgs/tools/misc/duc/default.nix new file mode 100644 index 000000000000..e113bd86bac3 --- /dev/null +++ b/pkgs/tools/misc/duc/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, pkgconfig, tokyocabinet, cairo, pango, ncurses }: + +stdenv.mkDerivation rec { + name = "duc-${version}"; + version = "1.3.3"; + + src = fetchurl { + url = "http://duc.zevv.nl/release/${name}.tar.gz"; + sha256 = "09mp8cq6s43sfhvms4mwhx3lw51vkaxgg34fbfbimafyjh4jdx3k"; + }; + + buildInputs = [ pkgconfig tokyocabinet cairo pango ncurses ]; + + meta = with stdenv.lib; { + homepage = http://duc.zevv.nl/; + description = "Collection of tools for inspecting and visualizing disk usage"; + license = licenses.gpl2; + + platforms = platforms.linux; + maintainers = [ maintainers.lethalman ]; + }; +} diff --git a/pkgs/tools/misc/dumptorrent/default.nix b/pkgs/tools/misc/dumptorrent/default.nix new file mode 100644 index 000000000000..60a2ed29bbf8 --- /dev/null +++ b/pkgs/tools/misc/dumptorrent/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "dumptorrent-${version}"; + version = "1.2"; + + src = fetchurl { + url = "mirror://sourceforge/dumptorrent/dumptorrent-${version}.tar.gz"; + sha256 = "073h03bmpfdy15qh37lvppayld2747i4acpyk0pm5nf2raiak0zm"; + }; + + installPhase = '' + mkdir -p $out/bin + cp ./dumptorrent $out/bin + ''; + + meta = with stdenv.lib; { + description = "Dump .torrent file information"; + homepage = https://sourceforge.net/projects/dumptorrent/; + license = licenses.gpl2; + maintainers = [ maintainers.zohl ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/misc/execline/default.nix b/pkgs/tools/misc/execline/default.nix index 7478b1e33eea..1726afca0d02 100644 --- a/pkgs/tools/misc/execline/default.nix +++ b/pkgs/tools/misc/execline/default.nix @@ -2,7 +2,7 @@ let - version = "2.1.4.0"; + version = "2.1.4.5"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { src = fetchgit { url = "git://git.skarnet.org/execline"; rev = "refs/tags/v${version}"; - sha256 = "1ih0mmkra3aa697nz7haaifq2hfy3wjj39npxzg9zr37m7yw67yz"; + sha256 = "1k4db9iyskrqf6wbc4dkiqgpn0wb43qc9rf1br7kvy9rrzq3yrj0"; }; dontDisableStatic = true; @@ -25,7 +25,9 @@ in stdenv.mkDerivation rec { "--with-include=${skalibs}/include" "--with-lib=${skalibs}/lib" "--with-dynlib=${skalibs}/lib" - ] ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ]); + ] + ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ]) + ++ (stdenv.lib.optional stdenv.isDarwin "--target=${stdenv.system}"); meta = { homepage = http://skarnet.org/software/execline/; diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix index 0ca0774989de..70b36222cca9 100644 --- a/pkgs/tools/misc/s6-portable-utils/default.nix +++ b/pkgs/tools/misc/s6-portable-utils/default.nix @@ -2,7 +2,7 @@ let - version = "2.0.5.2"; + version = "2.0.5.3"; in stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "http://www.skarnet.org/software/s6-portable-utils/${name}.tar.gz"; - sha256 = "0d5dvqz61abr4m2n10by8hccvw51jdvyckvpbbq0c57viri54jzm"; + sha256 = "029fg9c37vwh9yagd69h8r192nrx4mfva8dwgpm1gxkdssrh3gi7"; }; dontDisableStatic = true; @@ -20,7 +20,8 @@ in stdenv.mkDerivation rec { "--with-include=${skalibs}/include" "--with-lib=${skalibs}/lib" "--with-dynlib=${skalibs}/lib" - ]; + ] + ++ (stdenv.lib.optional stdenv.isDarwin "--target=${stdenv.system}"); meta = { homepage = http://www.skarnet.org/software/s6-portable-utils/; diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index 270e1c0cb62a..f8c087aa757b 100644 --- a/pkgs/tools/misc/svtplay-dl/default.nix +++ b/pkgs/tools/misc/svtplay-dl/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "svtplay-dl-${version}"; - version = "0.30.2016.02.08"; + version = "1.0"; src = fetchFromGitHub { owner = "spaam"; repo = "svtplay-dl"; rev = version; - sha256 = "0nkgc43lf06h0w8k4zm5pdzp6r6jjc6j94ciljcm8333n0ykfzpr"; + sha256 = "0chvljmhj7waq3dfyciiyk3i18hmrczc70qfyhn2ycq0k0nbn0jj"; }; pythonPaths = [ pycrypto requests2 ]; diff --git a/pkgs/tools/misc/tldr/default.nix b/pkgs/tools/misc/tldr/default.nix index f223a97520b0..39a7dc25c094 100644 --- a/pkgs/tools/misc/tldr/default.nix +++ b/pkgs/tools/misc/tldr/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "tldr-${version}"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { - sha256 = "0hxkrzp5njhy7c19v8i3svcb148f1jni7dlv36gc1nmcrz5izsiz"; + sha256 = "1dyvmxdxm92bfs5i6cngk8isa65qp6xlpim4yizs5rnm0rynf9kr"; rev = "v${version}"; repo = "tldr-cpp-client"; owner = "tldr-pages"; @@ -14,13 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ curl clang libzip ]; nativeBuildInputs = [ pkgconfig ]; - preConfigure = '' - cd src - ''; - - installPhase = '' - install -Dm755 {.,$out/bin}/tldr - ''; + installFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { description = "Simplified and community-driven man pages"; diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix index 8cb6172d87b6..189be8be9e26 100644 --- a/pkgs/tools/networking/aria2/default.nix +++ b/pkgs/tools/networking/aria2/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "aria2-${version}"; - version = "1.20.0"; + version = "1.21.0"; src = fetchurl { url = "https://github.com/tatsuhiro-t/aria2/releases/download/release-${version}/${name}.tar.xz"; - sha256 = "1l4gzz3yr0cl6a9xdy7843c5sb7afyq0i80wi2hasfpfdx5k95mz"; + sha256 = "1035rzx9y7qv4p7cv04f461343dxha7ikprch059x2fci8n5yp12"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix index a3719570e894..32cf5750c6a4 100644 --- a/pkgs/tools/networking/cjdns/default.nix +++ b/pkgs/tools/networking/cjdns/default.nix @@ -1,17 +1,12 @@ -{ stdenv, fetchFromGitHub, nodejs, which, python27, utillinux }: +{ stdenv, fetchurl, nodejs, which, python27, utillinux }: -let - version = "16"; # see ${src}/util/version/Version.h - date = "20150509"; -in +let version = "17.3"; in stdenv.mkDerivation { - name = "cjdns-${version}-${date}"; + name = "cjdns-"+version; - src = fetchFromGitHub { - owner = "cjdelisle"; - repo = "cjdns"; - rev = "a05ade40dc31caebaf3aa770aac3ab2ecb02d867"; - sha256 = "07vwsw5d0sdxypl187cyzzdrv0chf4yyjxcymf847afkfr249n29"; + src = fetchurl { + url = "https://github.com/cjdelisle/cjdns/archive/cjdns-v${version}.tar.gz"; + sha256 = "00p62y7b89y3piirpj27crprji8nh0zv7zh4mcqhzh6r39jxz4ri"; }; buildInputs = [ which python27 nodejs ] ++ @@ -35,7 +30,7 @@ stdenv.mkDerivation { homepage = https://github.com/cjdelisle/cjdns; description = "Encrypted networking for regular people"; license = licenses.gpl3; - maintainers = with maintainers; [ viric ehmry ]; + maintainers = with maintainers; [ ehmry ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix index 454d3b418187..3fd4e37c9080 100644 --- a/pkgs/tools/networking/i2pd/default.nix +++ b/pkgs/tools/networking/i2pd/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = pname + "-" + version; pname = "i2pd"; - version = "2.5.1"; + version = "2.6.0"; src = fetchFromGitHub { owner = "PurpleI2P"; repo = pname; rev = version; - sha256 = "17qf2pbxf05iw2gzyc5bc2zg3a4ns6zf1pm8q9j7nqhchh1rv4cm"; + sha256 = "0siqg2gf1w85c3j7w6bzjyyjzlxr8z57jk0675gn8yz0xvpkrdys"; }; buildInputs = [ boost zlib openssl ]; diff --git a/pkgs/tools/networking/minidlna/default.nix b/pkgs/tools/networking/minidlna/default.nix index c0944bb891ec..9e8e0c180d7e 100644 --- a/pkgs/tools/networking/minidlna/default.nix +++ b/pkgs/tools/networking/minidlna/default.nix @@ -16,6 +16,12 @@ stdenv.mkDerivation { buildInputs = [ ffmpeg flac libvorbis libogg libid3tag libexif libjpeg sqlite gettext ]; + postInstall = '' + mkdir -p $out/share/man/man{5,8} + cp minidlna.conf.5 $out/share/man/man5 + cp minidlnad.8 $out/share/man/man8 + ''; + meta = with stdenv.lib; { description = "Media server software"; longDescription = '' diff --git a/pkgs/tools/networking/mosh/default.nix b/pkgs/tools/networking/mosh/default.nix index ec2f8d78dc67..80feeafdbca4 100644 --- a/pkgs/tools/networking/mosh/default.nix +++ b/pkgs/tools/networking/mosh/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, zlib, boost, protobuf, ncurses, pkgconfig, IOTty -, makeWrapper, perl, openssl }: +, makeWrapper, perl, openssl, autoreconfHook, fetchpatch }: stdenv.mkDerivation rec { name = "mosh-1.2.5"; @@ -9,7 +9,16 @@ stdenv.mkDerivation rec { sha256 = "1qsb0y882yfgwnpy6f98pi5xqm6kykdsrxzvaal37hs7szjhky0s"; }; - buildInputs = [ boost protobuf ncurses zlib pkgconfig IOTty makeWrapper perl openssl ]; + buildInputs = [ autoreconfHook boost protobuf ncurses zlib pkgconfig IOTty makeWrapper perl openssl ]; + + patches = [ + # remove automake detection macro patch on next release as it is already on mosh master + (fetchpatch { + name = "fix_automake_detection_macro.patch"; + url = "https://github.com/mobile-shell/mosh/commit/a47917b97606a03f6bbf0cafd1fcd495b0229790.patch"; + sha256 = "0ib200ffvbnns125xd58947fyxdx31m06rmnzqmxpxcnjza7k404"; + }) + ]; postInstall = '' wrapProgram $out/bin/mosh --prefix PERL5LIB : $PERL5LIB diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix index e089f69ebd82..5e8931579cb3 100644 --- a/pkgs/tools/networking/network-manager-applet/default.nix +++ b/pkgs/tools/networking/network-manager-applet/default.nix @@ -6,7 +6,9 @@ let pn = "network-manager-applet"; major = "1.0"; - version = networkmanager.version; + # With version 1.0.12 of NM, we are no longer in sync + # version = "${networkmanager.version}.10"; + version = "${major}.10"; in stdenv.mkDerivation rec { @@ -14,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pn}/${major}/${name}.tar.xz"; - sha256 = "1yj0m6fb9v12d0di0rfmk3hx1vmygjkiff2c476rf792sbh56kax"; + sha256 = "1szh5jyijxm6z55irkp5s44pwah0nikss40mx7pvpk38m8zaqidh"; }; configureFlags = [ "--sysconfdir=/etc" ]; diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 654d590a8b72..afdca314ae64 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -2,20 +2,24 @@ , systemd, libgudev, libnl, libuuid, polkit, gnutls, ppp, dhcp, dhcpcd, iptables , libgcrypt, dnsmasq, avahi, bind, perl, bluez5, substituteAll, readline , gobjectIntrospection, modemmanager, openresolv, libndp, newt, libsoup -, ethtool, gnused }: +, ethtool, gnused, coreutils, file, inetutils }: stdenv.mkDerivation rec { name = "network-manager-${version}"; - version = "1.0.6"; + version = "1.0.12"; src = fetchurl { url = "mirror://gnome/sources/NetworkManager/1.0/NetworkManager-${version}.tar.xz"; - sha256 = "38ea002403e3b884ffa9aae25aea431d2a8420f81f4919761c83fb92648254bd"; + sha256 = "17jan0g5jzp8mrpklyacwdgnnw016m1c5pc4az5im6qhc260yirs"; }; preConfigure = '' - substituteInPlace tools/glib-mkenums --replace /usr/bin/perl ${perl}/bin/perl + substituteInPlace configure --replace /usr/bin/uname ${coreutils}/bin/uname + substituteInPlace configure --replace /usr/bin/file ${file}/bin/file + substituteInPlace src/devices/nm-device.c --replace /usr/bin/ping ${inetutils}/bin/ping substituteInPlace src/NetworkManagerUtils.c --replace /sbin/modprobe /run/current-system/sw/sbin/modprobe + substituteInPlace data/84-nm-drivers.rules \ + --replace /bin/sh ${stdenv.shell} substituteInPlace data/85-nm-unmanaged.rules \ --replace /bin/sh ${stdenv.shell} \ --replace /usr/sbin/ethtool ${ethtool}/sbin/ethtool \ diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 957d5e715e78..19b96fdc8dd5 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -41,7 +41,9 @@ stdenv.mkDerivation rec { ''; patches = - [ ./locale_archive.patch ] + [ ./locale_archive.patch + ./fix-host-key-algorithms-plus.patch + ] ++ optional withGssapiPatches gssapiSrc; buildInputs = [ zlib openssl libedit pkgconfig pam ] diff --git a/pkgs/tools/networking/openssh/fix-host-key-algorithms-plus.patch b/pkgs/tools/networking/openssh/fix-host-key-algorithms-plus.patch new file mode 100644 index 000000000000..02846e9bdad2 --- /dev/null +++ b/pkgs/tools/networking/openssh/fix-host-key-algorithms-plus.patch @@ -0,0 +1,52 @@ +Specifying "HostKeyAlgorithms +ssh-dds" does not work properly because +setting any value for HostKeyAlgorithms causes the known host keys to +be ignored for the purpose of determining the priority of algorithms. +This was fixed upstream for HostKeyAlgorithms in sshd_config, but not +in ssh_config. The fix is to apply order_hostkeyalgs() if the user +specifies a HostKeyAlgorithms starting with "+". + +diff -ru -x '*~' openssh-7.2p2-orig/sshconnect2.c openssh-7.2p2/sshconnect2.c +--- openssh-7.2p2-orig/sshconnect2.c 2016-03-09 19:04:48.000000000 +0100 ++++ openssh-7.2p2/sshconnect2.c 2016-04-01 15:39:45.140945902 +0200 +@@ -100,7 +100,7 @@ + } + + static char * +-order_hostkeyalgs(char *host, struct sockaddr *hostaddr, u_short port) ++order_hostkeyalgs(char *host, struct sockaddr *hostaddr, u_short port, char *algs) + { + char *oavail, *avail, *first, *last, *alg, *hostname, *ret; + size_t maxlen; +@@ -116,7 +116,7 @@ + for (i = 0; i < options.num_system_hostfiles; i++) + load_hostkeys(hostkeys, hostname, options.system_hostfiles[i]); + +- oavail = avail = xstrdup(KEX_DEFAULT_PK_ALG); ++ oavail = avail = xstrdup(algs); + maxlen = strlen(avail) + 1; + first = xmalloc(maxlen); + last = xmalloc(maxlen); +@@ -181,18 +181,21 @@ + myproposal[PROPOSAL_MAC_ALGS_CTOS] = + myproposal[PROPOSAL_MAC_ALGS_STOC] = options.macs; + if (options.hostkeyalgorithms != NULL) { ++ int append = options.hostkeyalgorithms[0] == '+'; + if (kex_assemble_names(KEX_DEFAULT_PK_ALG, + &options.hostkeyalgorithms) != 0) + fatal("%s: kex_assemble_namelist", __func__); + myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = +- compat_pkalg_proposal(options.hostkeyalgorithms); ++ compat_pkalg_proposal(append ++ ? order_hostkeyalgs(host, hostaddr, port, options.hostkeyalgorithms) ++ : options.hostkeyalgorithms); + } else { + /* Enforce default */ + options.hostkeyalgorithms = xstrdup(KEX_DEFAULT_PK_ALG); + /* Prefer algorithms that we already have keys for */ + myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = + compat_pkalg_proposal( +- order_hostkeyalgs(host, hostaddr, port)); ++ order_hostkeyalgs(host, hostaddr, port, KEX_DEFAULT_PK_ALG)); + } + + if (options.rekey_limit || options.rekey_interval) diff --git a/pkgs/tools/networking/s6-dns/default.nix b/pkgs/tools/networking/s6-dns/default.nix index 233425dc3a11..8715cb0c45cc 100644 --- a/pkgs/tools/networking/s6-dns/default.nix +++ b/pkgs/tools/networking/s6-dns/default.nix @@ -2,7 +2,7 @@ let - version = "2.0.0.4"; + version = "2.0.0.7"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { src = fetchgit { url = "git://git.skarnet.org/s6-dns"; rev = "refs/tags/v${version}"; - sha256 = "0h2s0r0g0qi74aw04c0jap09yjzzprwc6ihknx8bqgbzv08yv03w"; + sha256 = "033pijilkvj3vw94aqrvavr4mqafm7kcc8ql8lc3ma6lqkx4xyak"; }; dontDisableStatic = true; @@ -25,7 +25,9 @@ in stdenv.mkDerivation rec { "--with-include=${skalibs}/include" "--with-lib=${skalibs}/lib" "--with-dynlib=${skalibs}/lib" - ] ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ]); + ] + ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ]) + ++ (stdenv.lib.optional stdenv.isDarwin "--target=${stdenv.system}"); meta = { homepage = http://www.skarnet.org/software/s6-dns/; diff --git a/pkgs/tools/networking/s6-networking/default.nix b/pkgs/tools/networking/s6-networking/default.nix index 5f24592f030e..603b2f61551b 100644 --- a/pkgs/tools/networking/s6-networking/default.nix +++ b/pkgs/tools/networking/s6-networking/default.nix @@ -2,7 +2,7 @@ let - version = "2.1.0.1"; + version = "2.1.0.4"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { src = fetchgit { url = "git://git.skarnet.org/s6-networking"; rev = "refs/tags/v${version}"; - sha256 = "0jdjxwqrp7lzdb85sp1gdkm7s478wyl7wqxb3jfxflgh2bgdgvy2"; + sha256 = "1mvsiiv2zk1mbhway5q593xzjzd3lyzdqg85wrpvv791mv0kk8m9"; }; dontDisableStatic = true; @@ -32,7 +32,8 @@ in stdenv.mkDerivation rec { "--with-dynlib=${execline}/lib" "--with-dynlib=${s6}/lib" "--with-dynlib=${s6Dns}/lib" - ]; + ] + ++ (stdenv.lib.optional stdenv.isDarwin "--target=${stdenv.system}"); meta = { homepage = http://www.skarnet.org/software/s6-networking/; diff --git a/pkgs/tools/networking/snabbswitch/default.nix b/pkgs/tools/networking/snabb/default.nix index f7cd1a4300ac..8ba9cfa6dad8 100644 --- a/pkgs/tools/networking/snabbswitch/default.nix +++ b/pkgs/tools/networking/snabb/default.nix @@ -1,12 +1,14 @@ -{ stdenv, lib, fetchurl, bash, makeWrapper, git, mariadb, diffutils }: +{ stdenv, lib, fetchFromGitHub, bash, makeWrapper, git, mariadb, diffutils, which, coreutils, procps, nettools }: stdenv.mkDerivation rec { name = "snabb-${version}"; - version = "2015.12"; + version = "2016.04"; - src = fetchurl { - url = "https://github.com/SnabbCo/snabbswitch/archive/v${version}.tar.gz"; - sha256 = "1949a6d3hqdr2hdfmrr1na9gvjdwdahadbhmvz2pg7azmpq6ssmr"; + src = fetchFromGitHub { + owner = "snabbco"; + repo = "snabb"; + rev = "v${version}"; + sha256 = "1b5g477zy6cr5d9171xf8zrhhq6wxshg4cn78i5bki572q86kwlx"; }; buildInputs = [ makeWrapper ]; @@ -18,13 +20,15 @@ stdenv.mkDerivation rec { for f in $(find src/program/snabbnfv/ -type f); do substituteInPlace $f --replace "/bin/bash" "${bash}/bin/bash" done + + # We need a way to pass $PATH to the scripts + sed -i '2iexport PATH=${git}/bin:${mariadb}/bin:${which}/bin:${procps}/bin:${coreutils}/bin' src/program/snabbnfv/neutron_sync_master/neutron_sync_master.sh.inc + sed -i '2iexport PATH=${git}/bin:${coreutils}/bin:${diffutils}/bin:${nettools}/bin' src/program/snabbnfv/neutron_sync_agent/neutron_sync_agent.sh.inc ''; installPhase = '' mkdir -p $out/bin cp src/snabb $out/bin - - wrapProgram $out/bin/snabb --prefix PATH : "${ lib.makeBinPath [ git mariadb diffutils ]}" ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/security/gnupg/20.nix b/pkgs/tools/security/gnupg/20.nix index 117fc41c1abe..65d43ec9dbee 100644 --- a/pkgs/tools/security/gnupg/20.nix +++ b/pkgs/tools/security/gnupg/20.nix @@ -12,11 +12,11 @@ with stdenv.lib; assert x11Support -> pinentry != null; stdenv.mkDerivation rec { - name = "gnupg-2.0.29"; + name = "gnupg-2.0.30"; src = fetchurl { url = "mirror://gnupg/gnupg/${name}.tar.bz2"; - sha256 = "1jaakn0mi6pi2b3g3imxj3qzxw2zg0ifxs30baq2b157dcw6pvb8"; + sha256 = "0wax4cy14hh0h7kg9hj0hjn9424b71z8lrrc5kbsasrn9xd7hag3"; }; buildInputs diff --git a/pkgs/tools/security/gnupg/gpgkey2ssh-20.patch b/pkgs/tools/security/gnupg/gpgkey2ssh-20.patch index b536a4fe50e3..4bfdc13ef598 100644 --- a/pkgs/tools/security/gnupg/gpgkey2ssh-20.patch +++ b/pkgs/tools/security/gnupg/gpgkey2ssh-20.patch @@ -2,7 +2,7 @@ diff --git a/tools/gpgkey2ssh.c b/tools/gpgkey2ssh.c index 903fb5b..d5611dc 100644 --- a/tools/gpgkey2ssh.c +++ b/tools/gpgkey2ssh.c -@@ -266,7 +266,7 @@ main (int argc, char **argv) +@@ -268,7 +268,7 @@ main (int argc, char **argv) keyid = argv[1]; ret = asprintf (&command, diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix index 56e20726793d..2f6769b929b8 100644 --- a/pkgs/tools/security/pass/default.nix +++ b/pkgs/tools/security/pass/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { preInstall = '' mkdir -p "$out/share/bash-completion/completions" mkdir -p "$out/share/zsh/site-functions" - mkdir -p "$out/share/fish/completions" + mkdir -p "$out/share/fish/vendor_completions.d" ''; installFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/tools/security/sshuttle/default.nix b/pkgs/tools/security/sshuttle/default.nix index 4a8d7518e9c2..411195747678 100644 --- a/pkgs/tools/security/sshuttle/default.nix +++ b/pkgs/tools/security/sshuttle/default.nix @@ -3,10 +3,10 @@ pythonPackages.buildPythonApplication rec { name = "sshuttle-${version}"; - version = "0.77.2"; + version = "0.78.0"; src = fetchurl { - sha256 = "1fwlhr5r9pl3pns65nn4mxf5ivypmd2a12gv3vpyznfy5f097k10"; + sha256 = "18hrwi2gyri1n2rq0nghvv7hfhbhh5h67am89524vc1yyx40vn3b"; url = "https://pypi.python.org/packages/source/s/sshuttle/${name}.tar.gz"; }; diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index 5d3dbd861aa1..2f38c9b374af 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, autoreconfHook, libestr, json_c, zlib, pythonPackages +{ stdenv, fetchurl, pkgconfig, autoreconfHook, libestr, json_c, zlib, pythonPackages, fastJson , libkrb5 ? null, systemd ? null, jemalloc ? null, libmysql ? null, postgresql ? null , libdbi ? null, net_snmp ? null, libuuid ? null, curl ? null, gnutls ? null , libgcrypt ? null, liblognorm ? null, openssl ? null, librelp ? null, libksi ? null @@ -11,18 +11,18 @@ let mkFlag = cond: name: if cond then "--enable-${name}" else "--disable-${name}"; in stdenv.mkDerivation rec { - name = "rsyslog-8.14.0"; + name = "rsyslog-8.17.0"; src = fetchurl { url = "http://www.rsyslog.com/files/download/rsyslog/${name}.tar.gz"; - sha256 = "1hp7ga543m6vhijcnjb4z8v26ddjgypk1lh6km1cvxc45cfmnfs4"; + sha256 = "1fazpbllr3wk8aw41zk7b6iirds4h8j3im080nf8my2cjssij7pc"; }; #patches = [ ./fix-gnutls-detection.patch ]; nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ - libestr json_c zlib pythonPackages.docutils libkrb5 jemalloc libmysql + fastJson libestr json_c zlib pythonPackages.docutils libkrb5 jemalloc libmysql postgresql libdbi net_snmp libuuid curl gnutls libgcrypt liblognorm openssl librelp libgt libksi liblogging libnet hadoop rdkafka libmongo-client czmq rabbitmq-c hiredis diff --git a/pkgs/tools/system/s6-rc/default.nix b/pkgs/tools/system/s6-rc/default.nix index a3b244d875b6..35763e8212e3 100644 --- a/pkgs/tools/system/s6-rc/default.nix +++ b/pkgs/tools/system/s6-rc/default.nix @@ -2,7 +2,7 @@ let - version = "0.0.1.0"; + version = "0.0.2.1"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { src = fetchgit { url = "git://git.skarnet.org/s6-rc"; rev = "refs/tags/v${version}"; - sha256 = "02ppsda8pg7mph3r7lrh7dhi6ip99bgghsl3lf902cg9i4n50q6q"; + sha256 = "0x9ghi1f7zqphzlzyz67z7n7mnnyxf1hghi2wa2f8cdl70nfdi2f"; }; dontDisableStatic = true; @@ -29,7 +29,9 @@ in stdenv.mkDerivation rec { "--with-dynlib=${skalibs}/lib" "--with-dynlib=${execline}/lib" "--with-dynlib=${s6}/lib" - ] ++ [ (if stdenv.isDarwin then "--disable-shared" else "--enable-shared") ]; + ] + ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ]) + ++ (stdenv.lib.optional stdenv.isDarwin "--target=${stdenv.system}"); meta = { homepage = http://skarnet.org/software/s6-rc/; diff --git a/pkgs/tools/system/s6/default.nix b/pkgs/tools/system/s6/default.nix index 5e29c20339cf..e1e30de5799f 100644 --- a/pkgs/tools/system/s6/default.nix +++ b/pkgs/tools/system/s6/default.nix @@ -2,7 +2,7 @@ let - version = "2.2.1.0"; + version = "2.2.4.3"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { src = fetchgit { url = "git://git.skarnet.org/s6"; rev = "refs/tags/v${version}"; - sha256 = "1g8gr3znxj8lyqpwrmgzh47yb64zldrvvvgpp1m4pb37k5k11bj9"; + sha256 = "0j981xslcsra8filaawgwq6daqvxxjs0014lqb7dy3qf7c5pc4l8"; }; dontDisableStatic = true; @@ -26,7 +26,9 @@ in stdenv.mkDerivation rec { "--with-lib=${execline}/lib" "--with-dynlib=${skalibs}/lib" "--with-dynlib=${execline}/lib" - ] ++ [ (if stdenv.isDarwin then "--disable-shared" else "--enable-shared") ]; + ] + ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ]) + ++ (stdenv.lib.optional stdenv.isDarwin "--target=${stdenv.system}"); preBuild = '' substituteInPlace "src/daemontools-extras/s6-log.c" \ diff --git a/pkgs/tools/typesetting/tex/texlive-new/default.nix b/pkgs/tools/typesetting/tex/texlive-new/default.nix index fbf4adde2ae7..a2f0bf706c87 100644 --- a/pkgs/tools/typesetting/tex/texlive-new/default.nix +++ b/pkgs/tools/typesetting/tex/texlive-new/default.nix @@ -104,6 +104,7 @@ let mkUrlName = { pname, tlType, ... }: pname + lib.optionalString (tlType != "run") ".${tlType}"; + # command to unpack a single TL package unpackPkg = { # url ? null, urlPrefix ? null md5, pname, tlType, postUnpack ? "", stripPrefix ? 1, ... @@ -119,6 +120,7 @@ let -C "$out" --anchored --exclude=tlpkg --keep-old-files '' + postUnpack; + # create a derivation that contains unpacked upstream TL packages mkPkgs = { pname, tlType, version, pkgList }@args: /* TODOs: - "historic" isn't mirrored; posted a question at #287 |