mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-10-29 21:51:49 +00:00
Merge release-24.05 into staging-next-24.05
This commit is contained in:
commit
dff61761c4
@ -7859,6 +7859,12 @@
|
||||
githubId = 6430643;
|
||||
name = "Henry Till";
|
||||
};
|
||||
hensoko = {
|
||||
email = "hensoko@pub.solar";
|
||||
github = "hensoko";
|
||||
githubId = 13552930;
|
||||
name = "hensoko";
|
||||
};
|
||||
heph2 = {
|
||||
email = "srht@mrkeebs.eu";
|
||||
github = "heph2";
|
||||
|
@ -2,6 +2,7 @@
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, python3
|
||||
, pythonRelaxDepsHook
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
@ -24,15 +25,20 @@ python3.pkgs.buildPythonApplication rec {
|
||||
})
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"pandas"
|
||||
"databricks-sql-connector"
|
||||
"sqlparse"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'python = ">=3.7.1,<4.0"' 'python = ">=3.8,<4.0"' \
|
||||
--replace 'pandas = "1.3.4"' 'pandas = "~1.5"'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
nativeBuildInputs = (with python3.pkgs; [
|
||||
poetry-core
|
||||
];
|
||||
]) ++ [ pythonRelaxDepsHook ];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
cli-helpers
|
||||
|
@ -1,11 +1,11 @@
|
||||
{
|
||||
stable = {
|
||||
chromedriver = {
|
||||
hash_darwin = "sha256-YndBzhUNmn5tJdCqLmpUrs2WBXXpTxiKCNczWEz6DU4=";
|
||||
hash_darwin = "sha256-SZfl93TcaD9j59zGflPFmHgIP5NaS8bgDi3l3SRRFiI=";
|
||||
hash_darwin_aarch64 =
|
||||
"sha256-taG58kMgQUD40aGqnyx9O9e9m4qGsTWX57cjD3NeHm4=";
|
||||
hash_linux = "sha256-raWGzhjqWdm5bRK+Z7Qga8QM9kQYSXxdL5N+wk1hlXI=";
|
||||
version = "130.0.6723.58";
|
||||
"sha256-wLX63aA8l+23ehdBHPcXtoZ2WEhrmYVKzqUDBbrhSRw=";
|
||||
hash_linux = "sha256-kP6N7fM+7+S3JwT2JvqfWDRCfAQiNc/rQlHxjJ8DNuo=";
|
||||
version = "130.0.6723.69";
|
||||
};
|
||||
deps = {
|
||||
gn = {
|
||||
@ -15,8 +15,8 @@
|
||||
version = "2024-09-09";
|
||||
};
|
||||
};
|
||||
hash = "sha256-w1xQr+B7ROeCqBRN+M9vmh45YTRqVfjDYSsN5saDuDo=";
|
||||
version = "130.0.6723.58";
|
||||
hash = "sha256-k0epbUw9D3Vx7ELNDXIFEnsML+cYvDnHZFOW0kz4Kq8=";
|
||||
version = "130.0.6723.69";
|
||||
};
|
||||
ungoogled-chromium = {
|
||||
deps = {
|
||||
@ -27,11 +27,11 @@
|
||||
version = "2024-09-09";
|
||||
};
|
||||
ungoogled-patches = {
|
||||
hash = "sha256-M+aJ1hhFV88lBBPl9xBYpYRut7yHa/HJYXoclckaZVM=";
|
||||
rev = "130.0.6723.58-1";
|
||||
hash = "sha256-usNlX/ol8Zn3lQTvp311DuyYbSHF/HN0r7k8qeUIJmU=";
|
||||
rev = "130.0.6723.69-1";
|
||||
};
|
||||
};
|
||||
hash = "sha256-w1xQr+B7ROeCqBRN+M9vmh45YTRqVfjDYSsN5saDuDo=";
|
||||
version = "130.0.6723.58";
|
||||
hash = "sha256-k0epbUw9D3Vx7ELNDXIFEnsML+cYvDnHZFOW0kz4Kq8=";
|
||||
version = "130.0.6723.69";
|
||||
};
|
||||
}
|
||||
|
@ -1,9 +1,9 @@
|
||||
{
|
||||
"version" = "1.11.81";
|
||||
"version" = "1.11.82";
|
||||
"hashes" = {
|
||||
"desktopSrcHash" = "sha256-Dr1Bu05UzfqXDceBC6GP3A3Actt5ycUZlJ+MSLYkDZ0=";
|
||||
"desktopYarnHash" = "19ly8as7y1a1vwaxzmziwia3idnndf1iyz0l160zc213pd3nzabz";
|
||||
"webSrcHash" = "sha256-NaoBGyoHyCfmcOOokkQL6DrLxVQufVdZP/pgVMY6CPA=";
|
||||
"webYarnHash" = "1ap2cjxz5332sm7b1fv0530pibgrfman90i7msyr6a1zfvvds0cc";
|
||||
"desktopSrcHash" = "sha256-XG8q37N4PehYKPyoedgsIIBp2jrSHtoSJKaGrsxaIM8=";
|
||||
"desktopYarnHash" = "11130y915pa356fikk3i96w81ms41284x11d4xm1xw8385smjbgq";
|
||||
"webSrcHash" = "sha256-2W3noZfVnxpxwihimH6mlTxFpBpAdvXtLLfVHRiToxE=";
|
||||
"webYarnHash" = "1rmimxkd70ynrf29s67336vv43g2i6ry8bibc06zb8qyicg6ld83";
|
||||
};
|
||||
}
|
||||
|
@ -1,6 +1,7 @@
|
||||
{
|
||||
autoPatchelfHook,
|
||||
copyDesktopItems,
|
||||
fetchurl,
|
||||
fetchzip,
|
||||
lib,
|
||||
libGL,
|
||||
@ -79,6 +80,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
comment = description;
|
||||
desktopName = name;
|
||||
genericName = name;
|
||||
icon = fetchurl {
|
||||
url = "https://www.geeks3d.com/furmark/i/20240220-furmark-logo-02.png";
|
||||
hash = "sha256-EqhWQgTEmF/2AcqDxgGtr2m5SMYup28hPEhI6ssFw7g=";
|
||||
};
|
||||
categories = [
|
||||
"System"
|
||||
"Monitor"
|
||||
|
@ -166,11 +166,11 @@ let
|
||||
|
||||
linux = stdenv.mkDerivation (finalAttrs: {
|
||||
inherit pname meta passthru;
|
||||
version = "130.0.6723.58";
|
||||
version = "130.0.6723.69";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
|
||||
hash = "sha256-HWFC+9Op4ja/S3eP56N9hkOkMbCrbF+NHEcxSLb85Hg=";
|
||||
hash = "sha256-MhLaPV2Ht4ZYsmrs4HWYtv/IFqD/mQVZwA/IVnZfND8=";
|
||||
};
|
||||
|
||||
# With strictDeps on, some shebangs were not being patched correctly
|
||||
@ -266,11 +266,11 @@ let
|
||||
|
||||
darwin = stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
inherit pname meta passthru;
|
||||
version = "130.0.6723.59";
|
||||
version = "130.0.6723.70";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://dl.google.com/release2/chrome/oehlfkedv43jkzlol2mqd6xife_130.0.6723.59/GoogleChrome-130.0.6723.59.dmg";
|
||||
hash = "sha256-ioEWtD49XtZTItz+bCiDobV0nW82Dv6S41/oHlUsatU=";
|
||||
url = "http://dl.google.com/release2/chrome/acl5a2wdujowx65sbvjgokb6thqq_130.0.6723.70/GoogleChrome-130.0.6723.70.dmg";
|
||||
hash = "sha256-Ft+kBhYnnMpsRsCmmXp9rgyGuwCAb9WW6u5z6UJzh7o=";
|
||||
};
|
||||
|
||||
dontPatch = true;
|
||||
|
@ -1,30 +1,31 @@
|
||||
{ alsa-lib
|
||||
, libuuid
|
||||
, cups
|
||||
, dpkg
|
||||
, fetchurl
|
||||
, glib
|
||||
, libssh2
|
||||
, gtk3
|
||||
, lib
|
||||
, libayatana-appindicator
|
||||
, libdrm
|
||||
, libgcrypt
|
||||
, libkrb5
|
||||
, libnotify
|
||||
, mesa # for libgbm
|
||||
, libpulseaudio
|
||||
, libGL
|
||||
, nss
|
||||
, xorg
|
||||
, systemd
|
||||
, stdenv
|
||||
, vips
|
||||
, at-spi2-core
|
||||
, autoPatchelfHook
|
||||
, makeShellWrapper
|
||||
, wrapGAppsHook3
|
||||
, commandLineArgs ? ""
|
||||
{
|
||||
alsa-lib,
|
||||
libuuid,
|
||||
cups,
|
||||
dpkg,
|
||||
fetchurl,
|
||||
glib,
|
||||
libssh2,
|
||||
gtk3,
|
||||
lib,
|
||||
libayatana-appindicator,
|
||||
libdrm,
|
||||
libgcrypt,
|
||||
libkrb5,
|
||||
libnotify,
|
||||
mesa, # for libgbm
|
||||
libpulseaudio,
|
||||
libGL,
|
||||
nss,
|
||||
xorg,
|
||||
systemd,
|
||||
stdenv,
|
||||
vips,
|
||||
at-spi2-core,
|
||||
autoPatchelfHook,
|
||||
makeShellWrapper,
|
||||
wrapGAppsHook3,
|
||||
commandLineArgs ? "",
|
||||
}:
|
||||
|
||||
let
|
||||
@ -39,7 +40,8 @@ let
|
||||
hash = sources.arm64_hash;
|
||||
};
|
||||
};
|
||||
src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
src =
|
||||
srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "qq";
|
||||
@ -87,7 +89,12 @@ stdenv.mkDerivation {
|
||||
makeShellWrapper $out/opt/QQ/qq $out/bin/qq \
|
||||
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
|
||||
--prefix LD_PRELOAD : "${lib.makeLibraryPath [ libssh2 ]}/libssh2.so.1" \
|
||||
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL libuuid ]}" \
|
||||
--prefix LD_LIBRARY_PATH : "${
|
||||
lib.makeLibraryPath [
|
||||
libGL
|
||||
libuuid
|
||||
]
|
||||
}" \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \
|
||||
--add-flags ${lib.escapeShellArg commandLineArgs} \
|
||||
"''${gappsWrapperArgs[@]}"
|
||||
@ -110,12 +117,18 @@ stdenv.mkDerivation {
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "https://im.qq.com/linuxqq/";
|
||||
description = "Messaging app";
|
||||
platforms = [ "x86_64-linux" "aarch64-linux" ];
|
||||
license = licenses.unfree;
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
maintainers = with lib.maintainers; [ fee1-dead bot-wxt1221 ];
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"aarch64-linux"
|
||||
];
|
||||
license = lib.licenses.unfree;
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
maintainers = with lib.maintainers; [
|
||||
fee1-dead
|
||||
bot-wxt1221
|
||||
];
|
||||
};
|
||||
}
|
||||
|
@ -1,9 +1,9 @@
|
||||
# Generated by ./update.sh - do not update manually!
|
||||
# Last updated: 2024-09-28
|
||||
# Last updated: 2024-10-25
|
||||
{
|
||||
version = "3.2.12-2024.9.27";
|
||||
amd64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.12_240927_amd64_01.deb";
|
||||
arm64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.12_240927_arm64_01.deb";
|
||||
arm64_hash = "sha256-VfM+p2cTNkDZc7sTftfTuRSMKVWwE6TerW25pA1MIR0=";
|
||||
amd64_hash = "sha256-xBGSSxXDu+qUwj203i3iAkfI97iLtGOuGMGfEU6kCyQ=";
|
||||
version = "3.2.13-2024.10.23";
|
||||
amd64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.13_241023_amd64_01.deb";
|
||||
arm64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.13_241023_arm64_01.deb";
|
||||
arm64_hash = "sha256-n2ezKgLfmugUZYvGzDvaLKy+Tf8ooUC6Oc6xCDp5rYA=";
|
||||
amd64_hash = "sha256-H5ACKFVV4AQ3de9UV4i9ejL1WjuuPJhTLTVqK5EcssM=";
|
||||
}
|
||||
|
@ -8,11 +8,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "stats";
|
||||
version = "2.11.14";
|
||||
version = "2.11.16";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/exelban/stats/releases/download/v${finalAttrs.version}/Stats.dmg";
|
||||
hash = "sha256-JljFHlMcc8kfjGTdGAOP4ot+FqVy0yAJ1kxVO0TawHU=";
|
||||
hash = "sha256-cv2fTb3Xykp5HnBhkGezUwWk2SkHQVMcRjJ8rXJlUrU=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
@ -9,16 +9,16 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "micropython";
|
||||
version = "1.22.2";
|
||||
version = "1.24.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "micropython";
|
||||
repo = "micropython";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-7AA9n6UQchY6POkOp1VWAOAo87uRJSeCBhgvVXLoE04=";
|
||||
hash = "sha256-cFoUa4ZpPy1MldlTeY9ISXi9ilulmhmaH5mapUDBzE8=";
|
||||
fetchSubmodules = true;
|
||||
|
||||
# remove unused libaries from rp2 port's SDK. we leave this and the other
|
||||
# remove unused libraries from rp2 port's SDK. we leave this and the other
|
||||
# ports around for users who want to override makeFlags flags to build them.
|
||||
# https://github.com/micropython/micropython/blob/a61c446c0b34e82aeb54b9770250d267656f2b7f/ports/rp2/CMakeLists.txt#L17-L22
|
||||
#
|
||||
|
@ -12,28 +12,41 @@
|
||||
pyarrow,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
pythonAtLeast,
|
||||
pythonRelaxDepsHook,
|
||||
sqlalchemy,
|
||||
thrift,
|
||||
requests,
|
||||
urllib3,
|
||||
fetchpatch,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "databricks-sql-connector";
|
||||
version = "3.1.0";
|
||||
version = "3.3.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
# Depends on thrift that at the moment do not work in Python 3.12
|
||||
# see PR 328415 fix this.
|
||||
disabled = pythonOlder "3.7" || pythonAtLeast "3.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "databricks";
|
||||
repo = "databricks-sql-python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-LiA+zZuhPPXgBb8B1vZ/PuAYMrBXzxgd1CXwugf0mk8=";
|
||||
hash = "sha256-a3OeKJ3c2UCClsPMah7iJY2YvIVLfHmmBuHAx8vdXZs=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "fix-pandas.patch";
|
||||
url = "https://patch-diff.githubusercontent.com/raw/databricks/databricks-sql-python/pull/416.patch";
|
||||
sha256 = "sha256-sNCp8xSSmKP2yNzDK4wyWC5Hoe574AeHnKTeNcIxaek=";
|
||||
})
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"numpy"
|
||||
"thrift"
|
||||
"pyarrow"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -51,6 +64,8 @@ buildPythonPackage rec {
|
||||
pyarrow
|
||||
sqlalchemy
|
||||
thrift
|
||||
requests
|
||||
urllib3
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
@ -65,8 +80,5 @@ buildPythonPackage rec {
|
||||
changelog = "https://github.com/databricks/databricks-sql-python/blob/v${version}/CHANGELOG.md";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ harvidsen ];
|
||||
# No SQLAlchemy 2.0 support
|
||||
# https://github.com/databricks/databricks-sql-python/issues/91
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
@ -32,10 +32,11 @@ stdenv.mkDerivation rec {
|
||||
patches = [ ./install.patch ];
|
||||
|
||||
meta = {
|
||||
mainProgram = "iostat";
|
||||
homepage = "http://sebastien.godard.pagesperso-orange.fr/";
|
||||
description = "A collection of performance monitoring tools for Linux (such as sar, iostat and pidstat)";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = [ lib.maintainers.eelco ];
|
||||
maintainers = [ lib.maintainers.hensoko ];
|
||||
};
|
||||
}
|
||||
|
@ -5064,7 +5064,7 @@ with pkgs;
|
||||
|
||||
element-desktop = callPackage ../applications/networking/instant-messengers/element/element-desktop.nix {
|
||||
inherit (darwin.apple_sdk.frameworks) Security AppKit CoreServices;
|
||||
electron = electron_31;
|
||||
electron = electron_32;
|
||||
};
|
||||
element-desktop-wayland = writeScriptBin "element-desktop" ''
|
||||
#!/bin/sh
|
||||
|
Loading…
Reference in New Issue
Block a user