diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-04-17 18:26:28 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-04-17 18:26:28 +0200 |
| commit | ec736312d44e4cf63c1f86c7c38f2c2f28d1212e (patch) | |
| tree | 283a3734e8c4c39c8d5df06c1dfcdaa63680fe95 /pkgs/tools/graphics | |
| parent | 6bd036d5f9e4f1c5caa305c98c379f986d3bc402 (diff) | |
| parent | 3f0ee819e2f15e8513d99c3569761fe8cd0bd8de (diff) | |
| download | nixlib-ec736312d44e4cf63c1f86c7c38f2c2f28d1212e.tar nixlib-ec736312d44e4cf63c1f86c7c38f2c2f28d1212e.tar.gz nixlib-ec736312d44e4cf63c1f86c7c38f2c2f28d1212e.tar.bz2 nixlib-ec736312d44e4cf63c1f86c7c38f2c2f28d1212e.tar.lz nixlib-ec736312d44e4cf63c1f86c7c38f2c2f28d1212e.tar.xz nixlib-ec736312d44e4cf63c1f86c7c38f2c2f28d1212e.tar.zst nixlib-ec736312d44e4cf63c1f86c7c38f2c2f28d1212e.zip | |
Merge branch 'master' into x-updates
Conflicts: pkgs/development/compilers/vala/default.nix (it's different version) pkgs/development/libraries/cairo/default.nix (trivial)
Diffstat (limited to 'pkgs/tools/graphics')
| -rw-r--r-- | pkgs/tools/graphics/glxinfo/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/graphics/glxinfo/default.nix b/pkgs/tools/graphics/glxinfo/default.nix index ed29b743d546..d0235c5bade4 100644 --- a/pkgs/tools/graphics/glxinfo/default.nix +++ b/pkgs/tools/graphics/glxinfo/default.nix @@ -1,13 +1,13 @@ {stdenv, fetchurl, x11, mesa}: -let version = "8.0.1"; in +let version = "8.1.0"; in stdenv.mkDerivation { name = "glxinfo-${version}"; src = fetchurl { url = "ftp://ftp.freedesktop.org/pub/mesa/demos/${version}/mesa-demos-${version}.tar.bz2"; - sha256 = "1lbp1llpx0hl5k79xb653yvjvk9mlikj73r8xjzyxqqp1nrg5isb"; + sha256 = "0a58hw5850731p4smz4zqsbvyxvgjf7n5xdbs9l1wamk8q3gl0wp"; }; buildInputs = [x11 mesa]; |