Merge master into staging-next

This commit is contained in:
github-actions[bot] 2023-10-26 06:01:04 +00:00 committed by GitHub
commit 7054a80f3b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
37 changed files with 192 additions and 187 deletions

View File

@ -2,24 +2,17 @@
rustPlatform.buildRustPackage rec {
pname = "helix";
version = "23.05";
version = "23.10";
# This release tarball includes source code for the tree-sitter grammars,
# which is not ordinarily part of the repository.
src = fetchzip {
url = "https://github.com/helix-editor/helix/releases/download/${version}/helix-${version}-source.tar.xz";
hash = "sha256-3ZEToXwW569P7IFLqz6Un8rClnWrW5RiYKmRVFt7My8=";
hash = "sha256-PH4n+zm5ShwOrzzQm0Sn8b8JzAW/CF8UzzKZYE3e2WA=";
stripRoot = false;
};
cargoHash = "sha256-/LCtfyDAA2JuioBD/CDMv6OOxM0B9A3PpuVP/YY5oF0=";
patches = [
(fetchpatch {
url = "https://patch-diff.githubusercontent.com/raw/helix-editor/helix/pull/7227.patch";
hash = "sha256-dObMKHNJfc5TODUjZ28TVxuTen02rl8HzcXpFWnhB1k=";
})
];
cargoHash = "sha256-B8RO6BADDbPchowSfNVgviGvVgH23iF42DdhEBKBQzs=";
nativeBuildInputs = [ git installShellFiles makeWrapper ];

View File

@ -34,13 +34,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "grass";
version = "8.3.0";
version = "8.3.1";
src = fetchFromGitHub {
owner = "OSGeo";
repo = "grass";
rev = finalAttrs.version;
hash = "sha256-YHQtvp/AYMWme46yIc4lE/izjqVePnPxn3GY5RRfPq4=";
hash = "sha256-SoJq4SuDYImfkM2e991s47vYusrmnrQaXn7p3xwyOOQ=";
};
nativeBuildInputs = [

View File

@ -9,7 +9,7 @@
let
pname = "1password";
version = if channel == "stable" then "8.10.18" else "8.10.18-19.BETA";
version = if channel == "stable" then "8.10.18" else "8.10.20-1.BETA";
sources = {
stable = {
@ -33,19 +33,19 @@ let
beta = {
x86_64-linux = {
url = "https://downloads.1password.com/linux/tar/beta/x86_64/1password-${version}.x64.tar.gz";
hash = "sha256-siQ6w1byDkfNrbkvjLWmQRbJ5nVZZv24vg0RFWaRHmE=";
hash = "sha256-+wHxtlE0zeVEObzdpcIP75LKbbjsG8LMqdIPFkY0BoU=";
};
aarch64-linux = {
url = "https://downloads.1password.com/linux/tar/beta/aarch64/1password-${version}.arm64.tar.gz";
hash = "sha256-WX6NzBXBSBf/hIl1kTIuUvCnEZ1+B0NBHfKvMeIZOw4=";
hash = "sha256-BRsp/hhBwgQFU+5Tt1M9V5Lx8oRLN3uaqLrzrPo/xpo=";
};
x86_64-darwin = {
url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip";
hash = "sha256-HQRw1OGIT/cVjDk4PGa8x4QdYHQxtqMePsUh+cpyysM=";
hash = "sha256-WVP5a007cU1GR/lnL7C6QiJpTTsjzaiS69H2LJzYm70=";
};
aarch64-darwin = {
url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip";
hash = "sha256-1KcTgmxDhbvB6gzTqF3bhu5toCSjskGjCflrBSNYzk4=";
hash = "sha256-BBSUSSnot1ktC0ik7yMhqsgLdkeQBrJUpHBvwu0w9m0=";
};
};
};

View File

@ -4176,21 +4176,6 @@ dependencies = [
"windows 0.37.0",
]
[[package]]
name = "ring"
version = "0.16.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
dependencies = [
"cc",
"libc",
"once_cell",
"spin 0.5.2",
"untrusted",
"web-sys",
"winapi",
]
[[package]]
name = "rsa"
version = "0.9.2"
@ -4255,36 +4240,6 @@ dependencies = [
"windows-sys 0.48.0",
]
[[package]]
name = "rustls"
version = "0.21.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8"
dependencies = [
"ring",
"rustls-webpki",
"sct",
]
[[package]]
name = "rustls-pemfile"
version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2"
dependencies = [
"base64 0.21.4",
]
[[package]]
name = "rustls-webpki"
version = "0.101.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c7d5dece342910d9ba34d259310cae3e0154b873b35408b787b59bce53d34fe"
dependencies = [
"ring",
"untrusted",
]
[[package]]
name = "rustversion"
version = "1.0.14"
@ -4351,16 +4306,6 @@ dependencies = [
"xcb",
]
[[package]]
name = "sct"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4"
dependencies = [
"ring",
"untrusted",
]
[[package]]
name = "security-framework"
version = "2.9.2"
@ -4785,8 +4730,6 @@ dependencies = [
"once_cell",
"paste",
"percent-encoding",
"rustls",
"rustls-pemfile",
"serde",
"serde_json",
"sha2",
@ -4798,7 +4741,6 @@ dependencies = [
"tokio-stream",
"tracing",
"url",
"webpki-roots",
]
[[package]]
@ -5377,7 +5319,7 @@ dependencies = [
[[package]]
name = "tauri-plugin-sql"
version = "0.0.0"
source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#9b20f28d747f6ec3ba5a80bfcd5edc1d573b4c90"
source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#77b81af36cc6c03b07c59a2988b0f6d20960f1b0"
dependencies = [
"futures-core",
"log",
@ -5905,12 +5847,6 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e"
[[package]]
name = "untrusted"
version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
[[package]]
name = "url"
version = "2.4.1"
@ -6232,15 +6168,6 @@ dependencies = [
"system-deps 6.1.2",
]
[[package]]
name = "webpki-roots"
version = "0.24.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b291546d5d9d1eab74f069c77749f2cb8504a12caa20f0f2de93ddbf6f411888"
dependencies = [
"rustls-webpki",
]
[[package]]
name = "webview2-com"
version = "0.19.1"

View File

@ -23,13 +23,13 @@
stdenv.mkDerivation rec {
pname = "pot";
version = "2.6.3";
version = "2.6.6";
src = fetchFromGitHub {
owner = "pot-app";
repo = "pot-desktop";
rev = version;
hash = "sha256-ag54ns4lqIGjjHj6n8mDJTalQfBjqLxqSudjyeRRSs4=";
hash = "sha256-ZpN+SgBq2vA2p4MjrT07j22VB67FdiXIIl9puGiGJA4=";
};
sourceRoot = "${src.name}/src-tauri";
@ -74,6 +74,7 @@ stdenv.mkDerivation rec {
outputHashes = {
# All other crates in the same workspace reuse this hash.
"tauri-plugin-autostart-0.0.0" = "sha256-wgVsF3H9BT8lBew7tQ308eIQ6cLZT93hD/4eYCDEq98=";
"tauri-plugin-sql-0.0.0" = "sha256-e9iwcHwW8MaRzkaAbewrq6b9+n3ZofMTBnvA23ZF2ro=";
};
};

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "kubeshark";
version = "50.4";
version = "51.0.14";
src = fetchFromGitHub {
owner = "kubeshark";
repo = "kubeshark";
rev = version;
sha256 = "sha256-+9AnzY/vnB1OGzkKmYL0sxWS17NV+MGnHNXGOtt+BKU=";
rev = "v${version}";
hash = "sha256-aFeegAFGRofGa54roJ3EACvk9179YAwsgO97eeoOd6s=";
};
vendorHash = "sha256-Vcn1Ky/J/3QiV6M5fLedDcpkLp5WsVcXRkOEgkKPYEQ=";

View File

@ -2,18 +2,18 @@
buildGoModule rec {
pname = "weave-gitops";
version = "0.33.0";
version = "0.34.0";
src = fetchFromGitHub {
owner = "weaveworks";
repo = pname;
rev = "v${version}";
sha256 = "sha256-MJX9OrfvzGwrJria1Ki6QHprvoDLxBRPCnKRqPdnbUw=";
sha256 = "sha256-W7Q5rsmNEDUGofQumbs9HaByQEb7sj4tOT7ZpIe98E4=";
};
ldflags = [ "-s" "-w" "-X github.com/weaveworks/weave-gitops/cmd/gitops/version.Version=${version}" ];
vendorHash = "sha256-3woVoEh+bU8QOzOEk7hnxxVe0mlPozqUDuP0Rn/9J6k=";
vendorHash = "sha256-+UxrhtwYP+ctn+y7IxKKLO5RVoiUSl4ky0xprXr98Jc=";
subPackages = [ "cmd/gitops" ];

View File

@ -15,25 +15,25 @@ let
in
mkYarnPackage rec {
pname = "micropad";
version = "4.3.0";
version = "4.4.0";
src = fetchFromGitHub {
owner = "MicroPad";
repo = "Micropad-Electron";
rev = "v${version}";
hash = "sha256-Rr3mOz2OlCq2tibxutR8zBANhswnkz70aP9BBS/pXp0=";
hash = "sha256-VK3sSXYW/Dev7jCdkgrU9PXFbJ6+R2hy6QMRjj6bJ5M=";
};
micropad-core = fetchzip {
url = "https://github.com/MicroPad/MicroPad-Core/releases/download/v${version}/micropad.tar.xz";
hash = "sha256-7yFTD8bXsxT6kBKxBGGxwzYpa0rZYLYV6KRYtImQ58c=";
hash = "sha256-KfS13p+mjIh7VShVCT6vFuQY0e/EO/sENOx4GPAORHU=";
};
packageJSON = ./package.json;
offlineCache = fetchYarnDeps {
yarnLock = "${src}/yarn.lock";
hash = "sha256-PKCi1c8WY1BG/H1kUJ8xSCVoLF/9DEn5Kh29is2BTYY=";
hash = "sha256-8M0VZI5I4fLoLLmXkIVeCqouww+CyiXbd+vJc8+2tIs=";
};
nativeBuildInputs = [ copyDesktopItems makeWrapper ]

View File

@ -1,6 +1,6 @@
{
"name": "micropad",
"version": "4.3.0",
"version": "4.4.0",
"description": "A powerful note-taking app that helps you organise + take notes without restrictions.",
"main": "main.js",
"scripts": {
@ -27,9 +27,10 @@
"devDependencies": {
"@types/mime": "^3.0.1",
"@types/node": "^18.7.18",
"electron": "^25.5.0",
"electron-builder": "^24.6.3",
"typescript": "~4.9.5"
"@types/typo-js": "^1.2.1",
"electron": "^27.0.2",
"electron-builder": "^24.6.4",
"typescript": "~5.2.2"
},
"dependencies": {
"dictionary-en": "^3.0.0",

View File

@ -8,13 +8,13 @@
stdenvNoCC.mkDerivation rec {
pname = "cloudlog";
version = "2.4.10";
version = "2.4.11";
src = fetchFromGitHub {
owner = "magicbug";
repo = "Cloudlog";
rev = version;
hash = "sha256-Hj/Qtx9g73H3eKPQgQE+nRqjG344IbxzRX1y/iPgJAc=";
hash = "sha256-w1QCEow0K8uzbHlyASCggw2U+1RXjPbmxd5XRSdp6yE=";
};
postPath = ''

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "glab";
version = "1.33.0";
version = "1.34.0";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "cli";
rev = "v${version}";
hash = "sha256-sBovwqL+3UmOdGf5pnAVzAiAbu69PJi7YhfcJqdejTY=";
hash = "sha256-YMiT1eJyBwKKFxonQCAu7st+JoU/YLpxKCcMfs/sZ1U=";
};
vendorHash = "sha256-HiU6Kx/du8QLNKUDsSMm349msxSxyNRppxadtIpglBg=";
vendorHash = "sha256-o/B5enbrmv/+zJYBQkxbdUaiieaFyOJDc8Fm6tV//uM=";
ldflags = [
"-s"

View File

@ -10,13 +10,13 @@
rustPlatform.buildRustPackage rec {
pname = "youki";
version = "0.1.0";
version = "0.3.0";
src = fetchFromGitHub {
owner = "containers";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Nz3paJiR5Jtv8gLBq6mBUyLDfIFJCpnc/RMsDLT09Vg=";
sha256 = "sha256-XoHGRCGLEG/a6gb+3ejYoeOuIml64U/p6CcxsFLoTWY=";
};
nativeBuildInputs = [ pkg-config installShellFiles ];
@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec {
cargoBuildFlags = [ "-p" "youki" ];
cargoTestFlags = [ "-p" "youki" ];
cargoHash = "sha256-luzKyN09lauflAict9zqVdGPbDLFAfe5P8121a5YBsA=";
cargoHash = "sha256-L5IhOPo8BDQAvaSs3IJzJHN0TbgmUcEyv60IDLN4kn0=";
meta = with lib; {
description = "A container runtime written in Rust";

View File

@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "ast-grep";
version = "0.12.4";
version = "0.12.5";
src = fetchFromGitHub {
owner = "ast-grep";
repo = "ast-grep";
rev = version;
hash = "sha256-rWfuPk8PWxOmy/WDXGnqBCuGPEI7tBwuOc0IP2FhAq8=";
hash = "sha256-oFe3AbMpBVBAm/W4IowXAKcEN7CDrrAXhx4dzMXppUM=";
};
cargoHash = "sha256-M3eNvY8UwsnV9mvkGD//u1zTiJzV1ce7ODyQjnDSZTo=";
cargoHash = "sha256-f4tcJqT3l9G6FimBb0D4PATgQYUkSG5uIQ9BbsbgC/U=";
# error: linker `aarch64-linux-gnu-gcc` not found
postPatch = ''

View File

@ -20,16 +20,16 @@ assert waylandSupport -> stdenv.isLinux;
buildGoModule rec {
pname = "supersonic" + lib.optionalString waylandSupport "-wayland";
version = "0.5.2";
version = "0.6.0";
src = fetchFromGitHub {
owner = "dweymouth";
repo = "supersonic";
rev = "v${version}";
hash = "sha256-4SLAUqLMoUxTSi4I/QeHqudO62Gmhpm1XbCGf+3rPlc=";
hash = "sha256-elDVkhRW1mTez56OKQJJ0m0VxP8/Bq+HcXf5iokeY5I=";
};
vendorHash = "sha256-6Yp5OoybFpoBuIKodbwnyX3crLCl8hJ2r4plzo0plsY=";
vendorHash = "sha256-z1sDlyc7HW+tYfG0Z4EjUCEM3Su4JjmWIKxU2MV6GOA=";
nativeBuildInputs = [
copyDesktopItems
@ -62,6 +62,7 @@ buildGoModule rec {
darwin.apple_sdk_11_0.frameworks.Kernel
darwin.apple_sdk_11_0.frameworks.OpenGL
darwin.apple_sdk_11_0.frameworks.UserNotifications
darwin.apple_sdk_11_0.frameworks.MediaPlayer
];
postInstall = ''

View File

@ -0,0 +1,26 @@
{ lib, buildNpmPackage, fetchFromGitHub }:
buildNpmPackage rec {
pname = "whistle";
version = "2.9.58";
src = fetchFromGitHub {
owner = "avwo";
repo = "whistle";
rev = "v${version}";
hash = "sha256-/dt4xwUZrvymCpc3xRyWM2Wsh7zk7ndepgOWJwJ2Das=";
};
npmDepsHash = "sha256-9GBhC2PQyaqi64ncIuMZSf9CLB8l+cywT7QTzW9WiTs=";
dontNpmBuild = true;
meta = with lib; {
description = "HTTP, HTTP2, HTTPS, Websocket debugging proxy";
homepage = "https://github.com/avwo/whistle";
changelog = "https://github.com/avwo/whistle/blob/${src.rev}/CHANGELOG.md";
license = licenses.mit;
maintainers = [ maintainers.marsam ];
mainProgram = "whistle";
};
}

View File

@ -55,16 +55,16 @@ assert (extraParameters != null) -> set != null;
buildNpmPackage rec {
pname = if set != null then "iosevka-${set}" else "iosevka";
version = "27.2.1";
version = "27.3.1";
src = fetchFromGitHub {
owner = "be5invis";
repo = "iosevka";
rev = "v${version}";
hash = "sha256-+d6pONsAoA0iI7VCuDHBGGjZPaxgLToouQpFTaX6edY=";
hash = "sha256-7ndJDdgDn5tnnUeB4etQ8bBZnH7NuiYoNQ9CrF2HtwQ=";
};
npmDepsHash = "sha256-c/QvrDjjoq2o1le++e7D0Lb18wyZc/q6ct++rkgYtzg=";
npmDepsHash = "sha256-MNlT8VJTIvoZDAAdEs0Fa8gqO7dWhRR9I4Kw4qlW5Ig=";
nativeBuildInputs = [
remarshal

View File

@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "zix";
version = "unstable-2023-02-13";
version = "0.4.2";
src = fetchFromGitLab {
owner = "drobilla";
repo = pname;
rev = "262d4a1522c38be0588746e874159da5c7bb457d";
hash = "sha256-3vuefgnirM4ksK3j9sjBHgOmx0JpL+6tCPb69/7jI00=";
rev = "v${version}";
hash = "sha256-nMm3Mdqc4ncCae8SoyGxZYURzmXLNcp1GjsSExfB6x4=";
};
nativeBuildInputs = [

View File

@ -19,18 +19,15 @@ stdenv.mkDerivation (finalAttrs: {
sha256 = "sha256-oUy9HhybNMjRBWoqqal1Mw8cC5RddgN4izxAl0cgnKE=";
};
nativeBuildInputs = [ meson ninja ];
nativeBuildInputs = [ meson ninja python3 ];
postPatch = ''
substituteInPlace varlink-wrapper.py \
--replace "/usr/bin/env python3" "${python3}/bin/python3"
# test-object: ../lib/test-object.c:129: main: Assertion `setlocale(LC_NUMERIC, "de_DE.UTF-8") != 0' failed.
# PR that added it https://github.com/varlink/libvarlink/pull/27
substituteInPlace lib/test-object.c \
--replace 'assert(setlocale(LC_NUMERIC, "de_DE.UTF-8") != 0);' ""
patchShebangs lib/test-symbols.sh
patchShebangs lib/test-symbols.sh varlink-wrapper.py
'';
doCheck = true;

View File

@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "utf8proc";
version = "2.8.0";
version = "2.9.0";
src = fetchFromGitHub {
owner = "JuliaStrings";
repo = pname;
rev = "v${version}";
sha256 = "sha256-/lSD78kj133rpcSAOh8T8XFW/Z0c3JKkGQM5Z6DcMtU=";
sha256 = "sha256-Sgh8vTbclUV+lFZdR29PtNUy8F+9L/OAXk647B+l2mg=";
};
nativeBuildInputs = [ cmake ];

View File

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "pymunk";
version = "6.5.1";
version = "6.5.2";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
extension = "zip";
hash = "sha256-ZEO7YJBkCMgsD9MnwBn/X3qt39+IiecM453bjDgZDls=";
hash = "sha256-AV6upaZcnbKmQm9tTItRB6LpckappjdHvMH/awn/KeE=";
};
propagatedBuildInputs = [

View File

@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "sphinx-tabs";
version = "3.4.1";
version = "3.4.4";
format = "pyproject";
outputs = [ "out" "doc" ];
@ -26,8 +26,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "executablebooks";
repo = "sphinx-tabs";
rev = "v${version}";
hash = "sha256-5lpo7NRCksXJOdbLSFjDxQV/BsxRBb93lA6tavz6YEs=";
rev = "refs/tags/v${version}";
hash = "sha256-RcCADGJfwXP/U7Uws/uX+huaJzRDRUabQOnc9gqMUzM=";
};
postPatch = ''

View File

@ -6,16 +6,16 @@
buildGoModule rec {
pname = "hcloud";
version = "1.37.0";
version = "1.38.3";
src = fetchFromGitHub {
owner = "hetznercloud";
repo = "cli";
rev = "refs/tags/v${version}";
hash = "sha256-6UQaO2ArAYd6Lr1maciC83k1GlR8FLx+acAZh6SjI3g=";
hash = "sha256-argcQvt4875TNOX5P5sOF41u6GcFq79gnH41To73foM=";
};
vendorHash = "sha256-mxAG3o3IY70xn8WymUzF96Q2XWwQ0efWrrw1VV4Y8HU=";
vendorHash = "sha256-RXojFeT80oroBSweyb0eYo+LC/JTi1F3LmQ10XpnEXA=";
ldflags = [
"-s"
@ -32,11 +32,11 @@ buildGoModule rec {
done
'';
meta = {
meta = with lib; {
changelog = "https://github.com/hetznercloud/cli/releases/tag/v${version}";
description = "A command-line interface for Hetzner Cloud, a provider for cloud virtual private servers";
homepage = "https://github.com/hetznercloud/cli";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.zauberpony ];
license = licenses.mit;
maintainers = with maintainers; [ zauberpony techknowlogick ];
};
}

View File

@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "metals";
version = "1.0.1";
version = "1.1.0";
deps = stdenv.mkDerivation {
name = "${pname}-deps-${version}";
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
'';
outputHashMode = "recursive";
outputHashAlgo = "sha256";
outputHash = "sha256-AamUE6mr9fwjbDndQtzO2Yscu2T6zUW/DiXMYwv35YE=";
outputHash = "sha256-9zigJM0xEJSYgohbjc9ZLBKbPa/WGVSv3KVFE3QUzWE=";
};
nativeBuildInputs = [ makeWrapper setJavaClassPath ];

View File

@ -1,5 +1,6 @@
{ lib, stdenv
, fetchFromGitHub
, fetchpatch
, cmake
, pkg-config
, bzip2
@ -21,6 +22,16 @@ stdenv.mkDerivation rec {
sha256 = "sha256-f9Nt303xXZzLSu3GtOEpyaL91WVFUmKO7mxi8UNX3go=";
};
patches = [
# Backport upstream fix for gcc-13 support:
# https://github.com/nxp-imx/mfgtools/pull/360
(fetchpatch {
name = "gcc-13.patch";
url = "https://github.com/nxp-imx/mfgtools/commit/24fd043225903247f71ac10666d820277c0b10b1.patch";
hash = "sha256-P7n6+Tiz10GIQ7QOd/qQ3BI7Wo5/66b0EwjFSpOUSJg=";
})
];
nativeBuildInputs = [ cmake pkg-config installShellFiles ];
buildInputs = [ bzip2 libusb1 libzip openssl zstd ];

View File

@ -13,16 +13,16 @@
rustPlatform.buildRustPackage rec {
pname = "deno";
version = "1.37.1";
version = "1.37.2";
src = fetchFromGitHub {
owner = "denoland";
repo = pname;
rev = "v${version}";
hash = "sha256-ZfICDkW6q4OLvpSZnRpa6i324OuLNuOHXuSOQ7/aUJ8=";
hash = "sha256-F04Dxt3pLtUaku6bWGDSwJQwk/NUyBfZPhT7zLyBq48=";
};
cargoHash = "sha256-n+6Hz9Q20vq1Bf/Ny7I3IpGbkEECjjBG8xHN1v0z0Pw=";
cargoHash = "sha256-PfChqb2yMFk4HAAspkKHjstlxCTkEA2k+VRMf8MVwTw=";
postPatch = ''
# upstream uses lld on aarch64-darwin for faster builds

View File

@ -11,11 +11,11 @@ let
};
in
fetch_librusty_v8 {
version = "0.78.0";
version = "0.79.2";
shas = {
x86_64-linux = "sha256-1df7bH3ZdgIasZvvNH3iKQ4lmcGNq6ldgMV9nDgOC14=";
aarch64-linux = "sha256-riSyGvOGwqL1hSAXpUvBju/3DN20THtg0NuIzn1m1M8=";
x86_64-darwin = "sha256-4Nnkrj9GfliYUInb7SssqzFIDbV0XVxdEBC28klqBDM=";
aarch64-darwin = "sha256-oepRKVb05zAUeZo2RN3Vca0CUQ+Fd1duIU3xOG+FEJw=";
x86_64-linux = "sha256-efpB4BayPvB7KrP9v+U/jlS+Vs7QeURmPm5dnGmDD8Q=";
aarch64-linux = "sha256-agtWSohMkkhxfKU+BQvHXomZSxVQLafma4IfiDO7vvo=";
x86_64-darwin = "sha256-UWZAm7punliDUOOdD+vqZXpChyMXw5AMw8kgJ6nclzs=";
aarch64-darwin = "sha256-p8lulv3E9A48nMH1KdROSY0L3Q/hqPVtTp9qIpUl1SM=";
};
}

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "matterircd";
version = "0.27.1";
version = "0.28.0";
src = fetchFromGitHub {
owner = "42wim";
repo = "matterircd";
rev = "v${version}";
sha256 = "sha256-bDM+P9UwH4cpieOQQfEi2xIKTRQ1zInW9iFK3yAU1Xk=";
sha256 = "sha256-qA07i31fGLLIfWoCBW1f5nvf4AWEIkSXZh22F6rRnpM=";
};
vendorHash = null;

View File

@ -16,13 +16,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "owntracks-recorder";
version = "0.9.3";
version = "0.9.5";
src = fetchFromGitHub {
owner = "owntracks";
repo = "recorder";
rev = finalAttrs.version;
hash = "sha256-w0wk69hERGz6fs6uXBYiomcVlQeeTGCfTICu2q7ryNg=";
hash = "sha256-N9qMMAIgmBUEscydJKBQneLcX8odOEXY+560lJJz52g=";
};
nativeBuildInputs = [

View File

@ -0,0 +1,34 @@
{ lib
, stdenv
, fetchFromGitHub
, postgresql
}:
stdenv.mkDerivation rec {
pname = "pg_uuidv7";
version = "1.3.0";
buildInputs = [ postgresql ];
src = fetchFromGitHub {
owner = "fboulnois";
repo = "pg_uuidv7";
rev = "v${version}";
hash = "sha256-kHxS9tL7fpKhjJ8Xx5tee1fv10zVcTt2FgUQSaRdNZo=";
};
installPhase = ''
install -D -t $out/lib pg_uuidv7${postgresql.dlSuffix}
install -D {sql/pg_uuidv7--${lib.versions.majorMinor version}.sql,pg_uuidv7.control} -t $out/share/postgresql/extension
'';
meta = with lib; {
description = "A tiny Postgres extension to create version 7 UUIDs";
homepage = "https://github.com/fboulnois/pg_uuidv7";
changelog = "https://github.com/fboulnois/pg_uuidv7/blob/main/CHANGELOG.md";
maintainers = with maintainers; [ gaelreyrol ];
platforms = postgresql.meta.platforms;
license = licenses.mpl20;
broken = versionOlder postgresql.version "13";
};
}

View File

@ -79,6 +79,8 @@ self: super: {
pg_safeupdate = super.callPackage ./ext/pg_safeupdate.nix { };
pg_uuidv7 = super.callPackage ./ext/pg_uuidv7.nix { };
promscale_extension = super.callPackage ./ext/promscale_extension.nix { };
repmgr = super.callPackage ./ext/repmgr.nix { };

View File

@ -30,14 +30,14 @@ let
in
with py.pkgs; buildPythonApplication rec {
pname = "awscli2";
version = "2.13.25"; # N.B: if you change this, check if overrides are still up-to-date
version = "2.13.28"; # 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-8Euc2yOWv0TRz4SgjRAMdTogGQNE4J/XtadPNe5kKKI=";
hash = "sha256-rl4gBjuCnXfyJMv/2KIeujK0ouR624+AYaVYn4ri1Nk=";
};
postPatch = ''

View File

@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "tailspin";
version = "1.5.1";
version = "1.6.0";
src = fetchFromGitHub {
owner = "bensadeh";
repo = "tailspin";
rev = "refs/tags/${version}";
hash = "sha256-Uqo47g0AXyRNFb1RmVVJzdFI2g1Oakx85Sg+zIN5B2A=";
hash = "sha256-yzG8wFTd4DYnmd+fbBdjZ0fr1iEoL4ZqXr59kX/a0Gs=";
};
cargoHash = "sha256-0ROLrdS3oBZuh+nXW9mTS2Jn/D+iLAUaYqhKvmKAPTo=";
cargoHash = "sha256-v6aOPfQyxqaoxKvT7ak91GvL68h88WfNjlnyU1vH/kY=";
meta = with lib; {
description = "A log file highlighter";

View File

@ -1,29 +1,21 @@
{ lib
, rustPlatform
, fetchFromGitHub
, fetchpatch
, nixosTests
}:
rustPlatform.buildRustPackage rec {
pname = "aardvark-dns";
version = "1.7.0";
version = "1.8.0";
src = fetchFromGitHub {
owner = "containers";
repo = pname;
rev = "v${version}";
hash = "sha256-bScL8hFV/Kot7P9nJRMDDhB8pllPUsejtJpbjmQ8skI=";
hash = "sha256-7nuLHhkVwMc2RYq3rS9bZl39asjFAnsHxnecPypT1HM=";
};
cargoHash = "sha256-rrn+ZTAsFs7UTP4xQL3Cy8G6RG7vwT0wMKnXHHIkB90=";
patches = [
(fetchpatch { # https://github.com/containers/aardvark-dns/issues/379
url = "https://github.com/containers/aardvark-dns/commit/b13f0434f410934b515f086334414c6f5f55096e.diff";
hash = "sha256-6XReIShEe8+WKc5jK5NzCNMEd4INdOn9Sf8UrQLbj+s=";
})
];
cargoHash = "sha256-WwM4lPWQmfsBjL4M/j3sZkLtH+Wdy9LTv4M4AF0Z6oo=";
passthru.tests = { inherit (nixosTests) podman; };

View File

@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "boundary";
version = "0.13.1";
version = "0.14.1";
src =
let
@ -15,10 +15,10 @@ stdenv.mkDerivation rec {
aarch64-darwin = "darwin_arm64";
};
sha256 = selectSystem {
x86_64-linux = "sha256-SrBfZ0te1l5XDmI8euojpVVRHxqq+T1WDSVbberxJYs=";
aarch64-linux = "sha256-T0t1E8lZMJZVanG7NZh9O+1RwzH82HtGi1ytDYYslhE=";
x86_64-darwin = "sha256-Wmk2hRbRe0dOuPnwISpsh2om1khpE3sX65VfWLYXNFk=";
aarch64-darwin = "sha256-ccfAtuqZSaQG4rCQZ4ujtFhp1e6dsrMAUcRuHT+YqXU=";
x86_64-linux = "sha256-z4pBC/igKpwe1zJpOP8VqBOybtIq0wVaz+rfOwPzht4=";
aarch64-linux = "sha256-f3ofThBmBfV6Fr9FHfAsNz6w1Od0QM9fE8tFVB01PzM=";
x86_64-darwin = "sha256-iU/t35ibkTjgNV3E0xzdrMw63TKVzSlJjhZTxGzHSz0=";
aarch64-darwin = "sha256-213e3J2e9fvuoGPkeeKV46eWxR0nP+uh0f+INeZG738=";
};
in
fetchzip {

View File

@ -10,21 +10,23 @@
, hostname
, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd
, extraTags ? [ ]
, testers
, datadog-agent
}:
let
# keep this in sync with github.com/DataDog/agent-payload dependency
payloadVersion = "5.0.89";
payloadVersion = "5.0.97";
python = pythonPackages.python;
owner = "DataDog";
repo = "datadog-agent";
goPackagePath = "github.com/${owner}/${repo}";
version = "7.45.1";
version = "7.48.1";
src = fetchFromGitHub {
inherit owner repo;
rev = version;
sha256 = "sha256-bG8wsSQvZcG4/Th6mWVdVX9vpeYBZx8FxwdYXpIdXnU=";
hash = "sha256-3PFplTR/L2xJjQ5GEz2ow28SEHWafOmiLjIQHQqAaso=";
};
rtloader = stdenv.mkDerivation {
pname = "datadog-agent-rtloader";
@ -41,7 +43,7 @@ in buildGoModule rec {
doCheck = false;
vendorHash = "sha256-bGDf48wFa32hURZfGN5pCMmslC3PeLNayKcl5cfjq9M=";
vendorHash = "sha256-o7CTw7IIS5xueW20O1wKDV1Yji7PhGhp+6+i2ymKhxE=";
subPackages = [
"cmd/agent"
@ -84,9 +86,9 @@ in buildGoModule rec {
postPatch = ''
sed -e "s|PyChecksPath =.*|PyChecksPath = \"$out/${python.sitePackages}\"|" \
-e "s|distPath =.*|distPath = \"$out/share/datadog-agent\"|" \
-i cmd/agent/common/common_nix.go
-i cmd/agent/common/path/path_nix.go
sed -e "s|/bin/hostname|${lib.getBin hostname}/bin/hostname|" \
-i pkg/util/hostname_nix.go
-i pkg/util/hostname/fqdn_nix.go
'';
# Install the config files and python modules from the "dist" dir
@ -103,6 +105,11 @@ in buildGoModule rec {
--set PYTHONPATH "$out/${python.sitePackages}"'' + lib.optionalString withSystemd '' \
--prefix LD_LIBRARY_PATH : '' + lib.makeLibraryPath [ (lib.getLib systemd) rtloader ];
passthru.tests.version = testers.testVersion {
package = datadog-agent;
command = "agent version";
};
meta = with lib; {
description = ''
Event collector for the DataDog analysis service

View File

@ -2,6 +2,7 @@
, stdenv
, clang
, fetchFromGitHub
, fetchpatch
, installShellFiles
, openssl
, libpcap
@ -18,6 +19,16 @@ stdenv.mkDerivation rec {
sha256 = "0fvwwghhd7wsx0lw2dj9rdsjnirawnq3c6silzvhi0yfnzn5fs0s";
};
patches = [
# Pull upstream fix for parallel builds:
# https://github.com/joswr1ght/cowpatty/pull/5
(fetchpatch {
name = "fix-parallel.patch";
url = "https://github.com/joswr1ght/cowpatty/commit/9c8cc09c4fa90aebee44afcd0ad6a35539178478.patch";
hash = "sha256-k0Qht80HcjvPoxVPF6wAXwxN3d2mxBrEyeFGuU7w9eA=";
})
];
nativeBuildInputs = [
clang
installShellFiles
@ -28,6 +39,8 @@ stdenv.mkDerivation rec {
libpcap
];
enableParallelBuilding = true;
makeFlags = [
"DESTDIR=$(out)"
"BINDIR=/bin"

View File

@ -5987,7 +5987,7 @@ with pkgs;
};
micropad = callPackage ../applications/office/micropad {
electron = electron_25;
electron = electron_27;
};
midicsv = callPackage ../tools/audio/midicsv { };