Merge master into staging-next

This commit is contained in:
nixpkgs-ci[bot]
2026-04-22 12:23:11 +00:00
committed by GitHub
55 changed files with 490 additions and 213 deletions
+6
View File
@@ -27730,6 +27730,12 @@
githubId = 7727887;
name = "Tomas Kala";
};
tomasrivera = {
email = "tomas.riveral@icloud.com";
github = "tomasriveral";
githubId = 137088692;
name = "Tomás Rivera";
};
tomberek = {
email = "tomberek@gmail.com";
matrix = "@tomberek:matrix.org";
-4
View File
@@ -677,10 +677,6 @@ let
};
in
{
imports = [
(lib.mkRenamedOptionModule [ "credentialsFile" ] [ "environmentFile" ])
];
options = {
validMinDays = lib.mkOption {
type = lib.types.nullOr lib.types.int;
@@ -58,6 +58,12 @@ in
description = "Port the OnlyOffice document server should listen on.";
};
allowLocalConnections = lib.mkOption {
type = lib.types.bool;
default = false;
description = "Whether to allow the document server to download files from private IP addresses.";
};
examplePort = lib.mkOption {
type = lib.types.port;
default = null;
@@ -308,6 +314,10 @@ in
# https://github.com/ONLYOFFICE/Docker-DocumentServer/blob/master/run-document-server.sh
FS_SECRET_STRING=$(cut -d '"' -f 2 < ${cfg.securityNonceFile})
jq '
${lib.optionalString cfg.allowLocalConnections ''
.services.CoAuthoring."request-filtering-agent".allowPrivateIPAddress = true |
.services.CoAuthoring."request-filtering-agent".allowMetaIPAddress = true |
''}
.storage.fs.secretString = "'$FS_SECRET_STRING'" |
.services.CoAuthoring.server.port = ${toString cfg.port} |
.services.CoAuthoring.sql.dbHost = "${cfg.postgresHost}" |
@@ -9,13 +9,13 @@
}:
mkLibretroCore {
core = "parallel-n64";
version = "0-unstable-2025-12-04";
version = "0-unstable-2026-04-20";
src = fetchFromGitHub {
owner = "libretro";
repo = "parallel-n64";
rev = "1da824e13e725a7144f3245324f43d59623974f8";
hash = "sha256-Th8VqENewfTeRTH+lONN7ZTMLQ0G6901q6ZBNMgepL4=";
rev = "51aefbd38751563138b5fee3810ff653a78c4f24";
hash = "sha256-E+3dcc+NgwdY23K9YqbH2El+hL1n+ihN4Sby19cYRBE=";
};
patches = [
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "quicknes";
version = "0-unstable-2026-03-31";
version = "0-unstable-2026-04-20";
src = fetchFromGitHub {
owner = "libretro";
repo = "QuickNES_Core";
rev = "71782569078f29214017a966b0f992b9e512bf19";
hash = "sha256-Bx1iZcrUG5B/wjeWf2hZEAIocM7dKgRwRPqpGzS2Cgc=";
rev = "7848e1ac22b1c69d056ae4cb57710651ff1dd169";
hash = "sha256-cgoLO1572XoDDBJiEFglWtbo3vk5EXu/U3Pn7zrxqM8=";
};
makefile = "Makefile";
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "snes9x2002";
version = "0-unstable-2026-03-31";
version = "0-unstable-2026-04-20";
src = fetchFromGitHub {
owner = "libretro";
repo = "snes9x2002";
rev = "15826a2afc1474b30c310502b5dbe25c639be59d";
hash = "sha256-LVTtpnmZzmKCohFwc74qLMR6cN4ntT/o/OUQOg6mdU0=";
rev = "39e0d8c6daf4b1b1302eeecfee8309570aeb6a82";
hash = "sha256-mOtCZEuXKWQEupWfFfr3Ji6m15zZuOIJ/ieKtrFGsWI=";
};
makefile = "Makefile";
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "virtualjaguar";
version = "0-unstable-2026-04-03";
version = "0-unstable-2026-04-16";
src = fetchFromGitHub {
owner = "libretro";
repo = "virtualjaguar-libretro";
rev = "68265f930f6120f8f05c1f71c9fc9e417dab0d28";
hash = "sha256-BWpOm0DECqTqbQ1FR9YgjxjsxU7LdB4MlYHzGatcrJk=";
rev = "dd44259f8dca0ba87068eb2264367c01e131c263";
hash = "sha256-prvUvHXOeSWG5BK4mHkkFVnq0xGc3pI09GDNJJvZfgs=";
};
makefile = "Makefile";
@@ -0,0 +1,35 @@
From be3aca2216ecb4aab6d1e3c5e11ed621fd75691a Mon Sep 17 00:00:00 2001
From: Winter M <winter@antithesis.com>
Date: Wed, 8 Apr 2026 17:34:43 -0400
Subject: [PATCH] makefile: don't use tool to generate version file
---
makefile | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/makefile b/makefile
index fa3e0943..d3bc479e 100644
--- a/makefile
+++ b/makefile
@@ -118,10 +118,7 @@ pre-build:
$(COPY) $(GO_SPACE)/seelog_windows.xml.template $(GO_SPACE)/bin/
$(COPY) $(GO_SPACE)/agent/integration-cli/integration-cli.json $(GO_SPACE)/bin/
- @echo "Regenerate version file during pre-release"
-# Remove overrides for GOARCH and GOOS when invoking 'go run', since we want the local host's settings
- GOARCH= GOOS= go run $(GO_SPACE)/agent/version/versiongenerator/version-gen.go
- $(COPY) $(GO_SPACE)/VERSION $(GO_SPACE)/bin/
+ echo -e 'package version\nconst Version = "@VERSION@"' > $(GO_SPACE)/agent/version/version.go
# General build recipe. Defaults to generating a linux/amd64 non-PIE build, but can be overriden
# by setting appropriate variables.
@@ -493,4 +490,4 @@ argot-check:
$(GO_SPACE)/Tools/src/run_argot.sh
argot-update:
- $(GO_SPACE)/Tools/src/run_argot.sh "true"
\ No newline at end of file
+ $(GO_SPACE)/Tools/src/run_argot.sh "true"
--
2.53.0
@@ -5,6 +5,7 @@
makeWrapper,
darwin,
fetchFromGitHub,
substitute,
coreutils,
unixtools,
util-linux,
@@ -60,6 +61,18 @@ buildGoModule (finalAttrs: {
# They used constants from another package that I couldn't figure
# out how to resolve, so hardcoded the constants.
./0002-version-gen-don-t-use-unnecessary-constants.patch
# They run a tool on the build platform in a way that isn't quite
# compatible with cross (`go run`). Simplest thing is to just make
# the file with a hardcoded value, as we already have it from attrs.
(substitute {
src = ./0001-makefile-don-t-use-tool-to-generate-version-file.patch;
substitutions = [
"--subst-var-by"
"VERSION"
finalAttrs.version
];
})
];
nativeBuildInputs = [
+4 -4
View File
@@ -5,7 +5,7 @@
"packages": {
"": {
"dependencies": {
"@sourcegraph/amp": "^0.0.1776125492-g5cb0c2"
"@sourcegraph/amp": "^0.0.1776834056-gfb3ba0"
}
},
"node_modules/@napi-rs/keyring": {
@@ -228,9 +228,9 @@
}
},
"node_modules/@sourcegraph/amp": {
"version": "0.0.1776125492-g5cb0c2",
"resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1776125492-g5cb0c2.tgz",
"integrity": "sha512-LdicFMcgJLNrKAF5diTbOLykdb7znsFohcyGiZInpHl6xGyRyJdyqdeh7VdRSfP4vR5EQGIsi7+i1nQOs6ViDQ==",
"version": "0.0.1776834056-gfb3ba0",
"resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1776834056-gfb3ba0.tgz",
"integrity": "sha512-2wXC+aXm7+NzNDIpa2Y7bii5V8Ya3wfF5/0MA2BsXfO/RfJ8zrhuFzeoDsO049VlKD5UkOOVOHbyXMk23whC5Q==",
"license": "Amp Commercial License",
"dependencies": {
"@napi-rs/keyring": "1.1.10"
+3 -3
View File
@@ -9,11 +9,11 @@
buildNpmPackage (finalAttrs: {
pname = "amp-cli";
version = "0.0.1776125492-g5cb0c2";
version = "0.0.1776834056-gfb3ba0";
src = fetchzip {
url = "https://registry.npmjs.org/@sourcegraph/amp/-/amp-${finalAttrs.version}.tgz";
hash = "sha256-EXS32qGU+/SD5MqjXO10GRH0w8EvvP9OqCCfEQfV8Kg=";
hash = "sha256-okV2WpxYTrKFW373OO6yfLs8YCULJ9K6uVgNNH58oHk=";
};
postPatch = ''
@@ -45,7 +45,7 @@ buildNpmPackage (finalAttrs: {
chmod +x bin/amp-wrapper.js
'';
npmDepsHash = "sha256-YT92XzPl1fnJ2a7XdjAe1+01gTeWWJ20Ca5uiLVL+Q4=";
npmDepsHash = "sha256-apW3mTGaTTnl2uIW9Ds+B6xxpIgLIIQH/pRtbTAOFEU=";
propagatedBuildInputs = [
ripgrep
+53
View File
@@ -0,0 +1,53 @@
{
lib,
stdenv,
fetchurl,
versionCheckHook,
nix-update-script,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "apfel-llm";
version = "1.0.5";
__structuredAttrs = true;
strictDeps = true;
# Building from source requires swift 6.3.0 while nixpkgs only has 5.10.1
src = fetchurl {
url = "https://github.com/Arthur-Ficial/apfel/releases/download/v${finalAttrs.version}/apfel-${finalAttrs.version}-arm64-macos.tar.gz";
hash = "sha256-etEOYkYVPm08SRE3nuKcDigS7lCkUUgMacOl/sLv/1A=";
};
sourceRoot = ".";
dontBuild = true;
dontConfigure = true;
installPhase = ''
runHook preInstall
mkdir -p $out/bin
cp apfel $out/bin/
chmod +x $out/bin/apfel
runHook postInstall
'';
nativeInstallCheckInputs = [ versionCheckHook ];
doInstallCheck = true;
passthru.updateScript = nix-update-script { };
meta = {
description = "Local Apple Intelligence LLM CLI and server";
homepage = "https://github.com/Arthur-Ficial/apfel";
changelog = "https://github.com/Arthur-Ficial/apfel/releases/tag/v${finalAttrs.version}";
license = lib.licenses.mit;
platforms = [ "aarch64-darwin" ];
mainProgram = "apfel";
sourceProvenance = [
lib.sourceTypes.binaryNativeCode
];
};
})
+2 -2
View File
@@ -6,13 +6,13 @@
buildGoModule (finalAttrs: {
pname = "checkip";
version = "0.50.0";
version = "0.53.0";
src = fetchFromGitHub {
owner = "jreisinger";
repo = "checkip";
tag = "v${finalAttrs.version}";
hash = "sha256-tf/PqMAOlFJrUFg5yPdARY8zTh/SjlNHp2LAX9f7QqM=";
hash = "sha256-n8TsbuaTsPC8CdWaUshCl4ILYJ6lkqfhFb52RGIl/f0=";
};
vendorHash = "sha256-5sUBrzo6wJfaMMvgNflcjB2QNSIeaD2TN7qBao53NFs=";
+3 -3
View File
@@ -6,18 +6,18 @@
buildGoModule (finalAttrs: {
pname = "cnspec";
version = "13.4.1";
version = "13.5.0";
src = fetchFromGitHub {
owner = "mondoohq";
repo = "cnspec";
tag = "v${finalAttrs.version}";
hash = "sha256-3Uo2x30K7b7NA5OGP8YYlcoEJmFhlkL7t7ohvzUlmYI=";
hash = "sha256-B78wdVa3GrD7eXG0RKnO2/F/FXV3jwaul2Ag1P76s2g=";
};
proxyVendor = true;
vendorHash = "sha256-7XwLkvG0LYL0pIbjMs78wMSqbXR5SScPAgjRxYsPwlA=";
vendorHash = "sha256-yb89NhE3d7Wx26ZzjadNTlOWauHVpT7Q4ScPauLcnlU=";
subPackages = [ "apps/cnspec" ];
+2 -2
View File
@@ -61,13 +61,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "fastfetch";
version = "2.61.0";
version = "2.62.0";
src = fetchFromGitHub {
owner = "fastfetch-cli";
repo = "fastfetch";
tag = finalAttrs.version;
hash = "sha256-gy4xxY3w3OzzqLrXvpy5ruwticUKRhx/B9OU/bpukvs=";
hash = "sha256-26rKLrlRKn8pVbqP727H5JAXCN5NaRCbf8si0Jgo4fc=";
};
outputs = [
+9 -1
View File
@@ -18,13 +18,21 @@ stdenvNoCC.mkDerivation (finalAttrs: {
sourceRoot = "source/fonts";
outputs = [
"out"
"webfont"
];
nativeBuildInputs = [ installFonts ];
meta = {
homepage = "https://github.com/erikdkennedy/figtree";
description = "Simple and friendly geometric sans serif font";
platforms = lib.platforms.all;
maintainers = with lib.maintainers; [ mrcjkb ];
maintainers = with lib.maintainers; [
mrcjkb
ners
];
license = lib.licenses.ofl;
};
})
+3 -3
View File
@@ -15,18 +15,18 @@
buildNpmPackage (finalAttrs: {
pname = "gemini-cli";
version = "0.38.1";
version = "0.38.2";
src = fetchFromGitHub {
owner = "google-gemini";
repo = "gemini-cli";
tag = "v${finalAttrs.version}";
hash = "sha256-Iq/KxQ8rbLtXDbGzcZxspfFwar189H3mBWwOD4hO7HU=";
hash = "sha256-DPJMpm+hOQQxG87/NyrCrlomeR4AD1WNfNoIsdaakaE=";
};
nodejs = nodejs_22;
npmDepsHash = "sha256-T3fxNFvkLR7f49GQjzzTnl3VM+VUUgJfFF5d2GGe7L4=";
npmDepsHash = "sha256-6UnLSmKdnXwEXgGcyRTibDkEqvlRr75e3fRld0v6T2s=";
dontPatchElf = stdenv.isDarwin;
-4
View File
@@ -25,10 +25,6 @@ buildGoModule {
"cmd/tomltestgen"
];
# allowGoReference adds the flag `-trimpath` which is also denoted by, go-toml's goreleaser config
# <https://github.com/pelletier/go-toml/blob/a3d5a0bb530b5206c728eed9cb57323061922bcb/.goreleaser.yaml#L13>
allowGoReference = true;
ldflags = [
"-s"
"-w"
+10 -4
View File
@@ -20,14 +20,14 @@
withDoc ? (stdenv.buildPlatform == stdenv.hostPlatform),
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "libxklavier";
version = "5.4";
src = fetchgit {
url = "https://gitlab.freedesktop.org/archived-projects/libxklavier.git";
rev = "${pname}-${version}";
sha256 = "1w1x5mrgly2ldiw3q2r6y620zgd89gk7n90ja46775lhaswxzv7a";
tag = "libxklavier-${finalAttrs.version}";
hash = "sha256-6uzfuVaQlnMMURIke+ZLqL0PhPEmCzx4bFR4+nItPfA=";
};
patches = [
@@ -58,6 +58,10 @@ stdenv.mkDerivation rec {
isocodes
];
depsBuildBuild = [
pkg-config
];
nativeBuildInputs = [
autoreconfHook
pkg-config
@@ -66,6 +70,8 @@ stdenv.mkDerivation rec {
gobject-introspection
];
strictDeps = true;
preAutoreconf = ''
export NOCONFIGURE=1
gtkdocize
@@ -84,4 +90,4 @@ stdenv.mkDerivation rec {
license = lib.licenses.lgpl2Plus;
platforms = lib.platforms.unix;
};
}
})
+5
View File
@@ -48,6 +48,11 @@ stdenv.mkDerivation (finalAttrs: {
"-Denable_x11_support=${lib.boolToString x11Support}"
];
postInstall = ''
install -Dm0644 res/config.ini "$out/etc/config.ini"
install -Dm0755 res/setup.sh "$out/etc/setup.sh"
'';
doInstallCheck = true;
nativeInstallCheckInputs = [ versionCheckHook ];
@@ -23,66 +23,32 @@ let
}).overrideAttrs
(
final: old: {
version = "10.5.1";
version = "10.10.1";
src = fetchFromGitea {
domain = "forgejo.ellis.link";
owner = "continuwuation";
repo = "rocksdb";
rev = "10.5.fb";
hash = "sha256-X4ApGLkHF9ceBtBg77dimEpu720I79ffLoyPa8JMHaU=";
rev = "10.10.fb";
hash = "sha256-1ef75IDMs5Hba4VWEyXPJb02JyShy5k4gJfzGDhopRk=";
};
patches = [ ];
cmakeFlags =
lib.subtractLists [
# no real reason to have snappy or zlib, no one uses this
(lib.cmakeBool "WITH_SNAPPY" true)
(lib.cmakeBool "ZLIB" true)
(lib.cmakeBool "WITH_ZLIB" true)
# we dont need to use ldb or sst_dump (core_tools)
(lib.cmakeBool "WITH_CORE_TOOLS" true)
# we dont need to build rocksdb tests
(lib.cmakeBool "WITH_TESTS" true)
# we use rust-rocksdb via C interface and dont need C++ RTTI
(lib.cmakeBool "USE_RTTI" true)
# this doesn't exist in RocksDB
(lib.cmakeBool "FORCE_SSE43" true)
] old.cmakeFlags
++ [
# no real reason to have snappy, no one uses this
(lib.cmakeBool "WITH_SNAPPY" false)
(lib.cmakeBool "ZLIB" false)
(lib.cmakeBool "WITH_ZLIB" false)
# we dont need to use ldb or sst_dump (core_tools)
(lib.cmakeBool "WITH_CORE_TOOLS" false)
# we dont need to build rocksdb tests
(lib.cmakeBool "WITH_TESTS" false)
# we use rust-rocksdb via C interface and dont need C++ RTTI
(lib.cmakeBool "USE_RTTI" false)
(lib.cmakeBool "WITH_TRACE_TOOLS" false)
];
outputs = [ "out" ];
# We aren't building tools, the original package uses this to make sure rocksdb
# tools work as expected. Hence we override this and make it empty.
preInstall = "";
}
);
in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "matrix-continuwuity";
version = "0.5.6";
version = "0.5.7";
src = fetchFromGitea {
domain = "forgejo.ellis.link";
owner = "continuwuation";
repo = "continuwuity";
tag = "v${finalAttrs.version}";
hash = "sha256-p6dL1wL9n+1ivUItdlZuLxTneDBjCHEdNr0ukau2rHI=";
hash = "sha256-DrW31VesYipZlFpCoCv4Sj4BtKeAF9/UpWhZjBIrXH4=";
};
cargoHash = "sha256-lLbnFA2WS96er84G2e9bGrYhhqe2zL3Npn1SXB3De2w=";
cargoHash = "sha256-E4eqPTLTilqMdIJ9MHbMbu5zTpqEqNPPo3rMS+sA8uA=";
nativeBuildInputs = [
pkg-config
@@ -122,6 +88,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
changelog = "https://forgejo.ellis.link/continuwuation/continuwuity/releases/tag/v${finalAttrs.version}";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [
bartoostveen
nyabinary
snaki
];
+3 -3
View File
@@ -14,16 +14,16 @@
buildGoModule (finalAttrs: {
pname = "openbao";
version = "2.5.2";
version = "2.5.3";
src = fetchFromGitHub {
owner = "openbao";
repo = "openbao";
tag = "v${finalAttrs.version}";
hash = "sha256-fqsCQf9wFlzMWC4XV1BclWlYG649VhhZBKlGrdsbqKc=";
hash = "sha256-VpW27vWKtqabJiNxuyx3PGDThHF6MOlxxfzD1UksX6I=";
};
vendorHash = "sha256-0L+0U4tM7/ObNjXcSZcvIw7Y/RwYs2iRsLA2zSYmexU=";
vendorHash = "sha256-imP8GJjm8udJ1RXfGhVJX7YZ9J47p/vdKjKjMfMgTXA=";
proxyVendor = true;
+3 -3
View File
@@ -7,16 +7,16 @@
buildGoModule (finalAttrs: {
pname = "pphack";
version = "0.1.2";
version = "0.1.3";
src = fetchFromGitHub {
owner = "edoardottt";
repo = "pphack";
tag = "v${finalAttrs.version}";
hash = "sha256-SVoIFrdiuFQDrqfqo+edXGXSMXEbmdecoHn8LzPuMUE=";
hash = "sha256-1v4XanhFNjE/t8DTe/YUXKnv61K6FT1nZn2+q0ZreTE=";
};
vendorHash = "sha256-zrC+QNv6Tat7rMsPbVAkbqT6WEImgGg5XSgIN3xSd2w=";
vendorHash = "sha256-RZJXl2GC9vJq5Ui9hlyKEkiq9HeMQeJIvsH6tOUp4Sg=";
nativeInstallCheckInputs = [ versionCheckHook ];
+4 -4
View File
@@ -22,16 +22,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "qbz";
version = "1.2.7";
version = "1.2.8";
src = fetchFromGitHub {
owner = "vicrodh";
repo = "qbz";
tag = "v${finalAttrs.version}";
hash = "sha256-/7gYjCfMJ1TmjogGQWkRDgDaUZ8o03hVNxZ21w4xniU=";
hash = "sha256-I5j1rpcAT7NNG/KtHwUUwvHjLIJB/+PAfPZJUvTsZTE=";
};
cargoHash = "sha256-Xk1v5QosIgzowLpo5L0qaSNFKqoL+kfQeA6KCIImK8M=";
cargoHash = "sha256-fPowLCj7+ZY6aNZ8UTMhVI4UFW+CM9Y6b7OXqJycYaw=";
cargoRoot = "src-tauri";
buildAndTestSubdir = finalAttrs.cargoRoot;
@@ -40,7 +40,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
npmDeps = fetchNpmDeps {
name = "qbz-${finalAttrs.version}-npm-deps";
inherit (finalAttrs) src;
hash = "sha256-xBad4Ms5dlE0jHZ5iKLS2dEujgIZahfNfcknJH9qoXM=";
hash = "sha256-0J86UrIoTL735I/7plyCfU2WxBcFXBt6g1tLXO+6JMI=";
};
env.LIBCLANG_PATH = "${lib.getLib llvmPackages.libclang}/lib";
+23 -24
View File
@@ -2,39 +2,41 @@
lib,
stdenv,
fetchFromGitHub,
buildGoModule,
mpv,
makeWrapper,
installShellFiles,
makeWrapper,
mpv,
nix-update-script,
testers,
radioboat,
rustPlatform,
versionCheckHook,
}:
buildGoModule (finalAttrs: {
rustPlatform.buildRustPackage (finalAttrs: {
pname = "radioboat";
version = "0.3.0";
version = "0.6.0";
src = fetchFromGitHub {
owner = "slashformotion";
repo = "radioboat";
rev = "v${finalAttrs.version}";
hash = "sha256-4k+WK2Cxu1yBWgvEW9LMD2RGfiY7XDAe0qqph82zvlI=";
tag = "v${finalAttrs.version}";
hash = "sha256-1fTXXT0HxGOoy+oNK1ixzgFgjapreQEOoVlQlJwqbrA=";
};
vendorHash = "sha256-H2vo5gngXUcrem25tqz/1MhOgpNZcN+IcaQHZrGyjW8=";
postPatch = ''
substituteInPlace Cargo.toml \
--replace-fail 'version = "0.4.0"' 'version = "${finalAttrs.version}"'
'';
ldflags = [
"-s"
"-w"
"-X github.com/slashformotion/radioboat/internal/buildinfo.Version=${finalAttrs.version}"
];
__structuredAttrs = true;
cargoHash = "sha256-ibDOUgprr5VziIvTpvDFISGVpVH5ZyQ1ZZ5tIQirPP8=";
nativeBuildInputs = [
makeWrapper
installShellFiles
];
nativeInstallCheckInputs = [ versionCheckHook ];
preFixup = ''
wrapProgram $out/bin/radioboat --prefix PATH ":" "${lib.makeBinPath [ mpv ]}";
'';
@@ -46,20 +48,17 @@ buildGoModule (finalAttrs: {
--zsh <($out/bin/radioboat completion zsh)
'';
passthru = {
updateScript = nix-update-script { };
tests.version = testers.testVersion {
package = radioboat;
command = "radioboat version";
};
};
passthru.updateScript = nix-update-script { };
doInstallCheck = true;
meta = {
description = "Terminal web radio client";
mainProgram = "radioboat";
homepage = "https://github.com/slashformotion/radioboat";
changelog = "https://github.com/slashformotion/radioboat/releases/tag/${finalAttrs.src.tag}";
license = lib.licenses.asl20;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ zendo ];
mainProgram = "radioboat";
platforms = lib.platforms.linux;
};
})
+2 -2
View File
@@ -6,10 +6,10 @@
}:
let
pname = "remnote";
version = "1.25.7";
version = "1.25.19";
src = fetchurl {
url = "https://download2.remnote.io/remnote-desktop2/RemNote-${version}.AppImage";
hash = "sha256-ckigM+kXV8W5iI42SGSyFd1//e5ghqiV/b6Ja5at7Do=";
hash = "sha256-DJWRhNTRmYVdY5AfAlVOhrNkongusv+volwiLQBg1xM=";
};
appimageContents = appimageTools.extractType2 { inherit pname version src; };
in
+42
View File
@@ -0,0 +1,42 @@
{
lib,
buildGoModule,
fetchFromGitHub,
nix-update-script,
versionCheckHook,
}:
buildGoModule (finalAttrs: {
pname = "sbb-tui";
version = "1.13.4";
__structuredAttrs = true;
src = fetchFromGitHub {
owner = "Necrom4";
repo = "sbb-tui";
tag = "v${finalAttrs.version}";
hash = "sha256-JLjAhs5UbqgNYqpA3cDucrAS6ell+0JiDJNf7G33Nhs=";
};
vendorHash = "sha256-K4DOu3rfSlKAa5JNKCzWWpnWZlXXxtN5Po7p1Spqe1w=";
ldflags = [
"-s"
"-w"
"-X main.version=${finalAttrs.version}"
];
doCheck = true;
nativeCheckInputs = [ versionCheckHook ];
passthru.updateScript = nix-update-script { };
meta = {
description = "TUI client for Switzerland's public transport timetables, inspired by SBB/CFF/FFS app";
homepage = "https://github.com/Necrom4/sbb-tui";
license = lib.licenses.mit;
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ tomasrivera ];
mainProgram = "sbb-tui";
};
})
+3 -3
View File
@@ -12,18 +12,18 @@
buildGoModule (finalAttrs: {
pname = "sendspin-go";
version = "1.2.0";
version = "1.5.0";
src = fetchFromGitHub {
owner = "Sendspin";
repo = "sendspin-go";
tag = "v${finalAttrs.version}";
hash = "sha256-hhUUtqtQZ48b/1nRcoUoY7H3cmzTfXdF239u7mKIopY=";
hash = "sha256-vywxcGCDwJbOnQA4hW4SNxaRauokyGJbZA7u1UzKpWk=";
};
__structuredAttrs = true;
vendorHash = "sha256-OfomzW2kbkSdkDhie529IbRUNXWM3lqmq/bCGzaWXG4=";
vendorHash = "sha256-g2u3kkP6FUtHoCnY4PxqTp/d1wYQuz0uFZkeuobtl7U=";
nativeBuildInputs = [ pkg-config ];
+3 -3
View File
@@ -9,13 +9,13 @@
buildGoModule (finalAttrs: {
pname = "slackdump";
version = "4.1.2";
version = "4.3.0";
src = fetchFromGitHub {
owner = "rusq";
repo = "slackdump";
tag = "v${finalAttrs.version}";
hash = "sha256-Kt9FGQiGaWDOpJMeg/UFDcNO16skQ8qblYwl26Fr5Bk=";
hash = "sha256-Ds3nggx1f389goOWelYXNviFRZ/h4XX54LgtU9oqklc=";
};
nativeCheckInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.IOKitTools;
@@ -35,7 +35,7 @@ buildGoModule (finalAttrs: {
"-skip=^${builtins.concatStringsSep "$|^" skippedTests}$"
];
vendorHash = "sha256-3pZCGE8MLNIdU4zVDwkHJwPr7xHHDhnUlzidej6c4E0=";
vendorHash = "sha256-fRvtdl0+uVhN6cQJxRsOw1vQsrcsPvcn/Tb7US7MKmM=";
__darwinAllowLocalNetworking = true;
+3 -3
View File
@@ -39,13 +39,13 @@ stdenv.mkDerivation {
pname = binName;
# versions are specified in `squeezelite.h`
# see https://github.com/ralph-irving/squeezelite/issues/29
version = "2.0.0.1561";
version = "2.0.0.1563";
src = fetchFromGitHub {
owner = "ralph-irving";
repo = "squeezelite";
rev = "e977d1045f5f4c1a51ba0d66387f26fd19a2f42a";
hash = "sha256-VY9iMGUgI+VCoadYYnfB8GUItjl/U/hh1pV2yu41miE=";
rev = "39fe3c8b1dd4e852fd8410bc480d7d709056859d";
hash = "sha256-0zBppeMSK/1m4Nxla6wdWeVPDFOUfVCaMKFHZGLqbrE=";
};
buildInputs = [
+36
View File
@@ -0,0 +1,36 @@
{
lib,
fetchFromGitHub,
openssl,
pkg-config,
rustPlatform,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "terminalmap";
version = "0.1.0";
src = fetchFromGitHub {
owner = "psmux";
repo = "TerminalMap";
tag = "v${finalAttrs.version}";
hash = "sha256-6L3K5meR5pR8/U7QbW+qMaO2m+GNVB5Gny5gFCGE+hE=";
};
cargoHash = "sha256-VNvSjxCRO93beSY5DD1Vi/Wz87uYlkyyNeYVf8q860U=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ];
__structuredAttrs = true;
meta = {
description = "Tool to render real world maps in your terminal";
homepage = "https://github.com/psmux/TerminalMap";
changelog = "https://github.com/psmux/TerminalMap/releases/tag/${finalAttrs.src.tag}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ fab ];
mainProgram = "terminalmap";
};
})
+49
View File
@@ -0,0 +1,49 @@
{
lib,
rustPlatform,
fetchFromGitHub,
pkg-config,
sqlite,
versionCheckHook,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "urx";
version = "0.9.0";
src = fetchFromGitHub {
owner = "hahwul";
repo = "urx";
tag = finalAttrs.version;
hash = "sha256-NSPEAA+tD1CdCjRj3myQB8bPdMhT7H76qAIIWx2z++I=";
};
cargoHash = "sha256-nPm4ofmu03Rb12spjb+m36C6EauJIppgqTkX1oJF3uk=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ sqlite ];
nativeInstallCheckInputs = [ versionCheckHook ];
__structuredAttrs = true;
checkFlags = [
# Tests require network access
"--skip=providers"
"--skip=network::client::tests"
];
doInstallCheck = true;
versionCheckProgramArg = [ "--version" ];
meta = {
description = "Extracts URLs from OSINT Archives for Security Insights";
homepage = "https://github.com/hahwul/urx";
changelog = "https://github.com/hahwul/urx/blob/${finalAttrs.src.tag}/CHANGELOG.md";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ fab ];
mainProgram = "urx";
};
})
+3 -3
View File
@@ -67,7 +67,7 @@
stdenv.mkDerivation rec {
pname = "vivaldi";
version = "7.9.3970.50";
version = "7.9.3970.55";
suffix =
{
@@ -80,8 +80,8 @@ stdenv.mkDerivation rec {
url = "https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-1_${suffix}.deb";
hash =
{
aarch64-linux = "sha256-DIaBjUPs9bgpzwxT20cwdOJzo8kCO1chmudo4wqWSeU=";
x86_64-linux = "sha256-9fX0xnIZeu7hTYyKvSQrJj3mQkTPGg8S3IjEjh/84g0=";
aarch64-linux = "sha256-iwz/FB1avKgW+UsoBeXUL2FE1f5v5RrTgwBiFJu4TD4=";
x86_64-linux = "sha256-FNZGSDv/xRiB3r4Y6H2FfyVIR84+wVMiVqT/9gfmE8w=";
}
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
};
+3 -3
View File
@@ -97,7 +97,7 @@ let
in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "zed-editor";
version = "0.232.2";
version = "0.232.3";
outputs = [
"out"
@@ -110,7 +110,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
owner = "zed-industries";
repo = "zed";
tag = "v${finalAttrs.version}";
hash = "sha256-S7N9R5VUcJP+yq0S6s4zeQQhSFSdDovtoL9FL1BEg2U=";
hash = "sha256-bi7iGZpgFET+QXYZcG6Ye2F39FSb2X/rV+ACkkuOfUc=";
};
postPatch = ''
@@ -139,7 +139,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
rm -r $out/git/*/candle-book/
'';
cargoHash = "sha256-WpEPQw3GOemxjyfDH7VH3FURpkYVfVyXQiALJsccwQ4=";
cargoHash = "sha256-p9QR7AxF4dAADv/FfHxG5OUaAcS3xy4DWVO8HpOBAbE=";
__structuredAttrs = true;
@@ -11,11 +11,11 @@
stdenv.mkDerivation rec {
pname = "evisum";
version = "1.2.2";
version = "1.2.3";
src = fetchurl {
url = "https://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz";
sha256 = "3Icc41A+JyFZB0RS7F6kzTdJsEnZ4IDc+Ck40myGP20=";
sha256 = "McL4th987bozpaT3ESNCGBxSN+Fw5sW+MOFAiXYm1MI=";
};
nativeBuildInputs = [
@@ -16,14 +16,14 @@
buildPythonPackage (finalAttrs: {
pname = "agentic-threat-hunting-framework";
version = "0.11.1";
version = "0.11.2";
pyproject = true;
src = fetchFromGitHub {
owner = "Nebulock-Inc";
repo = "agentic-threat-hunting-framework";
tag = "v${finalAttrs.version}";
hash = "sha256-dqiWldjPv5iU6OGsoZ4fTdw6dXbu/duFHt19qcPfVjk=";
hash = "sha256-wZT8XjLikabI5SPDUG3cRBx7g7YanMjqv8lwHJ16wDY=";
};
build-system = [ setuptools ];
@@ -358,13 +358,13 @@
buildPythonPackage (finalAttrs: {
pname = "boto3-stubs";
version = "1.42.92";
version = "1.42.93";
pyproject = true;
src = fetchPypi {
pname = "boto3_stubs";
inherit (finalAttrs) version;
hash = "sha256-S8k0BpxejHs83SRCVp2uFOgnL+IH1EW9OKpXi4RjY48=";
hash = "sha256-wfZXcxWdaZOPbxgVOQRuYKu7A5BIgWa+2Z73Al6Z2+Y=";
};
build-system = [ setuptools ];
@@ -8,14 +8,14 @@
buildPythonPackage (finalAttrs: {
pname = "iamdata";
version = "0.1.202604211";
version = "0.1.202604221";
pyproject = true;
src = fetchFromGitHub {
owner = "cloud-copilot";
repo = "iam-data-python";
tag = "v${finalAttrs.version}";
hash = "sha256-Fw2Vql8Y6aJ/t1lUrZ9MDZhRKtuPNqUqX1RF8FHfz+I=";
hash = "sha256-p6Ai2TBCcO9Jx9MmwqUJLDWT3jMrdvM/NNum8O3gDos=";
};
__darwinAllowLocalNetworking = true;
@@ -9,14 +9,14 @@
buildPythonPackage (finalAttrs: {
pname = "meilisearch";
version = "0.40.0";
version = "0.41.0";
pyproject = true;
src = fetchFromGitHub {
owner = "meilisearch";
repo = "meilisearch-python";
tag = "v${finalAttrs.version}";
hash = "sha256-mxIE2/gZhV8geE0UJ2ModGKs0TPjJLyp38Wvcs59wz8=";
hash = "sha256-05N77HOFmuy73my4ndq7yKJl4SD3OEX36heFsXNx358=";
};
build-system = [ setuptools ];
@@ -7,14 +7,14 @@
buildPythonPackage (finalAttrs: {
pname = "mitogen";
version = "0.3.45";
version = "0.3.47";
pyproject = true;
src = fetchFromGitHub {
owner = "mitogen-hq";
repo = "mitogen";
tag = "v${finalAttrs.version}";
hash = "sha256-PwvtniLqy8gSHqN0NxMQqh9Jf8zj7PaVTFot61w4LPM=";
hash = "sha256-vCfGig2Sc4NpDl2lEM5FkFAsA/+EFd8Sv643onkMWqQ=";
};
build-system = [ setuptools ];
@@ -16,14 +16,14 @@
buildPythonPackage (finalAttrs: {
pname = "msgraph-sdk";
version = "1.55.0";
version = "1.56.0";
pyproject = true;
src = fetchFromGitHub {
owner = "microsoftgraph";
repo = "msgraph-sdk-python";
tag = "v${finalAttrs.version}";
hash = "sha256-F6iL+bQS/r7t9NUGtspNx8E0viK4Fm211AqrxNgNGqg=";
hash = "sha256-Y2PX07IzHO3wjVEYUw1o6vb1cr1pa8BJIR9Uliho3lQ=";
};
build-system = [ flit-core ];
@@ -311,8 +311,8 @@ in
"sha256-N9PEmvqI7Yc7AAuDdOj1iePSq7hJTgOmS+4z7GzYd98=";
mypy-boto3-cognito-idp =
buildMypyBoto3Package "cognito-idp" "1.42.90"
"sha256-BSU4enN4Z7vc1zT3s+ha0YXNFh4UB63CULw2auK5EJM=";
buildMypyBoto3Package "cognito-idp" "1.42.93"
"sha256-C0zMym2VLzGtMfj5fVh1AOsMdXbreJXfge54jGas+UU=";
mypy-boto3-cognito-sync =
buildMypyBoto3Package "cognito-sync" "1.42.3"
@@ -323,12 +323,12 @@ in
"sha256-b+dX5aCg7czhnGTapZ1DdIYyNcr8bb1SGEmw96oe2jI=";
mypy-boto3-comprehendmedical =
buildMypyBoto3Package "comprehendmedical" "1.42.3"
"sha256-F4zRXA2p9DfQnXItfz4VYlB1ueDwV5MORUCDHxOcr2w=";
buildMypyBoto3Package "comprehendmedical" "1.42.93"
"sha256-ZOOFySOhGZqPmziNpx/OA3A9mdp6F4uJs30DCp6ONQw=";
mypy-boto3-compute-optimizer =
buildMypyBoto3Package "compute-optimizer" "1.42.3"
"sha256-M8vUOtM7Q5gnwi9ZPGu6n+I4Twl02Su4eRGqq2+Ow1o=";
buildMypyBoto3Package "compute-optimizer" "1.42.93"
"sha256-4x9LiMTVf1DT4ICIm6ZKEbKedyin3eFTHgy1I2NCIK0=";
mypy-boto3-config =
buildMypyBoto3Package "config" "1.42.68"
@@ -559,8 +559,8 @@ in
"sha256-NqNGcL3HfJgx2ScPLKMNNwpVS3bO4Cu7JpYlenSJwJg=";
mypy-boto3-gamelift =
buildMypyBoto3Package "gamelift" "1.42.82"
"sha256-4sWx8fog6KbXwh29KzzsoqYoej7IFYCjcSW0D+dw5+M=";
buildMypyBoto3Package "gamelift" "1.42.93"
"sha256-jTnuvbOlY/SXkeBP1wt8wKu/pc+7IImOv6B7EBmZarM=";
mypy-boto3-glacier =
buildMypyBoto3Package "glacier" "1.42.30"
@@ -846,8 +846,8 @@ in
"sha256-lyq6RaR12pc3LKJokhd+S5wSppt4hWdsHoVsQe34GMY=";
mypy-boto3-marketplace-entitlement =
buildMypyBoto3Package "marketplace-entitlement" "1.42.58"
"sha256-vD0N5KMd6GE/UyMuhaULwwKNDy8ndKPSbW0bLo3eW5g=";
buildMypyBoto3Package "marketplace-entitlement" "1.42.93"
"sha256-8vOhUKggO8OBPOx2e58da++K+zLJ8OkS2M7Otsk5ALE=";
mypy-boto3-marketplacecommerceanalytics =
buildMypyBoto3Package "marketplacecommerceanalytics" "1.42.3"
@@ -946,8 +946,8 @@ in
"sha256-xm+KGZ0gWvTNgHoFrIsB8gqPFZTNE9csQmcrWtQ4axY=";
mypy-boto3-network-firewall =
buildMypyBoto3Package "network-firewall" "1.42.3"
"sha256-1y1aQ8A+XkPyNlXNODlau+Lgfdc6wCgmjiugLWY7nIk=";
buildMypyBoto3Package "network-firewall" "1.42.93"
"sha256-WfW36tWXQeFdAgAKKu8+o6zPv/fBHKV1s+4+a0UyGBQ=";
mypy-boto3-networkmanager =
buildMypyBoto3Package "networkmanager" "1.42.3"
@@ -1170,8 +1170,8 @@ in
"sha256-juVfwdjPDNPaT5tvyXpzDtomugqxeu++AERLkVtFIxw=";
mypy-boto3-sagemaker =
buildMypyBoto3Package "sagemaker" "1.42.91"
"sha256-M3Mbmu5fJdyl5UHS+wIklJ1UlFRzTxxQ2Rz057k0Auc=";
buildMypyBoto3Package "sagemaker" "1.42.93"
"sha256-ZxPcCnneSMwI0Yl3TiiMxim9FIBzen4hC5X76Dhnd7U=";
mypy-boto3-sagemaker-a2i-runtime =
buildMypyBoto3Package "sagemaker-a2i-runtime" "1.42.3"
@@ -1278,8 +1278,8 @@ in
"sha256-wNuzufARcqJ8liqDq2uSLxf6OvHt6ILm4uwi2mZ22rM=";
mypy-boto3-snowball =
buildMypyBoto3Package "snowball" "1.42.3"
"sha256-hRI6ESK7/wbcKYo5aB2W5QXQ0hDrfKIHTTyN/RpEYrA=";
buildMypyBoto3Package "snowball" "1.42.93"
"sha256-SUWzgGwyfU5afIs2m2LHdiRX0D1vYGdQUrOEHe498Z8=";
mypy-boto3-sns =
buildMypyBoto3Package "sns" "1.42.3"
@@ -18,14 +18,14 @@
buildPythonPackage rec {
pname = "pontos";
version = "26.4.0";
version = "26.4.1";
pyproject = true;
src = fetchFromGitHub {
owner = "greenbone";
repo = "pontos";
tag = "v${version}";
hash = "sha256-xAQX2YjYS5aWT/8we8WR/q/IxhpSa+WWdjDScuhvTEw=";
hash = "sha256-aqoZHuH9TErkPvlf7xwQ4EA/f7LWwKFbePhuoG2dX+0=";
};
build-system = [ poetry-core ];
@@ -11,12 +11,12 @@
buildPythonPackage (finalAttrs: {
pname = "publicsuffixlist";
version = "1.0.2.20260417";
version = "1.0.2.20260422";
pyproject = true;
src = fetchPypi {
inherit (finalAttrs) pname version;
hash = "sha256-NiVaU/Oj/qNDbOicG3AUZVVOVFPL9/Vnbp6kyUJ6pyg=";
hash = "sha256-dFmSz317sHAg2PCBg2wAGM3shb27sqRkx5M1xcO2gsw=";
};
postPatch = ''
@@ -9,12 +9,12 @@
buildPythonPackage (finalAttrs: {
pname = "pyexploitdb";
version = "0.3.22";
version = "0.3.23";
pyproject = true;
src = fetchPypi {
inherit (finalAttrs) pname version;
hash = "sha256-yk01aq1rOed312E629Vt5TuXl1vQdgoZZB3c5tk3nEk=";
hash = "sha256-RS1nAIjuCmznq8rQ82lNWT2CVGxahRiH0RrBjDIPwJo=";
};
build-system = [ setuptools ];
@@ -2,39 +2,44 @@
lib,
aiohttp,
buildPythonPackage,
fetchPypi,
setuptools,
fetchFromGitHub,
hatchling,
pytest-asyncio,
pytestCheckHook,
urllib3,
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "python-opendata-transport";
version = "0.5.0";
version = "0.6.2";
pyproject = true;
src = fetchPypi {
pname = "python_opendata_transport";
inherit version;
hash = "sha256-CtYsks7Q33ww0Mr9ehhq7+fJhCsj4gxKytiCZ6G4Aqc=";
src = fetchFromGitHub {
owner = "home-assistant-ecosystem";
repo = "python-opendata-transport";
tag = finalAttrs.version;
hash = "sha256-CN+zy2x+4IKdAcpa2vIrOGXW39d+anU4HGPU83dGif0=";
};
build-system = [ setuptools ];
build-system = [ hatchling ];
dependencies = [
aiohttp
urllib3
];
# No tests are present
doCheck = false;
nativeCheckInputs = [
pytest-asyncio
pytestCheckHook
];
pythonImportsCheck = [ "opendata_transport" ];
meta = {
description = "Python client for interacting with transport.opendata.ch";
homepage = "https://github.com/home-assistant-ecosystem/python-opendata-transport";
changelog = "https://github.com/home-assistant-ecosystem/python-opendata-transport/releases/tag/${version}";
changelog = "https://github.com/home-assistant-ecosystem/python-opendata-transport/releases/tag/${finalAttrs.src.tag}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ fab ];
};
}
})
@@ -14,14 +14,14 @@
buildPythonPackage (finalAttrs: {
pname = "rns";
version = "1.1.6";
version = "1.1.8";
pyproject = true;
src = fetchFromGitHub {
owner = "markqvist";
repo = "Reticulum";
tag = finalAttrs.version;
hash = "sha256-21ym6R2zPxm8Z4zO6g/ZA4/A4S0SmwhOEqC6B+DTpOI=";
hash = "sha256-HBH7TAHEDAygkfZC1vUQ502J8qwocKp9B1fWaAgLkHo=";
};
patches = [
@@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "scooby";
version = "0.11.0";
version = "0.11.1";
pyproject = true;
src = fetchFromGitHub {
owner = "banesullivan";
repo = "scooby";
tag = "v${version}";
hash = "sha256-krExDVT9evG9ODZjTGpX+S1ygh7lMob06fzOwhh/hzA=";
hash = "sha256-Wg/cM6G75x3VVZEwdAhfjf6PkefUWLqX/p9GPP2mRls=";
};
build-system = [ setuptools-scm ];
@@ -9,14 +9,14 @@
buildPythonPackage (finalAttrs: {
pname = "tencentcloud-sdk-python";
version = "3.1.82";
version = "3.1.83";
pyproject = true;
src = fetchFromGitHub {
owner = "TencentCloud";
repo = "tencentcloud-sdk-python";
tag = finalAttrs.version;
hash = "sha256-pDV2hDsc0Vn4LgT9aWaaCoZ+smulfP+yblcpHqIJl1I=";
hash = "sha256-L3XAElFubSSifh4X8X5NFikLz5QnVjspMxhf5TnhE28=";
};
build-system = [ setuptools ];
+14 -9
View File
@@ -1,19 +1,29 @@
{
lib,
fetchpatch,
mkKdeDerivation,
pkg-config,
qtwayland,
qtmultimedia,
opencv,
tesseractLanguages ? [ ],
tesseract5,
}:
let
tesseract = tesseract5.override { enableLanguages = tesseractLanguages; };
in
mkKdeDerivation {
pname = "spectacle";
# Backport the upstream switch from runtime QLibrary loading to direct
# linking so Spectacle OCR can find Tesseract reliably on NixOS.
patches = [
(fetchpatch {
url = "https://invent.kde.org/graphics/spectacle/-/commit/13b0be099e7abe9bbb17b90e62c2e83afb248db7.patch";
hash = "sha256-HEgHsuajaF+WVMiRp0YKRmi+/NsIy5s8frwMJRIdDY8=";
})
];
extraNativeBuildInputs = [ pkg-config ];
extraBuildInputs = [
(tesseract5.override { enableLanguages = tesseractLanguages; })
qtwayland
qtmultimedia
(opencv.override {
@@ -26,10 +36,5 @@ mkKdeDerivation {
})
];
# no point adding the dependency when we have no language packs
preFixup = lib.optionalString (tesseractLanguages != [ ]) ''
patchelf --add-needed libtesseract.so.5 --add-rpath ${tesseract}/lib $out/bin/spectacle
'';
meta.mainProgram = "spectacle";
}
+11 -5
View File
@@ -16,6 +16,7 @@
keyutils,
udevCheckHook,
gettext,
versionCheckHook,
# drbd-utils are compiled twice, once with forOCF = true to extract
# its OCF definitions for use in the ocf-resource-agents derivation,
@@ -25,12 +26,12 @@
ocf-resource-agents,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "drbd";
version = "9.33.0";
src = fetchurl {
url = "https://pkg.linbit.com/downloads/drbd/utils/${pname}-utils-${version}.tar.gz";
url = "https://pkg.linbit.com/downloads/drbd/utils/drbd-utils-${finalAttrs.version}.tar.gz";
hash = "sha256-Ij/gfQtkbpkbM7qepBRo+aZvkDVi59p2bdD8a06jPbk=";
};
@@ -42,14 +43,16 @@ stdenv.mkDerivation rec {
keyutils
udevCheckHook
gettext
perl
perlPackages.Po4a
];
buildInputs = [
perl
perlPackages.Po4a
gettext
];
strictDeps = true;
configureFlags = [
"--libdir=${placeholder "out"}/lib"
"--sbindir=${placeholder "out"}/bin"
@@ -113,6 +116,9 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
doInstallCheck = true;
nativeInstallCheckInputs = [ versionCheckHook ];
versionCheckProgram = [ "${placeholder "out"}/bin/drbdadm" ];
versionCheckProgramArg = "--version";
passthru.tests.drbd = nixosTests.drbd;
@@ -131,4 +137,4 @@ stdenv.mkDerivation rec {
mirroring the content of block devices (hard disks, partitions, logical volumes etc.) between hosts.
'';
};
}
})
+3
View File
@@ -28,6 +28,9 @@ stdenv.mkDerivation (finalAttrs: {
env.KERNEL_BUILD_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
postPatch = ''
substituteInPlace kernel/linux/ena/configure.sh --replace-fail '^HOSTCC' '^CC'
'';
configurePhase = ''
runHook preConfigure
cd kernel/linux/ena
+5 -3
View File
@@ -461,16 +461,18 @@ optionalAttrs allowAliases aliases
generate =
name: value:
pkgs.callPackage (
{ runCommand, yj }:
{ runCommand, go-toml }:
runCommand name
{
nativeBuildInputs = [ yj ];
nativeBuildInputs = [ go-toml ];
value = builtins.toJSON value;
passAsFile = [ "value" ];
preferLocalBuild = true;
}
# -use-json-number: preserve JSON ints as TOML ints
# (Go's json.Decoder defaults to float64 for all numbers)
''
yj -jt < "$valuePath" > "$out"
jsontoml -use-json-number < "$valuePath" > "$out"
''
) { };
+38 -3
View File
@@ -695,16 +695,51 @@ runBuildTests {
float = 3.141
int = 10
list = [1, 2]
str = "foo"
str = 'foo'
true = true
[attrs]
foo = "foo"
foo = 'foo'
[level1]
[level1.level2]
[level1.level2.level3]
level4 = "deep"
level4 = 'deep'
'';
};
# Regression test for https://github.com/NixOS/nixpkgs/issues/511970
# yj crashes on arrays mixing scalars and attrsets (heterogeneous arrays),
# e.g. Helix language-server configs like ["bash-ls", {name = "ts-ls"; ...}].
# TOML 1.0 allows mixed-type arrays; the converter must emit them as
# inline arrays with inline tables.
tomlHeterogeneousArray = shouldPass {
format = formats.toml { };
input = {
language-server = [
"bash-language-server"
{
name = "typescript-language-server";
except-features = [ "diagnostics" ];
}
];
};
expected = ''
language-server = ['bash-language-server', {except-features = ['diagnostics'], name = 'typescript-language-server'}]
'';
};
# Regression test for https://github.com/sclevine/yj/issues/52
# yj truncates keys at the first comma because it stores TOML keys in Go
# struct tags, where commas are option separators.
# e.g. "stack(x,n)" is emitted as "stack(x" — silently losing data.
tomlCommaInKey = shouldPass {
format = formats.toml { };
input = {
"stack(x,n)" = "foobar";
};
expected = ''
'stack(x,n)' = 'foobar'
'';
};
+5 -5
View File
@@ -1,8 +1,8 @@
{
"serverVersion": "0.19.17",
"uiVersion": "0.19.17",
"serverHash": "sha256-zEqKuOHmbftN1LGW+yP/Uo6nZ7Q2RoDIPVWkoj5HnXk=",
"serverCargoHash": "sha256-1z9CasnGqhaowzmY3nC2IZUI6vI8i9Zh5ZA+SEtI09c=",
"uiHash": "sha256-Gysv3VlLL0pwu/JUbK2ViD4wC+rrnEo4lU9HloRSQMw=",
"serverVersion": "0.19.18",
"uiVersion": "0.19.18",
"serverHash": "sha256-NUr96dsH3Gd+1ouOAgPheU0hnDI37a87EN642u482Sg=",
"serverCargoHash": "sha256-oI8o+29kqjkAP2DIoSopPMQb5YlZNja1hV1bVmfMIvU=",
"uiHash": "sha256-7WcPujev7VrkoX5vvGUvS0hUVJnCZjsceO5zK36jPbw=",
"uiPNPMDepsHash": "sha256-dRUD/R7Qtlfy2saX7grfdi5qBDP8gc3L3+C2m7ro1CU="
}