diff options
Diffstat (limited to 'pkgs/tools')
72 files changed, 485 insertions, 275 deletions
diff --git a/pkgs/tools/X11/x11vnc/default.nix b/pkgs/tools/X11/x11vnc/default.nix index 23b0aaa55e8e..8acb11833da5 100644 --- a/pkgs/tools/X11/x11vnc/default.nix +++ b/pkgs/tools/X11/x11vnc/default.nix @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { substituteInPlace x11vnc/unixpw.c \ --replace '"/bin/su"' '"/var/setuid-wrappers/su"' \ --replace '"/bin/true"' '"${coreutils}/bin/true"' - - sed -i -e '/#!\/bin\/sh/a"PATH=${xorg.xdpyinfo}\/bin:$PATH\\n"' -e 's|/bin/su|/var/setuid-wrappers/su|g' x11vnc/ssltools.h + + sed -i -e '/#!\/bin\/sh/a"PATH=${xorg.xdpyinfo}\/bin:${xorg.xauth}\/bin:$PATH\\n"' -e 's|/bin/su|/var/setuid-wrappers/su|g' x11vnc/ssltools.h ''; meta = { diff --git a/pkgs/tools/admin/gtk-vnc/default.nix b/pkgs/tools/admin/gtk-vnc/default.nix index 1fda870d5fbb..44a421e2ba3d 100644 --- a/pkgs/tools/admin/gtk-vnc/default.nix +++ b/pkgs/tools/admin/gtk-vnc/default.nix @@ -1,17 +1,17 @@ x@{builderDefsPackage , python, gtk, pygtk, gnutls, cairo, libtool, glib, pkgconfig, libtasn1 - , libffi, cyrus_sasl, intltool, perl, perlPackages, firefox36Pkgs + , libffi, cyrus_sasl, intltool, perl, perlPackages, firefoxPkgs , kbproto, libX11, libXext, xextproto, pygobject, libgcrypt , ...}: builderDefsPackage (a : let helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - ["perlPackages" "firefox36Pkgs"]; + ["perlPackages" "firefoxPkgs"]; buildInputs = (map (n: builtins.getAttr n x) (builtins.attrNames (builtins.removeAttrs x helperArgNames))) - ++ [perlPackages.TextCSV firefox36Pkgs.xulrunner ]; + ++ [perlPackages.TextCSV firefoxPkgs.xulrunner ]; sourceInfo = rec { baseName="gtk-vnc"; majorVersion="0.4"; diff --git a/pkgs/tools/backup/bup/default.nix b/pkgs/tools/backup/bup/default.nix index e683df5a7fe1..54b089bd08e9 100644 --- a/pkgs/tools/backup/bup/default.nix +++ b/pkgs/tools/backup/bup/default.nix @@ -3,14 +3,16 @@ assert par2Support -> par2cmdline != null; +let rev = "96c6fa2a70425fff1e73d2e0945f8e242411ab58"; in + with stdenv.lib; stdenv.mkDerivation { - name = "bup-0.25-rc1-107-g96c6fa2"; + name = "bup-0.25-rc1-107-${stdenv.lib.strings.substring 0 7 rev}"; src = fetchgit { url = "https://github.com/bup/bup.git"; - rev = "96c6fa2a70425fff1e73d2e0945f8e242411ab58"; + inherit rev; sha256 = "0d9hgyh1g5qcpdvnqv3a5zy67x79yx9qx557rxrnxyzqckp9v75n"; }; diff --git a/pkgs/tools/filesystems/xtreemfs/default.nix b/pkgs/tools/filesystems/xtreemfs/default.nix index 6d1f863fdeaa..81be62b5159a 100644 --- a/pkgs/tools/filesystems/xtreemfs/default.nix +++ b/pkgs/tools/filesystems/xtreemfs/default.nix @@ -69,6 +69,7 @@ rec { platforms = with a.lib.platforms; linux; license = a.lib.licenses.bsd3; + broken = true; }; passthru = { updateInfo = { diff --git a/pkgs/tools/filesystems/yandex-disk/default.nix b/pkgs/tools/filesystems/yandex-disk/default.nix new file mode 100644 index 000000000000..31b1471fb7fc --- /dev/null +++ b/pkgs/tools/filesystems/yandex-disk/default.nix @@ -0,0 +1,54 @@ +{ stdenv, fetchurl, writeText, zlib, rpm, cpio, patchelf, which }: +let + p = if stdenv.is64bit then { + arch = "x86_64"; + gcclib = "${stdenv.gcc.gcc}/lib64"; + sha256 = "1fmmlvvh97d60n9k08bn4k6ghwr3yhs8sib82025nwpw1sq08vim"; + } + else { + arch = "i386"; + gcclib = "${stdenv.gcc.gcc}/lib"; + sha256 = "3940420bd9d1fe1ecec1a117bfd9d21d545bca59f5e0a4364304ab808c976f7f"; + }; +in +stdenv.mkDerivation rec { + + name = "yandex-disk-0.1.2.481"; + + src = fetchurl { + url = "http://repo.yandex.ru/yandex-disk/rpm/stable/${p.arch}/${name}-1.fedora.${p.arch}.rpm"; + sha256 = p.sha256; + }; + + builder = writeText "builder.sh" '' + . $stdenv/setup + mkdir -pv $out/bin + mkdir -pv $out/share + mkdir -pv $out/etc + + mkdir -pv unpacked + cd unpacked + ${rpm}/bin/rpm2cpio $src | ${cpio}/bin/cpio -imd + + cp -r -t $out/bin usr/bin/* + cp -r -t $out/share usr/share/* + cp -r -t $out/etc etc/* + + sed -i 's@have@${which}/bin/which >/dev/null 2>&1@' \ + $out/etc/bash_completion.d/yandex-disk-completion.bash + + ${patchelf}/bin/patchelf \ + --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + --set-rpath "${zlib}/lib:${p.gcclib}" \ + $out/bin/yandex-disk + ''; + + meta = { + homepage = http://help.yandex.com/disk/cli-clients.xml; + description = "Yandex.Disk is a free cloud file storage service"; + maintainers = with stdenv.lib.maintainers; [smironov]; + platforms = ["i686-linux" "x86_64-linux"]; + license = stdenv.lib.licenses.unfree; + }; +} + diff --git a/pkgs/tools/graphics/dcraw/default.nix b/pkgs/tools/graphics/dcraw/default.nix index 959241d30abf..5df814530a11 100644 --- a/pkgs/tools/graphics/dcraw/default.nix +++ b/pkgs/tools/graphics/dcraw/default.nix @@ -1,14 +1,14 @@ -{stdenv, fetchurl, libjpeg, lcms, gettext }: +{stdenv, fetchurl, libjpeg, lcms, gettext, jasper }: stdenv.mkDerivation rec { - name = "dcraw-9.04"; + name = "dcraw-9.19"; src = fetchurl { url = "http://www.cybercom.net/~dcoffin/dcraw/archive/${name}.tar.gz"; - sha256 = "1i9w35pldyzp5xjjcy20rps7p9wkxs6vj4wz43vhfyda93nij4y0"; + sha256 = "0x2qjavfp97vadw29d384sb887wgpfki4sl00p5lximf0a7fa0dv"; }; - buildInputs = [ libjpeg lcms gettext ]; + buildInputs = [ libjpeg lcms gettext jasper ]; patchPhase = '' sed -i -e s@/usr/local@$out@ install @@ -16,9 +16,7 @@ stdenv.mkDerivation rec { buildPhase = '' mkdir -p $out/bin - set +e sh install - set -e ''; meta = { diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix index c1aebd3dfe1a..0ef70a197d6f 100644 --- a/pkgs/tools/graphics/graphviz/default.nix +++ b/pkgs/tools/graphics/graphviz/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { interfaces for other technical domains. ''; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; maintainers = with stdenv.lib.maintainers; [ simons bjornfor ]; }; } diff --git a/pkgs/tools/graphics/pngcrush/default.nix b/pkgs/tools/graphics/pngcrush/default.nix index 60301b9b164e..7b5f16c502d1 100644 --- a/pkgs/tools/graphics/pngcrush/default.nix +++ b/pkgs/tools/graphics/pngcrush/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libpng }: stdenv.mkDerivation rec { - name = "pngcrush-1.7.50"; + name = "pngcrush-1.7.69"; src = fetchurl { url = "mirror://sourceforge/pmt/${name}-nolib.tar.xz"; - sha256 = "1xabqjgvwsyazs0hw7bzzm256zbd7v33alwzp0lbawm521m3m651"; + sha256 = "0j9nis6513hxd6klcv5559rwnfg7kawp2vqd4qgc1ax6wyvga4mw"; }; configurePhase = '' @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { description = "A PNG optimizer"; license = "free"; platforms = with stdenv.lib.platforms; linux; + maintainers = with stdenv.lib.maintainers; [ the-kenny ]; }; } diff --git a/pkgs/tools/graphics/welkin/default.nix b/pkgs/tools/graphics/welkin/default.nix index d02b38b41279..23c5ec11aaad 100644 --- a/pkgs/tools/graphics/welkin/default.nix +++ b/pkgs/tools/graphics/welkin/default.nix @@ -46,8 +46,7 @@ rec { [ raskin ]; - platforms = with a.lib.platforms; - []; + hydraPlatforms = []; license = "free-noncopyleft"; }; passthru = { diff --git a/pkgs/tools/misc/bogofilter/default.nix b/pkgs/tools/misc/bogofilter/default.nix index f23bd8993cff..3d9287a9b8c2 100644 --- a/pkgs/tools/misc/bogofilter/default.nix +++ b/pkgs/tools/misc/bogofilter/default.nix @@ -1,10 +1,10 @@ {fetchurl, stdenv, flex, bdb}: stdenv.mkDerivation rec { - name = "bogofilter-1.1.6"; + name = "bogofilter-1.1.7"; src = fetchurl { url = "mirror://sourceforge/bogofilter/${name}.tar.bz2"; - sha256 = "11pbhw6cc2yjdgl7nq771mrcv0z19al8jvassxnvbw4pvr5kzn9j"; + sha256 = "0ahi3pxv9v6yjjpfyr0x7fch4c4jdikshrcx86q0j8s2rhv94snm"; }; # FIXME: We would need `pax' as a "propagated build input" (for use diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix new file mode 100644 index 000000000000..5588fe3d647f --- /dev/null +++ b/pkgs/tools/misc/direnv/default.nix @@ -0,0 +1,37 @@ +{ fetchurl, stdenv, go }: + +let + version = "2.1.0"; +in +stdenv.mkDerivation { + name = "direnv-${version}"; + src = fetchurl { + url = "http://github.com/zimbatm/direnv/archive/v${version}.tar.gz"; + name = "direnv-${version}.tar.gz"; + sha256 = "4dad14e53aa5a20fd11cdbb907c19a05f16464172af302981adb410bd691cefe"; + }; + + buildInputs = [ go ]; + + buildPhase = "make"; + installPhase = "make install DESTDIR=$out"; + + meta = { + description = "a shell extension that manages your environment"; + longDescription = '' + Once hooked into your shell direnv is looking for an .envrc file in your + current directory before every prompt. + + If found it will load the exported environment variables from that bash + script into your current environment, and unload them if the .envrc is + not reachable from the current path anymore. + + In short, this little tool allows you to have project-specific + environment variables. + ''; + homepage = http://direnv.net; + license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.zimbatm ]; + }; +} diff --git a/pkgs/tools/misc/g500-control/default.nix b/pkgs/tools/misc/g500-control/default.nix index adccde71c46d..9d42c7d68d53 100644 --- a/pkgs/tools/misc/g500-control/default.nix +++ b/pkgs/tools/misc/g500-control/default.nix @@ -1,6 +1,6 @@ -{stdenv, fetchurl, coreutils}: +{ stdenv, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "g500-control-0.0.1"; src = fetchurl { @@ -8,10 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1xlg9lpxnk3228k81y1i6jjh4df1p4jh64g54w969g6a6v6dazvb"; }; - buildInputs = [ coreutils ]; - unpackPhase = '' - mkdir -pv g500-control + mkdir -p g500-control tar -C g500-control/ -xf $src ''; @@ -21,15 +19,16 @@ stdenv.mkDerivation rec { ''; installPhase = '' - mkdir -pv $out/bin/ + mkdir -p $out/bin/ cp g500-control $out/bin/ ''; - + meta = { homepage = http://code.google.com/p/g500-control/; description = "Configure Logitech G500's internal profile under Linux"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ the-kenny ]; }; } diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix index 9e8b1f9e3224..00d2f759be4f 100644 --- a/pkgs/tools/misc/gparted/default.nix +++ b/pkgs/tools/misc/gparted/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { parted gtk glib intltool gettext libuuid pkgconfig gtkmm libxml2 ]; + preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; + meta = { description = "Graphical disk partitioning tool"; homepage = http://gparted.sourceforge.net; diff --git a/pkgs/tools/misc/keychain/default.nix b/pkgs/tools/misc/keychain/default.nix index 881c65ef74b6..2c2a547f2fdc 100644 --- a/pkgs/tools/misc/keychain/default.nix +++ b/pkgs/tools/misc/keychain/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, makeWrapper, coreutils, openssh, gnupg +, procps, gnugrep, gawk, findutils, gnused }: stdenv.mkDerivation { name = "keychain-2.7.1"; @@ -8,13 +9,23 @@ stdenv.mkDerivation { sha256 = "14ai6wjwnj09xnl81ar2dlr5kwb8y1k5ck6nc549shpng0zzw1qi"; }; - phases = "unpackPhase buildPhase"; + phases = [ "unpackPhase" "buildPhase" ]; - buildPhase = - '' - mkdir -p $out/bin - cp keychain $out/bin - ''; + buildInputs = [ makeWrapper ]; + + buildPhase = '' + mkdir -p $out/bin + cp keychain $out/bin + wrapProgram $out/bin/keychain \ + --prefix PATH ":" "${coreutils}/bin" \ + --prefix PATH ":" "${openssh}/bin" \ + --prefix PATH ":" "${gnupg}/bin" \ + --prefix PATH ":" "${gnugrep}/bin" \ + --prefix PATH ":" "${gnused}/bin" \ + --prefix PATH ":" "${findutils}/bin" \ + --prefix PATH ":" "${gawk}/bin" \ + --prefix PATH ":" "${procps}/bin" + ''; meta = { description = "Keychain management tool"; diff --git a/pkgs/tools/misc/ldapvi/default.nix b/pkgs/tools/misc/ldapvi/default.nix new file mode 100644 index 000000000000..28d9b4863d4b --- /dev/null +++ b/pkgs/tools/misc/ldapvi/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchgit, openldap, openssl, popt, glib, ncurses, readline, pkgconfig, cyrus_sasl, autoconf, automake }: + +stdenv.mkDerivation rec { + name = "ldapvi-${version}"; + version = "0lz1sb5r0y9ypy8d7hm0l2wfa8l69f8ll0i5c78c0apz40nyjqkg"; + + # use latest git, it includes some important patches since 2007 release + src = fetchgit { + url = "http://www.lichteblau.com/git/ldapvi.git"; + sha256 = "3ef3103030ecb04d7fe80180e3fd490377cf81fb2af96782323fddabc3225030"; + }; + + buildInputs = [ openldap openssl popt glib ncurses readline pkgconfig cyrus_sasl autoconf automake ]; + + setSourceRoot = '' + sourceRoot=git-export/ldapvi + ''; + + preConfigure = '' + ./autogen.sh + ''; + + meta = with stdenv.lib; { + description = "ldapvi is an interactive LDAP client for Unix terminals. Using it, you can update LDAP entries with a text editor"; + homepage = http://www.lichteblau.com/ldapvi/; + license = licenses.gpl2; + maintainers = with maintainers; [ iElectric ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/misc/ngrok/default.nix b/pkgs/tools/misc/ngrok/default.nix index 971c42aac71c..e517dba7c550 100644 --- a/pkgs/tools/misc/ngrok/default.nix +++ b/pkgs/tools/misc/ngrok/default.nix @@ -3,36 +3,43 @@ let go-websocket = fetchgit { url = "git://github.com/garyburd/go-websocket"; - rev = "refs/heads/master"; - sha256 = "1e4fcff29c961cd7433ba1b655412d466edfeb1f0829b41f578764857bc801fe"; + rev = "4bad98c955"; + sha256 = "1zh1r1xqar47awgv8a883zmxyvj65m0mbdm17d1xf74nkkrcykqy"; }; go-metrics = fetchgit { url = "https://github.com/inconshreveable/go-metrics"; + rev = "60ba4ca70c"; sha256 = "3dc8c229ce5123d86269c0c48401a9cdd2cde7558d85374c9dbc4bbd531e86d5"; }; termbox-go = fetchgit { url = "https://github.com/nsf/termbox-go"; - sha256 = "6b23e8eabb1c7a99dc8c5a7dd5ecb2c2ae736c7f54e485548d08ac337b3a0400"; + rev = "cea198fce7"; + sha256 = "bde4190ae83d5c5870b8e11e16387cf03f2d44a8369f94674d4b9d0960c40693"; }; go-bindata = fetchgit { url = "https://github.com/inconshreveable/go-bindata"; + rev = "99016b3cc0"; sha256 = "518a5b61cfbe58f8bc55bd6139adcd69997b6ba474536a70b538879aaf118578"; }; go-update = fetchgit { url = "https://github.com/inconshreveable/go-update"; + rev = "3f04666667"; sha256 = "34647689a50b9d12e85a280d9034cc1772079163481c4778ee4b3e6c4b41e2f4"; }; goyaml = fetchbzr { url = "https://launchpad.net/goyaml"; sha256 = "03is37cgw62cha316xrs5h7q97im46ry5qldkfvbhimjq3ww0swj"; - revision = "branch:lp:goyaml"; + # Branch: "branch:lp:goyaml" + revision = 47; }; log4go = fetchhg { url = "https://code.google.com/p/log4go/"; + tag = "c3294304d93f"; sha256 = "0q906sxrmwir295virfibqvdzlaj340qh2r4ysx1ccjrjazc0q5p"; }; osext = fetchhg { url = "https://bitbucket.org/kardianos/osext"; + tag = "364fb57"; sha256 = "1w9x2zj716agfd5x5497ajb9nz3ljar74768vjidsyly143vzjws"; }; in stdenv.mkDerivation rec { diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix index c2c0a5aa534f..7dd04d251202 100644 --- a/pkgs/tools/misc/screen/default.nix +++ b/pkgs/tools/misc/screen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, pam }: +{ stdenv, fetchurl, ncurses, pam ? null }: stdenv.mkDerivation rec { name = "screen-4.0.3"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sed -i -e "s|/usr/local|/non-existent|g" -e "s|/usr|/non-existent|g" configure Makefile.in */Makefile.in ''; - buildInputs = [ ncurses pam ]; + buildInputs = [ ncurses ] ++ stdenv.lib.optional stdenv.isLinux pam; doCheck = true; diff --git a/pkgs/tools/misc/smc/default.nix b/pkgs/tools/misc/smc/default.nix new file mode 100644 index 000000000000..a12a40e8ed71 --- /dev/null +++ b/pkgs/tools/misc/smc/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchurl, jre }: + +stdenv.mkDerivation rec { + name = "smc-6.3.0"; + + src = fetchurl { + url = "mirror://sourceforge/project/smc/smc/6_3_0/smc_6_3_0.tgz"; + sha256 = "0arzi8kc4vycp1ccf0v87p08cdpylwhx4za2pzvp08vkfwi8zc7z"; + }; + + # Prebuilt Java package. + installPhase = '' + mkdir -p "$out/bin" + mkdir -p "$out/share/smc" + mkdir -p "$out/share/smc/lib" + mkdir -p "$out/share/icons" + mkdir -p "$out/lib/java" + + cp bin/Smc.jar "$out/lib/java/" + cp -r examples/ docs/ tools/ README.txt LICENSE.txt "$out/share/smc/" + cp -r lib/* "$out/share/smc/lib/" + cp misc/smc.ico "$out/share/icons/" + + cat > "$out/bin/smc" << EOF + #!${stdenv.shell} + ${jre}/bin/java -jar "$out/lib/java/Smc.jar" "\$@" + EOF + chmod a+x "$out/bin/smc" + ''; + + meta = with stdenv.lib; { + description = "Generate state machine code from text input (state diagram)"; + longDescription = '' + SMC (State Machine Compiler) takes a text input file describing states, + events and actions of a state machine and generates source code that + implements the state machine. + + SMC supports many target languages: + C, C++, DotNet, Groovy, java, Java, JavaScript, Lua, ObjC, Perl, Php, + Python, Ruby, Scala, Tcl. + + SMC can also generate GraphViz state diagrams from the input file. + ''; + homepage = http://smc.sourceforge.net/; + license = licenses.mpl11; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/tools/misc/ttmkfdir/default.nix b/pkgs/tools/misc/ttmkfdir/default.nix index 12adb5318a89..3583b5b8f302 100644 --- a/pkgs/tools/misc/ttmkfdir/default.nix +++ b/pkgs/tools/misc/ttmkfdir/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "ttf-mkfontdir-3.0.9-6"; src = fetchurl { - url = http://ftp.de.debian.org/debian/pool/main/t/ttmkfdir/ttmkfdir_3.0.9.orig.tar.gz; + url = http://mirror.fsf.org/trisquel/pool/main/t/ttmkfdir/ttmkfdir_3.0.9.orig.tar.gz; sha256 = "0n6bmmndmp4c1myisvv7cby559gzgvwsw4rfw065a3f92m87jxiq"; }; @@ -12,7 +12,7 @@ stdenv.mkDerivation { # who knows more about C/C++ .. patches = [ (fetchurl { - url = http://ftp.de.debian.org/debian/pool/main/t/ttmkfdir/ttmkfdir_3.0.9-6.diff.gz; + url = http://mirror.fsf.org/trisquel/pool/main/t/ttmkfdir/ttmkfdir_3.0.9-6.diff.gz; sha256 = "141kxaf2by8nf87hqyszaxi0n7nnmswr1nh2i5r5bsvxxmaj9633"; }) diff --git a/pkgs/tools/misc/w3c-css-validator/default.nix b/pkgs/tools/misc/w3c-css-validator/default.nix index 5cfe87376388..f08fe87202f0 100644 --- a/pkgs/tools/misc/w3c-css-validator/default.nix +++ b/pkgs/tools/misc/w3c-css-validator/default.nix @@ -72,5 +72,6 @@ stdenv.mkDerivation { license = "w3c"; # http://www.w3.org/Consortium/Legal/ maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; + broken = true; }; } diff --git a/pkgs/tools/misc/xmltv/default.nix b/pkgs/tools/misc/xmltv/default.nix index 4b8ba43f597d..9d3939406066 100644 --- a/pkgs/tools/misc/xmltv/default.nix +++ b/pkgs/tools/misc/xmltv/default.nix @@ -12,4 +12,5 @@ import ../../../development/perl-modules/generic perl { perlPackages.DateManip perlPackages.HTMLTree perlPackages.HTMLParser perlPackages.HTMLTagset perlPackages.URI perlPackages.LWP ]; + meta.broken = true; } diff --git a/pkgs/tools/networking/badvpn/default.nix b/pkgs/tools/networking/badvpn/default.nix new file mode 100644 index 000000000000..d2e53d677e24 --- /dev/null +++ b/pkgs/tools/networking/badvpn/default.nix @@ -0,0 +1,35 @@ +{stdenv, fetchurl, cmake, openssl, nss, pkgconfig, nspr, bash}: +let + s = # Generated upstream information + rec { + baseName="badvpn"; + version="1.999.128"; + name="${baseName}-${version}"; + hash="1z4v1jydv8zkkszsq7scc17rw5dqz9zlpcc40ldxsw34arfqvcnn"; + url="http://badvpn.googlecode.com/files/badvpn-1.999.128.tar.bz2"; + sha256="1z4v1jydv8zkkszsq7scc17rw5dqz9zlpcc40ldxsw34arfqvcnn"; + }; + buildInputs = [ + cmake openssl nss pkgconfig nspr + ]; +in +stdenv.mkDerivation { + inherit (s) name version; + inherit buildInputs; + src = fetchurl { + inherit (s) url sha256; + }; + + preConfigure = '' + find . -name '*.sh' -exec sed -e 's@#!/bin/sh@${stdenv.shell}@' -i '{}' ';' + find . -name '*.sh' -exec sed -e 's@#!/bin/bash@${bash}/bin/bash@' -i '{}' ';' + ''; + + meta = { + inherit (s) version; + description = ''A set of network-related (mostly VPN-related) tools''; + license = stdenv.lib.licenses.bsd3 ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/networking/badvpn/default.upstream b/pkgs/tools/networking/badvpn/default.upstream new file mode 100644 index 000000000000..1c746698fefe --- /dev/null +++ b/pkgs/tools/networking/badvpn/default.upstream @@ -0,0 +1,3 @@ +url http://gc.codehum.com/p/badvpn/downloads/list +version_link '[.]tar[.][a-z0-9]+$' +process 'gc.codehum.com//' '' diff --git a/pkgs/tools/networking/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix index d15559961f6b..41eb1a8f77af 100644 --- a/pkgs/tools/networking/chrony/default.nix +++ b/pkgs/tools/networking/chrony/default.nix @@ -3,15 +3,17 @@ assert stdenv.isLinux -> libcap != null; stdenv.mkDerivation rec { - name = "chrony-1.27"; + name = "chrony-1.29"; src = fetchurl { url = "http://download.tuxfamily.org/chrony/${name}.tar.gz"; - sha256 = "17dfhcm5mrkg8ids0ajwscryr7fm7664kz10ygsa1ac047p3aj6l"; + sha256 = "16ykdb8pnqcr30pdsaa6rabvsin2n858fmkzd81anqq6p9rg11f6"; }; buildInputs = [ readline ] ++ stdenv.lib.optional stdenv.isLinux libcap; + configureFlags = [ "--sysconfdir=\$(out)/etc" "--chronyvardir=\$(out)/var/lib/chrony" ]; + meta = with stdenv.lib; { description = "Sets your computer's clock from time servers on the Net"; homepage = "http://chrony.tuxfamily.org/"; diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix index a76e351efc49..ffe22a93d0d4 100644 --- a/pkgs/tools/networking/cjdns/default.nix +++ b/pkgs/tools/networking/cjdns/default.nix @@ -4,7 +4,7 @@ let rev = "f7b02ac0cc"; in stdenv.mkDerivation { - name = "cjdns-git-20130620-${rev}"; + name = "cjdns-git-20130620-${stdenv.lib.strings.substring 0 7 rev}"; src = fetchgit { url = "https://github.com/cjdelisle/cjdns.git"; diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 9902c1f1238c..86f27d7460c1 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -13,11 +13,11 @@ assert scpSupport -> libssh2 != null; assert c-aresSupport -> c-ares != null; stdenv.mkDerivation rec { - name = "curl-7.31.0"; + name = "curl-7.33.0"; src = fetchurl { url = "http://curl.haxx.se/download/${name}.tar.bz2"; - sha256 = "021ygqk4gn24iqm0i0xvzldfgqdg18fmvwqia7i5vzzcxj712fx7"; + sha256 = "1cyiali7jq613qz5zb28myhywrdi35dngniwvknmh9lyjk6y9z8a"; }; # Zlib and OpenSSL must be propagated because `libcurl.la' contains diff --git a/pkgs/tools/networking/ddclient/default.nix b/pkgs/tools/networking/ddclient/default.nix index 22539657b1f1..0d50b1b2c0f3 100644 --- a/pkgs/tools/networking/ddclient/default.nix +++ b/pkgs/tools/networking/ddclient/default.nix @@ -8,7 +8,7 @@ buildPerlPackage { sha256 = "f22ac7b0ec78e310d7b88a1cf636e5c00360b2ed9c087f231b3522ef3e6295f2"; }; - buildInputs = [ perlPackages.IOSocketSSL ]; + buildInputs = [ perlPackages.IOSocketSSL perlPackages.DigestSHA1 ]; patches = [ ./ddclient-foreground.patch ]; diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix index 20964213d539..7217d9871864 100644 --- a/pkgs/tools/networking/dnsmasq/default.nix +++ b/pkgs/tools/networking/dnsmasq/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "dnsmasq-2.63"; + name = "dnsmasq-2.67"; src = fetchurl { url = "http://www.thekelleys.org.uk/dnsmasq/${name}.tar.gz"; - sha256 = "043p8qjd1zx8bklcli9qnk3vzfz7j2kvl82abvipcg56qsyf71px"; + sha256 = "0jkbn5j3jc96mw7w3nf9zfkl9l3183r4ls4ryi6mnd94c5xlrv4j"; }; makeFlags = "DESTDIR= BINDIR=$(out)/bin MANDIR=$(out)/man LOCALEDIR=$(out)/share/locale"; diff --git a/pkgs/tools/networking/dropbear/default.nix b/pkgs/tools/networking/dropbear/default.nix index 1d51c4864a18..933267eff23d 100644 --- a/pkgs/tools/networking/dropbear/default.nix +++ b/pkgs/tools/networking/dropbear/default.nix @@ -2,11 +2,11 @@ sftpPath ? "/var/run/current-system/sw/libexec/sftp-server" }: stdenv.mkDerivation rec { - name = "dropbear-2013.58"; + name = "dropbear-2013.60"; src = fetchurl { url = "http://matt.ucc.asn.au/dropbear/releases/${name}.tar.bz2"; - sha256 = "0m9fhabs78v35fhqmji5gkm66ahkyqbbdzmlmr9m7q8l3ndihrnq"; + sha256 = "1fw1hrcavfqjmsn34dhkrzh8w06yfqvfss2rkvvnxnad7d2m432c"; }; dontDisableStatic = enableStatic; diff --git a/pkgs/tools/networking/iperf/default.nix b/pkgs/tools/networking/iperf/default.nix index 66f600f76784..2ee8a90cb4af 100644 --- a/pkgs/tools/networking/iperf/default.nix +++ b/pkgs/tools/networking/iperf/default.nix @@ -1,16 +1,17 @@ { stdenv, fetchurl }: -stdenv.mkDerivation { - name = "iperf-2.0.4"; +stdenv.mkDerivation rec { + name = "iperf-2.0.5"; src = fetchurl { - url = mirror://sourceforge/iperf/iperf-2.0.4.tar.gz; - sha256 = "0i3r75prbyxs56rngjbrag8rg480ki3daaa924krrafng30z2liv"; + url = "mirror://sourceforge/iperf/${name}.tar.gz"; + sha256 = "0nr6c81x55ihs7ly2dwq19v9i1n6wiyad1gacw3aikii0kzlwsv3"; }; - meta = { - homepage = ""; - description = "tool to measure IP bandwidth using UDP or TCP"; + meta = with stdenv.lib; { + homepage = "http://sourceforge.net/projects/iperf/"; + description = "Tool to measure IP bandwidth using UDP or TCP"; + platforms = platforms.linux; license = "as-is"; }; } diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix index 653bec897474..99793c139cbd 100644 --- a/pkgs/tools/networking/nbd/default.nix +++ b/pkgs/tools/networking/nbd/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, glib }: let - name = "nbd-3.4"; + name = "nbd-3.5"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "mirror://sourceforge/nbd/${name}.tar.bz2"; - sha256 = "1krj185fagnqsqpcfig7zkqa3cqgyyn956241ix224wssvynsajm"; + sha256 = "0frnbmdcm1b0nmmpvpwjb9h1yabdpwwd2l95056mhl2zaafh8gqx"; }; buildInputs = [ pkgconfig glib ] ++ stdenv.lib.optional (stdenv ? glibc) stdenv.glibc.kernelHeaders; diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix index a196c309197e..4f72c0e294f2 100644 --- a/pkgs/tools/networking/network-manager-applet/default.nix +++ b/pkgs/tools/networking/network-manager-applet/default.nix @@ -33,6 +33,9 @@ stdenv.mkDerivation rec { ''CFLAGS=-DMOBILE_BROADBAND_PROVIDER_INFO=\"${mobile_broadband_provider_info}/share/mobile-broadband-provider-info/serviceproviders.xml\"'' ]; + preFixup = '' + rm $out/share/glib-2.0/schemas/gschemas.compiled''; + postInstall = '' mkdir -p $out/etc/NetworkManager/VPN ln -s ${networkmanager_openvpn}/etc/NetworkManager/VPN/nm-openvpn-service.name $out/etc/NetworkManager/VPN/nm-openvpn-service.name diff --git a/pkgs/tools/networking/ntop/default.nix b/pkgs/tools/networking/ntop/default.nix index 48f2c9f08938..d5fa2deb68dc 100644 --- a/pkgs/tools/networking/ntop/default.nix +++ b/pkgs/tools/networking/ntop/default.nix @@ -19,11 +19,9 @@ stdenv.mkDerivation rec { meta = { description = "Traffic analysis with NetFlow and sFlow support"; - license = "GLPv3+"; - homepage = http://www.ntop.org/products/ntop/; - platforms = stdenv.lib.platforms.linux; + broken = true; }; } diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix index fa1d2fb805a7..02e1f742201f 100644 --- a/pkgs/tools/networking/offlineimap/default.nix +++ b/pkgs/tools/networking/offlineimap/default.nix @@ -1,14 +1,13 @@ { pkgs, fetchurl, buildPythonPackage, sqlite3 }: buildPythonPackage rec { - version = "6.5.5-rc2"; + version = "6.5.5"; name = "offlineimap-${version}"; namePrefix = ""; src = fetchurl { - url = "https://github.com/OfflineIMAP/offlineimap/tarball/v${version}"; - name = "${name}.tar.bz"; - sha256 = "03w3irh8pxwvivi139xm5iaj2f8vmriak1ispq9d9f84z1098pd3"; + url = "https://github.com/OfflineIMAP/offlineimap/archive/v${version}.tar.gz"; + sha256 = "00k84qagph3xnxss6rkxm61x07ngz8fvffx4z9jyw5baf3cdd32p"; }; doCheck = false; diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 35586031ef55..7d2ae9c5bb4b 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { export NIX_LDFLAGS="$NIX_LDFLAGS -lgcc_s" ''; - patches = [ ./locale_archive.patch ]; + patches = [ ./locale_archive.patch ./gcmrekey.patch ]; buildInputs = [ zlib openssl libedit pkgconfig pam ] ++ (if withKerberos then [ kerberos ] else []) diff --git a/pkgs/tools/networking/openssh/gcmrekey.patch b/pkgs/tools/networking/openssh/gcmrekey.patch new file mode 100644 index 000000000000..ddb694af1ddb --- /dev/null +++ b/pkgs/tools/networking/openssh/gcmrekey.patch @@ -0,0 +1,18 @@ +http://www.openssh.com/txt/gcmrekey.adv + +Index: monitor_wrap.c +=================================================================== +RCS file: /cvs/src/usr.bin/ssh/monitor_wrap.c,v +retrieving revision 1.76 +diff -u -p -u -r1.76 monitor_wrap.c +--- a/monitor_wrap.c 17 May 2013 00:13:13 -0000 1.76 ++++ b/monitor_wrap.c 6 Nov 2013 16:31:26 -0000 +@@ -469,7 +469,7 @@ mm_newkeys_from_blob(u_char *blob, int b + buffer_init(&b); + buffer_append(&b, blob, blen); + +- newkey = xmalloc(sizeof(*newkey)); ++ newkey = xcalloc(1, sizeof(*newkey)); + enc = &newkey->enc; + mac = &newkey->mac; + comp = &newkey->comp; diff --git a/pkgs/tools/networking/privoxy/default.nix b/pkgs/tools/networking/privoxy/default.nix index 8af67aed1d40..c6a57c238a48 100644 --- a/pkgs/tools/networking/privoxy/default.nix +++ b/pkgs/tools/networking/privoxy/default.nix @@ -1,19 +1,20 @@ -{stdenv, fetchurl, autoconf, automake, zlib, pcre, w3m}: +{ stdenv, fetchurl, autoreconfHook, zlib, pcre, w3m, man }: stdenv.mkDerivation { - name = "privoxy-3.0.12"; + name = "privoxy-3.0.21"; src = fetchurl { - url = mirror://sourceforge/ijbswa/Sources/3.0.12%20%28stable%29/privoxy-3.0.12-stable-src.tar.gz; - sha256 = "16ngim1p4pb4zk8h7js4zjw280fxqxamasfngixikp2ivmzxl469"; + url = mirror://sourceforge/ijbswa/Sources/3.0.21%20%28stable%29/privoxy-3.0.21-stable-src.tar.gz; + sha256 = "1f6xb7aa47p90c26vqaw74y6drs9gpnhxsgby3mx0awdjh0ydisy"; }; - buildInputs = [automake autoconf zlib pcre w3m]; + buildInputs = [ autoreconfHook zlib pcre w3m man ]; - patches = [./disable-user-error.patch]; - - preConfigure = '' - autoheader - autoconf - ''; + meta = with stdenv.lib; { + homepage = http://www.privoxy.org/; + description = "Non-caching web proxy with advanced filtering capabilities"; + license = licenses.gpl2; + platforms = platforms.all; + maintainers = [ maintainers.phreedom ]; + }; } diff --git a/pkgs/tools/networking/privoxy/disable-user-error.patch b/pkgs/tools/networking/privoxy/disable-user-error.patch deleted file mode 100644 index c2576409c6d0..000000000000 --- a/pkgs/tools/networking/privoxy/disable-user-error.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff -rc privoxy-3.0.12-stable/configure.in privoxy-3.0.12-stable-new/configure.in -*** privoxy-3.0.12-stable/configure.in 2009-03-21 11:45:06.000000000 +0100 ---- privoxy-3.0.12-stable-new/configure.in 2009-10-05 15:39:53.683884809 +0200 -*************** -*** 652,659 **** - AC_PROG_AWK - - AC_CHECK_PROG(GDB,gdb,yes,no) -! AC_PATH_PROG(BGROUPS,groups,no,/bin:/usr/bin:/usr/local/bin) -! AC_PATH_PROG(ID,id,no,/bin:/usr/bin:/usr/local/bin) - AC_SUBST(ID) - AC_SUBST(BGROUPS) - ---- 652,659 ---- - AC_PROG_AWK - - AC_CHECK_PROG(GDB,gdb,yes,no) -! AC_PATH_PROG(BGROUPS,groups,no,$PATH) -! AC_PATH_PROG(ID,id,no,$PATH) - AC_SUBST(ID) - AC_SUBST(BGROUPS) - -*************** -*** 715,721 **** - if test $? -eq 0 ; then - USER=$with_user; - else -! AC_MSG_ERROR(There is no user '$with_user' on this system) - fi - fi - else ---- 715,721 ---- - if test $? -eq 0 ; then - USER=$with_user; - else -! AC_MSG_WARN(There is no user '$with_user' on this system) - fi - fi - else -*************** -*** 747,758 **** - # FIXME: this fails if valid group, but not first group - # listed. - if test "$with_group" != "`$BGROUPS $USER | sed 's/.*: //' 2>/dev/null |$AWK '{print $1}'`" ; then -! AC_MSG_ERROR(The given value '$withval' does not match group entry) - else - GROUP=$with_group; - fi - else -! AC_MSG_ERROR(There is no group entry for user '$USER') - fi - fi - else ---- 747,758 ---- - # FIXME: this fails if valid group, but not first group - # listed. - if test "$with_group" != "`$BGROUPS $USER | sed 's/.*: //' 2>/dev/null |$AWK '{print $1}'`" ; then -! AC_MSG_WARN(The given value '$withval' does not match group entry) - else - GROUP=$with_group; - fi - else -! AC_MSG_WARN(There is no group entry for user '$USER') - fi - fi - else diff --git a/pkgs/tools/networking/socat/2.0.0-b3.nix b/pkgs/tools/networking/socat/2.0.0-b3.nix deleted file mode 100644 index 6567e5dfcc40..000000000000 --- a/pkgs/tools/networking/socat/2.0.0-b3.nix +++ /dev/null @@ -1,29 +0,0 @@ -args : with args; -let - version = "2.0.0-b3"; - patches = []; -in -rec { - src = /* Here a fetchurl expression goes */ - fetchurl { - url = http://www.dest-unreach.org/socat/download/socat-2.0.0-b3.tar.bz2; - sha256 = "0p4v8m898dzcardsw02xdda3y3b1rky7v956rm27x43783w5qmsx"; - }; - - buildInputs = [openssl]; - configureFlags = []; - - /* doConfigure should be specified separately */ - phaseNames = ["doPatch" "doConfigure" "doMakeInstall"]; - - name = "socat-" + version; - meta = { - description = "Socat - a different replacement for netcat"; - longDesc = " - Socat, one more analogue of netcat, but not mimicking it. - 'netcat++' (extended design, new implementation) -"; - homepage = "http://www.dest-unreach.org/socat/"; - srcs = patches; - }; -} diff --git a/pkgs/tools/networking/socat/2.x.nix b/pkgs/tools/networking/socat/2.x.nix new file mode 100644 index 000000000000..621803134426 --- /dev/null +++ b/pkgs/tools/networking/socat/2.x.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, openssl }: + +stdenv.mkDerivation rec { + name = "socat-2.0.0-b6"; + + src = fetchurl { + url = "http://www.dest-unreach.org/socat/download/${name}.tar.bz2"; + sha256 = "03n70v7ygsl4ji7rwvyv8f70d3q32jnas26j29amkf3fm4agnhvz"; + }; + + buildInputs = [ openssl ]; + + meta = { + description = "A utility for bidirectional data transfer between two independent data channels"; + homepage = http://www.dest-unreach.org/socat/; + platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2; + maintainers = stdenv.lib.maintainers.eelco; + }; +} diff --git a/pkgs/tools/networking/socat/default.nix b/pkgs/tools/networking/socat/default.nix index 727bbe086059..45de7015d7ab 100644 --- a/pkgs/tools/networking/socat/default.nix +++ b/pkgs/tools/networking/socat/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl }: stdenv.mkDerivation rec { - name = "socat-1.7.2.1"; + name = "socat-1.7.2.2"; src = fetchurl { url = "http://www.dest-unreach.org/socat/download/${name}.tar.bz2"; - sha256 = "0xw2qmmixv7jwsrgx2vy54bq695d6my3pm3z4dcpmf9vqvb2xsps"; + sha256 = "0g4miazc9w3gxbk5vvw228jp3qxn775jspkgqv5hjf2d3bqpl5ls"; }; buildInputs = [ openssl ]; diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix index 3e3b74dfe902..5ae85adbec7e 100644 --- a/pkgs/tools/networking/wget/default.nix +++ b/pkgs/tools/networking/wget/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0yqllj3nv9p3vqbdm6j4nvpjcwf1y19rq8sd966nrbd2qvvxfq8p"; }; + patches = stdenv.lib.optional stdenv.isDarwin ./iri-test.patch; + preConfigure = stdenv.lib.optionalString doCheck '' for i in "doc/texi2pod.pl" "tests/run-px" "util/rmold.pl" do diff --git a/pkgs/tools/networking/wget/iri-test.patch b/pkgs/tools/networking/wget/iri-test.patch new file mode 100644 index 000000000000..c1f798ce3726 --- /dev/null +++ b/pkgs/tools/networking/wget/iri-test.patch @@ -0,0 +1,12 @@ +diff -r --unified a/wget-1.14/tests/run-px b/wget-1.14/tests/run-px +--- a/tests/run-px 2012-06-16 11:58:11.000000000 +0100 ++++ b/tests/run-px 2013-11-02 14:06:14.000000000 +0000 +@@ -48,7 +48,7 @@ + 'Test-idn-robots-utf8.px', + 'Test-iri.px', + 'Test-iri-percent.px', +- 'Test-iri-disabled.px', ++ #'Test-iri-disabled.px', + 'Test-iri-forced-remote.px', + 'Test-iri-list.px', + 'Test-k.px', diff --git a/pkgs/tools/package-management/cabal-install/1.18.0.2.nix b/pkgs/tools/package-management/cabal-install/1.18.0.2.nix index 9b56f60546ce..3c1c6ddd133d 100644 --- a/pkgs/tools/package-management/cabal-install/1.18.0.2.nix +++ b/pkgs/tools/package-management/cabal-install/1.18.0.2.nix @@ -20,6 +20,9 @@ cabal.mkDerivation (self: { mkdir $out/etc mv bash-completion $out/etc/bash_completion.d ''; + patchPhase = '' + sed -i -e 's|array .*,|array,|' cabal-install.cabal + ''; meta = { homepage = "http://www.haskell.org/cabal/"; description = "The command-line interface for Cabal and Hackage"; diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix index 62a644e195aa..5c9120cf33ed 100644 --- a/pkgs/tools/package-management/disnix/default.nix +++ b/pkgs/tools/package-management/disnix/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, pkgconfig, dbus_glib, libxml2, libxslt, getopt, nixUnstable, libintlOrEmpty, libiconvOrEmpty }: +{ stdenv, fetchurl, pkgconfig, dbus_glib, libxml2, libxslt, getopt, nixUnstable, dysnomia, libintlOrEmpty, libiconvOrEmpty }: stdenv.mkDerivation { - name = "disnix-0.3pre57b56b6b9d43b48ce72e4e47f6acfdb3b1cbe3ef"; + name = "disnix-0.3pre8aa12b65ced9029f7c17a494cee25e6ffc69fdea"; src = fetchurl { - url = http://hydra.nixos.org/build/5576475/download/4/disnix-0.3pre57b56b6b9d43b48ce72e4e47f6acfdb3b1cbe3ef.tar.gz; - sha256 = "18sxs4c3a1sr2sldd6p7rmxg6541v1hsl987vzc7ij8mwkcnm1r0"; + url = http://hydra.nixos.org/build/6763179/download/4/disnix-0.3pre8aa12b65ced9029f7c17a494cee25e6ffc69fdea.tar.gz; + sha256 = "0zmsaz1kvc7dl1igh6z74jxy3w5p2zbfm9jsczdjdh3947fkni4p"; }; - buildInputs = [ pkgconfig dbus_glib libxml2 libxslt getopt nixUnstable libintlOrEmpty libiconvOrEmpty ]; + buildInputs = [ pkgconfig dbus_glib libxml2 libxslt getopt nixUnstable libintlOrEmpty libiconvOrEmpty dysnomia ]; dontStrip = true; diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix index 80ac91b54899..4c811dd3f71f 100644 --- a/pkgs/tools/package-management/disnix/disnixos/default.nix +++ b/pkgs/tools/package-management/disnix/disnixos/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, disnix, socat, pkgconfig }: stdenv.mkDerivation { - name = "disnixos-0.2pre77208b9bf296b2376bd95154b333db304b50bec0.tar.gz"; + name = "disnixos-0.2prebb320d396f93d7062c28d6a54105d8e8196b9d99"; src = fetchurl { - url = http://hydra.nixos.org/build/5578534/download/3/disnixos-0.2pre77208b9bf296b2376bd95154b333db304b50bec0.tar.gz; - sha256 = "0a9ah16rhq6kgknylq9dsv6mk8pp4vbahqls9hcg99ys9bn18d8z"; + url = http://hydra.nixos.org/build/6769017/download/3/disnixos-0.2prebb320d396f93d7062c28d6a54105d8e8196b9d99.tar.gz; + sha256 = "0jw05qjn0fbf4xb2g8a8i0padmsw17ayr4acw7z784bljrm1z055"; }; buildInputs = [ socat pkgconfig disnix ]; diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix index de3690e3e203..2a5852863f96 100644 --- a/pkgs/tools/package-management/disnix/dysnomia/default.nix +++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, ejabberd ? null, mysql ? null, postgresql ? null, subversion ? null +, ejabberd ? null, mysql ? null, postgresql ? null, subversion ? null, mongodb ? null , enableApacheWebApplication ? false , enableAxis2WebService ? false , enableEjabberdDump ? false @@ -7,6 +7,7 @@ , enablePostgreSQLDatabase ? false , enableSubversionRepository ? false , enableTomcatWebApplication ? false +, enableMongoDatabase ? false , catalinaBaseDir ? "/var/tomcat" }: @@ -14,12 +15,13 @@ assert enableMySQLDatabase -> mysql != null; assert enablePostgreSQLDatabase -> postgresql != null; assert enableSubversionRepository -> subversion != null; assert enableEjabberdDump -> ejabberd != null; +assert enableMongoDatabase -> mongodb != null; stdenv.mkDerivation { - name = "dysnomia-0.3pre7c81cc254a0f6966dd9ac55f945c458b45b3d428.tar.gz"; + name = "dysnomia-0.3pred677260f77bb202c7490f7db08dbd8442c9db484"; src = fetchurl { - url = http://hydra.nixos.org/build/5613342/download/1/dysnomia-0.3pre7c81cc254a0f6966dd9ac55f945c458b45b3d428.tar.gz; - sha256 = "0ll09vh94ygqkncq4ddb62s4c84n3pr5qy0gi1ywy0j30qk6zvsq"; + url = http://hydra.nixos.org/build/6763096/download/1/dysnomia-0.3pred677260f77bb202c7490f7db08dbd8442c9db484.tar.gz; + sha256 = "0k7qpqa9inzxjdryd7zfzxid8k1icsxxw995chzw4wrlgxns16xy"; }; preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else ""; @@ -32,13 +34,15 @@ stdenv.mkDerivation { ${if enablePostgreSQLDatabase then "--with-postgresql" else "--without-postgresql"} ${if enableSubversionRepository then "--with-subversion" else "--without-subversion"} ${if enableTomcatWebApplication then "--with-tomcat=${catalinaBaseDir}" else "--without-tomcat"} + ${if enableMongoDatabase then "--with-mongodb" else "--without-mongodb"} ''; buildInputs = [] ++ stdenv.lib.optional enableEjabberdDump ejabberd ++ stdenv.lib.optional enableMySQLDatabase mysql ++ stdenv.lib.optional enablePostgreSQLDatabase postgresql - ++ stdenv.lib.optional enableSubversionRepository subversion; + ++ stdenv.lib.optional enableSubversionRepository subversion + ++ stdenv.lib.optional enableMongoDatabase mongodb; meta = { description = "Automated deployment of mutable components and services for Disnix"; diff --git a/pkgs/tools/security/ccid/default.nix b/pkgs/tools/security/ccid/default.nix index 0e607092412b..ad1cb6bec906 100644 --- a/pkgs/tools/security/ccid/default.nix +++ b/pkgs/tools/security/ccid/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, pcsclite, pkgconfig, libusb1, perl }: stdenv.mkDerivation rec { - name = "ccid-1.4.9"; + name = "ccid-1.4.13"; src = fetchurl { - url = "https://alioth.debian.org/frs/download.php/3866/${name}.tar.bz2"; - sha256 = "1dj0cw4js4ab678l94rf9p8a8gppkf1hm66qhmq5ajra6r5nv3m9"; + url = "http://pkgs.fedoraproject.org/repo/pkgs/pcsc-lite-ccid/ccid-1.4.13.tar.bz2/89c167a873df1f8bc0dc907ce209e5ff/ccid-1.4.13.tar.bz2"; + sha256 = "1w0mxb5qzps9x2fcggv958mwgwmvfxxj4nspxs67fa7qg7r6yxar"; }; patchPhase = '' diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix index ec00137b36f7..858320004b84 100644 --- a/pkgs/tools/security/clamav/default.nix +++ b/pkgs/tools/security/clamav/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, zlib, bzip2, libiconv }: stdenv.mkDerivation rec { name = "clamav-${version}"; - version = "0.97.5"; + version = "0.97.8"; src = fetchurl { url = "mirror://sourceforge/clamav/clamav-${version}.tar.gz"; - sha256 = "039wm64wl2sx7k019g5ll5dkdlsq64fnd0ng0s00pjn8bqd5wv6v"; + sha256 = "04pwm8a84silnvgimn2wi2wgwdzwpskybx72mp10ni1dd7yvswnq"; }; buildInputs = [ zlib bzip2 libiconv ]; diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix index 1a443fc18b61..6196cc53bb28 100644 --- a/pkgs/tools/security/fail2ban/default.nix +++ b/pkgs/tools/security/fail2ban/default.nix @@ -48,6 +48,6 @@ pythonPackages.buildPythonPackage { description = "A program that scans log files for repeated failing login attempts and bans IP addresses"; license = licenses.gpl2Plus; maintainers = with maintainers; [ eelco lovek323 ]; - platforms = platforms.unix; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/tools/security/opensc/0.11.7.nix b/pkgs/tools/security/opensc/0.11.7.nix deleted file mode 100644 index e18858363013..000000000000 --- a/pkgs/tools/security/opensc/0.11.7.nix +++ /dev/null @@ -1,27 +0,0 @@ -{stdenv, fetchurl, libtool, readline, zlib, openssl, libiconv, pcsclite, - libassuan1, pkgconfig, libXt, pinentry}: - -stdenv.mkDerivation rec { - name = "opensc-0.11.7"; - - src = fetchurl { - url = "http://www.opensc-project.org/files/opensc/${name}.tar.gz"; - sha256 = "0781qi0bsm01wdhkb1vd3ra9wkwgyjcm2w87jb2r53msply2gavd"; - }; - - configureFlags = [ "--enable-pcsc" "--enable-nsplugin" - "--with-pcsc-provider=${pcsclite}/lib/libpcsclite.so.1" - "--with-pinentry=${pinentry}/bin/pinentry" ]; - - buildInputs = [ libtool readline zlib openssl pcsclite libassuan1 pkgconfig - libXt ] ++ - stdenv.lib.optional (! stdenv.isLinux) libiconv; - - meta = { - description = "Set of libraries and utilities to access smart cards"; - homepage = http://www.opensc-project.org/opensc/; - license = "LGPL"; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; - }; -} diff --git a/pkgs/tools/security/opensc/default.nix b/pkgs/tools/security/opensc/default.nix new file mode 100644 index 000000000000..42303fc356aa --- /dev/null +++ b/pkgs/tools/security/opensc/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, libtool, readline, zlib, openssl, libiconvOrNull, pcsclite +, libassuan1, pkgconfig, libXt, docbook_xsl, libxslt, docbook_xml_dtd_412 +}: + +stdenv.mkDerivation rec { + name = "opensc-0.13.0"; + + src = fetchurl { + url = "mirror://sourceforge/opensc/${name}.tar.gz"; + sha256 = "054v11yc2lqlfqs556liw18klhkx9zyjylqcwirk4axiafp4dpmb"; + }; + + buildInputs = [ libtool readline zlib openssl pcsclite libassuan1 pkgconfig + libXt libxslt libiconvOrNull docbook_xml_dtd_412 + ]; + + configureFlags = [ + "--enable-doc" + "--enable-man" + "--enable-openssl" + "--enable-pcsc" + "--enable-readline" + "--enable-sm" + "--enable-zlib" + "--with-pcsc-provider=${pcsclite}/lib/libpcsclite.so.1" + "--with-xsl-stylesheetsdir=${docbook_xsl}/xml/xsl/docbook" + ]; + + meta = { + description = "Set of libraries and utilities to access smart cards"; + homepage = "https://github.com/OpenSC/OpenSC/wiki"; + license = stdenv.lib.licenses.lgpl21Plus; + maintainers = with stdenv.lib.maintainers; [viric]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/tools/security/prey/default.nix b/pkgs/tools/security/prey/default.nix index fe71806301dd..0333e931858c 100644 --- a/pkgs/tools/security/prey/default.nix +++ b/pkgs/tools/security/prey/default.nix @@ -10,6 +10,7 @@ let modulesSrc = fetchgit { url = "git://github.com/prey/prey-bash-client-modules.git"; rev = "aba260ef110834cb2e92923a31f50c15970639ee"; + sha256 = "9cb1ad813d052a0a3e3bbdd329a8711ae3272e340379489511f7dd578d911e30"; }; in stdenv.mkDerivation rec { name = "prey-bash-client-${version}"; diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index e361746c57b9..568b39be87d5 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, coreutils, pam, groff }: stdenv.mkDerivation rec { - name = "sudo-1.8.6p7"; + name = "sudo-1.8.8"; src = fetchurl { urls = [ "ftp://ftp.sudo.ws/pub/sudo/${name}.tar.gz" "ftp://ftp.sudo.ws/pub/sudo/OLD/${name}.tar.gz" ]; - sha256 = "0djh2b14d1b1knah46v971x940rz63hvnskz16fzami3nbnqj41h"; + sha256 = "1j9gk6pfqry44gvp41p7ajfnpl58jw8shbxmvq381ywpj8g1r4cz"; }; postConfigure = '' diff --git a/pkgs/tools/security/vidalia/default.nix b/pkgs/tools/security/vidalia/default.nix index 6f34d61908e1..4d216bee0b60 100644 --- a/pkgs/tools/security/vidalia/default.nix +++ b/pkgs/tools/security/vidalia/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, cmake, qt4 }: +{ stdenv, fetchurl, cmake, qt4, doxygen }: stdenv.mkDerivation rec { name = "vidalia-${version}"; - version = "0.2.21"; + version = "0.3.1"; src = fetchurl { url = "https://www.torproject.org/dist/vidalia/${name}.tar.gz"; - sha256 = "1rqvvhdqgk6jqrd15invvc4r7p4nckd3b93hhr5dzpc1fxz8w064"; + sha256 = "1mw3wnlh18rj20qjv7jxjk3a8mf75p5wzv358qfs3sm3lqgd68qm"; }; - buildInputs = [ cmake qt4 ]; + buildInputs = [ cmake qt4 doxygen ]; meta = with stdenv.lib; { homepage = https://www.torproject.org/projects/vidalia.html.en; diff --git a/pkgs/tools/system/fdisk/default.nix b/pkgs/tools/system/fdisk/default.nix index 111408d1339c..e72497cf7c4e 100644 --- a/pkgs/tools/system/fdisk/default.nix +++ b/pkgs/tools/system/fdisk/default.nix @@ -24,7 +24,6 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/fdisk/; - maintainers = [ ]; - #platforms = stdenv.lib.platforms.linux; # was failing for long without anyone complaining + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/system/lshw/default.nix b/pkgs/tools/system/lshw/default.nix index 930cb7b7bff0..ccda9be9f03f 100644 --- a/pkgs/tools/system/lshw/default.nix +++ b/pkgs/tools/system/lshw/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "lshw-${version}"; - version = "02.15b"; + version = "02.17b"; src = fetchurl { - url = http://ezix.org/software/files/lshw-B.02.15.tar.gz; - sha256 = "19im6yj1pmsbrwkvdmgshllhiw7jh6nzhr6dc777q1n99g3cw0gv"; + url = http://ezix.org/software/files/lshw-B.02.17.tar.gz; + sha256 = "1728b96gyjmrp31knzips9azn6wkfdp5k5dnbil7h7hgz99w177b"; }; buildInputs = [] ++ stdenv.lib.optional withGUI [ gtk pkgconfig sqlite ]; diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix index 93486d3decf2..25201ba97abc 100644 --- a/pkgs/tools/system/pciutils/default.nix +++ b/pkgs/tools/system/pciutils/default.nix @@ -8,16 +8,16 @@ let }; in stdenv.mkDerivation rec { - name = "pciutils-3.2.0"; + name = "pciutils-3.2.1"; # with database from 2013-11-10 src = fetchurl { url = "mirror://kernel/software/utils/pciutils/${name}.tar.bz2"; - sha256 = "0d9as9jzjjg5c1nwf58z1y1i7rf9fqxmww1civckhcvcn0xr85mq"; + sha256 = "1pnwwc4sq0q7zz3mw2rsrc9j5rxwpdvxirqjmxcd0brf0hcjpm8j"; }; buildInputs = [ pkgconfig zlib kmod which ]; - preBuild = "bunzip2 < ${pciids} > pci.ids"; + #preBuild = "bunzip2 < ${pciids} > pci.ids"; makeFlags = "SHARED=yes PREFIX=\${out}"; diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index 3b5c06483845..c4e955056f4f 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, eventlog, pkgconfig, libestr, libee, json_c, libuuid, zlib, gnutls}: stdenv.mkDerivation { - name = "rsyslog-7.2.6"; + name = "rsyslog-7.2.7"; src = fetchurl { - url = http://www.rsyslog.com/files/download/rsyslog/rsyslog-7.2.6.tar.gz; - sha256 = "19a5c60816ebce6c86468eb8c5fe1c4cc1febf23c9167ce59d2327fe5e047ed9"; + url = http://www.rsyslog.com/files/download/rsyslog/rsyslog-7.2.7.tar.gz; + sha256 = "0vgrbbklsvnwcy0m0kbxcj5lhpn2k9bsv0lh0vnyn6hc2hx56cs8"; }; buildInputs = [pkgconfig libestr libee json_c libuuid zlib gnutls]; diff --git a/pkgs/tools/system/ts/default.nix b/pkgs/tools/system/ts/default.nix index a392ed0bcfd3..6d1c6ad5e1ff 100644 --- a/pkgs/tools/system/ts/default.nix +++ b/pkgs/tools/system/ts/default.nix @@ -1,8 +1,9 @@ -{stdenv, fetchurl}: +{stdenv, fetchurl, +sendmailPath ? "/var/setuid-wrappers/sendmail" }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { - name = "ts-0.7.3"; + name = "ts-0.7.4"; installPhase=''make install "PREFIX=$out"''; @@ -10,9 +11,13 @@ stdenv.mkDerivation { makeFlags = "CC=${stdenv.cross.config}-gcc"; }; + patchPhase = '' + sed -i s,/usr/sbin/sendmail,${sendmailPath}, mail.c ts.1 + ''; + src = fetchurl { - url = http://vicerveza.homeunix.net/~viric/soft/ts/ts-0.7.3.tar.gz; - sha256 = "1ajgk6y9y9bng5ssdqxwpzw44pmib30vn5284rgga6vr04ppakdy"; + url = "http://viric.name/~viric/soft/ts/${name}.tar.gz"; + sha256 = "042r9a09300v4fdrw4r60g5xi25v5m6g12kvvr6pcsm9qnfqyqqs"; }; meta = { diff --git a/pkgs/tools/text/ascii/default.nix b/pkgs/tools/text/ascii/default.nix index 769cf389426c..071b93683294 100644 --- a/pkgs/tools/text/ascii/default.nix +++ b/pkgs/tools/text/ascii/default.nix @@ -2,24 +2,26 @@ stdenv.mkDerivation rec { name = "ascii-${version}"; - version = "3.12"; + version = "3.14"; src = fetchurl { url = "http://www.catb.org/~esr/ascii/${name}.tar.gz"; - sha256 = "17jhmmdbhzzaai0lr5aslg0nmqchq1ygdxwd8pgl7qn2jnxhc6ci"; + sha256 = "1ldwi4cs2d36r1fv3j13cfa8h2pc4yayq5qii91758qqwfzky3kz"; }; prePatch = '' - sed -i -e 's|$(DESTDIR)/usr|$(out)|g' Makefile + sed -i -e "s|^PREFIX = .*|PREFIX = $out|" Makefile ''; preInstall = '' mkdir -vp "$out/bin" "$out/share/man/man1" ''; - meta = { + meta = with stdenv.lib; { description = "Interactive ASCII name and synonym chart"; homepage = "http://www.catb.org/~esr/ascii/"; - license = stdenv.lib.licenses.bsd3; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/tools/text/ebook-tools/default.nix b/pkgs/tools/text/ebook-tools/default.nix index abb766928d74..2fafec02d816 100644 --- a/pkgs/tools/text/ebook-tools/default.nix +++ b/pkgs/tools/text/ebook-tools/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, pkgconfig, libxml2, libzip }: stdenv.mkDerivation rec { - name = "ebook-tools-0.2.1"; + name = "ebook-tools-0.2.2"; src = fetchurl { url = "mirror://sourceforge/ebook-tools/${name}.tar.gz"; - sha256 = "0wgwdsd3jwwfg36jyr5j0wayqjli3ia80lxzk10byd4cmkywnhy2"; + sha256 = "1bi7wsz3p5slb43kj7lgb3r6lb91lvb6ldi556k4y50ix6b5khyb"; }; buildInputs = [ cmake pkgconfig libxml2 libzip ]; diff --git a/pkgs/tools/text/uni2ascii/default.nix b/pkgs/tools/text/uni2ascii/default.nix index b4573118a49f..0f54644eba56 100644 --- a/pkgs/tools/text/uni2ascii/default.nix +++ b/pkgs/tools/text/uni2ascii/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "uni2ascii-4.15"; + name = "uni2ascii-4.18"; src = fetchurl { url = "http://billposer.org/Software/Downloads/${name}.tar.gz"; - sha256 = "0vlwsqrzmdsb2mx0hbhmw1dvzy56jk8779hphnj6yxijryva6g2v"; + sha256 = "03lklnzr6ngs4wqiqa7rifd246f441gfvardbsaa5l6fn9pbn94y"; }; meta = { diff --git a/pkgs/tools/text/wdiff/default.nix b/pkgs/tools/text/wdiff/default.nix index 63de9c306939..70b9bf69e290 100644 --- a/pkgs/tools/text/wdiff/default.nix +++ b/pkgs/tools/text/wdiff/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { description = "GNU wdiff, comparing files on a word by word basis"; license = "GPLv3+"; maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/text/xml/basex/default.nix b/pkgs/tools/text/xml/basex/default.nix index 4f120601c8e7..2484aac8b0d1 100644 --- a/pkgs/tools/text/xml/basex/default.nix +++ b/pkgs/tools/text/xml/basex/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, unzip, jre, coreutils, makeDesktopItem }: stdenv.mkDerivation rec { - name = "basex-7.7"; + name = "basex-7.7.2"; src = fetchurl { - url = "http://files.basex.org/releases/7.7/BaseX77.zip"; - sha256 = "1wnndq8lcnfx29bc3j2sgswk6dxgv2nln2chmwbf7h4a05fcavdj"; + url = "http://files.basex.org/releases/7.7.2/BaseX772.zip"; + sha256 = "1rh91rzgca1waq8jnd3ard1r04qlalc2qqrawmrahwxgf3f16f4a"; }; buildInputs = [ unzip jre ]; diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix index aeeaf04e7bad..723741b2c836 100644 --- a/pkgs/tools/typesetting/asciidoc/default.nix +++ b/pkgs/tools/typesetting/asciidoc/default.nix @@ -128,11 +128,11 @@ let in stdenv.mkDerivation rec { - name = "asciidoc-8.6.8"; + name = "asciidoc-8.6.9"; src = fetchurl { url = "mirror://sourceforge/asciidoc/${name}.tar.gz"; - sha256 = "ffb67f59dccaf6f15db72fcd04fdf21a2f9b703d31f94fcd0c49a424a9fcfbc4"; + sha256 = "1w71nk527lq504njmaf0vzr93pgahkgzzxzglrq6bay8cw2rvnvq"; }; buildInputs = [ python unzip ]; @@ -257,7 +257,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://www.methods.co.nz/asciidoc/"; license = licenses.gpl2Plus; - platforms = platforms.linux; + platforms = platforms.linux ++ [ "x86_64-darwin" ]; maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/tools/typesetting/tex/texlive/cm-super.nix b/pkgs/tools/typesetting/tex/texlive/cm-super.nix index 4d161c3e0536..066796ed39c9 100644 --- a/pkgs/tools/typesetting/tex/texlive/cm-super.nix +++ b/pkgs/tools/typesetting/tex/texlive/cm-super.nix @@ -30,6 +30,6 @@ rec { maintainers = [ args.lib.maintainers.raskin ]; # Actually, arch-independent.. - platforms = [] ; + hydraPlatforms = []; }; } diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index 57f7424dc2da..2b9c6d066372 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -6,13 +6,13 @@ rec { }; texmfSrc = fetchurl { - url = mirror://debian/pool/main/t/texlive-base/texlive-base_2013.20130918.orig.tar.xz; - sha256 = "0h7x49zsd2gs8fr28f4h04dv5m8p2mpgqxk2vvl5xlf4wwxxbm2p"; + url = mirror://debian/pool/main/t/texlive-base/texlive-base_2013.20131112.orig.tar.xz; + sha256 = "1zak95xh35bnzr3hjrjaxg0yisyw8g3xcym0ywsspc4dxpn1qgk1"; }; langTexmfSrc = fetchurl { - url = mirror://debian/pool/main/t/texlive-lang/texlive-lang_2013.20131010.orig.tar.xz; - sha256 = "17wfd2qmyafv74ac3ssy9aga12g09l2q0r1p19fb4vvs0wrkwzbz"; + url = mirror://debian/pool/main/t/texlive-lang/texlive-lang_2013.20131112.orig.tar.xz; + sha256 = "003rj7pv38lgmggya2nbzcyfdx5d4wa7h1h4xh7iivsxja7z4m1d"; }; setupHook = ./setup-hook.sh; @@ -133,4 +133,3 @@ rec { platforms = platforms.unix; }; } - diff --git a/pkgs/tools/typesetting/tex/texlive/extra.nix b/pkgs/tools/typesetting/tex/texlive/extra.nix index 6613578e2c67..ab8046fcc967 100644 --- a/pkgs/tools/typesetting/tex/texlive/extra.nix +++ b/pkgs/tools/typesetting/tex/texlive/extra.nix @@ -2,8 +2,8 @@ args: with args; rec { name = "texlive-extra-2013"; src = fetchurl { - url = mirror://debian/pool/main/t/texlive-extra/texlive-extra_2013.20131010.orig.tar.xz; - sha256 = "1wciyjwp0swny22amwcnr6vvdwjy423856q7c3l1sd5b31xfbc18"; + url = mirror://debian/pool/main/t/texlive-extra/texlive-extra_2013.20131112.orig.tar.xz; + sha256 = "0qpiig9sz8wx3dhy1jha7rkxrhvpf2cmfx424h68s3ql05nnw65i"; }; buildInputs = [texLive xz]; @@ -19,6 +19,6 @@ rec { maintainers = [ args.lib.maintainers.raskin ]; # Actually, arch-independent.. - platforms = [] ; + hydraPlatforms = []; }; } diff --git a/pkgs/tools/typesetting/tex/texlive/moderncv.nix b/pkgs/tools/typesetting/tex/texlive/moderncv.nix index 0ce1afbb41b3..f4db43f21f2b 100644 --- a/pkgs/tools/typesetting/tex/texlive/moderncv.nix +++ b/pkgs/tools/typesetting/tex/texlive/moderncv.nix @@ -21,6 +21,6 @@ rec { maintainers = [ args.lib.maintainers.simons ]; # Actually, arch-independent.. - platforms = [] ; + hydraPlatforms = []; }; } diff --git a/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix b/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix index 4cb93794edfe..f7d8f1254c55 100644 --- a/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix +++ b/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix @@ -24,6 +24,6 @@ rec { maintainers = [ args.lib.maintainers.simons ]; # Actually, arch-independent.. - platforms = [] ; + hydraPlatforms = []; }; } diff --git a/pkgs/tools/typesetting/xmlto/default.nix b/pkgs/tools/typesetting/xmlto/default.nix index c72192317b77..c5ebb9d971b3 100644 --- a/pkgs/tools/typesetting/xmlto/default.nix +++ b/pkgs/tools/typesetting/xmlto/default.nix @@ -43,8 +43,5 @@ stdenv.mkDerivation rec { license = "GPLv2+"; homepage = https://fedorahosted.org/xmlto/; - - maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice }; } |