svn merge ^/nixpkgs/trunk, one simple conflict in jruby

svn path=/nixpkgs/branches/stdenv-updates/; revision=31721
2012-01-19 21:31:51 +00:00
parent 3980444b2b b94fef3cba
commit 84c0185038
69 changed files with 763 additions and 352 deletions
@@ -2,14 +2,14 @@

 let
  name = "source-highlight";
-  version = "3.1.5";
+  version = "3.1.6";
 in
 stdenv.mkDerivation {
  name = "${name}-${version}";

  src = fetchurl {
      url = "mirror://gnu/src-highlite/${name}-${version}.tar.gz";
-      sha256 = "16a2ybd0i7gk926ipp7c63mxcfwklbb20fw65npyrjzr94z1agwx";
+      sha256 = "0a5zh876nc1gig8z586b953r8ahh9zbs1lmi8vxjrkwp6zqzf4xm";
    };

  configureFlags = [ "--with-boost=${boost}" ];