c4patino/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-06 17:13:24 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge staging-next into staging

Browse source
This commit is contained in:
nixpkgs-ci[bot] 2026-05-28 07:22:13 +00:00 • committed by GitHub
commit 760ac2002c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
25 changed files with 854 additions and 658 deletions
Download patch file Download diff file Expand all files Collapse all files

62
lib/generators.nix
View file

@ -23,9 +23,12 @@
let
inherit (lib)
addErrorContext
any
assertMsg
attrNames
attrValues
concatLists
concatMap
concatMapStringsSep
concatStrings
concatStringsSep
@ -52,6 +55,7 @@ let
isString
last
length
genAttrs
mapAttrs
mapAttrsToList
optionals
@ -379,55 +383,69 @@ rec {
See the [git-config documentation](https://git-scm.com/docs/git-config#_variables) for possible values.
*/
toGitINI =
attrs:
let
mkSectionName =
let
containsQuote = hasInfix ''"'';
in
name:
let
containsQuote = hasInfix ''"'' name;
sections = splitString "." name;
section = head sections;
subsections = tail sections;
subsection = concatStringsSep "." subsections;
in
if containsQuote || subsections == [ ] then name else ''${section} "${subsection}"'';
if containsQuote name || length sections == 1 then
name
else
''${head sections} "${concatStringsSep "." (tail sections)}"'';
mkValueString =
v:
let
escapedV = ''"${replaceStrings [ "\n" " " ''"'' "\\" ] [ "\\n" "\\t" ''\"'' "\\\\" ] v}"'';
escape = replaceStrings [ "\n" " " ''"'' "\\" ] [ "\\n" "\\t" ''\"'' "\\\\" ];
in
mkValueStringDefault { } (if isString v then escapedV else v);
v: mkValueStringDefault { } (if isString v then ''"${escape v}"'' else v);
# generation for multiple ini values
mkKeyValue =
k: v:
let
mkKeyValue = mkKeyValueDefault { inherit mkValueString; } " = " k;
mkKeyValue = mkKeyValueDefault { inherit mkValueString; } " = ";
attrToString = k: v: "\t" + mkKeyValue k v;
in
concatStringsSep "\n" (map (kv: "\t" + mkKeyValue kv) (toList v));
k: v: if isList v then concatStringsSep "\n" (map (attrToString k) v) else attrToString k v;
# converts { a.b.c = 5; } to { "a.b".c = 5; } for toINI
gitFlattenAttrs =
let
isNonDrvAttrs = value: isAttrs value && !isDerivation value;
recurse =
path: value:
if isAttrs value && !isDerivation value then
mapAttrsToList (name: value: recurse ([ name ] ++ path) value) value
if isNonDrvAttrs value then
concatMap (name: recurse ([ name ] ++ path) value.${name}) (attrNames value)
else if length path > 1 then
{
${concatStringsSep "." (reverseList (tail path))}.${head path} = value;
}
[
{
${concatStringsSep "." (reverseList (tail path))}.${head path} = value;
}
]
else
{
${head path} = value;
};
[
{
${head path} = value;
}
];
in
attrs: foldl recursiveUpdate { } (flatten (recurse [ ] attrs));
attrs:
let
# Filter the names for any that contain nested attrsets. attrs that
# don't contain nested attrsets can stay the same =
namesToRewrite = filter (
name: isAttrs attrs.${name} && any isNonDrvAttrs (attrValues attrs.${name})
) (attrNames attrs);
attrsToRewrite = genAttrs namesToRewrite (name: attrs.${name});
in
removeAttrs attrs namesToRewrite // foldl recursiveUpdate { } (recurse [ ] attrsToRewrite);
toINI_ = toINI { inherit mkKeyValue mkSectionName; };
in
toINI_ (gitFlattenAttrs attrs);
attrs: toINI_ (gitFlattenAttrs attrs);
/**
`mkKeyValueDefault` wrapper that handles dconf INI quirks.

12
nixos/modules/services/search/nominatim.nix
View file

@ -50,6 +50,10 @@ in
};
ui = {
enable = lib.mkEnableOption "Nominatim UI" // {
default = true;
};
package = lib.mkPackageOption pkgs "nominatim-ui" { };
config = lib.mkOption {
@ -277,7 +281,7 @@ in
services.nginx = {
enable = true;
appendHttpConfig = ''
appendHttpConfig = lib.mkIf cfg.ui.enable ''
map $args $format {
default default;
~(^|&)format=html(&|$) html;
@ -304,19 +308,19 @@ in
enableACME = lib.mkDefault true;
locations = {
"= /" = {
extraConfig = ''
extraConfig = lib.mkIf cfg.ui.enable ''
return 301 $scheme://$http_host/ui/search.html;
'';
};
"/" = {
proxyPass = "http://nominatim";
extraConfig = ''
extraConfig = lib.mkIf cfg.ui.enable ''
if ($forward_to_ui) {
rewrite ^(/[^/.]*) /ui$1.html redirect;
}
'';
};
"/ui/" = {
"/ui/" = lib.mkIf cfg.ui.enable {
alias = "${uiPackage}/";
};
};

2
nixos/modules/services/web-apps/immich.nix
View file

@ -380,6 +380,8 @@ in
MACHINE_LEARNING_WORKERS = "1";
MACHINE_LEARNING_WORKER_TIMEOUT = "120";
MACHINE_LEARNING_CACHE_FOLDER = "/var/cache/immich";
# TODO: drop when insightface no longer unconditionally imports matplotlib
MPLCONFIGDIR = "/var/cache/immich";
XDG_CACHE_HOME = "/var/cache/immich";
IMMICH_HOST = "localhost";
IMMICH_PORT = "3003";

24
pkgs/by-name/_1/_1password-gui/sources.json
View file

@ -18,39 +18,39 @@
"sources": {
"x86_64": {
"url": "https://downloads.1password.com/mac/1Password-8.12.21-x86_64.zip",
"hash": "sha256-tAWgIe7mcaGANCn8Kr0h6+zmvqufDJMjzAI3FrAGNk0="
"hash": "sha256-1dAmyaBMo4re1aQTk16AMEol7GjeSVhx9F4SuYBGoso="
},
"aarch64": {
"url": "https://downloads.1password.com/mac/1Password-8.12.21-aarch64.zip",
"hash": "sha256-1c6YbzFYNyHKzY13OZ7z1Ad5hzgTIMs3aT0nluK9l0w="
"hash": "sha256-WrWbGzBK65tVNl9Dc3OnJURiPpfbNLOYUJcVT0ETaAs="
}
}
}
},
"beta": {
"linux": {
"version": "8.12.22-15.BETA",
"version": "8.12.22-16.BETA",
"sources": {
"x86_64": {
"url": "https://downloads.1password.com/linux/tar/beta/x86_64/1password-8.12.22-15.BETA.x64.tar.gz",
"hash": "sha256-rqbbfsCgo5+3PecaVo0YKCXS9afgzSbXz1DxcVWfkf8="
"url": "https://downloads.1password.com/linux/tar/beta/x86_64/1password-8.12.22-16.BETA.x64.tar.gz",
"hash": "sha256-Kpmexrq6WpGpanTIYKaMIpM4rJiy8NV2TR8TILmuhr0="
},
"aarch64": {
"url": "https://downloads.1password.com/linux/tar/beta/aarch64/1password-8.12.22-15.BETA.arm64.tar.gz",
"hash": "sha256-e3IzRG/Ptj3MSszd1DRRMOXorlhVPon+oVinRy+4q+I="
"url": "https://downloads.1password.com/linux/tar/beta/aarch64/1password-8.12.22-16.BETA.arm64.tar.gz",
"hash": "sha256-7ZxrPLPdGizexCRMHkufi9WapFMApxwDw0VgBTpQ7bM="
}
}
},
"darwin": {
"version": "8.12.22-15.BETA",
"version": "8.12.22-16.BETA",
"sources": {
"x86_64": {
"url": "https://downloads.1password.com/mac/1Password-8.12.22-15.BETA-x86_64.zip",
"hash": "sha256-AVKhJcRwkxp4N0s2dalY/lcFvcEzuJ0dJzVKwmEpT1M="
"url": "https://downloads.1password.com/mac/1Password-8.12.22-16.BETA-x86_64.zip",
"hash": "sha256-Ce9A3UKGxJvABDlMhlw9gElGc2iKS+j+CvBnohij4mg="
},
"aarch64": {
"url": "https://downloads.1password.com/mac/1Password-8.12.22-15.BETA-aarch64.zip",
"hash": "sha256-ZQAZUFHlNfgvBe/JKVnpjpstQsivXemXMDFiHuxM3eo="
"url": "https://downloads.1password.com/mac/1Password-8.12.22-16.BETA-aarch64.zip",
"hash": "sha256-sfBVX171OQfxh+v8367nmeVNATMRAJdIk+bS2KXF+BA="
}
}
}

6
pkgs/by-name/am/amd-debug-tools/package.nix
View file

@ -9,13 +9,13 @@
python3Packages.buildPythonApplication (finalAttrs: {
pname = "amd-debug-tools";
version = "0.2.13";
version = "0.2.18";
pyproject = true;
src = fetchgit {
url = "https://git.kernel.org/pub/scm/linux/kernel/git/superm1/amd-debug-tools.git";
rev = finalAttrs.version;
hash = "sha256-748K4Ee9HVYWQ7/DVz7F2nZNjau5v4OGvgHwJZ4vYpM=";
tag = finalAttrs.version;
hash = "sha256-qBgQFjiWFRKVTsIx0aLZC9AQWsVzgbJGOPGG6ojKoDE=";
};
build-system = with python3Packages; [

82
pkgs/by-name/an/android-cli/package.nix Normal file
View file

@ -0,0 +1,82 @@
{
lib,
stdenv,
fetchurl,
autoPatchelfHook,
writableTmpDirAsHomeHook,
versionCheckHook,
}:
let
platformData = {
x86_64-linux = {
url = "https://dl.google.com/android/cli/latest/linux_x86_64/android-cli";
hash = "sha256-1F9RVDPqiy60zs2CfWytKSPKeRC9KDTogw4Ml59HaeY=";
};
x86_64-darwin = {
url = "https://dl.google.com/android/cli/latest/darwin_x86_64/android-cli";
hash = "sha256-bXP9rRMSqQa3+kfUJnIeDb1LZXh2P2A6ytwunzjyfGs=";
};
aarch64-darwin = {
url = "https://dl.google.com/android/cli/latest/darwin_arm64/android-cli";
hash = "sha256-r47LXmilevW0td4N+SRTR7EFnCrPBdG7G/oTUAea90Q=";
};
};
systemData =
platformData.${stdenv.hostPlatform.system}
or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
in
stdenv.mkDerivation {
pname = "android-cli";
version = "1.0.15433482";
strictDeps = true;
__structuredAttrs = true;
src = fetchurl {
name = "android-cli";
url = systemData.url;
hash = systemData.hash;
};
dontUnpack = true;
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [
autoPatchelfHook
];
dontConfigure = true;
dontBuild = true;
installPhase = ''
runHook preInstall
install -m755 -D $src $out/bin/android
runHook postInstall
'';
nativeInstallCheckInputs = [
writableTmpDirAsHomeHook
versionCheckHook
];
doInstallCheck = true;
versionCheckKeepEnvironment = [ "HOME" ];
meta = with lib; {
description = "Android Command-Line Tool (CLI) by Google";
homepage = "https://developer.android.com/tools/agents/android-cli";
license = licenses.unfree;
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
maintainers = with maintainers; [ kirillrdy ];
teams = with teams; [ android ];
platforms = [
"x86_64-linux"
"x86_64-darwin"
"aarch64-darwin"
];
mainProgram = "android";
};
}

6
pkgs/by-name/as/asio/package.nix
View file

@ -7,7 +7,7 @@
openssl,
boost,
testers,
asioVersion ? "1.36.0",
asioVersion ? "1.38.0",
}:
stdenv.mkDerivation (finalAttrs: {
@ -23,11 +23,13 @@ stdenv.mkDerivation (finalAttrs: {
# Preserve 1.32.0 because some project depends on asio/io_service.hpp
"1.32.0" = "sha256-PBoa4OAOOmHas9wCutjz80rWXc3zGONntb9vTQk3FNY=";
"1.36.0" = "sha256-BhJpE5+t0WXsuQ5CtncU0P8Kf483uFoV+OGlFLc7TpQ=";
"1.38.0" = "sha256-pkSu8XMibmRPMoS3v5hO34oJb077bYc9KWELj3t8D6M=";
}
.${asioVersion} or (throw "Unsupported asio version. Please use overrideAttrs directly");
};
sourceRoot = "${finalAttrs.src.name}/asio";
sourceRoot =
finalAttrs.src.name + lib.optionalString (lib.versionOlder finalAttrs.version "1.38.0") "/asio";
patches = [
# Linking against `boost_system` fails because the stub compiled library

4
pkgs/by-name/bs/bstone/package.nix
View file

@ -10,13 +10,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "bstone";
version = "1.3.3";
version = "1.3.4";
src = fetchFromGitHub {
owner = "bibendovsky";
repo = "bstone";
tag = "v${finalAttrs.version}";
hash = "sha256-Svqm8gpZ2TgI2MdJc+gY9O7xCYYNo84/bbbqprBFpcc=";
hash = "sha256-8ifvHNf+vUtoffxghMwFXpGuarMEEBF+bkSbE4M9zf0=";
};
nativeBuildInputs = [

10
pkgs/by-name/fe/feishu/package.nix
View file

@ -65,12 +65,12 @@
let
sources = {
x86_64-linux = fetchurl {
url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/f63223d9/Feishu-linux_x64-7.62.9.deb";
sha256 = "sha256-96hOYAKsfKaZtvv+jnNCkFeeCVuwuQdwSHSPg5AGmIM=";
url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/289abaac/Feishu-linux_x64-7.66.10.deb";
sha256 = "sha256-68WKfT4dblQOQDd51n90nyAzOxrkBESR0pqbjbwrOso=";
};
aarch64-linux = fetchurl {
url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/d95df105/Feishu-linux_arm64-7.62.9.deb";
sha256 = "sha256-j+fEtJd+jaHV3NB+MXg8anks6F3cd8V/Tz2PcHMQt2o=";
url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/382a3d72/Feishu-linux_arm64-7.66.10.deb";
sha256 = "sha256-Beh0dYJ96BuwJwTMPF61H6R9u99Jcg4pzEF1rFOj9WA=";
};
};
@ -133,7 +133,7 @@ let
];
in
stdenv.mkDerivation {
version = "7.62.9";
version = "7.66.10";
pname = "feishu";
src =

1108
pkgs/by-name/go/google-cloud-sdk/components.json
View file

File diff suppressed because it is too large Load diff

22
pkgs/by-name/go/google-cloud-sdk/data.nix
View file

@ -1,27 +1,27 @@
# DO NOT EDIT! This file is generated automatically by update.sh
{ }:
{
version = "565.0.0";
version = "570.0.0";
googleCloudSdkPkgs = {
x86_64-linux = {
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-565.0.0-linux-x86_64.tar.gz";
sha256 = "0pra5cr46bf5k729m30xbs3s1vw8vkix7p33j9h8gvmqhr66fwh9";
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-570.0.0-linux-x86_64.tar.gz";
sha256 = "1qx246cy1mcngky4gcg65lzzw64anab9hqpmp6v7dqfqfld64p5k";
};
x86_64-darwin = {
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-565.0.0-darwin-x86_64.tar.gz";
sha256 = "1hyrr6kkbaqz6nhn029l1rwyn416jcvvyd41187vgpyr5b2ldd0h";
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-570.0.0-darwin-x86_64.tar.gz";
sha256 = "1gk6rrj8p30zraw3n2ajy50vnd5v724s5bnhnilnml03is7ssamd";
};
aarch64-linux = {
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-565.0.0-linux-arm.tar.gz";
sha256 = "0jx0h0skicy16g2572rblj59a4f5q3fxbaxhfs03ldqr15fjg647";
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-570.0.0-linux-arm.tar.gz";
sha256 = "085ykvz0y6madak8aak4bh0qyafqyiflmck0nkcb4xv6kmw6s3fa";
};
aarch64-darwin = {
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-565.0.0-darwin-arm.tar.gz";
sha256 = "1b7h0gzp58fkkln5v0dnki2j73akankhjm67205qah9hskaq06cd";
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-570.0.0-darwin-arm.tar.gz";
sha256 = "0vn6bz4lm6h9lsdnqywaj03p3b2175zsnmjf5mdgwdv7rd4iiwzs";
};
i686-linux = {
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-565.0.0-linux-x86.tar.gz";
sha256 = "19nba1qp87yf1wr94rabvkgf584i8pkvsp01qqd5la6hhmcpg0zn";
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-570.0.0-linux-x86.tar.gz";
sha256 = "07cmank5cx9bikc56jbnrrc9xx3qhzki8lcfbi6kxlqy8hwc9xba";
};
};
}

4
pkgs/by-name/go/google-cloud-sdk/package.nix
View file

@ -13,7 +13,7 @@
lib,
fetchurl,
makeWrapper,
python312,
python314,
openssl,
jq,
callPackage,
@ -25,7 +25,7 @@
}:
let
python3 = python312;
python3 = python314;
pythonEnv = python3.withPackages (
p:

2
pkgs/by-name/go/google-cloud-sdk/update.sh
View file

@ -6,7 +6,7 @@ BASE_URL="$CHANNEL_URL/downloads/google-cloud-sdk"
PACKAGE_DIR=$(dirname -- "$0")
VERSION=$(curl "https://storage.googleapis.com/storage/v1/b/cloud-sdk-release/o?delimiter=/&startOffset=google-cloud-sdk-${UPDATE_NIX_OLD_VERSION}&endOffset=google-cloud-sdk-9" | jq --raw-output '.items[-1].name | scan("\\d+\\.\\d+\\.\\d+")')
VERSION=$(curl -s "$CHANNEL_URL/components-2.json" | jq -r '.version')
function genMainSrc() {
local url="${BASE_URL}-${VERSION}-${1}-${2}.tar.gz"

7
pkgs/by-name/i3/i3lock/package.nix
View file

@ -16,6 +16,7 @@
libxkbfile,
libxcb-util,
cairo,
versionCheckHook,
}:
let
cairo' = cairo.override {
@ -26,6 +27,9 @@ stdenv.mkDerivation (finalAttrs: {
pname = "i3lock";
version = "2.15";
strictDeps = true;
__structuredAttrs = true;
src = fetchFromGitHub {
owner = "i3";
repo = "i3lock";
@ -53,6 +57,9 @@ stdenv.mkDerivation (finalAttrs: {
libxcb-util
];
nativeInstallCheckInputs = [ versionCheckHook ];
doInstallCheck = true;
meta = {
description = "Simple screen locker like slock";
longDescription = ''

33
pkgs/by-name/re/reaction/nftables-aarch64-linux-compat.patch Normal file
View file

@ -0,0 +1,33 @@
From 94fafae651077be5e7a6dfd29fc06327a2f218ed Mon Sep 17 00:00:00 2001
From: ppom <reaction@ppom.me>
Date: Thu, 28 May 2026 12:00:00 +0200
Subject: [PATCH] nftables: fix compilation on aarch64-linux
---
plugins/reaction-plugin-nftables/src/nft.rs | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/plugins/reaction-plugin-nftables/src/nft.rs b/plugins/reaction-plugin-nftables/src/nft.rs
index c234f77..2ac49df 100644
--- a/plugins/reaction-plugin-nftables/src/nft.rs
+++ b/plugins/reaction-plugin-nftables/src/nft.rs
@@ -1,5 +1,6 @@
use std::{
ffi::{CStr, CString},
+ os::raw::c_char,
thread,
};
@@ -71,7 +72,7 @@ struct NftCommand {
ret: oneshot::Sender<Result<String, String>>,
}
-fn to_rust_string(c_ptr: *const i8) -> Option<String> {
+fn to_rust_string(c_ptr: *const c_char) -> Option<String> {
if c_ptr.is_null() {
None
} else {
--
GitLab

19
pkgs/by-name/re/reaction/package.nix
View file

@ -4,6 +4,7 @@
callPackage,
rustPlatform,
fetchFromGitLab,
fetchpatch,
versionCheckHook,
installShellFiles,
@ -13,17 +14,22 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "reaction";
version = "2.3.1";
version = "2.4.0";
src = fetchFromGitLab {
domain = "framagit.org";
owner = "ppom";
repo = "reaction";
rev = "c0868d6fe1d155de183a89729b5f3f0ede7be4a2"; # TODO: return to tagged release
hash = "sha256-QlSXZ2Wk1OXzAY2x6YjtW+xNchY+Ghb/6AsJgjfgoFE=";
tag = "v${finalAttrs.version}";
hash = "sha256-Y6scgbcwhg56SQ1DefNtdja+n89Gc5bJUHKHKn2EYwQ=";
};
cargoHash = "sha256-FYd7I93MAAzD6y0VMd9kMU7DAgS6v5CKt2KjrskaKeo=";
patches = [
# nftables: fix compilation on aarch64-linux; remove in 2.4.1
./nftables-aarch64-linux-compat.patch
];
cargoHash = "sha256-NAcMpASvphAqjBjbAPWLG5qZbSgdaFC3GvU25exCS3g=";
nativeBuildInputs = [ installShellFiles ];
@ -66,7 +72,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
passthru = {
inherit (callPackage ./plugins { }) mkReactionPlugin plugins;
updateScript = nix-update-script { };
tests = nixosTests.reaction;
tests = {
inherit (nixosTests) reaction;
}
// finalAttrs.passthru.plugins;
};
meta = {

7
pkgs/by-name/re/reaction/plugins/default.nix
View file

@ -12,7 +12,12 @@
rustPlatform.buildRustPackage (
{
pname = name;
inherit (reaction) version src cargoHash;
inherit (reaction)
version
src
patches
cargoHash
;
buildAndTestSubdir = "plugins/${name}";
meta = {

6
pkgs/by-name/re/restish/package.nix
View file

@ -14,16 +14,16 @@
buildGoModule (finalAttrs: {
pname = "restish";
version = "0.21.2";
version = "2.0.0";
src = fetchFromGitHub {
owner = "danielgtaylor";
repo = "restish";
tag = "v${finalAttrs.version}";
hash = "sha256-C+fB9UeEq+h6SlBtVPPZWs5fCCsJVe/TJFy4KhhaItU=";
hash = "sha256-4piN0W/9y2NTsTuZ2B4Czhr9RQNb4eT9ZIX9MYzfMLI=";
};
vendorHash = "sha256-5+N6iL9wD5J/E6H5qn1InQR8bbuAlTOzPQn0sawVbrI=";
vendorHash = "sha256-ZRyGCdmPenOeLtFuj0howJH0rah05sPUuD7RH/c0LKI=";
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
libx11

37
pkgs/by-name/t3/t3code/package.nix
View file

@ -18,6 +18,23 @@
writableTmpDirAsHomeHook,
writeDarwinBundle,
xcbuild,
enableAzureDevOps ? false,
azure-cli,
azure-cli-extensions,
enableBitbucket ? false,
bitbucket-cli,
enableClaude ? false,
claude-code,
enableCodex ? true,
codex,
enableGitHub ? true,
gh,
enableGit ? true,
git,
enableGitLab ? false,
glab,
enableJujutsu ? false,
jujutsu,
}:
stdenv.mkDerivation (
@ -30,6 +47,22 @@ stdenv.mkDerivation (
"assets/prod/black-macos-1024.png"
else
"assets/prod/black-universal-1024.png";
runtimePackages =
lib.optionals enableAzureDevOps [
azure-cli.withExtensions
[ azure-cli-extensions.azure-devops ]
]
++ lib.optionals enableBitbucket [ bitbucket-cli ]
++ lib.optionals enableClaude [ claude-code ]
++ lib.optionals enableCodex [ codex ]
++ lib.optionals enableGitHub [ gh ]
++ lib.optionals enableGit [ git ]
++ lib.optionals enableGitLab [ glab ]
++ lib.optionals enableJujutsu [ jujutsu ];
runtimePathWrapperArgs = lib.optionalString (runtimePackages != [ ]) ''
\
--prefix PATH : ${lib.makeBinPath runtimePackages}
'';
nodeModules = stdenvNoCC.mkDerivation {
pname = "${finalAttrs.pname}-node_modules";
inherit (finalAttrs) src version strictDeps;
@ -166,11 +199,11 @@ stdenv.mkDerivation (
find "$out"/libexec/t3code -xtype l -delete
makeWrapper ${lib.getExe nodejs} "$out"/bin/t3code \
--add-flags "$out"/libexec/t3code/apps/server/dist/bin.mjs
--add-flags "$out"/libexec/t3code/apps/server/dist/bin.mjs ${runtimePathWrapperArgs}
makeWrapper ${lib.getExe electron} "$out"/bin/t3code-desktop \
--add-flags "$out"/libexec/t3code/apps/desktop/dist-electron/main.cjs \
--inherit-argv0
--inherit-argv0 ${runtimePathWrapperArgs}
''
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
mkdir --parents "$out/Applications/${appName}.app/Contents/"{MacOS,Resources}

4
pkgs/by-name/vi/visual-paradigm-ce/package.nix
View file

@ -10,7 +10,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "visual-paradigm-ce";
version = "18.0.20260511";
version = "18.0.20260521";
src =
let
@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
url = "https://eu10-dl.visual-paradigm.com/visual-paradigm/vpce${majorMinor}/${suffix}/Visual_Paradigm_CE_${
builtins.replaceStrings [ "." ] [ "_" ] majorMinor
}_${suffix}_Linux64_InstallFree.tar.gz";
hash = "sha256-K3eJhS+hz0AlVB0a17Chf/PNa5bFXjVIaFHt9thlabo=";
hash = "sha256-L5BxY7o2AwRRU6AnDeFk45ubhYTe8s+N/W66TSfLb3A=";
};
passthru.updateScript = writeScript "update-visual-paradigm-ce" ''

6
pkgs/by-name/ze/zeno/package.nix
View file

@ -5,16 +5,16 @@
}:
buildGoModule (finalAttrs: {
pname = "zeno";
version = "2.0.23";
version = "2.0.24";
src = fetchFromGitHub {
owner = "internetarchive";
repo = "Zeno";
tag = "v${finalAttrs.version}";
hash = "sha256-1U2XLQJ+PCLcq3baqkd6fsQnAX1dZ6Ct6vF6l/ywLyQ=";
hash = "sha256-v8LAT9e1as2zuoBhaEn8M5lILdo0kF2lGa6u+rSUPFs=";
};
vendorHash = "sha256-a0M9iPrrIurFlVtO8oXfqZJzwE/tZ8Hw9BKjZmJZ/r0=";
vendorHash = "sha256-f+N1eTl6hdWt1GOTWFW9KBk/1dGTq30IJSwU+c5R6V8=";
env.CGO_ENABLED = true;
ldFlags = [

4
pkgs/development/libraries/ffmpeg/default.nix
View file

@ -16,8 +16,8 @@ let
);
v4 = {
version = "4.4.6";
hash = "sha256-IM+1+WJWHuUNHZCVs+eKlmaEkfbvay4vQ2I/GbV1fqk=";
version = "4.4.7";
hash = "sha256-A/75BOHNhoal0VLJPOoQmyBHF4BIVk8iZOdM3RBU6iE=";
};
v6 = {

8
pkgs/development/python-modules/rapidocr/default.nix
View file

@ -3,6 +3,7 @@
buildPythonPackage,
fetchFromGitHub,
fetchpatch,
fetchzip,
replaceVars,
@ -19,7 +20,6 @@
onnxruntime,
tqdm,
pytestCheckHook,
requests,
}:
let
@ -61,6 +61,12 @@ buildPythonPackage {
(replaceVars ./setup-py-override-version-checking.patch {
inherit version;
})
# Fix type error in Immich which is caused by passing null to Path() when model_root_dir is the default null
(fetchpatch {
url = "https://github.com/RapidAI/RapidOCR/commit/57dfac08d8de63c4c00d21a1ab14a4a3b5c01975.patch";
stripLen = 1;
hash = "sha256-G49mTvBOm20BFOll4Pc0X397ZABT1tWMXd8nlDjBr7E=";
})
];
postPatch = ''

25
pkgs/development/python-modules/scikit-image/default.nix
View file

@ -5,7 +5,6 @@
buildPythonPackage,
python,
astropy,
cloudpickle,
cython,
dask,
imageio,
@ -24,10 +23,8 @@
pywavelets,
scikit-learn,
scipy,
setuptools,
simpleitk,
tifffile,
wheel,
}:
let
@ -51,25 +48,20 @@ let
--replace-fail "version = version_from_init()" "version = \"${version}\""
'';
nativeBuildInputs = [
build-system = [
cython
meson-python
numpy
packaging
pythran
setuptools
wheel
];
propagatedBuildInputs = [
dependencies = [
imageio
lazy-loader
matplotlib
networkx
numpy
packaging
pillow
pywavelets
scipy
tifffile
];
@ -77,14 +69,17 @@ let
optional-dependencies = {
data = [ pooch ];
optional = [
simpleitk
scikit-learn
pyamg
]
++ self.passthru.optional-dependencies.optional_free_threaded;
optional_free_threaded = [
astropy
cloudpickle
dask
matplotlib
pooch
pyamg
scikit-learn
simpleitk
pywavelets
]
++ dask.optional-dependencies.array;
};
@ -115,7 +110,7 @@ let
];
disabledTestPaths = [
# Requires network access (actually some data is loaded via `skimage._shared.testing.fetch` in the global scope, which calls `pytest.skip` when a network is unaccessible, leading to a pytest collection error).
# Requires network access (actually some data is loaded via `skimage._shared.testing.fetch` in the global scope, which calls `pytest.skip` when a network is inaccessible, leading to a pytest collection error).
"${installedPackageRoot}/skimage/filters/rank/tests/test_rank.py"
# These tests require network access

12
pkgs/development/python-modules/twscrape/default.nix
View file

@ -14,16 +14,16 @@
pytest-httpx,
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "twscrape";
version = "0.17.0";
version = "0.18.1";
pyproject = true;
src = fetchFromGitHub {
owner = "vladkens";
repo = "twscrape";
tag = "v${version}";
hash = "sha256-0j6nE8V0CWTuIHMS+2p5Ncz7d+D6VagjtyfMbQuI8Eg=";
tag = "v${finalAttrs.version}";
hash = "sha256-FQYBC/b2L+c6UtqMZcsuVom01n0sRpBvMTnE2zZh86U=";
};
build-system = [ hatchling ];
@ -50,8 +50,8 @@ buildPythonPackage rec {
meta = {
description = "Twitter API scrapper with authorization support";
homepage = "https://github.com/vladkens/twscrape";
changelog = "https://github.com/vladkens/twscrape/releases/tag/v${version}";
changelog = "https://github.com/vladkens/twscrape/releases/tag/${finalAttrs.src.tag}";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.amadejkastelic ];
};
}
})