diff options
| author | Lluís Batlle i Rossell | 2009-11-26 21:46:08 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell | 2009-11-26 21:46:08 +0000 |
| commit | a3403e6828ee7cac9955b7ad7e420e087b62c700 (patch) | |
| tree | 5fd4a5b069d5af2ac7d93f4c8994cbd57c952725 /pkgs/servers | |
| parent | 3cda62f6e1b9fe934798ab27daaa0d5da7e9130c (diff) | |
| parent | fe10a3aed5911f4858d667d611c94bb77a375b75 (diff) | |
Finishing the update from trunk, having resolved the eclipse related directory
renaming. I think directory renaming breaks the usual merges... because it leaves the 'to be removed' directory in the working directory still. A manual 'rm' of the 'to be removed' directory fixed the commit. svn merge ^/nixpkgs/trunk svn path=/nixpkgs/branches/stdenv-updates/; revision=18661
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index fb360e433bb0..523f49eb637c 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -123,7 +123,7 @@ in }; xf86videoopenchrome = attrs: attrs // { - name = "xf86-video-openchrome-svn-798"; + name = "xf86-video-openchrome-svn-816"; src = args.fetchsvn { url = http://svn.openchrome.org/svn/trunk; sha256 = "1mhfh1n1x7fnxdbbkbz13lzd57m6xi3n9cblzgm43mz5bamacr02"; |