From d0a0f22c766e71c4b9bdacdabf02e28d0e413f6d Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Fri, 17 Dec 2010 18:42:02 +0000
Subject: [PATCH] Updated Disnix packages and added disnixos

svn path=/nixpkgs/trunk/; revision=25181
---
 .../disnix/DisnixWebService/default.nix              |  4 ++--
 .../disnix/activation-scripts/default.nix            |  4 ++--
 pkgs/tools/package-management/disnix/default.nix     |  6 +++---
 .../package-management/disnix/disnixos/default.nix   | 12 ++++++++++++
 pkgs/top-level/all-packages.nix                      |  2 ++
 5 files changed, 21 insertions(+), 7 deletions(-)
 create mode 100644 pkgs/tools/package-management/disnix/disnixos/default.nix

diff --git a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix
index ef6f9300c425..e129d9e29ec8 100644
--- a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix
+++ b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix
@@ -3,8 +3,8 @@
 stdenv.mkDerivation {
   name = "DisnixWebService-0.2";
   src = fetchurl {
-    url = http://hydra.nixos.org/build/716007/download/1/DisnixWebService-0.2.tar.bz2;
-    sha256 = "0a6l9dhi20d67bddzgqi15i00xvrxacpmfbn5a0nscp2izzbvmdr";
+    url = http://hydra.nixos.org/build/792274/download/3/DisnixWebService-0.2.tar.bz2;
+    sha256 = "1ccgrab896cs7bg5m99iam4cyvdj9q3gkmjkg9awqb710l9168sh";
   };
   buildInputs = [ apacheAnt ];
   PREFIX = ''''${env.out}'';
diff --git a/pkgs/tools/package-management/disnix/activation-scripts/default.nix b/pkgs/tools/package-management/disnix/activation-scripts/default.nix
index e214206d891b..c19c6a406a97 100644
--- a/pkgs/tools/package-management/disnix/activation-scripts/default.nix
+++ b/pkgs/tools/package-management/disnix/activation-scripts/default.nix
@@ -14,8 +14,8 @@ assert enableEjabberdDump -> ejabberd != null;
 stdenv.mkDerivation {
   name = "disnix-activation-scripts-0.2pre24557";
   src = fetchurl {
-    url = http://hydra.nixos.org/build/727573/download/1/disnix-activation-scripts-0.2pre24557.tar.gz;
-    sha256 = "089bp700rjdxfa0wzf81420i5iphs78kkz41506ibsfnbm8k3axj";
+    url = http://hydra.nixos.org/build/774785/download/1/disnix-activation-scripts-0.2pre24557.tar.gz;
+    sha256 = "16allbni0hwcj9qyg67n4ly4bl09wp32rrds3s1hvq6a2p3a3fg7";
   };
   
   preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else "";
diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix
index adb1dcc0dd63..732ba2ad1811 100644
--- a/pkgs/tools/package-management/disnix/default.nix
+++ b/pkgs/tools/package-management/disnix/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, pkgconfig, dbus_glib, libxml2, libxslt, getopt, nixUnstable, gettext, libiconv}:
 
 stdenv.mkDerivation {
-  name = "disnix-0.2pre24517";
+  name = "disnix-0.2pre25135";
   src = fetchurl {
-    url = http://hydra.nixos.org/build/720966/download/3/disnix-0.2pre24517.tar.gz;
-    sha256 = "03d2w9kckk8hy2xrywb5mk5qiyd9kjxabihv1rjnc3grlzi053k4";
+    url = http://hydra.nixos.org/build/811133/download/4/disnix-0.2pre25135.tar.gz;
+    sha256 = "0ivblsgbl6fc4vqhs8zjw2qn463qlhnlzb5h34zyl0lya6wggcsd";
   };
   buildInputs = [ pkgconfig dbus_glib libxml2 libxslt getopt nixUnstable ]
                 ++ stdenv.lib.optional (!stdenv.isLinux) libiconv
diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix
new file mode 100644
index 000000000000..5572ffe67975
--- /dev/null
+++ b/pkgs/tools/package-management/disnix/disnixos/default.nix
@@ -0,0 +1,12 @@
+{stdenv, fetchurl, disnix, socat, pkgconfig}:
+
+stdenv.mkDerivation {
+  name = "disnixos";
+  src = fetchurl {
+    url = http://hydra.nixos.org/build/811135/download/1/disnixos-0.1pre25150.tar.gz;
+    sha256 = "004i4k0c9lfvfmmv5iqwnqk3h2lip166dp8vpn3k3mvmpl17cn3j";
+  };
+  buildInputs = [ socat pkgconfig disnix ];
+  dontStrip = true;
+  NIX_STRIP_DEBUG = true;
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a2da4bdda1df..9dc4e280fa6a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7249,6 +7249,8 @@ let
     enableTomcatWebApplication = getConfig ["disnix" "enableTomcatWebApplication"] false;
   };
 
+  disnixos = callPackage ../tools/package-management/disnix/disnixos { };
+  
   DisnixWebService = callPackage ../tools/package-management/disnix/DisnixWebService { };
 
   latex2html = callPackage ../misc/tex/latex2html/default.nix {