diff options
author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-03-01 07:04:39 +0000 |
---|---|---|
committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-03-01 07:04:39 +0000 |
commit | 0210e20b5ae5ee9f9652d2eedf955974cc9e5ddc (patch) | |
tree | c1c7f6ea999ae4f455500ba2599c58e41aa581ad /pkgs/tools | |
parent | b14a737a4d86608bd61acf08cfc479bf262e9d99 (diff) | |
parent | 57b612cb050778c4ded12fe8e45de26b91eeef70 (diff) |
svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32713
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/misc/grub/1.98.nix | 79 | ||||
-rw-r--r-- | pkgs/tools/networking/network-manager-applet/default.nix | 8 | ||||
-rw-r--r-- | pkgs/tools/networking/network-manager/default.nix | 10 | ||||
-rw-r--r-- | pkgs/tools/networking/vpnc/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/networking/vpnc/vpnc-script.patch | 12 | ||||
-rw-r--r-- | pkgs/tools/security/tor/default.nix | 10 | ||||
-rw-r--r-- | pkgs/tools/security/vidalia/default.nix | 21 | ||||
-rw-r--r-- | pkgs/tools/typesetting/tex/texlive/moderncv.nix | 4 |
8 files changed, 50 insertions, 96 deletions
diff --git a/pkgs/tools/misc/grub/1.98.nix b/pkgs/tools/misc/grub/1.98.nix deleted file mode 100644 index df7d3408b6190..0000000000000 --- a/pkgs/tools/misc/grub/1.98.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ fetchurl, stdenv, bison, gettext, ncurses, libusb, freetype, qemu }: - -let unifont_bdf = fetchurl { - url = "http://unifoundry.com/unifont-5.1.20080820.bdf.gz"; - sha256 = "0s0qfff6n6282q28nwwblp5x295zd6n71kl43xj40vgvdqxv0fxx"; - }; -in - -stdenv.mkDerivation rec { - name = "grub-1.98"; - - src = fetchurl { - url = "ftp://alpha.gnu.org/gnu/grub/${name}.tar.gz"; - sha256 = "05660x82y2rwrzm0d1c4z07fbh02qwmacsmbbav6fa855s4w3wmy"; - }; - - buildInputs = [ bison ncurses libusb freetype gettext ] - ++ stdenv.lib.optional doCheck qemu; - - preConfigure = - '' for i in "tests/util/"*.in - do - sed -i "$i" -e's|/bin/bash|/bin/sh|g' - done - - # Apparently, the QEMU executable is no longer called - # `qemu-system-i386', even on i386. - # - # In addition, use `-nodefaults' to avoid errors like: - # - # chardev: opening backend "stdio" failed - # qemu: could not open serial device 'stdio': Invalid argument - # - # See <http://www.mail-archive.com/qemu-devel@nongnu.org/msg22775.html>. - sed -i "tests/util/grub-shell.in" \ - -e's/qemu-system-i386/qemu-system-x86_64 -nodefaults/g' - ''; - - patches = - [ # The udev rules for LVM create symlinks in /dev/mapper rathe - # than device nodes, causing GRUB to fail to recognize LVM - # volumes. See - # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=550704 - # This ugly workaround makes `find_root_device' use stat() on - # files in /dev/mapper instead of lstat(). - ./device-mapper-symlinks.patch - ]; - - postPatch = - '' gunzip < "${unifont_bdf}" > "unifont.bdf" - sed -i "configure" \ - -e "s|/usr/src/unifont.bdf|$PWD/unifont.bdf|g" - ''; - - doCheck = true; - - meta = { - description = "GNU GRUB, the Grand Unified Boot Loader (2.x alpha)"; - - longDescription = - '' GNU GRUB is a Multiboot boot loader. It was derived from GRUB, GRand - Unified Bootloader, which was originally designed and implemented by - Erich Stefan Boleyn. - - Briefly, the boot loader is the first software program that runs when a - computer starts. It is responsible for loading and transferring - control to the operating system kernel software (such as the Hurd or - the Linux). The kernel, in turn, initializes the rest of the - operating system (e.g., GNU). - ''; - - homepage = http://www.gnu.org/software/grub/; - - license = "GPLv3+"; - - maintainers = [ stdenv.lib.maintainers.ludo ]; - platforms = stdenv.lib.platforms.gnu; - }; -} diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix index d41b2ad001094..ba743722e3b8e 100644 --- a/pkgs/tools/networking/network-manager-applet/default.nix +++ b/pkgs/tools/networking/network-manager-applet/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, intltool, pkgconfig, gtk, glib, libglade , networkmanager, GConf, libnotify, gnome_keyring, dbus_glib -, polkit }: +, polkit, isocodes }: let pn = "network-manager-applet"; major = "0.9"; - version = "${major}.0"; + version = "${major}.2.0"; in stdenv.mkDerivation rec { @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pn}/${major}/${name}.tar.xz"; - sha256 = "097y7c29bgd9wm0im06ka3cd94zssg4s626y5lw7yrypq3hzg18f"; + sha256 = "ebe725d0140f658c6a3f384674c72fba7a7c417df3be0e84ee8f45e6dfc219de"; }; buildInputs = [ gtk libglade networkmanager GConf libnotify gnome_keyring - polkit]; + polkit isocodes ]; buildNativeInputs = [ intltool pkgconfig ]; diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 8ca0be990397b..49aacaa4ef9ad 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, intltool, wirelesstools, pkgconfig, dbus_glib +{ stdenv, fetchurl, intltool, wirelesstools, pkgconfig, dbus_glib, xz , udev, libnl1, libuuid, polkit, gnutls, ppp, dhcp, dhcpcd, iptables , libgcrypt, dnsmasq, avahi }: stdenv.mkDerivation rec { name = "network-manager-${version}"; - version = "0.9.0"; + version = "0.9.2.0"; src = fetchurl { - url = "mirror://gnome/sources/NetworkManager/0.9/NetworkManager-${version}.tar.bz2"; - sha256 = "0kvi767c224zlja65r8gixmhj57292k0gsxa0217lw5i99l2incq"; + url = "mirror://gnome/sources/NetworkManager/0.9/NetworkManager-${version}.tar.xz"; + sha256 = "1pvd49ji7mh8ww2rfbvq6hmmjms5mb7w10fr7ihgzqbg589zjyj3"; }; # Right now we hardcode quite a few paths at build time. Probably we should @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { "--with-dbus-sys-dir=\${out}/etc/dbus-1/system.d" "--with-crypto=gnutls" "--disable-more-warnings" ]; - buildInputs = [ wirelesstools udev libnl1 libuuid polkit ppp ]; + buildInputs = [ wirelesstools udev libnl1 libuuid polkit ppp xz ]; propagatedBuildInputs = [ dbus_glib gnutls libgcrypt ]; diff --git a/pkgs/tools/networking/vpnc/default.nix b/pkgs/tools/networking/vpnc/default.nix index 88ef6bd8e59af..8619cd9540904 100644 --- a/pkgs/tools/networking/vpnc/default.nix +++ b/pkgs/tools/networking/vpnc/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { sha256 = "1128860lis89g1s21hqxvap2nq426c9j4bvgghncc1zj0ays7kj6"; }; - patches = [ ./makefile.patch ]; + patches = [ ./makefile.patch ./vpnc-script.patch ]; # The `etc/vpnc/vpnc-script' script relies on `which' and on # `ifconfig' as found in net-tools (not GNU Inetutils). diff --git a/pkgs/tools/networking/vpnc/vpnc-script.patch b/pkgs/tools/networking/vpnc/vpnc-script.patch new file mode 100644 index 0000000000000..67a86d5d58fa8 --- /dev/null +++ b/pkgs/tools/networking/vpnc/vpnc-script.patch @@ -0,0 +1,12 @@ +diff -ubr vpnc-0.5.3-orig/vpnc-script.in vpnc-0.5.3/vpnc-script.in +--- vpnc-0.5.3-orig/vpnc-script.in 2012-02-29 23:03:35.289636602 +0100 ++++ vpnc-0.5.3/vpnc-script.in 2012-02-29 23:03:59.597307445 +0100 +@@ -116,7 +116,7 @@ + + if [ -n "$IPROUTE" ]; then + fix_ip_get_output () { +- sed 's/cache//;s/metric \?[0-9]\+ [0-9]\+//g;s/hoplimit [0-9]\+//g' ++ sed 's/cache//;s/metric \?[0-9]\+ [0-9]\+//g;s/hoplimit [0-9]\+//g;s/ipid 0x....//g' + } + + set_vpngateway_route() { diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index 62a75c16b4e4c..3d2360196a665 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchurl, libevent, openssl, zlib }: stdenv.mkDerivation rec { - name = "tor-0.2.1.30"; + name = "tor-0.2.2.35"; src = fetchurl { url = "http://www.torproject.org/dist/${name}.tar.gz"; - sha256 = "02g15k8w5r57r9r6lz0sxzzvqx200y397y142cjswsd4zyla2lpk"; + sha256 = "f141a41fffd31494a0f96ebbb6b999eab33ce62d5c31f81222a0acd034adbf3a"; }; - patchPhase = +# patchPhase = # DNS lookups fail in chroots. - '' sed -i "src/or/test.c" -es/localhost/127.0.0.1/g - ''; +# '' sed -i "src/or/test.c" -es/localhost/127.0.0.1/g +# ''; buildInputs = [ libevent openssl zlib ]; diff --git a/pkgs/tools/security/vidalia/default.nix b/pkgs/tools/security/vidalia/default.nix new file mode 100644 index 0000000000000..243604c2c79e0 --- /dev/null +++ b/pkgs/tools/security/vidalia/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, cmake, qt4 }: +stdenv.mkDerivation rec { + + name = "vidalia-${version}"; + version = "0.2.17"; + + src = fetchurl { + url = "https://www.torproject.org/dist/vidalia/${name}.tar.gz"; + sha256 = "0x0vb37h2d5njxmqkss03ybv7b7jw25682xb793mix1m8l0hs44r"; + }; + + buildInputs = [ cmake qt4 ]; + + meta = with stdenv.lib; { + homepage = https://www.torproject.org/projects/vidalia.html.en; + description = "a cross-platform graphical controller for the Tor software, built using the Qt framework"; + license = licenses.gpl2Plus; + maintainers = [ maintainers.phreedom ]; + platforms = platforms.all; + }; +} \ No newline at end of file diff --git a/pkgs/tools/typesetting/tex/texlive/moderncv.nix b/pkgs/tools/typesetting/tex/texlive/moderncv.nix index c4cd1ee3a05ad..021983370e1dc 100644 --- a/pkgs/tools/typesetting/tex/texlive/moderncv.nix +++ b/pkgs/tools/typesetting/tex/texlive/moderncv.nix @@ -1,9 +1,9 @@ args: with args; rec { - name = "moderncv-2012.01.16"; + name = "moderncv-0.19"; src = fetchurl { url = "http://mirror.ctan.org/macros/latex/contrib/moderncv.zip"; - sha256 = "5cd2117cd2a3572dbc055033ca81ca744ee65918c42d23687e133bb1e6ddd644"; + sha256 = "0i6nvpkb2fqkgrl26bf431cyckklra0wlcsh0ny2smx3s9y13ljw"; }; buildInputs = [texLive unzip]; |