diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-01-14 14:49:31 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-01-14 14:49:31 +0000 |
| commit | 9183f21f7e005b9229b615e65fa463733267ce96 (patch) | |
| tree | 9155247a14d60982c3f4be514e386a976f7240d3 /pkgs/development/libraries/libdrm | |
| parent | c161cd1773e6411054047b1dd2a9544b0b05b0d1 (diff) | |
| parent | c63858a16919de0f929d8377ce616e93a99f2074 (diff) | |
| download | nixpkgs-9183f21f7e005b9229b615e65fa463733267ce96.tar nixpkgs-9183f21f7e005b9229b615e65fa463733267ce96.tar.gz nixpkgs-9183f21f7e005b9229b615e65fa463733267ce96.tar.bz2 nixpkgs-9183f21f7e005b9229b615e65fa463733267ce96.tar.lz nixpkgs-9183f21f7e005b9229b615e65fa463733267ce96.tar.xz nixpkgs-9183f21f7e005b9229b615e65fa463733267ce96.tar.zst nixpkgs-9183f21f7e005b9229b615e65fa463733267ce96.zip | |
Merging from trunk.
I fixed conflicts regarding the renaming 'kernel' -> 'linux' in all-packages. Also a small conflict in all-packages about making openssl overridable. And I some linux 2.6.31-zen kernel files also marked in conflict. svn path=/nixpkgs/branches/stdenv-updates/; revision=19438
Diffstat (limited to 'pkgs/development/libraries/libdrm')
| -rw-r--r-- | pkgs/development/libraries/libdrm/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index ea10c3ee8d2..98dce86a2f8 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, pkgconfig, libpthreadstubs}: stdenv.mkDerivation rec { - name = "libdrm-2.4.15"; + name = "libdrm-2.4.17"; src = fetchurl { url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2"; - sha256 = "1pm7iddv3yjwvqmlbdmj9m55bmkfcfzq0wvqpgx4gkmdjfd8kzxw"; + sha256 = "0sii8bhplb99i4x67626sd4pm1c2i3i0c73rdma71sdh233fg95q"; }; buildInputs = [ pkgconfig libpthreadstubs ]; |