MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 07:13:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #163010 from WolfangAukang/oci-2.59.0

Browse source
This commit is contained in:
Sandro 2022-03-12 23:36:06 +01:00 committed by GitHub
commit b8cfa08b9c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/python-modules/oci/default.nix
View file

@ -13,7 +13,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "oci"; pname = "oci";
version = "2.56.0"; version = "2.60.0";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "oracle"; owner = "oracle";
repo = "oci-python-sdk"; repo = "oci-python-sdk";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-olrWv4c2DoZ7ddm58Wpb5jZntw8WEKJ6IzAND11tdjk="; hash = "sha256-fXeea4MftVSJWzanHeAuERRiQLBp8l1l1Cw2lG3uz24=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

30
pkgs/tools/admin/lexicon/default.nix
View file

@ -3,42 +3,18 @@
, fetchFromGitHub , fetchFromGitHub
}: }:
let with python3.pkgs;
py = python3.override {
packageOverrides = self: super: {
# until https://github.com/ags-slc/localzone/issues/1 gets resolved
dnspython = super.dnspython.overridePythonAttrs(oldAttrs: rec {
pname = "dnspython";
version = "1.16.0";
# since name is defined from the previous derivation, need to override
# name explicity for correct version to show in drvName
name = "${pname}-${version}";
src = super.fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "00cfamn97w2vhq3id87f10mjna8ag5yz5dw0cy5s0sa3ipiyii9n";
};
});
localzone = super.localzone.overridePythonAttrs(oldAttrs: rec {
meta = oldAttrs.meta // { broken = false; };
});
};
};
in
with py.pkgs;
buildPythonApplication rec { buildPythonApplication rec {
pname = "lexicon"; pname = "lexicon";
version = "3.9.0"; version = "3.9.4";
format = "pyproject"; format = "pyproject";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "AnalogJ"; owner = "AnalogJ";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-qJFHwFzFjZVdQv4YfrlR2cMQHsEtpQbvg/DMo6C5/z0="; hash = "sha256-TySgIxBEl2RolndAkEN4vCIDKaI48vrh2ocd+CTn7Ow=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/tools/admin/oci-cli/default.nix
View file

@ -23,14 +23,14 @@ with py.pkgs;
buildPythonApplication rec { buildPythonApplication rec {
pname = "oci-cli"; pname = "oci-cli";
version = "3.5.0"; version = "3.6.0";
format = "setuptools"; format = "setuptools";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "oracle"; owner = "oracle";
repo = "oci-cli"; repo = "oci-cli";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-udvYfYFUulGfnc1gzjG3UxOc68JuecpPJ1/s57qvX0k="; hash = "sha256-ADjHPRG3QzSWR7FvcTIJdcBYmzZK+SWipdY1giNtaME=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [