public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

svn merge ^/nixpkgs/trunk

Browse Source 
A few trivial conflicts

svn path=/nixpkgs/branches/stdenv-updates/; revision=31434
This commit is contained in:
Yury G. Kudryashov
2012-01-08 16:01:12 +00:00
parent 0b90cd41b2 47288a2224
commit 9ee0a9df9b
237 changed files with 3563 additions and 688 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/tools/misc/xburst-tools/default.nix
View File

@@ -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 = ''