diff options
author | Mathijs Kwik <mathijs@bluescreen303.nl> | 2013-09-11 10:51:46 +0200 |
---|---|---|
committer | Mathijs Kwik <mathijs@bluescreen303.nl> | 2013-09-11 10:53:31 +0200 |
commit | 1a55c4b89f6f6e337d1ca8878bfd8104f3fb6304 (patch) | |
tree | 3513b616eec434d455177a877119cdd96a7b4ade /pkgs/development/libraries/libdrm | |
parent | 2d405ed4d54ba4d924b5146cea4a39ae65343d59 (diff) | |
parent | aa8e8303e1b42c5cf5195f3ce82f886664aa26d4 (diff) | |
download | nixlib-1a55c4b89f6f6e337d1ca8878bfd8104f3fb6304.tar nixlib-1a55c4b89f6f6e337d1ca8878bfd8104f3fb6304.tar.gz nixlib-1a55c4b89f6f6e337d1ca8878bfd8104f3fb6304.tar.bz2 nixlib-1a55c4b89f6f6e337d1ca8878bfd8104f3fb6304.tar.lz nixlib-1a55c4b89f6f6e337d1ca8878bfd8104f3fb6304.tar.xz nixlib-1a55c4b89f6f6e337d1ca8878bfd8104f3fb6304.tar.zst nixlib-1a55c4b89f6f6e337d1ca8878bfd8104f3fb6304.zip |
Merge remote-tracking branch 'official/master' into multiple-outputs
Conflicts: pkgs/development/libraries/cairo/default.nix pkgs/development/libraries/freetype/default.nix pkgs/development/libraries/glib/default.nix pkgs/development/libraries/libpng/default.nix pkgs/development/libraries/pango/default.nix pkgs/tools/typesetting/tex/texlive/default.nix pkgs/top-level/all-packages.nix
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 20de41af68bb..9fe34fdeb97f 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, udev }: stdenv.mkDerivation rec { - name = "libdrm-2.4.42"; + name = "libdrm-2.4.46"; src = fetchurl { url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2"; - sha256 = "1qbnpi64hyqzd650hj6jki1d50pzypdhj3rw9m3whwbqly110rz0"; + sha256 = "1wah4qmrrcv0gnx65lhrlxb6gprxch92wy8lhxv6102fml6k5krk"; }; outputs = [ "dev" "out" ]; |