Merge remote-tracking branch 'central/master' into stdenv-updates

Conflicts: pkgs/os-specific/linux/alsa-utils/default.nix
2013-01-27 11:32:12 +01:00
parent 0214514f8b bff4b06640
commit 3b26ba7019
38 changed files with 283 additions and 74 deletions
@@ -6,11 +6,11 @@
 assert stdenv.isLinux;

 stdenv.mkDerivation rec {
-  name = "upower-0.9.18";
+  name = "upower-0.9.19";

  src = fetchurl {
    url = "http://upower.freedesktop.org/releases/${name}.tar.xz";
-    sha256 = "13q6cw2d45qp077g3bjng4yhrvm6g1y9347dkf53kscm5xfm18d1";
+    sha256 = "053yahks5c7nwdxwx8q6nqp3mxbqldmc844mzyvc3ws9635zmisl";
  };

  buildInputs =