Merge master into staging-next

2021-02-15 00:37:03 +00:00
parent 4f3b8e7b41 e1dcb0f5df
commit 0630986bf7
22 changed files with 252 additions and 153 deletions
@@ -1,20 +1,19 @@
-{ lib, stdenv, fetchFromGitHub, gitMinimal, python2Packages }:
+{ lib, stdenv, fetchFromGitHub, gitMinimal, docutils }:

 stdenv.mkDerivation rec {
  pname = "git-hub";
-  version = "1.1.0";
+  version = "2.1.0";

  src = fetchFromGitHub {
    owner = "sociomantic-tsunami";
    repo = "git-hub";
    rev = "v${version}";
-    sha256 = "0jkzg7vjvgb952qncndhki7n70714w61flbzf4mdcjc286lqjvwb";
+    sha256 = "1df9l8fpbxjgcgi72fwaqxiay5kpfihyc63f0gj67mns9n9ic1i7";
  };

-  buildInputs = [ python2Packages.python ];
  nativeBuildInputs = [
    gitMinimal        # Used during build to generate Bash completion.
-    python2Packages.docutils
+    docutils
  ];

  postPatch = ''