From 64ed7e705d418aa34d8a14bf1e82f6627d9354a2 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 3 Dec 2010 11:26:34 +0000
Subject: Adding Satallax prover

svn path=/nixpkgs/trunk/; revision=24963
---
 pkgs/build-support/builder-defs/template-auto-callable.nix | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'pkgs/build-support')

diff --git a/pkgs/build-support/builder-defs/template-auto-callable.nix b/pkgs/build-support/builder-defs/template-auto-callable.nix
index 769b9c1af761..1ff7ed0a96c4 100644
--- a/pkgs/build-support/builder-defs/template-auto-callable.nix
+++ b/pkgs/build-support/builder-defs/template-auto-callable.nix
@@ -10,6 +10,11 @@ let
   buildInputs = map (n: builtins.getAttr n x)
     (builtins.attrNames (builtins.removeAttrs x helperArgNames));
   sourceInfo = rec {
+    baseName="${abort ''Specify package name''}";
+    version="";
+    name="${baseName}-${version}";
+    url="${name}";
+    hash="";
   };
 in
 rec {
@@ -32,6 +37,7 @@ rec {
     ];
     platforms = with a.lib.platforms;
       (abort "Specify platforms");
+    license = "${abort ''Specify license''}";
   };
   passthru = {
     updateInfo = {
-- 
cgit 1.4.1


From f26b2678588b28d37d43526bd048b58d7446db2c Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Mon, 6 Dec 2010 08:03:11 +0000
Subject: fix debian lenny hashes

svn path=/nixpkgs/trunk/; revision=24986
---
 pkgs/build-support/vm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/build-support')

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index b626a61ac688..5e0d77129c58 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -1117,7 +1117,7 @@ rec {
       fullName = "Debian 5.0.5 Lenny (i386)";
       packagesList = fetchurl {
         url = mirror://debian/dists/lenny/main/binary-i386/Packages.bz2;
-        sha256 = "df450198f1597b526281e507e858f614ceafbd1b4f047c8ed994648f3e2ece19";
+        sha256 = "1nzd0r44lnvw2bmshqpbhghs84fxbcr1jkg55d37v4d09gsdmln0";
       };
       urlPrefix = mirror://debian;
       packages = commonDebianPackages;
@@ -1128,7 +1128,7 @@ rec {
       fullName = "Debian 5.0.5 Lenny (amd64)";
       packagesList = fetchurl {
         url = mirror://debian/dists/lenny/main/binary-amd64/Packages.bz2;
-        sha256 = "1817h2ag6fmrlifh1b9kv3zjr5ghknf53f38s1rqwfq6vh0avsig";
+        sha256 = "04hab4ybjilppr1hwnl4k50vr5y88w7zn6v22phfrsrxf23nrlv3";
       };
       urlPrefix = mirror://debian;
       packages = commonDebianPackages;
-- 
cgit 1.4.1


From 04ec671c8a809d987eeb79d69dd51377f907f29a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 6 Dec 2010 19:03:32 +0000
Subject: * Run smbd in its own session / process group (setsid) because smbd  
 now kills its process group when it exits.  Without setsid, this   ends up
 killing the parent (i.e., the builder). * Use port 445 instead of 139 because
 the CIFS kernel module tries   port 445 first.  If there is an actual Samba
 running on the host, it   would end up connecting to that one instead of our
 own and fail.

svn path=/nixpkgs/trunk/; revision=25017
---
 pkgs/build-support/vm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/build-support')

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 5e0d77129c58..4e63d8082c3f 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -216,7 +216,7 @@ rec {
       -nographic -no-reboot \
       -net nic,model=virtio \
       -chardev socket,id=samba,path=./samba \
-      -net user,guestfwd=tcp:10.0.2.4:139-chardev:samba \
+      -net user,guestfwd=tcp:10.0.2.4:445-chardev:samba \
       -drive file=$diskImage,if=virtio,boot=on,cache=writeback,werror=report \
       -kernel ${kernel}/bzImage \
       -initrd ${initrd}/initrd \
@@ -247,7 +247,7 @@ rec {
       SMB
 
       rm -f ./samba
-      ${socat}/bin/socat unix-listen:./samba exec:"${samba}/sbin/smbd -s $TMPDIR/smb.conf",nofork > /dev/null 2>&1 &
+      ${socat}/bin/socat unix-listen:./samba exec:"${utillinux}/bin/setsid ${samba}/sbin/smbd -s $TMPDIR/smb.conf",nofork > /dev/null 2>&1 &
       while [ ! -e ./samba ]; do sleep 0.1; done # ugly
     '';
 
-- 
cgit 1.4.1