nixpkgs/pkgs
Eelco Dolstra 28780d27d1 * cmake: don't use replace-literal.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31736
2012-01-20 15:10:28 +00:00
..
applications svn merge ^/nixpkgs/trunk, one simple conflict in jruby 2012-01-19 21:31:51 +00:00
build-support * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
data * Cleanup: remove obsolete references to ‘xz’, which is in stdenv now. 2012-01-18 20:53:01 +00:00
desktops svn merge ^/nixpkgs/trunk, one simple conflict in jruby 2012-01-19 21:31:51 +00:00
development * cmake: don't use replace-literal. 2012-01-20 15:10:28 +00:00
games * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
lib svn merge ^/nixpkgs/trunk, one simple conflict in jruby 2012-01-19 21:31:51 +00:00
misc * The postHook substitution is not used anywhere, so get rid of it. 2012-01-19 15:39:12 +00:00
os-specific svn merge ^/nixpkgs/trunk, one simple conflict in jruby 2012-01-19 21:31:51 +00:00
servers svn merge ^/nixpkgs/trunk, one simple conflict in jruby 2012-01-19 21:31:51 +00:00
shells * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
stdenv * Oops. 2012-01-20 10:55:45 +00:00
test
tools svn merge ^/nixpkgs/trunk, one simple conflict in jruby 2012-01-19 21:31:51 +00:00
top-level svn merge ^/nixpkgs/trunk, one simple conflict in jruby 2012-01-19 21:31:51 +00:00