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-03-10 18:18:12 +00:00
committed by GitHub
parent 9616517962 ed6c38bce3
commit fd9ba5340d
61 changed files with 1785 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/release-notes/rl-2605.section.md
+2
View File
@@ -244,6 +244,8 @@
- We now use the upstream wrapper script for Gradle, supporting both the `JAVA_HOME` and `GRADLE_OPTS` environment variables.
- the `autossh-ng` NixOS module was introduced as a simpler alternative to the existing `autossh` module.
- `gnuradio`: Overriding the `.pkgs` package set is now possible with a `packageOverrides` function, like with `python.pkgs` and other language-specific package sets.
Example:
maintainers/maintainer-list.nix
+12
View File
@@ -341,6 +341,12 @@
githubId = 65275785;
name = "Alexander Kenji Berthold";
};
a-peirogon = {
email = "ainfanthe@gmail.com";
github = "a-peirogon";
githubId = 105471058;
name = "Andrés D'Infante";
};
A1ca7raz = {
email = "aya@wtm.moe";
github = "A1ca7raz";
@@ -12187,6 +12193,12 @@
github = "jdupak";
githubId = 22683640;
};
jeafleohj = {
name = "Jhony Elmer Angulo Fabian";
email = "jhonyangulof+nixpkgs@gmail.com";
github = "jeafleohj";
githubId = 26931381;
};
jeancaspar = {
name = "Jean Caspar";
github = "JeanCASPAR";
nixos/modules/module-list.nix
+1
View File
@@ -1119,6 +1119,7 @@
./services/networking/atalkd.nix
./services/networking/atftpd.nix
./services/networking/atticd.nix
./services/networking/autossh-ng.nix
./services/networking/autossh.nix
./services/networking/avahi-daemon.nix
./services/networking/ax25/axlisten.nix
nixos/modules/services/networking/autossh-ng.nix
+135
View File
@@ -0,0 +1,135 @@
{
config,
lib,
pkgs,
...
}:
let
cfg = config.services.autossh-ng;
in
{
###### interface
options = {
services.autossh-ng = {
sessions = lib.mkOption {
type = lib.types.attrsOf (
lib.types.submodule (
{ name, config, ... }:
{
options = {
user = lib.mkOption {
type = lib.types.str;
example = "bill";
description = "Name of the user the local session should run as";
};
destination = lib.mkOption {
type = lib.types.str;
example = "billremote@socks.host.net";
description = "Destination to connect to";
};
hostKeyChecking = lib.mkOption {
type = lib.types.bool;
description = ''
Whether to enable host key checking. The advantage of enabling
host key checking is that it protects against AitM attacks, on
the other hand disabling host key checking makes the autossh
connection resilient against host key rotations of the destination
machine.
'';
};
knownHostsFile = lib.mkOption {
type = lib.types.path;
example = "/home/bill/.ssh/known_hosts";
description = ''
If you enabled host key checking, use this file to verify
destination host keys against.
'';
};
extraArguments = lib.mkOption {
type = lib.types.separatedString " ";
example = "-L2222:localhost:22 -i \${config.age.secrets.privatekey.path}";
description = ''
Arguments to be passed to the ssh process process.
Some meaningful options include
-D (open SOCKS proxy on local port),
-R (forward remote port),
-L (forward local port),
-v (Enable debug),
-i (identity file to use).
Check ssh manual for the complete list.
'';
};
};
}
)
);
default = { };
description = ''
Set of SSH sessions to start as systemd services. Each service is
named 'autossh-ng-{session.name}'.
'';
example = {
"socket-peer" = {
user = "bill";
destination = "billremote@socks.host.net";
extraArguments = "-L2222:localhost:22 -i \${config.age.secrets.privatekey.path}";
};
};
};
};
};
###### implementation
config = lib.mkIf (cfg.sessions != { }) {
systemd.services =
lib.attrsets.mapAttrs' (name: s: {
name = "autossh-ng-${name}";
value = {
description = "Automatic SSH session (" + name + ")";
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
serviceConfig = {
User = "${s.user}";
# backoff would be nice, but doesn't automatically
# get reset on successful start yet, so static 10s restart for now:
Restart = "always";
RestartSec = "10s";
ExecStart =
let
hostKeyCheckOption =
if s.hostKeyChecking then
"-o \"UserKnownHostsFile=${s.knownHostsFile}\""
else
"-o \"UserKnownHostsFile=/dev/null\" -o \"StrictHostKeyChecking=no\"";
in
''
${pkgs.openssh}/bin/ssh \
-o "ServerAliveInterval 30" \
-o "ServerAliveCountMax 3" \
-o ExitOnForwardFailure=yes \
${hostKeyCheckOption} \
-N \
${s.extraArguments} \
${s.destination}
'';
};
};
}) cfg.sessions;
};
}
nixos/tests/nixos-rebuild-target-host-interrupted.nix
+9 -14
View File
@@ -100,17 +100,12 @@
nix.settings.trusted-users = [ "@wheel" ];
systemd.services."autossh-ng" = {
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
serviceConfig = {
User = "root";
Restart = "always";
RestartSec = "10s";
ExecStart = "${pkgs.openssh}/bin/ssh -o \"ServerAliveInterval 30\" -o \"ServerAliveCountMax 3\" -o ExitOnForwardFailure=yes -N -R2222:localhost:22 deployer";
};
services.autossh-ng.sessions.will-be-interrupted-by-rebuild = {
user = "root";
destination = "deployer";
extraArguments = "-R2222:localhost:22";
hostKeyChecking = false;
};
};
in
{
@@ -167,6 +162,8 @@
};
# needed to make NIX_SSHOPTS work for nix-copy-closure
# 2.31.3 (current default) break, 2.32.6 and 2.33.3 (current latest) work
# let's use the default here again once the fix has made it there.
nix.package = pkgs.nixVersions.latest;
# We're changing the '-E' parameter to the new hostname here,
@@ -174,8 +171,7 @@
# force the scenario where the connection is broken during the
# deployment (because the autossh-ng service is stopped and
# started):
systemd.services."autossh-ng".serviceConfig.ExecStart =
lib.mkForce "''${pkgs.openssh}/bin/ssh -o \"ServerAliveInterval 30\" -o \"ServerAliveCountMax 3\" -o ExitOnForwardFailure=yes -N -R2222:localhost:22 -E ${hostname} deployer";
services.autossh-ng.sessions.will-be-interrupted-by-rebuild.extraArguments = "-R2222:localhost:22 -E ${hostname}";
# this will be asserted to validate the switch happened:
networking.hostName = "${hostname}";
@@ -193,9 +189,8 @@
target.succeed("nixos-generate-config")
target.succeed("install -Dm 600 ${nodes.target.system.build.privateKey} ~root/.ssh/id_ecdsa")
target.succeed("install ${sshConfig} ~root/.ssh/config")
deployer.succeed("scp alice@target:/etc/nixos/hardware-configuration.nix /root/hardware-configuration.nix")
target.wait_for_unit("autossh-ng.service")
target.wait_for_unit("autossh-ng-will-be-interrupted-by-rebuild.service")
deployer.copy_from_host("${configFile "config-1-deployed"}", "/root/configuration-1.nix")
deployer.copy_from_host("${configFile "config-2-deployed"}", "/root/configuration-2.nix")
pkgs/applications/networking/p2p/deluge/default.nix
+1
View File
@@ -106,6 +106,7 @@ let
description = "Torrent client";
homepage = "https://deluge-torrent.org";
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ a-peirogon ];
platforms = lib.platforms.all;
};
};
pkgs/by-name/al/alpaca/package.nix
+2 -2
View File
@@ -33,14 +33,14 @@ let
in
pythonPackages.buildPythonApplication rec {
pname = "alpaca";
version = "9.2.0";
version = "9.2.1";
pyproject = false; # Built with meson
src = fetchFromGitHub {
owner = "Jeffser";
repo = "Alpaca";
tag = version;
hash = "sha256-/FpeizUrO7WSfcOfBkM0IIdu0rc7UvLXXP2y/tunxeo=";
hash = "sha256-deTn3Q2cy56Qj00dYp2QrCHif+Pk3t110HRTnie9/b8=";
};
postPatch = ''
pkgs/by-name/bu/buildbox/package.nix
+2 -2
View File
@@ -23,13 +23,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "buildbox";
version = "1.3.53";
version = "1.3.54";
src = fetchFromGitLab {
owner = "BuildGrid";
repo = "buildbox/buildbox";
tag = finalAttrs.version;
hash = "sha256-G4K6KxKAG+BgWtuG7HOxpRr+oa8SJ435zF0wbZCLXTk=";
hash = "sha256-5IJHXgDeedh0FMxupokB0BRo0ZrchEo/Lba6ifeeFBg=";
};
nativeBuildInputs = [
pkgs/by-name/co/codex/package.nix
+22 -4
View File
@@ -4,9 +4,11 @@
rustPlatform,
fetchFromGitHub,
installShellFiles,
cargo,
clang,
cmake,
gitMinimal,
libcap,
libclang,
makeBinaryWrapper,
nix-update-script,
@@ -18,18 +20,30 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "codex";
version = "0.92.0";
version = "0.111.0";
src = fetchFromGitHub {
owner = "openai";
repo = "codex";
tag = "rust-v${finalAttrs.version}";
hash = "sha256-m/g+5wdehyaHDw6i5vik4HXiisY/iWFtPX0gKjCFPNY=";
hash = "sha256-hdR70BhiMg9G/ibLCeHnRSY3PcGZDv0vnqBCbzSRD6I=";
};
sourceRoot = "${finalAttrs.src.name}/codex-rs";
cargoHash = "sha256-fuT8vPb9/7fZam129nR6y+r+3j46WBhlf73Htkcjpzc=";
# TODO: Drop workaround once PR #486983 reaches master.
depsExtraArgs = {
nativeBuildInputs = [ cargo ];
postBuild = ''
# delete all Cargo.toml files for which `cargo metadata` fails
shopt -s globstar
for manifest_path in "$out"/**/Cargo.toml; do
cargo metadata --format-version 1 --no-deps --manifest-path "$manifest_path" >/dev/null || rm -v "$manifest_path"
done
'';
};
cargoHash = "sha256-Ym2fB9IWQzYdgOX3hiBd9XUI00xF4cIoKO2jpal4eUA=";
nativeBuildInputs = [
clang
@@ -43,6 +57,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
buildInputs = [
libclang
openssl
]
++ lib.optionals stdenv.hostPlatform.isLinux [
libcap
];
# NOTE: set LIBCLANG_PATH so bindgen can locate libclang, and adjust
@@ -99,8 +116,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
license = lib.licenses.asl20;
mainProgram = "codex";
maintainers = with lib.maintainers; [
malo
delafthi
jeafleohj
malo
];
platforms = lib.platforms.unix;
};
pkgs/by-name/cu/curv/package.nix
+3 -3
View File
@@ -27,13 +27,13 @@
stdenv.mkDerivation {
pname = "curv";
version = "0.5-unstable-2026-01-30";
version = "0.5-unstable-2026-02-26";
src = fetchFromCodeberg {
owner = "doug-moen";
repo = "curv";
rev = "6a157d444e1d50628af6bb36b6c29bd4681451d5";
hash = "sha256-y9cfJYhgQrrerU6r7DYHABkw4LQGqcaagVEbSK7AkOg=";
rev = "bf573da133f94efacc6a42c9dc94666bfbfab6bc";
hash = "sha256-5tcF0vEvxd/SgNWM7lgZTujBsIF+v8t0I0g4tykBCPY=";
fetchSubmodules = true;
};
pkgs/by-name/da/dasel/package.nix
+6 -16
View File
@@ -3,43 +3,33 @@
stdenv,
buildGoModule,
fetchFromGitHub,
installShellFiles,
}:
buildGoModule (finalAttrs: {
pname = "dasel";
version = "2.8.1";
version = "3.3.0";
src = fetchFromGitHub {
owner = "TomWright";
repo = "dasel";
rev = "v${finalAttrs.version}";
hash = "sha256-vq4lRCsqD2hmQw0yH84Wji5LeJ/aiMGJJIyCDvATA+I=";
hash = "sha256-3gLOAca5C4HfLqmF+1c1fDytA58JNml+18FYsWUhIQ0=";
};
vendorHash = "sha256-edyFs5oURklkqsTF7JA1in3XteSBx/6YEVu4MjIcGN4=";
vendorHash = "sha256-hHxEE0xNSP4wnT5B13BAxUPpdIWs8v7KF1MuISfaYBE=";
ldflags = [
"-s"
"-w"
"-X github.com/tomwright/dasel/v2/internal.Version=${finalAttrs.version}"
"-X github.com/tomwright/dasel/v3/internal.Version=v${finalAttrs.version}"
];
nativeBuildInputs = [ installShellFiles ];
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd dasel \
--bash <($out/bin/dasel completion bash) \
--fish <($out/bin/dasel completion fish) \
--zsh <($out/bin/dasel completion zsh)
'';
doInstallCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
installCheckPhase = ''
runHook preInstallCheck
if [[ $($out/bin/dasel --version) == "dasel version ${finalAttrs.version}" ]]; then
if [[ $($out/bin/dasel version) == "v${finalAttrs.version}" ]]; then
echo '{ "my": { "favourites": { "colour": "blue" } } }' \
| $out/bin/dasel put -t json -r json -t string -v "red" "my.favourites.colour" \
| $out/bin/dasel -i json 'my.favourites.colour = "red"' \
| grep "red"
else
return 1
pkgs/by-name/fa/facter/Gemfile
+2
View File
@@ -3,3 +3,5 @@
source "https://rubygems.org"
gem "facter"
gem "base64", "~> 0.2.0"
pkgs/by-name/fa/facter/Gemfile.lock
+3 -1
View File
@@ -1,6 +1,7 @@
GEM
remote: https://rubygems.org/
specs:
base64 (0.2.0)
facter (4.10.0)
hocon (~> 1.3)
thor (>= 1.0.1, < 1.3)
@@ -11,7 +12,8 @@ PLATFORMS
ruby
DEPENDENCIES
base64 (~> 0.2.0)
facter
BUNDLED WITH
2.5.16
2.6.6
pkgs/by-name/fa/facter/gemset.nix
+10
View File
@@ -1,4 +1,14 @@
{
base64 = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g";
type = "gem";
};
version = "0.2.0";
};
facter = {
dependencies = [
"hocon"
pkgs/by-name/ga/gallery-dl/package.nix
+2 -2
View File
@@ -8,14 +8,14 @@
python3Packages.buildPythonApplication (finalAttrs: {
pname = "gallery-dl";
version = "1.31.6";
version = "1.31.9";
pyproject = true;
src = fetchFromGitHub {
owner = "mikf";
repo = "gallery-dl";
tag = "v${finalAttrs.version}";
hash = "sha256-6Fh32XAPwSI95dqjyFp65DMSSdCZzGuymB3QhlFoKs8=";
hash = "sha256-Dq4SSj78CEZ4hq3jCgzcJK/+KPgn7h52HMfFNDQXQPY=";
};
build-system = [ python3Packages.setuptools ];
pkgs/by-name/ga/gatekeeper/package.nix
+3 -3
View File
@@ -8,16 +8,16 @@
buildGoModule (finalAttrs: {
pname = "gatekeeper";
version = "3.21.1";
version = "3.22.0";
src = fetchFromGitHub {
owner = "open-policy-agent";
repo = "gatekeeper";
tag = "v${finalAttrs.version}";
hash = "sha256-KzddaF334jhrIyJlfU2iTGBi+Oi67PK2dkIBkHk8oLY=";
hash = "sha256-ARgrazsIx3w9BLqI9kWV794ojvZgIdNMGsjAXs19u1g=";
};
vendorHash = null;
vendorHash = "sha256-2mnUYuxQ6wXOpK/V+8KpF0f5bkYRBgqJEl1bKOLTHNE=";
nativeBuildInputs = [
installShellFiles
pkgs/by-name/go/golangci-lint/package.nix
+3 -3
View File
@@ -14,16 +14,16 @@
buildGo126Module (finalAttrs: {
pname = "golangci-lint";
version = "2.11.2";
version = "2.11.3";
src = fetchFromGitHub {
owner = "golangci";
repo = "golangci-lint";
tag = "v${finalAttrs.version}";
hash = "sha256-PyX0uD5gaj/n9kTvJ1PEwcMAlCGd6Zeurbkm4IB9sY8=";
hash = "sha256-VD46VOSBzVeeJ86FYLEPTsy23MUQapDPPYiO3/Ki8Mw=";
};
vendorHash = "sha256-RTdHfQRg/MLt+VJ4mcbOui6L7T4c1kFT66ROnjs6nKU=";
vendorHash = "sha256-k/lsDC6thW3B1zcn+OXjSmwmiW8pm0HM+g/z+N3AQek=";
subPackages = [ "cmd/golangci-lint" ];
pkgs/by-name/ka/kahip/package.nix
+2 -2
View File
@@ -12,13 +12,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "kahip";
version = "3.22";
version = "3.23";
src = fetchFromGitHub {
owner = "KaHIP";
repo = "KaHIP";
tag = "v${finalAttrs.version}";
hash = "sha256-uZRNATfrQgAn5Wsmpk9tU0ojXHbLJ8DOOuXRJJhkhFM=";
hash = "sha256-glT8UDk934N4Qb7ip57yGGTudhyfpU2Hz1mptZeBhmI=";
};
nativeBuildInputs = [
pkgs/by-name/li/lix-diff/package.nix
+3 -3
View File
@@ -6,16 +6,16 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "lix-diff";
version = "1.2.0";
version = "1.4.1";
src = fetchFromGitHub {
owner = "tgirlcloud";
repo = "lix-diff";
tag = "v${finalAttrs.version}";
hash = "sha256-ehASke8ZpvHkQI9bCV3/9i1QG67hjSIMoIMQDlbODxU=";
hash = "sha256-aLmCS+Q6B/DU6DZ0U/FfCOovwZTSTAG5vrCGHZ1Xsrk=";
};
cargoHash = "sha256-ghwCwIg0PDfUfiHnwiUy8kNjPEgVWk92zA5ZnlD8BO8=";
cargoHash = "sha256-g50St9tX2IYaPmnjSE8AeSKqUF5Ou87Y5F0zVBK3Xxo=";
passthru.updateScript = nix-update-script { };
pkgs/by-name/ml/mlucas/package.nix
+76
View File
@@ -0,0 +1,76 @@
{
lib,
stdenv,
fetchFromGitHub,
gmp,
versionCheckHook,
}:
let
platform = if stdenv.hostPlatform.system == "aarch64-linux" then "asimd" else "avx2";
in
stdenv.mkDerivation (finalAttrs: {
pname = "mlucas";
# A specific git commit is used because there are no official GitHub releases.
version = "21.0.2";
src = fetchFromGitHub {
owner = "primesearch";
repo = "Mlucas";
rev = "d082c2a00b42410d6d87605212c68be25f9f4d7d";
hash = "sha256-YD2Kt8SD5sxZH8Em8jDZ1qSfIhgLUklOdkORmVR588o=";
};
enableParallelBuilding = true;
buildInputs = [
gmp
];
postPatch = ''
chmod +x makemake.sh
patchShebangs makemake.sh
'';
env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
buildPhase = ''
runHook preBuild
./makemake.sh ${platform}
runHook postBuild
'';
installPhase = ''
runHook preInstall
install -Dm755 obj_${platform}/Mlucas $out/bin/mlucas
runHook postInstall
'';
nativeInstallCheckInputs = [ versionCheckHook ];
doInstallCheck = true;
meta = {
description = "Open-source program for primality testing of Mersenne numbers";
longDescription = ''
This program may be used to test any suitable number as you wish, but it is preferable that you do so in a coordinated fashion,
as part of the Great Internet Mersenne Prime Search (GIMPS). Note that on x86 processors Mlucas is not as efficient
as the main GIMPS client, George Woltman's Prime95 program (a.k.a. mprime for the linux version),
but that program is not 100% open-source. Prime95 is also only available for platforms based on the
x86 processor architecture. The help.txt file in the Github repo includes a variety of usage information
not covered in the original README.
'';
homepage = "https://github.com/primesearch/Mlucas";
maintainers = with lib.maintainers; [ dstremur ];
license = lib.licenses.gpl3Only;
platforms = [
"x86_64-linux"
"aarch64-linux"
];
mainProgram = "mlucas";
};
})
pkgs/by-name/ng/ngn-k/package.nix
+5 -7
View File
@@ -7,13 +7,13 @@
stdenv.mkDerivation {
pname = "ngn-k";
version = "0-unstable-2025-01-04";
version = "0-unstable-2025-11-17";
src = fetchFromCodeberg {
owner = "ngn";
repo = "k";
rev = "feb51a61443dac03213c4e97edd8df679a4a3aaa";
sha256 = "14v2bwbgaxi1rsq5xabp5dmv0bl0vga3lhzwdxyvsyl9q7qybf55";
rev = "717063f24921d5aff405a39cf7643efedb5bb365";
hash = "sha256-rUMi+VetQc139PjbFJXlSkmYEuK5wtM6LpQ/f1tcB1s=";
};
patches = [
@@ -34,6 +34,7 @@ stdenv.mkDerivation {
"libk.so"
];
checkTarget = "t";
doCheck = true;
outputs = [
"out"
@@ -58,9 +59,6 @@ stdenv.mkDerivation {
homepage = "https://codeberg.org/ngn/k";
license = lib.licenses.agpl3Only;
maintainers = [ lib.maintainers.sternenseemann ];
platforms = [
"x86_64-linux"
"x86_64-freebsd"
];
platforms = lib.platforms.linux ++ lib.platforms.freebsd;
};
}
pkgs/by-name/ol/olivetin/package.nix
+10
View File
@@ -142,6 +142,16 @@ buildGoModule (
license = lib.licenses.agpl3Only;
maintainers = with lib.maintainers; [ defelo ];
mainProgram = "OliveTin";
knownVulnerabilities = [
"CVE-2026-27626: OS Command Injection via password argument type and webhook JSON extraction bypasses shell safety checks"
"CVE-2026-28342: Unauthenticated Denial of Service via Memory Exhaustion in PasswordHash API Endpoint"
"CVE-2026-30223: JWT Audience Validation Bypass in Local Key and HMAC Modes"
"CVE-2026-28789: Unauthenticated DoS via concurrent map writes in OAuth2 state handling"
"CVE-2026-30224: Session Fixation - Logout Fails to Invalidate Server-Side Session"
"CVE-2026-28790: Unauthenticated Action Termination via KillAction When Guests Must Login"
"CVE-2026-30233: View permission not being checked when returning dashboards"
"CVE-2026-30225: RestartAction always runs actions as guest"
];
};
}
)
pkgs/by-name/pg/pgpool/darwin-strchrnul.patch
+13
View File
@@ -0,0 +1,13 @@
diff --git a/src/utils/pool_process_reporting.c b/src/utils/pool_process_reporting.c
index 39087bc47..dc28ba958 100644
--- a/src/utils/pool_process_reporting.c
+++ b/src/utils/pool_process_reporting.c
@@ -1118,7 +1118,8 @@ get_config(int *nrows)
StrNCpy(status[i].name, "memqcache_stats_start_time", POOLCONFIG_MAXNAMELEN);
snprintf(status[i].value, POOLCONFIG_MAXVALLEN, "%s", ctime(&pool_get_memqcache_stats()->start_time));
/* remove a newline added by ctime() */
- *(strchrnul(status[i].value, '\n')) = '\0';
+ char *p = strchr(status[i].value, '\n');
+ if (p) *p = '\0';
StrNCpy(status[i].desc, "Start time of query cache stats", POOLCONFIG_MAXDESCLEN);
i++;
pkgs/by-name/pg/pgpool/darwin-strlcpy.patch
+66 -91
View File
@@ -1,17 +1,8 @@
diff --git a/src/Makefile.in b/src/Makefile.in
index 3b19ca27..4d2e8e52 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -124,7 +124,7 @@ am_pgpool_OBJECTS = main/main.$(OBJEXT) main/pool_globals.$(OBJEXT) \
context/pool_query_context.$(OBJEXT) \
streaming_replication/pool_worker_child.$(OBJEXT) \
rewrite/pool_timestamp.$(OBJEXT) rewrite/pool_lobj.$(OBJEXT) \
- utils/pool_select_walker.$(OBJEXT) utils/strlcpy.$(OBJEXT) \
+ utils/pool_select_walker.$(OBJEXT) \
utils/psprintf.$(OBJEXT) utils/pool_params.$(OBJEXT) \
utils/ps_status.$(OBJEXT) utils/pool_shmem.$(OBJEXT) \
utils/pool_sema.$(OBJEXT) utils/pool_signal.$(OBJEXT) \
@@ -469,7 +469,6 @@ pgpool_SOURCES = main/main.c \
diff --git a/src/Makefile.am b/src/Makefile.am
index 4678ab530..f3c12cb94 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -35,7 +35,6 @@ pgpool_SOURCES = main/main.c \
rewrite/pool_timestamp.c \
rewrite/pool_lobj.c \
utils/pool_select_walker.c \
@@ -19,57 +10,52 @@ index 3b19ca27..4d2e8e52 100644
utils/psprintf.c \
utils/pool_params.c \
utils/ps_status.c \
@@ -762,7 +761,6 @@ utils/$(am__dirstamp):
@$(MKDIR_P) utils
@: > utils/$(am__dirstamp)
utils/pool_select_walker.$(OBJEXT): utils/$(am__dirstamp)
-utils/strlcpy.$(OBJEXT): utils/$(am__dirstamp)
utils/psprintf.$(OBJEXT): utils/$(am__dirstamp)
utils/pool_params.$(OBJEXT): utils/$(am__dirstamp)
utils/ps_status.$(OBJEXT): utils/$(am__dirstamp)
diff --git a/src/libs/pcp/Makefile.in b/src/libs/pcp/Makefile.in
index 5ea3213a..5689fb33 100644
--- a/src/libs/pcp/Makefile.in
+++ b/src/libs/pcp/Makefile.in
@@ -129,7 +129,7 @@ libpcp_la_LIBADD =
am__dirstamp = $(am__leading_dot)dirstamp
dist_libpcp_la_OBJECTS = pcp.lo ../../utils/pool_path.lo \
../../tools/fe_port.lo ../../tools/fe_memutils.lo \
- ../../utils/strlcpy.lo ../../utils/pool_health_check_stats.lo
+ ../../utils/pool_health_check_stats.lo
nodist_libpcp_la_OBJECTS = pcp_stream.lo md5.lo json.lo
libpcp_la_OBJECTS = $(dist_libpcp_la_OBJECTS) \
$(nodist_libpcp_la_OBJECTS)
@@ -347,7 +347,6 @@ dist_libpcp_la_SOURCES = pcp.c \
@@ -106,7 +105,7 @@ pgpool_LDADD = -L@PGSQL_LIB_DIR@ -lpq parser/libsql-parser.a \
if enable_rpath
pgpool_LDFLAGS = -rpath @PGSQL_LIB_DIR@ -rpath $(libdir)
else
- pgpool_LDFLAGS =
+ pgpool_LDFLAGS =
endif
AM_YFLAGS = -d
diff --git a/src/libs/pcp/Makefile.am b/src/libs/pcp/Makefile.am
index 31f51233a..bca3f5374 100644
--- a/src/libs/pcp/Makefile.am
+++ b/src/libs/pcp/Makefile.am
@@ -6,7 +6,6 @@ dist_libpcp_la_SOURCES = pcp.c \
../../utils/pool_path.c \
../../tools/fe_port.c \
../../tools/fe_memutils.c \
- ../../utils/strlcpy.c \
../../utils/pool_health_check_stats.c
../../utils/pool_health_check_stats.c \
../../utils/sprompt.c
nodist_libpcp_la_SOURCES = pcp_stream.c \
@@ -437,7 +436,6 @@ clean-libLTLIBRARIES:
@: > ../../tools/$(am__dirstamp)
../../tools/fe_port.lo: ../../tools/$(am__dirstamp)
../../tools/fe_memutils.lo: ../../tools/$(am__dirstamp)
-../../utils/strlcpy.lo: ../../utils/$(am__dirstamp)
../../utils/pool_health_check_stats.lo: ../../utils/$(am__dirstamp)
diff --git a/src/test/regression/tests/010.rewrite_timestamp/timestamp/Makefile b/src/test/regression/tests/010.rewrite_timestamp/timestamp/Makefile
index f19c88f29..baf6220e5 100644
--- a/src/test/regression/tests/010.rewrite_timestamp/timestamp/Makefile
+++ b/src/test/regression/tests/010.rewrite_timestamp/timestamp/Makefile
@@ -5,7 +5,6 @@ CFLAGS=-Wall -O0 -g -std=gnu99
CC=gcc
libpcp.la: $(libpcp_la_OBJECTS) $(libpcp_la_DEPENDENCIES) $(EXTRA_libpcp_la_DEPENDENCIES)
diff --git a/src/tools/pgenc/Makefile.in b/src/tools/pgenc/Makefile.in
index ad117a5e..5c5fc838 100644
--- a/src/tools/pgenc/Makefile.in
+++ b/src/tools/pgenc/Makefile.in
@@ -101,7 +101,7 @@ PROGRAMS = $(bin_PROGRAMS)
am__dirstamp = $(am__leading_dot)dirstamp
dist_pg_enc_OBJECTS = pg_enc.$(OBJEXT) ../fe_port.$(OBJEXT)
nodist_pg_enc_OBJECTS = ssl_utils.$(OBJEXT) md5.$(OBJEXT) \
- base64.$(OBJEXT) pool_passwd.$(OBJEXT) strlcpy.$(OBJEXT) \
+ base64.$(OBJEXT) pool_passwd.$(OBJEXT) \
regex_array.$(OBJEXT) pool_config_variables.$(OBJEXT) \
pool_config.$(OBJEXT) fe_memutils.$(OBJEXT) \
pool_path.$(OBJEXT)
@@ -320,7 +320,6 @@ nodist_pg_enc_SOURCES = ssl_utils.c \
OBJS=main.o \
- $(topsrc_dir)/utils/strlcpy.o \
$(topsrc_dir)/utils/pgstrcasecmp.o \
$(topsrc_dir)/utils/psprintf.o \
$(topsrc_dir)/main/pool_globals.o \
@@ -15,7 +14,6 @@ OBJS=main.o \
all: all-pre $(PROGRAM)
all-pre:
- $(MAKE) -C $(topsrc_dir)/utils strlcpy.o
$(MAKE) -C $(topsrc_dir)/utils pgstrcasecmp.o
$(MAKE) -C $(topsrc_dir)/utils psprintf.o
$(MAKE) -C $(topsrc_dir)/main pool_globals.o
diff --git a/src/tools/pgenc/Makefile.am b/src/tools/pgenc/Makefile.am
index 643ad51b4..bff5d4a1d 100644
--- a/src/tools/pgenc/Makefile.am
+++ b/src/tools/pgenc/Makefile.am
@@ -7,7 +7,6 @@ nodist_pg_enc_SOURCES = ssl_utils.c \
md5.c \
base64.c \
pool_passwd.c \
@@ -77,7 +63,7 @@ index ad117a5e..5c5fc838 100644
regex_array.c \
pool_config_variables.c \
pool_config.c \
@@ -664,8 +663,6 @@ base64.h: ../../../src/include/utils/base64.h
@@ -33,8 +32,6 @@ base64.h: ../../../src/include/utils/base64.h
rm -f $@ && ln -s $< .
ssl_utils.h: ../../../src/include/utils/ssl_utils.h
rm -f $@ && ln -s $< .
@@ -86,28 +72,19 @@ index ad117a5e..5c5fc838 100644
regex_array.c: ../../../src/utils/regex_array.c
rm -f $@ && ln -s $< .
pool_config_variables.c: ../../../src/config/pool_config_variables.c
diff --git a/src/tools/pgmd5/Makefile.in b/src/tools/pgmd5/Makefile.in
index 275f39e5..d3af1e25 100644
--- a/src/tools/pgmd5/Makefile.in
+++ b/src/tools/pgmd5/Makefile.in
@@ -101,7 +101,7 @@ PROGRAMS = $(bin_PROGRAMS)
am__dirstamp = $(am__leading_dot)dirstamp
dist_pg_md5_OBJECTS = pg_md5.$(OBJEXT) ../fe_port.$(OBJEXT)
nodist_pg_md5_OBJECTS = md5.$(OBJEXT) pool_passwd.$(OBJEXT) \
- strlcpy.$(OBJEXT) regex_array.$(OBJEXT) \
+ regex_array.$(OBJEXT) \
pool_config_variables.$(OBJEXT) pool_config.$(OBJEXT) \
fe_memutils.$(OBJEXT) pool_path.$(OBJEXT)
pg_md5_OBJECTS = $(dist_pg_md5_OBJECTS) $(nodist_pg_md5_OBJECTS)
@@ -317,7 +317,6 @@ dist_pg_md5_SOURCES = pg_md5.c \
diff --git a/src/tools/pgmd5/Makefile.am b/src/tools/pgmd5/Makefile.am
index 1bf535a2a..f6fd04075 100644
--- a/src/tools/pgmd5/Makefile.am
+++ b/src/tools/pgmd5/Makefile.am
@@ -5,7 +5,6 @@ dist_pg_md5_SOURCES = pg_md5.c \
../fe_port.c
nodist_pg_md5_SOURCES = md5.c \
pool_passwd.c \
- strlcpy.c \
regex_array.c \
pool_config_variables.c \
pool_config.c \
@@ -653,8 +652,6 @@ pool_passwd.c: ../../../src/auth/pool_passwd.c
@@ -23,8 +22,6 @@ pool_passwd.c: ../../../src/auth/pool_passwd.c
rm -f $@ && ln -s $< .
pool_path.c: ../../../src/utils/pool_path.c
rm -f $@ && ln -s $< .
@@ -116,20 +93,18 @@ index 275f39e5..d3af1e25 100644
regex_array.c: ../../../src/utils/regex_array.c
rm -f $@ && ln -s $< .
pool_config_variables.c: ../../../src/config/pool_config_variables.c
diff --git a/src/tools/watchdog/Makefile.in b/src/tools/watchdog/Makefile.in
index 3e578b44..c7fbce4e 100644
--- a/src/tools/watchdog/Makefile.in
+++ b/src/tools/watchdog/Makefile.in
@@ -105,7 +105,7 @@ nodist_wd_cli_OBJECTS = ssl_utils.$(OBJEXT) wd_ipc_conn.$(OBJEXT) \
wd_commands.$(OBJEXT) json_writer.$(OBJEXT) json.$(OBJEXT) \
pool_config_variables.$(OBJEXT) pool_config.$(OBJEXT) \
pool_path.$(OBJEXT) fe_memutils.$(OBJEXT) stringinfo.$(OBJEXT) \
- strlcpy.$(OBJEXT) socket_stream.$(OBJEXT) \
+ socket_stream.$(OBJEXT) \
regex_array.$(OBJEXT) psprintf.$(OBJEXT) md5.$(OBJEXT)
wd_cli_OBJECTS = $(dist_wd_cli_OBJECTS) $(nodist_wd_cli_OBJECTS)
wd_cli_LDADD = $(LDADD)
@@ -359,7 +359,6 @@ nodist_wd_cli_SOURCES = ssl_utils.c \
diff --git a/src/tools/watchdog/Makefile.am b/src/tools/watchdog/Makefile.am
index 14226aba5..974bd5953 100644
--- a/src/tools/watchdog/Makefile.am
+++ b/src/tools/watchdog/Makefile.am
@@ -1,5 +1,5 @@
parser_incdir = $(top_srcdir)/src/include/parser
-AM_CPPFLAGS = -D_GNU_SOURCE -DPOOL_PRIVATE -I $(parser_incdir) -I @PGSQL_INCLUDE_DIR@
+AM_CPPFLAGS = -D_GNU_SOURCE -DPOOL_PRIVATE -I $(parser_incdir) -I @PGSQL_INCLUDE_DIR@
bin_PROGRAMS = wd_cli
bin_SCRIPTS = watchdog_setup
@@ -18,7 +18,6 @@ nodist_wd_cli_SOURCES = ssl_utils.c \
fe_memutils.c \
stringinfo.h \
stringinfo.c \
@@ -137,7 +112,7 @@ index 3e578b44..c7fbce4e 100644
socket_stream.c \
regex_array.c \
psprintf.c \
@@ -732,8 +731,6 @@ md5.h: ../../../src/include/auth/md5.h
@@ -37,8 +36,6 @@ md5.h: ../../../src/include/auth/md5.h
rm -f $@ && ln -s $< .
socket_stream.c: ../../../src/utils/socket_stream.c
rm -f $@ && ln -s $< .
pkgs/by-name/pg/pgpool/package.nix
+60 -23
View File
@@ -1,58 +1,95 @@
{
lib,
stdenv,
fetchurl,
autoreconfHook,
bison,
fetchFromGitHub,
flex,
libmemcached,
libpq,
openssl,
libxcrypt,
withPam ? stdenv.hostPlatform.isLinux,
openldap,
openssl,
pam,
versionCheckHook,
enableLdap ? true,
enableMemcached ? true,
enablePam ? true,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "pgpool-II";
version = "4.6.4";
pname = "pgpool";
version = "4.7.1";
src = fetchurl {
url = "https://www.pgpool.net/mediawiki/download.php?f=pgpool-II-${finalAttrs.version}.tar.gz";
name = "pgpool-II-${finalAttrs.version}.tar.gz";
hash = "sha256-7w0ukamhHXN8ZHYkchnmefcYvsU1UGRhiVlO+a79KY0=";
outputs = [
"out"
"dev"
"lib"
];
src = fetchFromGitHub {
owner = "pgpool";
repo = "pgpool2";
tag = "V${lib.replaceString "." "_" finalAttrs.version}";
hash = "sha256-npH4rhRToPVfKk7XyGGzdRSZMQ+APM8MBKHmd0rzlDw=";
};
patches = [
# Build checks for strlcpy being available in the system, but doesn't
# actually exclude its own copy from being built
./darwin-strlcpy.patch
# Fix strchrnul not available on Darwin
./darwin-strchrnul.patch
];
nativeBuildInputs = [
autoreconfHook
bison
flex
];
buildInputs = [
libpq
openssl
libxcrypt
openssl
]
++ lib.optional withPam pam;
++ lib.optional enableLdap openldap
++ lib.optional enableMemcached libmemcached
++ lib.optional enablePam pam;
env.NIX_CFLAGS_COMPILE = toString (
lib.optionals (stdenv.cc.isClang) [
"-Wno-error=implicit-function-declaration"
]
);
configureFlags = [
"--sysconfdir=/etc"
"--localstatedir=/var"
"--with-openssl"
]
++ lib.optional withPam "--with-pam";
(lib.withFeature true "openssl")
(lib.withFeature enableLdap "ldap")
(lib.withFeature enablePam "pam")
(lib.withFeatureAs enableMemcached "memcached" (lib.getDev libmemcached))
];
installFlags = [
"sysconfdir=\${out}/etc"
];
patches = lib.optionals (stdenv.hostPlatform.isDarwin) [
# Build checks for strlcpy being available in the system, but doesn't
# actually exclude its own copy from being built
./darwin-strlcpy.patch
];
enableParallelBuilding = true;
nativeInstallCheckInputs = [ versionCheckHook ];
doInstallCheck = true;
meta = {
homepage = "https://www.pgpool.net/mediawiki/index.php/Main_Page";
description = "Middleware that works between PostgreSQL servers and PostgreSQL clients";
homepage = "https://pgpool.net/";
changelog = "https://www.pgpool.net/docs/latest/en/html/release-${
builtins.replaceStrings [ "." ] [ "-" ] finalAttrs.version
lib.replaceString "." "-" finalAttrs.version
}.html";
license = lib.licenses.free;
platforms = lib.platforms.unix;
maintainers = [ ];
maintainers = with lib.maintainers; [ anthonyroussel ];
mainProgram = "pgpool";
};
})
pkgs/by-name/pr/proton-pass-cli/package.nix
+5 -5
View File
@@ -14,7 +14,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "proton-pass-cli";
version = "1.5.2";
version = "1.6.1";
src = finalAttrs.passthru.sources.${stdenv.hostPlatform.system};
@@ -47,19 +47,19 @@ stdenv.mkDerivation (finalAttrs: {
sources = {
"aarch64-darwin" = fetchurl {
url = "https://proton.me/download/pass-cli/${finalAttrs.version}/pass-cli-macos-aarch64";
hash = "sha256-8k6stQFVUC8vmytYV/zUJRsJxVRnm2eFeql7HTfCsuc=";
hash = "sha256-xEqD5ET6bi1mr9RscWJ4V2uBRNrjzd08fBet9OCm28I=";
};
"aarch64-linux" = fetchurl {
url = "https://proton.me/download/pass-cli/${finalAttrs.version}/pass-cli-linux-aarch64";
hash = "sha256-rIji6/FaR5nFCECMDPgd2RgDE/5FtnlBVn69MMT7rbI=";
hash = "sha256-vmily9b6ukkdRDbnKHRyssn3bvRFhdzxDyYPqIMESs8=";
};
"x86_64-darwin" = fetchurl {
url = "https://proton.me/download/pass-cli/${finalAttrs.version}/pass-cli-macos-x86_64";
hash = "sha256-z7LAfw/J2P7NSyUIr0uw8g7pylSkF0EjUX1MFzuJmIk=";
hash = "sha256-zKBrZYLJpYKF5x2I3pNMtETWtVH9Mqy77or7aBG3sAg=";
};
"x86_64-linux" = fetchurl {
url = "https://proton.me/download/pass-cli/${finalAttrs.version}/pass-cli-linux-x86_64";
hash = "sha256-tuAqx5zuJ3dnAj3aIbbOonbVb9sL+F2W6vAi/2In3rw=";
hash = "sha256-u/S6AVt9N9GUzYSBZJAxqzxNXFTLNttffqLAW3yNKL8=";
};
};
updateScript = writeShellScript "update-proton-pass-cli" ''
pkgs/by-name/py/pyrra/package.nix
+3 -3
View File
@@ -8,13 +8,13 @@
buildGoModule (finalAttrs: {
pname = "pyrra";
version = "0.9.3";
version = "0.9.4";
src = fetchFromGitHub {
owner = "pyrra-dev";
repo = "pyrra";
tag = "v${finalAttrs.version}";
hash = "sha256-3eEnwS3nnDuIYfZCDUrWFeNmAHEGWtpxtSVoI+XIMVM=";
hash = "sha256-XJIYCGv9XOIMxqOjq7u536EhfSIAjLNCNeuwnXUhBMs=";
};
vendorHash = "sha256-E2/OrAC2Wkv7OYPjs9ROE1RL4UUXYTByJZRY1qZB3gE=";
@@ -25,7 +25,7 @@ buildGoModule (finalAttrs: {
pname = "${finalAttrs.pname}-ui";
src = "${finalAttrs.src}/ui";
npmDepsHash = "sha256-1KSkYUIJy6uci+Cy2q4dXO2PGpnwKcXQmWaWmpjPneA=";
npmDepsHash = "sha256-gbVKnz1F1qfyD0/FAYn0YkIkejv3bvoxyzRsZhqw7Ws=";
installPhase = ''
runHook preInstall
pkgs/by-name/ri/ristretto/package.nix
+2 -2
View File
@@ -24,14 +24,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "ristretto";
version = "0.13.4";
version = "0.14.0";
src = fetchFromGitLab {
domain = "gitlab.xfce.org";
owner = "apps";
repo = "ristretto";
tag = "ristretto-${finalAttrs.version}";
hash = "sha256-X0liZddeEOxlo0tyn3Irvo0+MTnMFuvKY2m4h+/EI2E=";
hash = "sha256-3Jlm0fqFKOQF9DG1hqc7P2MrILDe/gKkxkT9WPRflBo=";
};
strictDeps = true;
pkgs/by-name/ro/rocketchat-desktop/package.nix
+3 -3
View File
@@ -21,13 +21,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "rocketchat-desktop";
version = "4.12.0";
version = "4.13.0";
src = fetchFromGitHub {
owner = "RocketChat";
repo = "Rocket.Chat.Electron";
tag = finalAttrs.version;
hash = "sha256-/IzIvPgm18YXSq5RUBXdWsMk45jEs15qkPCnKeMW+E4=";
hash = "sha256-u2bGCtF+PBYUsYUytgJfhDVXlCwEeQCon5iRecvspEI=";
};
# This might need to be updated between releases.
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
offlineCache = yarn-berry.fetchYarnBerryDeps {
inherit (finalAttrs) src missingHashes;
hash = "sha256-3j1lydMNR3kI+G49Sz+LZ2YhwMQWcwKAn09ao4ur0oc=";
hash = "sha256-OevWuXmLlDPENVpc7L5mCY+iguqtrEeoFBHmD8YAxeY=";
};
nativeBuildInputs = [
pkgs/by-name/sc/scala-next/package.nix
+2 -2
View File
@@ -1,10 +1,10 @@
{ scala, fetchurl }:
scala.bare.overrideAttrs (oldAttrs: {
version = "3.8.1";
version = "3.8.2";
pname = "scala-next";
src = fetchurl {
inherit (oldAttrs.src) url;
hash = "sha256-6RdU/L3zUQE7uiC7T1q8TptJCoMnKxk84CLXQ9Q0Ao8=";
hash = "sha256-gnNWp4pw09eS8ad+EJzD+j6pRrjSaEi7JF8nW+Uv144=";
};
})
pkgs/by-name/sh/shfmt/package.nix
+15 -4
View File
@@ -3,28 +3,35 @@
buildGoModule,
fetchFromGitHub,
installShellFiles,
replaceVars,
scdoc,
versionCheckHook,
}:
buildGoModule (finalAttrs: {
pname = "shfmt";
version = "3.12.0";
version = "3.13.0";
src = fetchFromGitHub {
owner = "mvdan";
repo = "sh";
rev = "v${finalAttrs.version}";
hash = "sha256-3a0N5GsqZvJVx1qhsTzwtC2SBtexdXJMalerM+joNIc=";
hash = "sha256-VFLnQNhySXB/VE0u9u2X4jAHq+083+QjhWM7vfyxhM8=";
};
vendorHash = "sha256-jvsX0nn9cHq2cZUrD9E1eMtOiy5I4wfpngAc+6qUbEE=";
vendorHash = "sha256-WLGHcmBslXJO4OKdUK7HqimdUCOtdCdK+AOdlo4hgWk=";
patches = [
(replaceVars ./version.patch {
inherit (finalAttrs) version;
})
];
subPackages = [ "cmd/shfmt" ];
ldflags = [
"-s"
"-w"
"-X main.version=${finalAttrs.version}"
];
nativeBuildInputs = [
@@ -37,6 +44,10 @@ buildGoModule (finalAttrs: {
installManPage shfmt.1
'';
doInstallCheck = true;
nativeInstallCheckInputs = [ versionCheckHook ];
versionCheckProgramArg = "--version";
meta = {
homepage = "https://github.com/mvdan/sh";
description = "Shell parser and formatter";
pkgs/by-name/sh/shfmt/version.patch
+37
View File
@@ -0,0 +1,37 @@
diff --git a/cmd/shfmt/main.go b/cmd/shfmt/main.go
index c6c08e37..e59128ec 100644
--- a/cmd/shfmt/main.go
+++ b/cmd/shfmt/main.go
@@ -153,13 +153,12 @@ For more information and to report bugs, see https://github.com/mvdan/sh.
flag.Parse()
if versionFlag.val {
- version := "(unknown)"
+ version := "@version@"
if info, ok := debug.ReadBuildInfo(); ok {
mod := &info.Main
if mod.Replace != nil {
mod = mod.Replace
}
- version = mod.Version
}
fmt.Println(version)
return
diff --git a/cmd/shfmt/testdata/script/flags.txtar b/cmd/shfmt/testdata/script/flags.txtar
index 012912cb..54305a03 100644
--- a/cmd/shfmt/testdata/script/flags.txtar
+++ b/cmd/shfmt/testdata/script/flags.txtar
@@ -9,11 +9,11 @@ exec shfmt --help
stderr 'usage: shfmt'
exec shfmt -version
-stdout 'devel|v3'
+stdout '@version@'
! stderr .
exec shfmt --version
-stdout 'devel|v3'
+stdout '@version@'
! stderr .
! exec shfmt -ln=bash -p
pkgs/by-name/sl/slidev-cli/package.nix
+3 -3
View File
@@ -10,13 +10,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "slidev-cli";
version = "52.13.0";
version = "52.14.1";
src = fetchFromGitHub {
owner = "slidevjs";
repo = "slidev";
tag = "v${finalAttrs.version}";
hash = "sha256-k2brtG7vpcfZx4E/zu+yiD98F4RdX9oyksCFbvLGzyk=";
hash = "sha256-GIg4KU2TJMSZXjnB+A8MPZUUp1/M1YX5ctO13dfmOz0=";
};
pnpmWorkspaces = [ "@slidev/cli..." ];
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
pnpmWorkspaces
;
fetcherVersion = 3;
hash = "sha256-t1ZqOqIp2jmIGRr/FyG3X1jfMF01k1YaObzj7oNXoJg=";
hash = "sha256-2BNnxPM608vRx1uQit2lf+IckLNX5/yG3fvpEeZF+C8=";
};
nativeBuildInputs = [
pkgs/by-name/ta/talosctl/package.nix
+7 -4
View File
@@ -9,16 +9,16 @@
buildGoModule (finalAttrs: {
pname = "talosctl";
version = "1.12.4";
version = "1.12.5";
src = fetchFromGitHub {
owner = "siderolabs";
repo = "talos";
tag = "v${finalAttrs.version}";
hash = "sha256-shXNd8Vz5YXpA9J6m4IDsRx8cTR7ZDPDfjm8kVssBqg=";
hash = "sha256-mGfaf64he6/eK8JMHOCUSKaAEnsxoceYWDHhsD8WQ9Q=";
};
vendorHash = "sha256-74zQzCiqH9jCdPzgXIQqPHCslcKuD+kLxfiH/CjzhAY=";
vendorHash = "sha256-3po3MWqi2w2jEp+OlMQN53XUqMK4YVzv1K132TdV2bc=";
ldflags = [
"-s"
@@ -53,6 +53,9 @@ buildGoModule (finalAttrs: {
mainProgram = "talosctl";
homepage = "https://www.talos.dev/";
license = lib.licenses.mpl20;
maintainers = with lib.maintainers; [ flokli ];
maintainers = with lib.maintainers; [
flokli
johanot
];
};
})
pkgs/by-name/va/vacuum-go/package.nix
+3 -3
View File
@@ -7,16 +7,16 @@
buildGoModule (finalAttrs: {
pname = "vacuum-go";
version = "0.24.0";
version = "0.25.0";
src = fetchFromGitHub {
owner = "daveshanley";
repo = "vacuum";
tag = "v${finalAttrs.version}";
hash = "sha256-En8MjRrEICHKJU9fk34tCi1gip8kFmST/40HTKS8Ktg=";
hash = "sha256-Qm3TrVgChCuCfMoVstFjAeONR20zLHXexfHQE8/2kdQ=";
};
vendorHash = "sha256-YkEQWbs4CDTCjePuO/bdfeWE3Y/Y4yr2qrY5/scU1e8=";
vendorHash = "sha256-8AH/o95EnpCMfiMzcMRKL0cnM+4yU61dom/4Gv+PM6A=";
env.CGO_ENABLED = 0;
ldflags = [
pkgs/by-name/vm/vmware-workstation/package.nix
+9 -5
View File
@@ -49,12 +49,12 @@
stdenv.mkDerivation (finalAttrs: {
pname = "vmware-workstation";
version = "17.6.4";
build = "24832109";
version = "25H2u1";
build = "25219725";
src = fetchurl {
url = "https://archive.org/download/vmware-workstation-full-${finalAttrs.version}-${finalAttrs.build}.x86_64/VMware-Workstation-Full-${finalAttrs.version}-${finalAttrs.build}.x86_64.bundle";
hash = "sha256-ZPv7rqzEiGVGgRQ2Kiu6rekRDMnoe8O9k4OWun8Zqb0=";
url = "https://archive.org/download/VMware-Workstation-Full-${finalAttrs.version}-${finalAttrs.build}.x86_64/VMware-Workstation-Full-${finalAttrs.version}-${finalAttrs.build}.x86_64.bundle";
hash = "sha256-chqpPE68qlGsbbde2Xx6TbEKqIEQRGiQ2x5Av6/HVmo=";
};
vmware-unpack-env = buildFHSEnv {
@@ -223,7 +223,6 @@ stdenv.mkDerivation (finalAttrs: {
cp -r $unpacked/lib/modules $out/lib/vmware/
cp -r $unpacked/lib/include $out/lib/vmware/
cp -r $unpacked/extra/checkvm $out/bin/
cp -r $unpacked/extra/modules.xml $out/lib/vmware/modules/
ln -s $out/lib/vmware/bin/appLoader $out/lib/vmware/bin/vmware-vmblock-fuse
@@ -379,6 +378,11 @@ stdenv.mkDerivation (finalAttrs: {
fi
done
# VMware upgraded their shipped libxml2 without recompiling these libraries against it?
for lib in $out/lib/vmware/lib/{libcroco-0.6.so.3/libcroco-0.6.so.3,librsvg-2.so.2/librsvg-2.so.2} $out/lib/vmware/libconf/lib/gtk-3.0/3.0.0/loaders/libpixbufloader-svg.so; do
patchelf $lib --replace-needed libxml2.so.2 libxml2.so.16
done
runHook postInstall
'';
pkgs/by-name/xf/xfce4-terminal/package.nix
+2 -2
View File
@@ -24,14 +24,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "xfce4-terminal";
version = "1.1.5";
version = "1.2.0";
src = fetchFromGitLab {
domain = "gitlab.xfce.org";
owner = "apps";
repo = "xfce4-terminal";
tag = "xfce4-terminal-${finalAttrs.version}";
hash = "sha256-qNXrxUjmuY6+k95/zcOu1/CUfhb1u0Ca91aFD3c4uoc=";
hash = "sha256-2zlx9pt9srMT6iKy89oKKdvh7YALOkyQTy7hRH60AOw=";
};
strictDeps = true;
pkgs/by-name/yt/ytdl-sub/package.nix
+2 -2
View File
@@ -9,14 +9,14 @@
python3Packages.buildPythonApplication (finalAttrs: {
pname = "ytdl-sub";
version = "2026.02.23";
version = "2026.03.09.post3";
pyproject = true;
src = fetchFromGitHub {
owner = "jmbannon";
repo = "ytdl-sub";
tag = finalAttrs.version;
hash = "sha256-Wux6qSjhu3J6N9SqjT6S2M9KPUMQ9kWs4kA4mvF/CKY=";
hash = "sha256-+ULR/8bHO6gX7oWDbj3WHqYLXTwbDxSPenEDXGETTi0=";
};
postPatch = ''
pkgs/by-name/ze/zerofs/package.nix
+3 -3
View File
@@ -10,18 +10,18 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "zerofs";
version = "1.0.5";
version = "1.0.6";
src = fetchFromGitHub {
owner = "Barre";
repo = "ZeroFS";
tag = "v${finalAttrs.version}";
hash = "sha256-tDImSu9oLczXabGFj+FDoZXHE8he8vqmBBMwQVQIQqw=";
hash = "sha256-A2Mb4CTjAkPQrckhJghRyIObjNQ1A1AEylIGOhN5sOo=";
};
sourceRoot = "${finalAttrs.src.name}/zerofs";
cargoHash = "sha256-/pAZ+oyYZw70WIVZgz9bRFet5dvpWhUtRJavXi3Ihis=";
cargoHash = "sha256-cinRkFRAV3TOWCXT7Ud7/P/oQDWBYOLb0DL6Ifmh5GA=";
nativeBuildInputs = [ cmake ];
pkgs/development/compilers/crystal/build-package.nix
+1 -1
View File
@@ -108,7 +108,7 @@ stdenv.mkDerivation (
++ [ "runHook postConfigure" ]
));
env = {
env = args.env or { } // {
CRFLAGS = lib.concatStringsSep " " defaultOptions;
PREFIX = placeholder "out";
pkgs/development/cuda-modules/_cuda/db/bootstrap/nvcc.nix
+14 -1
View File
@@ -278,7 +278,7 @@
};
# 13.0 to 13.1 adds support for Clang 21
# https://docs.nvidia.com/cuda/cuda-installation-guide-linux/index.html#host-compiler-support-policy
# https://docs.nvidia.com/cuda/archive/13.1.1/cuda-installation-guide-linux/index.html#host-compiler-support-policy
"13.1" = {
clang = {
maxMajorVersion = "21";
@@ -289,5 +289,18 @@
minMajorVersion = "6";
};
};
# No changes from 13.1 to 13.2
# https://docs.nvidia.com/cuda/cuda-installation-guide-linux/index.html#host-compiler-support-policy
"13.2" = {
clang = {
maxMajorVersion = "21";
minMajorVersion = "7";
};
gcc = {
maxMajorVersion = "15";
minMajorVersion = "6";
};
};
};
}
pkgs/development/cuda-modules/_cuda/manifests/cuda/redistrib_13.2.0.json
+1122
View File
File diff suppressed because it is too large Load Diff
pkgs/development/octave-modules/datatypes/default.nix
+27
View File
@@ -0,0 +1,27 @@
{
buildOctavePackage,
lib,
fetchFromGitHub,
nix-update-script,
}:
buildOctavePackage rec {
pname = "datatypes";
version = "1.2.0";
src = fetchFromGitHub {
owner = "pr0m1th3as";
repo = "datatypes";
tag = "release-${version}";
sha256 = "sha256-0RhZm/UzICbAAn1uCSQSgq8+6GnOuTB6TD9NoIEdvXA=";
};
passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=release-(.*)" ]; };
meta = {
homepage = "https://gnu-octave.github.io/packages/datatypes/";
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ KarlJoad ];
description = "Extra data types for GNU Octave";
};
}
pkgs/development/octave-modules/statistics/default.nix
+4 -2
View File
@@ -3,21 +3,23 @@
lib,
fetchFromGitHub,
io,
datatypes,
}:
buildOctavePackage rec {
pname = "statistics";
version = "1.8.0";
version = "1.8.2";
src = fetchFromGitHub {
owner = "gnu-octave";
repo = "statistics";
tag = "release-${version}";
hash = "sha256-4nwkrnYaFdBkLLbIUJX0U4tytHrSIKltWu7Srx43K5g=";
hash = "sha256-5wUQLIMr1X07Yi4AANBFjd0izDzGNsI5ccY7IherB3I=";
};
requiredOctavePackages = [
io
datatypes
];
meta = {
pkgs/development/python-modules/authlib/default.nix
+2 -2
View File
@@ -19,14 +19,14 @@
buildPythonPackage rec {
pname = "authlib";
version = "1.6.7";
version = "1.6.9";
pyproject = true;
src = fetchFromGitHub {
owner = "lepture";
repo = "authlib";
tag = "v${version}";
hash = "sha256-Socbm6jZW5sywU7TRiSELnkWSDZ/94g3+XLRTO1ln48=";
hash = "sha256-9H9DF3LmxzUv0M0fxYh6FLtdAA9FgRklceMlGdjlp+g=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/caio/default.nix
+2 -2
View File
@@ -10,14 +10,14 @@
buildPythonPackage (finalAttrs: {
pname = "caio";
version = "0.9.25";
version = "0.10.0";
pyproject = true;
src = fetchFromGitHub {
owner = "mosquito";
repo = "caio";
tag = finalAttrs.version;
hash = "sha256-uKQJWGYtBdpcfFD6yDKjIz0H0FEq4dmCP50sbVGYRGU=";
hash = "sha256-F14uNUELzgAHbk0onY2MrXWRvifa3AeNkw2IFHcRDvo=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/env-canada/default.nix
+2 -2
View File
@@ -20,14 +20,14 @@
buildPythonPackage (finalAttrs: {
pname = "env-canada";
version = "0.13.2";
version = "0.14.0";
pyproject = true;
src = fetchFromGitHub {
owner = "michaeldavie";
repo = "env_canada";
tag = "v${finalAttrs.version}";
hash = "sha256-E6ZStsc0T0zbjC11wi1h0JtQVBrEPtr0SJwUodCbF7k=";
hash = "sha256-1UjBE2Oc6bqwmJSFeqWukgAVU7b6OwOt1KMV0UigM3o=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/gvm-tools/default.nix
+2 -2
View File
@@ -9,14 +9,14 @@
buildPythonPackage (finalAttrs: {
pname = "gvm-tools";
version = "25.4.7";
version = "25.4.8";
pyproject = true;
src = fetchFromGitHub {
owner = "greenbone";
repo = "gvm-tools";
tag = "v${finalAttrs.version}";
hash = "sha256-4RcpnQpWTwOXzaUYLToR2S3KVJ9q7Pdecge3s6L8sd8=";
hash = "sha256-tKUaUo9Sr4d9mLdbbmn+OmAgUcEuwWSzCYY4BPJ4UKw=";
};
__darwinAllowLocalNetworking = true;
pkgs/development/python-modules/iamdata/default.nix
+2 -2
View File
@@ -8,14 +8,14 @@
buildPythonPackage (finalAttrs: {
pname = "iamdata";
version = "0.1.202603081";
version = "0.1.202603101";
pyproject = true;
src = fetchFromGitHub {
owner = "cloud-copilot";
repo = "iam-data-python";
tag = "v${finalAttrs.version}";
hash = "sha256-1rtajfssDVTUBaT5CbliEFk/OSITdbhr9XG1oYKTgas=";
hash = "sha256-6XHMQ09Cyt2s2LmHhtmKDkYJKp/R49hba+tRdWSf9Eg=";
};
__darwinAllowLocalNetworking = true;
pkgs/development/python-modules/imagecodecs/default.nix
+2 -2
View File
@@ -29,7 +29,7 @@
}:
let
version = "2026.1.14";
version = "2026.3.6";
in
buildPythonPackage rec {
pname = "imagecodecs";
@@ -40,7 +40,7 @@ buildPythonPackage rec {
owner = "cgohlke";
repo = "imagecodecs";
tag = "v${version}";
hash = "sha256-1q1CF6kIWQEcKRa+ah/MVlSZg8524bn/UbRn3IF6M6I=";
hash = "sha256-UOyhTzejLJ1HnwHtvFe9Mo8nxOkLNANnJL2z/SSRjXs=";
};
build-system = [
pkgs/development/python-modules/lexilang/default.nix
+11 -3
View File
@@ -6,7 +6,7 @@
python,
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "lexilang";
version = "1.0.7";
pyproject = true;
@@ -14,12 +14,20 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "LibreTranslate";
repo = "LexiLang";
tag = "v${version}";
tag = "v${finalAttrs.version}";
hash = "sha256-5/P9u2naTTyG5l3uhrinRIAekyOYn8OKLwb/VEON2Vc=";
};
build-system = [ setuptools ];
# Upstream builds in CI:
# https://github.com/LibreTranslate/LexiLang/blob/ba49108a736b9c077ea45cbe61d54fa635fe25d5/.github/workflows/publish.yml#L30-L31
postInstall = ''
${lib.getExe python} -c "from lexilang.utils import compile_data; compile_data()"
rm -f lexilang/data/.gitignore
cp -r lexilang/data $out/${python.sitePackages}/lexilang/data
'';
pythonImportsCheck = [ "lexilang" ];
checkPhase = ''
@@ -34,4 +42,4 @@ buildPythonPackage rec {
license = lib.licenses.agpl3Only;
maintainers = with lib.maintainers; [ izorkin ];
};
}
})
pkgs/development/python-modules/llama-index-workflows/default.nix
+2 -2
View File
@@ -10,13 +10,13 @@
buildPythonPackage (finalAttrs: {
pname = "llama-index-workflows";
version = "2.15.0";
version = "2.15.1";
pyproject = true;
src = fetchPypi {
pname = "llama_index_workflows";
inherit (finalAttrs) version;
hash = "sha256-BmMMo4h7m/J9p3bxDkKBGu7fNTRZHrZUeWMZ74mNLXs=";
hash = "sha256-Xkba4saD06negApPr0crSqkVAms/Qb02urowexLNPn8=";
};
postPatch = ''
pkgs/development/python-modules/pdf2docx/default.nix
+2 -2
View File
@@ -15,7 +15,7 @@
setuptools,
}:
let
version = "0.5.9";
version = "0.5.12";
in
buildPythonPackage {
pname = "pdf2docx";
@@ -26,7 +26,7 @@ buildPythonPackage {
owner = "ArtifexSoftware";
repo = "pdf2docx";
tag = "v${version}";
hash = "sha256-yfxBWQ8r0mCZkk7Gtbeub5x9HBpNWXv6kW1D678hN4g=";
hash = "sha256-fn5MnuLCmqjl99Xvs9THwerkIyUeXwPQmn+znvWtgUE=";
};
build-system = [
pkgs/development/python-modules/pyosmium/default.nix
+6 -2
View File
@@ -12,7 +12,8 @@
pybind11,
pytest-httpserver,
pytestCheckHook,
setuptools,
scikit-build-core,
ninja,
shapely,
werkzeug,
isPyPy,
@@ -34,7 +35,10 @@ buildPythonPackage rec {
hash = "sha256-AkldgvZmn1CLa9Ze7RHBhL5wLLJ+mBnNj+yyV98nzZ8=";
};
build-system = [ setuptools ];
build-system = [
scikit-build-core
ninja
];
nativeBuildInputs = [ cmake ];
pkgs/development/python-modules/python-cinderclient/default.nix
+2 -2
View File
@@ -22,13 +22,13 @@
buildPythonPackage rec {
pname = "python-cinderclient";
version = "9.8.0";
version = "9.9.0";
pyproject = true;
src = fetchPypi {
pname = "python_cinderclient";
inherit version;
hash = "sha256-vT7p+Uh8XnmVfwGKaz8t7OcFna2PYVXYPdS265RHoR0=";
hash = "sha256-aX5NEsJJ85tB7PT6b8uMOMvy1rLYTW9RXtVnuC3NC9E=";
};
nativeBuildInputs = [
pkgs/development/python-modules/python-picnic-api2/default.nix
+2 -2
View File
@@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "python-picnic-api2";
version = "1.3.2";
version = "1.3.4";
pyproject = true;
src = fetchFromGitHub {
owner = "codesalatdev";
repo = "python-picnic-api";
tag = "v${version}";
hash = "sha256-GFxs2ZjyGADMG8YWtpy+sAZClLOYt70KtEp5MCgY+7I=";
hash = "sha256-ytzzGr/z0jrsudtCBrcvGITo4DxxC8JCmSmQ8ybeomM=";
};
build-system = [ hatchling ];
pkgs/development/python-modules/rioxarray/default.nix
+2 -2
View File
@@ -22,14 +22,14 @@
buildPythonPackage rec {
pname = "rioxarray";
version = "0.20.0";
version = "0.22.0";
pyproject = true;
src = fetchFromGitHub {
owner = "corteva";
repo = "rioxarray";
tag = version;
hash = "sha256-yLWCDaAcwQT2C0Nt1GaIA3NWXe6k2CDkBAr3rsm8eQs=";
hash = "sha256-+0TJeEjAKIqi6cbLZiv14dPKW8Xza+4tn/Erzn88ZS0=";
};
build-system = [ setuptools ];
pkgs/os-specific/linux/vmware/default.nix
+3 -3
View File
@@ -9,13 +9,13 @@
stdenv.mkDerivation {
pname = "vmware-modules";
version = "workstation-17.6.3-20250728-${kernel.version}";
version = "workstation-25h2-20251015-${kernel.version}";
src = fetchFromGitHub {
owner = "philipl";
repo = "vmware-host-modules";
rev = "6797e552638a28d1fa1e9ebd7ab5d3c628671ba0";
hash = "sha256-KCLxAF6UtNIdKcDoANviln2RJuz1Ld8jq5QFW9ONghs=";
rev = "5c80f597017882f76e9c7ffd48a292a4b7c860fe";
hash = "sha256-EFOkzwul1QCaKUBwFqH8uIsIUcvtEmxYVaE/OdoHdZI=";
};
hardeningDisable = [ "pic" ];
pkgs/top-level/all-packages.nix
+1
View File
@@ -2155,6 +2155,7 @@ with pkgs;
cudaPackages_12_9
cudaPackages_13_0
cudaPackages_13_1
cudaPackages_13_2
;
cudaPackages_12 = cudaPackages_12_8;
pkgs/top-level/cuda-packages.nix
+23
View File
@@ -145,6 +145,28 @@ let
tensorrt =
if hasPreThorJetsonCudaCapability requestedJetsonCudaCapabilities then "10.7.0" else "10.14.1";
};
cudaPackages_13_2 =
let
inherit (cudaPackages_13_2.backendStdenv) requestedJetsonCudaCapabilities;
in
mkCudaPackages {
cublasmp = "0.6.0";
cuda = "13.2.0";
cudnn = "9.13.0";
cudss = "0.6.0";
cuquantum = "25.09.0";
cusolvermp = "0.7.0";
cusparselt = "0.8.1";
cutensor = "2.3.1";
nppplus = "0.10.0";
nvcomp = "5.0.0.6";
nvjpeg2000 = "0.9.0";
nvpl = "25.5";
nvtiff = "0.5.1";
tensorrt =
if hasPreThorJetsonCudaCapability requestedJetsonCudaCapabilities then "10.7.0" else "10.14.1";
};
in
{
inherit
@@ -153,5 +175,6 @@ in
cudaPackages_12_9
cudaPackages_13_0
cudaPackages_13_1
cudaPackages_13_2
;
}
pkgs/top-level/octave-packages.nix
+2
View File
@@ -84,6 +84,8 @@ makeScope newScope (
dataframe = callPackage ../development/octave-modules/dataframe { };
datatypes = callPackage ../development/octave-modules/datatypes { };
dicom = callPackage ../development/octave-modules/dicom { };
divand = callPackage ../development/octave-modules/divand { };