Author: raskin
Date: Mon Feb 28 20:56:01 2011
New Revision: 26126
URL: https://svn.nixos.org/websvn/nix/?rev=26126&sc=1
Log:
Updating veracity; adding parts of needed infrastructure for tests. Currently,
a test run would fail
Modified:
nixpkgs/trunk/pkgs/applications/version-management/veracity/default.nix
nixpkgs/trunk/pkgs/applications/version-management/veracity/src-for-default.nix
Modified:
nixpkgs/trunk/pkgs/applications/version-management/veracity/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/version-management/veracity/default.nix
Sun Feb 27 19:06:04 2011 (r26125)
+++ nixpkgs/trunk/pkgs/applications/version-management/veracity/default.nix
Mon Feb 28 20:56:01 2011 (r26126)
@@ -19,19 +19,33 @@
inherit (s) name;
inherit buildInputs;
- phaseNames = ["prepare_sgneeds" "dump0" "prepareMakefiles" "doMake"
"doDeploy"];
+ phaseNames = ["prepare_sgneeds" "dump0" "prepareMakefiles" "doMake" "doTest"
"doDeploy"];
dump0 = (a.doDump "0");
+ doTest = a.fullDepEntry ''
+ sed -e "s@/bin/bash@${a.stdenv.shell}@" -i $(find .. -type f)
+ mkdir pseudo-home
+ export HOME=$PWD/pseudo-home
+ echo make test
+ '' ["doMake" "minInit"];
+
prepare_sgneeds = a.fullDepEntry (''
+ ensureDir "$out/sgneeds/include/spidermonkey"
for d in bin include lib; do
ensureDir "$out/sgneeds/$d"
+ ensureDir "$out/sgneeds/$d"
for p in "${spidermonkey_1_8_0rc1}"; do
for f in "$p"/"$d"/*; do
ln -sf "$f" "$out"/sgneeds/"$d"
done
done
done
+ for p in "${spidermonkey_1_8_0rc1}/include"
"${spidermonkey_1_8_0rc1}/include/js"; do
+ for f in "$p"/*; do
+ ln -sf "$f" "$out"/sgneeds/include/spidermonkey/
+ done
+ done
ensureDir "$out/sgneeds/include/sgbrings"
ln -s "$out/sgneeds/include/js" "$out/sgneeds/include/sgbrings/js"
@@ -41,6 +55,9 @@
done
export SGNEEDS_DIR="$out"/sgneeds/
+ export VVTHIRDPARTY="$out"/sgneeds/
+
+ export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$out/sgneeds/include"
'') ["minInit" "defEnsureDir"];
prepareMakefiles = a.fullDepEntry ''
@@ -48,7 +65,7 @@
mkdir build
cd build
export NIX_LDFLAGS="$NIX_LDFLAGS -lssl"
- cmake -G "Unix Makefiles" -D SGNEEDS_DIR="$SGNEEDS_DIR" ../veracity*
+ cmake -G "Unix Makefiles" -D SGNEEDS_DIR="$SGNEEDS_DIR" -D
VVTHIRDPARTY="$VVTHIRDPARTY" -D
SPIDERMONKEY_INCDIR="${a.spidermonkey_1_8_0rc1}/include" -D
SPIDERMONKEY_LIB="${a.spidermonkey_1_8_0rc1}/lib/libjs.so" ../veracity*
'' ["minInit" "addInputs" "doUnpack"];
doDeploy = a.fullDepEntry ''
Modified:
nixpkgs/trunk/pkgs/applications/version-management/veracity/src-for-default.nix
==============================================================================
---
nixpkgs/trunk/pkgs/applications/version-management/veracity/src-for-default.nix
Sun Feb 27 19:06:04 2011 (r26125)
+++
nixpkgs/trunk/pkgs/applications/version-management/veracity/src-for-default.nix
Mon Feb 28 20:56:01 2011 (r26126)
@@ -1,9 +1,9 @@
rec {
- version="0.5.7.10383";
- name="veracity-0.5.7.10383";
- hash="1826zr2nwd6qknvv6mw7a2x93fwi4wpabfq4ijy6am3cl55hdy51";
+ version="0.5.7.10397";
+ name="veracity-0.5.7.10397";
+ hash="09w1qj4wklaf7mw0vavzyqpagcd0cwqppdl8vaqqi0irddgivnq8";
url="http://download-us.sourcegear.com/Veracity/nightly/veracity-source-${version}.tar.gz";;
-
advertisedUrl="http://download-us.sourcegear.com/Veracity/nightly/veracity-source-0.5.7.10383.tar.gz";;
+
advertisedUrl="http://download-us.sourcegear.com/Veracity/nightly/veracity-source-0.5.7.10397.tar.gz";;
}
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
