diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-12-11 12:47:00 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-12-11 12:47:00 +0000 |
| commit | ee04ffcb550809f7d97d709ff4ec709a21b30ab9 (patch) | |
| tree | 470bdb3f97b0ab18d3abeec3e1f59db7a4af34ed /pkgs/build-support | |
| parent | 3f1a32c266f792290cb08c45ab40f22a43cb13cb (diff) | |
| parent | 97d4a54698a4dea4b57ec4124591d75a740ee44e (diff) | |
| download | nixlib-ee04ffcb550809f7d97d709ff4ec709a21b30ab9.tar nixlib-ee04ffcb550809f7d97d709ff4ec709a21b30ab9.tar.gz nixlib-ee04ffcb550809f7d97d709ff4ec709a21b30ab9.tar.bz2 nixlib-ee04ffcb550809f7d97d709ff4ec709a21b30ab9.tar.lz nixlib-ee04ffcb550809f7d97d709ff4ec709a21b30ab9.tar.xz nixlib-ee04ffcb550809f7d97d709ff4ec709a21b30ab9.tar.zst nixlib-ee04ffcb550809f7d97d709ff4ec709a21b30ab9.zip | |
Updating from trunk. I resolved simple conflicts.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25061
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/builder-defs/template-auto-callable.nix | 6 | ||||
| -rw-r--r-- | pkgs/build-support/vm/default.nix | 8 |
2 files changed, 10 insertions, 4 deletions
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 = { diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index b626a61ac688..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 ''; @@ -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; |