From 4a7f99d55d299453a9c2397f90b33d1120669775 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Mon, 11 Jan 2021 08:54:33 +0100 Subject: treewide: with stdenv.lib; in meta -> with lib; MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Part of: https://github.com/NixOS/nixpkgs/issues/108938 meta = with stdenv.lib; is a widely used pattern. We want to slowly remove the `stdenv.lib` indirection and encourage people to use `lib` directly. Thus let’s start with the meta field. This used a rewriting script to mostly automatically replace all occurances of this pattern, and add the `lib` argument to the package header if it doesn’t exist yet. The script in its current form is available at https://cs.tvl.fyi/depot@2f807d7f141068d2d60676a89213eaa5353ca6e0/-/blob/users/Profpatsch/nixpkgs-rewriter/default.nix --- pkgs/development/python-modules/python-gitlab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/python-modules/python-gitlab') diff --git a/pkgs/development/python-modules/python-gitlab/default.nix b/pkgs/development/python-modules/python-gitlab/default.nix index 6108ea74a23a..c706ff7903c3 100644 --- a/pkgs/development/python-modules/python-gitlab/default.nix +++ b/pkgs/development/python-modules/python-gitlab/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, requests, mock, httmock, pythonOlder, pytest, responses }: +{ lib, stdenv, buildPythonPackage, fetchPypi, requests, mock, httmock, pythonOlder, pytest, responses }: buildPythonPackage rec { pname = "python-gitlab"; @@ -15,7 +15,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.6"; - meta = with stdenv.lib; { + meta = with lib; { description = "Interact with GitLab API"; homepage = "https://github.com/python-gitlab/python-gitlab"; license = licenses.lgpl3; -- cgit v1.2.3 From a6ce00c50c36624fec06b2b756a766d4d0f4a888 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Mon, 25 Jan 2021 09:26:54 +0100 Subject: treewide: remove stdenv where not needed --- pkgs/development/python-modules/python-gitlab/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development/python-modules/python-gitlab') diff --git a/pkgs/development/python-modules/python-gitlab/default.nix b/pkgs/development/python-modules/python-gitlab/default.nix index c706ff7903c3..1a2e28d57aba 100644 --- a/pkgs/development/python-modules/python-gitlab/default.nix +++ b/pkgs/development/python-modules/python-gitlab/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, requests, mock, httmock, pythonOlder, pytest, responses }: +{ lib, buildPythonPackage, fetchPypi, requests, mock, httmock, pythonOlder, pytest, responses }: buildPythonPackage rec { pname = "python-gitlab"; -- cgit v1.2.3 From 619aecf7a1feacd2d4a925bc143edbe915c90851 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:25 +0100 Subject: python3Packages.python-gitlab: 2.5.0 -> 2.6.0 --- pkgs/development/python-modules/python-gitlab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/python-modules/python-gitlab') diff --git a/pkgs/development/python-modules/python-gitlab/default.nix b/pkgs/development/python-modules/python-gitlab/default.nix index 1a2e28d57aba..4dc3cfb5693f 100644 --- a/pkgs/development/python-modules/python-gitlab/default.nix +++ b/pkgs/development/python-modules/python-gitlab/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-gitlab"; - version = "2.5.0"; + version = "2.6.0"; src = fetchPypi { inherit pname version; - sha256 = "68b42aafd4b620ab2534ff78a52584c7f799e4e55d5ac297eab4263066e6f74b"; + sha256 = "a862c6874524ab585b725a17b2cd2950fc09d6d74205f40a11be2a4e8f2dcaa1"; }; propagatedBuildInputs = [ requests ]; -- cgit v1.2.3 From f812b261e2e39db31bcac09732054abf8f847108 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 27 Apr 2021 03:46:57 +0200 Subject: python3Packages.python-gitlab: 2.6.0 -> 2.7.1 Fixes the build, disable tests, as they rely on a local GitLab instance running on docker. Adds pythonImportsCheck. --- .../python-modules/python-gitlab/default.nix | 29 +++++++++++++++++----- 1 file changed, 23 insertions(+), 6 deletions(-) (limited to 'pkgs/development/python-modules/python-gitlab') diff --git a/pkgs/development/python-modules/python-gitlab/default.nix b/pkgs/development/python-modules/python-gitlab/default.nix index 4dc3cfb5693f..b3cb9aaff633 100644 --- a/pkgs/development/python-modules/python-gitlab/default.nix +++ b/pkgs/development/python-modules/python-gitlab/default.nix @@ -1,19 +1,36 @@ -{ lib, buildPythonPackage, fetchPypi, requests, mock, httmock, pythonOlder, pytest, responses }: +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, argcomplete +, requests +, requests-toolbelt +, pyyaml +}: buildPythonPackage rec { pname = "python-gitlab"; - version = "2.6.0"; + version = "2.7.1"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "a862c6874524ab585b725a17b2cd2950fc09d6d74205f40a11be2a4e8f2dcaa1"; + sha256 = "0z4amj5xhx5zc3h2m0zrkardm3z5ba9qpjx5n6dczyz77r527yg1"; }; - propagatedBuildInputs = [ requests ]; + propagatedBuildInputs = [ + argcomplete + pyyaml + requests + requests-toolbelt + ]; - checkInputs = [ mock httmock pytest responses ]; + # tests rely on a gitlab instance on a local docker setup + doCheck = false; - disabled = pythonOlder "3.6"; + pythonImportsCheck = [ + "gitlab" + ]; meta = with lib; { description = "Interact with GitLab API"; -- cgit v1.2.3 From d8a76e3dc16ba60f1e0ac0250a860f7a41ce0588 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 20 Jun 2021 00:43:26 +0200 Subject: python3Packages.python-gitlab: 2.7.1 -> 2.8.0 --- pkgs/development/python-modules/python-gitlab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/python-modules/python-gitlab') diff --git a/pkgs/development/python-modules/python-gitlab/default.nix b/pkgs/development/python-modules/python-gitlab/default.nix index b3cb9aaff633..4d7f7a289cb5 100644 --- a/pkgs/development/python-modules/python-gitlab/default.nix +++ b/pkgs/development/python-modules/python-gitlab/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "python-gitlab"; - version = "2.7.1"; + version = "2.8.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0z4amj5xhx5zc3h2m0zrkardm3z5ba9qpjx5n6dczyz77r527yg1"; + sha256 = "0081jgjgqi4mqpr436ivw2q571hxi3hv2pa8d0z0nfl13s6lldpk"; }; propagatedBuildInputs = [ -- cgit v1.2.3 From ca33f99091133d88c2af62b9a21ca3d88b059b25 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 18 Jun 2021 23:47:35 +0200 Subject: python3Packages.python-gitlab: 2.7.1 -> 2.8.0 --- pkgs/development/python-modules/python-gitlab/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development/python-modules/python-gitlab') diff --git a/pkgs/development/python-modules/python-gitlab/default.nix b/pkgs/development/python-modules/python-gitlab/default.nix index 4d7f7a289cb5..34fbcff42f13 100644 --- a/pkgs/development/python-modules/python-gitlab/default.nix +++ b/pkgs/development/python-modules/python-gitlab/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0081jgjgqi4mqpr436ivw2q571hxi3hv2pa8d0z0nfl13s6lldpk"; + sha256 = "f3364a8d1e813a0b3e68485db1e1881d8653b0e03b9a41f2c59544fce4930101"; }; propagatedBuildInputs = [ -- cgit v1.2.3 From fa55cb1af8720b0976cf62119fc2474ca8aa4bed Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 2 Jul 2021 11:50:59 +0200 Subject: python3Packages.python-gitlab: 2.8.0 -> 2.9.0 --- pkgs/development/python-modules/python-gitlab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/python-modules/python-gitlab') diff --git a/pkgs/development/python-modules/python-gitlab/default.nix b/pkgs/development/python-modules/python-gitlab/default.nix index 34fbcff42f13..9d06569dfdc3 100644 --- a/pkgs/development/python-modules/python-gitlab/default.nix +++ b/pkgs/development/python-modules/python-gitlab/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "python-gitlab"; - version = "2.8.0"; + version = "2.9.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "f3364a8d1e813a0b3e68485db1e1881d8653b0e03b9a41f2c59544fce4930101"; + sha256 = "sha256-LFGxTN2aaAKDFaKw6IUl03YJZziPmfqlfeiQK0VGW+Y="; }; propagatedBuildInputs = [ -- cgit v1.2.3