Merge master into staging-next

This commit is contained in:
nixpkgs-ci[bot]
2025-06-10 16:40:14 +00:00
committed by GitHub
36 changed files with 207 additions and 472 deletions
+1
View File
@@ -17,6 +17,7 @@
- `base16-builder` node package has been removed due to lack of upstream maintenance.
- `gentium` package now provides `Gentium-*.ttf` files, and not `GentiumPlus-*.ttf` files like before. The font identifiers `Gentium Plus*` are available in the `gentium-plus` package, and if you want to use the more recently updated package `gentium` [by sil](https://software.sil.org/gentium/), you should update your configuration files to use the `Gentium` font identifier.
- `space-orbit` package has been removed due to lack of upstream maintenance. Debian upstream stopped tracking it in 2011.
## Other Notable Changes {#sec-nixpkgs-release-25.11-notable-changes}
+7
View File
@@ -12956,6 +12956,13 @@
githubId = 8211181;
name = "Kevin Kandlbinder";
};
keyruu = {
name = "Lucas";
email = "me@keyruu.de";
matrix = "@keyruu:matrix.org";
github = "Keyruu";
githubId = 53177682;
};
keysmashes = {
email = "x-89cjg9@keysmash.solutions";
github = "keysmashes";
@@ -36,6 +36,8 @@
- The Pocket ID module ([`services.pocket-id`][#opt-services.pocket-id.enable]) and package (`pocket-id`) has been updated to 1.0.0. Some environment variables have been changed or removed, see the [migration guide](https://pocket-id.org/docs/setup/migrate-to-v1/).
- The `services.siproxd` module has been removed as `siproxd` is unmaintained and broken with libosip 5.x.
- `renovate` was updated to v40. See the [upstream release notes](https://github.com/renovatebot/renovate/releases/tag/40.0.0) for breaking changes.
- The `boot.readOnlyNixStore` has been removed. Control over bind mount options on `/nix/store` is now offered by the `boot.nixStoreMountOpts` option.
-1
View File
@@ -909,7 +909,6 @@
./services/misc/servarr/whisparr.nix
./services/misc/serviio.nix
./services/misc/sickbeard.nix
./services/misc/siproxd.nix
./services/misc/snapper.nix
./services/misc/soft-serve.nix
./services/misc/sourcehut
+5
View File
@@ -223,6 +223,11 @@ in
"services"
"shout"
] "shout was removed because it was deprecated upstream in favor of thelounge.")
(mkRemovedOptionModule [ "services" "siproxd" ] ''
The siproxd package and the corresponding module have been removed due to
the service being unmaintained. `services.asterisk.*` or `services.freeswitch.*`
could be used instead.
'')
(mkRemovedOptionModule [ "services" "ssmtp" ] ''
The ssmtp package and the corresponding module have been removed due to
the program being unmaintained. The options `programs.msmtp.*` can be
-196
View File
@@ -1,196 +0,0 @@
{
config,
lib,
pkgs,
...
}:
let
cfg = config.services.siproxd;
conf = ''
daemonize = 0
rtp_proxy_enable = 1
user = siproxd
if_inbound = ${cfg.ifInbound}
if_outbound = ${cfg.ifOutbound}
sip_listen_port = ${toString cfg.sipListenPort}
rtp_port_low = ${toString cfg.rtpPortLow}
rtp_port_high = ${toString cfg.rtpPortHigh}
rtp_dscp = ${toString cfg.rtpDscp}
sip_dscp = ${toString cfg.sipDscp}
${lib.optionalString (
cfg.hostsAllowReg != [ ]
) "hosts_allow_reg = ${lib.concatStringsSep "," cfg.hostsAllowReg}"}
${lib.optionalString (
cfg.hostsAllowSip != [ ]
) "hosts_allow_sip = ${lib.concatStringsSep "," cfg.hostsAllowSip}"}
${lib.optionalString (
cfg.hostsDenySip != [ ]
) "hosts_deny_sip = ${lib.concatStringsSep "," cfg.hostsDenySip}"}
${lib.optionalString (cfg.passwordFile != "") "proxy_auth_pwfile = ${cfg.passwordFile}"}
${cfg.extraConfig}
'';
confFile = builtins.toFile "siproxd.conf" conf;
in
{
##### interface
options = {
services.siproxd = {
enable = lib.mkOption {
type = lib.types.bool;
default = false;
description = ''
Whether to enable the Siproxd SIP
proxy/masquerading daemon.
'';
};
ifInbound = lib.mkOption {
type = lib.types.str;
example = "eth0";
description = "Local network interface";
};
ifOutbound = lib.mkOption {
type = lib.types.str;
example = "ppp0";
description = "Public network interface";
};
hostsAllowReg = lib.mkOption {
type = lib.types.listOf lib.types.str;
default = [ ];
example = [
"192.168.1.0/24"
"192.168.2.0/24"
];
description = ''
Access control list for incoming SIP registrations.
'';
};
hostsAllowSip = lib.mkOption {
type = lib.types.listOf lib.types.str;
default = [ ];
example = [
"123.45.0.0/16"
"123.46.0.0/16"
];
description = ''
Access control list for incoming SIP traffic.
'';
};
hostsDenySip = lib.mkOption {
type = lib.types.listOf lib.types.str;
default = [ ];
example = [
"10.0.0.0/8"
"11.0.0.0/8"
];
description = ''
Access control list for denying incoming
SIP registrations and traffic.
'';
};
sipListenPort = lib.mkOption {
type = lib.types.int;
default = 5060;
description = ''
Port to listen for incoming SIP messages.
'';
};
rtpPortLow = lib.mkOption {
type = lib.types.int;
default = 7070;
description = ''
Bottom of UDP port range for incoming and outgoing RTP traffic
'';
};
rtpPortHigh = lib.mkOption {
type = lib.types.int;
default = 7089;
description = ''
Top of UDP port range for incoming and outgoing RTP traffic
'';
};
rtpTimeout = lib.mkOption {
type = lib.types.int;
default = 300;
description = ''
Timeout for an RTP stream. If for the specified
number of seconds no data is relayed on an active
stream, it is considered dead and will be killed.
'';
};
rtpDscp = lib.mkOption {
type = lib.types.int;
default = 46;
description = ''
DSCP (differentiated services) value to be assigned
to RTP packets. Allows QOS aware routers to handle
different types traffic with different priorities.
'';
};
sipDscp = lib.mkOption {
type = lib.types.int;
default = 0;
description = ''
DSCP (differentiated services) value to be assigned
to SIP packets. Allows QOS aware routers to handle
different types traffic with different priorities.
'';
};
passwordFile = lib.mkOption {
type = lib.types.str;
default = "";
description = ''
Path to per-user password file.
'';
};
extraConfig = lib.mkOption {
type = lib.types.lines;
default = "";
description = ''
Extra configuration to add to siproxd configuration.
'';
};
};
};
##### implementation
config = lib.mkIf cfg.enable {
users.users.siproxyd = {
uid = config.ids.uids.siproxd;
};
systemd.services.siproxd = {
description = "SIP proxy/masquerading daemon";
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
serviceConfig = {
ExecStart = "${pkgs.siproxd}/sbin/siproxd -c ${confFile}";
};
};
};
}
@@ -1,122 +0,0 @@
{
"images-calico-linux-amd64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.29.15%2Brke2r1/rke2-images-calico.linux-amd64.tar.gz",
"sha256": "020d5dfa9f00591444e57223bd0cd236bb4ad8f0fae6e5cc19a60fa71b0096cd"
},
"images-calico-linux-amd64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.29.15%2Brke2r1/rke2-images-calico.linux-amd64.tar.zst",
"sha256": "004cb2dbd99b15a311a68697a89f3747de9dbf643654bf52db19b5ad12f809a7"
},
"images-calico-linux-arm64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.29.15%2Brke2r1/rke2-images-calico.linux-arm64.tar.gz",
"sha256": "df9502035dfdca214a4c4ef7353ff6a9b003e14baf81d6c34a4d72ac85837062"
},
"images-calico-linux-arm64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.29.15%2Brke2r1/rke2-images-calico.linux-arm64.tar.zst",
"sha256": "acbc610d1def7f24c47832b5e93780e7cd0f8fd7ce74f8fd3ff29fab713feb32"
},
"images-canal-linux-amd64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.29.15%2Brke2r1/rke2-images-canal.linux-amd64.tar.gz",
"sha256": "ba47ab111cda68836b36f1480d63b088d0de6a97d3ac511d1be57ed714ad0860"
},
"images-canal-linux-amd64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.29.15%2Brke2r1/rke2-images-canal.linux-amd64.tar.zst",
"sha256": "e0e8d9757a0f5445a33ce83c4c96d5c5023d70288fa4ee34103d3375e912b2b2"
},
"images-canal-linux-arm64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.29.15%2Brke2r1/rke2-images-canal.linux-arm64.tar.gz",
"sha256": "e1411b8a65525573f36df2587829dd6ba2565ed5961f818bcef532fd8ad64296"
},
"images-canal-linux-arm64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.29.15%2Brke2r1/rke2-images-canal.linux-arm64.tar.zst",
"sha256": "7dd696507da2fbc4e6e4d7b730fc8df0cb2c216614020217d77f58d10703f11a"
},
"images-cilium-linux-amd64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.29.15%2Brke2r1/rke2-images-cilium.linux-amd64.tar.gz",
"sha256": "9107d48dcc8b1839d2f910005737327d0f3c653472caf0588f0824f77603300f"
},
"images-cilium-linux-amd64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.29.15%2Brke2r1/rke2-images-cilium.linux-amd64.tar.zst",
"sha256": "0ce5b126150c0d5f11529bb9cfb945cf2da342c06aa432e3df79cb896eceef9f"
},
"images-cilium-linux-arm64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.29.15%2Brke2r1/rke2-images-cilium.linux-arm64.tar.gz",
"sha256": "1d8870e6369bbb56cfbfa3bdcc5b81c329d021a4b2183654c301f82f4a6fe65e"
},
"images-cilium-linux-arm64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.29.15%2Brke2r1/rke2-images-cilium.linux-arm64.tar.zst",
"sha256": "eb1d54688eacadc97cf77a6e6cbb039182596d0b895cebfb40e71786944f0358"
},
"images-core-linux-amd64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.29.15%2Brke2r1/rke2-images-core.linux-amd64.tar.gz",
"sha256": "98c366348a67572702c1332c71d81b98b14c3bf4ca4f1e0a5caedab462bf61b3"
},
"images-core-linux-amd64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.29.15%2Brke2r1/rke2-images-core.linux-amd64.tar.zst",
"sha256": "41616e68c3e456dea8d5e40158857c27bc786eade7a1c7dbb4621b372971f17e"
},
"images-core-linux-arm64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.29.15%2Brke2r1/rke2-images-core.linux-arm64.tar.gz",
"sha256": "ef4a9b0acaaac2341c54741107c653efb2610d3d443c03cb2947a7d9076415dc"
},
"images-core-linux-arm64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.29.15%2Brke2r1/rke2-images-core.linux-arm64.tar.zst",
"sha256": "d7f5ee3b12399082c4b52b4513f581c257123989dff1dbba822e9343ceb92139"
},
"images-flannel-linux-amd64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.29.15%2Brke2r1/rke2-images-flannel.linux-amd64.tar.gz",
"sha256": "8c0e75adf064bd1cc37df4b6a0c01edebbd1381fcc49799b589d072f8919bb14"
},
"images-flannel-linux-amd64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.29.15%2Brke2r1/rke2-images-flannel.linux-amd64.tar.zst",
"sha256": "a3b13a559f4ea866774e93d0c9883bea7ff2eb9fb4832529e8c7e7fee924ca2b"
},
"images-flannel-linux-arm64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.29.15%2Brke2r1/rke2-images-flannel.linux-arm64.tar.gz",
"sha256": "035142ddea7ce5ad3e30a485cda3091c86bda22c1f106614327a9ab4504a9ec3"
},
"images-flannel-linux-arm64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.29.15%2Brke2r1/rke2-images-flannel.linux-arm64.tar.zst",
"sha256": "28b1d7fc4544296724031007ae29415d7ee128354b8bcdc90bd13b328f3122d1"
},
"images-harvester-linux-amd64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.29.15%2Brke2r1/rke2-images-harvester.linux-amd64.tar.gz",
"sha256": "b571e832903c6f9abe94bea4c4128eb4784d11c6b4a53030e29bccdb6205338d"
},
"images-harvester-linux-amd64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.29.15%2Brke2r1/rke2-images-harvester.linux-amd64.tar.zst",
"sha256": "b464b22d3fcd708f09b659f730773f6ca9340dc0b5c5e703ea9b69af4c9919b3"
},
"images-harvester-linux-arm64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.29.15%2Brke2r1/rke2-images-harvester.linux-arm64.tar.gz",
"sha256": "99d014012b54a64bd9c0387fc81615bcc6a9095dca87ddf256a4d14cdf93c511"
},
"images-harvester-linux-arm64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.29.15%2Brke2r1/rke2-images-harvester.linux-arm64.tar.zst",
"sha256": "1e46a193719b2e1394f133b071a8bfe60081160c929d38973d34b600380a2080"
},
"images-multus-linux-amd64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.29.15%2Brke2r1/rke2-images-multus.linux-amd64.tar.gz",
"sha256": "ac1e5082d27473d81d7fa8f7765e4023878ca92c27878ed0cd99accfb8d8b38e"
},
"images-multus-linux-amd64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.29.15%2Brke2r1/rke2-images-multus.linux-amd64.tar.zst",
"sha256": "087148184e0e06ef58111ac336b58ad62c061189d0d0dd7c316a842732449c05"
},
"images-multus-linux-arm64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.29.15%2Brke2r1/rke2-images-multus.linux-arm64.tar.gz",
"sha256": "49d1914afe109bd6b1e5c56435cb3cd4ed79ae4688f11ade33b37f4e9a592f77"
},
"images-multus-linux-arm64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.29.15%2Brke2r1/rke2-images-multus.linux-arm64.tar.zst",
"sha256": "f14ab45b4d315ea27787f4741a0eb4bc0bff7a9ecb498da5694ce991097becd8"
},
"images-vsphere-linux-amd64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.29.15%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.gz",
"sha256": "3ce2832234efde4dfc61d74debb380ac245ec9828aa7613e8ff9204207038069"
},
"images-vsphere-linux-amd64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.29.15%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.zst",
"sha256": "b182062f8eff3e71d6e8afea8b5e2cbadfa3d02d092744cd05673803cb464746"
}
}
@@ -1,12 +0,0 @@
{
rke2Version = "1.29.15+rke2r1";
rke2Commit = "c228232895f83b6c3e17a9741e0c8d8e4439894d";
rke2TarballHash = "sha256-ZvujSxuTsM6oBNEehQSMmCkbSTsp8sBZd00vwJGx5Lk=";
rke2VendorHash = "sha256-PhJgHvVCZAxWK78cn0pURC/Oy63/V41k0ZFn4sveCPY=";
k8sImageTag = "v1.29.15-rke2r1-build20250312";
etcdVersion = "v3.5.19-k3s1-build20250306";
pauseVersion = "3.6";
ccmVersion = "v1.29.10-0.20241016053521-9510ac25fefb-build20241016";
dockerizedVersion = "v1.29.15-rke2r1";
imagesVersions = with builtins; fromJSON (readFile ./images-versions.json);
}
@@ -5,16 +5,6 @@ let
extraArgs = builtins.removeAttrs args [ "callPackage" ];
in
rec {
rke2_1_29 = common (
(import ./1_29/versions.nix)
// {
updateScript = [
./update-script.sh
"29"
];
}
) extraArgs;
rke2_1_30 = common (
(import ./1_30/versions.nix)
// {
+2 -2
View File
@@ -8,13 +8,13 @@
python3Packages.buildPythonApplication rec {
pname = "ansible-lint";
version = "25.4.0";
version = "25.5.0";
pyproject = true;
src = fetchPypi {
inherit version;
pname = "ansible_lint";
hash = "sha256-8vKzGtGZklsjQ/ZgVS+5Rolw8WwsXVfan+rnDsTuyn0=";
hash = "sha256-QYJSDyM+70JIvEz0tgdOJc2vW+Ic+b6USqvIXfVAfpw=";
};
postPatch = ''
+43
View File
@@ -0,0 +1,43 @@
{
dbus,
fetchFromGitHub,
lib,
pkg-config,
rustPlatform,
}:
rustPlatform.buildRustPackage rec {
pname = "bzmenu";
version = "0.2.1";
src = fetchFromGitHub {
owner = "e-tho";
repo = "bzmenu";
tag = "v${version}";
hash = "sha256-42ZiENkqFXFhtqn26r9AIsG9sE+W0nGxm2zKdcbY5ss=";
};
cargoHash = "sha256-DvnWw4yH4ghFb368cms981pENez0zTgvpMghDTrah50=";
nativeBuildInputs = [
pkg-config
];
buildInputs = [
dbus
];
meta = {
homepage = "https://github.com/e-tho/bzmenu";
description = "Launcher-driven Bluetooth manager for Linux";
longDescription = ''
Use `bzmenu --launcher <launcher command>`
Supported launchers are: `dmenu`, `fuzzel`, `rofi`, `walker` and `custom` with `stdin`
for details refer to https://github.com/e-tho/bzmenu/blob/main/README.md#usage
'';
mainProgram = "bzmenu";
platforms = lib.platforms.linux;
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ vuimuich ];
};
}
+10 -10
View File
@@ -4,24 +4,24 @@
fetchFromGitHub,
}:
buildGoModule rec {
buildGoModule (finalAttrs: {
pname = "dnsproxy";
version = "0.75.5";
version = "0.75.6";
src = fetchFromGitHub {
owner = "AdguardTeam";
repo = "dnsproxy";
rev = "v${version}";
hash = "sha256-VkvYh4ksQkxhcEH0ZaaUT2h1L0Zw44s8hoDiZjdEMx0=";
tag = "v${finalAttrs.version}";
hash = "sha256-zMSwAbNwomb2XXOtnXJvO+ehUPYz0F8lzRkhhHhk3QQ=";
};
vendorHash = "sha256-ev05aQ+A67BT+Xtt7HVSTqmmqN/DgFp56AHWDcbkoGE=";
vendorHash = "sha256-k+F85fPzIvSr/M/oRkO7kmXUStN+zWpvo9JJIKlgSFQ=";
ldflags = [
"-s"
"-w"
"-X"
"github.com/AdguardTeam/dnsproxy/internal/version.version=${version}"
"github.com/AdguardTeam/dnsproxy/internal/version.version=${finalAttrs.version}"
];
# Development tool dependencies; not part of the main project
@@ -29,14 +29,14 @@ buildGoModule rec {
doCheck = false;
meta = with lib; {
meta = {
description = "Simple DNS proxy with DoH, DoT, and DNSCrypt support";
homepage = "https://github.com/AdguardTeam/dnsproxy";
license = licenses.asl20;
maintainers = with maintainers; [
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [
contrun
diogotcorreia
];
mainProgram = "dnsproxy";
};
}
})
+3 -3
View File
@@ -9,16 +9,16 @@
buildGoModule rec {
pname = "flyctl";
version = "0.3.132";
version = "0.3.140";
src = fetchFromGitHub {
owner = "superfly";
repo = "flyctl";
rev = "v${version}";
hash = "sha256-xuPcJchATGlGZR4dwWKp5GXlo7O1Xv2u+gDzgn1668I=";
hash = "sha256-YlpK0gRHk9LbzDwSSJAc05ZYHRWPZ67Qi6SxImNzUTE=";
};
vendorHash = "sha256-9E6Kd9TV8TplL4KU47hhOIPuO/hm0T3aaMK/rEMBUU4=";
vendorHash = "sha256-mOPOVVG7c3PI/ltlwHBzNGqSyj6nMIvemYObrWezrqQ=";
subPackages = [ "." ];
+3 -3
View File
@@ -13,17 +13,17 @@
rustPlatform.buildRustPackage rec {
pname = "foundry";
version = "1.2.2";
version = "1.2.3";
src = fetchFromGitHub {
owner = "foundry-rs";
repo = "foundry";
tag = "v${version}";
hash = "sha256-XZHlBTFmdt4RL/JNGbHDI9XLwDRHoEr3KNCTq5oKexQ=";
hash = "sha256-1mZsz0tCvf943WLk7J+AJfPSl/yc84qlvMaQwFhM2ss=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-qa8mnLqu1X8Rs5ouxXgAiPxDwuXqSY896SCQl8Me5cU=";
cargoHash = "sha256-q0iNyGabqJJcxVLzU8CZpkxxSYOCfuc7ewiSQcQIzSY=";
nativeBuildInputs = [
pkg-config
+4 -4
View File
@@ -20,7 +20,7 @@ let
pname = "gitea-frontend";
inherit (gitea) src version;
npmDepsHash = "sha256-5i3aB1QgH5NK5yDZySFlraVGU+Kh6J4Y2zvFqJX5kJs=";
npmDepsHash = "sha256-+o7/A+Pqr8LZi+q0fOajQgLkWqquBrJSf0dpEXEJtwM=";
# use webpack directly instead of 'make frontend' as the packages are already installed
buildPhase = ''
@@ -35,18 +35,18 @@ let
in
buildGoModule rec {
pname = "gitea";
version = "1.23.8";
version = "1.24.0";
src = fetchFromGitHub {
owner = "go-gitea";
repo = "gitea";
tag = "v${gitea.version}";
hash = "sha256-79GSHJozNlzBkddeyKX36D/w73loEN28fNSbcMVhgxQ=";
hash = "sha256-lKeqoNL6RMjhm9egk6upbovJaWwm3r2kxi0Z9bjNxtI=";
};
proxyVendor = true;
vendorHash = "sha256-wdrFa+6E1qTW9PBXr7ROgBQn3nfgxZF7Z47yk61Iqvs=";
vendorHash = "sha256-nC8y3skBhnOo7Ki9nc7Ni6UpheArB8bGK4AR/1Gdjr0=";
outputs = [
"out"
@@ -20,14 +20,14 @@ let
in
stdenv.mkDerivation rec {
pname = "incus-ui-canonical";
version = "0.15.3";
version = "0.15.4";
src = fetchFromGitHub {
owner = "zabbly";
repo = "incus-ui-canonical";
# only use tags prefixed by incus- they are the tested fork versions
tag = "incus-${version}";
hash = "sha256-FsDdALcIXJFo0ScOA8YEzulefp8IfOSi2ZClrtcPo24=";
hash = "sha256-kY7FMZbwP5D5EJfYH1/ptgKdCceduk05fjVdwtOgUNk=";
};
offlineCache = fetchYarnDeps {
@@ -42,13 +42,13 @@ let
in
stdenv.mkDerivation rec {
pname = "intel-graphics-compiler";
version = "2.10.8";
version = "2.11.7";
src = fetchFromGitHub {
owner = "intel";
repo = "intel-graphics-compiler";
tag = "v${version}";
hash = "sha256-BFEl2LiaGRZXnQtOTEY/86ymKuQO3QN4HPbwHsdSZMs=";
hash = "sha256-bGH+cgWI3bRgOhSBgQUrHPiCQ68EfAxG+iM6vs8VjhU=";
};
postPatch = ''
+8 -14
View File
@@ -9,13 +9,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "libe57format";
version = "3.1.1";
version = "3.2.0";
src = fetchFromGitHub {
owner = "asmaloney";
repo = "libE57Format";
rev = "v${finalAttrs.version}";
hash = "sha256-bOuWh9Nkxva2v0M6+vnAya8EW/G3WQePxHakQt8T9NE=";
hash = "sha256-GyzfJshL2cOTEDp8eR0sqQq4GSnOdskiLi5mY1a2KW0=";
fetchSubmodules = true; # for submodule-vendored libraries such as `gtest`
};
@@ -23,8 +23,8 @@ stdenv.mkDerivation (finalAttrs: {
libE57Format-test-data_src = fetchFromGitHub {
owner = "asmaloney";
repo = "libE57Format-test-data";
rev = "4960564a732c6444c50dfae5b2273e68837399cd";
hash = "sha256-k26yVbYSQJ3EMgcpjm35N1OAxarFmfMvzfTN2Hdyu8c=";
rev = "2171612112b06afd4fec5babe8837be69d910149";
hash = "sha256-JARpxp6Z2VioBfY0pZSyQU2mG/EllbaF3qteSFM9u8o=";
};
CXXFLAGS = [
@@ -32,16 +32,6 @@ stdenv.mkDerivation (finalAttrs: {
"-include cstdint"
];
patches = [
# TODO: Remove with the next release: https://github.com/asmaloney/libE57Format/pull/299
(fetchpatch {
name = "libE57Format-Dont-force-warnings-as-errors-when-building-self.patch"; # https://github.com/apache/thrift/pull/2726
url = "https://github.com/asmaloney/libE57Format/commit/66bb5af15937b4c10a7f412ca4d1673f42bbad28.patch";
hash = "sha256-2cNURjMLP0TijYY5gbuWLE7H/PlMW936wAeOqJ/w9C0=";
})
];
nativeBuildInputs = [
cmake
];
@@ -51,6 +41,10 @@ stdenv.mkDerivation (finalAttrs: {
];
cmakeFlags = [
# Without this, LTO will be enabled, which seems to cause
# errors when consumers try to link the `.a` file, see:
# https://github.com/asmaloney/libE57Format/pull/313#issuecomment-2907797367
"-DE57_RELEASE_LTO=OFF"
# See https://github.com/asmaloney/libE57Format/blob/9372bdea8db2cc0c032a08f6d655a53833d484b8/test/README.md
(
if finalAttrs.finalPackage.doCheck then
@@ -100,5 +100,6 @@ stdenv.mkDerivation rec {
maintainers = [ lib.maintainers.imsick ];
platforms = [ "x86_64-linux" ];
sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
broken = true; # needs older version of fprintd (v1.94.4)
};
}
+38
View File
@@ -0,0 +1,38 @@
{
lib,
python3Packages,
fetchFromGitHub,
}:
python3Packages.buildPythonApplication rec {
pname = "mcp-proxy";
version = "0.7.0";
src = fetchFromGitHub {
owner = "sparfenyuk";
repo = "mcp-proxy";
tag = "v${version}";
hash = "sha256-xHy+IwnUoyICSTusqTzGf/kOvT0FvJYcTT9Do0C5DiY=";
};
pyproject = true;
build-system = [ python3Packages.setuptools ];
dependencies = with python3Packages; [
uvicorn
mcp
];
nativeCheckInputs = with python3Packages; [
pytestCheckHook
pytest-asyncio
];
meta = {
description = "MCP server which proxies other MCP servers from stdio to SSE or from SSE to stdio";
homepage = "https://github.com/sparfenyuk/mcp-proxy";
mainProgram = "mcp-proxy";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ keyruu ];
};
}
+4 -4
View File
@@ -1,9 +1,10 @@
{
lib,
stdenv,
stdenvNoCC,
fetchurl,
makeWrapper,
patchelf,
bintools,
dpkg,
# Linked dynamic libraries.
@@ -176,7 +177,7 @@ let
++ lib.optionals libvaSupport [ libva ];
in
stdenv.mkDerivation (finalAttrs: {
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "microsoft-edge";
version = "137.0.3296.68";
@@ -272,7 +273,7 @@ stdenv.mkDerivation (finalAttrs: {
for elf in $out/share/microsoft/$appname/{msedge,msedge-sandbox,msedge_crashpad_handler}; do
patchelf --set-rpath $rpath $elf
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $elf
patchelf --set-interpreter ${bintools.dynamicLinker} $elf
done
runHook postInstall
@@ -289,7 +290,6 @@ stdenv.mkDerivation (finalAttrs: {
maintainers = with lib.maintainers; [
cholli
ulrikstrid
emaryn
maeve-oake
leleuvilela
];
+3
View File
@@ -80,5 +80,8 @@ stdenv.mkDerivation rec {
teams = [ teams.sage ];
license = licenses.gpl2Plus;
platforms = platforms.all;
# Does not cross compile
# https://github.com/libntl/ntl/issues/8
broken = !(stdenv.buildPlatform.canExecute stdenv.hostPlatform);
};
}
+3 -3
View File
@@ -7,13 +7,13 @@
buildGoModule rec {
pname = "orchard";
version = "0.33.2";
version = "0.33.3";
src = fetchFromGitHub {
owner = "cirruslabs";
repo = "orchard";
rev = version;
hash = "sha256-yiCMnP73C5MJLYjnZfqcKtdSzPyL/9WlAtylMXDl4E8=";
hash = "sha256-bkJ2qvhMs3kSx4p46wgo8ZabqNNRYRE5jwTniBuobLA=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;
@@ -24,7 +24,7 @@ buildGoModule rec {
'';
};
vendorHash = "sha256-fU2TXUtcXmjswlEbSsbCTOaC5rvtctHbTKbR7zIwP/g=";
vendorHash = "sha256-D1zTKHioavIpWwS0i/uP91hK+Cxg9Git6DQ0iCowcXM=";
nativeBuildInputs = [ installShellFiles ];
+2 -2
View File
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "rss-bridge";
version = "2025-01-26";
version = "2025-06-03";
src = fetchFromGitHub {
owner = "RSS-Bridge";
repo = "rss-bridge";
rev = version;
sha256 = "sha256-b8mBojtNbQ9QSsFT2PTwyHJIOhoOpTxd6c2ldMy/g5g=";
sha256 = "sha256-S9TSTUwuScOcLbEpGgET1zzH1WlO1IMUOiwzMTsA65s=";
};
installPhase = ''
+2 -2
View File
@@ -40,11 +40,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "shotwell";
version = "0.32.10";
version = "0.32.13";
src = fetchurl {
url = "mirror://gnome/sources/shotwell/${lib.versions.majorMinor finalAttrs.version}/shotwell-${finalAttrs.version}.tar.xz";
sha256 = "sha256-JuRaYbVDGwlv/NF28RW9B76ad6aDNYmVQhBuGeB/QA4=";
sha256 = "sha256-vdPoT2AuL8frQoQ8kKJes6pJ+y/7de21HbAb0pBdvR4=";
};
nativeBuildInputs = [
-66
View File
@@ -1,66 +0,0 @@
{
lib,
stdenv,
fetchurl,
libGLU,
libGL,
libXi,
libXt,
libXext,
libX11,
libXmu,
libglut,
}:
stdenv.mkDerivation rec {
pname = "space-orbit";
version = "1.01";
patchversion = "9";
buildInputs = [
libGLU
libGL
libXi
libXt
libXext
libX11
libXmu
libglut
];
src = fetchurl {
url = "mirror://debian/pool/main/s/space-orbit/space-orbit_${version}.orig.tar.gz";
sha256 = "1kx69f9jqnfzwjh47cl1df8p8hn3bnp6bznxnb6c4wx32ijn5gri";
};
patches = [
(fetchurl {
url = "mirror://debian/pool/main/s/space-orbit/space-orbit_${version}-${patchversion}.diff.gz";
sha256 = "1v3s97day6fhv08l2rn81waiprhi1lfyjjsj55axfh6n6zqfn1w2";
})
];
preBuild = ''
cd src
sed -e 's@/usr/share/games/orbit/@'$out'/dump/@g' -i *.c
sed -e '/DIR=/d; s/-lesd//; s/-DESD//;' -i Makefile
'';
installPhase = ''
mkdir -p $out/bin
cp -r .. $out/dump
cat >$out/bin/space-orbit <<EOF
#! ${stdenv.shell}
exec $out/dump/orbit "\$@"
EOF
chmod a+x $out/bin/space-orbit
'';
meta = with lib; {
broken = stdenv.hostPlatform.isDarwin;
description = "Space combat simulator";
mainProgram = "space-orbit";
license = licenses.gpl2Plus;
platforms = platforms.all;
};
}
@@ -43,9 +43,9 @@ let
}
else if llvmMajor == "15" then
rec {
version = "15.0.11";
version = "15.0.12";
rev = "v${version}";
hash = "sha256-q4WhUaBDw0cnv1eqC6wSvrApHKvyg5/4QetybDLQkEw=";
hash = "sha256-u3cy8Nk9Dvt5VeSP46glvmSv1sQp+lUl9rY6pPTqtmY=";
}
else if llvmMajor == "14" then
{
+2 -2
View File
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "thrift-ls";
version = "0.2.7";
version = "0.2.9";
src = fetchFromGitHub {
owner = "joyme123";
repo = "thrift-ls";
rev = "v${version}";
hash = "sha256-QX4ChPjHIY0GtjqmZH5Q4veC+VnMntYIQvwwSds8UUo=";
hash = "sha256-Gmqm1D+zcXtqFEraHjivqIqFz0AZCJd3pnH4zKE/jxw=";
};
vendorHash = "sha256-SGCJ12BxjFUQ7bnaNY0bvrrtm2qNNrwYKKfNEi1lPco=";
@@ -26,7 +26,7 @@
stdenv.mkDerivation rec {
pname = "elementary-files";
version = "7.1.1";
version = "7.1.2";
outputs = [
"out"
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = "files";
rev = version;
hash = "sha256-GJ+OYe2DJ9VIMkwobQJxD1bGoV8k6ALkx9RpT3Cazis=";
hash = "sha256-7K9XXTXQMoHGV7yI23Gtbw7R1NRyQgFO45haXHAuUxw=";
};
nativeBuildInputs = [
@@ -6,16 +6,25 @@
buildDunePackage rec {
pname = "benchmark";
version = "1.6";
version = "1.7";
minimalOCamlVersion = "4.03";
src = fetchurl {
url = "https://github.com/Chris00/ocaml-benchmark/releases/download/${version}/benchmark-${version}.tbz";
hash = "sha256-Mw19cYya/MEy52PVRYE/B6TnqCWw5tEz9CUrUfKAnPA=";
url = "https://github.com/Chris00/ocaml-benchmark/releases/download/v${version}/benchmark-${version}.tbz";
hash = "sha256-Aij7vJzamNWQfjLeGgENlIp6Il8+Wc9hsahr4eDGs68=";
};
meta = {
homepage = "https://github.com/Chris00/ocaml-benchmark";
description = "Benchmark running times of code";
license = lib.licenses.lgpl21;
longDescription = ''
This module provides a set of tools to measure the running times of
your functions and to easily compare the results. A statistical test
is used to determine whether the results truly differ.
'';
changelog = "https://raw.githubusercontent.com/Chris00/ocaml-benchmark/refs/tags/v${version}/CHANGES.md";
license = lib.licenses.lgpl3;
maintainers = with lib.maintainers; [ momeemt ];
};
}
@@ -0,0 +1,32 @@
{
lib,
mkTclDerivation,
fetchzip,
pkg-config,
dbus,
}:
mkTclDerivation rec {
pname = "dbus";
version = "4.1";
src = fetchzip {
url = "https://chiselapp.com/user/schelte/repository/dbus/uv/dbus-${version}.tar.gz";
hash = "sha256-8VIw475Q9kRh6UV6FxWCXKLKasqM1z58ed0rMgzEX3I=";
};
nativeBuildInputs = [
pkg-config
];
buildInputs = [
dbus
];
meta = {
description = "DBus bindings for Tcl";
homepage = "https://chiselapp.com/user/schelte/repository/dbus/home";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ fgaz ];
};
}
+2 -2
View File
@@ -16,8 +16,8 @@ let
hash = "sha256-z4anrXZEBjldQoam0J1zBxFyCsxtk+nc6ax6xNxKKKc=";
};
"10" = {
version = "10.11.1";
hash = "sha256-IR6ZkBSElcn8MLflg5b37tqD2SQ+t1QH6k+GUPsWH3w=";
version = "10.12.1";
hash = "sha256-iJusRw7JPMw3ZEiKGda6j5xkitXlCppuS+N2il3jh6M=";
};
};
@@ -37,6 +37,7 @@ stdenv.mkDerivation {
man = "share/man";
include = "include";
lib = "lib";
libexec = "libexec";
locale = "share/locale";
doc = "share/doc/cpupower";
conf = "etc";
+3 -1
View File
@@ -1690,6 +1690,7 @@ mapAliases {
riko4 = throw "'riko4' has been removed as it was unmaintained, failed to build and dependend on outdated libraries"; # Added 2025-05-18
rippled = throw "rippled has been removed as it was broken and had not been updated since 2022"; # Added 2024-11-25
rippled-validator-keys-tool = throw "rippled-validator-keys-tool has been removed as it was broken and had not been updated since 2022"; # Added 2024-11-25
rke2_1_29 = throw "'rke2_1_29' has been removed from nixpkgs as it has reached end of life"; # Added 2025-05-05
rke2_testing = throw "'rke2_testing' has been removed from nixpkgs as the RKE2 testing channel no longer serves releases"; # Added 2025-06-02
rl_json = tclPackages.rl_json; # Added 2025-05-03
rockbox_utility = rockbox-utility; # Added 2022-03-17
@@ -1761,7 +1762,7 @@ mapAliases {
signal-desktop-source = lib.warnOnInstantiate "'signal-desktop-source' is now exposed at 'signal-desktop'." signal-desktop; # Added 2025-04-16
silc_server = throw "'silc_server' has been removed because it is unmaintained"; # Added 2025-05-12
silc_client = throw "'silc_client' has been removed because it is unmaintained"; # Added 2025-05-12
siproxd = throw "'siproxd' has been as it was unmaintained and incompatible with newer libosip versions"; # Added 2025-05-18
siproxd = throw "'siproxd' has been removed as it was unmaintained and incompatible with newer libosip versions"; # Added 2025-05-18
sheesy-cli = throw "'sheesy-cli' has been removed due to lack of upstream maintenance"; # Added 2025-01-26
shout = nodePackages.shout; # Added unknown; moved 2024-10-19
sky = throw "'sky' has been removed because its upstream website disappeared"; # Added 2024-07-21
@@ -1781,6 +1782,7 @@ mapAliases {
SP800-90B_EntropyAssessment = sp800-90b-entropyassessment; # Added on 2024-06-12
SPAdes = spades; # Added 2024-06-12
spark2014 = gnatprove; # Added 2024-02-25
space-orbit = throw "'space-orbit' has been removed because it is unmaintained; Debian upstream stopped tracking it in 2011."; # Added 2025-06-08
spatialite_gui = throw "spatialite_gui has been renamed to spatialite-gui"; # Added 2025-01-12
spatialite_tools = throw "spatialite_tools has been renamed to spatialite-tools"; # Added 2025-02-06
-1
View File
@@ -13839,7 +13839,6 @@ with pkgs;
callPackage ../applications/networking/instant-messengers/ripcord/darwin.nix { };
inherit (callPackage ../applications/networking/cluster/rke2 { })
rke2_1_29
rke2_1_30
rke2_1_31
rke2_1_32
+5
View File
@@ -7,6 +7,7 @@ in
newScope,
tcl,
tk,
pkgs,
}:
lib.makeScope newScope (
@@ -17,5 +18,9 @@ lib.makeScope newScope (
critcl = self.callPackage ../development/tcl-modules/critcl {
tcllib = self.tcllib.override { withCritcl = false; };
};
dbus = self.callPackage ../development/tcl-modules/dbus {
inherit (pkgs) dbus;
};
})
)