about summary refs log tree commit diff
path: root/pkgs/tools/misc
diff options
context:
space:
mode:
authorYury G. Kudryashov <urkud.urkud@gmail.com>2012-01-08 16:01:12 +0000
committerYury G. Kudryashov <urkud.urkud@gmail.com>2012-01-08 16:01:12 +0000
commit9ee0a9df9bc69e72278b8d34093238428fa3ea82 (patch)
tree5b074e2ebbc2aba8c957753bfb9e549ed7689585 /pkgs/tools/misc
parent0b90cd41b2fe467f53d9a082c91e6f6438ba6a2b (diff)
parent47288a22242b0cd554efc45d446e67573ca308f7 (diff)
downloadnixlib-9ee0a9df9bc69e72278b8d34093238428fa3ea82.tar
nixlib-9ee0a9df9bc69e72278b8d34093238428fa3ea82.tar.gz
nixlib-9ee0a9df9bc69e72278b8d34093238428fa3ea82.tar.bz2
nixlib-9ee0a9df9bc69e72278b8d34093238428fa3ea82.tar.lz
nixlib-9ee0a9df9bc69e72278b8d34093238428fa3ea82.tar.xz
nixlib-9ee0a9df9bc69e72278b8d34093238428fa3ea82.tar.zst
nixlib-9ee0a9df9bc69e72278b8d34093238428fa3ea82.zip
svn merge ^/nixpkgs/trunk
A few trivial conflicts

svn path=/nixpkgs/branches/stdenv-updates/; revision=31434
Diffstat (limited to 'pkgs/tools/misc')
-rw-r--r--pkgs/tools/misc/xburst-tools/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tools/misc/xburst-tools/default.nix b/pkgs/tools/misc/xburst-tools/default.nix
index 63f5470aa9ec..410c0ab93a18 100644
--- a/pkgs/tools/misc/xburst-tools/default.nix
+++ b/pkgs/tools/misc/xburst-tools/default.nix
@@ -2,15 +2,15 @@
 , gccCross ? null }:
 
 let
-  version = "2011-03-08";
+  version = "2011-12-26";
 in
 stdenv.mkDerivation {
   name = "xburst-tools-${version}";
 
   src = fetchgit {
     url = git://projects.qi-hardware.com/xburst-tools.git;
-    rev = "a3a38cabf1e854667d90f49f0b4487e28974a3a6";
-    sha256 = "ac5671708cf9d18de79207530335f6781fa4bedf55288069786f4ecb971c4658";
+    rev = "c71ce8e15db25fe49ce8702917cb17720882e341";
+    sha256 = "abe4c4591183f2bc5ca6363451d1cd7d966c080b4f5bfb0fedf7e9a4f70267a4";
   };
 
   preConfigure = ''