gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-nixos

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2026-06-23 18:44:26 +00:00
committed by GitHub
parent 17180d0f3d 2f4f625e9f
commit 2235c4778b
56 changed files with 1212 additions and 858 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/attrsets.nix
+14 -9
View File
@@ -5,7 +5,6 @@
let
inherit (builtins) head length;
inherit (lib.trivial) mergeAttrs;
inherit (lib.strings)
concatStringsSep
concatMapStringsSep
@@ -13,16 +12,18 @@ let
sanitizeDerivationName
;
inherit (lib.lists)
filter
foldr
foldl'
all
concatLists
concatMap
elemAt
all
partition
groupBy
take
filter
foldl
foldl'
foldr
groupBy
partition
reverseList
take
;
in
@@ -370,7 +371,11 @@ rec {
:::
*/
concatMapAttrs = f: v: foldl' mergeAttrs { } (attrValues (mapAttrs f v));
concatMapAttrs =
f: v:
listToAttrs (
concatLists (reverseList (mapAttrsToList (name: value: attrsToList (f name value)) v))
);
/**
Update or set specific paths of an attribute set.
lib/cli.nix
+39 -27
View File
@@ -1,6 +1,22 @@
{ lib }:
{
let
inherit (lib)
concatLists
concatMap
escapeShellArgs
isBool
isList
mapAttrsToList
oldestSupportedReleaseIsAtLeast
optional
stringLength
warnIf
;
inherit (lib.generators) mkValueStringDefault;
mkValueString = mkValueStringDefault { };
in
rec {
/**
Automatically convert an attribute set to command-line options.
@@ -40,9 +56,9 @@
:::
*/
toGNUCommandLineShell =
lib.warnIf (lib.oldestSupportedReleaseIsAtLeast 2511)
warnIf (oldestSupportedReleaseIsAtLeast 2511)
"lib.cli.toGNUCommandLineShell is deprecated, please use lib.cli.toCommandLineShell or lib.cli.toCommandLineShellGNU instead."
(options: attrs: lib.escapeShellArgs (lib.cli.toGNUCommandLine options attrs));
(options: attrs: escapeShellArgs (toGNUCommandLine options attrs));
/**
Automatically convert an attribute set to a list of command-line options.
@@ -116,15 +132,15 @@
:::
*/
toGNUCommandLine =
lib.warnIf (lib.oldestSupportedReleaseIsAtLeast 2511)
warnIf (oldestSupportedReleaseIsAtLeast 2511)
"lib.cli.toGNUCommandLine is deprecated, please use lib.cli.toCommandLine or lib.cli.toCommandLineShellGNU instead."
(
{
mkOptionName ? k: if builtins.stringLength k == 1 then "-${k}" else "--${k}",
mkOptionName ? k: if stringLength k == 1 then "-${k}" else "--${k}",
mkBool ? k: v: lib.optional v (mkOptionName k),
mkBool ? k: v: optional v (mkOptionName k),
mkList ? k: v: lib.concatMap (mkOption k) v,
mkList ? k: concatMap (mkOption k),
mkOption ?
k: v:
@@ -133,26 +149,24 @@
else if optionValueSeparator == null then
[
(mkOptionName k)
(lib.generators.mkValueStringDefault { } v)
(mkValueString v)
]
else
[ "${mkOptionName k}${optionValueSeparator}${lib.generators.mkValueStringDefault { } v}" ],
[ "${mkOptionName k}${optionValueSeparator}${mkValueString v}" ],
optionValueSeparator ? null,
}:
options:
let
render =
k: v:
if builtins.isBool v then
if isBool v then
mkBool k v
else if builtins.isList v then
else if isList v then
mkList k v
else
mkOption k v;
in
builtins.concatLists (lib.mapAttrsToList render options)
options: concatLists (mapAttrsToList render options)
);
/**
@@ -163,8 +177,7 @@
For further reference see:
[`lib.cli.toCommandLineGNU`](#function-library-lib.cli.toCommandLineGNU)
*/
toCommandLineShellGNU =
options: attrs: lib.escapeShellArgs (lib.cli.toCommandLineGNU options attrs);
toCommandLineShellGNU = options: attrs: escapeShellArgs (toCommandLineGNU options attrs);
/**
Converts an attribute set into a list of GNU-style command-line arguments.
@@ -227,9 +240,9 @@
*/
toCommandLineGNU =
{
isLong ? optionName: builtins.stringLength optionName > 1,
isLong ? optionName: stringLength optionName > 1,
explicitBool ? false,
formatArg ? lib.generators.mkValueStringDefault { },
formatArg ? mkValueString,
}:
let
optionFormat = optionName: {
@@ -238,7 +251,7 @@
inherit explicitBool formatArg;
};
in
lib.cli.toCommandLine optionFormat;
toCommandLine optionFormat;
/**
Converts the given attributes into a single shell-escaped command-line
@@ -248,8 +261,7 @@
For further reference see:
[`lib.cli.toCommandLine`](#function-library-lib.cli.toCommandLine)
*/
toCommandLineShell =
optionFormat: attrs: lib.escapeShellArgs (lib.cli.toCommandLine optionFormat attrs);
toCommandLineShell = optionFormat: attrs: escapeShellArgs (toCommandLine optionFormat attrs);
/**
Converts an attribute set into a list of command-line arguments.
@@ -421,14 +433,14 @@
- `lib.cli.toCommandLineShellGNU`
*/
toCommandLine =
optionFormat: attrs:
optionFormat:
let
handlePair =
k: v:
if k == "" then
lib.throw "lib.cli.toCommandLine only accepts non-empty option names."
else if builtins.isList v then
builtins.concatMap (handleOption k) v
throw "lib.cli.toCommandLine only accepts non-empty option names."
else if isList v then
concatMap (handleOption k) v
else
handleOption k v;
@@ -439,7 +451,7 @@
option,
sep,
explicitBool,
formatArg ? lib.generators.mkValueStringDefault { },
formatArg ? mkValueString,
}:
k: v:
if v == null || (!explicitBool && v == false) then
@@ -458,5 +470,5 @@
arg
];
in
builtins.concatLists (lib.mapAttrsToList handlePair attrs);
attrs: concatLists (mapAttrsToList handlePair attrs);
}
lib/tests/misc.nix
+15
View File
@@ -2164,6 +2164,21 @@ runTests {
};
};
testConcatMapAttrsDuplicates = {
expr =
concatMapAttrs
(name: value: {
final = value;
})
{
a = 1;
b = 2;
};
expected = {
final = 2;
};
};
testFilterAttrs = {
expr = filterAttrs (n: v: n != "a" && (v.hello or false) == true) {
a.hello = true;
nixos/doc/manual/development/writing-nixos-tests.section.md
+1 -1
View File
@@ -146,7 +146,7 @@ Some advantages of virtual machines over containers are:
(kernel modules, etc.).
- Virtual machines support testing graphical applications on X11.
- Virtual machines allow testing NixOS modules that use systemd's namespacing options (such as `ProtectSystem=` or `MountAPIVFS=`).
- Virtual machines allow testing [`spcialisation`](options.html#opt-specialisation).
- Virtual machines allow testing [`specialisation`](options.html#opt-specialisation).
(Switching to a specialisation requires the creation of SUID/SGID wrappers, which is disallowed in `systemd-nspawn` within the Nix sandbox.)
- Virtual machines allow the execution of `setuid` binaries.
nixos/modules/misc/documentation/modular-services.nix
+4
View File
@@ -19,6 +19,10 @@ let
modularServicesModule = {
options = {
"<imports = [ pkgs.autopush-rs.services.autoconnect ]>" =
fakeSubmodule pkgs.autopush-rs.services.autoconnect;
"<imports = [ pkgs.autopush-rs.services.autoendpoint ]>" =
fakeSubmodule pkgs.autopush-rs.services.autoendpoint;
"<imports = [ pkgs.ghostunnel.services.default ]>" = fakeSubmodule pkgs.ghostunnel.services.default;
"<imports = [ pkgs.ktls-utils.services.default ]>" = fakeSubmodule pkgs.ktls-utils.services.default;
"<imports = [ pkgs.php.services.default ]>" = fakeSubmodule pkgs.php.services.default;
nixos/modules/services/web-apps/jitsi-meet.nix
+11 -13
View File
@@ -651,19 +651,17 @@ in
};
};
services.jitsi-meet.config =
recursiveUpdate
(mkIf cfg.excalidraw.enable {
whiteboard = {
enabled = true;
collabServerBaseUrl = "https://${cfg.hostName}";
};
})
(
mkIf cfg.secureDomain.enable {
hosts.anonymousdomain = "guest.${cfg.hostName}";
}
);
services.jitsi-meet.config = mkMerge [
(mkIf cfg.excalidraw.enable {
whiteboard = {
enabled = true;
collabServerBaseUrl = "https://${cfg.hostName}";
};
})
(mkIf cfg.secureDomain.enable {
hosts.anonymousdomain = "guest.${cfg.hostName}";
})
];
services.jitsi-videobridge = mkIf cfg.videobridge.enable {
enable = true;
nixos/tests/systemd-repart.nix
+5 -1
View File
@@ -303,10 +303,14 @@ in
systemd = {
enable = true;
# avoids reaching cryptsetup.target before recreation of the
# "state" volume completed, during the factory reset
# "state" volume completed, during the factory reset and tries to
# ensure that devices are retriggered before trying to work with them.
services.systemd-repart.before = [
"systemd-cryptsetup@state.service"
];
services.systemd-factory-reset-complete.before = [
"systemd-cryptsetup@state.service"
];
repart = {
enable = true;
extraArgs = [
pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+619 -619
View File
File diff suppressed because it is too large Load Diff
pkgs/applications/networking/browsers/firefox/packages/firefox.nix
+2 -2
View File
@@ -9,10 +9,10 @@
buildMozillaMach rec {
pname = "firefox";
version = "152.0.1";
version = "152.0.2";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "9b2595148ed977040ea2b21e7d6ece70f0e53fac9b96b3115b113bea76ead6c0422f6e94b1540283b430fed5e8e9a227771a6357bf16f56d530a7fae7dc7553a";
sha512 = "e4e54cffffcfd5751eac5817a7b74b0ef0aa43fc00ef29397cc9df9aa52572b2272b96e60373a70d712be4dc849170d8d5c1b449f3ea978b4ab28dee19056b03";
};
meta = {
pkgs/by-name/am/amneziawg-tools/package.nix
+2 -2
View File
@@ -14,13 +14,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "amneziawg-tools";
version = "1.0.20260223";
version = "1.0.20260618-2";
src = fetchFromGitHub {
owner = "amnezia-vpn";
repo = "amneziawg-tools";
tag = "v${finalAttrs.version}";
hash = "sha256-pHmuxlrbTqjwRrB7BShdC4ENw3iVQRRLH+Z2w8x+KeE=";
hash = "sha256-b/ol1OovcZm0OFzz29GVO6EzxGvDDeixaABwGLaR3O0=";
};
sourceRoot = "${finalAttrs.src.name}/src";
pkgs/by-name/au/autopush-rs/service-autoconnect.nix
+1 -1
View File
@@ -24,7 +24,7 @@ in
description = "Endpoint of the database server.";
type = lib.types.str;
default = "";
example = lib.literalExpression "redis+socket://${config.services.redis.servers.autopush-rs.unixSocket}";
example = lib.literalExpression "redis+socket://\${config.services.redis.servers.autopush-rs.port}";
};
};
};
pkgs/by-name/au/autopush-rs/service-autoendpoint.nix
+1 -1
View File
@@ -25,7 +25,7 @@ in
description = "Endpoint of the database server.";
type = lib.types.str;
default = "";
example = lib.literalExpression "redis+socket://${config.services.redis.servers.autopush-rs.unixSocket}";
example = lib.literalExpression "redis+socket://\${config.services.redis.servers.autopush-rs.port}";
};
};
};
pkgs/by-name/ba/baddns/package.nix
+21 -12
View File
@@ -5,28 +5,26 @@
python3,
}:
python3.pkgs.buildPythonApplication rec {
python3.pkgs.buildPythonApplication (finalAttrs: {
pname = "baddns";
version = "1.12.294";
version = "2.4.1";
pyproject = true;
src = fetchFromGitHub {
owner = "blacklanternsecurity";
repo = "baddns";
tag = version;
hash = "sha256-HAVoCyI7yxCdAR4qq7yXJz3YxkPnhBdeXLJZmzZpwF4=";
tag = finalAttrs.version;
hash = "sha256-3SKR94/KBjTxk7swPKaIn2zzAjYMSEqqLALeCBjwMFg=";
};
pythonRelaxDeps = true;
build-system = with python3.pkgs; [
poetry-core
poetry-dynamic-versioning
];
build-system = with python3.pkgs; [ hatchling ];
dependencies = with python3.pkgs; [
colorama
cloudcheck
dnspython
blastdns
blasthttp
httpx
python-dateutil
python-whois
@@ -49,23 +47,34 @@ python3.pkgs.buildPythonApplication rec {
disabledTests = [
# Tests require network access
"test_cli_cname_http"
"test_cli_cname_nxdomain"
"test_cli_direct"
"test_cli_validation_customnameservers_valid"
"test_cname_http_bigcartel_match"
"test_cname_whois_unregistered_baddata"
"test_cname_whois_unregistered_match"
"test_cname_whois_unregistered_missingdata"
"test_custom_signatures_dir"
"test_debug_mode"
"test_default_resolver"
"test_dmarc"
"test_min_confidence_confirmed_excludes_high"
"test_min_confidence_filters_findings"
"test_min_severity_critical_excludes_medium"
"test_min_severity_low_includes_medium"
"test_modules_customnameservers"
"test_references_cname_css"
"test_references_cname_js"
"test_silent_mode"
"test_spf"
];
meta = {
description = "Tool to check subdomains for subdomain takeovers and other DNS issues";
homepage = "https://github.com/blacklanternsecurity/baddns/";
changelog = "https://github.com/blacklanternsecurity/baddns/releases/tag/${src.tag}";
changelog = "https://github.com/blacklanternsecurity/baddns/releases/tag/${finalAttrs.src.tag}";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ fab ];
mainProgram = "baddns";
};
}
})
pkgs/by-name/ca/cargo-nextest/package.nix
+3 -3
View File
@@ -8,13 +8,13 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cargo-nextest";
version = "0.9.137";
version = "0.9.138";
src = fetchFromGitHub {
owner = "nextest-rs";
repo = "nextest";
tag = "cargo-nextest-${finalAttrs.version}";
hash = "sha256-Ad5QXVkPwJk2wMHbCbYVwgua0DfmUwBLmfG9bSt1dbA=";
hash = "sha256-4YD2NSRSqEJq/zDllpsrV7TlInAjTGsa2SKSAbsVPnc=";
};
# FIXME: we don't support dtrace probe generation on macOS until we have a dtrace build: https://github.com/NixOS/nixpkgs/pull/392918
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
./no-dtrace-macos.patch
];
cargoHash = "sha256-7ISzQ9jt/ekrO7Z4B09YbNLZkNDwS13ljl2tpEQdthU=";
cargoHash = "sha256-MXl8tzTNhgs+Jfa8p6c51B0qHbTjEeXHD6otqr5qnvs=";
cargoBuildFlags = [
"-p"
pkgs/by-name/dr/drupal/package.nix
+3 -3
View File
@@ -8,18 +8,18 @@
php.buildComposerProject2 (finalAttrs: {
pname = "drupal";
version = "11.3.11";
version = "11.3.13";
src = fetchFromGitLab {
domain = "git.drupalcode.org";
owner = "project";
repo = "drupal";
tag = finalAttrs.version;
hash = "sha256-O1Al14D9vZEdNOtOKcvMnlp6hyjrfu8n2nTE5qk4Xe0=";
hash = "sha256-t60EbgN3r9KmSyZcvLtUy+H4eRizqFyI3bLFHH1/ciY=";
};
composerNoPlugins = false;
vendorHash = "sha256-pA1Hy4WtHqWQTBxD0fbbetg0heVYfuPJUUOHPE3JyGc=";
vendorHash = "sha256-DaKWrdFNHppZm4a8wexfwapSPDhlNL45ftVQ+YSY18s=";
passthru = {
tests = {
pkgs/by-name/fo/forgejo-runner/package.nix
+2 -2
View File
@@ -55,14 +55,14 @@ let
in
buildGoModule (finalAttrs: {
pname = "forgejo-runner";
version = "12.11.1";
version = "12.12.0";
src = fetchFromGitea {
domain = "code.forgejo.org";
owner = "forgejo";
repo = "runner";
rev = "v${finalAttrs.version}";
hash = "sha256-Qc43zWDDCjL8RW9Q30H4N5VRSFT3LR4Pt8/P0NcMacU=";
hash = "sha256-6czLxFgjcrBepoFN4iYDUt8uBkhfC8qx4yqmcfQ8FAg=";
};
vendorHash = "sha256-du7fXehcxZ70Lsr5VCkz646G0Us/XwM4Sl98HXimoao=";
pkgs/by-name/fz/fzf-git-sh/package.nix
+3 -3
View File
@@ -20,13 +20,13 @@
stdenv.mkDerivation rec {
pname = "fzf-git-sh";
version = "0-unstable-2026-03-19";
version = "0-unstable-2026-06-16";
src = fetchFromGitHub {
owner = "junegunn";
repo = "fzf-git.sh";
rev = "0f0488331a060cf45aaecb6705a2cf394fb20293";
hash = "sha256-fV4RtYL+ksbl5SMVZMoRyo6YUWP/KFvFPgfIbecIOO4=";
rev = "d76cd4df21f2ca5aafeab8b31118c4df133472c0";
hash = "sha256-lK8rbwu5PhCOY3ODWW6U/R/O3AA4c4etxCQogHja9nA=";
};
dontBuild = true;
pkgs/by-name/go/go-sendxmpp/package.nix
+3 -3
View File
@@ -9,17 +9,17 @@
buildGoModule (finalAttrs: {
pname = "go-sendxmpp";
version = "0.15.8";
version = "0.16.0";
src = fetchFromGitLab {
domain = "salsa.debian.org";
owner = "mdosch";
repo = "go-sendxmpp";
tag = "v${finalAttrs.version}";
hash = "sha256-9p9/3kMW25lfWDdN1EExomVRaNXEytJ6/V8MUA3rABQ=";
hash = "sha256-QAsrx7Ae0AMxTMYsr40ZHsXXA4wLXVrxO3QLfLrIGXU=";
};
vendorHash = "sha256-/38b5tMB7ZHMl16ZzB8UJvWfysa1MD9OLRyqX5X0ACY=";
vendorHash = "sha256-uMl5/NKOgoVYFIAfgUBAr69KGIsi79RCWZLZac9HAQ4=";
passthru = {
tests = { inherit (nixosTests) ejabberd prosody; };
pkgs/by-name/gy/gyroflow-bin/package.nix
+49
View File
@@ -0,0 +1,49 @@
{
lib,
stdenvNoCC,
fetchurl,
_7zz,
makeWrapper,
gyroflow,
nix-update-script,
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "gyroflow-bin";
version = "1.6.3";
__structuredAttrs = true;
strictDeps = true;
src = fetchurl {
url = "https://github.com/gyroflow/gyroflow/releases/download/v${finalAttrs.version}/Gyroflow-mac-universal.dmg";
hash = "sha256-++Jnk8Y58UENiZXeutGIchWHEIy2p0Ik6Hn3nku4ocA=";
};
sourceRoot = ".";
nativeBuildInputs = [
_7zz
makeWrapper
];
installPhase = ''
runHook preInstall
mkdir -p $out/Applications
cp -r "Gyroflow v${finalAttrs.version}/Gyroflow.app" $out/Applications/
makeWrapper $out/Applications/Gyroflow.app/Contents/MacOS/gyroflow $out/bin/gyroflow
runHook postInstall
'';
meta = gyroflow.meta // {
description = "Advanced gyro-based video stabilization tool (pre-built macOS binary)";
maintainers = with lib.maintainers; [ Br1ght0ne ];
mainProgram = "gyroflow";
platforms = lib.platforms.darwin;
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
};
passthru.updateScript = nix-update-script { };
})
pkgs/by-name/ho/homebank/package.nix
+2 -2
View File
@@ -13,10 +13,10 @@
stdenv.mkDerivation (finalAttrs: {
pname = "homebank";
version = "5.10.1";
version = "5.10.2";
src = fetchurl {
url = "https://www.gethomebank.org/public/sources/homebank-${finalAttrs.version}.tar.gz";
hash = "sha256-Z1EtMYjqRfkqb5Mm6CnBQq9a1QkwZwLzsEV6GrYR1Co=";
hash = "sha256-8L6v4H6iIVXI+OJneY1usF1uAV1WYLlvs0/eylprxMc=";
};
nativeBuildInputs = [
pkgs/by-name/if/ifstate/package.nix
+4
View File
@@ -4,6 +4,7 @@
yq,
python3Packages,
fetchFromCodeberg,
ethtool,
iproute2,
libbpf,
nixosTests,
@@ -62,6 +63,9 @@ let
postPatch = ''
substituteInPlace libifstate/routing/__init__.py \
--replace-fail '/usr/share/iproute2' '${iproute2}/share/iproute2'
substituteInPlace libifstate/link/base.py \
--replace-fail "/usr/sbin/ethtool" "${lib.getExe ethtool}"
''
+ lib.optionalString withBpf ''
substituteInPlace libifstate/bpf/ctypes.py \
pkgs/by-name/la/lasuite-docs-collaboration-server/package.nix
+2 -2
View File
@@ -13,13 +13,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "lasuite-docs-collaboration-server";
version = "5.2.1";
version = "5.3.0";
src = fetchFromGitHub {
owner = "suitenumerique";
repo = "docs";
tag = "v${finalAttrs.version}";
hash = "sha256-FRN4rcS2aYoYjFY05nYV9pYz0Es8X3EWsD/oPdp4kpI=";
hash = "sha256-GQAhCwtcp/9rSk1B1/EWL2jnfd46w1vikEMJeucD1bA=";
};
sourceRoot = "${finalAttrs.src.name}/src/frontend";
pkgs/by-name/la/lasuite-docs-frontend/package.nix
+2 -2
View File
@@ -12,13 +12,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "lasuite-docs-frontend";
version = "5.2.1";
version = "5.3.0";
src = fetchFromGitHub {
owner = "suitenumerique";
repo = "docs";
tag = "v${finalAttrs.version}";
hash = "sha256-FRN4rcS2aYoYjFY05nYV9pYz0Es8X3EWsD/oPdp4kpI=";
hash = "sha256-GQAhCwtcp/9rSk1B1/EWL2jnfd46w1vikEMJeucD1bA=";
};
sourceRoot = "${finalAttrs.src.name}/src/frontend";
pkgs/by-name/la/lasuite-docs/package.nix
+2 -2
View File
@@ -11,12 +11,12 @@
yarnConfigHook,
}:
let
version = "5.2.1";
version = "5.3.0";
src = fetchFromGitHub {
owner = "suitenumerique";
repo = "docs";
tag = "v${version}";
hash = "sha256-FRN4rcS2aYoYjFY05nYV9pYz0Es8X3EWsD/oPdp4kpI=";
hash = "sha256-GQAhCwtcp/9rSk1B1/EWL2jnfd46w1vikEMJeucD1bA=";
};
mail-templates = stdenv.mkDerivation {
pkgs/by-name/ll/llmfit/package.nix
+3 -3
View File
@@ -7,16 +7,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "llmfit";
version = "0.9.31";
version = "0.9.33";
src = fetchFromGitHub {
owner = "AlexsJones";
repo = "llmfit";
tag = "v${finalAttrs.version}";
hash = "sha256-VRJawGEdyz9p9fqNxFQ56oCc5OggT6wi4l55pydgyrg=";
hash = "sha256-t78LXDadwqPhdD9s4aIq0ZKaynw+/rdC+ZL2Sk0lPTY=";
};
cargoHash = "sha256-LuTLhwmvB0t+3iZQfxc6SvC8qgjZyOTcVzT7a8ue29Q=";
cargoHash = "sha256-gn9hhD+ztudHnUiOSXQUk9QbsQtcdfZW9HMRHCWAl0k=";
passthru.updateScript = nix-update-script { };
pkgs/by-name/mo/moor/package.nix
+2 -2
View File
@@ -10,13 +10,13 @@
buildGoModule (finalAttrs: {
pname = "moor";
version = "2.15.0";
version = "2.15.1";
src = fetchFromGitHub {
owner = "walles";
repo = "moor";
tag = "v${finalAttrs.version}";
hash = "sha256-TUMv7+8RUHzNTydUE+Tqihn7VD0QXUdegsU3elGAQG4=";
hash = "sha256-AaoEG7N6N1OmJFlDRW1GhonKEQBaYKKYax/ahdEhtnU=";
};
vendorHash = "sha256-vf0hdrNy8HrQBtZZKwmbWOVn2TB6tV4qdews8Enjwao=";
pkgs/by-name/ne/nerva/package.nix
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule (finalAttrs: {
pname = "nerva";
version = "1.21.0";
version = "1.25.2";
src = fetchFromGitHub {
owner = "praetorian-inc";
repo = "nerva";
tag = "v${finalAttrs.version}";
hash = "sha256-1XdM+MWIYhYbI7kgYtvGa4IRGLQAaGzNDaK31gRteVg=";
hash = "sha256-t8LAxtdA45nfpD99HvRiP5Nv8hsxP9iQF81JUbztLS4=";
};
vendorHash = "sha256-j+8KZxHnYrtxwdBxpAXZ+Q5Sm1REluUEmD69tKYTCag=";
vendorHash = "sha256-Z0MSD+1/1VzrJ+pz5x0JvxrCxtJe59ckaTqHK/+TVN8=";
ldflags = [
"-s"
pkgs/by-name/ru/rumdl/package.nix
+3 -3
View File
@@ -11,16 +11,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "rumdl";
version = "0.2.16";
version = "0.2.21";
src = fetchFromGitHub {
owner = "rvben";
repo = "rumdl";
tag = "v${finalAttrs.version}";
hash = "sha256-iAro4RHLiuZwu1w2ZLdkhrypyZzu8gxGRuODg4FZoiw=";
hash = "sha256-cOoZWcioSv/iUMiKNqeMqHDj5BIOnunxXiJzrWlugc4=";
};
cargoHash = "sha256-FBx75yBcz2lDlMo7fReYXpukF/dmnvl7RS1ByL4HG4s=";
cargoHash = "sha256-imw1v9oRlw56Qp6zAgSNuh8NKTeEvDZ1R8I/E42Eb58=";
cargoBuildFlags = [
"--bin=rumdl"
pkgs/by-name/sa/sabiql/package.nix
+60
View File
@@ -0,0 +1,60 @@
{
fetchFromGitHub,
lib,
stdenv,
rustPlatform,
rustc,
graphviz,
postgresql,
xdg-utils,
makeBinaryWrapper,
nix-update-script,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "sabiql";
version = "1.13.0";
src = fetchFromGitHub {
owner = "riii111";
repo = "sabiql";
rev = "v${finalAttrs.version}";
hash = "sha256-HDaiCLu1L2aQ+9swQWWPzb9MWqI44ECf71KyhI43emk=";
};
cargoHash = "sha256-5o68x2pOe4ArDzPJmGI9ooqRgs8rEReSFnpT8TKItl4=";
# Upstream use latest rust version need to patch use nixpkgs version
postPatch = ''
sed -i 's/rust-version\s*=\s*".*"/rust-version = "${rustc.version}"/' Cargo.toml
'';
nativeBuildInputs = [
makeBinaryWrapper
];
postInstall =
let
runtimePathDeps = [
graphviz
postgresql
]
++ lib.optionals stdenv.hostPlatform.isLinux [ xdg-utils ];
in
''
wrapProgram $out/bin/sabiql \
--prefix PATH : ${lib.makeBinPath runtimePathDeps}
'';
passthru.updateScript = nix-update-script { };
__structuredAttrs = true;
meta = {
description = "Fast PostgreSQL TUI written in Rust. driver-less, vim-first, with ER diagrams. No database drivers, no setup, just psql";
mainProgram = "sabiql";
homepage = "https://github.com/riii111/sabiql";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ theeasternfurry ];
};
})
pkgs/by-name/sh/shopware-cli/package.nix
+3 -3
View File
@@ -11,12 +11,12 @@
buildGoModule (finalAttrs: {
pname = "shopware-cli";
version = "0.15.5";
version = "0.15.10";
src = fetchFromGitHub {
repo = "shopware-cli";
owner = "shopware";
tag = finalAttrs.version;
hash = "sha256-76zfmnrmwnZV0yr+h4RNQ4fuqcTxrANdP2PWFEDzHic=";
hash = "sha256-xLgWXuSNUjmqWjSGU73r/FeIPb3mV1Yvv0R7tUrh6oM=";
};
nativeBuildInputs = [
@@ -28,7 +28,7 @@ buildGoModule (finalAttrs: {
dart-sass
];
vendorHash = "sha256-6zSHc26G2Blw3H2xYOelxGqrhenWlumxEINME55u+kY=";
vendorHash = "sha256-sBsIiLusitW24fXtPPxizEE3gu+ZbSbOAc1+UfCHZPk=";
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd shopware-cli \
pkgs/by-name/sm/smuview/package.nix
+2 -2
View File
@@ -14,7 +14,7 @@
glibmm,
python3,
bluez,
pcre,
pcre2,
libsForQt5,
desktopToDarwinBundle,
qt5,
@@ -48,7 +48,7 @@ stdenv.mkDerivation {
hidapi
glibmm
python3
pcre
pcre2
libsForQt5.qwt
]
++ lib.optionals stdenv.hostPlatform.isLinux [ bluez ];
pkgs/by-name/st/stackit-cli/package.nix
+3 -3
View File
@@ -12,16 +12,16 @@
buildGoModule (finalAttrs: {
pname = "stackit-cli";
version = "0.64.0";
version = "0.65.0";
src = fetchFromGitHub {
owner = "stackitcloud";
repo = "stackit-cli";
rev = "v${finalAttrs.version}";
hash = "sha256-bJ1gOmlSRxod3fSBI+TKByjEUXzBO8tS7dViJ/UrNFI=";
hash = "sha256-iFGcvRnmQdAnhhDwJiCDskRyToR+wSguicqp1VQfTuc=";
};
vendorHash = "sha256-+/AgWBpz7Magn4wFyq+t4dg2Kh1+4nKU1N21erHQbZE=";
vendorHash = "sha256-I5mRG+sDiEsv4QJJMcMS/UUVuQd04TsPV0fY0LYNpPQ=";
subPackages = [ "." ];
pkgs/by-name/su/sudo-rs/package.nix
+3 -3
View File
@@ -12,16 +12,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "sudo-rs";
version = "0.2.13";
version = "0.2.14";
src = fetchFromGitHub {
owner = "trifectatechfoundation";
repo = "sudo-rs";
tag = "v${finalAttrs.version}";
hash = "sha256-T9QkdpNq7YTR2df1M+lIt+iocVzrFv1yUwq0wgBRHaA=";
hash = "sha256-ym+Kc/J6ssE0j67aRguig6EjBT6W24WmGTounVJBhX0=";
};
cargoHash = "sha256-yfML0XO2/Xug0IhbzX1P7PL1YspxWR1FJYP5VtqZzRA=";
cargoHash = "sha256-wuvMo17kh3T4tFnbh557QPDyw997YKXssYspUsHFTU0=";
nativeBuildInputs = [ installShellFiles ];
pkgs/by-name/ti/tixati/package.nix
+2 -2
View File
@@ -15,11 +15,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "tixati";
version = "3.42";
version = "3.44";
src = fetchurl {
url = "https://download.tixati.com/tixati-${finalAttrs.version}-1.x86_64.manualinstall.tar.gz";
hash = "sha256-tuejoQQ3W9PyvABPieiYle3QYy2JKNqDvRlorSxPuHc=";
hash = "sha256-OwYAGaSOt6m3vQFGCszrxAeeGjEF6nfsZszXvJX4kR8=";
};
nativeBuildInputs = [ autoPatchelfHook ];
pkgs/by-name/to/tor/package.nix
+2 -2
View File
@@ -46,11 +46,11 @@ in
stdenv.mkDerivation (finalAttrs: {
pname = "tor";
version = "0.4.9.9";
version = "0.4.9.10";
src = fetchurl {
url = "https://dist.torproject.org/tor-${finalAttrs.version}.tar.gz";
hash = "sha256-vXW6f9aPYHx4Bvz3AVajAKqSbprWml5WqOZBT1In6DM=";
hash = "sha256-3+6QTq6Pw4ouOzURVPisD8oqZkkDjxp+allGHeV9pH8=";
};
outputs = [
pkgs/by-name/tt/ttyplot/package.nix
+2 -2
View File
@@ -8,13 +8,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "ttyplot";
version = "1.7.4";
version = "1.7.5";
src = fetchFromGitHub {
owner = "tenox7";
repo = "ttyplot";
rev = finalAttrs.version;
hash = "sha256-hWjjl11NGhbv0VrLpdJ/W+a8tJPjg8OtUTKgDIqpsfs=";
hash = "sha256-JXxJDFwbwnLc19qfKtHwsZDv3Un1ahCOZlAfQbBuCpc=";
};
nativeBuildInputs = [
pkgs/by-name/uf/uftpd/package.nix
+2 -2
View File
@@ -10,13 +10,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "uftpd";
version = "2.15";
version = "2.16";
src = fetchFromGitHub {
owner = "troglobit";
repo = "uftpd";
rev = "v${finalAttrs.version}";
hash = "sha256-+y1eRPUgYf5laRFIDD1XOEfonPP8QMJNCSkmHlXIjdY=";
hash = "sha256-Fk/YwTqtFSnR6EeObAcZdUume2xK0wd6EOPSJpOwMTg=";
};
nativeBuildInputs = [
pkgs/by-name/vs/vscode-langservers-extracted/package.nix
+70 -38
View File
@@ -1,56 +1,88 @@
{
lib,
stdenv,
buildNpmPackage,
fetchFromGitHub,
unzip,
stdenvNoCC,
vscodium,
vscode-extensions,
nodejs-slim,
makeBinaryWrapper,
unzip,
runCommandLocal,
}:
buildNpmPackage rec {
stdenvNoCC.mkDerivation (finalAttrs: {
inherit (vscodium) version src;
pname = "vscode-langservers-extracted";
version = "4.10.0";
srcs = [
(fetchFromGitHub {
owner = "hrsh7th";
repo = "vscode-langservers-extracted";
rev = "v${version}";
hash = "sha256-3m9+HZY24xdlLcFKY/5DfvftqprwLJk0vve2ZO1aEWk=";
})
vscodium.src
sourceRoot =
if stdenvNoCC.hostPlatform.isDarwin then
"VSCodium.app/Contents/Resources/app/extensions"
else
"resources/app/extensions";
nativeBuildInputs = [
makeBinaryWrapper
]
# The Darwin release is a zip.
# stdenv unpacks the Linux tarball (tar.gz) natively.
# FIXME: update vscodium.src to use fetchTarball & fetchZip
++ lib.optionals stdenvNoCC.hostPlatform.isDarwin [
unzip
];
sourceRoot = "source";
__structuredAttrs = true;
strictDeps = true;
dontConfigure = true;
dontBuild = true;
npmDepsHash = "sha256-XGlFtmikUrnnWXsAYzTqw2K7Y2O0bUtYug0xXFIASBQ=";
installPhase = ''
runHook preInstall
nativeBuildInputs = [ unzip ];
for language in css html json; do
server="$language-language-features/server/dist/node/''${language}ServerMain.js"
install -Dm644 "$server" \
"$out/lib/extensions/$server"
makeBinaryWrapper ${lib.getExe nodejs-slim} "$out/bin/vscode-$language-language-server" \
--add-flag "$out/lib/extensions/$server"
done
buildPhase =
let
extensions =
if stdenv.hostPlatform.isDarwin then
"../VSCodium.app/Contents/Resources/app/extensions"
else
"../resources/app/extensions";
in
''
npx babel ${extensions}/css-language-features/server/dist/node \
--out-dir lib/css-language-server/node/
npx babel ${extensions}/html-language-features/server/dist/node \
--out-dir lib/html-language-server/node/
npx babel ${extensions}/json-language-features/server/dist/node \
--out-dir lib/json-language-server/node/
cp -r ${vscode-extensions.dbaeumer.vscode-eslint}/share/vscode/extensions/dbaeumer.vscode-eslint/server/out \
lib/eslint-language-server
'';
server="eslint-language-features/server/out/eslintServer.js"
install -Dm644 "${vscode-extensions.dbaeumer.vscode-eslint}/share/vscode/extensions/dbaeumer.vscode-eslint/server/out/eslintServer.js" \
"$out/lib/extensions/$server"
makeBinaryWrapper ${lib.getExe nodejs-slim} "$out/bin/vscode-eslint-language-server" \
--add-flag "$out/lib/extensions/$server"
# Use VSCodium bundled TypeScript
mkdir -p "$out/lib/extensions/node_modules"
cp -a node_modules/typescript "$out/lib/extensions/node_modules/typescript"
runHook postInstall
'';
passthru.tests.initialization =
runCommandLocal "vscode-langservers-extracted-initialization"
{
nativeBuildInputs = [ finalAttrs.finalPackage ];
}
''
request() {
init_request='{"jsonrpc":"2.0","id":1,"method":"initialize","params":{"processId":null,"rootUri":null,"capabilities":{}}}'
content_length=''${#init_request}
printf "Content-Length: %d\r\n\r\n%s" "$content_length" "$init_request"
sleep 1
}
for language in css html json eslint; do
echo "Checking $language language server"
response=$(request | timeout 3 "vscode-$language-language-server" --stdio) || true
grep -q '"capabilities"' <<< "$response"
done
touch $out
'';
meta = {
inherit (vscodium.meta) license platforms;
description = "HTML/CSS/JSON/ESLint language servers extracted from vscode";
homepage = "https://github.com/hrsh7th/vscode-langservers-extracted";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ lord-valen ];
};
}
})
pkgs/by-name/xe/xenia-canary/package.nix
+3 -3
View File
@@ -33,14 +33,14 @@ let
in
llvmPackages_20.stdenv.mkDerivation {
pname = "xenia-canary";
version = "0-unstable-2026-06-14";
version = "0-unstable-2026-06-22";
src = fetchFromGitHub {
owner = "xenia-canary";
repo = "xenia-canary";
fetchSubmodules = true;
rev = "72ce1309715b30d07035c8511dffc13c0b92a2d9";
hash = "sha256-FDQ+Eil5gETX1tK/BpqhDanhnNdFkcVbIhAHUTNM8PU=";
rev = "9c8e34b29e276320a319a0a46f7713de60efa50c";
hash = "sha256-56WAS3woSzqNQf1GJNLLvHYdLhb5JWykJ1h+6yZmKOY=";
};
dontConfigure = true;
pkgs/development/python-modules/aiosmtplib/default.nix
+2 -2
View File
@@ -12,14 +12,14 @@
buildPythonPackage (finalAttrs: {
pname = "aiosmtplib";
version = "5.1.1";
version = "5.1.2";
pyproject = true;
src = fetchFromGitHub {
owner = "cole";
repo = "aiosmtplib";
tag = "v${finalAttrs.version}";
hash = "sha256-noVyN9toeOAGQeu0AwSBeEmU/y2MpDlVn8naN0I3zfM=";
hash = "sha256-IAWMs4LBfVDMLxgPBnXrHQQ/8yhBYjvd4Fi4k0F19o0=";
};
build-system = [ hatchling ];
pkgs/development/python-modules/arelle/default.nix
+3 -3
View File
@@ -52,14 +52,14 @@
buildPythonPackage (finalAttrs: {
pname = "arelle${lib.optionalString (!gui) "-headless"}";
version = "2.38.7";
version = "2.39.10";
pyproject = true;
src = fetchFromGitHub {
owner = "Arelle";
repo = "Arelle";
tag = finalAttrs.version;
hash = "sha256-9ARMEXqoiBuAnj8hRrA1PqArmTMmRMP1BwASekOTQoc=";
hash = "sha256-oMZZCmZyUfCP3qe3FMHmR9IbmtDcKLS5NHmnWQJ8TZQ=";
};
outputs = [
@@ -69,7 +69,7 @@ buildPythonPackage (finalAttrs: {
postPatch = ''
substituteInPlace pyproject.toml --replace-fail \
'requires = ["setuptools>=80.9,<81", "wheel>=0.45,<1", "setuptools_scm[toml]>=9.2,<10"]' \
'requires = ["setuptools>=82,<83", "wheel>=0.46,<0.47", "setuptools_scm>=10.0,<11.0"]' \
'requires = ["setuptools", "wheel", "setuptools_scm[toml]"]'
'';
pkgs/development/python-modules/blastdns/default.nix
+84
View File
@@ -0,0 +1,84 @@
{
lib,
buildPythonPackage,
cargo,
fetchFromGitHub,
nix-update-script,
orjson,
pydantic,
pytest-asyncio,
pytestCheckHook,
rustc,
rustPlatform,
}:
buildPythonPackage (finalAttrs: {
pname = "blastdns";
version = "1.9.1-unstable-2026-04-15";
pyproject = true;
__structuredAttrs = true;
__darwinAllowLocalNetworking = true;
src = fetchFromGitHub {
owner = "blacklanternsecurity";
repo = "blastdns";
rev = "a35704b0ec2f6d800da8f85505bfff1893172869";
hash = "sha256-N0IbnKz/JdZogJhRHMNaZhhMt2LM9Vhs1ETLqeksE2k=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) pname version src;
hash = "sha256-wBC/T/XUSfxurujQy/B8zXxZthpUWczKT9qdnG4BK7w=";
};
build-system = [
cargo
rustPlatform.cargoSetupHook
rustPlatform.maturinBuildHook
rustc
];
dependencies = [
orjson
pydantic
];
nativeCheckInputs = [
pytest-asyncio
pytestCheckHook
];
# Run tests outside the source package path so imports resolve to the
# installed wheel, which contains the compiled _native extension.
preCheck = ''
cd "$TMPDIR"
cp -r /build/source/blastdns/tests ./tests
'';
pytestFlags = [
"--import-mode=importlib"
"tests"
];
disabledTests = [
# Tests requires host system DNS config files that are absent in sandboxed builds.
"test_get_system_resolvers"
"test_client_resolve"
"test_mock_matches_real_client"
"test_zone_transfer_success"
"test_zone_transfer_nonexistent_zone"
];
pythonImportsCheck = [ "blastdns" ];
passthru.updateScript = nix-update-script { };
meta = {
description = "Ultra-fast DNS resolver";
homepage = "https://github.com/blacklanternsecurity/blastdns";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ fab ];
};
})
pkgs/development/python-modules/boto3-stubs/default.nix
+2 -2
View File
@@ -358,13 +358,13 @@
buildPythonPackage (finalAttrs: {
pname = "boto3-stubs";
version = "1.43.34";
version = "1.43.36";
pyproject = true;
src = fetchPypi {
pname = "boto3_stubs";
inherit (finalAttrs) version;
hash = "sha256-K2WABl4eFFaH/VdvFbz1o5lhnI1RIXacilnHhMLdIqw=";
hash = "sha256-Nb3O8PPltrsfH25hq4E/3eDXOVCFEkULbqElCbUWzcs=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/claude-agent-sdk/default.nix
+2 -2
View File
@@ -14,14 +14,14 @@
buildPythonPackage (finalAttrs: {
pname = "claude-agent-sdk";
version = "0.2.105";
version = "0.2.107";
pyproject = true;
src = fetchFromGitHub {
owner = "anthropics";
repo = "claude-agent-sdk-python";
tag = "v${finalAttrs.version}";
hash = "sha256-CkY3mJp8vUgB1SR+vg9S/r3pIGvgppmgll3wre4bd00=";
hash = "sha256-+VlVdc2LoGNwawfbZT+gBdj9nEbOcsFJYStX+jmJfR0=";
};
build-system = [ hatchling ];
pkgs/development/python-modules/cloudcheck/default.nix
+49 -23
View File
@@ -2,56 +2,82 @@
lib,
buildPythonPackage,
fetchFromGitHub,
httpx,
poetry-core,
poetry-dynamic-versioning,
fetchurl,
openssl,
perl,
pkg-config,
pydantic,
pytest-asyncio,
pytestCheckHook,
radixtarget,
regex,
requests,
rustPlatform,
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "cloudcheck";
version = "7.2.11";
version = "11.0.0";
pyproject = true;
src = fetchFromGitHub {
owner = "blacklanternsecurity";
repo = "cloudcheck";
tag = "v${version}";
hash = "sha256-z2KJ6EaqQLc2oQBZCfKMejPlTdgYGzmDPm/rGLHXCQA=";
tag = "v${finalAttrs.version}";
hash = "sha256-ao5NSGu2QOPn0P/51vjIu71IlhTWd1h4q9q++B+p4Po=";
};
pythonRelaxDeps = [
"radixtarget"
"regex"
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) pname version src;
hash = "sha256-8uMyBhD8dybSFS4KqFHBfamyTdFYawoM0P4R6WAy10E=";
};
nativeBuildInputs = with rustPlatform; [
cargoSetupHook
maturinBuildHook
perl
pkg-config
];
build-system = [
poetry-core
poetry-dynamic-versioning
];
env.SWAGGER_UI_DOWNLOAD_URL =
let
swaggerUi = fetchurl {
url = "https://github.com/swagger-api/swagger-ui/archive/refs/tags/v5.17.14.zip";
hash = "sha256-SBJE0IEgl7Efuu73n3HZQrFxYX+cn5UU5jrL4T5xzNw=";
};
in
"file://${swaggerUi}";
dependencies = [
httpx
pydantic
radixtarget
regex
];
buildInputs = [ openssl ];
nativeCheckInputs = [
pydantic
pytest-asyncio
pytestCheckHook
requests
];
pythonImportsCheck = [ "cloudcheck" ];
disabledTestPaths = [
# Test requires network access
"cloudcheck_update/test_cloudcheck_update.py"
];
disabledTests = [
# Tests require network access
"test_lookup_google_dns"
"test_lookup_amazon_domain"
"test_lookup_endpoint"
];
preCheck = ''
rm -rf cloudcheck
'';
meta = {
description = "Module to check whether an IP address or hostname belongs to popular cloud providers";
homepage = "https://github.com/blacklanternsecurity/cloudcheck";
changelog = "https://github.com/blacklanternsecurity/cloudcheck/releases/tag/${finalAttrs.src.tag}";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ fab ];
};
}
})
pkgs/development/python-modules/coloraide/default.nix
+2 -2
View File
@@ -7,7 +7,7 @@
typing-extensions,
}:
let
version = "7.0";
version = "8.8.1";
in
buildPythonPackage {
pname = "coloraide";
@@ -18,7 +18,7 @@ buildPythonPackage {
owner = "facelessuser";
repo = "coloraide";
tag = version;
hash = "sha256-RjccFdsI7VAVieyVR2XbMTuG2SgPGCLzxjPrJ5G7tIo=";
hash = "sha256-a6FAMtvJMKkMfJVNjlxb7ayIPVZwsGYktO9bkRJjmL4=";
};
build-system = [
pkgs/development/python-modules/fastapi-sso/default.nix
+2 -2
View File
@@ -17,14 +17,14 @@
buildPythonPackage (finalAttrs: {
pname = "fastapi-sso";
version = "0.21.0";
version = "0.21.1";
pyproject = true;
src = fetchFromGitHub {
owner = "tomasvotava";
repo = "fastapi-sso";
tag = finalAttrs.version;
hash = "sha256-5CtblFFKf1b7ja5zF6oTtdKvUdWR9cQypiK4XzMVA5s=";
hash = "sha256-/5YuHLDYLnVQc/34OdlRTCJAVL2z6MZV8stSV/tpte4=";
};
build-system = [ poetry-core ];
pkgs/development/python-modules/meilisearch/default.nix
+2 -2
View File
@@ -9,14 +9,14 @@
buildPythonPackage (finalAttrs: {
pname = "meilisearch";
version = "0.41.0";
version = "0.41.1";
pyproject = true;
src = fetchFromGitHub {
owner = "meilisearch";
repo = "meilisearch-python";
tag = "v${finalAttrs.version}";
hash = "sha256-05N77HOFmuy73my4ndq7yKJl4SD3OEX36heFsXNx358=";
hash = "sha256-E58LDNc7UkreBjWORsbEkErZlSb41g9OEBMdRyJ2kuM=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/mitogen/default.nix
+2 -2
View File
@@ -7,14 +7,14 @@
buildPythonPackage (finalAttrs: {
pname = "mitogen";
version = "0.3.49";
version = "0.3.50";
pyproject = true;
src = fetchFromGitHub {
owner = "mitogen-hq";
repo = "mitogen";
tag = "v${finalAttrs.version}";
hash = "sha256-gOb4W9EO5YRNoTJlsTTNybJF9FvDDTNdYFrGjyFbXzY=";
hash = "sha256-f6N9eGwhxa/Ls9NqTSqMh+zbLNBeFEUJXd9Km5aBGI8=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/mypy-boto3/default.nix
+18 -18
View File
@@ -399,8 +399,8 @@ in
"sha256-4VGCEZbno4w3H5+bc+2/f4ZkgefUDgWOOBkuGTVqvWk=";
mypy-boto3-directconnect =
buildMypyBoto3Package "directconnect" "1.43.31"
"sha256-DFq9baDdB2vDM7G4ifvBEim7Tztrq8MjyjK+xwCLNho=";
buildMypyBoto3Package "directconnect" "1.43.35"
"sha256-EaazNjN3MOBQLjSaLi01grlO9evVVu0ST5ZOf1dAk9M=";
mypy-boto3-discovery =
buildMypyBoto3Package "discovery" "1.43.0"
@@ -443,8 +443,8 @@ in
"sha256-dXNkOcMonYrBh4yzeubd+v3mW42s9XpmpfvgbtgoJgY=";
mypy-boto3-ec2 =
buildMypyBoto3Package "ec2" "1.43.33"
"sha256-35GbcIr6yNm8rfPoQ4v1a+R0AXrNKd/CiT/S0iJL1Ok=";
buildMypyBoto3Package "ec2" "1.43.35"
"sha256-AttG0LV1gmyRz0LlByDp0VIn19Mz3Y6UZdgVgMkFASs=";
mypy-boto3-ec2-instance-connect =
buildMypyBoto3Package "ec2-instance-connect" "1.43.0"
@@ -590,8 +590,8 @@ in
"sha256-+DDeD9YWo98meLZU2Mzu5AE0S7HFg6kfxeUWUh9XcQA=";
mypy-boto3-guardduty =
buildMypyBoto3Package "guardduty" "1.43.23"
"sha256-8lpdVOn5hPKmOTTCtEJiCv4bsWhX6NtEtx4cgsKMDp0=";
buildMypyBoto3Package "guardduty" "1.43.35"
"sha256-L0DBDIfXuZjJZRA63rZRukaXcPBHzt+H4AzeNc67xaw=";
mypy-boto3-health =
buildMypyBoto3Package "health" "1.43.0"
@@ -706,8 +706,8 @@ in
"sha256-9XMdnVsYUmz8Uf9kAgVMbG960vy0TOJturoD9/ZoM98=";
mypy-boto3-kafka =
buildMypyBoto3Package "kafka" "1.43.1"
"sha256-RJ7g5WeLvVe6AaiGwWVHewC3JnFw7cAqv+B8C9FQ/8E=";
buildMypyBoto3Package "kafka" "1.43.36"
"sha256-MUtSVAMTjMWokZVY8t6VLsGnqzp/M1yg50lGtV+irL8=";
mypy-boto3-kafkaconnect =
buildMypyBoto3Package "kafkaconnect" "1.43.0"
@@ -766,8 +766,8 @@ in
"sha256-gYTCgaRwH3zKi6gg4MC8DUwXQT+jZO6lqc/vi+JUahU=";
mypy-boto3-lambda =
buildMypyBoto3Package "lambda" "1.43.33"
"sha256-WrEHRzWcOLIolJk0tXpiqCbaYBRHED/fsyi8BSo9kpQ=";
buildMypyBoto3Package "lambda" "1.43.35"
"sha256-492yjIjUCSeK0eckq3svFns6ovCz0Oyk3VRXCymU0MY=";
mypy-boto3-lex-models =
buildMypyBoto3Package "lex-models" "1.43.3"
@@ -806,8 +806,8 @@ in
"sha256-EunrKwNaYp0CDiwp8frI7zASilMF4wYHjDSuCsJ6aJM=";
mypy-boto3-logs =
buildMypyBoto3Package "logs" "1.43.33"
"sha256-Acp5vySW/YPY11wzHKE1/s/K3fP+aIAed6GeQpd0Ru0=";
buildMypyBoto3Package "logs" "1.43.35"
"sha256-z43XDlXC123oIHrKLmEprJ3tfVXPDVg1wjLQJ9jM9WY=";
mypy-boto3-lookoutequipment =
buildMypyBoto3Package "lookoutequipment" "1.43.0"
@@ -854,8 +854,8 @@ in
"sha256-Ob9sh8Ng8I3sWiy/qwu+lfSvf+W2KQiprWX6QCNiSLM=";
mypy-boto3-mediaconnect =
buildMypyBoto3Package "mediaconnect" "1.43.13"
"sha256-4hBMy4j3GdSdq7MyeU8a1WHYrM0mb56OlqPeKkdbt7w=";
buildMypyBoto3Package "mediaconnect" "1.43.35"
"sha256-ZlvcxMsMtkPwzyBpxGWffcD2g73aNIU6WG7jYn66ZjU=";
mypy-boto3-mediaconvert =
buildMypyBoto3Package "mediaconvert" "1.43.24"
@@ -962,8 +962,8 @@ in
"sha256-BUl/wnJKR3TB1YsTCLrJdEoH9Lz8DZ6H94STOOX8gkQ=";
mypy-boto3-omics =
buildMypyBoto3Package "omics" "1.43.28"
"sha256-dlZYG0M6H1b3SyocmFc+HQYn9MX1fryNJo6cIu6paBA=";
buildMypyBoto3Package "omics" "1.43.35"
"sha256-1wQApBLsMnKRZ3lJZdd2W0+2Zz50QFdzYAhrOvEzByM=";
mypy-boto3-opensearch =
buildMypyBoto3Package "opensearch" "1.43.34"
@@ -1070,8 +1070,8 @@ in
"sha256-YrrEKl3aGz//5Z5JGapHhWtk6hBXQ4cuRQmLqGYztzg=";
mypy-boto3-quicksight =
buildMypyBoto3Package "quicksight" "1.43.24"
"sha256-9qBqNSVOR8W14XbzkN1pr6v3qWmgOIIPpBHC5SKXjls=";
buildMypyBoto3Package "quicksight" "1.43.35"
"sha256-47+AzLZ3ovvK0wLQ4xFoFkMocEjP1Kv44z+X1Ad4aYs=";
mypy-boto3-ram =
buildMypyBoto3Package "ram" "1.43.0"
pkgs/development/python-modules/ua-generator/default.nix
+2 -2
View File
@@ -13,7 +13,7 @@
buildPythonPackage (finalAttrs: {
pname = "ua-generator";
version = "2.1.1";
version = "2.1.2";
pyproject = true;
__structuredAttrs = true;
@@ -22,7 +22,7 @@ buildPythonPackage (finalAttrs: {
owner = "iamdual";
repo = "ua-generator";
tag = finalAttrs.version;
hash = "sha256-3NWVJciaaCx+YtZ+oFCMFLXfEE9A2CoErFfSi5Hf0hM=";
hash = "sha256-mpwyhR50a0F8J9VUyOoYNF20IbOKaDl+JpQ1qkLIt6s=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/wandb/default.nix
+2 -2
View File
@@ -77,12 +77,12 @@
}:
let
version = "0.27.2";
version = "0.28.0";
src = fetchFromGitHub {
owner = "wandb";
repo = "wandb";
tag = "v${version}";
hash = "sha256-guNepG8h8Pl8SaJqImS5UsWNFmPyrWidsXh+q9Es73I=";
hash = "sha256-YdM/LrrWQFup/1Fkv49//eOFfYFCRgpuuH7+DZIOT1M=";
};
wandb-xpu = rustPlatform.buildRustPackage {
pkgs/development/python-modules/wandb/hardcode-git-path.patch
+35 -4
View File
@@ -1,8 +1,39 @@
diff --git a/tests/unit_tests/test_wandb_settings.py b/tests/unit_tests/test_wandb_settings.py
index 4089d0719..694715290 100644
--- a/tests/unit_tests/test_wandb_settings.py
+++ b/tests/unit_tests/test_wandb_settings.py
@@ -698,7 +698,7 @@ def test_reports_invalid_system_settings(
def test_infer_git_root_finds_repo(tmp_path):
git_root = tmp_path / "repo"
git_root.mkdir()
- subprocess.run(["git", "init", str(git_root)], check=True, capture_output=True)
+ subprocess.run(["@git@", "init", str(git_root)], check=True, capture_output=True)
subdir = git_root / "subdir"
subdir.mkdir()
@@ -718,7 +718,7 @@ def test_infer_git_root_no_repo(tmp_path):
def test_infer_git_root_skips_if_already_set(tmp_path):
git_root = tmp_path / "repo"
git_root.mkdir()
- subprocess.run(["git", "init", str(git_root)], check=True, capture_output=True)
+ subprocess.run(["@git@", "init", str(git_root)], check=True, capture_output=True)
preset = "/some/other/path"
s = Settings(root_dir=str(git_root), git_root=preset)
@@ -730,7 +730,7 @@ def test_infer_git_root_skips_if_already_set(tmp_path):
def test_infer_git_root_skips_if_disable_git(tmp_path):
git_root = tmp_path / "repo"
git_root.mkdir()
- subprocess.run(["git", "init", str(git_root)], check=True, capture_output=True)
+ subprocess.run(["@git@", "init", str(git_root)], check=True, capture_output=True)
s = Settings(root_dir=str(git_root), disable_git=True)
s.infer_git_root()
diff --git a/wandb/cli/cli.py b/wandb/cli/cli.py
index 2623a3d75..ea78e52b8 100644
index 0ec7996cc..973b10643 100644
--- a/wandb/cli/cli.py
+++ b/wandb/cli/cli.py
@@ -3264,7 +3264,7 @@ def restore(ctx, run, no_git, branch, project, entity):
@@ -3265,7 +3265,7 @@ def restore(ctx, run, no_git, branch, project, entity):
commit, json_config, patch_content, metadata = api.run_config(
project, run=run, entity=entity
)
@@ -11,7 +42,7 @@ index 2623a3d75..ea78e52b8 100644
image = metadata.get("docker")
restore_message = f"""`wandb restore` needs to be run from the same git repository as the original run.
Run `git clone {repo}` and restore from there or pass the --no-git flag."""
@@ -3283,7 +3283,7 @@ Run `git clone {repo}` and restore from there or pass the --no-git flag."""
@@ -3284,7 +3284,7 @@ Run `git clone {repo}` and restore from there or pass the --no-git flag."""
if commit and git.enabled:
wandb.termlog(f"Fetching origin and finding commit: {commit}")
@@ -20,7 +51,7 @@ index 2623a3d75..ea78e52b8 100644
try:
git.repo.commit(commit)
except ValueError:
@@ -3336,7 +3336,7 @@ Run `git clone {repo}` and restore from there or pass the --no-git flag."""
@@ -3337,7 +3337,7 @@ Run `git clone {repo}` and restore from there or pass the --no-git flag."""
# --reject is necessary or else this fails any time a binary file
# occurs in the diff
exit_code = subprocess.call(
pkgs/development/python-modules/xarray/default.nix
+8 -1
View File
@@ -7,7 +7,7 @@
setuptools,
setuptools-scm,
# dependenices
# dependencies
numpy,
packaging,
pandas,
@@ -32,6 +32,7 @@
# tests
pytest-asyncio,
pytest-xdist,
pytestCheckHook,
h5py,
}:
@@ -98,8 +99,14 @@ buildPythonPackage (finalAttrs: {
accel ++ io ++ etc ++ parallel ++ viz;
};
preCheck = ''
# tests become flaky with to many cores
export NIX_BUILD_CORES=$((NIX_BUILD_CORES > 8 ? 8 : NIX_BUILD_CORES))
'';
nativeCheckInputs = [
pytest-asyncio
pytest-xdist
pytestCheckHook
]
# Besides scipy, these are not strictly needed for the tests, but adding all
pkgs/servers/sql/mariadb/default.nix
+22 -10
View File
@@ -359,8 +359,20 @@ let
+ lib.optionalString withStorageMroonga ''
mv "$out"/share/{groonga,groonga-normalizer-mysql} "$out"/share/doc/mysql
''
+ lib.optionalString (!stdenv.hostPlatform.isDarwin && lib.versionAtLeast common.version "10.4") ''
mv "$out"/OFF/suite/plugins/pam/pam_mariadb_mtr.so "$out"/share/pam/lib/security
+
lib.optionalString
(
!stdenv.hostPlatform.isDarwin
&& lib.versionAtLeast common.version "10.6"
&& lib.versionOlder common.version "10.11"
)
''
mv "$out"/OFF/suite/plugins/pam/pam_mariadb_mtr.so "$out"/share/pam/lib/security
''
+ lib.optionalString (!stdenv.hostPlatform.isDarwin && lib.versionAtLeast common.version "10.11") ''
mv "$out"/lib/mysql/plugin/test_pam_modules/pam_mariadb_mtr.so "$out"/share/pam/lib/security
''
+ lib.optionalString (!stdenv.hostPlatform.isDarwin && lib.versionAtLeast common.version "10.6") ''
mv "$out"/OFF/suite/plugins/pam/mariadb_mtr "$out"/share/pam/etc/security
rm -r "$out"/OFF
'';
@@ -382,22 +394,22 @@ self: {
# see https://mariadb.org/about/#maintenance-policy for EOLs
mariadb_106 = self.callPackage generic {
# Supported until 2026-07-06
version = "10.6.24";
hash = "sha256-SeK63GdFcMhg48t6LAFhJKpmKMlfMBMwMEEeXImqFy8=";
version = "10.6.27";
hash = "sha256-jrdq07Gz0UxWYRzMkQQoFB/lYWAEOBnmR0FgOF9pZl4=";
};
mariadb_1011 = self.callPackage generic {
# Supported until 2028-02-16
version = "10.11.15";
hash = "sha256-UxHoV2VAK95agamnsmQ6c3jSAxaigiv61LbdzxBHWaU=";
version = "10.11.18";
hash = "sha256-pGhSxoB1vnwxx7M/7iM8W1oAyMKBF/UgTRJOTy/Vb6g=";
};
mariadb_114 = self.callPackage generic {
# Supported until 2029-05-29
version = "11.4.9";
hash = "sha256-jkgcoptadARE1FRRyOotk3Ec9SXW+l0nvJUSz4lzsHU=";
version = "11.4.12";
hash = "sha256-WreIPbUZv86/3SqsCbxVRKEs4yjznt1G0L8BaQYV72w=";
};
mariadb_118 = self.callPackage generic {
# Supported until 2028-06-04
version = "11.8.5";
hash = "sha256-vLc5RWnAiHfCg+FkmGlQRTG+6MqvowKI8HjjDZn8ufY=";
version = "11.8.8";
hash = "sha256-vQI6SVn68BLbfw6/wNJ2cp5n5UQ98ZMWP5jYD9/FJMk=";
};
}
pkgs/top-level/python-packages.nix
+2
View File
@@ -2144,6 +2144,8 @@ self: super: with self; {
blake3 = callPackage ../development/python-modules/blake3 { };
blastdns = callPackage ../development/python-modules/blastdns { };
blasthttp = callPackage ../development/python-modules/blasthttp { };
ble-serial = callPackage ../development/python-modules/ble-serial { };