Merge branch 'master' into staging

Conflicts: pkgs/games/scummvm/default.nix
2016-08-28 12:20:59 +01:00
parent ed01e0ca4f f0da094b2e
commit 57ddc155fc
19 changed files with 150 additions and 306 deletions
--- a/pkgs/tools/backup/borg/default.nix
+++ b/pkgs/tools/backup/borg/default.nix
@@ -2,13 +2,13 @@

 python3Packages.buildPythonApplication rec {
  name = "borgbackup-${version}";
-  version = "1.0.6";
+  version = "1.0.7";
  namePrefix = "";

  src = fetchurl {
    url = "https://github.com/borgbackup/borg/releases/download/"
      + "${version}/${name}.tar.gz";
-    sha256 = "1dxn9p4xm0zd32xzzd9hs4a542db34clykrrnnv3hrdnc394895p";
+    sha256 = "1l9iw55w5x51yxl3q89cf6avg80lajxvc8qz584hrsmnk6i56cr0";
  };

  nativeBuildInputs = with python3Packages; [