diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-10-14 12:01:35 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-10-14 12:01:35 +0000 |
commit | cc090d2b942f76fad83faf6e9c5ed44b73ba7114 (patch) | |
tree | ec584f904d5d5629685fee21ade61ae94aa4fb51 /pkgs/development | |
parent | c3ee9d1583170240202121f07223100af1bad9f8 (diff) | |
parent | 5e66f427c661955f08d55f654e82bab1b1a7abc1 (diff) | |
download | nixpkgs-cc090d2b942f76fad83faf6e9c5ed44b73ba7114.tar nixpkgs-cc090d2b942f76fad83faf6e9c5ed44b73ba7114.tar.gz nixpkgs-cc090d2b942f76fad83faf6e9c5ed44b73ba7114.tar.bz2 nixpkgs-cc090d2b942f76fad83faf6e9c5ed44b73ba7114.tar.lz nixpkgs-cc090d2b942f76fad83faf6e9c5ed44b73ba7114.tar.xz nixpkgs-cc090d2b942f76fad83faf6e9c5ed44b73ba7114.tar.zst nixpkgs-cc090d2b942f76fad83faf6e9c5ed44b73ba7114.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/development')
12 files changed, 76 insertions, 46 deletions
diff --git a/pkgs/development/libraries/nvidia-vaapi-driver/default.nix b/pkgs/development/libraries/nvidia-vaapi-driver/default.nix index 7225efad2f6..3554457d3f2 100644 --- a/pkgs/development/libraries/nvidia-vaapi-driver/default.nix +++ b/pkgs/development/libraries/nvidia-vaapi-driver/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "nvidia-vaapi-driver"; - version = "0.0.6"; + version = "0.0.7"; src = fetchFromGitHub { owner = "elFarto"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/9PCqjs0hiIM7ZLvDesff5Bh0a1B8/w/CTw62spw+j4="; + sha256 = "sha256-c74XJW9e8sgjBuTpZQOgIvgEoP73aQlx6beE6bChYfw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/odpic/default.nix b/pkgs/development/libraries/odpic/default.nix index b13aa66eb8f..30ddc3d3b62 100644 --- a/pkgs/development/libraries/odpic/default.nix +++ b/pkgs/development/libraries/odpic/default.nix @@ -38,7 +38,7 @@ in stdenv.mkDerivation { homepage = "https://oracle.github.io/odpi/"; maintainers = with maintainers; [ mkazulak flokli ]; license = licenses.asl20; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; hydraPlatforms = []; }; } diff --git a/pkgs/development/libraries/oracle-instantclient/default.nix b/pkgs/development/libraries/oracle-instantclient/default.nix index f5a414786ac..129874c1dfb 100644 --- a/pkgs/development/libraries/oracle-instantclient/default.nix +++ b/pkgs/development/libraries/oracle-instantclient/default.nix @@ -22,18 +22,32 @@ let # determine the version number, there might be different ones per architecture version = { - x86_64-linux = "19.3.0.0.0"; + x86_64-linux = "19.16.0.0.0"; + aarch64-linux = "19.10.0.0.0"; x86_64-darwin = "19.3.0.0.0"; }.${stdenv.hostPlatform.system} or throwSystem; + directory = { + x86_64-linux = "1916000"; + aarch64-linux = "191000"; + x86_64-darwin = "193000"; + }.${stdenv.hostPlatform.system} or throwSystem; + # hashes per component and architecture hashes = { x86_64-linux = { - basic = "1yk4ng3a9ka1mzgfph9br6rwclagbgfvmg6kja11nl5dapxdzaxy"; - sdk = "115v1gqr0czy7dcf2idwxhc6ja5b0nind0mf1rn8iawgrw560l99"; - sqlplus = "0zj5h84ypv4n4678kfix6jih9yakb277l9hc0819iddc0a5slbi5"; - tools = "1q19blr0gz1c8bq0bnv1njzflrp03hf82ngid966xc6gwmqpkdsk"; - odbc = "1g1z6pdn76dp440fh49pm8ijfgjazx4cvxdi665fsr62h62xkvch"; + basic = "sha256-Sq1rWvbC1YME7EjSYPaP2g+1Xxxkk4ZkGaBmLo2cKcQ="; + sdk = "sha256-yJ8f/Hlq6vZoPxv+dfY4z1E7rWvcqlK+ou0SU0KKlEI="; + sqlplus = "sha256-C44srukpCB9et9UWm59daJmU83zr0HAktnWv7R42Irw="; + tools = "sha256-GP4E1REIoU3lctVYmLsAiwTJEvGRpCmOFlRuZk+A8HE="; + odbc = "sha256-JECxK7Ia1IJtve2goZJdTkvm5NJjqB2rc6k5BXUt3oA="; + }; + aarch64-linux = { + basic = "sha256-DNntH20BAmo5kOz7uEgW2NXaNfwdvJ8l8oMnp50BOsY="; + sdk = "sha256-8VpkNyLyFMUfQwbZpSDV/CB95RoXfaMr8w58cRt/syw="; + sqlplus = "sha256-iHcyijHhAvjsAqN9R+Rxo2R47k940VvPbScc2MWYn0Q="; + tools = "sha256-4QY0EwcnctwPm6ZGDZLudOFM4UycLFmRIluKGXVwR0M="; + odbc = "sha256-T+RIIKzZ9xEg/E72pfs5xqHz2WuIWKx/oRfDrQbw3ms="; }; x86_64-darwin = { basic = "f4335c1d53e8188a3a8cdfb97494ff87c4d0f481309284cf086dc64080a60abd"; @@ -50,11 +64,13 @@ let # convert platform to oracle architecture names arch = { x86_64-linux = "linux.x64"; + aarch64-linux = "linux.arm64"; x86_64-darwin = "macos.x64"; }.${stdenv.hostPlatform.system} or throwSystem; shortArch = { x86_64-linux = "linux"; + aarch64-linux = "linux"; x86_64-darwin = "mac"; }.${stdenv.hostPlatform.system} or throwSystem; @@ -62,12 +78,11 @@ let srcFilename = component: arch: version: rel: "instantclient-${component}-${arch}-${version}" + (optionalString (rel != "") "-${rel}") + - (optionalString (arch == "linux.x64" || arch == "macos.x64") "dbru") + # ¯\_(ツ)_/¯ - ".zip"; + "dbru.zip"; # ¯\_(ツ)_/¯ # fetcher for the non clickthrough artifacts fetcher = srcFilename: hash: fetchurl { - url = "https://download.oracle.com/otn_software/${shortArch}/instantclient/193000/${srcFilename}"; + url = "https://download.oracle.com/otn_software/${shortArch}/instantclient/${directory}/${srcFilename}"; sha256 = hash; }; @@ -127,7 +142,7 @@ stdenv.mkDerivation { ''; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.unfree; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; maintainers = with maintainers; [ flokli ]; hydraPlatforms = [ ]; }; diff --git a/pkgs/development/libraries/physics/clhep/default.nix b/pkgs/development/libraries/physics/clhep/default.nix index 6f648463c85..a3b85e36796 100644 --- a/pkgs/development/libraries/physics/clhep/default.nix +++ b/pkgs/development/libraries/physics/clhep/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "clhep"; - version = "2.4.5.3"; + version = "2.4.6.0"; src = fetchurl { url = "https://proj-clhep.web.cern.ch/proj-clhep/dist1/clhep-${version}.tgz"; - hash = "sha256-RfY+6wl/Av5nuGp9rb8Q1Am0AcKKGj4XLbNiUsMJfBM="; + hash = "sha256-6NFt67hM7SjkDproR4nPWgra1F+SE/usPOdYPgbKp7E="; }; prePatch = '' diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index 1da9b869a0d..c915a3df521 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "rocksdb"; - version = "7.7.2"; + version = "7.7.3"; src = fetchFromGitHub { owner = "facebook"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Cla2yat/xCrzx53mYRKjcvH9cCY0MVD8RSMjGfxVDUM="; + sha256 = "sha256-Np3HPTZYzyoPOKL0xgsLzcvOkceFiEQd+1nyGbg4BHo="; }; nativeBuildInputs = [ cmake ninja ]; diff --git a/pkgs/development/python-modules/aioftp/default.nix b/pkgs/development/python-modules/aioftp/default.nix index 8f0ef50e7fd..df7575de048 100644 --- a/pkgs/development/python-modules/aioftp/default.nix +++ b/pkgs/development/python-modules/aioftp/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "aioftp"; - version = "0.21.3"; + version = "0.21.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-xtrlCzqgfwlbLZOoN9Y23ZPyNaqv5Ure+Cvg+OVWf9I="; + sha256 = "sha256-KLsm1GFsfDgaFUMoH5hwUbjS0dW/rwI9nn4sIQXFG7k="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/radish-bdd/default.nix b/pkgs/development/python-modules/radish-bdd/default.nix index f75e5cc19ee..258cd012716 100644 --- a/pkgs/development/python-modules/radish-bdd/default.nix +++ b/pkgs/development/python-modules/radish-bdd/default.nix @@ -7,41 +7,56 @@ , freezegun , humanize , lark +, lxml , parse-type , pysingleton +, pytest-mock , pytestCheckHook +, pythonOlder , pyyaml , tag-expressions -, lxml -, pytest-mock }: buildPythonPackage rec { pname = "radish-bdd"; - version = "0.13.4"; + version = "0.14.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; - # Pypi package does not have necessary test fixtures. src = fetchFromGitHub { owner = pname; repo = "radish"; - rev = "v${version}"; - sha256 = "1slfgh61648i009qj8156qipy21a6zm8qzjk00kbm5kk5z9jfryi"; + rev = "refs/tags/v${version}"; + hash = "sha256-7C8XgGlpNVUONSfg9DsIS8Awpy6iDzFOLAFs1xpfHXI="; }; propagatedBuildInputs = [ - lark click colorful - tag-expressions - parse-type - humanize - pyyaml docopt + humanize + lark + lxml + parse-type pysingleton + tag-expressions + ]; + + checkInputs = [ + freezegun + pytest-mock + pytestCheckHook + pyyaml ]; - checkInputs = [ freezegun lxml pytestCheckHook pytest-mock ]; - disabledTests = [ "test_main_cli_calls" ]; + pythonImportsCheck = [ + "radish" + ]; + + disabledTests = [ + "test_main_cli_calls" + ]; meta = with lib; { description = "Behaviour-Driven-Development tool for python"; diff --git a/pkgs/development/tools/analysis/rizin/cutter.nix b/pkgs/development/tools/analysis/rizin/cutter.nix index f7c5eae72a8..3eb953bd480 100644 --- a/pkgs/development/tools/analysis/rizin/cutter.nix +++ b/pkgs/development/tools/analysis/rizin/cutter.nix @@ -11,13 +11,13 @@ mkDerivation rec { pname = "cutter"; - version = "2.1.0"; + version = "2.1.2"; src = fetchFromGitHub { owner = "rizinorg"; repo = "cutter"; rev = "v${version}"; - sha256 = "sha256-JfJQuEUeLXCjzm4d0ZNHRVazF0Bk6fVAsNvBb+okoXs="; + sha256 = "sha256-rJYnKQYrwj2zSg3dBHOI7zxwXTAO7ImAj0dkbVmUvHU="; fetchSubmodules = true; }; diff --git a/pkgs/development/tools/continuous-integration/fly/default.nix b/pkgs/development/tools/continuous-integration/fly/default.nix index 7dd67dcebd3..c0211bd17fe 100644 --- a/pkgs/development/tools/continuous-integration/fly/default.nix +++ b/pkgs/development/tools/continuous-integration/fly/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fly"; - version = "7.8.2"; + version = "7.8.3"; src = fetchFromGitHub { owner = "concourse"; repo = "concourse"; rev = "v${version}"; - sha256 = "sha256-Lgsn5k3ITJnRnOXXZjfjlEEG+OvTZjFq+LB3Us3DH8k="; + sha256 = "sha256-7r9/r6gj8u3r4R5UQIxpnmJ33SGfEAuOcqRLK11khfc="; }; - vendorSha256 = "sha256-91N6AOxXFOI6AM28avlInseAeZkqE9IfybJAX31tPDg="; + vendorSha256 = "sha256-tEh1D/eczqLzuVQUcHE4+7Q74jM/yomdPDt6+TVJeew="; subPackages = [ "fly" ]; diff --git a/pkgs/development/tools/millet/default.nix b/pkgs/development/tools/millet/default.nix index afe20aef049..883e88866b7 100644 --- a/pkgs/development/tools/millet/default.nix +++ b/pkgs/development/tools/millet/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "millet"; - version = "0.3.14"; + version = "0.4.1"; src = fetchFromGitHub { owner = "azdavis"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fi0kU1+gazSfQEyL3qYcK/qeMh1UGuitGXJ9FsVAiTw="; + sha256 = "sha256-7CIi1a3SyuJzvBrjTE5wS7xKXEVdmUu2RUVeL3P//z8="; }; - cargoSha256 = "sha256-ijXGXq5+OOnf4Nmg68GcSKZe/5tjG0KebOsCWU+vmHc="; + cargoSha256 = "sha256-Dg/dq2/q+snqbkX1fR/mgKozfKZlZOuT5vXFTuu0AiY="; postPatch = '' rm .cargo/config.toml diff --git a/pkgs/development/tools/misc/terraform-ls/default.nix b/pkgs/development/tools/misc/terraform-ls/default.nix index b60dfa7f446..7570dd586f0 100644 --- a/pkgs/development/tools/misc/terraform-ls/default.nix +++ b/pkgs/development/tools/misc/terraform-ls/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "terraform-ls"; - version = "0.29.2"; + version = "0.29.3"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-oPBk5mTCq8nn4olC9Z7ROvrfAUXDxnWhm8w20sh5Wkw="; + sha256 = "sha256-CYbeRhwoffyELM0REZL14m4tTe/66GDToqNKcEfmums="; }; - vendorSha256 = "sha256-5Pb1mr3rYPcWFLjETAZp8rLW32n+RyCm7NbfooM4hZs="; + vendorSha256 = "sha256-wbB3/RfzL05SaLv49gs7WKrjV//dM3SjpbMNGI1yH4I="; ldflags = [ "-s" "-w" "-X main.version=v${version}" "-X main.prerelease=" ]; diff --git a/pkgs/development/tools/rust/cargo-pgx/default.nix b/pkgs/development/tools/rust/cargo-pgx/default.nix index 4ad70bfa9ed..e4ff582964f 100644 --- a/pkgs/development/tools/rust/cargo-pgx/default.nix +++ b/pkgs/development/tools/rust/cargo-pgx/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-pgx"; - version = "0.4.5"; + version = "0.5.0"; src = fetchCrate { inherit version pname; - sha256 = "sha256-BcMGa/1ATwLG8VnwItfd5eqmrck/u0MEoR5sA2yuzyQ="; + sha256 = "sha256-5UH34l4zmKFZY2uHLDqJ1kW/QRQbII0/zmmGA3DFKB4="; }; - cargoSha256 = "sha256-urlwqBCZMxlPEjLLPBhI2lDNTusCSZ1bZu1p8poVrtw="; + cargoSha256 = "sha256-1CU/VrNS3tGycjel5MV6SrZJ7LExds2YhdO+VAHgusM="; nativeBuildInputs = [ pkg-config ]; |