[Nix-commits] SVN commit: nix - r28766 - nixpkgs/trunk/pkgs/development/tools/misc/avrdude

2011-08-22 Thread Michael Raskin 
Author: raskin
Date: Tue Aug 23 03:23:34 2011
New Revision: 28766
URL: https://svn.nixos.org/websvn/nix/?rev=28766&sc=1

Log:
Updating avrdude

Modified:
   nixpkgs/trunk/pkgs/development/tools/misc/avrdude/default.nix

Modified: nixpkgs/trunk/pkgs/development/tools/misc/avrdude/default.nix
==
--- nixpkgs/trunk/pkgs/development/tools/misc/avrdude/default.nix   Tue Aug 
23 02:34:21 2011(r28765)
+++ nixpkgs/trunk/pkgs/development/tools/misc/avrdude/default.nix   Tue Aug 
23 03:23:34 2011(r28766)
@@ -2,12 +2,12 @@
 
 let edf = composableDerivation.edf; in
 
-composableDerivation.composableDerivation {} {
-  name="avrdude-5.4";
+composableDerivation.composableDerivation {} rec {
+  name="avrdude-5.10";
 
   src = fetchurl {
-url = http://mirror.switch.ch/mirror/gentoo/distfiles/avrdude-5.4.tar.gz;
-sha256 = 
"bee4148c51ec95999d803cb9f68f12ac2e9128b06f07afe307d38966c0833b30";
+url = "http://download.savannah.gnu.org/releases/avrdude/${name}.tar.gz";;
+sha256 = "0pmy73777x8p7f2aj2w2q1dnk1bvhd1cm7hcs1s9hsdqsmiinl41";
   };
 
   configureFlags = [ "--disable-dependency-tracking" ];
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r28765 - nixpkgs/trunk/pkgs/os-specific/linux/kernel

2011-08-22 Thread Shea Levy 
Author: shlevy
Date: Tue Aug 23 02:34:21 2011
New Revision: 28765
URL: https://svn.nixos.org/websvn/nix/?rev=28765&sc=1

Log:
linux-3.1.nix: Bump to 3.1-rc3

Modified:
   nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.1.nix

Modified: nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.1.nix
==
--- nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.1.nix   Mon Aug 22 
23:10:24 2011(r28764)
+++ nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.1.nix   Tue Aug 23 
02:34:21 2011(r28765)
@@ -199,13 +199,13 @@
 import ./generic.nix (
 
   rec {
-version = "3.1-rc2";
+version = "3.1-rc3";
 
-modDirVersion = "3.1.0-rc2";
+modDirVersion = "3.1.0-rc3";
   
 src = fetchurl {
   url = 
"mirror://kernel/linux/kernel/v3.x/testing/linux-${version}.tar.bz2";
-  sha256 = "0lrgsj37aacp6gyqv5my0g24wys07sr6g618yfg3a6rzij2asczg";
+  sha256 = "0ky6pawracgc27m0d4mq71f87yiwbp90k5aqn8qh5bdfq3ml84i6";
 };
 
 config = configWithPlatform stdenv.platform;
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-dev] Blacklisting snd_pcsp by default

2011-08-22 Thread Shea Levy 

Hi all,

The snd_pcsp module is known to cause issues with the default ALSA audio 
device, and as far as I know is not really that useful on modern 
machines. Would anyone mind if snd_pcsp was blacklisted when ALSA is 
enabled?


~Shea
___
nix-dev mailing list
nix-dev@cs.uu.nl
https://mail.cs.uu.nl/mailman/listinfo/nix-dev

[Nix-commits] SVN commit: nix - r28764 - nixos/trunk/modules/services/x11/desktop-managers

2011-08-22 Thread Eelco Dolstra 
Author: eelco
Date: Mon Aug 22 23:10:24 2011
New Revision: 28764
URL: https://svn.nixos.org/websvn/nix/?rev=28764&sc=1

Log:
* Enable upower and udisks for Xfce 4.8.

Modified:
   nixos/trunk/modules/services/x11/desktop-managers/kde4.nix
   nixos/trunk/modules/services/x11/desktop-managers/xfce.nix

Modified: nixos/trunk/modules/services/x11/desktop-managers/kde4.nix
==
--- nixos/trunk/modules/services/x11/desktop-managers/kde4.nix  Mon Aug 22 
23:08:42 2011(r28763)
+++ nixos/trunk/modules/services/x11/desktop-managers/kde4.nix  Mon Aug 22 
23:10:24 2011(r28764)
@@ -140,10 +140,10 @@
 target = "X11/xkb";
   };
 
-# Enable required DBus services.
+# Enable helpful DBus services.
 services.hal = mkIf (!isKDE47) { enable = true; };
 services.udisks = mkIf isKDE47 { enable = true; };
-services.upower = mkIf isKDE47 { enable = true; };
+services.upower = mkIf (isKDE47 && config.powerManagement.enable) { enable 
= true; };
 
   };
 

Modified: nixos/trunk/modules/services/x11/desktop-managers/xfce.nix
==
--- nixos/trunk/modules/services/x11/desktop-managers/xfce.nix  Mon Aug 22 
23:08:42 2011(r28763)
+++ nixos/trunk/modules/services/x11/desktop-managers/xfce.nix  Mon Aug 22 
23:10:24 2011(r28764)
@@ -80,7 +80,10 @@
 environment.pathsToLink =
   [ "/share/xfce4" "/share/themes" "/share/mime" 
"/share/desktop-directories" ];
   
+# Enable helpful DBus services.
 services.hal = mkIf (!isXfce48) { enable = true; };
+services.udisks = mkIf isXfce48 { enable = true; };
+services.upower = mkIf (isXfce48 && config.powerManagement.enable) { 
enable = true; };
 
   };
 
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r28763 - nixpkgs/trunk/pkgs/desktops/xfce-4.8/applications

2011-08-22 Thread Eelco Dolstra 
Author: eelco
Date: Mon Aug 22 23:08:42 2011
New Revision: 28763
URL: https://svn.nixos.org/websvn/nix/?rev=28763&sc=1

Log:
* Updated xfce4-power-manager.

Modified:
   nixpkgs/trunk/pkgs/desktops/xfce-4.8/applications/xfce4-power-manager.nix

Modified: 
nixpkgs/trunk/pkgs/desktops/xfce-4.8/applications/xfce4-power-manager.nix
==
--- nixpkgs/trunk/pkgs/desktops/xfce-4.8/applications/xfce4-power-manager.nix   
Mon Aug 22 22:52:13 2011(r28762)
+++ nixpkgs/trunk/pkgs/desktops/xfce-4.8/applications/xfce4-power-manager.nix   
Mon Aug 22 23:08:42 2011(r28763)
@@ -1,21 +1,19 @@
 { stdenv, fetchurl, pkgconfig, intltool, gtk, dbus_glib, xfconf
-, libxfcegui4, libxfce4util, libnotify, xfce4panel }:
+, libxfce4ui, libxfce4util, libnotify, xfce4panel }:
 
 stdenv.mkDerivation rec {
-  name = "xfce4-power-manager-0.8.5";
+  name = "xfce4-power-manager-1.0.10";
   
   src = fetchurl {
-url = 
"http://www.xfce.org/archive/src/apps/xfce4-power-manager/0.8/${name}.tar.bz2";;
-sha1 = "b1ce0f120733ec1a6267d50ba5c2990ccfd4";
+url = 
"http://archive.xfce.org/src/apps/xfce4-power-manager/1.0/${name}.tar.bz2";;
+sha1 = "64dd7a8fae9cd1cbcf6403d2f51f2281f38cca05";
   };
 
   buildInputs =
-[ pkgconfig intltool gtk dbus_glib xfconf libxfcegui4 libxfce4util
+[ pkgconfig intltool gtk dbus_glib xfconf libxfce4ui libxfce4util
   libnotify xfce4panel
 ];
 
-  NIX_CFLAGS_COMPILE = "-I${libxfcegui4}/include/xfce4";
-
   meta = {
 homepage = 
http://goodies.xfce.org/projects/applications/xfce4-power-manager;
 description = "A power manager for the Xfce Desktop Environment";
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r28762 - nixos/trunk/modules/services/x11/desktop-managers

2011-08-22 Thread Eelco Dolstra 
Author: eelco
Date: Mon Aug 22 22:52:13 2011
New Revision: 28762
URL: https://svn.nixos.org/websvn/nix/?rev=28762&sc=1

Log:
* Xfce 4.8 doesn't need HAL anymore.

Modified:
   nixos/trunk/modules/services/x11/desktop-managers/xfce.nix

Modified: nixos/trunk/modules/services/x11/desktop-managers/xfce.nix
==
--- nixos/trunk/modules/services/x11/desktop-managers/xfce.nix  Mon Aug 22 
22:51:23 2011(r28761)
+++ nixos/trunk/modules/services/x11/desktop-managers/xfce.nix  Mon Aug 22 
22:52:13 2011(r28762)
@@ -7,6 +7,8 @@
   xcfg = config.services.xserver;
   cfg = xcfg.desktopManager.xfce;
 
+  isXfce48 = pkgs.xfce ? libxfce4ui;
+
 in
 
 {
@@ -69,12 +71,16 @@
 pkgs.gnome.gnomeicontheme
 pkgs.desktop_file_utils
   ]
+  ++ optionals isXfce48 [
+pkgs.xfce.libxfce4ui
+pkgs.xfce.garcon
+  ]
   ++ optional config.powerManagement.enable pkgs.xfce.xfce4_power_manager;
 
 environment.pathsToLink =
-  [ "/share/xfce4" "/share/themes" "/share/mime" ];
+  [ "/share/xfce4" "/share/themes" "/share/mime" 
"/share/desktop-directories" ];
   
-services.hal.enable = true;
+services.hal = mkIf (!isXfce48) { enable = true; };
 
   };
 
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r28761 - in nixpkgs/trunk/pkgs: desktops/xfce-4.8 desktops/xfce-4.8/applications desktops/xfce-4.8/core top-level

2011-08-22 Thread Eelco Dolstra 
Author: eelco
Date: Mon Aug 22 22:51:23 2011
New Revision: 28761
URL: https://svn.nixos.org/websvn/nix/?rev=28761&sc=1

Log:
* Xfce 4.8.

Added:
   nixpkgs/trunk/pkgs/desktops/xfce-4.8/
  - copied from r28757, nixpkgs/trunk/pkgs/desktops/xfce-4.6/
Deleted:
   nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/libxfce4menu.nix
Modified:
   nixpkgs/trunk/pkgs/desktops/xfce-4.8/applications/ristretto.nix
   nixpkgs/trunk/pkgs/desktops/xfce-4.8/applications/terminal.nix
   nixpkgs/trunk/pkgs/desktops/xfce-4.8/applications/xfce4-mixer.nix
   nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/exo.nix
   nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/gtk-xfce-engine.nix
   nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/libxfce4util.nix
   nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/libxfcegui4.nix
   nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/thunar.nix
   nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/xfce-utils.nix
   nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/xfce4-panel.nix
   nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/xfce4-session.nix
   nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/xfce4-settings.nix
   nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/xfconf.nix
   nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/xfdesktop.nix
   nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/xfwm4.nix
   nixpkgs/trunk/pkgs/desktops/xfce-4.8/default.nix
   nixpkgs/trunk/pkgs/top-level/all-packages.nix

Modified: nixpkgs/trunk/pkgs/desktops/xfce-4.8/applications/ristretto.nix
==
--- nixpkgs/trunk/pkgs/desktops/xfce-4.6/applications/ristretto.nix Mon Aug 
22 17:40:07 2011(r28757)
+++ nixpkgs/trunk/pkgs/desktops/xfce-4.8/applications/ristretto.nix Mon Aug 
22 22:51:23 2011(r28761)
@@ -1,17 +1,17 @@
 { stdenv, fetchurl, pkgconfig, intltool, libexif, gtk, thunar
-, exo, dbus_glib, libxfce4util, libxfcegui4, xfconf }:
+, exo, dbus_glib, libxfce4util, libxfce4ui, xfconf }:
 
 stdenv.mkDerivation rec {
-  name = "ristretto-0.0.22";
+  name = "ristretto-0.0.93";
   
   src = fetchurl {
-url = "http://www.xfce.org/archive/src/apps/ristretto/0.0/${name}.tar.gz";;
-sha1 = "bddbc8618ba67699ccf5ee4ea0b538b1be7fdb0a";
+url = "http://archive.xfce.org/src/apps/ristretto/0.0/${name}.tar.bz2";;
+sha1 = "c71acaad169633faffe26609f9cc671b04ff52d3";
   };
 
   buildInputs =
 [ pkgconfig intltool libexif gtk thunar exo dbus_glib
-  libxfce4util libxfcegui4 xfconf
+  libxfce4util libxfce4ui xfconf
 ];
 
   NIX_LDFLAGS = "-lX11";

Modified: nixpkgs/trunk/pkgs/desktops/xfce-4.8/applications/terminal.nix
==
--- nixpkgs/trunk/pkgs/desktops/xfce-4.6/applications/terminal.nix  Mon Aug 
22 17:40:07 2011(r28757)
+++ nixpkgs/trunk/pkgs/desktops/xfce-4.8/applications/terminal.nix  Mon Aug 
22 22:51:23 2011(r28761)
@@ -6,11 +6,11 @@
 }:
 
 stdenv.mkDerivation {
-  name = "xfce-terminal-0.4.5";
+  name = "xfce-terminal-0.4.8";
   
   src = fetchurl {
-url = http://archive.xfce.org/src/apps/terminal/0.4/Terminal-0.4.5.tar.bz2;
-sha256 = "14w8mhmyrq6dd9574zfvq0pymknljckq6qgcv1r6c1r22jydrzcj";
+url = http://archive.xfce.org/src/apps/terminal/0.4/Terminal-0.4.8.tar.bz2;
+sha1 = "2f12c3a0fffad18976d47e531d404ee308cb2f05";
   };
 
   buildInputs = [ pkgconfig intltool exo gtk vte libxfce4util ncurses ];

Modified: nixpkgs/trunk/pkgs/desktops/xfce-4.8/applications/xfce4-mixer.nix
==
--- nixpkgs/trunk/pkgs/desktops/xfce-4.6/applications/xfce4-mixer.nix   Mon Aug 
22 17:40:07 2011(r28757)
+++ nixpkgs/trunk/pkgs/desktops/xfce-4.8/applications/xfce4-mixer.nix   Mon Aug 
22 22:51:23 2011(r28761)
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, intltool, glib, gst_all, gtk
-, libxfce4util, libxfcegui4, xfce4panel, xfconf, makeWrapper }:
+, libxfce4util, libxfce4ui, xfce4panel, xfconf }:
 
 let
 
@@ -12,16 +12,16 @@
 in
 
 stdenv.mkDerivation rec {
-  name = "xfce4-mixer-4.6.1";
+  name = "xfce4-mixer-4.8.0";
   
   src = fetchurl {
-url = "http://archive.xfce.org/src/apps/xfce4-mixer/4.6/${name}.tar.bz2";;
-sha1 = "e86163782fc4fc31671c7cb212d23d34106ad3af";
+url = "http://archive.xfce.org/src/apps/xfce4-mixer/4.8/${name}.tar.bz2";;
+sha1 = "24f3401a68f10d2c620e354a6de98e09fe808665";
   };
 
   buildInputs =
 [ pkgconfig intltool glib gst_all.gstreamer gstPluginsBase gtk
-  libxfce4util libxfcegui4 xfce4panel xfconf makeWrapper
+  libxfce4util libxfce4ui xfce4panel xfconf
 ];
 
   postInstall =

Modified: nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/exo.nix
==
--- nixpkgs/trunk/pkgs/desktops/xfce-4.6/core/exo.nix   Mon Aug 22 17:40:07 
2011(r28757)
+++ nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/exo.nix   Mon Aug 22 22:51:23 
2011(r28761)
@@ -1,17 +1,15 @@
-{ stdenv, fetchurl, pk

[Nix-commits] SVN commit: nix - r28760 - nixpkgs/trunk/pkgs/applications/version-management/git-and-tools

2011-08-22 Thread David Guibert 
Author: guibert
Date: Mon Aug 22 20:26:15 2011
New Revision: 28760
URL: https://svn.nixos.org/websvn/nix/?rev=28760&sc=1

Log:
git-subtree: 0.3 -> 0.4

Modified:
   nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/default.nix

Modified: 
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/default.nix
==
--- 
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/default.nix
Mon Aug 22 20:26:11 2011(r28759)
+++ 
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/default.nix
Mon Aug 22 20:26:15 2011(r28760)
@@ -104,11 +104,11 @@
   };
 
   gitSubtree = stdenv.mkDerivation {
-name = "git-subtree-0.3";
+name = "git-subtree-0.4";
 src = fetchurl {
-  url = "http://github.com/apenwarr/git-subtree/tarball/v0.3";;
+  url = "http://github.com/apenwarr/git-subtree/tarball/v0.4";;
 #  sha256 = "0y57lpbcc2142jgrr4lflyb9xgzs9x33r7g4b919ncn3alb95vdr";
-  sha256 = 
"f2ccac1e9cff4c35d989dc2a5581133c96b72d96c6a5ed89e51b6446dadac03f";
+  sha256 = "19s8352igwh7x1nqgdfs7rgxahw9cnfv7zmpzpd63m1r3l2945d4";
 };
 unpackCmd = "gzip -d < $curSrc | tar xvf -";
 buildInputs = [ git asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt 
];
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r28759 - in nixpkgs/trunk/pkgs: applications/graphics/jbrout development/python-modules/pyexiv2 top-level

2011-08-22 Thread David Guibert 
Author: guibert
Date: Mon Aug 22 20:26:11 2011
New Revision: 28759
URL: https://svn.nixos.org/websvn/nix/?rev=28759&sc=1

Log:
add jbrout, a photo manager using IPTC keywords/EXIF

Added:
   nixpkgs/trunk/pkgs/applications/graphics/jbrout/
   nixpkgs/trunk/pkgs/applications/graphics/jbrout/default.nix
   nixpkgs/trunk/pkgs/development/python-modules/pyexiv2/
   nixpkgs/trunk/pkgs/development/python-modules/pyexiv2/default.nix
Modified:
   nixpkgs/trunk/pkgs/top-level/all-packages.nix

Added: nixpkgs/trunk/pkgs/applications/graphics/jbrout/default.nix
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/applications/graphics/jbrout/default.nix Mon Aug 22 
20:26:11 2011(r28759)
@@ -0,0 +1,38 @@
+{ stdenv, fetchsvn, buildPythonPackage, python, pyGtkGlade, makeWrapper, 
pyexiv2, lxml, pil, fbida, which }:
+
+buildPythonPackage {
+  name = "jbrout-338";
+  version = "338";
+  src = fetchsvn {
+url = "http://jbrout.googlecode.com/svn/trunk";;
+rev = "338";
+sha256 = "0257ni4vkxgd0qhs73fw5ppw1qpf11j8fgwsqc03b1k1yv3hk4hf";
+  };
+
+  doCheck = false;
+# XXX: preConfigure to avoid this
+#  File 
"/nix/store/vnyjxn6h3rbrn49m25yyw7i1chlxglhw-python-2.7.1/lib/python2.7/zipfile.py",
 line 348, in FileHeader
+#len(filename), len(extra))
+#struct.error: ushort format requires 0 <= number <= USHRT_MAX
+
+  preConfigure = ''
+find | xargs touch
+  '';
+
+  postInstall = ''
+ensureDir $out/bin
+echo '#!/bin/sh' > $out/bin/jbrout
+echo "python 
$out/lib/python2.7/site-packages/jbrout-src-py2.7.egg/jbrout/jbrout.py" >> 
$out/bin/jbrout
+chmod +x $out/bin/jbrout
+
+wrapProgram $out/bin/jbrout \
+--set PYTHONPATH "$out/lib/python:$(toPythonPath 
${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pyexiv2}):$(toPythonPath 
${lxml}):$(toPythonPath ${pil}):$PYTHONPATH" \
+--set PATH "${fbida}/bin:${which}/bin:$PATH"
+  '';
+
+  buildInputs = [ python pyGtkGlade makeWrapper pyexiv2 lxml pil fbida which ];
+  meta = {
+homepage = "http://code.google.com/p/jbrout";;
+description = "jBrout is a photo manager";
+  };
+}

Added: nixpkgs/trunk/pkgs/development/python-modules/pyexiv2/default.nix
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/python-modules/pyexiv2/default.nix   Mon Aug 
22 20:26:11 2011(r28759)
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, python, exiv2, scons, boost }:
+
+let version = "0.3.0"; in
+
+stdenv.mkDerivation {
+  name = "pyexiv2-${version}";
+  
+  src = fetchurl {
+url = 
"http://launchpad.net/pyexiv2/0.3.x/0.3/+download/pyexiv2-0.3.0.tar.bz2";;
+sha256 = "1y7r2z0ja166cx8fmykq7gaif02drknqqbxaf18fhv9nmgz4jrg9";
+  };
+
+  buildPhase = ''
+sed -i -e "s@env = Environment()@env = Environment( ENV = os.environ )@" 
src/SConscript
+scons
+  '';
+  installPhase = ''
+sed -i -e "s@python_lib_path = get_python_lib(plat_specific=True)@
python_lib_path = \'/lib/python2.7/site-packages\'@" src/SConscript
+scons install DESTDIR=$out
+  '';
+
+  buildInputs = [ python exiv2 scons boost ];
+}

Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix   Mon Aug 22 19:46:09 
2011(r28758)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix   Mon Aug 22 20:26:11 
2011(r28759)
@@ -4709,6 +4709,8 @@
 
   pycups = callPackage ../development/python-modules/pycups { };
 
+  pyexiv2 = callPackage ../development/python-modules/pyexiv2 { };
+
   pygame = callPackage ../development/python-modules/pygame { };
 
   pygobject = callPackage ../development/python-modules/pygobject { };
@@ -6765,6 +6767,10 @@
 
   joe = callPackage ../applications/editors/joe { };
 
+  jbrout = callPackage ../applications/graphics/jbrout {
+inherit (pythonPackages) lxml;
+  };
+
   jwm = callPackage ../applications/window-managers/jwm { };
 
   k3b = newScope pkgs.kde4 ../applications/misc/k3b { };
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r28758 - nixpkgs/trunk/pkgs/development/libraries/haskell/attoparsec

2011-08-22 Thread Peter Simons 
Author: simons
Date: Mon Aug 22 19:46:09 2011
New Revision: 28758
URL: https://svn.nixos.org/websvn/nix/?rev=28758&sc=1

Log:
haskell-attoparsec: updated to version 0.9.1.2

Modified:
   nixpkgs/trunk/pkgs/development/libraries/haskell/attoparsec/default.nix

Modified: 
nixpkgs/trunk/pkgs/development/libraries/haskell/attoparsec/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/attoparsec/default.nix 
Mon Aug 22 17:40:07 2011(r28757)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/attoparsec/default.nix 
Mon Aug 22 19:46:09 2011(r28758)
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "attoparsec";
-  version = "0.9.1.1";
-  sha256 = "1qkkl9pzk4znqh34pchmxbcslybvii35lkxhwf6445lyhj20356b";
+  version = "0.9.1.2";
+  sha256 = "0h9j4gn376k6j3v9l6pk7a4vxabkwk80043x6xlyxsh8p77jgj3v";
   buildDepends = [ deepseq ];
   meta = {
 homepage = "https://bitbucket.org/bos/attoparsec";;
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] Hydra job nixpkgs:trunk:tarball build 1270219: Failed with non-zero exit code

2011-08-22 Thread Hydra Build Daemon 
Hi,

This is to let you know that Hydra build 1270219 of job nixpkgs:trunk:tarball 
has changed from 'Success' to 'Failed with non-zero exit code'.

Complete build information can be found on this page: 
http://hydra.nixos.org/build/1270219

The last 50 lines of the build log are shown at the bottom of this email.

A summary of the build information follows:

Build ID:  | 1270219
Nix name:  | nixpkgs-tarball-0pre28757
Short description: | Build of a source distribution from a checkout
Maintainer(s): | Nix Committers 
System:| x86_64-linux
Derivation store path: | 
/nix/store/4mm6sp7jk9grlc0nqq242kiz0gk6xs4p-nixpkgs-tarball-0pre28757.drv
Output store path: | 
/nix/store/zkrcw8fy2zfijrsk9pmg8v1ca9d7aplb-nixpkgs-tarball-0pre28757
Time added:| 2011-08-22 20:14:39
Build started: | 2011-08-22 20:13:32
Build finished:| 2011-08-22 20:14:39
Duration:  | 67s

The build inputs were:

Name| Type| Value
+-+
nixpkgs | svn | https://svn.nixos.org/repos/nix/nixpkgs/trunk:28757
officialRelease | boolean | false

Regards,

The Hydra build daemon.

---
trace: vwm
trace: vxl
trace: w3cCSSValidator
trace: w3m
trace: wakelan
trace: warmux
trace: warsow
trace: warzone2100
trace: wavemon
trace: wdiff
trace: webdruid
trace: webkit
trace: weechat
trace: wesnoth
trace: wget
trace: which
trace: wicd
trace: widelands
trace: wine
trace: wineWarcraft
trace: wings
trace: wirelesstools
trace: wireshark
trace: wordnet
trace: wpa_supplicant
trace: wvdial
trace: wvstreams
trace: wxGTK
trace: wxmaxima
trace: x11_ssh_askpass
trace: xbase
trace: xbindkeys
trace: xchm
trace: xcompmgr
trace: xconq
trace: xdaliclock
trace: xdg_utils
trace: xdotool
trace: xen
trace: xf86_input_wacom
trace: xfce
trace: glib
trace: gtk
trace: xfce4
trace: gtk_xfce_engine
error: evaluation aborted with the following error message: `cannot find 
attribute `xfce4.gtk_xfce_engine''
(use `--show-trace' to show detailed location information)
build time elapsed:  0m0.019s 0m0.013s 0m50.567s 0m8.183s
builder for 
`/nix/store/4mm6sp7jk9grlc0nqq242kiz0gk6xs4p-nixpkgs-tarball-0pre28757.drv' 
failed with exit code 1
error: build of 
`/nix/store/4mm6sp7jk9grlc0nqq242kiz0gk6xs4p-nixpkgs-tarball-0pre28757.drv' 
failed
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r28757 - in nixpkgs/trunk/pkgs: desktops/xfce-4 desktops/xfce-4.6 top-level

2011-08-22 Thread Eelco Dolstra 
Author: eelco
Date: Mon Aug 22 17:40:07 2011
New Revision: 28757
URL: https://svn.nixos.org/websvn/nix/?rev=28757&sc=1

Log:
* Rename xfce-4 to xfce-4.6 in preparation for Xfce 4.8.

Added:
   nixpkgs/trunk/pkgs/desktops/xfce-4.6/
  - copied from r28724, nixpkgs/trunk/pkgs/desktops/xfce-4/
Deleted:
   nixpkgs/trunk/pkgs/desktops/xfce-4/
Modified:
   nixpkgs/trunk/pkgs/top-level/all-packages.nix

Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix   Mon Aug 22 17:38:57 
2011(r28756)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix   Mon Aug 22 17:40:07 
2011(r28757)
@@ -7876,11 +7876,11 @@
 inherit (gtkLibs) glib gtk;
   };
 
-  xfce = xfce4;
+  xfce = xfce46;
 
-  xfce4 = recurseIntoAttrs
-(let callPackage = newScope pkgs.xfce4; in
- import ../desktops/xfce-4 { inherit callPackage pkgs; });
+  xfce46 = recurseIntoAttrs
+(let callPackage = newScope pkgs.xfce46; in
+ import ../desktops/xfce-4.6 { inherit callPackage pkgs; });
 
 
   ### SCIENCE
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r28755 - in configurations/trunk/misc/raskin: . lesser-expressions

2011-08-22 Thread Michael Raskin 
Author: raskin
Date: Mon Aug 22 17:38:54 2011
New Revision: 28755
URL: https://svn.nixos.org/websvn/nix/?rev=28755&sc=1

Log:
updates - moslty to package set

Modified:
   configurations/trunk/misc/raskin/filesystems-asus-n53j.nix
   configurations/trunk/misc/raskin/lesser-expressions/raskin-user.nix
   configurations/trunk/misc/raskin/package-groups.nix
   configurations/trunk/misc/raskin/raskin-asus-n53j.nix
   configurations/trunk/misc/raskin/services-main.nix

Modified: configurations/trunk/misc/raskin/filesystems-asus-n53j.nix
==
--- configurations/trunk/misc/raskin/filesystems-asus-n53j.nix  Mon Aug 22 
17:38:53 2011(r28754)
+++ configurations/trunk/misc/raskin/filesystems-asus-n53j.nix  Mon Aug 22 
17:38:54 2011(r28755)
@@ -64,10 +64,10 @@
   device="debugfs";
   fsType = "debugfs";
 }
-{ mountPoint = "/dev/cgroup/cpu";
+{ mountPoint = "/dev/cgroup/";
   device = "cgroup";
   fsType = "cgroup";
-  options = "cpu";
+  options = "cpu,ns,cpuset,freezer,devices";
   autocreate = true;
 }
   ]

Modified: configurations/trunk/misc/raskin/lesser-expressions/raskin-user.nix
==
--- configurations/trunk/misc/raskin/lesser-expressions/raskin-user.nix Mon Aug 
22 17:38:53 2011(r28754)
+++ configurations/trunk/misc/raskin/lesser-expressions/raskin-user.nix Mon Aug 
22 17:38:54 2011(r28755)
@@ -25,7 +25,6 @@
{name="xkill"; path=xorg.xkill;}
{name="vim"; path=customVim pkgs;}
{name="uzbl"; path=uzbl.passthru.function { src = ("" + 
/var/repos/uzbl + "/"); };}
-   {name="kdebindings"; path=kde4.kdebindings;}
{name="ant+jdk-1.5"; path=symlinkJoin "ant+jdk-1.5" [jdk5 
(apacheAnt.override {jdk=jdk5;})];}
] ++ (map justUse ["mesa" "freeglut" "cairo" "nss" "gsl"
"libev" "libuuid" "pyxml" "libxml2" "zlib" "rubygems" 
@@ -39,6 +38,7 @@
"dejavu_fonts" "e2fsprogs" "dmtx" "qt4"
#"empathy" 
"hicolor_icon_theme" "libfixposix" "plan9port"
+   "pygtk" "pygobject" "pycairo"
])
++ 
[

Modified: configurations/trunk/misc/raskin/package-groups.nix
==
--- configurations/trunk/misc/raskin/package-groups.nix Mon Aug 22 17:38:53 
2011(r28754)
+++ configurations/trunk/misc/raskin/package-groups.nix Mon Aug 22 17:38:54 
2011(r28755)
@@ -38,11 +38,11 @@
 
xsane saneBackends saneFrontends gphoto2 gphoto2fs
 
-   gpm setserial gnokii 
+   gpm setserial gnokii v4l_utils
 
fbterm dd_rescue ddrescue baseKernel.kernelPackages.kernel
 
-   blueman bluez
+   blueman bluez acpi acpitool
 
hplip foo2zjs foomatic_filters
 
@@ -81,7 +81,7 @@
sshfsFuse fuse fusesmb ntfs3g
glusterfs smbnetfs
 
-   # (pkgs.linuxPackagesFor baseKernel).aufs2_util
+   #(pkgs.linuxPackagesFor baseKernel).aufs2_1_util
];
 
networkTools 
@@ -89,15 +89,15 @@
iputils ncat wpa_supplicant iproute lftp  
iptables samba wget telnet nmap ntp nc6
socat2pre msf dhcp gvpe bridge_utils mtr
-   ndisc6 vlan wavemon openvpn iperf
+   ndisc6 vlan wavemon openvpn iperf vde2
];
 
 browsers = [
  opera chromeWrapper
-  #firefox36Wrapper 
- mozplugger firefox40Pkgs.xulrunner
- (wrapFirefox firefox40Pkgs.firefox "firefox" "4")
- (wrapFirefox firefox50Pkgs.firefox "firefox" "")
+ mozplugger
+ 
+ (wrapFirefox firefox50Pkgs.firefox "firefox" "5")
+ (wrapFirefox firefox70b1Pkgs.firefox "firefox" "")
];
 
graphicEdit = [
@@ -193,7 +193,7 @@
gst_all.gstPluginsBase
gst_all.gstPluginsGood
gst_all.gstFfmpeg
-   xineUI espeak lame
+   xineUI espeak lame flite
];
 
buildSupport = [
@@ -232,12 +232,12 @@
# gdmap - disk usage and its accumulation through
# directory tree
 
-   gdmap xfig gnuplot /*freemind*/ transfig xxdiff
-   gqview pqiv webkit dia midori /*xawtv*/ 
+   gdmap xfig gnuplot freemind transfig xxdiff
+   gqview pqiv webkit dia midori 
gnome.zenity xclip welkin
/*netsurfBrowser*/ geeqie
gosmore tulip merkaartor
-   pp.uzbl sonicVisualiser
+   pp.uzbl /*sonic_visualiser*/
];
 
clientServer = [
@@ -269,7 +269,7 @@
inetu

[Nix-commits] SVN commit: nix - r28756 - nixpkgs/trunk/maintainers/scripts/gnu

2011-08-22 Thread Ludovic Courtès 
Author: ludo
Date: Mon Aug 22 17:38:57 2011
New Revision: 28756
URL: https://svn.nixos.org/websvn/nix/?rev=28756&sc=1

Log:
gnupdate: Update the list of ignored packages.

* maintainers/scripts/gnu/gnupdate (%ignored-package-attributes):
  Update.

Modified:
   nixpkgs/trunk/maintainers/scripts/gnu/gnupdate

Modified: nixpkgs/trunk/maintainers/scripts/gnu/gnupdate
==
--- nixpkgs/trunk/maintainers/scripts/gnu/gnupdate  Mon Aug 22 17:38:54 
2011(r28755)
+++ nixpkgs/trunk/maintainers/scripts/gnu/gnupdate  Mon Aug 22 17:38:57 
2011(r28756)
@@ -553,7 +553,9 @@
 "automake110x"
 "bison1875"
 "bison23"
-"bison" ;; = 2.3
+"bison24"
+"bison" ;; = 2.4
+"ccrtp_1_8"
 "emacs22"
 "emacsSnapshot"
 "gcc295"
@@ -581,6 +583,8 @@
 "icecat3Xul" ;; redundant with `icecat'
 "icecatWrapper"
 "icecatXulrunner3"
+"libzrtpcpp_1_6"
+"parted_2_3"
 ))
 
 (define (gnu? package)
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r28754 - nixpkgs/trunk/pkgs/tools/X11/xnee

2011-08-22 Thread Ludovic Courtès 
Author: ludo
Date: Mon Aug 22 17:38:53 2011
New Revision: 28754
URL: https://svn.nixos.org/websvn/nix/?rev=28754&sc=1

Log:
GNU Xnee 3.10.

Modified:
   nixpkgs/trunk/pkgs/tools/X11/xnee/default.nix

Modified: nixpkgs/trunk/pkgs/tools/X11/xnee/default.nix
==
--- nixpkgs/trunk/pkgs/tools/X11/xnee/default.nix   Mon Aug 22 17:38:49 
2011(r28753)
+++ nixpkgs/trunk/pkgs/tools/X11/xnee/default.nix   Mon Aug 22 17:38:53 
2011(r28754)
@@ -2,17 +2,17 @@
 , gtk, libXi, inputproto, pkgconfig, recordproto, texinfo }:
 
 stdenv.mkDerivation rec {
-  name = "xnee-3.09";
+  name = "xnee-3.10";
 
   src = fetchurl {
 url = "mirror://gnu/xnee/${name}.tar.gz";
-sha256 = "08171scqiqzgmbq03rwjvlsakvw9cqrr7h3b743j14z4jzbasi8i";
+sha256 = "0mkbp0gikm1mv9g2v0vs7krinkz392p1crvaira8ml9q94py0q32";
   };
 
   patchPhase =
 '' for i in `find cnee/test -name \*.sh`
do
- sed -i "$i" -e's|/bin/bash|/bin/sh|g'
+ sed -i "$i" -e's|/bin/bash|/bin/sh|g ; s|/usr/bin/env bash|/bin/sh|g'
done
 '';
 
@@ -24,7 +24,7 @@
 
   configureFlags =
 # Do a static build because `libxnee' doesn't get installed anyway.
-[ "--disable-gnome-applet" "--disable-shared" "--enable-static" ];
+[ "--disable-gnome-applet" "--enable-static" ];
 
   # `cnee' is linked without `-lXi' and as a consequence has a RUNPATH that
   # lacks libXi.
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r28753 - nixpkgs/trunk/pkgs/tools/misc/parallel

2011-08-22 Thread Ludovic Courtès 
Author: ludo
Date: Mon Aug 22 17:38:49 2011
New Revision: 28753
URL: https://svn.nixos.org/websvn/nix/?rev=28753&sc=1

Log:
GNU Parallel 20110822.

Modified:
   nixpkgs/trunk/pkgs/tools/misc/parallel/default.nix

Modified: nixpkgs/trunk/pkgs/tools/misc/parallel/default.nix
==
--- nixpkgs/trunk/pkgs/tools/misc/parallel/default.nix  Mon Aug 22 17:38:45 
2011(r28752)
+++ nixpkgs/trunk/pkgs/tools/misc/parallel/default.nix  Mon Aug 22 17:38:49 
2011(r28753)
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, perl }:
 
 stdenv.mkDerivation rec {
-  name = "parallel-20110622";
+  name = "parallel-20110822";
 
   src = fetchurl {
 url = "mirror://gnu/parallel/${name}.tar.bz2";
-sha256 = "1fy2csbkcd4hiivsx6qn5hppqazyff5n83c5c8s5dzbnkj0lmczr";
+sha256 = "0ryj97b9w2mzvmnqhkh384s59v62gf0vlyj8qphiy34505x5pznb";
   };
 
   patchPhase =
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r28752 - nixpkgs/trunk/pkgs/tools/security/gnupg

2011-08-22 Thread Ludovic Courtès 
Author: ludo
Date: Mon Aug 22 17:38:45 2011
New Revision: 28752
URL: https://svn.nixos.org/websvn/nix/?rev=28752&sc=1

Log:
GnuPG 2.0.18.

Modified:
   nixpkgs/trunk/pkgs/tools/security/gnupg/default.nix

Modified: nixpkgs/trunk/pkgs/tools/security/gnupg/default.nix
==
--- nixpkgs/trunk/pkgs/tools/security/gnupg/default.nix Mon Aug 22 17:38:37 
2011(r28751)
+++ nixpkgs/trunk/pkgs/tools/security/gnupg/default.nix Mon Aug 22 17:38:45 
2011(r28752)
@@ -13,11 +13,11 @@
 assert useCurl -> (curl != null);
 
 stdenv.mkDerivation rec {
-  name = "gnupg-2.0.17";
+  name = "gnupg-2.0.18";
 
   src = fetchurl {
 url = "mirror://gnupg/gnupg/${name}.tar.bz2";
-sha256 = "19pf74hv26mis8wiq92ljlgmin6pv1m6qyf5h66wr5rgrdg9sr7a";
+sha256 = "0nxf5nbgxi5splnw6xww5iy6sw367kz9x1cy5aaznhx45ivdvbj8";
   };
 
   buildInputs = [ readline zlib libgpgerror pth libgcrypt libassuan libksba ]
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r28751 - nixpkgs/trunk/pkgs/tools/cd-dvd/xorriso

2011-08-22 Thread Ludovic Courtès 
Author: ludo
Date: Mon Aug 22 17:38:37 2011
New Revision: 28751
URL: https://svn.nixos.org/websvn/nix/?rev=28751&sc=1

Log:
GNU Xorriso 1.1.4.

Modified:
   nixpkgs/trunk/pkgs/tools/cd-dvd/xorriso/default.nix

Modified: nixpkgs/trunk/pkgs/tools/cd-dvd/xorriso/default.nix
==
--- nixpkgs/trunk/pkgs/tools/cd-dvd/xorriso/default.nix Mon Aug 22 17:38:33 
2011(r28750)
+++ nixpkgs/trunk/pkgs/tools/cd-dvd/xorriso/default.nix Mon Aug 22 17:38:37 
2011(r28751)
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, libcdio, zlib, bzip2, readline, acl }:
 
 stdenv.mkDerivation rec {
-  name = "xorriso-1.1.0.pl01";
+  name = "xorriso-1.1.4";
 
   src = fetchurl {
 url = "mirror://gnu/xorriso/${name}.tar.gz";
-sha256 = "0718p8acgn46zms0672xlaxav1acj79wsy5yif6gai5s62zw18l9";
+sha256 = "0zxmln5kw5prqrs8bahwz4lhvl914xphsjizlz3nr9y2l39350j8";
   };
 
   doCheck = true;
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r28750 - nixpkgs/trunk/pkgs/servers/http/myserver

2011-08-22 Thread Ludovic Courtès 
Author: ludo
Date: Mon Aug 22 17:38:33 2011
New Revision: 28750
URL: https://svn.nixos.org/websvn/nix/?rev=28750&sc=1

Log:
GNU MyServer 0.11.

Modified:
   nixpkgs/trunk/pkgs/servers/http/myserver/default.nix

Modified: nixpkgs/trunk/pkgs/servers/http/myserver/default.nix
==
--- nixpkgs/trunk/pkgs/servers/http/myserver/default.nixMon Aug 22 
17:38:29 2011(r28749)
+++ nixpkgs/trunk/pkgs/servers/http/myserver/default.nixMon Aug 22 
17:38:33 2011(r28750)
@@ -1,17 +1,17 @@
 { fetchurl, stdenv, libgcrypt, libevent, libidn, gnutls
 , libxml2, zlib, guile, texinfo, cppunit, xz, psmisc }:
 
-let version = "0.10"; in
+let version = "0.11"; in
   stdenv.mkDerivation (rec {
 name = "myserver-${version}";
 
 src = fetchurl {
   url = "mirror://gnu/myserver/${version}/${name}.tar.xz";
-  sha256 = "0w8njgka54if8ycd9cyxgmqa0ivv7r0rka7gda3x2rfr2z4nxvpb";
+  sha256 = "02y3vv4hxpy5h710y79s8ipzshhc370gbz1wm85x0lnq5nqxj2ax";
 };
 
 patches =
-  [ ./disable-dns-lookup-in-chroot.patch ./installable-binary.patch ];
+  [ ./disable-dns-lookup-in-chroot.patch ];
 
 buildInputs =
   [ libgcrypt libevent libidn gnutls libxml2 zlib guile texinfo xz ]
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r28749 - nixpkgs/trunk/pkgs/development/libraries/gnutls

2011-08-22 Thread Ludovic Courtès 
Author: ludo
Date: Mon Aug 22 17:38:29 2011
New Revision: 28749
URL: https://svn.nixos.org/websvn/nix/?rev=28749&sc=1

Log:
gnutls fix

Modified:
   nixpkgs/trunk/pkgs/development/libraries/gnutls/default.nix

Modified: nixpkgs/trunk/pkgs/development/libraries/gnutls/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/gnutls/default.nix Mon Aug 22 
17:38:24 2011(r28748)
+++ nixpkgs/trunk/pkgs/development/libraries/gnutls/default.nix Mon Aug 22 
17:38:29 2011(r28749)
@@ -24,10 +24,10 @@
 else ""}
   '';
 
-  buildInputs = [ xz zlib lzo libtasn1 ]
+  buildInputs = [ xz zlib lzo ]
 ++ stdenv.lib.optional guileBindings guile;
 
-  propagatedBuildInputs = [ nettle ];
+  propagatedBuildInputs = [ nettle libtasn1 ];
 
   doCheck = true;
 
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r28748 - nixpkgs/trunk/pkgs/servers/sip/sipwitch

2011-08-22 Thread Ludovic Courtès 
Author: ludo
Date: Mon Aug 22 17:38:24 2011
New Revision: 28748
URL: https://svn.nixos.org/websvn/nix/?rev=28748&sc=1

Log:
GNU SIP Witch 1.1.1.

Modified:
   nixpkgs/trunk/pkgs/servers/sip/sipwitch/default.nix

Modified: nixpkgs/trunk/pkgs/servers/sip/sipwitch/default.nix
==
--- nixpkgs/trunk/pkgs/servers/sip/sipwitch/default.nix Mon Aug 22 17:38:20 
2011(r28747)
+++ nixpkgs/trunk/pkgs/servers/sip/sipwitch/default.nix Mon Aug 22 17:38:24 
2011(r28748)
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, pkgconfig, ucommon, libosip, libexosip, gnutls, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "sipwitch-1.0.3";
+  name = "sipwitch-1.1.1";
 
   src = fetchurl {
 url = "mirror://gnu/sipwitch/${name}.tar.gz";
-sha256 = "0mip2bwgavmflg30zcq3nzbg3js12wixkivxvbsnai9vfllaapw0";
+sha256 = "14irv1zda6xjsrizc0dvy85fcjx3szbb94jkh3q4s20ywc4s41kx";
   };
 
   buildInputs = [ pkgconfig ucommon libosip libexosip gnutls zlib ];
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r28747 - nixpkgs/trunk/pkgs/development/libraries/ucommon

2011-08-22 Thread Ludovic Courtès 
Author: ludo
Date: Mon Aug 22 17:38:20 2011
New Revision: 28747
URL: https://svn.nixos.org/websvn/nix/?rev=28747&sc=1

Log:
GNU uCommon C++ 5.0.5.

Modified:
   nixpkgs/trunk/pkgs/development/libraries/ucommon/default.nix

Modified: nixpkgs/trunk/pkgs/development/libraries/ucommon/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/ucommon/default.nixMon Aug 
22 17:38:16 2011(r28746)
+++ nixpkgs/trunk/pkgs/development/libraries/ucommon/default.nixMon Aug 
22 17:38:20 2011(r28747)
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, gnutls, pkgconfig, zlib, libgcrypt }:
 
 stdenv.mkDerivation rec {
-  name = "ucommon-5.0.3";
+  name = "ucommon-5.0.5";
 
   src = fetchurl {
-url = mirror://gnu/commoncpp/ucommon-5.0.3.tar.gz;
-sha256 = "0i2mc15hcjbdq796wxzjric238w071kj3g2lzvxbx4vrinn8204g";
+url = mirror://gnu/commoncpp/ucommon-5.0.5.tar.gz;
+sha256 = "0rpq6qkhzcsls2rmnf1p1dnf9vyzmgw0cips3hl82mh0w5d70253";
   };
 
   buildInputs = [ pkgconfig gnutls zlib ];
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r28746 - nixpkgs/trunk/pkgs/development/libraries/nettle

2011-08-22 Thread Ludovic Courtès 
Author: ludo
Date: Mon Aug 22 17:38:16 2011
New Revision: 28746
URL: https://svn.nixos.org/websvn/nix/?rev=28746&sc=1

Log:
GNU Nettle 2.2.

Modified:
   nixpkgs/trunk/pkgs/development/libraries/nettle/default.nix

Modified: nixpkgs/trunk/pkgs/development/libraries/nettle/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/nettle/default.nix Mon Aug 22 
17:38:12 2011(r28745)
+++ nixpkgs/trunk/pkgs/development/libraries/nettle/default.nix Mon Aug 22 
17:38:16 2011(r28746)
@@ -1,12 +1,12 @@
 { fetchurl, stdenv, gmp, gnum4 }:
 
 stdenv.mkDerivation rec {
-  name = "nettle-2.1";
+  name = "nettle-2.2";
 
   src = fetchurl {
 # Eventually use `mirror://gnu/'.
 url = "ftp://ftp.lysator.liu.se/pub/security/lsh/${name}.tar.gz";;
-sha256 = "0knp778738dpgbcj1yz54a7jsvmarfiafzl05z086bc470z6plmp";
+sha256 = "1kdl842x1x4wk80bi0k1d2ci8hqsmgjdb5zvrlmyakb8pfhw3gl2";
   };
 
   buildInputs = [ gnum4 ];
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r28745 - nixpkgs/trunk/pkgs/development/libraries/glpk

2011-08-22 Thread Ludovic Courtès 
Author: ludo
Date: Mon Aug 22 17:38:12 2011
New Revision: 28745
URL: https://svn.nixos.org/websvn/nix/?rev=28745&sc=1

Log:
GLPK 4.46.

Modified:
   nixpkgs/trunk/pkgs/development/libraries/glpk/default.nix

Modified: nixpkgs/trunk/pkgs/development/libraries/glpk/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/glpk/default.nix   Mon Aug 22 
17:38:08 2011(r28744)
+++ nixpkgs/trunk/pkgs/development/libraries/glpk/default.nix   Mon Aug 22 
17:38:12 2011(r28745)
@@ -1,11 +1,11 @@
 { fetchurl, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "glpk-4.45";
+  name = "glpk-4.46";
 
   src = fetchurl {
 url = "mirror://gnu/glpk/${name}.tar.gz";
-sha256 = "13797cvyrvhga22klap9y370dlbnh40z5cf1dfkdjdj47mhwn1wj";
+sha256 = "0hijkq44yxbq017wxqh441zz2rpdap6x1brp122i6s7hca147gpv";
   };
 
   doCheck = true;
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r28744 - nixpkgs/trunk/pkgs/development/libraries/ccrtp

2011-08-22 Thread Ludovic Courtès 
Author: ludo
Date: Mon Aug 22 17:38:08 2011
New Revision: 28744
URL: https://svn.nixos.org/websvn/nix/?rev=28744&sc=1

Log:
GNU ccRTP 2.0.1.

Modified:
   nixpkgs/trunk/pkgs/development/libraries/ccrtp/default.nix

Modified: nixpkgs/trunk/pkgs/development/libraries/ccrtp/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/ccrtp/default.nix  Mon Aug 22 
17:38:04 2011(r28743)
+++ nixpkgs/trunk/pkgs/development/libraries/ccrtp/default.nix  Mon Aug 22 
17:38:08 2011(r28744)
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, openssl, pkgconfig, libgcrypt, ucommon }:
 
 stdenv.mkDerivation {
-  name = "ccrtp-2.0.0";
+  name = "ccrtp-2.0.1";
 
   src = fetchurl {
-url = mirror://gnu/ccrtp/ccrtp-2.0.0.tar.gz;
-sha256 = "1gx3jsywvihwkhk69xkcpq2plb6lbylpz0gpg55c5dx7xg1796b2";
+url = mirror://gnu/ccrtp/ccrtp-2.0.1.tar.gz;
+sha256 = "0wksiq55zq8yvjgzkaxyg15w9kfr4sni8a0yqk11qdqpl8x0al9x";
   };
 
   buildInputs = [ openssl pkgconfig libgcrypt ucommon ];
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r28743 - nixpkgs/trunk/pkgs/development/libraries/gnutls

2011-08-22 Thread Ludovic Courtès 
Author: ludo
Date: Mon Aug 22 17:38:04 2011
New Revision: 28743
URL: https://svn.nixos.org/websvn/nix/?rev=28743&sc=1

Log:
GnuTLS 3.0.1.

Added:
   
nixpkgs/trunk/pkgs/development/libraries/gnutls/fix-guile-priorities-test.patch
Modified:
   nixpkgs/trunk/pkgs/development/libraries/gnutls/default.nix

Modified: nixpkgs/trunk/pkgs/development/libraries/gnutls/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/gnutls/default.nix Mon Aug 22 
17:37:59 2011(r28742)
+++ nixpkgs/trunk/pkgs/development/libraries/gnutls/default.nix Mon Aug 22 
17:38:04 2011(r28743)
@@ -1,27 +1,30 @@
-{ fetchurl, stdenv, zlib, lzo, libtasn1, nettle
+{ fetchurl, stdenv, xz, zlib, lzo, libtasn1, nettle
 , guileBindings, guile }:
 
 assert guileBindings -> guile != null;
 
 stdenv.mkDerivation rec {
 
-  name = "gnutls-2.12.7";
+  name = "gnutls-3.0.1";
 
   src = fetchurl {
-url = "mirror://gnu/gnutls/${name}.tar.bz2";
-sha256 = "09vmm1b2iypwk5vh0adyqzra7sgx5hb9xyr1wjncv7947bk4zn3p";
+url = "mirror://gnu/gnutls/${name}.tar.xz";
+sha256 = "1z3dqjv8zvma2adbwbcw704zf91hazz8ilmxy91gkrdpi5z2kpz2";
   };
 
+  patches = [ ./fix-guile-priorities-test.patch ];
+
   configurePhase = ''
 ./configure --prefix="$out" \
   --disable-dependency-tracking --enable-fast-install   \
+  --without-p11-kit \
   --with-lzo --with-libtasn1-prefix="${libtasn1}"  \
   ${if guileBindings
 then "--enable-guile --with-guile-site-dir=\"$out/share/guile/site\""
 else ""}
   '';
 
-  buildInputs = [ zlib lzo libtasn1 ]
+  buildInputs = [ xz zlib lzo libtasn1 ]
 ++ stdenv.lib.optional guileBindings guile;
 
   propagatedBuildInputs = [ nettle ];

Added: 
nixpkgs/trunk/pkgs/development/libraries/gnutls/fix-guile-priorities-test.patch
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ 
nixpkgs/trunk/pkgs/development/libraries/gnutls/fix-guile-priorities-test.patch 
Mon Aug 22 17:38:04 2011(r28743)
@@ -0,0 +1,80 @@
+commit 10115e3fb9c36abcce95bd8f74d212d068cbddce (HEAD, refs/heads/gnutls_3_0_x)
+Author: Ludovic Courtès 
+Date:   Mon Aug 22 18:17:10 2011 +0200
+
+guile: Fix `priorities' test to use `run-test'.
+
+This is a followup to commit cd7b8102316cd4151356c4b2b7909c7435593890
+("guile: Fix tests to match the `exit' behavior introduced in Guile
+2.0.1.").
+
+   Modified guile/tests/priorities.scm
+diff --git a/guile/tests/priorities.scm b/guile/tests/priorities.scm
+index 1ee072b..2af837e 100644
+--- a/guile/tests/priorities.scm
 b/guile/tests/priorities.scm
+@@ -24,6 +24,8 @@
+ ;;;
+ 
+ (use-modules (gnutls)
++ (gnutls build tests)
++ (srfi srfi-1)
+  (srfi srfi-26))
+ 
+ (define %valid-priority-strings
+@@ -41,10 +43,7 @@
+ ("NONE:+VERS-TLS-ALL:+AES-128-CBC:"
+  . "+FAIL-HERE:+SHA1:+COMP-NULL:+SIGN-RSA-SHA1")))
+ 
+-(dynamic-wind
+-
+-(lambda ()
+-  #t)
++(run-test
+ 
+ (lambda ()
+   (let ((s (make-session connection-end/client)))
+@@ -52,25 +51,20 @@
+ (for-each (cut set-session-priorities! s <>)
+   %valid-priority-strings)
+ 
+-(for-each (lambda (prefix+suffix)
+-(let* ((prefix (car prefix+suffix))
+-   (suffix (cdr prefix+suffix))
+-   (pos(string-length prefix))
+-   (string (string-append prefix suffix)))
+-  (catch 'gnutls-error
+-(lambda ()
+-  (let ((s (make-session connection-end/client)))
+-(set-session-priorities! s string)))
+-(lambda (key err function error-location . unused)
+-  (or (and (eq? key 'gnutls-error)
+-   (eq? err error/invalid-request)
+-   (eq? function 'set-session-priorities!)
+-   (= error-location pos))
+-  (exit 1))
+-  %invalid-priority-strings)
+-
+-(exit 0)))
+-
+-(lambda ()
+-  ;; failure
+-  (exit 1)))
++(every (lambda (prefix+suffix)
++ (let* ((prefix (car prefix+suffix))
++(suffix (cdr prefix+suffix))
++(pos(string-length prefix))
++(string (string-append prefix suffix)))
++   (catch 'gnutls-error
++ (lambda ()
++   (let ((s (make-session connection-end/client)))
++ ;; The following call should raise an exception.
++ (set-session-priorities! s string)
++

[Nix-commits] SVN commit: nix - r28742 - nixpkgs/trunk/pkgs/development/libraries/aspell

2011-08-22 Thread Ludovic Courtès 
Author: ludo
Date: Mon Aug 22 17:37:59 2011
New Revision: 28742
URL: https://svn.nixos.org/websvn/nix/?rev=28742&sc=1

Log:
GNU Aspell 0.60.6.1.

Modified:
   nixpkgs/trunk/pkgs/development/libraries/aspell/default.nix

Modified: nixpkgs/trunk/pkgs/development/libraries/aspell/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/aspell/default.nix Mon Aug 22 
16:26:43 2011(r28741)
+++ nixpkgs/trunk/pkgs/development/libraries/aspell/default.nix Mon Aug 22 
17:37:59 2011(r28742)
@@ -1,14 +1,16 @@
 {stdenv, fetchurl, perl}:
 
 stdenv.mkDerivation rec {
-  name = "aspell-0.60.6";
-  
+  name = "aspell-0.60.6.1";
+
   src = fetchurl {
 url = "ftp://ftp.gnu.org/gnu/aspell/${name}.tar.gz";;
-sha256 = "0dhfgkp2y16z0agdvhn4iaikr34l4agjz2nannqvpxkcw8h1ansg";
+sha256 = "1qgn5psfyhbrnap275xjfrzppf5a83fb67gpql0kfqv37al869gm";
   };
-  
-  buildInputs = [perl];
+
+  buildInputs = [ perl ];
+
+  doCheck = true;
 
   # Note: Users should define the `ASPELL_CONF' environment variable to
   # `dict-dir $HOME/.nix-profile/lib/aspell/' so that they can access
@@ -20,6 +22,7 @@
   meta = {
 description = "GNU Aspell, A spell checker for many languages";
 homepage = http://aspell.net/;
-license = "LGPL";
+license = "LGPLv2+";
+maintainers = [ stdenv.lib.maintainers.ludo ];
   };
 }
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r28741 - configurations/trunk/tud

2011-08-22 Thread Eelco Dolstra 
Author: eelco
Date: Mon Aug 22 16:26:43 2011
New Revision: 28741
URL: https://svn.nixos.org/websvn/nix/?rev=28741&sc=1

Log:


Added:
   configurations/trunk/tud/wendy.nix
  - copied, changed from r28491, 
configurations/trunk/tud/build-machines-dell-r815.nix

Copied and modified: configurations/trunk/tud/wendy.nix (from r28491, 
configurations/trunk/tud/build-machines-dell-r815.nix)
==
--- configurations/trunk/tud/build-machines-dell-r815.nix   Thu Aug 11 
12:33:59 2011(r28491, copy source)
+++ configurations/trunk/tud/wendy.nix  Mon Aug 22 16:26:43 2011(r28741)
@@ -1,16 +1,47 @@
 { config, pkgs, ... }:
 
 {
-  boot.loader.grub.version = 2;
-  require = [ ./build-machines-common.nix ];
-  nixpkgs.system = "x86_64-linux";
-
-  boot.initrd.kernelModules = [ "megaraid_sas" "ext4" ];
-  boot.kernelModules = [ "acpi-cpufreq" "kvm-amd" ];
-
-  nix.maxJobs = 48;
-
-  fileSystems = [ 
-{ device = "none"; fsType = "tmpfs"; mountPoint = "/tmp"; options = 
"size=16G"; neededForBoot=true; } 
-  ];
+  require = [ ./build-machines-dell-r815.nix ];
+
+  services.httpd.enable = true;
+  services.httpd.adminAddr = "e.dols...@tudelft.nl";
+  services.httpd.enableUserDir = true;
+  services.httpd.hostName = "wendy";
+  services.httpd.extraConfig =
+''
+  UseCanonicalName On
+'';
+
+  jobs.mturk_webserver_production =
+{ name = "mturk-webserver-production";
+  startOn = "started network-interfaces";
+  exec = ''
+${pkgs.su}/bin/su - mturk -c 'MTURK_STATE=/home/mturk/state-production 
WEBINTERFACE_HOME=/home/mturk/icse-2012/src/WebInterface exec 
/home/mturk/icse-2012/src/WebInterface/script/webinterface_server.pl >> 
/home/mturk/state-production/webserver.log 2>&1'
+  '';
+};
+
+  jobs.mturk_webserver_sandbox =
+{ name = "mturk-webserver-sandbox";
+  startOn = "started network-interfaces";
+  exec = ''
+${pkgs.su}/bin/su - mturk -c 
'WEBINTERFACE_HOME=/home/mturk/icse-2012/src/WebInterface exec 
/home/mturk/icse-2012/src/WebInterface/script/webinterface_server.pl -p 3001 >> 
/home/mturk/state-sandbox/webserver.log 2>&1'
+  '';
+};
+
+  jobs.mturk_vnc_multiplexer_production =
+{ name = "mturk-vnc-multiplexer-production";
+  startOn = "started network-interfaces";
+  exec = ''
+${pkgs.su}/bin/su - mturk -c 'MTURK_STATE=/home/mturk/state-production 
exec vnc-multiplexer.pl >> /home/mturk/state-production/multiplexer.log 2>&1'
+  '';
+};
+
+  jobs.mturk_vnc_multiplexer_sandbox =
+{ name = "mturk-vnc-multiplexer-sandbox";
+  startOn = "started network-interfaces";
+  exec = ''
+${pkgs.su}/bin/su - mturk -c 'exec vnc-multiplexer.pl >> 
/home/mturk/state-sandbox/multiplexer.log 2>&1'
+  '';
+};
+
 }
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r28740 - nixpkgs/trunk/pkgs/tools/security/super

2011-08-22 Thread Eelco Dolstra 
Author: eelco
Date: Mon Aug 22 15:25:26 2011
New Revision: 28740
URL: https://svn.nixos.org/websvn/nix/?rev=28740&sc=1

Log:
* Remove unused dependency.

Modified:
   nixpkgs/trunk/pkgs/tools/security/super/default.nix

Modified: nixpkgs/trunk/pkgs/tools/security/super/default.nix
==
--- nixpkgs/trunk/pkgs/tools/security/super/default.nix Mon Aug 22 15:24:24 
2011(r28739)
+++ nixpkgs/trunk/pkgs/tools/security/super/default.nix Mon Aug 22 15:25:26 
2011(r28740)
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, groff }:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "super-3.30.0";
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r28739 - in nixpkgs/trunk/pkgs: tools/security/super top-level

2011-08-22 Thread Eelco Dolstra 
Author: eelco
Date: Mon Aug 22 15:24:24 2011
New Revision: 28739
URL: https://svn.nixos.org/websvn/nix/?rev=28739&sc=1

Log:
* Added super.

Added:
   nixpkgs/trunk/pkgs/tools/security/super/
   nixpkgs/trunk/pkgs/tools/security/super/default.nix
Modified:
   nixpkgs/trunk/pkgs/top-level/all-packages.nix

Added: nixpkgs/trunk/pkgs/tools/security/super/default.nix
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/tools/security/super/default.nix Mon Aug 22 15:24:24 
2011(r28739)
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, groff }:
+
+stdenv.mkDerivation rec {
+  name = "super-3.30.0";
+
+  src = fetchurl {
+name = "${name}.tar.gz";
+url = "http://ftp.ucolick.org/pub/users/will/${name}-tar.gz";;
+sha256 = "1sxgixx1yg7h8g9799v79rk15gb39gn7p7fx032c078wxx38qwq4";
+  };
+
+  NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE";
+
+  configureFlags = "--sysconfdir=/etc --localstatedir=/var";
+
+  installFlags = "sysconfdir=$(out)/etc localstatedir=$(TMPDIR)";
+
+  meta = {
+homepage = http://ftp.ucolick.org/pub/users/will/;
+description = "Allows users to execute scripts as if they were root";
+longDescription =
+  ''
+This package provides two commands: 1) “super”, which allows
+users to execute commands under a different uid/gid (specified
+in /etc/super.tab); and 2) “setuid”, which allows root to
+execute a command under a different uid.
+  '';
+  };  
+}

Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix   Mon Aug 22 12:20:31 
2011(r28738)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix   Mon Aug 22 15:24:24 
2011(r28739)
@@ -1323,8 +1323,9 @@
 
   sudo = callPackage ../tools/security/sudo { };
 
-  suidChroot = builderDefsPackage (import ../tools/system/suid-chroot) {
-  };
+  suidChroot = builderDefsPackage (import ../tools/system/suid-chroot) { };
+
+  super = callPackage ../tools/security/super { };
 
   ssmtp = callPackage ../tools/networking/ssmtp {
 tlsSupport = true;
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r28738 - nixpkgs/trunk/pkgs/development/libraries/haskell/mwc-random

2011-08-22 Thread Peter Simons 
Author: simons
Date: Mon Aug 22 12:20:31 2011
New Revision: 28738
URL: https://svn.nixos.org/websvn/nix/?rev=28738&sc=1

Log:
haskell-mwc-random: updated to version 0.10.0.1

Modified:
   nixpkgs/trunk/pkgs/development/libraries/haskell/mwc-random/default.nix

Modified: 
nixpkgs/trunk/pkgs/development/libraries/haskell/mwc-random/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/mwc-random/default.nix 
Mon Aug 22 11:54:23 2011(r28737)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/mwc-random/default.nix 
Mon Aug 22 12:20:31 2011(r28738)
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "mwc-random";
-  version = "0.10.0.0";
-  sha256 = "0pbzwq7jckjx0q7rpzhvjd2iam30yml0mwkz1jff8vl832z5xa8v";
+  version = "0.10.0.1";
+  sha256 = "0mmkl90rf57f2rxg3y2nibd37l9mwr2j4c71bwyvxqzfk7cylw9b";
   buildDepends = [ primitive time vector ];
   meta = {
 homepage = "https://github.com/bos/mwc-random";;
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r28737 - nixpkgs/trunk/pkgs/applications/office/hledger-interest

2011-08-22 Thread Peter Simons 
Author: simons
Date: Mon Aug 22 11:54:23 2011
New Revision: 28737
URL: https://svn.nixos.org/websvn/nix/?rev=28737&sc=1

Log:
haskell-hledger-interest: updated to version 1.2

Modified:
   nixpkgs/trunk/pkgs/applications/office/hledger-interest/default.nix

Modified: nixpkgs/trunk/pkgs/applications/office/hledger-interest/default.nix
==
--- nixpkgs/trunk/pkgs/applications/office/hledger-interest/default.nix Mon Aug 
22 11:54:16 2011(r28736)
+++ nixpkgs/trunk/pkgs/applications/office/hledger-interest/default.nix Mon Aug 
22 11:54:23 2011(r28737)
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hledger-interest";
-  version = "1.0";
-  sha256 = "082cyyyina7w5zvzsy1b9m9a7vb12ccxd351s8ajk11pg628zb80";
+  version = "1.2";
+  sha256 = "1r5x6z0k33fpvqba6zlkhpm7b0rwwnli4q100psms89x0rrj7y2d";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [ hledgerLib mtl time ];
@@ -12,6 +12,9 @@
 description = "computes interest for a given account";
 license = self.stdenv.lib.licenses.bsd3;
 platforms = self.ghc.meta.platforms;
-maintainers = [ self.stdenv.lib.maintainers.simons ];
+maintainers = [
+  self.stdenv.lib.maintainers.andres
+  self.stdenv.lib.maintainers.simons
+];
   };
 })
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r28736 - nixpkgs/trunk/pkgs/development/libraries/haskell/cmdlib

2011-08-22 Thread Peter Simons 
Author: simons
Date: Mon Aug 22 11:54:16 2011
New Revision: 28736
URL: https://svn.nixos.org/websvn/nix/?rev=28736&sc=1

Log:
haskell-cmdlib: cosmetic change

Modified:
   nixpkgs/trunk/pkgs/development/libraries/haskell/cmdlib/default.nix

Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/cmdlib/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/cmdlib/default.nix Mon Aug 
22 11:51:03 2011(r28735)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/cmdlib/default.nix Mon Aug 
22 11:54:16 2011(r28736)
@@ -12,8 +12,8 @@
 license = self.stdenv.lib.licenses.bsd3;
 platforms = self.ghc.meta.platforms;
 maintainers = [
-  self.stdenv.lib.maintainers.simons
   self.stdenv.lib.maintainers.andres
+  self.stdenv.lib.maintainers.simons
 ];
   };
 })
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r28735 - nixos/trunk/modules/services/x11/desktop-managers

2011-08-22 Thread Eelco Dolstra 
Author: eelco
Date: Mon Aug 22 11:51:03 2011
New Revision: 28735
URL: https://svn.nixos.org/websvn/nix/?rev=28735&sc=1

Log:
* Cause KDE's Polkit authentication agent to be started at login.
  You now get a nice popup window asking for the appropriate password
  if you try to do something that requires administrative privilege
  (e.g. "pkexec ls" in a terminal, unmounting devices that don't
  belong to you in Dolphin, or killing other people's processes in
  ksysguard).

Modified:
   nixos/trunk/modules/services/x11/desktop-managers/kde4.nix

Modified: nixos/trunk/modules/services/x11/desktop-managers/kde4.nix
==
--- nixos/trunk/modules/services/x11/desktop-managers/kde4.nix  Mon Aug 22 
11:46:32 2011(r28734)
+++ nixos/trunk/modules/services/x11/desktop-managers/kde4.nix  Mon Aug 22 
11:51:03 2011(r28735)
@@ -110,6 +110,9 @@
   pkgs.kde4.kde_wallpapers # contains kdm's default background
   pkgs.kde4.oxygen_icons
 
+  # Starts KDE's Polkit authentication agent.
+  pkgs.polkit_kde_agent
+
   # Phonon backends.
   pkgs.phonon_backend_gstreamer
   pkgs.gst_all.gstPluginsBase
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r28734 - nixos/trunk/modules/security

2011-08-22 Thread Eelco Dolstra 
Author: eelco
Date: Mon Aug 22 11:46:32 2011
New Revision: 28734
URL: https://svn.nixos.org/websvn/nix/?rev=28734&sc=1

Log:
* Polkit: remove the wrapper since it's no longer needed (and didn't
  really work as far as I can tell).

Modified:
   nixos/trunk/modules/security/polkit.nix

Modified: nixos/trunk/modules/security/polkit.nix
==
--- nixos/trunk/modules/security/polkit.nix Mon Aug 22 11:45:51 2011
(r28733)
+++ nixos/trunk/modules/security/polkit.nix Mon Aug 22 11:46:32 2011
(r28734)
@@ -6,25 +6,6 @@
 
   cfg = config.security.polkit;
 
-  pkWrapper = pkgs.stdenv.mkDerivation {
-name = "polkit-wrapper";
-helper = "libexec/polkit-1/polkit-agent-helper-1";
-buildInputs = [ pkgs.xorg.lndir ];
-
-builder = pkgs.writeScript "pkwrap-builder" ''
-  source $stdenv/setup
-
-  mkdir -pv $out
-  lndir ${pkgs.polkit} $out
-
-  # !!! I'm pretty sure the wrapper doesn't work because
-  # libpolkit-agent-1.so has a hard-coded reference to
-  # polkit-agent-helper-1.
-  rm $out/$helper
-  ln -sv ${config.security.wrapperDir}/polkit-agent-helper-1 $out/$helper
-  '';
-  };
-  
 in
 
 {
@@ -85,7 +66,7 @@
 
   config = mkIf cfg.enable {
 
-environment.systemPackages = [ pkWrapper ];
+environment.systemPackages = [ pkgs.polkit ];
 
 # The polkit daemon reads action files 
 environment.pathsToLink = [ "/share/polkit-1/actions" ];
@@ -111,7 +92,7 @@
 }
   ];
 
-services.dbus.packages = [ pkWrapper ];
+services.dbus.packages = [ pkgs.polkit ];
 
 security.pam.services = [ { name = "polkit-1"; } ];
 
@@ -122,7 +103,7 @@
 owner = "root";
 group = "root";
 setuid = true;
-source = pkgs.polkit + "/" + pkWrapper.helper;
+source = "${pkgs.polkit}/libexec/polkit-1/polkit-agent-helper-1";
   };
 
 system.activationScripts.polkit =
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r28733 - nixpkgs/trunk/pkgs/development/libraries/polkit

2011-08-22 Thread Eelco Dolstra 
Author: eelco
Date: Mon Aug 22 11:45:51 2011
New Revision: 28733
URL: https://svn.nixos.org/websvn/nix/?rev=28733&sc=1

Log:
* Polkit: look for ‘polkit-agent-helper-1’ in the right location (for
  NixOS, that is), i.e., /var/setuid-wrappers.

Modified:
   nixpkgs/trunk/pkgs/development/libraries/polkit/default.nix

Modified: nixpkgs/trunk/pkgs/development/libraries/polkit/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/polkit/default.nix Mon Aug 22 
06:54:03 2011(r28732)
+++ nixpkgs/trunk/pkgs/development/libraries/polkit/default.nix Mon Aug 22 
11:45:51 2011(r28733)
@@ -33,6 +33,15 @@
 ( map (var: ''-DPACKAGE_${var}_DIR=\""${builtins.getAttr var 
foolVars}"\"'')
 (builtins.attrNames foolVars) );
 
+  preBuild =
+''
+  # ‘libpolkit-agent-1.so’ should call the setuid wrapper on
+  # NixOS.  Hard-coding the path is kinda ugly.  Maybe we can just
+  # call through $PATH, but that might have security implications.
+  substituteInPlace src/polkitagent/polkitagentsession.c \
+--replace PACKAGE_LIBEXEC_DIR '"/var/setuid-wrappers"'
+'';
+
   makeFlags =
 ''
   INTROSPECTION_GIRDIR=$(out)/share/gir-1.0
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits