about summary refs log tree commit diff
path: root/pkgs/tools
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/tools')
-rw-r--r--pkgs/tools/X11/x11vnc/default.nix4
-rw-r--r--pkgs/tools/admin/tightvnc/builder.sh4
-rw-r--r--pkgs/tools/compression/xdelta/default.nix24
-rw-r--r--pkgs/tools/filesystems/e2fsprogs/default.nix8
-rw-r--r--pkgs/tools/filesystems/encfs/default.nix19
-rw-r--r--pkgs/tools/misc/system-config-printer/default.nix11
-rw-r--r--pkgs/tools/misc/tmux/default.nix40
-rw-r--r--pkgs/tools/networking/flvstreamer/default.nix39
-rw-r--r--pkgs/tools/networking/tcpdump/default.nix4
-rw-r--r--pkgs/tools/networking/wicd/default.nix29
-rw-r--r--pkgs/tools/networking/wicd/mkdir-networks.patch13
-rw-r--r--pkgs/tools/networking/wicd/no-var-install.patch37
-rw-r--r--pkgs/tools/networking/wicd/pygtk.patch4
-rw-r--r--pkgs/tools/package-management/nix/sqlite.nix6
-rw-r--r--pkgs/tools/package-management/nix/unstable.nix12
-rw-r--r--pkgs/tools/security/tor/default.nix4
-rw-r--r--pkgs/tools/system/ipmitool/default.nix14
17 files changed, 214 insertions, 58 deletions
diff --git a/pkgs/tools/X11/x11vnc/default.nix b/pkgs/tools/X11/x11vnc/default.nix
index bc8463128353..f51d3c2f290a 100644
--- a/pkgs/tools/X11/x11vnc/default.nix
+++ b/pkgs/tools/X11/x11vnc/default.nix
@@ -16,6 +16,10 @@ stdenv.mkDerivation rec {
       xorg.recordproto xorg.libXi xorg.libXrender xorg.renderproto
     ];
 
+  preConfigure = ''
+    configureFlags="--mandir=$out/share/man"
+  '';
+
   meta = {
     description = "A VNC server connected to a real X11 screen";
     homepage = http://www.karlrunge.com/x11vnc/;
diff --git a/pkgs/tools/admin/tightvnc/builder.sh b/pkgs/tools/admin/tightvnc/builder.sh
index 86729c0cdf88..72fced377286 100644
--- a/pkgs/tools/admin/tightvnc/builder.sh
+++ b/pkgs/tools/admin/tightvnc/builder.sh
@@ -32,8 +32,8 @@ buildPhase() {
 
 installPhase() {
     ensureDir $out/bin
-    ensureDir $out/man/man1
-    ./vncinstall $out/bin $out/man
+    ensureDir $out/share/man/man1
+    ./vncinstall $out/bin $out/share/man
 
     # fix HTTP client:
     t=$out/share/tightvnc
diff --git a/pkgs/tools/compression/xdelta/default.nix b/pkgs/tools/compression/xdelta/default.nix
new file mode 100644
index 000000000000..c85c7366cda8
--- /dev/null
+++ b/pkgs/tools/compression/xdelta/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation {
+  name = "xdelta-3.0z";
+  
+  src = fetchurl {
+    url = http://xdelta.googlecode.com/files/xdelta3.0z.tar.gz;
+    sha256 = "1rpk4n3yz8x81vakzn3n75h79a2ycm06p5v72djklx0wn9gb412m";
+  };
+
+  installPhase =
+    ''
+      mkdir -p $out/bin
+      cp xdelta3 $out/bin/
+
+      mkdir -p $out/share/man/man1
+      cp xdelta3.1 $out/share/man/man1/
+    '';
+
+  meta = {
+    homepage = http://xdelta.org/;
+    description = "A binary diff tool that uses the VCDIFF (RFC 3284) format and compression";
+  };
+}
diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix
index d568fa75caa5..903b8f10347f 100644
--- a/pkgs/tools/filesystems/e2fsprogs/default.nix
+++ b/pkgs/tools/filesystems/e2fsprogs/default.nix
@@ -1,14 +1,14 @@
-{stdenv, fetchurl, pkgconfig, libuuid}:
+{ stdenv, fetchurl, pkgconfig, libuuid }:
 
 stdenv.mkDerivation rec {
-  name = "e2fsprogs-1.41.9";
+  name = "e2fsprogs-1.41.12";
 
   src = fetchurl {
     url = "mirror://sourceforge/e2fsprogs/${name}.tar.gz";
-    sha256 = "1s365fpv5w5m8n6n5fnn6q003whr1clr22xn25wkssx1c51f7wfb";
+    sha256 = "084zpg4ma6g4y4plz7alfqc1q78jss8lfmpk4w7zvnmz43fd09lw";
   };
 
-  buildInputs = [pkgconfig libuuid];
+  buildInputs = [ pkgconfig libuuid ];
 
   crossAttrs = {
     preConfigure = ''
diff --git a/pkgs/tools/filesystems/encfs/default.nix b/pkgs/tools/filesystems/encfs/default.nix
new file mode 100644
index 000000000000..c950810026a8
--- /dev/null
+++ b/pkgs/tools/filesystems/encfs/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, openssl, fuse, boost, rlog }:
+
+stdenv.mkDerivation {
+  name = "encfs-1.6.1";
+
+  src = fetchurl {
+    url = "http://encfs.googlecode.com/files/encfs-1.6-1.tgz";
+    sha256 = "0k50ic5nyibb9giif9dqm6sj20q0yzri3drg78m788z17xp060mw";
+  };
+
+  buildInputs = [ boost fuse openssl rlog ];
+
+  configureFlags = "--with-boost-serialization=boost_wserialization --with-boost-filesystem=boost_filesystem";
+
+  meta = {
+    homepage = http://www.arg0.net/encfs;
+    description = "EncFS provides an encrypted filesystem in user-space via FUSE";
+  };
+}
diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix
index 4191ffd6f800..998737660242 100644
--- a/pkgs/tools/misc/system-config-printer/default.nix
+++ b/pkgs/tools/misc/system-config-printer/default.nix
@@ -1,5 +1,7 @@
 {stdenv, fetchurl, udev, intltool, python, pkgconfig, glib, xmlto,
-  docbook_xml_dtd_412, docbook_xsl, libxml2, desktop_file_utils, libusb, cups}:
+  makeWrapper, pygobject, pygtk, docbook_xml_dtd_412, docbook_xsl,
+  pythonDBus, libxml2, desktop_file_utils, libusb, cups, pycups,
+  notify }:
 
 stdenv.mkDerivation rec {
   name = "${meta.name}-${meta.version}";
@@ -9,10 +11,15 @@ stdenv.mkDerivation rec {
     sha256 = "16xjvahmdkkix7281gx7ac9zqaxgfb7pjjlgcc6kmw52cifk86ww";
   };
   buildInputs = [ udev intltool python pkgconfig glib xmlto docbook_xml_dtd_412
-    libxml2 docbook_xsl desktop_file_utils libusb cups];
+    libxml2 docbook_xsl desktop_file_utils libusb cups makeWrapper pygobject
+    pygtk pythonDBus pycups notify ];
 
   configureFlags = "--with-udev-rules";
 
+  postInstall = ''
+    wrapProgram $out/bin/system-config-printer --set PYTHONPATH "$PYTHONPATH:$(toPythonPath $out):$(toPythonPath ${notify})/gtk-2.0"
+  '';
+
   meta = {
     name = "system-config-printer";
     version = "1.2.4";
diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix
new file mode 100644
index 000000000000..10793753ab59
--- /dev/null
+++ b/pkgs/tools/misc/tmux/default.nix
@@ -0,0 +1,40 @@
+{stdenv, fetchurl, ncurses, libevent}:
+
+stdenv.mkDerivation rec {
+  pname = "tmux";
+  version = "1.3";
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/${pname}/${name}.tar.gz";
+    sha256 = "72c2d6f1c30fb4ccbd29b530a7d8a08e67c9c2d87ac8d67e3806561670fc0362";
+  };
+
+  makeFlags = "PREFIX=\${out}";
+
+  buildInputs = [ ncurses libevent ];
+
+  meta = {
+    homepage = http://tmux.sourceforge.net/;
+    description = "tmux is a terminal multiplexer";
+
+    longDescription =
+      '' tmux is intended to be a modern, BSD-licensed alternative to programs such as GNU screen. Major features include:
+
+          * A powerful, consistent, well-documented and easily scriptable command interface.
+          * A window may be split horizontally and vertically into panes.
+          * Panes can be freely moved and resized, or arranged into preset layouts.
+          * Support for UTF-8 and 256-colour terminals.
+          * Copy and paste with multiple buffers.
+          * Interactive menus to select windows, sessions or clients.
+          * Change the current window by searching for text in the target.
+          * Terminal locking, manually or after a timeout.
+          * A clean, easily extended, BSD-licensed codebase, under active development. 
+      '';
+
+    license = stdenv.lib.licenses.bsd3;
+
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ stdenv.lib.maintainers.thammers ];
+  };
+}
diff --git a/pkgs/tools/networking/flvstreamer/default.nix b/pkgs/tools/networking/flvstreamer/default.nix
new file mode 100644
index 000000000000..c3ac4e205ae2
--- /dev/null
+++ b/pkgs/tools/networking/flvstreamer/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+
+  name = "flvstreamer-2.1c1";
+
+  src = fetchurl {
+    url = "http://download.savannah.gnu.org/releases/flvstreamer/source/${name}.tar.gz";
+    sha256 = "e90e24e13a48c57b1be01e41c9a7ec41f59953cdb862b50cf3e667429394d1ee";
+  };
+
+  buildPhase = ''
+    make posix
+  '';
+
+  installPhase = ''
+    ensureDir $out/bin
+    cp flvstreamer $out/bin
+    cp streams $out/bin
+    cp rtmpsrv $out/bin
+    cp rtmpsuck $out/bin
+  '';
+
+  meta = {
+    description = "flvstreamer is an command-line RTMP client";
+
+    longDescription =
+      '' flvstreamer is an open source command-line RTMP client intended to 
+         stream audio or video content from all types of flash or rtmp servers.
+      '';
+
+    license = "GPLv2+";
+
+    homepage = http://savannah.nongnu.org/projects/flvstreamer;
+
+    maintainers = [ stdenv.lib.maintainers.thammers ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix
index 640b305591e2..e9e55f48beec 100644
--- a/pkgs/tools/networking/tcpdump/default.nix
+++ b/pkgs/tools/networking/tcpdump/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libpcap, enableStatic ? false }:
 
 stdenv.mkDerivation rec {
-  name = "tcpdump-4.1.0";
+  name = "tcpdump-4.1.1";
 
   src = fetchurl {
     url = "http://www.tcpdump.org/release/${name}.tar.gz";
-    sha256 = "1yhmz23cb0qx16nwnmyk2v7nnqai20lzcc4lx34v728qdpkmc1in";
+    sha256 = "02kz3sghpg16p26dhid8ma67pxil8x5jqdd83fvdnypcc6ylpkg6";
   };
 
   buildInputs = [ libpcap ];
diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix
index 52bbf7d7a1fa..70cc4a3b46cf 100644
--- a/pkgs/tools/networking/wicd/default.nix
+++ b/pkgs/tools/networking/wicd/default.nix
@@ -6,11 +6,11 @@
 # on urwid which has not been packaged at this time (2009-12-27).
 
 stdenv.mkDerivation rec {
-  name = "wicd-1.6.2.2";
+  name = "wicd-1.7.0";
   
   src = fetchurl {
-    url = "mirror://sourceforge/wicd/files/wicd-stable/${name}/${name}.tar.bz2";
-    sha256 = "1gpjrlanz7rrzkchnpm1dgik333rz1fsg4c4046c5pwdfpp1crxr";
+    url = "mirror://sourceforge/project/wicd/wicd-stable/${name}/${name}.tar.bz2";
+    sha256 = "0civfmpjlsvnaiw7fkpq34mh5ndhfzb9mkl3q2d3rjd4z0mnki8l";
   };
 
   buildInputs = [ python ];
@@ -19,24 +19,34 @@ stdenv.mkDerivation rec {
 
   # Should I be using pygtk's propogated build inputs?
   postPatch = ''
+    substituteInPlace in/scripts=wicd.in --subst-var-by TEMPLATE-DEFAULT $out/share/other/dhclient.conf.template.default
     sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin:${wpa_supplicant}/sbin:${dhcp}/sbin:${wirelesstools}/sbin:${nettools}/sbin:${iproute}/sbin" in/scripts=wicd.in
     sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pythonDBus})" in/scripts=wicd.in
     sed -i "4iexport LC_ALL=\\\"${locale}\\\"" in/scripts=wicd.in
     sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin" in/scripts=wicd-client.in
     sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})" in/scripts=wicd-client.in
+    sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin" in/scripts=wicd-gtk.in
+    sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})" in/scripts=wicd-gtk.in
+    sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin" in/scripts=wicd-cli.in
+    sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})" in/scripts=wicd-cli.in
   '';
 
   configurePhase = ''
     python setup.py configure \
     --lib=$out/lib/ \
-    --etc=/var/lib/wicd/ \
     --share=$out/share/ \
+    --etc=/var/lib/wicd/ \
     --scripts=$out/etc/scripts/ \
-    --images=$out/share/pixmaps/ \
+    --pixmaps=$out/share/pixmaps/ \
+    --images=$out/share/pixmaps/wicd/ \
     --encryption=$out/etc/encryption/templates/ \
     --bin=$out/bin/ \
     --sbin=$out/sbin/ \
-    --backends=$out/lib/backends/ \
+    --backends=$out/share/backends/ \
+    --daemon=$out/share/daemon/ \
+    --curses=$out/share/curses/ \
+    --gtk=$out/share/gtk/ \
+    --cli=$out/share/cli/ \
     --networks=/var/lib/wicd/configurations/ \
     --resume=$out/etc/acpi/resume.d/ \
     --suspend=$out/etc/acpi/suspend.d/ \
@@ -60,7 +70,11 @@ stdenv.mkDerivation rec {
     --no-install-ncurses \
   '';
 
-  installPhase = ''python setup.py install --prefix=$out'';
+  installPhase = ''
+    python setup.py install --prefix=$out
+    ensureDir $out/share/other
+    cp other/dhclient.conf.template.default $out/share/other/dhclient.conf.template.default
+  '';
 
   meta = {
     homepage = http://wicd.net/;
@@ -74,6 +88,7 @@ stdenv.mkDerivation rec {
       encryption types, such as WPA and WEP. Wicd will automatically
       connect at startup to any preferred network within range.
     '';
+    maintainers = [ stdenv.lib.maintainers.roconnor ];
     license="GPLv2";
   };
 }
diff --git a/pkgs/tools/networking/wicd/mkdir-networks.patch b/pkgs/tools/networking/wicd/mkdir-networks.patch
index df3f0487d1da..01563fd55dab 100644
--- a/pkgs/tools/networking/wicd/mkdir-networks.patch
+++ b/pkgs/tools/networking/wicd/mkdir-networks.patch
@@ -1,11 +1,12 @@
-wicd normally makes the NETWORKS directory at install time, but we cannot do that,
-so we make it at runtime instead.
+wicd normally makes the NETWORKS directory and install the dhclient.conf.template.default at install time, 
+but we cannot do that, so we make it at runtime instead.
 
---- wicd-1.6.2.2/in/scripts=wicd.in	2009-09-01 11:05:31.000000000 -0400
-+++ wicd-1.6.2.2/in/scripts=wicd.in	2010-01-04 18:01:57.000000000 -0500
-@@ -1,3 +1,5 @@
+--- wicd-1.7.0/in/scripts=wicd.in       2010-01-14 23:49:11.000000000 -0500
++++ wicd-1.7.0/in/scripts=wicd.in       2010-11-16 22:35:50.272555487 -0500
+@@ -1,3 +1,6 @@
  #!/bin/bash
  
 +mkdir -p %NETWORKS%
++ln -sf @TEMPLATE-DEFAULT@ %ETC%dhclient.conf.template.default
 +
- exec python -O %LIB%wicd-daemon.py $@
+ exec %PYTHON% -O %SHARE%daemon/wicd-daemon.py $@
diff --git a/pkgs/tools/networking/wicd/no-var-install.patch b/pkgs/tools/networking/wicd/no-var-install.patch
index 9ab5a0520d92..9a333332fcf2 100644
--- a/pkgs/tools/networking/wicd/no-var-install.patch
+++ b/pkgs/tools/networking/wicd/no-var-install.patch
@@ -1,21 +1,16 @@
-The install tries to create files in /var.  This patch removes those steps.

-

---- wicd-1.6.2.2/setup.py	2009-09-01 11:05:31.000000000 -0400

-+++ wicd-1.6.2.2/setup.py	2009-12-27 21:27:57.000000000 -0500

-@@ -464,8 +464,6 @@

-     data = [

-     (wpath.dbus, ['other/wicd.conf']),

-     (wpath.desktop, ['other/wicd.desktop']),

--    (wpath.log, []), 

--    (wpath.etc, []),

-     (wpath.icons + 'scalable/apps/', ['icons/scalable/wicd-client.svg']),

-     (wpath.icons + '192x192/apps/', ['icons/192px/wicd-client.png']),

-     (wpath.icons + '128x128/apps/', ['icons/128px/wicd-client.png']),

-@@ -481,7 +479,6 @@

-     (wpath.images, [('images/' + b) for b in os.listdir('images') if not b.startswith('.')]),

-     (wpath.encryption, [('encryption/templates/' + b) for b in 

-                         os.listdir('encryption/templates') if not b.startswith('.')]),

--    (wpath.networks, []),

-     (wpath.bin, ['scripts/wicd-client', ]), 

-     (wpath.sbin,  ['scripts/wicd', ]),  

-     (wpath.share, ['data/wicd.glade', ]),

+The install tries to create files in /var.  This patch removes those steps.
+
+--- wicd-1.7.0/setup.py 2010-01-14 23:49:11.000000000 -0500
++++ wicd-1.7.0/setup.py 2010-11-16 22:15:33.855977242 -0500
+@@ -493,11 +493,8 @@
+     print "Using init file",(wpath.init, wpath.initfile)
+     data = [
+     (wpath.dbus, ['other/wicd.conf']),
+-    (wpath.log, [empty_file]), 
+-    (wpath.etc, ['other/dhclient.conf.template.default']),
+     (wpath.encryption, [('encryption/templates/' + b) for b in 
+                         os.listdir('encryption/templates') if not b.startswith('.')]),
+-    (wpath.networks, [empty_file]),
+     (wpath.sbin,  ['scripts/wicd']),  
+     (wpath.daemon, ['wicd/monitor.py', 'wicd/wicd-daemon.py',
+                  'wicd/suspend.py', 'wicd/autoconnect.py']), 
diff --git a/pkgs/tools/networking/wicd/pygtk.patch b/pkgs/tools/networking/wicd/pygtk.patch
index e72228f75a5c..f015e50d684a 100644
--- a/pkgs/tools/networking/wicd/pygtk.patch
+++ b/pkgs/tools/networking/wicd/pygtk.patch
@@ -1,8 +1,8 @@
 For some reason nix's pygtk doesn't have a pygtk module so we remove the version check.
 If this ever changes we could remove this patch.
 
---- wicd-1.6.2.2/wicd/wicd-client.py	2009-09-01 11:05:31.000000000 -0400
-+++ wicd-1.6.2.2/wicd/wicd-client.py	2009-12-28 00:22:57.000000000 -0500
+--- wicd-1.7.0/gtk/wicd-client.py	2009-09-01 11:05:31.000000000 -0400
++++ wicd-1.7.0/gtk/wicd-client.py	2009-12-28 00:22:57.000000000 -0500
 @@ -43,9 +43,6 @@
  import atexit
  from dbus import DBusException
diff --git a/pkgs/tools/package-management/nix/sqlite.nix b/pkgs/tools/package-management/nix/sqlite.nix
index 793fc57350a3..0a69564c539f 100644
--- a/pkgs/tools/package-management/nix/sqlite.nix
+++ b/pkgs/tools/package-management/nix/sqlite.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nix-1.0pre24749";
+  name = "nix-1.0pre25036";
 
   src = fetchurl {
-    url = "http://hydra.nixos.org/build/757682/download/4/${name}.tar.bz2";
-    sha256 = "ab2bda296eb91a600d01a22ed4096acdf9b5d613f1155f98433d87e273a58970";
+    url = "http://hydra.nixos.org/build/787041/download/4/${name}.tar.bz2";
+    sha256 = "ccba5f44b75801187b766d4b98a53bccf335df35cde32aeab71630bfca7882f6";
   };
 
   buildInputs = [ perl curl openssl pkgconfig boehmgc ];
diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix
index b5e56464eecb..2dac26dd1b1d 100644
--- a/pkgs/tools/package-management/nix/unstable.nix
+++ b/pkgs/tools/package-management/nix/unstable.nix
@@ -1,24 +1,26 @@
 { stdenv, fetchurl, perl, curl, bzip2, openssl ? null
+, pkgconfig, boehmgc
 , storeDir ? "/nix/store"
 , stateDir ? "/nix/var"
 }:
 
 stdenv.mkDerivation rec {
-  name = "nix-1.0pre24122";
+  name = "nix-1.0pre24855";
 
   src = fetchurl {
-    url = "http://hydra.nixos.org/build/667798/download/4/${name}.tar.bz2";
-    sha256 = "0rz9radz4452bp3sy9yzcawn9yz5z4nyng43a0zrsa5v72cv695f";
+    url = "http://hydra.nixos.org/build/774404/download/4/${name}.tar.bz2";
+    sha256 = "cd2a75a04fc03dcafbab1d183e6ee485b491e17f1680bb7ee38738a2b1235932";
   };
 
-  buildNativeInputs = [ perl ];
-  buildInputs = [ curl openssl ];
+  buildNativeInputs = [ perl pkgconfig ];
+  buildInputs = [ curl openssl boehmgc ];
 
   configureFlags =
     ''
       --with-store-dir=${storeDir} --localstatedir=${stateDir}
       --with-bzip2=${bzip2}
       --disable-init-state
+      --enable-gc
       CFLAGS=-O3 CXXFLAGS=-O3
     '';
 
diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix
index d896e4429597..040e53774a3d 100644
--- a/pkgs/tools/security/tor/default.nix
+++ b/pkgs/tools/security/tor/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libevent, openssl, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "tor-0.2.1.26";
+  name = "tor-0.2.1.27";
 
   src = fetchurl {
     url = "http://www.torproject.org/dist/${name}.tar.gz";
-    sha256 = "18kz1hs6lvckkddy4y36gi7ly03ar2il2xzkrf8bfgif1gnn1p3c";
+    sha256 = "07367wynpbbqnwzis3z8zf8k9b6cgywcrjzn7gpdal8m4dkmqkgc";
   };
 
   patchPhase =
diff --git a/pkgs/tools/system/ipmitool/default.nix b/pkgs/tools/system/ipmitool/default.nix
index 0a4c4b01ef6f..2b66bb2e081b 100644
--- a/pkgs/tools/system/ipmitool/default.nix
+++ b/pkgs/tools/system/ipmitool/default.nix
@@ -13,13 +13,23 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [ openssl ];
-  dontDisableStatic = static;
-  configureFlags = if static then "LDFLAGS=-static --enable-static --disable-shared" else "--enable-shared";
+
+  preConfigure = ''
+    configureFlagsArray=(
+      --infodir=$out/share/info
+      --mandir=$out/share/man
+      ${if static then "LDFLAGS=-static --enable-static --disable-shared" else "--enable-shared"}
+    )
+  '';
   makeFlags = if static then "AM_LDFLAGS=-all-static" else "";
+  dontDisableStatic = static;
 
   meta = {
     description = ''Command-line interface to IPMI-enabled devices'';
     license = "BSD";
     homepage = "http://ipmitool.sourceforge.net";
+
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ stdenv.lib.maintainers.simons ];
   };
 }
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-08-02 13:58:16 +0000