From 5d4b383e20b9cba057d5e0c37f3b09f8028e30b2 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Tue, 21 May 2019 14:32:06 +0200
Subject: [PATCH] borgbackup: remove custom msgpack-python override, use
 bundled version

https://github.com/borgbackup/borg/blob/1.1.10/docs/changes.rst#version-1110-2019-05-16
mentions borgbackup now shipping a supported msgpack-python release, and
strongly encourages using that one.

So don't pass any msgpack-python into the build, and use the provided
one.
---
 pkgs/tools/backup/borg/default.nix | 28 +++++++---------------------
 1 file changed, 7 insertions(+), 21 deletions(-)

diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix
index e1a80f6bf914..1c0e08a2dbbd 100644
--- a/pkgs/tools/backup/borg/default.nix
+++ b/pkgs/tools/backup/borg/default.nix
@@ -1,37 +1,23 @@
 { stdenv, fetchpatch, python3, acl, libb2, lz4, zstd, openssl, openssh }:
 
-let
-  python = python3.override {
-    packageOverrides = self: super: {
-      # https://github.com/borgbackup/borg/issues/3753#issuecomment-454011810
-      msgpack-python = super.msgpack-python.overridePythonAttrs (oldAttrs: rec {
-        version = "0.5.6";
-        src = oldAttrs.src.override {
-          inherit version;
-          sha256 = "0ee8c8c85aa651be3aa0cd005b5931769eaa658c948ce79428766f1bd46ae2c3";
-        };
-      });
-    };
-  };
-
-in python.pkgs.buildPythonApplication rec {
+python3.pkgs.buildPythonApplication rec {
   pname = "borgbackup";
   version = "1.1.10";
 
-  src = python.pkgs.fetchPypi {
+  src = python3.pkgs.fetchPypi {
     inherit pname version;
     sha256 = "1pp70p4n5kamvcbl4d8021ggrxhyykmg9isjg4yd3wags8b19d7g";
   };
 
-  nativeBuildInputs = with python.pkgs; [
+  nativeBuildInputs = with python3.pkgs; [
     # For building documentation:
     sphinx guzzle_sphinx_theme
   ];
   buildInputs = [
-    libb2 lz4 zstd openssl python.pkgs.setuptools_scm
+    libb2 lz4 zstd openssl python3.pkgs.setuptools_scm
   ] ++ stdenv.lib.optionals stdenv.isLinux [ acl ];
-  propagatedBuildInputs = with python.pkgs; [
-    cython msgpack-python
+  propagatedBuildInputs = with python3.pkgs; [
+    cython
   ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ llfuse ];
 
   preConfigure = ''
@@ -64,7 +50,7 @@ in python.pkgs.buildPythonApplication rec {
     cp scripts/shell_completions/zsh/_borg $out/share/zsh/site-functions/
   '';
 
-  checkInputs = with python.pkgs; [
+  checkInputs = with python3.pkgs; [
     pytest
   ];