movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-10 03:23:29 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge staging-next into staging

Browse source
This commit is contained in:
nixpkgs-ci[bot] 2025-04-22 12:06:47 +00:00 • committed by GitHub
commit 032ce947b2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
84 changed files with 2338 additions and 1409 deletions
Download patch file Download diff file Expand all files Collapse all files

2
doc/release-notes/rl-2505.section.md
View file

@ -96,6 +96,8 @@
Packages wishing to maintain compatibility with Nixpkgs 24.11 must set `useFetchCargoVendor` to `true` explicitly.
`rustPlatform.importCargoLock` may also be appropriate in some circumstances.
- `cassandra_3_0` and `cassandra_3_11` have been removed as they have reached end-of-life. Please update to `cassandra_4`. See the [changelog](https://github.com/apache/cassandra/blob/cassandra-4.0.17/NEWS.txt) for more information about the upgrade process.
- NetBox was updated to `>= 4.2.0`. Have a look at the breaking changes
of the [4.1 release](https://github.com/netbox-community/netbox/releases/tag/v4.1.0)
and the [4.2 release](https://github.com/netbox-community/netbox/releases/tag/v4.2.0),

3
nixos/doc/manual/release-notes/rl-2505.section.md
View file

@ -272,6 +272,9 @@
- The `gotenberg` package has been updated to 8.16.0, which brings breaking changes to the configuration from version 8.13.0. See the [upstream release notes](https://github.com/gotenberg/gotenberg/releases/tag/v8.13.0)
for that release to get all the details. The `services.gotenberg` module has been updated appropriately to ensure your configuration is valid with this new release.
- `varnish` was updated from 7.5.0 to 7.7.0, see [Varnish 7.6.0 upgrade guide](https://varnish-cache.org/docs/7.6/whats-new/upgrading-7.6.html) and
[Varnish 7.7.0 upgrade guide](https://varnish-cache.org/docs/7.7/whats-new/upgrading-7.7.html#whatsnew-upgrading-7-7).
- `asusd` has been upgraded to version 6 which supports multiple aura devices. To account for this, the single `auraConfig` configuration option has been replaced with `auraConfigs` which is an attribute set of config options per each device. The config files may also be now specified as either source files or text strings; to account for this you will need to specify that `text` is used for your existing configs, e.g.:
```diff
-services.asusd.asusdConfig = '''file contents'''

18
nixos/modules/config/nix-flakes.nix
View file

@ -19,6 +19,10 @@ let
cfg = config.nix;
flakeRefFormat = ''
The format of flake references is described in {manpage}`nix3-flake(1)`.
'';
in
{
options = {
@ -46,7 +50,11 @@ in
type = "indirect";
id = "nixpkgs";
};
description = "The flake reference to be rewritten.";
description = ''
The flake reference to be rewritten.
${flakeRefFormat}
'';
};
to = mkOption {
type = referenceAttrs;
@ -55,7 +63,11 @@ in
owner = "my-org";
repo = "my-nixpkgs";
};
description = "The flake reference {option}`from` is rewritten to.";
description = ''
The flake reference {option}`from` is rewritten to.
${flakeRefFormat}
'';
};
flake = mkOption {
type = types.nullOr types.attrs;
@ -96,6 +108,8 @@ in
default = { };
description = ''
A system-wide flake registry.
See {manpage}`nix3-registry(1)` for more information.
'';
};
};

2
nixos/modules/module-list.nix
View file

@ -1408,6 +1408,7 @@
./services/security/certmgr.nix
./services/security/cfssl.nix
./services/security/clamav.nix
./services/security/e-imzo.nix
./services/security/endlessh-go.nix
./services/security/endlessh.nix
./services/security/esdm.nix
@ -1565,6 +1566,7 @@
./services/web-apps/isso.nix
./services/web-apps/jirafeau.nix
./services/web-apps/jitsi-meet.nix
./services/web-apps/karakeep.nix
./services/web-apps/kasmweb/default.nix
./services/web-apps/kanboard.nix
./services/web-apps/kavita.nix

2
nixos/modules/programs/nix-ld.nix
View file

@ -22,7 +22,7 @@ in
{
meta.maintainers = [ lib.maintainers.mic92 ];
options.programs.nix-ld = {
enable = lib.mkEnableOption ''nix-ld, Documentation: <https://github.com/Mic92/nix-ld>'';
enable = lib.mkEnableOption ''nix-ld, Documentation: <https://github.com/nix-community/nix-ld>'';
package = lib.mkPackageOption pkgs "nix-ld" { };
libraries = lib.mkOption {
type = lib.types.listOf lib.types.package;

34
nixos/modules/services/databases/cassandra.nix
View file

@ -24,10 +24,6 @@ let
cfg = config.services.cassandra;
atLeast3 = versionAtLeast cfg.package.version "3";
atLeast3_11 = versionAtLeast cfg.package.version "3.11";
atLeast4 = versionAtLeast cfg.package.version "4";
defaultUser = "cassandra";
cassandraConfig = flip recursiveUpdate cfg.extraConfig (
@ -41,6 +37,7 @@ let
data_file_directories = [ "${cfg.homeDir}/data" ];
commitlog_directory = "${cfg.homeDir}/commitlog";
saved_caches_directory = "${cfg.homeDir}/saved_caches";
hints_directory = "${cfg.homeDir}/hints";
}
// optionalAttrs (cfg.seedAddresses != [ ]) {
seed_provider = [
@ -50,9 +47,6 @@ let
}
];
}
// optionalAttrs atLeast3 {
hints_directory = "${cfg.homeDir}/hints";
}
);
cassandraConfigWithAddresses =
@ -97,9 +91,7 @@ let
# Delete default password file
sed -i '/-Dcom.sun.management.jmxremote.password.file=\/etc\/cassandra\/jmxremote.password/d' "$out/cassandra-env.sh"
${lib.optionalString atLeast4 ''
cp $package/conf/jvm*.options $out/
''}
cp $package/conf/jvm*.options $out/
'';
};
@ -109,17 +101,17 @@ let
fullJvmOptions =
cfg.jvmOpts
++ [
# Historically, we don't use a log dir, whereas the upstream scripts do
# expect this. We override those by providing our own -Xlog:gc flag.
"-Xlog:gc=warning,heap*=warning,age*=warning,safepoint=warning,promotion*=warning"
]
++ optionals (cfg.jmxRoles != [ ]) [
"-Dcom.sun.management.jmxremote.authenticate=true"
"-Dcom.sun.management.jmxremote.password.file=${cfg.jmxRolesFile}"
]
++ optionals cfg.remoteJmx [
"-Djava.rmi.server.hostname=${cfg.rpcAddress}"
]
++ optionals atLeast4 [
# Historically, we don't use a log dir, whereas the upstream scripts do
# expect this. We override those by providing our own -Xlog:gc flag.
"-Xlog:gc=warning,heap*=warning,age*=warning,safepoint=warning,promotion*=warning"
];
commonEnv = {
@ -169,7 +161,7 @@ in
};
package = mkPackageOption pkgs "cassandra" {
example = "cassandra_3_11";
example = "cassandra_4";
};
jvmOpts = mkOption {
@ -462,14 +454,11 @@ in
jmxRolesFile = mkOption {
type = types.nullOr types.path;
default = if atLeast3_11 then pkgs.writeText "jmx-roles-file" defaultJmxRolesFile else null;
defaultText = literalMD ''generated configuration file if version is at least 3.11, otherwise `null`'';
default = pkgs.writeText "jmx-roles-file" defaultJmxRolesFile;
defaultText = "generated configuration file";
example = "/var/lib/cassandra/jmx.password";
description = ''
Specify your own jmx roles file.
Make sure the permissions forbid "others" from reading the file if
you're using Cassandra below version 3.11.
'';
};
};
@ -492,8 +481,7 @@ in
assertion = cfg.remoteJmx -> cfg.jmxRolesFile != null;
message = ''
If you want JMX available remotely you need to set a password using
<literal>jmxRoles</literal> or <literal>jmxRolesFile</literal> if
using Cassandra older than v3.11.
<literal>jmxRoles</literal>.
'';
}
];

39
nixos/modules/services/misc/tzupdate.nix
View file

@ -18,6 +18,25 @@ in
update the timezone.
'';
};
package = lib.mkPackageOption pkgs "tzupdate" { };
timer.enable = lib.mkOption {
type = lib.types.bool;
default = true;
description = ''
Enable the tzupdate timer to update the timezone automatically.
'';
};
timer.interval = lib.mkOption {
type = lib.types.str;
default = "hourly";
description = ''
The interval at which the tzupdate timer should run. See
{manpage}`systemd.time(7)` to understand the format.
'';
};
};
config = lib.mkIf cfg.enable {
@ -26,15 +45,16 @@ in
# zone, which is better than silently overriding it.
time.timeZone = null;
# We provide a one-shot service which can be manually run. We could
# provide a service that runs on startup, but it's tricky to get
# a service to run after you have *internet* access.
# We provide a one-shot service that runs at startup once network
# interfaces are up, but we can’t ensure we actually have Internet access
# at that point. It can also be run manually with `systemctl start tzupdate`.
systemd.services.tzupdate = {
description = "tzupdate timezone update service";
wantedBy = [ "multi-user.target" ];
wants = [ "network-online.target" ];
after = [ "network-online.target" ];
script = ''
timezone="$(${lib.getExe pkgs.tzupdate} --print-only)"
timezone="$(${lib.getExe cfg.package} --print-only)"
if [[ -n "$timezone" ]]; then
echo "Setting timezone to '$timezone'"
timedatectl set-timezone "$timezone"
@ -45,6 +65,17 @@ in
Type = "oneshot";
};
};
systemd.timers.tzupdate = {
enable = cfg.timer.enable;
interval = cfg.timer.interval;
timerConfig = {
OnStartupSec = "30s";
OnCalendar = cfg.timer.interval;
Persistent = true;
};
wantedBy = [ "timers.target" ];
};
};
meta.maintainers = with lib.maintainers; [ doronbehar ];

50
nixos/modules/services/security/e-imzo.nix Normal file
View file

@ -0,0 +1,50 @@
{
config,
lib,
pkgs,
...
}:
let
cfg = config.services.e-imzo;
in
{
options = {
services.e-imzo = {
enable = lib.mkEnableOption "E-IMZO";
package = lib.mkPackageOption pkgs "e-imzo" {
extraDescription = "Official mirror deletes old versions as soon as they release new one. Feel free to use either unstable or your own custom e-imzo package and ping maintainer.";
};
};
};
config = lib.mkIf cfg.enable {
systemd.user.services.e-imzo = {
enable = true;
description = "E-IMZO, uzbek state web signing service";
documentation = [ "https://github.com/xinux-org/e-imzo" ];
after = [
"network-online.target"
"graphical.target"
];
wants = [
"network-online.target"
"graphical.target"
];
wantedBy = [ "default.target" ];
serviceConfig = {
Type = "simple";
Restart = "always";
RestartSec = 1;
ExecStart = lib.getExe cfg.package;
NoNewPrivileges = true;
SystemCallArchitectures = "native";
};
};
};
meta.maintainers = with lib.maintainers; [ orzklv ];
}

225
nixos/modules/services/web-apps/karakeep.nix Normal file
View file

@ -0,0 +1,225 @@
{
config,
lib,
pkgs,
...
}:
let
cfg = config.services.karakeep;
karakeepEnv = lib.mkMerge [
{ DATA_DIR = "/var/lib/karakeep"; }
(lib.mkIf cfg.meilisearch.enable {
MEILI_ADDR = "http://127.0.0.1:${toString config.services.meilisearch.listenPort}";
})
(lib.mkIf cfg.browser.enable {
BROWSER_WEB_URL = "http://127.0.0.1:${toString cfg.browser.port}";
})
cfg.extraEnvironment
];
environmentFiles = [
"/var/lib/karakeep/settings.env"
] ++ (lib.optional (cfg.environmentFile != null) cfg.environmentFile);
in
{
options = {
services.karakeep = {
enable = lib.mkEnableOption "Enable the Karakeep service";
package = lib.mkPackageOption pkgs "karakeep" { };
extraEnvironment = lib.mkOption {
description = ''
Environment variables to pass to Karakaeep. This is how most settings
can be configured. Changing DATA_DIR is possible but not supported.
See https://docs.karakeep.app/configuration/
'';
type = lib.types.attrsOf lib.types.str;
default = { };
example = lib.literalExpression ''
{
PORT = "1234";
DISABLE_SIGNUPS = "true";
DISABLE_NEW_RELEASE_CHECK = "true";
}
'';
};
environmentFile = lib.mkOption {
type = lib.types.nullOr lib.types.path;
default = null;
description = ''
An optional path to an environment file that will be used in the web and workers
services. This is useful for loading private keys.
'';
example = "/var/lib/karakeep/secrets.env";
};
browser = {
enable = lib.mkOption {
description = ''
Enable the karakeep-browser service that runs a chromium instance in
the background with debugging ports exposed. This is necessary for
certain features like screenshots.
'';
type = lib.types.bool;
default = true;
};
port = lib.mkOption {
description = "The port the browser should run on.";
type = lib.types.port;
default = 9222;
};
exe = lib.mkOption {
description = "The browser executable (must be Chrome-like).";
type = lib.types.str;
default = "${pkgs.chromium}/bin/chromium";
defaultText = lib.literalExpression "\${pkgs.chromium}/bin/chromium";
example = lib.literalExpression "\${pkgs.google-chrome}/bin/google-chrome-stable";
};
};
meilisearch = {
enable = lib.mkOption {
type = lib.types.bool;
default = true;
description = ''
Enable Meilisearch and configure Karakeep to use it. Meilisearch is
required for text search.
'';
};
};
};
};
config = lib.mkIf cfg.enable {
environment.systemPackages = [ cfg.package ];
users.groups.karakeep = { };
users.users.karakeep = {
isSystemUser = true;
group = "karakeep";
};
services.meilisearch = lib.mkIf cfg.meilisearch.enable {
enable = true;
};
systemd.services.karakeep-init = {
description = "Initialize Karakeep Data";
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
partOf = [ "karakeep.service" ];
path = [ pkgs.openssl ];
script = ''
umask 0077
if [ ! -f "$STATE_DIRECTORY/settings.env" ]; then
cat <<EOF >"$STATE_DIRECTORY/settings.env"
# Generated by NixOS Karakeep module
MEILI_MASTER_KEY=$(openssl rand -base64 36)
NEXTAUTH_SECRET=$(openssl rand -base64 36)
EOF
fi
export DATA_DIR="$STATE_DIRECTORY"
exec "${cfg.package}/lib/karakeep/migrate"
'';
serviceConfig = {
Type = "oneshot";
RemainAfterExit = true;
User = "karakeep";
Group = "karakeep";
StateDirectory = "karakeep";
PrivateTmp = "yes";
};
};
systemd.services.karakeep-workers = {
description = "Karakeep Workers";
wantedBy = [ "multi-user.target" ];
after = [
"network.target"
"karakeep-init.service"
];
partOf = [ "karakeep.service" ];
path = [
pkgs.monolith
pkgs.yt-dlp
];
environment = karakeepEnv;
serviceConfig = {
User = "karakeep";
Group = "karakeep";
ExecStart = "${cfg.package}/lib/karakeep/start-workers";
StateDirectory = "karakeep";
EnvironmentFile = environmentFiles;
PrivateTmp = "yes";
};
};
systemd.services.karakeep-web = {
description = "Karakeep Web";
wantedBy = [ "multi-user.target" ];
after = [
"network.target"
"karakeep-init.service"
"karakeep-workers.service"
];
partOf = [ "karakeep.service" ];
environment = karakeepEnv;
serviceConfig = {
ExecStart = "${cfg.package}/lib/karakeep/start-web";
User = "karakeep";
Group = "karakeep";
StateDirectory = "karakeep";
EnvironmentFile = environmentFiles;
PrivateTmp = "yes";
};
};
systemd.services.karakeep-browser = lib.mkIf cfg.browser.enable {
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
partOf = [ "karakeep.service" ];
script = ''
export HOME="$CACHE_DIRECTORY"
exec ${cfg.browser.exe} \
--headless --no-sandbox --disable-gpu --disable-dev-shm-usage \
--remote-debugging-address=127.0.0.1 \
--remote-debugging-port=${toString cfg.browser.port} \
--hide-scrollbars \
--user-data-dir="$STATE_DIRECTORY"
'';
serviceConfig = {
Type = "simple";
Restart = "on-failure";
CacheDirectory = "karakeep-browser";
StateDirectory = "karakeep-browser";
DevicePolicy = "closed";
DynamicUser = true;
LockPersonality = true;
NoNewPrivileges = true;
PrivateDevices = true;
PrivateTmp = true;
PrivateUsers = true;
ProtectClock = true;
ProtectControlGroups = true;
ProtectHostname = true;
ProtectKernelLogs = true;
ProtectKernelModules = true;
ProtectKernelTunables = true;
ProtectSystem = "strict";
RestrictNamespaces = true;
RestrictRealtime = true;
};
};
};
meta = {
maintainers = [ lib.maintainers.three ];
};
}

12
nixos/tests/all-tests.nix
View file

@ -281,8 +281,6 @@ in
calibre-server = import ./calibre-server.nix { inherit pkgs runTest; };
canaille = handleTest ./canaille.nix { };
castopod = handleTest ./castopod.nix { };
cassandra_3_0 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_3_0; };
cassandra_3_11 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_3_11; };
cassandra_4 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_4; };
centrifugo = runTest ./centrifugo.nix;
ceph-multi-node = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./ceph-multi-node.nix { };
@ -914,7 +912,7 @@ in
nifi = runTestOn [ "x86_64-linux" ] ./web-apps/nifi.nix;
nitter = handleTest ./nitter.nix { };
nix-config = handleTest ./nix-config.nix { };
nix-ld = handleTest ./nix-ld.nix { };
nix-ld = runTest ./nix-ld.nix;
nix-misc = handleTest ./nix/misc.nix { };
nix-upgrade = handleTest ./nix/upgrade.nix { inherit (pkgs) nixVersions; };
nix-required-mounts = runTest ./nix-required-mounts;
@ -1419,14 +1417,14 @@ in
imports = [ ./varnish.nix ];
_module.args.package = pkgs.varnish60;
};
varnish75 = runTest {
imports = [ ./varnish.nix ];
_module.args.package = pkgs.varnish75;
};
varnish76 = runTest {
imports = [ ./varnish.nix ];
_module.args.package = pkgs.varnish76;
};
varnish77 = runTest {
imports = [ ./varnish.nix ];
_module.args.package = pkgs.varnish77;
};
vault = handleTest ./vault.nix { };
vault-agent = handleTest ./vault-agent.nix { };
vault-dev = handleTest ./vault-dev.nix { };

38
nixos/tests/nix-ld.nix
View file

@ -1,14 +1,12 @@
{ ... }:
{
system ? builtins.currentSystem,
config ? { },
pkgs ? import ../.. { inherit system config; },
}:
let
inherit (import ../lib/testing-python.nix { inherit system pkgs; }) makeTest;
shared =
name = "nix-ld";
nodes.machine =
{ config, pkgs, ... }:
{
programs.nix-ld.enable = true;
environment.systemPackages = [
(pkgs.runCommand "patched-hello" { } ''
install -D -m755 ${pkgs.hello}/bin/hello $out/bin/hello
@ -16,25 +14,9 @@ let
'')
];
};
in
{
nix-ld = makeTest {
name = "nix-ld";
nodes.machine = shared;
testScript = ''
start_all()
machine.succeed("hello")
'';
};
nix-ld-rs = makeTest {
name = "nix-ld-rs";
nodes.machine = {
imports = [ shared ];
programs.nix-ld.package = pkgs.nix-ld-rs;
};
testScript = ''
start_all()
machine.succeed("hello")
'';
};
testScript = ''
start_all()
machine.succeed("hello")
'';
}

2
pkgs/applications/networking/browsers/firefox/wrapper.nix
View file

@ -487,7 +487,7 @@ let
done
fi
install -D -t $out/share/applications $desktopItem/share/applications/*
install -m 644 -D -t $out/share/applications $desktopItem/share/applications/*
''
+ lib.optionalString hasMozSystemDirPatch ''

6
pkgs/applications/virtualization/docker/default.nix
View file

@ -404,11 +404,11 @@ rec {
};
docker_28 = callPackage dockerGen rec {
version = "28.0.4";
version = "28.1.1";
cliRev = "v${version}";
cliHash = "sha256-DLUcmxbCxJs3EA96SGaesA+GzvHq6DC2vrGe5PvA0dE=";
cliHash = "sha256-bRnJ+c2C4t+94NL82L0S3r84uoJaTDq16YQGvEmo7Sw=";
mobyRev = "v${version}";
mobyHash = "sha256-yvz8MUOU61OuphPaIDu6+1wsbCXkIxJYQKK0fhcVwp0=";
mobyHash = "sha256-FB9btun41PAqqBjb9Ebn7SyjrIg/ILe3xJ+mqu2lqrs=";
runcRev = "v1.2.6";
runcHash = "sha256-XMN+YKdQOQeOLLwvdrC6Si2iAIyyHD5RgZbrOHrQE/g=";
containerdRev = "v1.7.27";

6
pkgs/by-name/al/aliae/package.nix
View file

@ -8,16 +8,16 @@
buildGoModule rec {
pname = "aliae";
version = "0.26.4";
version = "0.26.5";
src = fetchFromGitHub {
owner = "jandedobbeleer";
repo = "aliae";
tag = "v${version}";
hash = "sha256-Xyj/CEvYnVz8bX0vMsFAyRY7Hp6heHFjvq+VeCYWXow=";
hash = "sha256-F5OteK1D0MCNyiZG6iz3vawkx74WJKst2Yr6ca8TYZw=";
};
vendorHash = "sha256-wNcn7ATUumuki8IQIrs7f8cf3uD7sMFlaS6BhgpEMVM=";
vendorHash = "sha256-TsJU1oAc1T+VdUYzrcyflTPYJhG6sPjFNZ7bZKk1KdM=";
sourceRoot = "${src.name}/src";

4
pkgs/by-name/bu/butt/package.nix
View file

@ -21,11 +21,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "butt";
version = "1.44.0";
version = "1.45.0";
src = fetchurl {
url = "https://danielnoethen.de/butt/release/${finalAttrs.version}/butt-${finalAttrs.version}.tar.gz";
hash = "sha256-2RC0ChDbyhzjd+4jnBRuR0botIVQugpA1rUZm1yH4Kc=";
hash = "sha256-iEmFEJRsTvHeKGYvnhzYXSC/q0DSw0Z/YgK4buDtg2Q=";
};
postPatch = ''

6
pkgs/by-name/co/codebook/package.nix
View file

@ -9,17 +9,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "codebook";
version = "0.2.9";
version = "0.2.10";
src = fetchFromGitHub {
owner = "blopker";
repo = "codebook";
tag = "v${finalAttrs.version}";
hash = "sha256-iJ9S9DDoZVZxZ1o9dkor8PGM6Z+FljWZfetWFFMOIIo=";
hash = "sha256-LH5/xMbmHo0vBlPnNTsj3iX6gvBp9PFGZcAy999402E=";
};
buildAndTestSubdir = "crates/codebook-lsp";
cargoHash = "sha256-PmhfEftgto0FHOIfryN9JME9S+/CarAEZ6hV/vj37Eg=";
cargoHash = "sha256-EbcG99T0T5Hh7bRI5I3gf9qBiOcnl0EoCtVIfcJHeJg=";
nativeBuildInputs = [
pkg-config

6
pkgs/by-name/da/dalfox/package.nix
View file

@ -6,16 +6,16 @@
buildGoModule rec {
pname = "dalfox";
version = "2.10.0";
version = "2.11.0";
src = fetchFromGitHub {
owner = "hahwul";
repo = "dalfox";
tag = "v${version}";
hash = "sha256-F4CXVgHdEjSMK3YIF5X6zCVVI17GkIE3KGAE1OxfhyY=";
hash = "sha256-EM5T8uBMSkjxd7wTaMFPpbErAhcN2oLaV2g8MAxb0lQ=";
};
vendorHash = "sha256-Nt0Rgwrjs2irKPnt5G/32VH3Wj19+xnh+gLspWDnKCY=";
vendorHash = "sha256-EgNE3Z/NZ1lV0BPVe4MhB9bIYSMLftzYfmw65ktSo7A=";
ldflags = [
"-w"

6
pkgs/by-name/du/duckdb/versions.json
View file

@ -1,5 +1,5 @@
{
"version": "1.2.1",
"rev": "8e52ec43959ab363643d63cb78ee214577111da4",
"hash": "sha256-ez5BBZ+Yw+UkdpI3VvRZrYZPfk3Nkk3JmrJBdg8N+e0="
"version": "1.2.2",
"rev": "7c039464e452ddc3330e2691d3fa6d305521d09b",
"hash": "sha256-cHQcEA9Gpza/edEVyXUYiINC/Q2b3bf+zEQbl/Otfr4="
}

27
pkgs/by-name/ez/eztrace/0001-otf2-backend-cross.patch Normal file
View file

@ -0,0 +1,27 @@
diff --git a/cmake_modules/FindOTF2.cmake b/cmake_modules/FindOTF2.cmake
index 2853f92a..af1f3225 100644
--- a/cmake_modules/FindOTF2.cmake
+++ b/cmake_modules/FindOTF2.cmake
@@ -15,11 +15,11 @@ IF(NOT OTF2_CONFIG OR NOT EXISTS ${OTF2_CONFIG})
ELSE()
message(STATUS "OTF2 installation found. (using ${OTF2_CONFIG})")
- execute_process(COMMAND ${OTF2_CONFIG} "--cppflags" OUTPUT_VARIABLE OTF2_INCLUDE_PATH)
+ execute_process(COMMAND ${OTF2_CONFIG} "--cppflags" "--target" "backend" OUTPUT_VARIABLE OTF2_INCLUDE_PATH)
STRING(REPLACE "\n" "" OTF2_INCLUDE_PATH ${OTF2_INCLUDE_PATH})
STRING(REPLACE "-I" "" OTF2_INCLUDE_PATH ${OTF2_INCLUDE_PATH})
- execute_process(COMMAND ${OTF2_CONFIG} "--ldflags" OUTPUT_VARIABLE _LINK_LD_ARGS)
+ execute_process(COMMAND ${OTF2_CONFIG} "--ldflags" "--target" "backend" OUTPUT_VARIABLE _LINK_LD_ARGS)
STRING( REPLACE " " ";" _LINK_LD_ARGS ${_LINK_LD_ARGS} )
FOREACH( _ARG ${_LINK_LD_ARGS} )
IF(${_ARG} MATCHES "^-L")
@@ -29,7 +29,7 @@ ELSE()
ENDIF(${_ARG} MATCHES "^-L")
ENDFOREACH(_ARG)
- execute_process(COMMAND ${OTF2_CONFIG} "--libs" OUTPUT_VARIABLE _LINK_LD_ARGS)
+ execute_process(COMMAND ${OTF2_CONFIG} "--libs" "--target" "backend" OUTPUT_VARIABLE _LINK_LD_ARGS)
STRING( REPLACE " " ";" _LINK_LD_ARGS ${_LINK_LD_ARGS} )
FOREACH( _ARG ${_LINK_LD_ARGS} )
IF(${_ARG} MATCHES "^-l")

23
pkgs/by-name/ez/eztrace/0002-absolute-cmake-install-paths.patch Normal file
View file

@ -0,0 +1,23 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b36a8a94..74c6de2e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -195,8 +195,16 @@ set(EZTRACE_LIB_DIR ${CMAKE_INSTALL_FULL_LIBDIR})
#set(__PPTRACE_BINARY_TYPE "PPTRACE_BINARY_TYPE_BFD")
#set(abs_top_builddir ${CMAKE_BINARY_DIR})
-set(INSTALL_INCLUDEDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}")
-set(INSTALL_LIBDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
+if(IS_ABSOLUTE ${CMAKE_INSTALL_INCLUDEDIR})
+ set(INSTALL_INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}")
+else()
+ set(INSTALL_INCLUDEDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}")
+endif()
+if(IS_ABSOLUTE ${CMAKE_INSTALL_LIBDIR})
+ set(INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}")
+else()
+ set(INSTALL_LIBDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
+endif()
set(INSTALL_PKGCONFIG_DIR "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
# Subdirectory

97
pkgs/by-name/ez/eztrace/package.nix
View file

@ -2,43 +2,98 @@
lib,
stdenv,
fetchFromGitLab,
cmake,
gfortran,
libelf,
libiberty,
zlib,
# Once https://gitlab.com/eztrace/eztrace/-/issues/41
# is released we can switch to latest binutils.
libbfd_2_38,
libopcodes_2_38,
autoreconfHook,
libbfd,
libopcodes,
otf2,
versionCheckHook,
}:
stdenv.mkDerivation rec {
pname = "EZTrace";
version = "1.1-11";
stdenv.mkDerivation (finalAttrs: {
pname = "eztrace";
version = "2.1.1";
outputs = [
"out"
"dev"
"lib"
"man"
];
src = fetchFromGitLab {
owner = "eztrace";
repo = "eztrace";
rev = "eztrace-${version}";
hash = "sha256-A6HMr4ib5Ka1lTbbTQOdq3kIdCoN/CwAKRdXdv9wpfU=";
tag = "${finalAttrs.version}";
hash = "sha256-ccW4YjEf++tkdIJLze2x8B/SWbBBXnYt8UV9OH8+KGU=";
};
nativeBuildInputs = [
gfortran
autoreconfHook
# Possibly upstream these patches.
patches = [
./0001-otf2-backend-cross.patch # To fix cross.
./0002-absolute-cmake-install-paths.patch # To fix generated .pc file
];
postPatch = ''
substituteInPlace src/eztrace-lib/eztrace_otf2.c \
--replace-fail "/bin/rm" "rm"
substituteInPlace cmake_modules/FindOTF2.cmake \
--replace-fail "find_program(OTF2_CONFIG otf2-config REQUIRED)" \
"find_program(OTF2_CONFIG "${lib.getExe' otf2 "otf2-config"}" REQUIRED)" \
--replace-fail "find_program(OTF2_PRINT otf2-print REQUIRED)" \
"find_program(OTF2_PRINT "${lib.getExe' otf2 "otf2-print"}" REQUIRED)"
# 2.1.1 incorrectly reports 2.1.0. TODO: Remove after next release
substituteInPlace CMakeLists.txt \
--replace-fail "2.1.0" "${finalAttrs.version}"
patchShebangs test
'';
strictDeps = true;
cmakeFlags = [
(lib.cmakeBool "EZTRACE_ENABLE_MEMORY" true)
# This test is somewhat flaky and fails once per several rebuilds.
(lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "--exclude-regex;memory_tests")
];
nativeBuildInputs = [
cmake
gfortran
];
buildInputs = [
libelf
libiberty
zlib
libbfd_2_38
libopcodes_2_38
libbfd
libopcodes
otf2
];
meta = with lib; {
doCheck = true;
nativeCheckInputs = [
otf2 # `otf2-print` needed by compiler_instrumentation_tests,pthread_tests,posixio_tests
];
postInstall = ''
moveToOutput bin/eztrace_create_plugin "$dev"
'';
doInstallCheck = true;
nativeInstallCheckInputs = [ versionCheckHook ];
meta = {
description = "Tool that aims at generating automatically execution trace from HPC programs";
license = licenses.cecill-b;
maintainers = [ ];
homepage = "https://eztrace.gitlab.io/eztrace/index.html";
downloadPage = "https://gitlab.com/eztrace/eztrace/";
license = lib.licenses.cecill-b;
maintainers = [ lib.maintainers.xokdvium ];
mainProgram = "eztrace";
badPlatforms = [
# Undefined symbols for architecture x86_64:
# > "___cyg_profile_func_enter", referenced from:
lib.systems.inspect.patterns.isDarwin
];
};
}
})

23
pkgs/by-name/fc/fcast-receiver/package.nix
View file

@ -6,31 +6,32 @@
copyDesktopItems,
makeWrapper,
electron,
rsync,
}:
buildNpmPackage rec {
pname = "fcast-receiver";
version = "1.0.14";
version = "2.0.0";
src = fetchFromGitLab {
domain = "gitlab.futo.org";
owner = "videostreaming";
repo = "fcast";
rev = "c7a1cb27c470870df50dbf0de00a133061298d46";
hash = "sha256-9xF1DZ2wt6zMoUQywmvnNN3Z8m4GhOFJElENhozF9c8=";
rev = "4af2a537ef431918a5cf53b3ba18abe6b2d18c1e";
hash = "sha256-Y3IyxYLGRi/fLh5A3ap+5x3Wny9WRplaYtBM3R3I8+U=";
};
sourceRoot = "${src.name}/receivers/electron";
makeCacheWritable = true;
npmDepsHash = "sha256-gpbFZ8rKYR/GUY1l4eH5io/lz6FpJLUTl5h8q3haxvw=";
npmDepsHash = "sha256-GXlqOukGWtt3KP+xsAiDsUG2Naej0v2RL7Vq3hqcavE=";
env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
desktopItems = [
(makeDesktopItem {
name = pname;
name = "fcast-receiver";
desktopName = "FCast Receiver";
genericName = "Media Streaming Receiver";
exec = "fcast-receiver";
@ -42,24 +43,26 @@ buildNpmPackage rec {
nativeBuildInputs = [
copyDesktopItems
makeWrapper
rsync
];
postInstall = ''
install -Dm644 $out/lib/node_modules/fcast-receiver/app.png $out/share/pixmaps/fcast-receiver.png
install -Dm644 assets/icons/app/icon.png $out/share/pixmaps/fcast-receiver.png
ln -s $out/lib/node_modules/fcast-receiver/package.json $out/lib/node_modules/fcast-receiver/dist/package.json
makeWrapper ${electron}/bin/electron $out/bin/fcast-receiver \
--add-flags $out/lib/node_modules/fcast-receiver/dist/bundle.js
'';
meta = with lib; {
meta = {
description = "FCast Receiver, an open-source media streaming receiver";
longDescription = ''
FCast Receiver is a receiver for an open-source media streaming protocol, FCast, an alternative to Chromecast and AirPlay.
'';
homepage = "https://fcast.org/";
license = licenses.gpl3;
maintainers = with maintainers; [ ymstnt ];
license = lib.licenses.gpl3;
maintainers = with lib.maintainers; [ ymstnt ];
mainProgram = "fcast-receiver";
platforms = platforms.linux;
platforms = lib.platforms.linux;
};
}

24
pkgs/by-name/ff/ffmpeg-normalize/package.nix
View file

@ -4,23 +4,31 @@
fetchPypi,
ffmpeg,
}:
python3Packages.buildPythonApplication rec {
pname = "ffmpeg-normalize";
version = "1.28.3";
version = "1.31.3";
src = fetchPypi {
inherit pname version;
hash = "sha256-8wNPuVRQRQpFK6opgwqdKYMYmAFRqq8p/T5V9kC8QaY=";
inherit version;
pname = "ffmpeg_normalize";
hash = "sha256-sewDSBUX6gCZSIHeRtpx5fQGtOKN8OWZKrtCF2bgI9Y=";
};
propagatedBuildInputs = [
ffmpeg
python3Packages.ffmpeg-progress-yield
];
dependencies = with python3Packages; [ colorlog ];
dependencies =
with python3Packages;
[
colorlog
ffmpeg-progress-yield
]
++ [ ffmpeg ];
checkPhase = ''
runHook preCheck
$out/bin/ffmpeg-normalize --help > /dev/null
runHook postCheck
'';
meta = {

4
pkgs/by-name/go/go-ethereum/package.nix
View file

@ -17,13 +17,13 @@ let
in
buildGoModule rec {
pname = "go-ethereum";
version = "1.15.6";
version = "1.15.8";
src = fetchFromGitHub {
owner = "ethereum";
repo = pname;
rev = "v${version}";
hash = "sha256-BdNv0rx+9/F0leNj2AAej8psy8X8HysDrIXheVOOkSo=";
hash = "sha256-dEGPObm3Hy2MHOYrk+lga0PAeHrdSt0jfsTrk74wCUA=";
};
proxyVendor = true;

6
pkgs/by-name/h2/h2o/package.nix
View file

@ -21,13 +21,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "h2o";
version = "2.3.0.20250417";
version = "2.3.0.20250421";
src = fetchFromGitHub {
owner = "h2o";
repo = "h2o";
rev = "a5f5c212bfbec54a6c098a21cf5f9c0b0b5d5895";
sha256 = "sha256-+naLQWYx/nGOT24UbxzVl2UFW1sx9HksZkXahIm9byQ=";
rev = "be7c58007376d5a01f20400ca54bb8db01528ccd";
sha256 = "sha256-ewuTRdDtAQF1z/r0ukkaCaNS5gOFgykGvuqUmocEsBg=";
};
outputs = [

5
pkgs/by-name/ho/hoarder/helpers/hoarder-cli
View file

@ -1,5 +0,0 @@
#!/usr/bin/env bash
set -eu -o pipefail
HOARDER_LIB_PATH=
NODEJS=
exec "$NODEJS/bin/node" "$HOARDER_LIB_PATH/apps/cli/dist/index.mjs" "$@"

5
pkgs/by-name/ka/karakeep/helpers/karakeep Executable file
View file

@ -0,0 +1,5 @@
#!/usr/bin/env bash
set -eu -o pipefail
KARAKEEP_LIB_PATH=
NODEJS=
exec "$NODEJS/bin/node" "$KARAKEEP_LIB_PATH/apps/cli/dist/index.mjs" "$@"

4
pkgs/by-name/ho/hoarder/helpers/migrate → pkgs/by-name/ka/karakeep/helpers/migrate
View file

@ -1,10 +1,10 @@
#!/usr/bin/env bash
set -eu -o pipefail
HOARDER_LIB_PATH=
KARAKEEP_LIB_PATH=
RELEASE=
NODE_ENV=production
[[ -d "$DATA_DIR" ]] # Ensure DATA_DIR is defined and exists
export RELEASE NODE_ENV
exec "$HOARDER_LIB_PATH/node_modules/.bin/tsx" "$HOARDER_LIB_PATH/packages/db/migrate.ts" "$@"
exec "$KARAKEEP_LIB_PATH/node_modules/.bin/tsx" "$KARAKEEP_LIB_PATH/packages/db/migrate.ts" "$@"

4
pkgs/by-name/ho/hoarder/helpers/start-web → pkgs/by-name/ka/karakeep/helpers/start-web
View file

@ -1,6 +1,6 @@
#!/usr/bin/env bash
set -eu -o pipefail
HOARDER_LIB_PATH=
KARAKEEP_LIB_PATH=
RELEASE=
NODEJS=
NODE_ENV=production
@ -8,4 +8,4 @@ NODE_ENV=production
[[ -d "$DATA_DIR" ]] # Ensure DATA_DIR is defined and exists
export RELEASE NODE_ENV
exec "$NODEJS/bin/node" "$HOARDER_LIB_PATH/apps/web/.next/standalone/apps/web/server.js"
exec "$NODEJS/bin/node" "$KARAKEEP_LIB_PATH/apps/web/.next/standalone/apps/web/server.js"

6
pkgs/by-name/ho/hoarder/helpers/start-workers → pkgs/by-name/ka/karakeep/helpers/start-workers
View file

@ -1,11 +1,11 @@
#!/usr/bin/env bash
set -eu -o pipefail
HOARDER_LIB_PATH=
KARAKEEP_LIB_PATH=
RELEASE=
NODE_ENV=production
NODE_PATH="$HOARDER_LIB_PATH/apps/workers"
NODE_PATH="$KARAKEEP_LIB_PATH/apps/workers"
[[ -d "$DATA_DIR" ]] # Ensure DATA_DIR is defined and exists
export RELEASE NODE_ENV NODE_PATH
exec "$HOARDER_LIB_PATH/node_modules/.bin/tsx" "$HOARDER_LIB_PATH/apps/workers/index.ts"
exec "$KARAKEEP_LIB_PATH/node_modules/.bin/tsx" "$KARAKEEP_LIB_PATH/apps/workers/index.ts"

50
pkgs/by-name/ho/hoarder/package.nix → pkgs/by-name/ka/karakeep/package.nix
View file

@ -14,14 +14,14 @@ let
pnpm = pnpm_9;
in
stdenv.mkDerivation (finalAttrs: {
pname = "hoarder";
version = "0.23.0";
pname = "karakeep";
version = "0.23.2";
src = fetchFromGitHub {
owner = "hoarder-app";
repo = "hoarder";
owner = "karakeep-app";
repo = "karakeep";
tag = "v${finalAttrs.version}";
hash = "sha256-ro2+jXfp83JfQ9HQr0imy7aohSFbH5J6Wx5bxhMT5TM=";
hash = "sha256-Cm6e1XEmMHzQ3vODxa9+Yuwt+9zLvQ9S7jmwAozjA/k=";
};
patches = [
@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
'';
};
hash = "sha256-FzQPBIwe7OQ1KHaMtWaFe+RI+pXko5Ly11/jOmYSuFA=";
hash = "sha256-HZb11CAbnlGSmP/Gxyjncd/RuIWkPv3GvwYs9QZ12Ss=";
};
buildPhase = ''
runHook preBuild
@ -81,56 +81,56 @@ stdenv.mkDerivation (finalAttrs: {
installPhase = ''
runHook preInstall
mkdir -p $out/share/doc/hoarder
cp README.md LICENSE $out/share/doc/hoarder
mkdir -p $out/share/doc/karakeep
cp README.md LICENSE $out/share/doc/karakeep
# Copy necessary files into lib/hoarder while keeping the directory structure
# Copy necessary files into lib/karakeep while keeping the directory structure
LIB_TO_COPY="node_modules apps/web/.next/standalone apps/cli/dist apps/workers packages/db packages/shared packages/trpc"
HOARDER_LIB_PATH="$out/lib/hoarder"
KARAKEEP_LIB_PATH="$out/lib/karakeep"
for DIR in $LIB_TO_COPY; do
mkdir -p "$HOARDER_LIB_PATH/$DIR"
cp -a $DIR/{.,}* "$HOARDER_LIB_PATH/$DIR"
chmod -R u+w "$HOARDER_LIB_PATH/$DIR"
mkdir -p "$KARAKEEP_LIB_PATH/$DIR"
cp -a $DIR/{.,}* "$KARAKEEP_LIB_PATH/$DIR"
chmod -R u+w "$KARAKEEP_LIB_PATH/$DIR"
done
# NextJS requires static files are copied in a specific way
# https://nextjs.org/docs/pages/api-reference/config/next-config-js/output#automatically-copying-traced-files
cp -r ./apps/web/public "$HOARDER_LIB_PATH/apps/web/.next/standalone/apps/web/"
cp -r ./apps/web/.next/static "$HOARDER_LIB_PATH/apps/web/.next/standalone/apps/web/.next/"
cp -r ./apps/web/public "$KARAKEEP_LIB_PATH/apps/web/.next/standalone/apps/web/"
cp -r ./apps/web/.next/static "$KARAKEEP_LIB_PATH/apps/web/.next/standalone/apps/web/.next/"
# Copy and patch helper scripts
for HELPER_SCRIPT in ${./helpers}/*; do
HELPER_SCRIPT_NAME="$(basename "$HELPER_SCRIPT")"
cp "$HELPER_SCRIPT" "$HOARDER_LIB_PATH/"
substituteInPlace "$HOARDER_LIB_PATH/$HELPER_SCRIPT_NAME" \
--replace-warn "HOARDER_LIB_PATH=" "HOARDER_LIB_PATH=$HOARDER_LIB_PATH" \
cp "$HELPER_SCRIPT" "$KARAKEEP_LIB_PATH/"
substituteInPlace "$KARAKEEP_LIB_PATH/$HELPER_SCRIPT_NAME" \
--replace-warn "KARAKEEP_LIB_PATH=" "KARAKEEP_LIB_PATH=$KARAKEEP_LIB_PATH" \
--replace-warn "RELEASE=" "RELEASE=${finalAttrs.version}" \
--replace-warn "NODEJS=" "NODEJS=${nodejs}"
chmod +x "$HOARDER_LIB_PATH/$HELPER_SCRIPT_NAME"
patchShebangs "$HOARDER_LIB_PATH/$HELPER_SCRIPT_NAME"
chmod +x "$KARAKEEP_LIB_PATH/$HELPER_SCRIPT_NAME"
patchShebangs "$KARAKEEP_LIB_PATH/$HELPER_SCRIPT_NAME"
done
# The cli should be in bin/
mkdir -p $out/bin
mv "$HOARDER_LIB_PATH/hoarder-cli" $out/bin/
mv "$KARAKEEP_LIB_PATH/karakeep" $out/bin/
runHook postInstall
'';
postFixup = ''
# Remove large dependencies that are not necessary during runtime
rm -rf $out/lib/hoarder/node_modules/{@next,next,@swc,react-native,monaco-editor,faker,@typescript-eslint,@microsoft,@typescript-eslint,pdfjs-dist}
rm -rf $out/lib/karakeep/node_modules/{@next,next,@swc,react-native,monaco-editor,faker,@typescript-eslint,@microsoft,@typescript-eslint,pdfjs-dist}
# Remove broken symlinks
find $out -type l ! -exec test -e {} \; -delete
'';
meta = {
homepage = "https://github.com/hoarder-app/hoarder";
description = "Self-hostable bookmark-everything app with a touch of AI for the data hoarders out there";
homepage = "https://karakeep.app/";
description = "Self-hostable bookmark-everything app (links, notes and images) with AI-based automatic tagging and full text search";
license = lib.licenses.agpl3Only;
maintainers = [ lib.maintainers.three ];
mainProgram = "hoarder-cli";
mainProgram = "karakeep";
platforms = lib.platforms.linux;
};
})

0
pkgs/by-name/ho/hoarder/patches/dont-lock-pnpm-version.patch → pkgs/by-name/ka/karakeep/patches/dont-lock-pnpm-version.patch
View file

0
pkgs/by-name/ho/hoarder/patches/fix-migrations-path.patch → pkgs/by-name/ka/karakeep/patches/fix-migrations-path.patch
View file

0
pkgs/by-name/ho/hoarder/patches/use-local-font.patch → pkgs/by-name/ka/karakeep/patches/use-local-font.patch
View file

6
pkgs/by-name/me/meli/package.nix
View file

@ -25,7 +25,7 @@
rustPlatform.buildRustPackage rec {
pname = "meli";
version = "0.8.10";
version = "0.8.11";
src = fetchzip {
urls = [
@ -33,11 +33,11 @@ rustPlatform.buildRustPackage rec {
"https://codeberg.org/meli/meli/archive/v${version}.tar.gz"
"https://github.com/meli/meli/archive/refs/tags/v${version}.tar.gz"
];
hash = "sha256-MGnCX/6pnKNxDEqCcVWTl/fteMypk+N2PrJYRMP0sL0=";
hash = "sha256-q3vnvH0GWnrfYnk2WBRLTDInJ/wazI4JtkEMwiWanfI=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-OyOLAw3HzXY85Jwolh4Wqjmm6au6wRwGq5WkicOt5eg=";
cargoHash = "sha256-OAytdJgIiaS0xsHWOgNW2dkRQEyU9xcyaJtxClWzfjQ=";
# Needed to get openssl-sys to use pkg-config
OPENSSL_NO_VENDOR = 1;

1514
pkgs/by-name/ne/nezha-theme-admin/package-lock.json generated
View file

File diff suppressed because it is too large Load diff

6
pkgs/by-name/ne/nezha-theme-admin/package.nix
View file

@ -7,13 +7,13 @@
buildNpmPackage rec {
pname = "nezha-theme-admin";
version = "1.10.4";
version = "1.12.0";
src = fetchFromGitHub {
owner = "nezhahq";
repo = "admin-frontend";
tag = "v${version}";
hash = "sha256-TT/WCeHYi/Q5zpB8DCdJdAv8sJsm4J7q596qOqbCH4E=";
hash = "sha256-M1iJmSskXk0Qhr+p9yradZE4Xnf88F28NBUfJw4Wr34=";
};
# TODO: Switch to the bun build function once available in nixpkgs
@ -21,7 +21,7 @@ buildNpmPackage rec {
cp ${./package-lock.json} package-lock.json
'';
npmDepsHash = "sha256-vkToSpCqsXrbjMxmnlyBGeiWTQaQC04XBnCRtn9lEQU=";
npmDepsHash = "sha256-y0MnD6ymU4YDpNkTrEKMROHwllSVRm1LQeG0v3IPa0Y=";
npmPackFlags = [ "--ignore-scripts" ];

20
pkgs/by-name/ni/nix-ld/package.nix
View file

@ -8,19 +8,17 @@
rustPlatform.buildRustPackage rec {
pname = "nix-ld";
version = "2.0.3";
version = "2.0.4";
src = fetchFromGitHub {
owner = "mic92";
owner = "nix-community";
repo = "nix-ld";
rev = version;
hash = "sha256-NRkLjdMtVfC6dD1gEbYZWFEtbmC2xfD6ft1IP7l76Vw=";
hash = "sha256-ULoitJD5bMu0pFvh35cY5EEYywxj4e2fYOpqZwKB1lk=";
};
patches = [ ./rust-1.83.patch ];
useFetchCargoVendor = true;
cargoHash = "sha256-2CFdUZbKFl7cf6dik6XextuGG2vLM9oNS8rIyzLnfM4=";
cargoHash = "sha256-cDbszVjZcomag0HZvXM+17SjDiGS07iPj78zgsXstHc=";
hardeningDisable = [ "stackprotector" ];
@ -47,11 +45,11 @@ rustPlatform.buildRustPackage rec {
passthru.tests = nixosTests.nix-ld;
meta = with lib; {
meta = {
description = "Run unpatched dynamic binaries on NixOS";
homepage = "https://github.com/Mic92/nix-ld";
license = licenses.mit;
maintainers = with maintainers; [ mic92 ];
platforms = platforms.linux;
homepage = "https://github.com/nix-community/nix-ld";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ mic92 ];
platforms = lib.platforms.linux;
};
}

36
pkgs/by-name/ni/nix-ld/rust-1.83.patch
View file

@ -1,36 +0,0 @@
--- a/src/arch.rs
+++ b/src/arch.rs
@@ -142,7 +142,7 @@ cfg_match! {
#[naked]
unsafe extern "C" fn entry_trampoline() -> ! {
- core::arch::asm!(
+ core::arch::naked_asm!(
"lea r10, [rip + {context}]",
"mov r11, [r10 + {size} * 1]", // .env_entry
"test r11, r11",
@@ -153,7 +153,6 @@ cfg_match! {
"jmp [rip + {context}]",
context = sym TRAMPOLINE_CONTEXT,
size = const core::mem::size_of::<*const u8>(),
- options(noreturn),
)
}
}
@@ -162,7 +161,7 @@ cfg_match! {
#[naked]
unsafe extern "C" fn entry_trampoline() -> ! {
- core::arch::asm!(
+ core::arch::naked_asm!(
"adrp x8, {context}",
"ldr x9, [x8, {env_entry_off}]", // .env_entry
"cbz x9, 2f",
@@ -174,7 +173,6 @@ cfg_match! {
context = sym TRAMPOLINE_CONTEXT,
env_entry_off = const TrampolineContext::ENV_ENTRY_OFFSET,
env_string_off = const TrampolineContext::ENV_STRING_OFFSET,
- options(noreturn),
)
}
}

10
pkgs/by-name/oo/ooniprobe-cli/package.nix
View file

@ -6,16 +6,16 @@
buildGoModule rec {
pname = "ooniprobe-cli";
version = "3.24.0";
version = "3.25.0";
src = fetchFromGitHub {
owner = "ooni";
repo = "probe-cli";
rev = "v${version}";
hash = "sha256-jg09yIX3jHMp0PwSwy2RMwYhZm0haJFTmpwcyTc5I0A=";
tag = "v${version}";
hash = "sha256-6BZ1ZhlskvP1eYS/yMaPgR0gbAUDJS0rS3KId+Lq450=";
};
vendorHash = "sha256-QH5PyCvfJWWDhjH6Jo8O3wBq3MwfpHWKSuYMmpaqjWk=";
vendorHash = "sha256-WPfeelgKGY0zTfP19+x8PLBrCFpla2uJFstXxJM966o=";
subPackages = [ "cmd/ooniprobe" ];
@ -25,7 +25,7 @@ buildGoModule rec {
];
meta = with lib; {
changelog = "https://github.com/ooni/probe-cli/releases/tag/${src.rev}";
changelog = "https://github.com/ooni/probe-cli/releases/tag/${src.tag}";
description = "Open Observatory of Network Interference command line network probe";
homepage = "https://ooni.org/install/cli";
license = licenses.gpl3Plus;

36
pkgs/by-name/ot/otf2/package.nix
View file

@ -2,6 +2,8 @@
lib,
stdenv,
fetchurl,
buildPackages,
which,
versionCheckHook,
}:
@ -9,18 +11,48 @@ stdenv.mkDerivation (finalAttrs: {
pname = "otf2";
version = "3.1.1";
outputs = [
"out"
"lib"
"doc"
];
src = fetchurl {
url = "http://perftools.pages.jsc.fz-juelich.de/cicd/otf2/tags/otf2-${finalAttrs.version}/otf2-${finalAttrs.version}.tar.gz";
hash = "sha256-Wk4BOlGsTteU/jXFW3AM1yA0b9p/M+yEx2uGpfuICm4=";
};
configureFlags = [
"--enable-backend-test-runs"
postPatch = ''
substituteInPlace build-config/common/platforms/platform-backend-user-provided \
--replace-fail 'CC=' 'CC=${stdenv.cc.targetPrefix}cc' \
--replace-fail 'CXX=' 'CXX=${stdenv.cc.targetPrefix}c++'
substituteInPlace build-config/common/platforms/platform-frontend-user-provided \
--replace-fail 'CC_FOR_BUILD=' 'CC_FOR_BUILD=${buildPackages.stdenv.cc.targetPrefix}cc' \
--replace-fail 'CXX_FOR_BUILD=' 'CXX_FOR_BUILD=${buildPackages.stdenv.cc.targetPrefix}c++'
'';
strictDeps = true;
depsBuildBuild = [ buildPackages.stdenv.cc ];
configureFlags =
[
(lib.enableFeature finalAttrs.finalPackage.doCheck "backend-test-runs")
(lib.withFeature true "custom-compilers")
]
++ lib.optionals (!lib.systems.equals stdenv.buildPlatform stdenv.hostPlatform) [
"ac_scorep_cross_compiling=yes"
];
nativeBuildInputs = [
which # used in configure script
];
enableParallelBuilding = true;
nativeInstallCheckInputs = [ versionCheckHook ];
doCheck = true;
enableParallelChecking = true;
doInstallCheck = true;
versionCheckProgram = [ "${placeholder "out"}/bin/otf2-config" ];

6
pkgs/by-name/ra/rattler-build/package.nix
View file

@ -14,17 +14,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "rattler-build";
version = "0.39.0";
version = "0.40.0";
src = fetchFromGitHub {
owner = "prefix-dev";
repo = "rattler-build";
tag = "v${finalAttrs.version}";
hash = "sha256-8U48Jow/6mOBTxRgMUtW6CaTkhwaAu8Hkad3WjRdkEM=";
hash = "sha256-NwsNCd6ueCtvJp04fJTsfoXtfUlgZou+zwDHrXeUlhk=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-U9ebUV9Hkfu5clAffncMXBo/ujnVf80Qt6dOkzphWx4=";
cargoHash = "sha256-O0nTxgftGv70c8yv4qEG+fEZEXZ+H6fhUzd/p8CQMQ4=";
doCheck = false; # test requires network access

6
pkgs/by-name/sd/SDL2_gfx/package.nix
View file

@ -38,6 +38,10 @@ stdenv.mkDerivation (finalAttrs: {
"dev"
];
# Missing 'sincos()' implementation fails linking projects
# like 'freeciv_sdl2'.
env.NIX_LDFLAGS = "-lm";
configureFlags = [
(lib.enableFeature enableMmx "mmx")
(lib.enableFeature enableSdltest "sdltest")
@ -45,6 +49,8 @@ stdenv.mkDerivation (finalAttrs: {
strictDeps = true;
enableParallelBuilding = true;
passthru = {
tests.pkg-config = testers.hasPkgConfigModules {
package = finalAttrs.finalPackage;

2
pkgs/by-name/te/textlsp/package.nix
View file

@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec {
pygls
lsprotocol
language-tool-python
tree-sitter_0_21
tree-sitter
gitpython
appdirs
openai

8
pkgs/by-name/ti/tigerbeetle/package.nix
View file

@ -10,14 +10,14 @@ let
platform =
if stdenvNoCC.hostPlatform.isDarwin then "universal-macos" else stdenvNoCC.hostPlatform.system;
hash = builtins.getAttr platform {
"universal-macos" = "sha256-ryYQyt+qjNKiT3XQuAwaG65I8KIMrkM2QeL9WvFkyik=";
"x86_64-linux" = "sha256-VgV+K6DDtoX5CjqGUlSAZYVakAs4GWX6+8Fi9v29HjY=";
"aarch64-linux" = "sha256-euyfFe9iXnAnePYd1u4ymtWqKGrf7vNuOeS0jFtChCA=";
"universal-macos" = "sha256-6GDD3lS8g2F7cOBoqi32tKO2klY7JHtqJq8NIjTiH04=";
"x86_64-linux" = "sha256-BiRIScj309vOU5TvA19RdhUeVaGd+ke6GhTlVocbMRE=";
"aarch64-linux" = "sha256-4MlbXJ8dIHDtoXsUsJD76/YlgKt8faKhQVEeEyFi/T0=";
};
in
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "tigerbeetle";
version = "0.16.35";
version = "0.16.36";
src = fetchzip {
url = "https://github.com/tigerbeetle/tigerbeetle/releases/download/${finalAttrs.version}/tigerbeetle-${platform}.zip";

1
pkgs/by-name/tr/treefmt/with-config.nix
View file

@ -14,6 +14,7 @@ runCommand name
nativeBuildInputs = [ makeBinaryWrapper ];
treefmtExe = lib.getExe treefmt;
binPath = lib.makeBinPath runtimeInputs;
passthru = { inherit runtimeInputs; };
configFile = treefmt.buildConfig {
# Wrap user's modules with a default file location
_file = "<treefmt.withConfig settings arg>";

9
pkgs/by-name/xm/xmage/package.nix
View file

@ -8,11 +8,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "xmage";
version = "1.4.51-dev_2024-01-30_19-35";
version = "1.4.57-dev_2025-04-19_14-28";
src = fetchurl {
url = "http://xmage.today/files/mage-full_${finalAttrs.version}.zip";
sha256 = "sha256-ogi0hd2FoulTnc3gg5cpLwr4Jln71YA0WBBZFOT6apg=";
sha256 = "sha256-EeaUd81fqiPDqHiMP86E9gtdFi545PIBfCgb1i5Z5i0=";
};
preferLocalBuild = true;
@ -23,10 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
installPhase =
let
# upstream maintainers forgot to update version, so manual override for now
# strVersion = lib.substring 0 6 finalAttrs.version;
strVersion = "1.4.50";
strVersion = lib.substring 0 6 finalAttrs.version;
in
''
mkdir -p $out/bin

15
pkgs/by-name/za/zammad/fix-sendmail-location.diff
View file

@ -1,12 +1,13 @@
diff --git a/app/models/channel/driver/sendmail.rb b/app/models/channel/driver/sendmail.rb
index b15ef48a6..64c120a87 100644
index 475636c013..7f3149c331 100644
--- a/app/models/channel/driver/sendmail.rb
+++ b/app/models/channel/driver/sendmail.rb
@@ -32,6 +32,6 @@ def delivery_method(mail)
return mail.delivery_method :test if Rails.env.test?
- mail.delivery_method :sendmail
+ mail.delivery_method :sendmail, :location => '/run/wrappers/bin/sendmail'
@@ -30,7 +30,7 @@ class Channel::Driver::Sendmail < Channel::Driver::BaseEmailOutbound
# test
super(attr, notification, :test)
else
- super(attr, notification, :sendmail)
+ super(attr, notification, :sendmail, { location: '/run/wrappers/bin/sendmail' })
end
end
end

963
pkgs/by-name/za/zammad/gemset.nix
View file

File diff suppressed because it is too large Load diff

4
pkgs/by-name/za/zammad/package.nix
View file

@ -20,7 +20,7 @@
let
pname = "zammad";
version = "6.4.1";
version = "6.5.0";
src = applyPatches {
src = fetchFromGitHub (lib.importJSON ./source.json);
@ -81,7 +81,7 @@ stdenvNoCC.mkDerivation {
pnpmDeps = pnpm_9.fetchDeps {
inherit pname src;
hash = "sha256-bdm1nkJnXE7oZZhG2uBnk3fYhITaMROHGKPbf0G3bFs=";
hash = "sha256-mfdzb/LXQYL8kaQpWi9wD3OOroOOonDlJrhy9Dwl1no";
};
buildPhase = ''

4
pkgs/by-name/za/zammad/source.json
View file

@ -1,8 +1,8 @@
{
"owner": "zammad",
"repo": "zammad",
"rev": "453aeb09c1ad4584fae68b3a1c7d54b555d4384a",
"hash": "sha256-KlS9S6r787YJArhiWP0r4YsZQYEFet89MdwXGyrbe3g=",
"rev": "568ebbedd173a449eea2bd8c6f456b30ce106242",
"hash": "sha256-3EoKcAKIktdgzi2KO73YgFM1yCDhy2BYDMCS9xY6OSU=",
"fetchSubmodules": true
}

6
pkgs/development/python-modules/apkinspector/default.nix
View file

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "apkinspector";
version = "1.3.2";
version = "1.3.3";
pyproject = true;
disabled = pythonOlder "3.8";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "erev0s";
repo = "apkInspector";
tag = "v${version}";
hash = "sha256-trEbm9EFZLoFBWKKOlbI305r+8GdSmU5zWPnNhb5qzQ=";
hash = "sha256-KJ8B/KTT8oGKlON8/xDdxxZ61dGdOgyCrZlI5ENXpTw=";
};
build-system = [ poetry-core ];
@ -30,7 +30,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Module designed to provide detailed insights into the zip structure of APK files";
homepage = "https://github.com/erev0s/apkInspector";
changelog = "https://github.com/erev0s/apkInspector/releases/tag/v${version}";
changelog = "https://github.com/erev0s/apkInspector/releases/tag/${src.tag}";
license = licenses.asl20;
maintainers = with maintainers; [ fab ];
mainProgram = "apkInspector";

4
pkgs/development/python-modules/ayla-iot-unofficial/default.nix
View file

@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "ayla-iot-unofficial";
version = "1.4.8";
version = "1.5.0";
pyproject = true;
src = fetchFromGitHub {
owner = "rewardone";
repo = "ayla-iot-unofficial";
tag = "v${version}";
hash = "sha256-XFLNt+TwkowNoDcJJpaX9kKi+Gcx4JnzEU1JikpbzZ0=";
hash = "sha256-/Js2XMhGe4zPAjpeH2ON4377TAPaWPvA8+HEliYKxlw=";
};
build-system = [ setuptools ];

4
pkgs/development/python-modules/banks/default.nix
View file

@ -18,14 +18,14 @@
buildPythonPackage rec {
pname = "banks";
version = "2.1.1";
version = "2.1.2";
pyproject = true;
src = fetchFromGitHub {
owner = "masci";
repo = "banks";
tag = "v${version}";
hash = "sha256-bDOPWq941UGcRXlUO8CVewjmEDFHJH7OZaRTo1Iqbjw=";
hash = "sha256-lOlNYIBMa3G06t5KfRWNd/d8aXjxnWp11n8Kw7Ydy+Y=";
};
SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";

7
pkgs/development/python-modules/bosch-alarm-mode2/default.nix
View file

@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "bosch-alarm-mode2";
version = "0.4.3";
version = "0.4.6";
pyproject = true;
src = fetchFromGitHub {
owner = "mag1024";
repo = "bosch-alarm-mode2";
tag = "v${version}";
hash = "sha256-bVLwEPWpdCuLanEOAykvvVnL8C8JvOrbcVic/kV15BE=";
hash = "sha256-oTGkEguN4EFJI5+UhqxKBN1x2Ppf9wQ0AeYbiLi1fhk=";
};
build-system = [
@ -25,6 +25,9 @@ buildPythonPackage rec {
pythonImportsCheck = [ "bosch_alarm_mode2" ];
# upstream has no tests
doCheck = false;
meta = {
description = "Async Python library for interacting with Bosch Alarm Panels supporting the 'Mode 2' API";
homepage = "https://github.com/mag1024/bosch-alarm-mode2";

4
pkgs/development/python-modules/django-crispy-forms/default.nix
View file

@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "django-crispy-forms";
version = "2.3";
version = "2.4";
format = "pyproject";
src = fetchFromGitHub {
owner = "django-crispy-forms";
repo = "django-crispy-forms";
tag = version;
hash = "sha256-R2s2dUsVw5p7xn4yWeFcE7au8yHWXjFgS5jjCBveg04=";
hash = "sha256-YV7XUv5N2Xcf79/8EdI7XnVtpiX+yQBhQumSUbZmOfc=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/eheimdigital/default.nix
View file

@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "eheimdigital";
version = "1.0.6";
version = "1.1.0";
pyproject = true;
src = fetchFromGitHub {
owner = "autinerd";
repo = "eheimdigital";
tag = version;
hash = "sha256-ocDw7ZwuKSGQT8fPcZEbkKyRH0sCOJusopV0kM11rCw=";
hash = "sha256-dqQeRaPy9NtvRhmGUVBVzmORJNYxzM2X/ricJUBlCK0=";
};
build-system = [ hatchling ];

10
pkgs/development/python-modules/fuzzyfinder/default.nix
View file

@ -3,29 +3,29 @@
buildPythonPackage,
fetchFromGitHub,
pytestCheckHook,
setuptools,
setuptools-scm,
}:
buildPythonPackage rec {
pname = "fuzzyfinder";
version = "2.2.0";
version = "2.3.0";
pyproject = true;
src = fetchFromGitHub {
owner = "amjith";
repo = "fuzzyfinder";
tag = "v${version}";
hash = "sha256-QWUABljgtzsZONl1klCrxEh0tPYodMOXokEb3YvWsyg=";
hash = "sha256-Zqh2H2d2TCxErmEE9gQwdpzZBGsjeQIo3AxBsc+C5u0=";
};
build-system = [ setuptools ];
build-system = [ setuptools-scm ];
nativeCheckInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "fuzzyfinder" ];
meta = with lib; {
changelog = "https://github.com/amjith/fuzzyfinder/blob/${src.rev}/CHANGELOG.rst";
changelog = "https://github.com/amjith/fuzzyfinder/blob/${src.tag}/CHANGELOG.rst";
description = "Fuzzy Finder implemented in Python";
homepage = "https://github.com/amjith/fuzzyfinder";
license = licenses.bsd3;

4
pkgs/development/python-modules/google-cloud-webrisk/default.nix
View file

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "google-cloud-webrisk";
version = "1.17.1";
version = "1.18.0";
pyproject = true;
disabled = pythonOlder "3.7";
@ -23,7 +23,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "google_cloud_webrisk";
inherit version;
hash = "sha256-apCNF81eeLIP4nNdzm9KeUlUO7pjN6quKTrl1xsUn0Q=";
hash = "sha256-a+hb4chZzPaPduJihVmQHBd8arZ6MEKYBDFkNOvsprI=";
};
build-system = [ setuptools ];

9
pkgs/development/python-modules/jsonschema-rs/default.nix
View file

@ -3,6 +3,7 @@
fetchPypi,
hypothesis,
lib,
nix-update-script,
pytestCheckHook,
pythonOlder,
rustPlatform,
@ -10,7 +11,7 @@
buildPythonPackage rec {
pname = "jsonschema-rs";
version = "0.29.1";
version = "0.30.0";
pyproject = true;
@ -20,13 +21,13 @@ buildPythonPackage rec {
src = fetchPypi {
inherit version;
pname = "jsonschema_rs";
hash = "sha256-qfiWqeRRdjA3TxdTZHBYNsIvCdW9W7sG7AYRMytnAv0=";
hash = "sha256-KfmI0ik3HWrv1WDFsT5xvxyRyXKg2DpmxeuUHOR9MZM=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src;
name = "${pname}-${version}";
hash = "sha256-kVi4EFig0ZGnOSVjzfJuGeR7BiEngP1Jhj6NvbhMVy4=";
hash = "sha256-LNT2wQnOaVMBrI+fW6wbIRaTYPvw3ESinI5KY8wjp1o=";
};
nativeBuildInputs = with rustPlatform; [
@ -41,6 +42,8 @@ buildPythonPackage rec {
pythonImportsCheck = [ "jsonschema_rs" ];
passthru.updateScript = nix-update-script { };
meta = {
description = "High-performance JSON Schema validator for Python";
homepage = "https://github.com/Stranger6667/jsonschema/tree/master/crates/jsonschema-py";

1
pkgs/development/python-modules/mlxtend/default.nix
View file

@ -7,7 +7,6 @@
pytestCheckHook,
scipy,
numpy,
numpy_1,
scikit-learn,
pandas,
matplotlib,

4
pkgs/development/python-modules/python-linkplay/default.nix
View file

@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "python-linkplay";
version = "0.2.3";
version = "0.2.4";
pyproject = true;
src = fetchFromGitHub {
owner = "Velleman";
repo = "python-linkplay";
tag = "v${version}";
hash = "sha256-xs91de8ELDbBU7deDiOXgnyGMqmYcQY38HkltvPpScU=";
hash = "sha256-J0DwSUl1m0Yek1oPvMVLGEx9V3CCwo2OQyiI41Qs0x0=";
};
build-system = [ setuptools ];

19
pkgs/development/python-modules/pytradfri/default.nix
View file

@ -1,9 +1,7 @@
{
lib,
buildPythonPackage,
pythonOlder,
fetchFromGitHub,
fetchpatch2,
setuptools,
aiocoap,
dtlssocket,
@ -13,27 +11,16 @@
buildPythonPackage rec {
pname = "pytradfri";
version = "13.0.0";
version = "14.0.0";
pyproject = true;
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "home-assistant-libs";
repo = "pytradfri";
tag = version;
hash = "sha256-CWv3ebDulZuiFP+nJ2Xr7U/HTDFTqA9VYC0USLkpWR0=";
hash = "sha256-oYYi1P0Zu9PLsacUW//BlJlLmeOVvHgb/lR52KwZ7N8=";
};
patches = [
(fetchpatch2 {
name = "pydantic2-compat.patch";
url = "https://github.com/home-assistant-libs/pytradfri/commit/ecd099837a0b4538a56301af6260fddde77fbbb1.patch";
excludes = [ "requirements.txt" ];
hash = "sha256-QsvBTB9evKyE1fcfDaB0SN21kHmNmLgGPs3GJHHsMJc=";
})
];
build-system = [ setuptools ];
dependencies = [ pydantic ];
@ -52,7 +39,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python package to communicate with the IKEA Trådfri ZigBee Gateway";
homepage = "https://github.com/home-assistant-libs/pytradfri";
changelog = "https://github.com/home-assistant-libs/pytradfri/releases/tag/${version}";
changelog = "https://github.com/home-assistant-libs/pytradfri/releases/tag/${src.tag}";
license = licenses.mit;
maintainers = with maintainers; [ dotlambda ];
};

4
pkgs/development/python-modules/recurring-ical-events/default.nix
View file

@ -17,14 +17,14 @@
buildPythonPackage rec {
pname = "recurring-ical-events";
version = "3.6.1";
version = "3.7.0";
pyproject = true;
src = fetchFromGitHub {
owner = "niccokunzmann";
repo = "python-recurring-ical-events";
tag = "v${version}";
hash = "sha256-DrrWRzMauKDnX7iyD/Q6BnLSLawekxc1f5HxjQH/Lds=";
hash = "sha256-N/Y3K/QyJ6Djy9h08wgNdDm1gdy19f+6tkcV6mLaSag=";
};
postPatch = ''

5
pkgs/development/python-modules/sip/default.nix
View file

@ -24,6 +24,11 @@ buildPythonPackage rec {
hash = "sha256-+gUVaX1MmNvgTZ6JjYFt4UJ+W5rl0OFSFpEJ/SH10pw=";
};
patches = [
# Make wheel file generation deterministic https://github.com/NixOS/nixpkgs/issues/383885
./sip-builder.patch
];
build-system = [
setuptools
setuptools-scm

28
pkgs/development/python-modules/sip/sip-builder.patch Normal file
View file

@ -0,0 +1,28 @@
--- a/sipbuild/builder.py 2025-04-21 12:19:34
+++ b/sipbuild/builder.py 2025-04-21 12:27:09
@@ -177,16 +177,23 @@
saved_cwd = os.getcwd()
os.chdir(wheel_build_dir)
- from zipfile import ZipFile, ZIP_DEFLATED
+ from zipfile import ZipFile, ZipInfo, ZIP_DEFLATED
+ import time
+ epoch = int(os.environ.get('SOURCE_DATE_EPOCH', '946684800'))
+ zip_timestamp = time.gmtime(epoch)[:6]
+
with ZipFile(wheel_path, 'w', compression=ZIP_DEFLATED) as zf:
for dirpath, _, filenames in os.walk('.'):
for filename in filenames:
# This will result in a name with no leading '.'.
name = os.path.relpath(os.path.join(dirpath, filename))
- zf.write(name)
+ zi = ZipInfo(name, zip_timestamp)
+ with open(name, 'rb') as f:
+ zf.writestr(zi, f.read())
+
os.chdir(saved_cwd)
return wheel_file

4
pkgs/development/python-modules/stringzilla/default.nix
View file

@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "stringzilla";
version = "3.12.4";
version = "3.12.5";
pyproject = true;
src = fetchFromGitHub {
owner = "ashvardanian";
repo = "stringzilla";
tag = "v${version}";
hash = "sha256-U745bA3GTPyNPpiB7NESsUJYKmUCY8qK4aqbHECQqnE=";
hash = "sha256-Hp66R4+gic0WstRVnutMBx8g+DMzLEnxPzt3sgvWGG4=";
};
postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''

48
pkgs/development/python-modules/tree-sitter/0_21.nix
View file

@ -1,48 +0,0 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
pytestCheckHook,
pythonOlder,
pythonAtLeast,
setuptools,
distutils,
}:
buildPythonPackage rec {
pname = "tree-sitter";
version = "0.21.3";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "py-tree-sitter";
rev = "refs/tags/v${version}";
hash = "sha256-HT1sRzDFpeelWCq1ZMeRmoUg0a3SBR7bZKxBqn4fb2g=";
fetchSubmodules = true;
};
build-system = [ setuptools ];
nativeCheckInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "tree_sitter" ];
# Needed explicitly for Python >= 3.12 as tree-sitter provides
# calls to distutils functions to compile language files
dependencies = lib.optionals (pythonAtLeast "3.12") [ distutils ];
preCheck = ''
rm -r tree_sitter
'';
meta = with lib; {
description = "Python bindings to the Tree-sitter parsing library";
homepage = "https://github.com/tree-sitter/py-tree-sitter";
changelog = "https://github.com/tree-sitter/py-tree-sitter/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}

40
pkgs/development/tools/electron/binary/info.json
View file

@ -12,35 +12,35 @@
},
"33": {
"hashes": {
"aarch64-darwin": "b1425938a053b47bdf1c3c28abd146defb7372a8e645adb0a2f2a9650ca6a36d",
"aarch64-linux": "0f7350d2aa0d03b4e57aced4cc921a71fa15a0a5528ee463651771cb415e0381",
"armv7l-linux": "153938fe15bf90e2ff6429d1f7db19144b01b8ec12a00a351fdb9fee56c585c3",
"headers": "0gwin292x5ryx41kw0c801b4ipin9q1agnigdv31vcd4y0na2p3s",
"x86_64-darwin": "38d247a3540650e21ee8d99a8e07b3c9f40439ad09cc176628adb2af948070f6",
"x86_64-linux": "ae5cb348d7697f4acfb6d19dddc4ffc9fae1a687be5bee66684279a82fd8621b"
"aarch64-darwin": "3baba8bb35cd193be1fa7b46c4e0e2191cc345f599894d1e117353a7abdf429c",
"aarch64-linux": "436bfb19fc298c852327db5636e28cb1607cb8c2c714b3d289097373bf0cf418",
"armv7l-linux": "3944193d4984e983cee5f678e43b957ef760f07d5a8fe34d3f0ac94fbe18c650",
"headers": "178h07gjjxdx4kjcwp9ywnwc0qxh5gh70jj07n2xb9cp5whvfn0p",
"x86_64-darwin": "ec6bafaac0e422ebf6784c544b2623e8bb0c3c751a333df6a7e7a5ae6a2c8823",
"x86_64-linux": "4c49cb0a17e6b74efbf2066fd41a3c1d4a27a476f6b7e45f610a9d41afae2838"
},
"version": "33.4.8"
"version": "33.4.10"
},
"34": {
"hashes": {
"aarch64-darwin": "5a142772493b25ad22dda774a1d4da78887024adae8e83b0e74ad0ba64a7f55a",
"aarch64-linux": "d22f1778894393414d7da01aa3f85d6f11f2cb5a5c7623d9d8339bcd824df4cb",
"armv7l-linux": "29af72e24c74da70c85bfdce1ed6492b7efbe85f88cfb3da642844b51e5d7259",
"headers": "1jyc5riakfry5gmlcx7nmvl29iq6a01013k7zcfrcmijpkdw0p9z",
"x86_64-darwin": "618156b4c923adcc2bf3d0a81d82dc874f27129893b7b3c349d0ca13651619e8",
"x86_64-linux": "18ebcf0d2b681e273eb003ea0d77bb4fb91ed891f39778ad9c22b41972ed1975"
"aarch64-darwin": "26cf72d9032fc99674a8404f6740df0cbba7599943feae82122c8d0b8c5cca43",
"aarch64-linux": "6d511e55631bf73d56729dd0798bc23d44aa16a78bc94e912cae465d54b749f7",
"armv7l-linux": "f119dbe8d4a3c0dac2683b82713bd8a3e65ab111bff6c2cf75ced2d52b1e00de",
"headers": "1z70qaping1fxsg9x130zjywcc6pirsnyrk0bg3jiirynpvpp5yq",
"x86_64-darwin": "6003dfdc608b2b2ef1591659e7360c723e9b446f852030931bb9c66fadb9c4c0",
"x86_64-linux": "878c958cda5e2e48de1e5a89203bd2e3031f2dbbb25453fb75a305446eb282d0"
},
"version": "34.4.1"
"version": "34.5.2"
},
"35": {
"hashes": {
"aarch64-darwin": "ad701bedd2b969eddad8676c8dfa69a21d18896ae58fbd7310a358dd21c7d0eb",
"aarch64-linux": "a1a71be2bb826b59a1da726a59895025481ee335896c175fcffdc2fcfc432675",
"armv7l-linux": "28186a0edb4e83c9d7afeb32923f26794d26c39f28a3706462a060d4b0e3bc5f",
"aarch64-darwin": "8a8e1cb09ace8eb46164fa6154bc4695f19eba5fe6a8374d1e0b2ba0e177a28c",
"aarch64-linux": "c3b5224bbaac7b69890dbf6f69d78ad6dc2622231fa7554e5cf32333623a6d74",
"armv7l-linux": "2525cd09e54c4b33f7a9bcb5381716f88a933ee497df5fd465c9f3ceab01b0aa",
"headers": "1la2xfr8lyvq7dc4mxllj3qksrrwxmz3nc2fnr2h0l08bfn2y1ay",
"x86_64-darwin": "858f17d67ea811711802b209d041cfca8caa14e6c8f0960de48df14892a0c632",
"x86_64-linux": "ab6d4bceff76a070ebf3264ee516a3f96a040947f462d26ba202aa754e54d852"
"x86_64-darwin": "022d90656d9b78f53e56329722c7209ed3711af443ccbbbcd50ada5176e72cf0",
"x86_64-linux": "c3bc0fefe238e092ab2a26276d6c4bd5d70b85d08d8bb298c5f7499a4456a119"
},
"version": "35.1.2"
"version": "35.2.0"
}
}

42
pkgs/development/tools/electron/chromedriver/info.json
View file

@ -12,35 +12,35 @@
},
"33": {
"hashes": {
"aarch64-darwin": "70fd7d0e788c76f750f50e09ac12956cb2393ae8160f412b48bd32da076d53c4",
"aarch64-linux": "e3edec29ac7a4dff69957b7848de324816c68215ba413d5536f934ea3b41c362",
"armv7l-linux": "67de15769a70713c7422bd6eb1390f4150e83218e5bdba7409eaaa429c640b1b",
"headers": "1ji9mxjh2pigx1ldvp6m9ydlkcyvl6mrrpqsbvzvxd2spppzih0d",
"x86_64-darwin": "476d91e836986d49518da86869a2b923417718d8be008ef50738ef5920a995ba",
"x86_64-linux": "8109a11081311b94b2fbf38cb9e505857aaf5dbc952cc5d0c2fd6477603084f6"
"aarch64-darwin": "7673d1e80d42cea706a36af275c1a42061c7baa36e79e738671907f865c70725",
"aarch64-linux": "12c30544df2cfc2d678451dc62c8007d482394df08d6824fb91ccabf1a3bc794",
"armv7l-linux": "b96563ecb3433e28a2ea50a3d9e4ef0c8c349e8264a118558c5b5927d394330a",
"headers": "178h07gjjxdx4kjcwp9ywnwc0qxh5gh70jj07n2xb9cp5whvfn0p",
"x86_64-darwin": "77cd5f40655a709a5eecfb9fe2fe4421bcd527a45ae0f02a2b34c71feae25f5c",
"x86_64-linux": "d932f18b72949832b13c446faddb2f56a16dfff08286251f14d69315c5f2dc9b"
},
"version": "33.4.8"
"version": "33.4.10"
},
"34": {
"hashes": {
"aarch64-darwin": "5b3ba7acb5eabf1a8651322138094ab26d313171f624456cf4b6243c74d35bc4",
"aarch64-linux": "1778d1c3903beaa33d75c82cb9b6769f2b303bd75c991f6e55382d916055efd4",
"armv7l-linux": "41b9afe8dbe5a0656d6e395ed0d00a26e5e6206a7399768066d91501f181e0d5",
"headers": "175n6wkz5gyj7plbjbcd6nkhbc108i2ng8ms2wvjya042mshzlqi",
"x86_64-darwin": "e16db516f323e30dc6fd54cac11f72bfdc8fe7852839b55a3609b30fee2318f0",
"x86_64-linux": "e49534cc2c68f8aa58df6f1f2c1706b579b54f9ae362dba6a04469c04f1da9f3"
"aarch64-darwin": "fe1c9cd744f4c2542750ed96f99aff9cd3b28e6a62a21e2302f67cc7d9925b73",
"aarch64-linux": "fdfe6945ed870a8eb96f6d5119ed8f5b1704391fe9acfd8c3fa110ab6f74844d",
"armv7l-linux": "f0f567ffdb31f57124ceda3e81545b1525f69ef8b722c3493f55effce7a3266e",
"headers": "1z70qaping1fxsg9x130zjywcc6pirsnyrk0bg3jiirynpvpp5yq",
"x86_64-darwin": "70d84569431b4cb108b8f0e5bec41160100b853e487d550171213b87b043d449",
"x86_64-linux": "18d685523669b6704d5af58515b91a39cd97e04e897806048178901241cc96e5"
},
"version": "34.4.1"
"version": "34.5.2"
},
"35": {
"hashes": {
"aarch64-darwin": "df9ef717c02b38d9f5d85381d2f4f9f7604b74a439bd7998b351c2ba5fed7039",
"aarch64-linux": "47bafd3cce09a617b4fea65e6a7a440f2eb15f1419b93c037f52e4b50927922c",
"armv7l-linux": "9d95d2685426965c2dab2631ad07b91085967fc98ba9539bca65d2ce189d3574",
"headers": "1y6d1nygfg6hdcjlzzgdz12hvh8j3xihhg9sg7p6fkmqkll4fyyb",
"x86_64-darwin": "4a1e4b18fc9e7f8903d1041bd43d3b21a589525a83a87ca8a0f77b2615107cb2",
"x86_64-linux": "8dca29ef167b7afaaff6737bd1c17312a08b01ebd9fb4b2737491523c4e8a504"
"aarch64-darwin": "88d20f3398a8850ee7b7004e4f301e15705783e8860ca8f0de4ddc652e1cab4b",
"aarch64-linux": "4eae05fab28c9f0afff609bb13cfe1c999f02a0cf3539c715823a6bda327e1c6",
"armv7l-linux": "3bd32c34321e853d38453f30eb4a0ddabb278d95921e55abf01c22f53f074f4b",
"headers": "1la2xfr8lyvq7dc4mxllj3qksrrwxmz3nc2fnr2h0l08bfn2y1ay",
"x86_64-darwin": "852430a5121e3f4032845d2e562be78a0de87c616076cedc53505f3906921276",
"x86_64-linux": "702fdee68152c1baaf3d8fbbbdd16cceecd0b8989e223918714c56f7bea8f34a"
},
"version": "35.1.2"
"version": "35.2.0"
}
}

30
pkgs/development/tools/electron/info.json
View file

@ -57,10 +57,10 @@
},
"src/electron": {
"args": {
"hash": "sha256-mvDHVVjrKoeg2E2ucAGTsjnMRDqcrqr3QlDoCmxHQJY=",
"hash": "sha256-5r6sCfGOwMJhn20LIKxeaM1AyHbN0jgr1YxhFvCxZo0=",
"owner": "electron",
"repo": "electron",
"rev": "v33.4.8"
"rev": "v33.4.10"
},
"fetcher": "fetchFromGitHub"
},
@ -1258,7 +1258,7 @@
"electron_yarn_hash": "0bzsswcg62b39xinq5vikk7qz7d15276s2vc15v1gcb5wvh05ff8",
"modules": "130",
"node": "20.18.3",
"version": "33.4.8"
"version": "33.4.10"
},
"34": {
"chrome": "132.0.6834.210",
@ -1318,10 +1318,10 @@
},
"src/electron": {
"args": {
"hash": "sha256-azo3XHWccI9jmmFx1Ck83861Eu/jF64J+rz3uudeFe0=",
"hash": "sha256-o/luH8qWEMxgigE9Uo6lhv/jNj1bEOCVTvdHU2EuTlw=",
"owner": "electron",
"repo": "electron",
"rev": "v34.5.0"
"rev": "v34.5.2"
},
"fetcher": "fetchFromGitHub"
},
@ -2535,10 +2535,10 @@
"electron_yarn_hash": "10ny8cj2m8wn8zb5ljsfc8rpv6y4rp049zv5i5slyk3lj2zpgr6y",
"modules": "132",
"node": "20.19.0",
"version": "34.5.0"
"version": "34.5.2"
},
"35": {
"chrome": "134.0.6998.179",
"chrome": "134.0.6998.205",
"chromium": {
"deps": {
"gn": {
@ -2548,15 +2548,15 @@
"version": "2025-01-13"
}
},
"version": "134.0.6998.179"
"version": "134.0.6998.205"
},
"chromium_npm_hash": "sha256-oVoTruhxTymYiGkELd2Oa1wOfjGLtChQZozP4GzOO1A=",
"deps": {
"src": {
"args": {
"hash": "sha256-DI59KsXSy7xQIdHSpl++4S26sLP6lHqMGx1U1xi+pZY=",
"hash": "sha256-LL0lmb23zTjOwi8Sbz0Vb3Nj3ptqpRL/5V5rI8vXu0U=",
"postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/content/test/data; rm -rf $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ",
"rev": "134.0.6998.179",
"rev": "134.0.6998.205",
"url": "https://chromium.googlesource.com/chromium/src.git"
},
"fetcher": "fetchFromGitiles"
@ -2595,10 +2595,10 @@
},
"src/electron": {
"args": {
"hash": "sha256-P7GjUmkATDOo2B/uLs5Pv3E+meFoenwe2FTkIEc/Go0=",
"hash": "sha256-9svv7kEnZqgwyE9LnuBTIiUguZdgCHUkkupxtpUGcKQ=",
"owner": "electron",
"repo": "electron",
"rev": "v35.1.4"
"rev": "v35.2.0"
},
"fetcher": "fetchFromGitHub"
},
@ -3511,8 +3511,8 @@
},
"src/third_party/skia": {
"args": {
"hash": "sha256-tP6DnMeOoVqfTSn6bYXMLiCb4wg5f9uB28KzYMAeBUw=",
"rev": "aefbd9403c1b3032ad4cd0281ef312ed262c7125",
"hash": "sha256-QIWB5fVCo9r+AKE8MeeKLEpcWYG6lCfBzxNDR2yD3kg=",
"rev": "b467149a72ca10a2e46345a1e5cd031ce8637023",
"url": "https://skia.googlesource.com/skia.git"
},
"fetcher": "fetchFromGitiles"
@ -3844,6 +3844,6 @@
"electron_yarn_hash": "0l38rbmlrcrgkw7ggj33xszcs7arm601gzq4c8v0rn3m5zp6yr77",
"modules": "133",
"node": "22.14.0",
"version": "35.1.4"
"version": "35.2.0"
}
}

3
pkgs/servers/monitoring/zabbix/agent2.nix
View file

@ -14,7 +14,6 @@ import ./versions.nix (
{
version,
hash,
vendorHash ? throw "unsupported version ${version} for zabbix-agent2",
...
}:
buildGoModule {
@ -28,7 +27,7 @@ import ./versions.nix (
modRoot = "src/go";
inherit vendorHash;
vendorHash = null;
nativeBuildInputs = [
autoreconfHook

4
pkgs/servers/monitoring/zabbix/server.nix
View file

@ -91,10 +91,6 @@ import ./versions.nix (
++ optional postgresqlSupport "--with-postgresql"
++ optional ipmiSupport "--with-openipmi=${openipmi.dev}";
env.NIX_CFLAGS_COMPILE = lib.optionalString (
lib.versions.major version <= "5"
) "-Wno-error=incompatible-pointer-types";
prePatch = ''
find database -name data.sql -exec sed -i 's|/usr/bin/||g' {} +
'';

14
pkgs/servers/monitoring/zabbix/versions.nix
View file

@ -2,27 +2,13 @@ generic: {
v72 = generic {
version = "7.2.5";
hash = "sha256-DQGzk90isqYLNvs3qY/PEIHGg62Ygyot3YeUOhIAg54=";
vendorHash = null;
};
v70 = generic {
version = "7.0.11";
hash = "sha256-r9VNy3bRuFvJAL+ZQEbKjCAS3+AvetnWAwFjLxFVuGU=";
vendorHash = null;
};
v64 = generic {
version = "6.4.20";
hash = "sha256-tFsg2Jq8Uaa5YULGUu1kXLkxyJuA3YGeSfJ4DPfOHkk=";
vendorHash = null;
};
v60 = generic {
version = "6.0.36";
hash = "sha256-Ne0OY6NGzTYOn3sDVd+5tfawBu5VBjxNRtlxasubGCk=";
vendorHash = null;
};
v50 = generic {
version = "5.0.46";
hash = "sha256-p6OZALpOQG6v70Y20cC2bdlzTINz3JBd9qGWZACfcl4=";
vendorHash = "sha256-NgSi6usIbss3WEZCYht46WjxcrdOO3qv8KwwUZwtkk0=";
};
}

2
pkgs/servers/monitoring/zabbix/web.nix
View file

@ -24,7 +24,7 @@ import ./versions.nix (
installPhase = ''
mkdir -p $out/share/zabbix/
cp -a ${if lib.versionAtLeast version "5.0.0" then "ui/." else "frontends/php/."} $out/share/zabbix/
cp -a ui/. $out/share/zabbix/
cp ${phpConfig} $out/share/zabbix/conf/zabbix.conf.php
'';

2
pkgs/servers/nosql/cassandra/generic.nix
View file

@ -11,7 +11,7 @@
which,
jre,
nixosTests,
# generation is the attribute version suffix such as 3_11 in pkgs.cassandra_3_11
# generation is the attribute version suffix such as 4 in pkgs.cassandra_4
generation,
version,
sha256,

10
pkgs/servers/varnish/default.nix
View file

@ -94,14 +94,14 @@ in
version = "6.0.13";
hash = "sha256-DcpilfnGnUenIIWYxBU4XFkMZoY+vUK/6wijZ7eIqbo=";
};
# EOL 2025-03-15
varnish75 = common {
version = "7.5.0";
hash = "sha256-/KYbmDE54arGHEVG0SoaOrmAfbsdgxRXHjFIyT/3K10=";
};
# EOL 2025-09-15
varnish76 = common {
version = "7.6.2";
hash = "sha256-OFxhDsxj3P61PXb0fMRl6J6+J9osCSJvmGHE+o6dLJo=";
};
# EOL 2026-03-15
varnish77 = common {
version = "7.7.0";
hash = "sha256-aZSPIVEfgc548JqXFdmodQ6BEWGb1gVaPIYTFaIQtOQ=";
};
}

8
pkgs/servers/varnish/modules.nix
View file

@ -55,12 +55,12 @@ in
version = "0.15.1";
hash = "sha256-Et/iWOk2FWJBDOpKjNXm4Nh5i1SU4zVPaID7kh+Uj9M=";
};
modules24 = common {
version = "0.24.0";
hash = "sha256-2MfcrhhkBz9GyQxEWzjipdn1CBEqnCvC3t1G2YSauak=";
};
modules25 = common {
version = "0.25.0";
hash = "sha256-m/7moizVyvoP8xnpircAFVUqCmCfTGkgVyRc6zkdVsk=";
};
modules26 = common {
version = "0.26.0";
hash = "sha256-xKMOkqm6/GoBve0AhPqyVMQv/oh5Rtj6uCeg/yId7BU=";
};
}

10
pkgs/servers/varnish/packages.nix
View file

@ -2,8 +2,8 @@
callPackages,
callPackage,
varnish60,
varnish75,
varnish76,
varnish77,
}:
{
varnish60Packages = rec {
@ -20,12 +20,12 @@
sha256 = "1n94slrm6vn3hpymfkla03gw9603jajclg84bjhwb8kxsk3rxpmk";
};
};
varnish75Packages = rec {
varnish = varnish75;
modules = (callPackages ./modules.nix { inherit varnish; }).modules24;
};
varnish76Packages = rec {
varnish = varnish76;
modules = (callPackages ./modules.nix { inherit varnish; }).modules25;
};
varnish77Packages = rec {
varnish = varnish77;
modules = (callPackages ./modules.nix { inherit varnish; }).modules26;
};
}

1
pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
View file

@ -36,6 +36,7 @@ lib.mapAttrs (n: make) (
powerpc64le-unknown-linux-gnu = powernv;
riscv64-unknown-linux-gnu = riscv64;
s390x-unknown-linux-gnu = s390x;
loongarch64-unknown-linux-gnu = loongarch64-linux;
# musl
aarch64-unknown-linux-musl = aarch64-multiplatform-musl;

5
pkgs/stdenv/linux/stdenv-bootstrap-tools.nix
View file

@ -1,7 +1,7 @@
{
lib,
stdenv,
bash,
bashNonInteractive,
binutils,
bootBinutils,
bootGCC,
@ -66,7 +66,6 @@ stdenv.mkDerivation (finalAttrs: {
cp -d ${libc.out}/lib/libnsl*.so* $out/lib
''
+ ''
cp -d ${libc.out}/lib/libutil*.so* $out/lib
cp -d ${libc.out}/lib/libnss*.so* $out/lib
cp -d ${libc.out}/lib/libresolv*.so* $out/lib
# Copy all runtime files to enable non-PIE, PIE, static PIE and profile-generated builds
@ -112,7 +111,7 @@ stdenv.mkDerivation (finalAttrs: {
cp -d ${coreutilsMinimal.out}/bin/* $out/bin
(cd $out/bin && rm vdir dir sha*sum pinky factor pathchk runcon shuf who whoami shred users)
cp ${bash.out}/bin/bash $out/bin
cp ${bashNonInteractive.out}/bin/bash $out/bin
cp ${findutils.out}/bin/find $out/bin
cp ${findutils.out}/bin/xargs $out/bin
cp -d ${diffutils.out}/bin/* $out/bin

7
pkgs/top-level/aliases.nix
View file

@ -394,6 +394,8 @@ mapAliases {
cargo-information = throw "'cargo-information' has been removed due to being merged upstream into 'cargo'"; # Added 2025-03-09
cargo-inspect = throw "'cargo-inspect' has been removed due to lack of upstream maintenance. Upstream recommends cargo-expand."; # Added 2025-01-26
cargo-web = throw "'cargo-web' has been removed due to lack of upstream maintenance"; # Added 2025-01-26
cassandra_3_0 = throw "'cassandra_3_0' has been removed has it reached end-of-life"; # Added 2025-03-23
cassandra_3_11 = throw "'cassandra_3_11' has been removed has it reached end-of-life"; # Added 2025-03-23
cawbird = throw "cawbird has been abandoned upstream and is broken anyways due to Twitter closing its API";
centerim = throw "centerim has been removed due to upstream disappearing"; # Added 2025-04-18
certmgr-selfsigned = certmgr; # Added 2023-11-30
@ -819,6 +821,7 @@ mapAliases {
haven-cli = throw "'haven-cli' has been removed due to the official announcement of the project closure. Read more at https://havenprotocol.org/2024/12/12/project-closure-announcement"; # Added 2025-02-25
HentaiAtHome = hentai-at-home; # Added 2024-06-12
hll2390dw-cups = throw "The hll2390dw-cups package was dropped since it was unmaintained."; # Added 2024-06-21
hoarder = throw "'hoarder' has been renamed to 'karakeep'"; # Added 2025-04-21
hop-cli = throw "hop-cli has been removed as the service has been shut-down"; # Added 2024-08-13
hpp-fcl = coal; # Added 2024-11-15
ht-rust = throw "'ht-rust' has been renamed to/replaced by 'xh'"; # Converted to throw 2024-10-17
@ -1830,6 +1833,8 @@ mapAliases {
vaultwarden-vault = vaultwarden.webvault; # Added 2022-12-13
varnish74 = throw "varnish 7.4 is EOL. Either use the LTS or upgrade."; # Added 2024-10-31
varnish74Packages = throw "varnish 7.4 is EOL. Either use the LTS or upgrade."; # Added 2024-10-31
varnish75 = throw "varnish 7.5 is EOL. Either use the LTS or upgrade."; # Added 22025-03-29
varnish75Packages = throw "varnish 7.5 is EOL. Either use the LTS or upgrade."; # Added 2025-03-29
vdirsyncerStable = vdirsyncer; # Added 2020-11-08, see https://github.com/NixOS/nixpkgs/issues/103026#issuecomment-723428168
ventoy-bin = ventoy; # Added 2023-04-12
ventoy-bin-full = ventoy-full; # Added 2023-04-12
@ -1936,6 +1941,8 @@ mapAliases {
### Z ###
zabbix50 = throw "'zabbix50' has been removed, it would have reached its End of Life a few days after the release of NixOS 25.05. Consider upgrading to 'zabbix60' or 'zabbix70'.";
zabbix64 = throw "'zabbix64' has been removed because it reached its End of Life. Consider upgrading to 'zabbix70'.";
zeroadPackages = recurseIntoAttrs {
zeroad = lib.warnOnInstantiate "'zeroadPackages.zeroad' has been renamed to 'zeroad'" zeroad; # Added 2025-03-22
zeroad-data = lib.warnOnInstantiate "'zeroadPackages.zeroad-data' has been renamed to 'zeroad-data'" zeroad-data; # Added 2025-03-22

17
pkgs/top-level/all-packages.nix
View file

@ -5162,16 +5162,15 @@ with pkgs;
inherit (callPackages ../servers/varnish { })
varnish60
varnish75
varnish76
varnish77
;
inherit (callPackages ../servers/varnish/packages.nix { })
varnish60Packages
varnish75Packages
varnish76Packages
varnish77Packages
;
varnishPackages = varnish75Packages;
varnishPackages = varnish77Packages;
varnish = varnishPackages.varnish;
viceroy = callPackage ../development/tools/viceroy { };
@ -10950,14 +10949,6 @@ with pkgs;
appdaemon = callPackage ../servers/home-assistant/appdaemon.nix { };
cassandra_3_0 = callPackage ../servers/nosql/cassandra/3.0.nix {
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
python = python2;
};
cassandra_3_11 = callPackage ../servers/nosql/cassandra/3.11.nix {
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
python = python2;
};
cassandra_4 = callPackage ../servers/nosql/cassandra/4.nix {
# Effective Cassandra 4.0.2 there is full Java 11 support
# -- https://cassandra.apache.org/doc/latest/cassandra/new/java11.html
@ -11694,8 +11685,6 @@ with pkgs;
zabbix72 = recurseIntoAttrs (zabbixFor "v72");
zabbix70 = recurseIntoAttrs (zabbixFor "v70");
zabbix60 = recurseIntoAttrs (zabbixFor "v60");
zabbix64 = recurseIntoAttrs (zabbixFor "v64");
zabbix50 = recurseIntoAttrs (zabbixFor "v50");
zabbix = zabbix60;

2
pkgs/top-level/python-packages.nix
View file

@ -17506,8 +17506,6 @@ self: super: with self; {
tree-sitter-yaml = callPackage ../development/python-modules/tree-sitter-yaml { };
tree-sitter_0_21 = callPackage ../development/python-modules/tree-sitter/0_21.nix { };
treelib = callPackage ../development/python-modules/treelib { };
treelog = callPackage ../development/python-modules/treelog { };