From 58c179406231ee9d24a9b5646e10df145322ca8e Mon Sep 17 00:00:00 2001
From: Vincent Haupert <mail@vincent-haupert.de>
Date: Tue, 27 Apr 2021 14:11:41 +0200
Subject: [PATCH] ghp-import: 0.5.5 -> 1.1.0 (#120794)
---
.../python-modules/ghp-import/default.nix | 29 +++++++++++++++++++
pkgs/development/tools/ghp-import/default.nix | 28 ------------------
pkgs/top-level/all-packages.nix | 2 +-
pkgs/top-level/python-packages.nix | 2 ++
4 files changed, 32 insertions(+), 29 deletions(-)
create mode 100644 pkgs/development/python-modules/ghp-import/default.nix
delete mode 100644 pkgs/development/tools/ghp-import/default.nix
diff --git a/pkgs/development/python-modules/ghp-import/default.nix b/pkgs/development/python-modules/ghp-import/default.nix
new file mode 100644
index 000000000000..37a35febdf03
--- /dev/null
+++ b/pkgs/development/python-modules/ghp-import/default.nix
@@ -0,0 +1,29 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, dateutil
+}:
+
+buildPythonPackage rec {
+ pname = "ghp-import";
+ version = "1.1.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ hash = "sha256-wiqc4Qw3dT4miNFk12WnANrkuNefptsKLDEyuniBiU8=";
+ };
+
+ propagatedBuildInputs = [ dateutil ];
+
+ # Does not include any unit tests
+ doCheck = false;
+
+ pythonImportsCheck = [ "ghp_import" ];
+
+ meta = with lib; {
+ description = "Copy your docs directly to the gh-pages branch";
+ homepage = "https://github.com/c-w/ghp-import";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ veehaitch ];
+ };
+}
diff --git a/pkgs/development/tools/ghp-import/default.nix b/pkgs/development/tools/ghp-import/default.nix
deleted file mode 100644
index 4c258d6154ba..000000000000
--- a/pkgs/development/tools/ghp-import/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ python3, glibcLocales, lib }:
-
-with python3.pkgs;
-
-buildPythonApplication rec {
- version = "0.5.5";
- pname = "ghp-import";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "1mvmpi7lqflw2lr0g0y5f9s0d1pv9cav4gbmaqnziqg442klx4iy";
- };
-
- disabled = isPyPy;
- buildInputs = [ glibcLocales ];
-
- LC_ALL="en_US.UTF-8";
-
- # No tests available
- doCheck = false;
-
- meta = {
- description = "Copy your docs directly to the gh-pages branch";
- homepage = "https://github.com/davisp/ghp-import";
- license = "Tumbolia Public License";
- maintainers = with lib.maintainers; [ ];
- };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5e9a6e1a06a8..01d7ce6d4859 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14517,7 +14517,7 @@ in
givaro_3 = callPackage ../development/libraries/givaro/3.nix {};
givaro_3_7 = callPackage ../development/libraries/givaro/3.7.nix {};
- ghp-import = callPackage ../development/tools/ghp-import { };
+ ghp-import = with python3Packages; toPythonApplication ghp-import;
ghcid = haskellPackages.ghcid.bin;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index adb4a4aa4038..52c0e8e4ffc0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2658,6 +2658,8 @@ in {
ghdiff = callPackage ../development/python-modules/ghdiff { };
+ ghp-import = callPackage ../development/python-modules/ghp-import { };
+
gidgethub = callPackage ../development/python-modules/gidgethub { };
gin-config = callPackage ../development/python-modules/gin-config { };