mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-26 08:53:21 +00:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
46679c6a02
@ -1,56 +0,0 @@
|
||||
{ lib, stdenv, fetchurl, dpkg, autoPatchelfHook, makeWrapper, electron
|
||||
, alsa-lib, gtk3, libxshmfence, mesa, nss, popt }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "binance";
|
||||
version = "1.39.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/binance/desktop/releases/download/v${version}/${pname}-${version}-amd64-linux.deb";
|
||||
sha256 = "sha256-6VQerIzX2u8QGUsa8kvu6Qud3OEn9lrZkQddfkZ1X0g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
dpkg
|
||||
autoPatchelfHook
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
buildInputs = [ alsa-lib gtk3 libxshmfence mesa nss popt ];
|
||||
|
||||
libPath = lib.makeLibraryPath buildInputs;
|
||||
|
||||
dontBuild = true;
|
||||
dontConfigure = true;
|
||||
|
||||
unpackPhase = ''
|
||||
dpkg-deb -x ${src} ./
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mv usr $out
|
||||
mv opt $out
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
substituteInPlace $out/share/applications/binance.desktop --replace '/opt/Binance' $out/bin
|
||||
|
||||
makeWrapper ${electron}/bin/electron \
|
||||
$out/bin/binance \
|
||||
--add-flags $out/opt/Binance/resources/app.asar \
|
||||
--prefix LD_LIBRARY_PATH : ${libPath}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Binance Cryptoexchange Official Desktop Client";
|
||||
homepage = "https://www.binance.com/en/desktop-download";
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ wolfangaukang ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
33
pkgs/by-name/ma/mariadb-connector-java/package.nix
Normal file
33
pkgs/by-name/ma/mariadb-connector-java/package.nix
Normal file
@ -0,0 +1,33 @@
|
||||
{ lib, maven, fetchFromGitHub }:
|
||||
|
||||
maven.buildMavenPackage rec {
|
||||
pname = "mariadb-connector-java";
|
||||
version = "3.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mariadb-corporation";
|
||||
repo = "mariadb-connector-j";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-ssh6v2h/Ikl2Ulim6lSJ45avjKSCh3Vmtg+LPOgONRU=";
|
||||
};
|
||||
|
||||
mvnHash = "sha256-MizBoFlpYxwwcU7rOac1h2VPJoXv3eRQgWRgsTh8Xno=";
|
||||
|
||||
# Disable tests because they require networking
|
||||
mvnParameters = "-DskipTests";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -m444 -D target/mariadb-java-client-${version}.jar $out/share/java/mariadb-java-client.jar
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "MariaDB Connector/J is used to connect applications developed in Java to MariaDB and MySQL databases";
|
||||
homepage = "https://mariadb.com/kb/en/about-mariadb-connector-j/";
|
||||
changelog = "https://mariadb.com/kb/en/mariadb-connector-j-release-notes/";
|
||||
license = licenses.lgpl21;
|
||||
maintainers = with maintainers; [ anthonyroussel ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
@ -26,13 +26,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gala";
|
||||
version = "7.1.2";
|
||||
version = "7.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-g+Zcdl6SJ4uO6I1x3Ru6efZkf+O3UaW790n/zxmGkHU=";
|
||||
sha256 = "sha256-0fDbR28gh7F8Bcnofn48BBP1CTsYnfmY5kG72ookOXw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
2902
pkgs/development/interpreters/lune/Cargo.lock
generated
2902
pkgs/development/interpreters/lune/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -8,22 +8,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "lune";
|
||||
version = "0.7.4";
|
||||
version = "0.7.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "filiptibell";
|
||||
repo = "lune";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-um8XsXT0O+gTORrJAVlTku6YURh0wljLaQ7fueF+AoQ=";
|
||||
hash = "sha256-5agoAXeO16/CihsgvUHt+pgA+/ph6PualTY6xqDQbeU=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"rbx_binary-0.7.0" = "sha256-bwGCQMXN8VdycsyS7Om/9CKMkamAa0eBK2I2aPZ/sZs=";
|
||||
};
|
||||
};
|
||||
cargoHash = "sha256-kPBPxlsicoFDyOsuJWhvQHDC2uwYQqpd7S+kQPRd8DY=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
@ -33,6 +28,22 @@ rustPlatform.buildRustPackage rec {
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
];
|
||||
|
||||
checkFlags = [
|
||||
# these all require internet access
|
||||
"--skip=tests::net_request_codes"
|
||||
"--skip=tests::net_request_compression"
|
||||
"--skip=tests::net_request_methods"
|
||||
"--skip=tests::net_request_query"
|
||||
"--skip=tests::net_request_redirect"
|
||||
"--skip=tests::net_socket_wss"
|
||||
"--skip=tests::net_socket_wss_rw"
|
||||
"--skip=tests::roblox_instance_custom_async"
|
||||
"--skip=tests::serde_json_decode"
|
||||
|
||||
# this tries to use the root directory as the CWD
|
||||
"--skip=tests::process_spawn_cwd"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A standalone Luau script runtime";
|
||||
homepage = "https://github.com/filiptibell/lune";
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dask-awkward";
|
||||
version = "2023.11.0";
|
||||
version = "2023.11.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "dask-contrib";
|
||||
repo = "dask-awkward";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-oOIXqKwKjF6wCgRNRJ2EZn4F7sMqUKDSNQuGUpvL7sA=";
|
||||
hash = "sha256-yx0B31x+BMS4alHro+hAPeVB6YK9B7Tg+3sSCMCYjKs=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
@ -7,14 +7,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pex";
|
||||
version = "2.1.149";
|
||||
format = "pyproject";
|
||||
version = "2.1.151";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-C3RR0WUq63O875v23TQ8GwPGTgGuOqhYhwtfkCMFBfE=";
|
||||
hash = "sha256-op7V7Xn0qzcCTyISyi/Z4bhdk/W7Ol5YbmvD2Sl5zkM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "precis-i18n";
|
||||
version = "1.0.5";
|
||||
version = "1.1.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -15,7 +15,7 @@ buildPythonPackage rec {
|
||||
owner = "byllyfish";
|
||||
repo = "precis_i18n";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-DSm+KomveGs9ZzNFiT0B1gAjx2fh0BaUdKW0J+kW24U=";
|
||||
hash = "sha256-0Z8JbakShuB8FFGl3NS8VFpHAQgr2P900HVxUafAmyU=";
|
||||
};
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "psygnal";
|
||||
version = "0.9.2";
|
||||
version = "0.9.4";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = "pyapp-kit";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Ki2s057aqaZa+kOpAlhBYFpZeuDX42+txQXFuBtXd04=";
|
||||
hash = "sha256-1oy0gXHDAoCIPXAitQv6MRb3p2j89zBaZvpUni6wT8A=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
@ -11,14 +11,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "py-pdf-parser";
|
||||
version = "0.11.0";
|
||||
version = "0.12.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-GsiGBigvtAgrM0sRffZBG2tVoEaDai+eUxXhMXWNBr0=";
|
||||
hash = "sha256-nMEmzQVz1LR4omHyxhvrjBXDQQE23S62T0wxZeMnXhg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -15,14 +15,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyathena";
|
||||
version = "3.0.9";
|
||||
version = "3.0.10";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-RGU4UF+Nhfc2LGQlYf8ImrmDf2009JTSx6cO4o3VuDI=";
|
||||
hash = "sha256-HvmD1Hi8GCwuox11v0/VdVQlmF5dpPjhgSNfLScz5TY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pycaption";
|
||||
version = "2.1.1";
|
||||
version = "2.2.0";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-B+uIh8WTPPeNVU3yP8FEGc8OinY0MpJb9dHLC+nhi4I=";
|
||||
hash = "sha256-W/sD/Nh2k1z7YvFVnQB9dGa1bXoCTb4QrPk/1mi4Hdk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -24,11 +24,11 @@ let
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "pycuda";
|
||||
version = "2022.2.2";
|
||||
version = "2023.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-zZLnJGu0WsNFKVWhEHFBEmdM3ztKni9P8lpBWcaE5rs=";
|
||||
hash = "sha256-F1/2dfDPEOOOmtwD7V3z7Y2Kv32lE0yNzOx1LooKPpE=";
|
||||
};
|
||||
|
||||
preConfigure = with lib.versions; ''
|
||||
|
||||
@ -25,14 +25,10 @@ buildPythonPackage rec {
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix sklearn 1.2.0 compat; https://github.com/lmcinnes/pynndescent/issues/207
|
||||
# https://github.com/lmcinnes/pynndescent/pull/224
|
||||
(fetchpatch {
|
||||
url = "https://github.com/lmcinnes/pynndescent/commit/00444be2107b71169b853847e7b334623c58a4e3.patch";
|
||||
hash = "sha256-mbe01BwroS5q6hENsj3NejmGGhmk2IeX4LD6Iq6PR0c=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/lmcinnes/pynndescent/commit/e56b92776a4a05f2dabb80d25479bd37e7ebd88e.patch";
|
||||
hash = "sha256-zVTaW4syGEHh2HAGPyBN3YXqUGe55v/LxKLX/zjXT5Y=";
|
||||
url = "https://github.com/lmcinnes/pynndescent/commit/86e0d716a3a4d5f4e6a0a3c2952f6fe339524e96.patch";
|
||||
hash = "sha256-dfnT5P9Qsn/nSAr4Ysqo/olbLLfoZXvBRz33yzhN3J4=";
|
||||
})
|
||||
];
|
||||
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyorthanc";
|
||||
version = "1.12.3";
|
||||
version = "1.13.1";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
format = "pyproject";
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "gacou54";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-9+HP95OsJIXsLy+6m6fWECU3jXxY++C3wQJBcqnC+H0=";
|
||||
hash = "sha256-LahLR+LbppcPKs0gPT2lEP48XG6pbGMvCBW/EwAIFDQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pythonRelaxDepsHook poetry-core ];
|
||||
|
||||
@ -5,11 +5,11 @@
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "rpmfile";
|
||||
version = "1.1.1";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-ZxcHe1QxdG2GBIPMNrnJy6Vd8SRgZ4HOtwsks2be8Cs=";
|
||||
sha256 = "sha256-tLDdVTrZlxGk+oYmeCm/4XLAPx6hzkztJP+lXtiDhb4=";
|
||||
};
|
||||
|
||||
# Tests access the internet
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "seaborn";
|
||||
version = "0.13.0rc0";
|
||||
version = "0.13.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = "mwaskom";
|
||||
repo = "seaborn";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-bNuTDXUjdOwqJN1U20eaeSa4/Q3Fe2XMqulqVmDLFEU=";
|
||||
hash = "sha256-RbtBNKTjUHdCFe1V7IvACgbSNIPhVFMYmtE34GKVIzs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "umap-learn";
|
||||
version = "0.5.3";
|
||||
version = "0.5.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -25,40 +25,9 @@ buildPythonPackage rec {
|
||||
owner = "lmcinnes";
|
||||
repo = "umap";
|
||||
rev = version;
|
||||
hash = "sha256-S2+k7Ec4AxsN6d0GUGnU81oLnBgmlZp8OmUFCNaUJYw=";
|
||||
hash = "sha256-cvAq9b7xDowLIfIAzV+X08SUEL0QOisr/wBXMYeQ/8A=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix tests with sklearn>=1.2.0
|
||||
(fetchpatch {
|
||||
url = "https://github.com/lmcinnes/umap/commit/a714b59bd9e2ca2e63312bc3491b2b037a42f2f2.patch";
|
||||
hash = "sha256-WOSWNN5ewVTV7IEBEA7ZzgZYMZxctF1jAWs9ylKTyLs=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/lmcinnes/umap/commit/c7d05683325589ad432a55e109cacb9d631cfaa9.patch";
|
||||
hash = "sha256-hE2Svxf7Uja+DbCmTDCnd7mZynjNbC5GUjfqg4ZRO9Y=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/lmcinnes/umap/commit/949abd082524fce8c45dfb147bcd8e8ef49eade3.patch";
|
||||
hash = "sha256-8/1k8iYeF77FIaUApNtY07auPJkrt3vNRR/HTYRvq+0=";
|
||||
})
|
||||
# Fix tests with numpy>=1.24
|
||||
# https://github.com/lmcinnes/umap/pull/952
|
||||
(fetchpatch {
|
||||
url = "https://github.com/lmcinnes/umap/commit/588e1f724c9f5de528eb1500b0c85a1a609fe947.patch";
|
||||
hash = "sha256-B50eyMs3CRuzOAq+jxz56XMJPdiUofUxCL0Vqolaafo=";
|
||||
})
|
||||
# https://github.com/lmcinnes/umap/pull/1010
|
||||
(fetchpatch {
|
||||
url = "https://github.com/lmcinnes/umap/commit/848396c762c894e666aaf3d0bcfe1e041b529ea6.patch";
|
||||
hash = "sha256-ir0Pxfr2c0oSuFGXQqHjkj7nzvlpTXCYbaI9qAiLun0=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/lmcinnes/umap/commit/30e39938f4627f327223245dfe2c908af6b7e304.patch";
|
||||
hash = "sha256-7Divrym05wIPa7evgrNYXGm44/EOWG8sIYV8fmtuzJ4=";
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
numba
|
||||
numpy
|
||||
|
||||
@ -13,16 +13,16 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "buildkite-agent";
|
||||
version = "3.55.0";
|
||||
version = "3.59.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "buildkite";
|
||||
repo = "agent";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-HvpEEutvdVHyzDtHdlc7ZB9xwnCKYWKbH/A1gAtR+Wk=";
|
||||
sha256 = "sha256-pYaxjXoNn6MOE2oHUSKrBzP5oKhtfJwSHFCkcpkyzas=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-bIOS9Ja+mue6LNXUGmkLobh+lLiJfBDtNrAX3fp0jMY=";
|
||||
vendorHash = "sha256-JSuam9Tn+ZekfLrj78tBncH7Q2aP4CaUgaaDkJ/azEw=";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace clicommand/agent_start.go --replace /bin/bash ${bash}/bin/bash
|
||||
|
||||
@ -2,16 +2,21 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-sweep";
|
||||
version = "0.6.2";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "holmgr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-tumcGnYqY/FGP8UWA0ccfdAK49LBcT8qH6SshrDXNAI=";
|
||||
sha256 = "sha256-L9tWTgW8PIjxeby+wa71NPp3kWMYH5D7PNtpk8Bmeyc=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-fcosKyGOy0SKrHbsKdxQJimelt1ByAM4YKo7WpHV8CA=";
|
||||
cargoSha256 = "sha256-aalB7gHLc3YIgSOg68wc2fyzXFGfHO5x5YdzhuRmyro=";
|
||||
|
||||
checkFlags = [
|
||||
# Requires a rustup toolchain to be installed.
|
||||
"--skip check_toolchain_listing_on_multiple_projects"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Cargo subcommand for cleaning up unused build files generated by Cargo";
|
||||
|
||||
@ -10,13 +10,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "fastly";
|
||||
version = "10.6.1";
|
||||
version = "10.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fastly";
|
||||
repo = "cli";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-O71stl9vLbeNOtW9XeUuKSpB2JmnM4sawN+iFoTJHas=";
|
||||
hash = "sha256-j4dqLV1Q17RQczkTqGTh8S8Y6ELqXjWuJRr+xB/x2yE=";
|
||||
# The git commit is part of the `fastly version` original output;
|
||||
# leave that output the same in nixpkgs. Use the `.git` directory
|
||||
# to retrieve the commit SHA, and remove the directory afterwards,
|
||||
@ -33,7 +33,7 @@ buildGoModule rec {
|
||||
"cmd/fastly"
|
||||
];
|
||||
|
||||
vendorHash = "sha256-g4cUjvFH5F/GfABgG2GKS04XlyJuM+xJ3oQAqT3xjis=";
|
||||
vendorHash = "sha256-aCekNpf6C5fGIEk0pLkz4hJ6mQfBIzeCsIL6Fxf2QGk=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@ -22,13 +22,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "sketchybar";
|
||||
version = "2.18.0";
|
||||
version = "2.19.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FelixKratz";
|
||||
repo = "SketchyBar";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-GeFB+eE/NW9ZopwVSmSfMK3WiJLCJNXOdmQpYc3m8WE=";
|
||||
hash = "sha256-Ge15Df65fvNJ8ZdJ8giqvYytIivup2IIFPS+Ie3Yl9A=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
@ -43,6 +43,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
SkyLight
|
||||
];
|
||||
|
||||
# NOTE: Release didn't bump patch version remove with next release
|
||||
postPatch = ''
|
||||
substituteInPlace src/sketchybar.c \
|
||||
--replace "#define PATCH 0" "#define PATCH 1"
|
||||
'';
|
||||
|
||||
makeFlags = [
|
||||
target
|
||||
];
|
||||
|
||||
@ -1,8 +1,10 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, python3
|
||||
, groff
|
||||
, less
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
, nix-update-script
|
||||
, testers
|
||||
, awscli2
|
||||
@ -20,8 +22,8 @@ let
|
||||
urllib3 = prev.urllib3.overridePythonAttrs (prev: {
|
||||
format = "setuptools";
|
||||
src = prev.src.override {
|
||||
version = "1.26.16";
|
||||
hash = "sha256-jxNfZQJ1a95rKpsomJ31++h8mXDOyqaQQe3M5/BYmxQ=";
|
||||
version = "1.26.18";
|
||||
hash = "sha256-+OzBu6VmdBNFfFKauVW/jGe0XbeZ0VkGYmFxnjKFgKA=";
|
||||
};
|
||||
});
|
||||
});
|
||||
@ -30,21 +32,21 @@ let
|
||||
in
|
||||
with py.pkgs; buildPythonApplication rec {
|
||||
pname = "awscli2";
|
||||
version = "2.13.28"; # N.B: if you change this, check if overrides are still up-to-date
|
||||
version = "2.13.33"; # N.B: if you change this, check if overrides are still up-to-date
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws";
|
||||
repo = "aws-cli";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-rl4gBjuCnXfyJMv/2KIeujK0ouR624+AYaVYn4ri1Nk=";
|
||||
hash = "sha256-5ANfMa7b72z5E1EH9+dJ9avLDBnSEFGqvDOFFzLbZcM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'cryptography>=3.3.2,<40.0.2' 'cryptography>=3.3.2' \
|
||||
--replace 'flit_core>=3.7.1,<3.8.1' 'flit_core>=3.7.1' \
|
||||
--replace 'awscrt>=0.16.4,<=0.16.16' 'awscrt>=0.16.4' \
|
||||
--replace 'awscrt>=0.16.4,<=0.19.6' 'awscrt>=0.16.4' \
|
||||
--replace 'docutils>=0.10,<0.20' 'docutils>=0.10' \
|
||||
--replace 'prompt-toolkit>=3.0.24,<3.0.39' 'prompt-toolkit>=3.0.24'
|
||||
|
||||
@ -59,6 +61,7 @@ with py.pkgs; buildPythonApplication rec {
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
flit-core
|
||||
];
|
||||
|
||||
@ -87,15 +90,10 @@ with py.pkgs; buildPythonApplication rec {
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/${python3.sitePackages}/awscli/data
|
||||
${python3.interpreter} scripts/gen-ac-index --index-location $out/${python3.sitePackages}/awscli/data/ac.index
|
||||
|
||||
mkdir -p $out/share/bash-completion/completions
|
||||
echo "complete -C $out/bin/aws_completer aws" > $out/share/bash-completion/completions/aws
|
||||
|
||||
mkdir -p $out/share/zsh/site-functions
|
||||
mv $out/bin/aws_zsh_completer.sh $out/share/zsh/site-functions
|
||||
|
||||
installShellCompletion --cmd aws \
|
||||
--bash <(echo "complete -C $out/bin/aws_completer aws") \
|
||||
--zsh $out/bin/aws_zsh_completer.sh
|
||||
'' + lib.optionalString (!stdenv.hostPlatform.isWindows) ''
|
||||
rm $out/bin/aws.cmd
|
||||
'';
|
||||
|
||||
@ -136,7 +134,7 @@ with py.pkgs; buildPythonApplication rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Unified tool to manage your AWS services";
|
||||
homepage = "https://docs.aws.amazon.com/cli/latest/userguide/install-cliv2.html";
|
||||
homepage = "https://docs.aws.amazon.com/cli/latest/userguide/";
|
||||
changelog = "https://github.com/aws/aws-cli/blob/${version}/CHANGELOG.rst";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ bhipple davegallant bryanasdev000 devusb anthonyroussel ];
|
||||
|
||||
@ -89,6 +89,7 @@ mapAliases ({
|
||||
bash_5 = bash; # Added 2021-08-20
|
||||
bazel_3 = throw "bazel 3 is past end of life as it is not an lts version"; # Added 2023-02-02
|
||||
bedup = throw "bedup was removed because it was broken and abandoned upstream"; # added 2023-02-04
|
||||
binance = throw "binance has been removed, because it depends on a very outdated and insecure version of electron"; # Added 2023-11-09
|
||||
bird2 = bird; # Added 2022-02-21
|
||||
bitwig-studio1 = throw "bitwig-studio1 has been removed, you can upgrade to 'bitwig-studio'"; # Added 2023-01-03
|
||||
bitwig-studio2 = throw "bitwig-studio2 has been removed, you can upgrade to 'bitwig-studio'"; # Added 2023-01-03
|
||||
|
||||
@ -3546,10 +3546,6 @@ with pkgs;
|
||||
|
||||
bic = callPackage ../development/interpreters/bic { };
|
||||
|
||||
binance = callPackage ../applications/misc/binance {
|
||||
electron = electron_13;
|
||||
};
|
||||
|
||||
biscuit-cli = callPackage ../tools/security/biscuit-cli { };
|
||||
|
||||
bitwarden = callPackage ../tools/security/bitwarden { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user