Merge staging-next into staging
This commit is contained in:
nixpkgs-ci[bot]
@@ -22866,6 +22866,13 @@
|
||||
githubId = 96694484;
|
||||
name = "Sandeep Patel";
|
||||
};
|
||||
sandydoo = {
|
||||
name = "Sander";
|
||||
github = "sandydoo";
|
||||
githubId = 7572407;
|
||||
email = "hey@sandydoo.me";
|
||||
matrix = "@sandydoo:matrix.org";
|
||||
};
|
||||
Sanskarzz = {
|
||||
email = "sanskar.gur@gmail.com";
|
||||
github = "Sanskarzz";
|
||||
|
||||
@@ -170,6 +170,16 @@ with lib.maintainers;
|
||||
shortName = "c3d2";
|
||||
};
|
||||
|
||||
cachix = {
|
||||
# Verify additions to this team with at least one existing member of the team.
|
||||
members = [
|
||||
domenkozar
|
||||
sandydoo
|
||||
];
|
||||
scope = "Group registration for packages maintained by Cachix.";
|
||||
shortName = "Cachix employees";
|
||||
};
|
||||
|
||||
categorization = {
|
||||
members = [
|
||||
aleksana
|
||||
|
||||
@@ -8,7 +8,7 @@ let
|
||||
cfg = config.services.cachix-agent;
|
||||
in
|
||||
{
|
||||
meta.maintainers = [ lib.maintainers.domenkozar ];
|
||||
meta.maintainers = lib.teams.cachix.members;
|
||||
|
||||
options.services.cachix-agent = {
|
||||
enable = lib.mkEnableOption "Cachix Deploy Agent: <https://docs.cachix.org/deploy/>";
|
||||
|
||||
@@ -8,10 +8,9 @@ let
|
||||
cfg = config.services.cachix-watch-store;
|
||||
in
|
||||
{
|
||||
meta.maintainers = [
|
||||
lib.maintainers.jfroche
|
||||
lib.maintainers.domenkozar
|
||||
];
|
||||
meta = {
|
||||
maintainers = lib.teams.cachix.members ++ [ lib.maintainers.jfroche ];
|
||||
};
|
||||
|
||||
options.services.cachix-watch-store = {
|
||||
enable = lib.mkEnableOption "Cachix Watch Store: <https://docs.cachix.org>";
|
||||
|
||||
+2
-2
@@ -205,8 +205,8 @@ Other than that, PR titles have meaning only for humans.
|
||||
It is recommended to keep the PR title in sync with the commit title, to make it easier to find.
|
||||
For PRs with multiple commits, the PR title should be a general summary of these commits.
|
||||
|
||||
[!NOTE]
|
||||
Marking a PR as a draft does not prevent automatic builds.
|
||||
> [!NOTE]
|
||||
> Marking a PR as a draft does not prevent automatic builds.
|
||||
|
||||
## Category Hierarchy
|
||||
[categories]: #category-hierarchy
|
||||
|
||||
@@ -14,15 +14,18 @@
|
||||
libjpeg,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation {
|
||||
pname = "mup";
|
||||
version = "6.8";
|
||||
version = "7.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.arkkra.com/ftp/pub/unix/mup${
|
||||
builtins.replaceStrings [ "." ] [ "" ] version
|
||||
}src.tar.gz";
|
||||
sha256 = "06bv5nyl8rcibyb83zzrfdq6x6f93g3rgnv47i5gsjcaw5w6l31y";
|
||||
urls = [
|
||||
# Since the original site is geo-blocked in the EU, we may revert to the archived version;
|
||||
# please update both URLs during future updates!
|
||||
"http://www.arkkra.com/ftp/pub/unix/mup72src.tar.gz"
|
||||
"https://web.archive.org/web/20250907143445/http://www.arkkra.com/ftp/pub/unix/mup72src.tar.gz"
|
||||
];
|
||||
hash = "sha256-XbfIsSzE7cwdK0DlOyS8PEJbBGc7Doa1HGLsVfx2ZaY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -45,14 +48,16 @@ stdenv.mkDerivation rec {
|
||||
|
||||
postPatch = ''
|
||||
for f in Makefile.am doc/Makefile.am doc/htmldocs/Makefile.am src/mupmate/Preferences.C; do
|
||||
substituteInPlace $f --replace doc/packages doc
|
||||
substituteInPlace $f --replace-fail doc/packages doc
|
||||
done
|
||||
substituteInPlace src/mupprnt/mupprnt --replace 'mup ' $out/bin/mup' '
|
||||
substituteInPlace src/mupdisp/genfile.c --replace '"mup"' '"'$out/bin/mup'"'
|
||||
substituteInPlace src/mupprnt/mupprnt \
|
||||
--replace-fail 'mup ' $out/bin/mup' '
|
||||
substituteInPlace src/mupdisp/genfile.c \
|
||||
--replace-fail '"mup"' '"'$out/bin/mup'"'
|
||||
substituteInPlace src/mupmate/Preferences.C \
|
||||
--replace '"mup"' '"'$out/bin/mup'"' \
|
||||
--replace '"gv"' '"xdg-open"' \
|
||||
--replace /usr/share/doc $out/share/doc
|
||||
--replace-fail '"mup"' '"'$out/bin/mup'"' \
|
||||
--replace-fail '"gv"' '"xdg-open"' \
|
||||
--replace-fail /usr/share/doc $out/share/doc
|
||||
'';
|
||||
|
||||
enableParallelBuilding = false; # Undeclared dependencies + https://stackoverflow.com/a/19822767/1687334 for prolog.ps.
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
--- a/src/mup/Makefile.am
|
||||
+++ b/src/mup/Makefile.am
|
||||
@@ -39 +39 @@ fontdata.c: prolog.ps ../../tools/mup/getfontinfo.ps ../../LICENSE
|
||||
- $(GS) -sDEVICE=nullpage -sOutputFile=/dev/null -dQUIET - < ../../tools/mup/getfontinfo.ps | $(SED) -e "/Warning:/d" >> fontdata.c
|
||||
+ $(GS) -sDEVICE=nullpage -sOutputFile=/dev/null -dQUIET --permit-file-write=charnames:fontinit - < ../../tools/mup/getfontinfo.ps | $(SED) -e "/Warning:/d" >> fontdata.c
|
||||
@@ -37 +37 @@ fontdata.c: prolog.ps ../../tools/mup/getfontinfo.ps ../../LICENSE
|
||||
- $(GS) -dNOSAFER -sDEVICE=nullpage -sOutputFile=/dev/null -dQUIET - < ../../tools/mup/getfontinfo.ps | $(SED) -e "/Warning:/d" >> fontdata.c
|
||||
+ $(GS) -dNOSAFER -sDEVICE=nullpage -sOutputFile=/dev/null -dQUIET --permit-file-write=charnames:fontinit - < ../../tools/mup/getfontinfo.ps | $(SED) -e "/Warning:/d" >> fontdata.c
|
||||
|
||||
@@ -1182,8 +1182,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "dart-code";
|
||||
publisher = "dart-code";
|
||||
version = "3.116.0";
|
||||
hash = "sha256-YhcQXncHzpNS7CupRQMPjFLb5ZKwXmCxR3UfHlhlgYE=";
|
||||
version = "3.118.1";
|
||||
hash = "sha256-Ug3rEfM2oh1s9a6BulHmj0++xt+nzT0XcdQ4TuH8xV4=";
|
||||
};
|
||||
|
||||
meta.license = lib.licenses.mit;
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "amneziawg-tools";
|
||||
version = "1.0.20250706";
|
||||
version = "1.0.20250903";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "amnezia-vpn";
|
||||
repo = "amneziawg-tools";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-y6xkOLT9KVD6ACCH60Myk2iA1S8/+tGXEQbOYnu+dPI=";
|
||||
hash = "sha256-a5o49hx0HwB0PwlY1orp3ZI5zb5mpzHoRIhv9OdGSbU=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/src";
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-tally";
|
||||
version = "1.0.69";
|
||||
version = "1.0.70";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
hash = "sha256-ZAayOuuCncjQ3+RGega/aQW/s14QB9541EFB7f6CWxE=";
|
||||
hash = "sha256-9KOrnHWro3ZDFl9jl2lZl9/fDUbbMfzGftsV+1HXNfQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-XLnmx84OP3bwhuRfezczKMJsyc95ClK4yC/RqPe9AB8=";
|
||||
cargoHash = "sha256-7E9KO16LdIIULzxvPMZPPKlOunktYQkVbdnCZmxwlSw=";
|
||||
|
||||
meta = {
|
||||
description = "Graph the number of crates that depend on your crate over time";
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "comrak";
|
||||
version = "0.41.0";
|
||||
version = "0.41.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kivikakk";
|
||||
repo = "comrak";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-GYUMSn276XrGPIYRQf6+w3eIvKB5lMayBgSFyGb0DVw=";
|
||||
sha256 = "sha256-jOsbbSCI6upvWsCkpiSEherwVluv7YPLQbxSLEBOQA4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-GxWhSYsCxOxcRbEtHj7V+4Wu2uoZjTpG04NFidS8sSQ=";
|
||||
cargoHash = "sha256-0OtFCb5/rdDCtRiGow6t1bpc/H3ZZRMsHhcYG+2IFhw=";
|
||||
|
||||
meta = {
|
||||
description = "CommonMark-compatible GitHub Flavored Markdown parser and formatter";
|
||||
|
||||
@@ -101,6 +101,6 @@ rustPlatform.buildRustPackage {
|
||||
homepage = "https://github.com/cachix/devenv";
|
||||
license = lib.licenses.asl20;
|
||||
mainProgram = "devenv";
|
||||
maintainers = with lib.maintainers; [ domenkozar ];
|
||||
teams = [ lib.teams.cachix ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -5,14 +5,14 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "3.0.1";
|
||||
version = "3.0.1.2";
|
||||
pname = "discount";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Orc";
|
||||
repo = "discount";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Bb6vcEICzxaQmBIm9xQy5dKV485iwcxgkA3PAHaR2cw=";
|
||||
hash = "sha256-QZmbc3imBlQmFgTjtepEx2HqsfW93yqqUy0LN5WWKwM=";
|
||||
};
|
||||
|
||||
patches = [ ./fix-configure-path.patch ];
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "dprint";
|
||||
version = "0.50.1";
|
||||
version = "0.50.2";
|
||||
|
||||
# Prefer repository rather than crate here
|
||||
# - They have Cargo.lock in the repository
|
||||
@@ -21,16 +21,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
owner = "dprint";
|
||||
repo = "dprint";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-Lt6CzSzppu5ULhzYN5FTCWtWK3AA4/8jRzXgQkU4Tco=";
|
||||
hash = "sha256-pBiMJ+S23J5W+nldW6WpqnvkODcQsEwM2IzDhe6TUlM=";
|
||||
};
|
||||
|
||||
cargoPatches = [
|
||||
# Upgrade wasmer to 6.1.0-rc.3 to fix build failure with Rust ≥ 1.89.0
|
||||
# https://github.com/dprint/dprint/pull/1021
|
||||
./upgrade-wasmer.patch
|
||||
];
|
||||
|
||||
cargoHash = "sha256-RUWyR1Yr9G2xBMigDa9+LQyaU5on85xkRQYTLH9JOPg=";
|
||||
cargoHash = "sha256-doaZlr5B9XhOaEawLGgM3yWJjgJ5f6TLUiqb+Ze+v0I=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -1,161 +0,0 @@
|
||||
From 379cf407bfc07380dad24aefb2db40f6852f32ed Mon Sep 17 00:00:00 2001
|
||||
From: Anders Kaseorg <andersk@mit.edu>
|
||||
Date: Mon, 25 Aug 2025 18:01:57 -0700
|
||||
Subject: [PATCH] Upgrade wasmer to 6.1.0-rc.3
|
||||
|
||||
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
|
||||
---
|
||||
Cargo.lock | 41 ++++++++++++++++++++--------------------
|
||||
crates/dprint/Cargo.toml | 4 ++--
|
||||
2 files changed, 22 insertions(+), 23 deletions(-)
|
||||
|
||||
diff --git a/Cargo.lock b/Cargo.lock
|
||||
index 9a1bc870..bff2c81b 100644
|
||||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -455,9 +455,9 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
|
||||
|
||||
[[package]]
|
||||
name = "corosensei"
|
||||
-version = "0.2.1"
|
||||
+version = "0.2.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "ad067b451c08956709f8762dba86e049c124ea52858e3ab8d076ba2892caa437"
|
||||
+checksum = "5d1ea1c2a2f898d2a6ff149587b8a04f41ee708d248c723f01ac2f0f01edc0b3"
|
||||
dependencies = [
|
||||
"autocfg",
|
||||
"cfg-if",
|
||||
@@ -776,18 +776,18 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "derive_more"
|
||||
-version = "1.0.0"
|
||||
+version = "2.0.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05"
|
||||
+checksum = "093242cf7570c207c83073cf82f79706fe7b8317e98620a47d5be7c3d8497678"
|
||||
dependencies = [
|
||||
"derive_more-impl",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "derive_more-impl"
|
||||
-version = "1.0.0"
|
||||
+version = "2.0.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22"
|
||||
+checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
@@ -3256,16 +3256,15 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "wasmer"
|
||||
-version = "6.0.1"
|
||||
+version = "6.1.0-rc.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "f25dccc6251837449135914ee1978731c2c3df9fc727088eb7e098736c0f15d1"
|
||||
+checksum = "1e588d83a5ac7eb5e6af54ac4d34183442e4dd2a7358d2a11793b17c03b7df0b"
|
||||
dependencies = [
|
||||
"bindgen",
|
||||
"bytes",
|
||||
"cfg-if",
|
||||
"cmake",
|
||||
- "derive_more 1.0.0",
|
||||
- "idna_adapter",
|
||||
+ "derive_more 2.0.1",
|
||||
"indexmap",
|
||||
"js-sys",
|
||||
"more-asserts",
|
||||
@@ -3278,7 +3277,6 @@ dependencies = [
|
||||
"target-lexicon",
|
||||
"thiserror 1.0.61",
|
||||
"tracing",
|
||||
- "ureq",
|
||||
"wasm-bindgen",
|
||||
"wasmer-compiler",
|
||||
"wasmer-compiler-cranelift",
|
||||
@@ -3292,9 +3290,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "wasmer-compiler"
|
||||
-version = "6.0.1"
|
||||
+version = "6.1.0-rc.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "6f35baeb0d5b20710b5b9c59477dbf813b1ac53da33ee46cb22f8c4190e3986e"
|
||||
+checksum = "c9542eb21b9a0f7811101e26e40e360a9ac02d093e3089c8fa62dfa102478edb"
|
||||
dependencies = [
|
||||
"backtrace",
|
||||
"bytes",
|
||||
@@ -3323,9 +3321,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "wasmer-compiler-cranelift"
|
||||
-version = "6.0.1"
|
||||
+version = "6.1.0-rc.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "6d657a96003ce3f54a3cbbf681fcd782b983f9362c97cfbbe243cbf66790e004"
|
||||
+checksum = "a69f548bcccd4791b2647e0d748eb8ddd4d0856233778867c8b0db3781a82ca1"
|
||||
dependencies = [
|
||||
"cranelift-codegen",
|
||||
"cranelift-entity",
|
||||
@@ -3343,9 +3341,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "wasmer-derive"
|
||||
-version = "6.0.1"
|
||||
+version = "6.1.0-rc.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "62b57be80a67de03c2a02d697bfd763e097546b11f0020cf9930ebaa4f8cf965"
|
||||
+checksum = "8db532c73814748214276f878b8382a8885769fdd86d0bee2792c438b0d28c62"
|
||||
dependencies = [
|
||||
"proc-macro-error2",
|
||||
"proc-macro2",
|
||||
@@ -3355,9 +3353,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "wasmer-types"
|
||||
-version = "6.0.1"
|
||||
+version = "6.1.0-rc.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "1b8424d15f5c19a8df972fc9367d75ba3b87af63b279208d50a32e9a298d944b"
|
||||
+checksum = "81b900743ecb272e8e8a760a42e069f19d158d9fd03c6ac256026407bdc91833"
|
||||
dependencies = [
|
||||
"bytecheck 0.6.11",
|
||||
"enum-iterator",
|
||||
@@ -3375,9 +3373,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "wasmer-vm"
|
||||
-version = "6.0.1"
|
||||
+version = "6.1.0-rc.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "faabfffefc6fc350bb5b07301f05ba604a18c3d2d97c6354183f15792577056d"
|
||||
+checksum = "40956bcf167d5bed1a940649f638e2d610e5a066863b4ab6c1ab1341fef97a9a"
|
||||
dependencies = [
|
||||
"backtrace",
|
||||
"cc",
|
||||
@@ -3394,6 +3392,7 @@ dependencies = [
|
||||
"memoffset",
|
||||
"more-asserts",
|
||||
"region",
|
||||
+ "rustversion",
|
||||
"scopeguard",
|
||||
"thiserror 1.0.61",
|
||||
"wasmer-types",
|
||||
diff --git a/crates/dprint/Cargo.toml b/crates/dprint/Cargo.toml
|
||||
index 44d107d4..af733e83 100644
|
||||
--- a/crates/dprint/Cargo.toml
|
||||
+++ b/crates/dprint/Cargo.toml
|
||||
@@ -58,8 +58,8 @@ webpki-roots = "=0.26.7"
|
||||
# patch version increases of rkyv may cause panics when deserializing
|
||||
# data serialized with older versions
|
||||
rkyv = "=0.8.10"
|
||||
-wasmer = "=6.0.1"
|
||||
-wasmer-compiler = "=6.0.1"
|
||||
+wasmer = "=6.1.0-rc.3"
|
||||
+wasmer-compiler = "=6.1.0-rc.3"
|
||||
|
||||
[target.'cfg(windows)'.dependencies]
|
||||
winreg = "=0.55.0"
|
||||
@@ -1,21 +1,23 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
buildGo125Module,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
buildGo125Module rec {
|
||||
pname = "gobuster";
|
||||
version = "3.8.1";
|
||||
version = "3.8.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OJ";
|
||||
repo = "gobuster";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-ddTu13jbleylrcas93pGL98d0mE+2HNlPCVO+0iCP/4=";
|
||||
hash = "sha256-/woa0w/+aa1S2+Om5EK8I1XEI1mI47vNS1+GDnQHlTA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-h/ZJeHk0J8qOC/ZWw6gaHwy5mIE7RuZulITbhTpQJi8=";
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
vendorHash = "sha256-rTN8omPTfSVfp/ythGWxVyq6rR7tJCN2znwMGixiw90=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
@@ -24,13 +26,13 @@ buildGoModule rec {
|
||||
|
||||
meta = {
|
||||
description = "Tool used to brute-force URIs, DNS subdomains, Virtual Host names on target web servers";
|
||||
mainProgram = "gobuster";
|
||||
homepage = "https://github.com/OJ/gobuster";
|
||||
changelog = "https://github.com/OJ/gobuster/releases/tag/v${version}";
|
||||
changelog = "https://github.com/OJ/gobuster/releases/tag/${src.tag}";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [
|
||||
fab
|
||||
pamplemousse
|
||||
];
|
||||
mainProgram = "gobuster";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
"url": "https://github.com/grafana/grafana-image-renderer.git"
|
||||
},
|
||||
"scripts": {
|
||||
"eslint": "eslint . --ext .ts",
|
||||
"eslint": "eslint .",
|
||||
"typecheck": "tsc --noEmit",
|
||||
"prettier:check": "prettier --list-different \"**/*.ts\"",
|
||||
"prettier:write": "prettier --list-different \"**/*.ts\" --write",
|
||||
@@ -45,32 +45,43 @@
|
||||
"lodash": "^4.17.21",
|
||||
"minimist": "^1.2.6",
|
||||
"morgan": "^1.9.0",
|
||||
"multer": "^2.0.0",
|
||||
"multer": "^2.0.2",
|
||||
"on-finished": "^2.3.0",
|
||||
"poolpeteer": "^0.24.0",
|
||||
"prom-client": "^14.1.0",
|
||||
"puppeteer": "^22.8.2",
|
||||
"puppeteer-cluster": "^0.24.0",
|
||||
"rate-limiter-flexible": "^7.0.0",
|
||||
"tar-fs": "^3.0.9",
|
||||
"unique-filename": "^2.0.1",
|
||||
"winston": "^3.8.2"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@grafana/eslint-config": "^6.0.0",
|
||||
"@types/dompurify": "^3.2.0",
|
||||
"@eslint/js": "^9.31.0",
|
||||
"@grafana/eslint-config": "^8.1.0",
|
||||
"@grafana/sign-plugin": "^3.1.3",
|
||||
"@stylistic/eslint-plugin-ts": "^4.4.1",
|
||||
"@types/content-disposition": "^0.5.9",
|
||||
"@types/express": "^4.17.14",
|
||||
"@types/jest": "^29.5.12",
|
||||
"@types/jsdom": "20.0.0",
|
||||
"@types/lodash": "^4.17.20",
|
||||
"@types/minimist": "^1.2.5",
|
||||
"@types/morgan": "^1.9.10",
|
||||
"@types/multer": "^1.4.7",
|
||||
"@types/node": "^20.17.27",
|
||||
"@types/pixelmatch": "^5.2.6",
|
||||
"@types/supertest": "^2.0.15",
|
||||
"@typescript-eslint/eslint-plugin": "5.37.0",
|
||||
"@typescript-eslint/parser": "5.37.0",
|
||||
"@typescript-eslint/eslint-plugin": "^8.37.0",
|
||||
"@typescript-eslint/parser": "^8.37.0",
|
||||
"@yao-pkg/pkg": "^6.3.0",
|
||||
"axios": "1.8.2",
|
||||
"cross-env": "7.0.3",
|
||||
"eslint": "8.23.1",
|
||||
"eslint": "^9.31.0",
|
||||
"eslint-config-prettier": "^10.1.5",
|
||||
"eslint-plugin-jsdoc": "^51.4.1",
|
||||
"eslint-plugin-react": "^7.37.5",
|
||||
"eslint-plugin-react-hooks": "^5.2.0",
|
||||
"fast-png": "^6.2.0",
|
||||
"jest": "^29.7.0",
|
||||
"jsonwebtoken": "^9.0.2",
|
||||
@@ -80,11 +91,8 @@
|
||||
"ts-jest": "^29.1.1",
|
||||
"ts-node": "10.9.1",
|
||||
"tsc-watch": "5.0.3",
|
||||
"typescript": "4.8.3"
|
||||
},
|
||||
"resolutions": {
|
||||
"@types/express": "^4.17.14",
|
||||
"xml2js": "^0.6.2"
|
||||
"typescript": "^5.8.3",
|
||||
"typescript-eslint": "^8.37.0"
|
||||
},
|
||||
"lint-staged": {
|
||||
"*.ts": [
|
||||
@@ -96,6 +104,6 @@
|
||||
},
|
||||
"bin": "build/app.js",
|
||||
"engines": {
|
||||
"node": ">= 20"
|
||||
"node": ">= 22"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -14,18 +14,18 @@
|
||||
|
||||
mkYarnPackage rec {
|
||||
pname = "grafana-image-renderer";
|
||||
version = "3.12.7";
|
||||
version = "4.0.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grafana";
|
||||
repo = "grafana-image-renderer";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-X7aBUvyktqRHUGvIBBoqAHCUHbddU0ltyd3AhRW+PaA=";
|
||||
hash = "sha256-CoQTOzQ7h31B3U0yvJYsgC3uaSyjNNLpD+8uMN+naiQ=";
|
||||
};
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
yarnLock = src + "/yarn.lock";
|
||||
hash = "sha256-lV+4r+5E55J4H1zl05SimxIhGVD/PvEkIr3j1yhZS4o=";
|
||||
hash = "sha256-xZrIoQlPeyGTbFRUQ0M8Tc6YpzsC5IACW0bbZ+HnsOQ=";
|
||||
};
|
||||
|
||||
packageJSON = ./package.json;
|
||||
|
||||
@@ -0,0 +1,92 @@
|
||||
{
|
||||
lib,
|
||||
zip,
|
||||
love,
|
||||
imagemagick,
|
||||
strip-nondeterminism,
|
||||
copyDesktopItems,
|
||||
fetchFromGitHub,
|
||||
fetchpatch2,
|
||||
makeDesktopItem,
|
||||
makeBinaryWrapper,
|
||||
stdenv,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "honey-home";
|
||||
version = "0-unstable-2022-10-25";
|
||||
|
||||
# submodules have git@github.com which doesn't work
|
||||
# error: cannot run ssh: No such file or directory
|
||||
# this override is required to fetch them via https
|
||||
src =
|
||||
(fetchFromGitHub {
|
||||
owner = "dvdfu";
|
||||
repo = "ld38";
|
||||
rev = "45bb4bde8a667ee8cfb5034345bec90f70eb3b91";
|
||||
hash = "sha256-m8dyCoudTJDfP0KGcoA0Xj5LmRwN/8YOfEwiwCa8sOE=";
|
||||
fetchSubmodules = true;
|
||||
}).overrideAttrs
|
||||
(_: {
|
||||
GIT_CONFIG_COUNT = 1;
|
||||
GIT_CONFIG_KEY_0 = "url.https://github.com/.insteadOf";
|
||||
GIT_CONFIG_VALUE_0 = "git@github.com:";
|
||||
});
|
||||
|
||||
patches = [
|
||||
# follow https://github.com/dvdfu/ld38/pull/58 and remove if ever merged
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/dvdfu/ld38/commit/808537065a8dacc903e3d704b381f61b11f91d47.patch?full_index=1";
|
||||
hash = "sha256-iXFQWRU2hbKjVGjkwZKgxckRpr3/DUXczNNuMz48ktA=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
makeBinaryWrapper
|
||||
imagemagick
|
||||
strip-nondeterminism
|
||||
zip
|
||||
];
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "Honey Home";
|
||||
exec = "honey-home";
|
||||
icon = "honey-home";
|
||||
comment = "Save the bees in this tiny world";
|
||||
desktopName = "Honey Home";
|
||||
genericName = "Honey Home";
|
||||
categories = [ "Game" ];
|
||||
})
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/share/pixmaps
|
||||
# generate a logo as the title logo in the readme is too wide for an app icon
|
||||
magick \
|
||||
res/tree_hive.png \
|
||||
res/hud_bee.png -gravity Center -geometry -8+15 -composite \
|
||||
res/hud_bee.png -gravity Center -geometry -24+8 -composite \
|
||||
honey-home-logo.png
|
||||
install -Dm644 honey-home-logo.png $out/share/pixmaps/honey-home.png
|
||||
rm honey-home-logo.png
|
||||
zip -9 -r honey-home.love ./*
|
||||
strip-nondeterminism --type zip honey-home.love
|
||||
install -Dm444 -t $out/share/games/lovegames/ honey-home.love
|
||||
makeWrapper ${love}/bin/love $out/bin/honey-home \
|
||||
--add-flags $out/share/games/lovegames/honey-home.love
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/dvdfu/ld38";
|
||||
downloadPage = "https://dvdfu.itch.io/honey-home";
|
||||
description = "A game where you save the bees, Ludum Dare 38 Game Jam winner";
|
||||
license = lib.licenses.unfreeRedistributable; # best guess as it is source available
|
||||
platforms = love.meta.platforms;
|
||||
mainProgram = "honey-home";
|
||||
maintainers = with lib.maintainers; [ phanirithvij ];
|
||||
};
|
||||
})
|
||||
@@ -1,65 +1,60 @@
|
||||
{
|
||||
ameba = {
|
||||
"ameba" = {
|
||||
url = "https://github.com/crystal-ameba/ameba.git";
|
||||
rev = "v1.6.1";
|
||||
sha256 = "1qlgqpgycfxvvrfzih7b9ayb6fvkffz5aw0msbj70z2q7wvsq29p";
|
||||
};
|
||||
athena-negotiation = {
|
||||
"athena-negotiation" = {
|
||||
url = "https://github.com/athena-framework/negotiation.git";
|
||||
rev = "v0.1.1";
|
||||
sha256 = "1vkk59lqrxb0l8kyzs114i3c18zb2bdiah2xhazkk8q7x6fz4yzk";
|
||||
};
|
||||
backtracer = {
|
||||
"backtracer" = {
|
||||
url = "https://github.com/sija/backtracer.cr.git";
|
||||
rev = "v1.2.2";
|
||||
sha256 = "1rknyylsi14m7i77x7c3138wdw27i4f6sd78m3srw851p47bwr20";
|
||||
};
|
||||
db = {
|
||||
"db" = {
|
||||
url = "https://github.com/crystal-lang/crystal-db.git";
|
||||
rev = "v0.13.1";
|
||||
sha256 = "02b79bdv5h460ay0vkpwi5q69b1qrm9z29z02p09xb03hijxskpd";
|
||||
};
|
||||
exception_page = {
|
||||
"exception_page" = {
|
||||
url = "https://github.com/crystal-loot/exception_page.git";
|
||||
rev = "v0.2.2";
|
||||
sha256 = "1c8askb9b7621jjz5pjj6b8pdbhw3r1l3dym6swg1saspf5j3jwi";
|
||||
rev = "v0.4.1";
|
||||
sha256 = "00vl6vgxhpwbzadlamjpq5zm8c4y0plj9kga63301isxc75vn4x1";
|
||||
};
|
||||
http_proxy = {
|
||||
"http_proxy" = {
|
||||
url = "https://github.com/mamantoha/http_proxy.git";
|
||||
rev = "v0.10.3";
|
||||
sha256 = "1hgghjy611m9bbmq8drvzs30mymkq2s4d18lp19543qls58h80vs";
|
||||
};
|
||||
kemal = {
|
||||
"kemal" = {
|
||||
url = "https://github.com/kemalcr/kemal.git";
|
||||
rev = "v1.1.2";
|
||||
sha256 = "1149q4qw0zrws5asqqr4snrdi67xsmisdcq58zcrbgqgsxgly9d0";
|
||||
rev = "v1.6.0";
|
||||
sha256 = "1z64zaizzvb643rxxr70r23fzjrry2mvkwydngjyblcyvkrx074w";
|
||||
};
|
||||
kilt = {
|
||||
url = "https://github.com/jeromegn/kilt.git";
|
||||
rev = "v0.6.1";
|
||||
sha256 = "0dpc15y9m8c5l9zdfif6jlf7zmkrlm9w4m2igi5xa22fdjwamwfp";
|
||||
};
|
||||
pg = {
|
||||
"pg" = {
|
||||
url = "https://github.com/will/crystal-pg.git";
|
||||
rev = "v0.28.0";
|
||||
sha256 = "0g1kdpnz7sr7hpama0y3s70v5xjhi7jm2ypb1w503cfvr30qffpm";
|
||||
};
|
||||
protodec = {
|
||||
"protodec" = {
|
||||
url = "https://github.com/iv-org/protodec.git";
|
||||
rev = "v0.1.5";
|
||||
sha256 = "09cm36skv2mxqrlczp0j1g7cf8wsfdqr8q39nxyj3ggc3yadp8bc";
|
||||
};
|
||||
radix = {
|
||||
"radix" = {
|
||||
url = "https://github.com/luislavena/radix.git";
|
||||
rev = "v0.4.1";
|
||||
sha256 = "1l08cydkdidq9yyil1wl240hvk41iycv04jrg6nx5mkvzw4z1bzg";
|
||||
};
|
||||
spectator = {
|
||||
"spectator" = {
|
||||
url = "https://github.com/icy-arctic-fox/spectator.git";
|
||||
rev = "v0.10.6";
|
||||
sha256 = "0w6mv1q44is2m19pyspkyiwm84h55nchsm4pp82gdbb0j9ylhckx";
|
||||
};
|
||||
sqlite3 = {
|
||||
"sqlite3" = {
|
||||
url = "https://github.com/crystal-lang/crystal-sqlite3.git";
|
||||
rev = "v0.21.0";
|
||||
sha256 = "1mhg59l6qgmf14zjrais0jfn1h5jj9j32fy7fb0gkp9zhpa7x6vs";
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
{
|
||||
"invidious": {
|
||||
"hash": "sha256-JXcj5mh0WEetTt91cA+/pgqxNwyIRF+bISOBoHHVZf0=",
|
||||
"version": "2.20250504.0",
|
||||
"date": "2025.05.04",
|
||||
"commit": "aa7de1ed"
|
||||
"hash": "sha256-tVytYxFcHnGhI5mdZhZk9NBp++8q9PGdYbl8H6j7dAE=",
|
||||
"version": "2.20250913.0",
|
||||
"date": "2025.09.13",
|
||||
"commit": "cf019e3b"
|
||||
},
|
||||
"videojs": {
|
||||
"hash": "sha256-jED3zsDkPN8i6GhBBJwnsHujbuwlHdsVpVqa1/pzSH4="
|
||||
|
||||
@@ -24,13 +24,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "lnav";
|
||||
version = "0.13.0";
|
||||
version = "0.13.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tstack";
|
||||
repo = "lnav";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-1TS954ysXqSuMEGdzc2b9HTJ+ic0qfyc35j8RFzjLWA=";
|
||||
hash = "sha256-Pi1S8tRY7Lv0R7sdLOFppuCbTb/6omyAsNW13dmWBqA=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
@@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
src = "${finalAttrs.src}/src/third-party/prqlc-c";
|
||||
hash = "sha256-svi+C3ELw6Ly0mtji8xOv+DDqR0z5shFNazHa3kDQVg=";
|
||||
hash = "sha256-hXjn2CF4FxCfDzikWif9hGWRmlIJI+nxbcV8EBEWxis=";
|
||||
};
|
||||
|
||||
cargoRoot = "src/third-party/prqlc-c";
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "plutovg";
|
||||
version = "1.3.0";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sammycage";
|
||||
repo = "plutovg";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-9h7UvUSJLBRs4jD0/qTs3nzMBZKyyZg2T9eVEIpSYMg=";
|
||||
hash = "sha256-6UW+laVxTYvg+5qC12yA6U6gPKdFQeb7sdDunZ6gcd4=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
||||
@@ -18,13 +18,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "prrte";
|
||||
version = "3.0.11";
|
||||
version = "3.0.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openpmix";
|
||||
repo = "prrte";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-4JEh4N/38k0Xgp0CqnFipaEZlJBQr8nyxoncyz0/7yo=";
|
||||
hash = "sha256-sOCJc70imSzAqYXz29tOKKETsSHvgMUQmeTHlfnQXj4=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rip2";
|
||||
version = "0.9.4";
|
||||
version = "0.9.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MilesCranmer";
|
||||
repo = "rip2";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-lNMFbc0TItvVuzwpVbe7qWlSCzIaFi0/cQwfq2itzbY=";
|
||||
hash = "sha256-vYkJlmzysUcX+jULGSs4Omu2RjUs4ZO4blN/zlzDcqc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-KUVybOCtc66AubXjei0YCkXirfuIDgK3xSxjNODun98=";
|
||||
cargoHash = "sha256-+8o4PFcJ/jMoMzfEA96tJ8wuH1CTqxnDwvFuegmPcEY=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
+23
-12
@@ -18,6 +18,7 @@
|
||||
pandoc,
|
||||
pango,
|
||||
pkg-config,
|
||||
versionCheckHook,
|
||||
wayland,
|
||||
wayland-protocols,
|
||||
wayland-scanner,
|
||||
@@ -32,22 +33,24 @@
|
||||
x11Support ? true,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "rofi-unwrapped";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "davatorium";
|
||||
repo = "rofi";
|
||||
rev = version;
|
||||
tag = finalAttrs.version;
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-akKwIYH9OoCh4ZE/bxKPCppxXsUhplvfRjSGsdthFk4=";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
patchShebangs "script"
|
||||
|
||||
# root not present in build /etc/passwd
|
||||
sed -i 's/~root/~nobody/g' test/helper-expand.c
|
||||
substituteInPlace test/helper-expand.c \
|
||||
--replace-fail "~root" "~nobody"
|
||||
'';
|
||||
|
||||
depsBuildBuild = [
|
||||
@@ -91,22 +94,30 @@ stdenv.mkDerivation rec {
|
||||
xcbutilxrm
|
||||
];
|
||||
|
||||
mesonFlags =
|
||||
lib.optionals x11Support [ "-Dimdkit=true" ]
|
||||
++ lib.optionals (!waylandSupport) [ "-Dwayland=disabled" ]
|
||||
++ lib.optionals (!x11Support) [ "-Dxcb=disabled" ];
|
||||
mesonFlags = [
|
||||
(lib.mesonBool "imdkit" x11Support)
|
||||
(lib.mesonEnable "wayland" waylandSupport)
|
||||
(lib.mesonEnable "xcb" x11Support)
|
||||
];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
];
|
||||
versionCheckProgramArg = "-version";
|
||||
doInstallCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "Window switcher, run dialog and dmenu replacement";
|
||||
homepage = "https://github.com/davatorium/rofi";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [
|
||||
changelog = "https://github.com/davatorium/rofi/releases/tag/${finalAttrs.version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
bew
|
||||
SchweGELBin
|
||||
];
|
||||
platforms = with platforms; linux;
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "rofi";
|
||||
};
|
||||
}
|
||||
})
|
||||
@@ -27,7 +27,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
description = "Declarative secrets, every environment, any provider";
|
||||
homepage = "https://secretspec.dev";
|
||||
license = with lib.licenses; [ asl20 ];
|
||||
maintainers = with lib.maintainers; [ domenkozar ];
|
||||
teams = [ lib.teams.cachix ];
|
||||
mainProgram = "secretspec";
|
||||
};
|
||||
})
|
||||
|
||||
@@ -31,7 +31,7 @@ let
|
||||
"18.1.8".officialRelease.sha256 = "sha256-iiZKMRo/WxJaBXct9GdAcAT3cz9d9pnAcO1mmR6oPNE=";
|
||||
"19.1.7".officialRelease.sha256 = "sha256-cZAB5vZjeTsXt9QHbP5xluWNQnAHByHtHnAhVDV0E6I=";
|
||||
"20.1.8".officialRelease.sha256 = "sha256-ysyB/EYxi2qE9fD5x/F2zI4vjn8UDoo1Z9ukiIrjFGw=";
|
||||
"21.1.0".officialRelease.sha256 = "sha256-4DLEZuhREHMl2t0f1iqvXSRSE5VBMVxd94Tj4m8Yf9s=";
|
||||
"21.1.1".officialRelease.sha256 = "sha256-IB9Z3bIMwfgw2W2Vxo89CmtCM9DfOyV2Ei64nqgHrgc=";
|
||||
"22.0.0-git".gitRelease = {
|
||||
rev = "6fc32e93066c59a39b3c8c9be4e4f416653a917e";
|
||||
rev-version = "22.0.0-unstable-2025-09-07";
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "c-blosc2";
|
||||
version = "2.19.1";
|
||||
version = "2.21.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Blosc";
|
||||
repo = "c-blosc2";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-t+zh89VFVnqYzxqZh13hS6iieSqbG+DTPzI4aXwY8os=";
|
||||
sha256 = "sha256-Ra/LhLV78Gr2rXIKZIFx3+oJ+Fk03tfmguoGL4P9J5c=";
|
||||
};
|
||||
|
||||
# https://github.com/NixOS/nixpkgs/issues/144170
|
||||
|
||||
@@ -1,37 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
numpy,
|
||||
scipy,
|
||||
}:
|
||||
|
||||
buildPythonPackage {
|
||||
pname = "apkit";
|
||||
version = "unstable-2022-08-23";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hwp";
|
||||
repo = "apkit";
|
||||
rev = "40561738c3f585c590c3f0584bf2e3354eefbd48";
|
||||
hash = "sha256-/pwoEKB6BD+wWy7QwPwwzSxGn+TAOaMzduOXyuoXC8g=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
numpy
|
||||
scipy
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "apkit" ];
|
||||
|
||||
# This package has no tests
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Audio processing toolkit";
|
||||
homepage = "https://github.com/hwp/apkit";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ GaetanLepage ];
|
||||
};
|
||||
}
|
||||
@@ -32,14 +32,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "blosc2";
|
||||
version = "3.6.1";
|
||||
version = "3.7.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Blosc";
|
||||
repo = "python-blosc2";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-MSGuG9Vqniz6gie0je84XNTHLZaZho9tmqELMKoDh/U=";
|
||||
hash = "sha256-mA7/8i77wtl9b6IT4Wp/uFDYp/IacnPnAsRoXe64+z4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -75,6 +75,11 @@ buildPythonPackage rec {
|
||||
]
|
||||
++ lib.optionals runTorchTests [ torch ];
|
||||
|
||||
disabledTests = [
|
||||
# attempts external network requests
|
||||
"test_with_remote"
|
||||
];
|
||||
|
||||
passthru.c-blosc2 = c-blosc2;
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -31,14 +31,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bump-my-version";
|
||||
version = "1.2.1";
|
||||
version = "1.2.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "callowayproject";
|
||||
repo = "bump-my-version";
|
||||
tag = version;
|
||||
hash = "sha256-eDkjnV84btrT7U96svba7EhuJyTxF4a5ZtLekEGzbus=";
|
||||
hash = "sha256-r83RMI9oj8cauvMUJys4wA97HKflVWja2TKXjOSiVGQ=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -39,12 +39,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "coiled";
|
||||
version = "1.118.3";
|
||||
version = "1.120.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-HjbBZsTqb3D5uh3cBZPFkhe/QbJtnHwduUDCaMl3vc4=";
|
||||
hash = "sha256-ZVAJlYyEsvDfGd8ioLxmWn43T531jdyhG2L3FROetjU=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -37,7 +37,7 @@ let
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "deid";
|
||||
version = "0.4.0";
|
||||
version = "0.4.6";
|
||||
pyproject = true;
|
||||
|
||||
# Pypi version has no tests
|
||||
@@ -45,8 +45,8 @@ buildPythonPackage rec {
|
||||
owner = "pydicom";
|
||||
repo = "deid";
|
||||
# the github repo does not contain Pypi version tags:
|
||||
rev = "14d1e4eb70f2c9fda43fca411794be9d8a5a8516";
|
||||
hash = "sha256-YsLWHIO6whcBQriMYb0tDD9s/RrxlfeKGORF1UCOilI=";
|
||||
rev = "f2e125e5a13ae1c3ccfeb55d9431d3a627a4d0db";
|
||||
hash = "sha256-Vk6MD3MNf1JejqACxjjHkFniK7YDgmdH7k1iQi+enEY=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -18,14 +18,14 @@
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "uxsim";
|
||||
version = "1.9.0";
|
||||
version = "1.9.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "toruseo";
|
||||
repo = "UXsim";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-E4VhLkBl4kFg/OpOc050jIPQHEznxjMp22PIxDhVMIU=";
|
||||
hash = "sha256-txKeUf19l/BJZoQCLpMP31u0DBPlPHxrSqzASC3DPIw=";
|
||||
};
|
||||
|
||||
patches = [ ./add-qt-plugin-path-to-env.patch ];
|
||||
|
||||
@@ -23,8 +23,8 @@ let
|
||||
in
|
||||
buildNodejs {
|
||||
inherit enableNpm;
|
||||
version = "24.7.0";
|
||||
sha256 = "cf74a77753b629ffebd2e38fb153a21001b2b7a3c365c0ec7332b120b98c7251";
|
||||
version = "24.8.0";
|
||||
sha256 = "1c03b362ebf4740d4758b9a3d3087e3de989f54823650ec80b47090ef414b2e0";
|
||||
patches =
|
||||
(
|
||||
if (stdenv.hostPlatform.emulatorAvailable buildPackages) then
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
|
||||
grafanaPlugin {
|
||||
pname = "grafana-clock-panel";
|
||||
version = "2.1.8";
|
||||
zipHash = "sha256-QLvq2CSlJuEaYAazn8MoY3XCiXeRILj4dTp/aqrHL/k=";
|
||||
version = "2.1.9";
|
||||
zipHash = "sha256-awc1bA3MHg0z7HDzqhhWOymVPeEsOHUdxX0xneOd7kY=";
|
||||
meta = with lib; {
|
||||
description = "Clock panel for Grafana";
|
||||
license = licenses.mit;
|
||||
|
||||
+2
-2
@@ -2,8 +2,8 @@
|
||||
|
||||
grafanaPlugin {
|
||||
pname = "victoriametrics-metrics-datasource";
|
||||
version = "0.18.3";
|
||||
zipHash = "sha256-OKrOC53NxbFhiYflw6gUQOo0TyxWarznnFg9Wr57704=";
|
||||
version = "0.19.0";
|
||||
zipHash = "sha256-xHo052LaMw5pzAp1EcPBpP9n7c2QTzHSZRUUe/2mQgs=";
|
||||
meta = {
|
||||
description = "VictoriaMetrics metrics datasource for Grafana";
|
||||
license = lib.licenses.agpl3Only;
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
}:
|
||||
|
||||
yarn2nix-moretea.mkYarnPackage {
|
||||
version = "1.1.49";
|
||||
version = "1.1.50";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://registry.npmjs.org/meshcentral/-/meshcentral-1.1.49.tgz";
|
||||
sha256 = "1xklg7snn3qlmakkqy89q58n7b09idxz0zz5ha3hrn8s0wcmjakr";
|
||||
url = "https://registry.npmjs.org/meshcentral/-/meshcentral-1.1.50.tgz";
|
||||
sha256 = "1irjwypaygjf08y6p78dgfvmqd69i12bdm2zs87mkyq8igh8m8ph";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -24,7 +24,7 @@ yarn2nix-moretea.mkYarnPackage {
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
yarnLock = ./yarn.lock;
|
||||
hash = "sha256-xiZ1RL4GsihQc1yazjkTfge/DS2N9oimSl0EZr6WmrM=";
|
||||
hash = "sha256-rSkbrbI+AgBszwIRA30AfMK5hx/vvhx0MsDFHYMu7nQ=";
|
||||
};
|
||||
|
||||
# Tarball has CRLF line endings. This makes patching difficult, so let's convert them.
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "meshcentral",
|
||||
"version": "1.1.49",
|
||||
"version": "1.1.50",
|
||||
"keywords": [
|
||||
"Remote Device Management",
|
||||
"Remote Device Monitoring",
|
||||
@@ -122,7 +122,7 @@
|
||||
"webdav": "5.8.0",
|
||||
"minio": "8.0.2",
|
||||
"wildleek": "2.0.0",
|
||||
"yubikeyotp": "0.2.0",
|
||||
"yub": "0.11.1",
|
||||
"otplib": "12.0.1",
|
||||
"twilio": "4.19.0",
|
||||
"plivo": "4.58.0",
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
+7
-9
@@ -8,9 +8,9 @@ Rather than calling ukify and mkosi with sys.executable, which doesn't use the P
|
||||
Signed-off-by: Moritz Sanft <58110325+msanft@users.noreply.github.com>
|
||||
---
|
||||
mkosi/__init__.py | 17 +++++++----------
|
||||
mkosi/bootloader.py | 5 +----
|
||||
mkosi/bootloader.py | 3 +--
|
||||
mkosi/run.py | 8 ++++----
|
||||
3 files changed, 12 insertions(+), 18 deletions(-)
|
||||
3 files changed, 12 insertions(+), 16 deletions(-)
|
||||
|
||||
diff --git a/mkosi/__init__.py b/mkosi/__init__.py
|
||||
index 65cac772bf1fc9feabec5740ed89a958ba406125..c0debc09a76f36ae878bd172294eee6637b95bcb 100644
|
||||
@@ -98,18 +98,16 @@ index 65cac772bf1fc9feabec5740ed89a958ba406125..c0debc09a76f36ae878bd172294eee66
|
||||
die(
|
||||
f"Found '{ukify}' with version {v} but version {version} or newer is required to {reason}.",
|
||||
diff --git a/mkosi/bootloader.py b/mkosi/bootloader.py
|
||||
index 6f112b854f72a8863dc5e7348f0154851d3dda96..8fdf2c5df7950c032bfcd36d89f7824e86ec9173 100644
|
||||
index 6f112b854f72a8863dc5e7348f0154851d3dda96..28b32b9c8fcaa7c49a7d69e7e303ccf332d47d58 100644
|
||||
--- a/mkosi/bootloader.py
|
||||
+++ b/mkosi/bootloader.py
|
||||
@@ -268,10 +268,7 @@ def find_signed_grub_image(context: Context) -> Optional[Path]:
|
||||
|
||||
|
||||
@@ -270,8 +270,7 @@ def find_signed_grub_image(context: Context) -> Optional[Path]:
|
||||
def python_binary(config: Config) -> PathString:
|
||||
- # If there's no tools tree, prefer the interpreter from MKOSI_INTERPRETER. If there is a tools
|
||||
- # tree, just use the default python3 interpreter.
|
||||
# If there's no tools tree, prefer the interpreter from MKOSI_INTERPRETER. If there is a tools
|
||||
# tree, just use the default python3 interpreter.
|
||||
- exe = Path(sys.executable)
|
||||
- return "python3" if config.tools_tree or not exe.is_relative_to("/usr") else exe
|
||||
+ return "@PYTHON_PEFILE@"
|
||||
+ return "python3" if config.tools_tree else "@PYTHON_PEFILE@"
|
||||
|
||||
|
||||
def extract_pe_section(context: Context, binary: Path, section: str, output: Path) -> Path:
|
||||
|
||||
@@ -3302,9 +3302,7 @@ with pkgs;
|
||||
|
||||
ksmoothdock = libsForQt5.callPackage ../applications/misc/ksmoothdock { };
|
||||
|
||||
libcoap = callPackage ../applications/networking/libcoap {
|
||||
autoconf = buildPackages.autoconf269;
|
||||
};
|
||||
libcoap = callPackage ../applications/networking/libcoap { };
|
||||
|
||||
libcryptui = callPackage ../development/libraries/libcryptui {
|
||||
gtk3 = if stdenv.hostPlatform.isDarwin then gtk3-x11 else gtk3;
|
||||
@@ -12382,9 +12380,7 @@ with pkgs;
|
||||
|
||||
mumble_overlay = (callPackages ../applications/networking/mumble { }).overlay;
|
||||
|
||||
mup = callPackage ../applications/audio/mup {
|
||||
autoreconfHook = buildPackages.autoreconfHook269;
|
||||
};
|
||||
mup = callPackage ../applications/audio/mup { };
|
||||
|
||||
musescore = qt6.callPackage ../applications/audio/musescore { };
|
||||
|
||||
@@ -12816,9 +12812,6 @@ with pkgs;
|
||||
;
|
||||
rke2 = rke2_stable;
|
||||
|
||||
rofi-unwrapped = callPackage ../applications/misc/rofi { };
|
||||
rofi = callPackage ../applications/misc/rofi/wrapper.nix { };
|
||||
|
||||
rofi-pass = callPackage ../tools/security/pass/rofi-pass.nix { };
|
||||
rofi-pass-wayland = callPackage ../tools/security/pass/rofi-pass.nix {
|
||||
backend = "wayland";
|
||||
|
||||
@@ -82,6 +82,7 @@ mapAliases ({
|
||||
ansible-navigator = throw "ansible-navigator has been promoted to a top-level attribute name: pkgs.ansible-navigator"; # Added 2024-08-07
|
||||
anyjson = throw "anyjson has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18
|
||||
apache-airflow = throw "apache-airflow has been moved out of pythonPackages and is available as a standalone package"; # added 2023-06-05
|
||||
apkit = throw "apkit was removed because it is unmaintained upstream and different from apkit on PyPI"; # added 2025-09-13
|
||||
argon2_cffi = argon2-cffi; # added 2022-05-09
|
||||
arnparse = throw "arnparse has been removed because the upstream repository was archived in 2023"; # Added 2024-10-04
|
||||
APScheduler = apscheduler; # added 2023-02-19
|
||||
|
||||
@@ -789,8 +789,6 @@ self: super: with self; {
|
||||
|
||||
apkinspector = callPackage ../development/python-modules/apkinspector { };
|
||||
|
||||
apkit = callPackage ../development/python-modules/apkit { };
|
||||
|
||||
aplpy = callPackage ../development/python-modules/aplpy { };
|
||||
|
||||
apollo-fpga = callPackage ../development/python-modules/apollo-fpga { };
|
||||
|
||||
Reference in New Issue
Block a user