Merge master into staging-next
This commit is contained in:
@@ -668,7 +668,7 @@ in
|
||||
}
|
||||
else if cfg.database.driver == "mysql" then
|
||||
{
|
||||
charset = "utf8mb4,utf8";
|
||||
charset = "utf8mb4";
|
||||
writeTimeout = "60s";
|
||||
readTimeout = "60s";
|
||||
}
|
||||
@@ -682,7 +682,7 @@ in
|
||||
}
|
||||
else if config.mattermost.database.driver == "mysql" then
|
||||
{
|
||||
charset = "utf8mb4,utf8";
|
||||
charset = "utf8mb4";
|
||||
writeTimeout = "60s";
|
||||
readTimeout = "60s";
|
||||
}
|
||||
|
||||
@@ -270,13 +270,13 @@
|
||||
"vendorHash": "sha256-shRiTPn4A1rmwBnoSlRDfdYuHqSFvL4o6o8vAJutu3Q="
|
||||
},
|
||||
"cloudflare": {
|
||||
"hash": "sha256-Bv3M7GjroItGgnzqUQC4QMxJZ8I0WW+ukmXtQZstRoo=",
|
||||
"hash": "sha256-EsbktS0pP+tJtIPHckMmgdeIBLyL9T+lVyoDzJAzi98=",
|
||||
"homepage": "https://registry.terraform.io/providers/cloudflare/cloudflare",
|
||||
"owner": "cloudflare",
|
||||
"repo": "terraform-provider-cloudflare",
|
||||
"rev": "v5.8.4",
|
||||
"rev": "v5.9.0",
|
||||
"spdx": "Apache-2.0",
|
||||
"vendorHash": "sha256-SM5bbYwuLTCRo7vu9SPRNpYO3m5yN8rzedgAqg/BbKw="
|
||||
"vendorHash": "sha256-aMEcmK2lhKg0OH0jsQXDE09eHbImieyNgT4xH+pBEEk="
|
||||
},
|
||||
"cloudfoundry": {
|
||||
"hash": "sha256-1nYncJLVU/f9WD6Quh9IieIXgixPzbPk4zbtI1zmf9g=",
|
||||
@@ -940,11 +940,11 @@
|
||||
"vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI="
|
||||
},
|
||||
"oci": {
|
||||
"hash": "sha256-LoaFc5Ro7l2DOzWIUtcx+ycKwoRORkbBJtF8fu6kMBA=",
|
||||
"hash": "sha256-MbyUz+sMOoWnBKu9t0QWyZKnhoJyelsaZteqxtUKwDE=",
|
||||
"homepage": "https://registry.terraform.io/providers/oracle/oci",
|
||||
"owner": "oracle",
|
||||
"repo": "terraform-provider-oci",
|
||||
"rev": "v7.14.0",
|
||||
"rev": "v7.16.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
@@ -1021,11 +1021,11 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"ovh": {
|
||||
"hash": "sha256-Z9V+66Ycaa/XWs37ATAbQiwbMooBaHJYaEeduUXghV0=",
|
||||
"hash": "sha256-qMKjJP7iuW5qE+H/uP2TDl1zxowobutf9TrtJqQKzws=",
|
||||
"homepage": "https://registry.terraform.io/providers/ovh/ovh",
|
||||
"owner": "ovh",
|
||||
"repo": "terraform-provider-ovh",
|
||||
"rev": "v2.6.0",
|
||||
"rev": "v2.7.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "chirpstack-fuota-server";
|
||||
version = "3.0.0-test.4-unstable-2024-04-02";
|
||||
version = "3.0.0-test.4-unstable-2025-08-26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chirpstack";
|
||||
repo = "chirpstack-fuota-server";
|
||||
rev = "6e014688cb4b2a5dc658bf7876df69a1cf3e2176";
|
||||
hash = "sha256-ShpBUnDGaW8vbt5y1wZbedwFHPJaggPuij71l2p0a6o=";
|
||||
rev = "0d3ce7d8d50ab8d8747d2099a2a607b0ec4e86cb";
|
||||
hash = "sha256-OprWgex8Yzx/vElL84NlnbFwayeXhQLNVl7koZUb3hU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-dTmHkauFelqMo5MpB/TyK5yVax5d4/+g9twjmsRG3e0=";
|
||||
|
||||
@@ -7,17 +7,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "codebook";
|
||||
version = "0.3.8";
|
||||
version = "0.3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "blopker";
|
||||
repo = "codebook";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-1ZjR3nUWpeglTTTtXdvbmMGK7SW517cQIu6IQ63a8Wc=";
|
||||
hash = "sha256-yt7eQIQvufqPO8NIs7MMUyPGSSE7Vazou7MWZ5yinHk=";
|
||||
};
|
||||
|
||||
buildAndTestSubdir = "crates/codebook-lsp";
|
||||
cargoHash = "sha256-fwI+k9m5ptGb1KQ+mxsAmwlPhQwWSo5HGM0XeWlFHTI=";
|
||||
cargoHash = "sha256-3KCE+OK4hw/CsczY52OgLp+RBsySO5tNlwbmtHD05qs=";
|
||||
|
||||
# Integration tests require internet access for dictionaries
|
||||
doCheck = false;
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "flyctl";
|
||||
version = "0.3.171";
|
||||
version = "0.3.172";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "superfly";
|
||||
repo = "flyctl";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-9FJ/n2LoTrQmcO+J3eXxexggFhvP22yYFbrryd0rGtM=";
|
||||
hash = "sha256-jKzlKOdE+SrCzY81ciI9sKN0iiFZMsKp04A+1TV1+i0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-uXCy/8HkwqGnQEoNtyOErLw9byG8SWc5YdzYZXwjhW4=";
|
||||
vendorHash = "sha256-D6b+dLoE4IdhsmnWILe7Thkggq3p0ur4C3BOz7Cuk98=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "holos";
|
||||
version = "0.104.1";
|
||||
version = "0.104.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "holos-run";
|
||||
repo = "holos";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-4LCNKPf+b7O9DHCmOzaI8clCbmikyAAG+6C3I0aQdMg=";
|
||||
hash = "sha256-FzePCxBnKyEEnJZaKjiignahkGlerdw/j2RfDunQnbc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-FR3H2NS4sEYjGmzIyaUglby98AgDAgbIzl9de8h/cj8=";
|
||||
vendorHash = "sha256-HbYFQG+iZMP/bcqz0UYduxeFNAAo+e3UUTubblhiNxk=";
|
||||
|
||||
ldflags = [
|
||||
"-w"
|
||||
|
||||
@@ -337,7 +337,7 @@ mattermost.overrideAttrs (
|
||||
|
||||
# Start Postgres.
|
||||
export PGDATA="$NIX_BUILD_TOP/.postgres"
|
||||
initdb -U postgres
|
||||
initdb -E UTF8 -U postgres
|
||||
mkdir -p "$PGDATA/run"
|
||||
cat <<EOF >> "$PGDATA/postgresql.conf"
|
||||
unix_socket_directories = '$PGDATA/run'
|
||||
|
||||
@@ -6,17 +6,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "mitra";
|
||||
version = "4.8.0";
|
||||
version = "4.9.0";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "silverpill";
|
||||
repo = "mitra";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-hBbqlL5E0iSMtnGFCdVnKkCUcNwmBPkOnyEY+aAlw0o=";
|
||||
hash = "sha256-2/BQ0AScDCns9ddmr3VdFn6+eDnfzFoDHdxLVKvFEL8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-tk+WJaYBUteFfNfRuD45KNK0QaFMFUiDbaaqmwtPORQ=";
|
||||
cargoHash = "sha256-kwFoPnR8Wq/iqnc3TG/foqhMmRQk7VQ1UF50jyp970w=";
|
||||
|
||||
# require running database
|
||||
doCheck = false;
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "sketchybar-app-font";
|
||||
version = "2.0.40";
|
||||
version = "2.0.41";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kvndrsslr";
|
||||
repo = "sketchybar-app-font";
|
||||
rev = "v2.0.40";
|
||||
hash = "sha256-2tvGCUqRHXWX3As9Cm+2YXd7Iwm/EoxymZ5g1CysD6E=";
|
||||
rev = "v2.0.41";
|
||||
hash = "sha256-jK4NR7j7tsmCjdwvBQMIS8M3QJkfNEWaUo9H2n27kG8=";
|
||||
};
|
||||
|
||||
pnpmDeps = pnpm_9.fetchDeps {
|
||||
|
||||
@@ -10,18 +10,18 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "svix-server";
|
||||
version = "1.73.0";
|
||||
version = "1.75.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "svix";
|
||||
repo = "svix-webhooks";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Gx8fvOkoTznj3tvJOhn6lVRlf0lWcAgBm9oE7L8pxTs=";
|
||||
hash = "sha256-rZQWExWPoSQLmL79QGPU6GJ/Z5JEHBRPSGH2A4TsA94=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/server";
|
||||
|
||||
cargoHash = "sha256-LQefLUSoKQOeAgqhb/HT554j/xEaNvnKzmCOKHTRXq8=";
|
||||
cargoHash = "sha256-aTc4MmwesI8B26lv/1hifSXvrvWeW+UheIl8FN1/mes=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@@ -18,6 +18,8 @@
|
||||
xvfb-run,
|
||||
librsvg,
|
||||
libX11,
|
||||
copyDesktopItems,
|
||||
makeDesktopItem,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
@@ -35,6 +37,7 @@ python3Packages.buildPythonApplication rec {
|
||||
intltool
|
||||
wrapGAppsHook3
|
||||
gdk-pixbuf
|
||||
copyDesktopItems
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@@ -123,6 +126,16 @@ python3Packages.buildPythonApplication rec {
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "ulauncher";
|
||||
desktopName = "Ulauncher";
|
||||
exec = "ulauncher";
|
||||
categories = [ "Utility" ];
|
||||
icon = "ulauncher";
|
||||
})
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Fast application launcher for Linux, written in Python, using GTK";
|
||||
homepage = "https://ulauncher.io/";
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "vencord";
|
||||
version = "1.12.12";
|
||||
version = "1.12.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Vendicated";
|
||||
repo = "Vencord";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-44Jiel/Y8ueZkZW0BFltgxrvSKkWmeKs8zVgFBJU+BI=";
|
||||
hash = "sha256-mJPUt7+SjszRmscKr0HlW3X2yDwc9cCcJLz8rlg+gNA=";
|
||||
};
|
||||
|
||||
pnpmDeps = pnpm_10.fetchDeps {
|
||||
|
||||
@@ -2,21 +2,29 @@
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
installShellFiles,
|
||||
nix-update-script,
|
||||
testers,
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "wrtag";
|
||||
version = "0.15.0";
|
||||
version = "0.17.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sentriz";
|
||||
repo = "wrtag";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ev/dfj6WpBZzOaN1RXHcEmkd2pVLX92J/VhoMXYGPPw=";
|
||||
hash = "sha256-fYxtZnOO4+uU6p8p7uNPDnIinUT+TYXfO3G17PtcqQA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-es6pfWw3NqKKV9jfsgQhEU6IbWeptqbP0yvum/BxOuI=";
|
||||
vendorHash = "sha256-Baz5oCKh26+t30ZyjfdYt3YobWAxSRwk12wdFEVPLRY=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion contrib/completions/wrtag.{fish,bash}
|
||||
installShellCompletion contrib/completions/metadata.fish
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "medvol";
|
||||
version = "0.0.15";
|
||||
version = "0.0.16";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "MIC-DKFZ";
|
||||
repo = "medvol";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-JOw0ODx5yuBY5FyXy9z5C/NE/iok5GwiInalgXW/1J8=";
|
||||
hash = "sha256-MMYBPyXXS6hTehyWUcvQso9HBLhWMGWzRDGSTtT1iZc=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -0,0 +1,53 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
runCommand,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
maturin,
|
||||
protobuf_30,
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "pyluwen";
|
||||
version = "0.7.11";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tenstorrent";
|
||||
repo = "luwen";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-eQpKEeuy0mVrmu8ssAOWBcXi7zutStu+RbZOEF/IJ98=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
hash = "sha256-INzF8ORkrmPQMJbGSNm5QkfMOgE+HJ3taU1EZ9i+HJg=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/crates/${pname}";
|
||||
|
||||
prePatch = ''
|
||||
chmod -R u+w ../../
|
||||
cd ../../
|
||||
'';
|
||||
|
||||
postPatch = ''
|
||||
cd ../$sourceRoot
|
||||
cp --no-preserve=ownership,mode ../../Cargo.lock .
|
||||
'';
|
||||
|
||||
nativeBuildInputs = with rustPlatform; [
|
||||
cargoSetupHook
|
||||
maturinBuildHook
|
||||
protobuf_30
|
||||
];
|
||||
|
||||
build-system = [ maturin ];
|
||||
|
||||
meta = {
|
||||
description = "Tenstorrent system interface library";
|
||||
homepage = "https://github.com/tenstorrent/luwen";
|
||||
maintainers = with lib.maintainers; [ RossComputerGuy ];
|
||||
license = with lib.licenses; [ asl20 ];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,44 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
setuptools,
|
||||
pyyaml,
|
||||
tabulate,
|
||||
pyluwen,
|
||||
tt-tools-common,
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "tt-flash";
|
||||
version = "3.3.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tenstorrent";
|
||||
repo = "tt-flash";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-edWogH/HZZlGwyiqGbj6vunNxhsCr/+3LzmFgFGzjck=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
tabulate
|
||||
pyyaml
|
||||
pyluwen
|
||||
tt-tools-common
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "tt_flash" ];
|
||||
pythonRelaxDeps = [ "pyyaml" ];
|
||||
|
||||
meta = {
|
||||
description = "Tenstorrent Firmware Update Utility";
|
||||
homepage = "https://tenstorrent.com";
|
||||
maintainers = with lib.maintainers; [ RossComputerGuy ];
|
||||
license = with lib.licenses; [ asl20 ];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,51 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchpatch,
|
||||
fetchFromGitHub,
|
||||
setuptools,
|
||||
distro,
|
||||
elasticsearch,
|
||||
psutil,
|
||||
pyyaml,
|
||||
rich,
|
||||
textual,
|
||||
requests,
|
||||
tqdm,
|
||||
pydantic,
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "tt-tools-common";
|
||||
version = "1.4.25";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tenstorrent";
|
||||
repo = "tt-tools-common";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-phal8KxfQqsGAIcKQTlSPZB04J158jZYlyamZr45vdU=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
distro
|
||||
elasticsearch
|
||||
psutil
|
||||
pyyaml
|
||||
rich
|
||||
textual
|
||||
requests
|
||||
tqdm
|
||||
pydantic
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Helper library for common utilities shared across Tentorrent tools";
|
||||
homepage = "https://github.com/tenstorrent/tt-tools-common";
|
||||
maintainers = with lib.maintainers; [ RossComputerGuy ];
|
||||
license = with lib.licenses; [ asl20 ];
|
||||
};
|
||||
}
|
||||
@@ -13318,6 +13318,8 @@ self: super: with self; {
|
||||
|
||||
pylutron-caseta = callPackage ../development/python-modules/pylutron-caseta { };
|
||||
|
||||
pyluwen = callPackage ../development/python-modules/pyluwen { };
|
||||
|
||||
pylxd = callPackage ../development/python-modules/pylxd { };
|
||||
|
||||
pylyrics = callPackage ../development/python-modules/pylyrics { };
|
||||
@@ -18653,6 +18655,10 @@ self: super: with self; {
|
||||
|
||||
tsplib95 = callPackage ../development/python-modules/tsplib95 { };
|
||||
|
||||
tt-flash = callPackage ../development/python-modules/tt-flash { };
|
||||
|
||||
tt-tools-common = callPackage ../development/python-modules/tt-tools-common { };
|
||||
|
||||
ttach = callPackage ../development/python-modules/ttach { };
|
||||
|
||||
ttfautohint-py = callPackage ../development/python-modules/ttfautohint-py { };
|
||||
|
||||
Reference in New Issue
Block a user