From 3df7911f3553ffb6aac1e1b47cab8394d9411342 Mon Sep 17 00:00:00 2001
From: Martin Lavoie <broemartino@gmail.com>
Date: Tue, 8 Jul 2014 21:58:30 +0200
Subject: [PATCH 1/2] Add bitbucket-cli to nixpkgs
Adding refnil as mainteners
Added alias in top-level
---
lib/maintainers.nix | 1 +
pkgs/top-level/all-packages.nix | 2 ++
pkgs/top-level/python-packages.nix | 16 ++++++++++++++++
3 files changed, 19 insertions(+)
diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index df04cbc9f824..da0a9b096845 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -78,6 +78,7 @@
qknight = "Joachim Schiele <js@lastlog.de>";
raskin = "Michael Raskin <7c6f434c@mail.ru>";
redbaron = "Maxim Ivanov <ivanov.maxim@gmail.com>";
+ refnil = "Martin Lavoie <broemartino@gmail.com>";
relrod = "Ricky Elrod <ricky@elrod.me>";
rickynils = "Rickard Nilsson <rickynils@gmail.com>";
rob = "Rob Vermaas <rob.vermaas@gmail.com>";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dbef5de6c90c..da1824fe66cf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -593,6 +593,8 @@ let
bfr = callPackage ../tools/misc/bfr { };
+ bitbucket-cli = pythonPackages.bitbucket-cli;
+
blockdiag = pythonPackages.blockdiag;
bmon = callPackage ../tools/misc/bmon { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0f2e63b50ea0..d36f520eb3d8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -781,6 +781,22 @@ rec {
};
};
+ bitbucket-cli = buildPythonPackage rec {
+ name = "bitbucket-cli-0.4.1";
+ src = fetchurl {
+ url = "https://pypi.python.org/packages/source/b/bitbucket-cli/${name}.tar.gz";
+ md5 = "79cdbdc6c95dfa313d12cbdef406c9f2";
+ };
+
+ pythonPath = [ requests ];
+
+ meta = with stdenv.lib; {
+ description = "Bitbucket command line interface";
+ homepage = "https://bitbucket.org/zhemao/bitbucket-cli";
+ mainteners = [ mainteners.refnil ];
+ };
+ };
+
bitstring = buildPythonPackage rec {
name = "bitstring-3.1.2";
From 05f7391881db8ad047c739a47890ccbbac39ee44 Mon Sep 17 00:00:00 2001
From: Martin Lavoie <broemartino@gmail.com>
Date: Wed, 9 Jul 2014 02:03:49 +0200
Subject: [PATCH 2/2] Typo in bitbucket-cli expression
---
pkgs/top-level/python-packages.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d36f520eb3d8..0f785d235f46 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -793,7 +793,7 @@ rec {
meta = with stdenv.lib; {
description = "Bitbucket command line interface";
homepage = "https://bitbucket.org/zhemao/bitbucket-cli";
- mainteners = [ mainteners.refnil ];
+ maintainers = [ maintainers.refnil ];
};
};