Merge remote-tracking branch 'origin/master' into staging-next

This commit is contained in:
K900
2025-08-12 09:22:59 +03:00
135 changed files with 3074 additions and 1351 deletions
+7 -1
View File
@@ -5914,7 +5914,7 @@
};
dblsaiko = {
email = "me@dblsaiko.net";
github = "2xsaiko";
github = "dblsaiko";
githubId = 3987560;
name = "Katalin Rebhan";
};
@@ -16745,6 +16745,12 @@
githubId = 24192522;
name = "MithicSpirit";
};
miyu = {
email = "miyu@allthingslinux.org";
github = "fndov";
githubId = 168955383;
name = "Tommy B";
};
mjm = {
email = "matt@mattmoriarity.com";
github = "mjm";
@@ -187,6 +187,8 @@
- `services.monero` now includes the `environmentFile` option for adding secrets to the Monero daemon config.
- `services.netbird.server` now uses dedicated packages split out due to relicensing of server components to AGPLv3 with version `0.53.0`,
- The new option [networking.ipips](#opt-networking.ipips) has been added to create IP within IP kind of tunnels (including 4in6, ip6ip6 and ipip).
With the existing [networking.sits](#opt-networking.sits) option (6in4), it is now possible to create all combinations of IPv4 and IPv6 encapsulation.
@@ -21,6 +21,7 @@ let
_file = "${__curPos.file}:${toString __curPos.line}";
options = {
"<imports = [ pkgs.ghostunnel.services.default ]>" = fakeSubmodule pkgs.ghostunnel.services.default;
"<imports = [ pkgs.php.services.default ]>" = fakeSubmodule pkgs.php.services.default;
};
};
in
@@ -139,7 +139,7 @@ in
options.services.netbird.server.management = {
enable = mkEnableOption "Netbird Management Service";
package = mkPackageOption pkgs "netbird" { };
package = mkPackageOption pkgs "netbird-management" { };
domain = mkOption {
type = str;
@@ -31,7 +31,7 @@ in
options.services.netbird.server.signal = {
enable = mkEnableOption "Netbird's Signal Service";
package = mkPackageOption pkgs "netbird" { };
package = mkPackageOption pkgs "netbird-signal" { };
enableNginx = mkEnableOption "Nginx reverse-proxy for the netbird signal service";
+72 -28
View File
@@ -7,7 +7,7 @@
];
nodes = {
clients =
node =
{ ... }:
{
services.netbird.enable = true;
@@ -15,34 +15,16 @@
};
};
# TODO: confirm the whole solution is working end-to-end when netbird server is implemented
testScript = ''
start_all()
def did_start(node, name, interval=0.5, timeout=10):
node.wait_for_unit(f"{name}.service")
node.wait_for_file(f"/var/run/{name}/sock")
# `netbird status` returns a full "Disconnected" status during initialization
# only after a while passes it starts returning "NeedsLogin" help message
start = time.time()
output = node.succeed(f"{name} status")
while "Disconnected" in output and (time.time() - start) < timeout:
time.sleep(interval)
output = node.succeed(f"{name} status")
assert "NeedsLogin" in output
did_start(clients, "netbird")
did_start(clients, "netbird-custom")
'';
/*
`netbird status` used to print `Daemon status: NeedsLogin`
https://github.com/netbirdio/netbird/blob/23a14737974e3849fa86408d136cc46db8a885d0/client/cmd/status.go#L154-L164
as the first line, but now it is just:
Historically waiting for the NetBird client daemon initialization helped catch number of bugs with the service,
so we keep try to keep it here in as much details as it makes sense.
Daemon version: 0.26.3
CLI version: 0.26.3
Management: Disconnected
Initially `netbird status` returns a "Disconnected" messages:
OS: linux/amd64
Daemon version: 0.54.0
CLI version: 0.54.0
Profile: default
Management: Disconnected, reason: rpc error: code = FailedPrecondition desc = failed connecting to Management Service : context deadline exceeded
Signal: Disconnected
Relays: 0/0 Available
Nameservers: 0/0 Available
@@ -50,7 +32,69 @@
NetBird IP: N/A
Interface type: N/A
Quantum resistance: false
Routes: -
Lazy connection: false
Networks: -
Forwarding rules: 0
Peers count: 0/0 Connected
After a while passes it should start returning "NeedsLogin" help message.
As of ~0.53.0+ in ~30 second intervals the `netbird status` instead of "NeedsLogin" it briefly (for under 2 seconds) crashes with:
Error: status failed: failed connecting to Management Service : context deadline exceeded
This might be related to the following log line:
2025-08-11T15:03:25Z ERRO shared/management/client/grpc.go:65: failed creating connection to Management Service: context deadline exceeded
*/
# TODO: confirm the whole solution is working end-to-end when netbird server is implemented
testScript = ''
import textwrap
import time
start_all()
def run_with_debug(node, cmd, check=True, display=True, **kwargs):
cmd = f"{cmd} 2>&1"
start = time.time()
ret, output = node.execute(cmd, **kwargs)
duration = time.time() - start
txt = f">>> {cmd=} {ret=} {duration=:.2f}:\n{textwrap.indent(output, '... ')}"
if check:
assert ret == 0, txt
if display:
print(txt)
return ret, output
def wait_until_rcode(node, cmd, rcode=0, retries=30, **kwargs):
def check_success(_last_try):
nonlocal output
ret, output = run_with_debug(node, cmd, **kwargs)
return ret == rcode
kwargs.setdefault('check', False)
output = None
with node.nested(f"waiting for {cmd=} to exit with {rcode=}"):
retry(check_success, retries)
return output
instances = ["netbird", "netbird-custom"]
for name in instances:
node.wait_for_unit(f"{name}.service")
node.wait_for_file(f"/var/run/{name}/sock")
for name in instances:
wait_until_rcode(node, f"{name} status |& grep -C20 Disconnected", 0, retries=5)
''
# The status used to turn into `NeedsLogin`, but recently started crashing instead.
# leaving the snippets in here, in case some update goes back to the old behavior and can be tested again
+ lib.optionalString false ''
for name in instances:
#wait_until_rcode(node, f"{name} status |& grep -C20 NeedsLogin", 0, retries=20)
output = wait_until_rcode(node, f"{name} status", 1, retries=61)
msg = "Error: status failed: failed connecting to Management Service : context deadline exceeded"
assert output.strip() == msg, f"expected {msg=}, got {output=} instead"
wait_until_rcode(node, f"{name} status |& grep -C20 Disconnected", 0, retries=10)
'';
}
+4
View File
@@ -13,6 +13,10 @@ in
imports = [ ./fpm.nix ];
_module.args.php = php';
};
fpm-modular = runTest {
imports = [ ./fpm-modular.nix ];
_module.args.php = php';
};
httpd = runTest {
imports = [ ./httpd.nix ];
_module.args.php = php';
+71
View File
@@ -0,0 +1,71 @@
{ lib, php, ... }:
{
name = "php-${php.version}-fpm-modular-nginx-test";
meta.maintainers = with lib.maintainers; [
aanderse
];
nodes.machine =
{ config, pkgs, ... }:
{
environment.systemPackages = [ php ];
services.nginx = {
enable = true;
virtualHosts."phpfpm" =
let
testdir = pkgs.writeTextDir "web/index.php" "<?php phpinfo();";
in
{
root = "${testdir}/web";
locations."~ \\.php$".extraConfig = ''
fastcgi_pass unix:${config.system.services.php-fpm.php-fpm.settings.foobar.listen};
fastcgi_index index.php;
include ${config.services.nginx.package}/conf/fastcgi_params;
include ${pkgs.nginx}/conf/fastcgi.conf;
'';
locations."/" = {
tryFiles = "$uri $uri/ index.php";
index = "index.php index.html index.htm";
};
};
};
system.services.php-fpm = {
imports = [ php.services.default ];
php-fpm = {
package = php;
settings = {
foobar = {
"user" = "nginx";
"listen.group" = "nginx";
"listen.mode" = "0600";
"listen.owner" = "nginx";
"pm" = "dynamic";
"pm.max_children" = 5;
"pm.max_requests" = 500;
"pm.max_spare_servers" = 3;
"pm.min_spare_servers" = 1;
"pm.start_servers" = 2;
};
};
};
};
};
testScript =
{ ... }:
''
machine.wait_for_unit("nginx.service")
machine.wait_for_unit("php-fpm.service")
# Check so we get an evaluated PHP back
response = machine.succeed("curl -fvvv -s http://127.0.0.1:80/")
assert "PHP Version ${php.version}" in response, "PHP version not detected"
# Check so we have database and some other extensions loaded
for ext in ["json", "opcache", "pdo_mysql", "pdo_pgsql", "pdo_sqlite", "apcu"]:
assert ext in response, f"Missing {ext} extension"
machine.succeed(f'test -n "$(php -m | grep -i {ext})"')
'';
}
@@ -1,48 +0,0 @@
{
lib,
python3Packages,
fetchPypi,
libsForQt5,
p7zip,
archiveSupport ? true,
}:
python3Packages.buildPythonApplication rec {
pname = "kcc";
version = "5.5.1";
format = "setuptools";
src = fetchPypi {
inherit version;
pname = "KindleComicConverter";
sha256 = "5dbee5dc5ee06a07316ae5ebaf21ffa1970094dbae5985ad735e2807ef112644";
};
nativeBuildInputs = [ libsForQt5.wrapQtAppsHook ];
propagatedBuildInputs = with python3Packages; [
pillow
pyqt5
psutil
python-slugify
raven
];
qtWrapperArgs = lib.optionals archiveSupport [
"--prefix"
"PATH"
":"
"${lib.makeBinPath [ p7zip ]}"
];
postFixup = ''
wrapProgram $out/bin/kcc "''${qtWrapperArgs[@]}"
'';
meta = with lib; {
description = "Python app to convert comic/manga files or folders to EPUB, Panel View MOBI or E-Ink optimized CBZ";
homepage = "https://github.com/ciromattia/kcc";
license = licenses.isc;
maintainers = with maintainers; [ dawidsowa ];
};
}
@@ -198,13 +198,13 @@
"vendorHash": "sha256-ok73U0WWFGXp5TJ7sp7U9umq7DlChCw7fSyFmbifwKE="
},
"bitwarden": {
"hash": "sha256-eqWyKPzSINSZcO8Ho0WHTeVDOxbUynOzupXu6vzTtuU=",
"hash": "sha256-yq45SlP8x/jMSuhgrIIAM+hWa4tcp2d871uoLy+iIZM=",
"homepage": "https://registry.terraform.io/providers/maxlaverse/bitwarden",
"owner": "maxlaverse",
"repo": "terraform-provider-bitwarden",
"rev": "v0.14.0",
"rev": "v0.15.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-TmlnrCsIM9k2ApPFcSpFUoggIIDrT9S/BeD3kKI2Klc="
"vendorHash": "sha256-oQ7rOrWS2cJtAOwO+tQ9aB27DyHMhf5FYpDvJVsLe/k="
},
"brightbox": {
"hash": "sha256-pwFbCP+qDL/4IUfbPRCkddkbsEEeAu7Wp12/mDL0ABA=",
@@ -534,13 +534,13 @@
"vendorHash": "sha256-n6UUSCQt3mJESEfqVHX4sfr1XqOXu+u7Qejjps6RmBs="
},
"google-beta": {
"hash": "sha256-HWtH/F4Bf86jzb27jSSpE7h77CH9FpGTF5tpGSxuX+g=",
"hash": "sha256-8woiWjYYaojpKykxd9eMT4qXfpHVkXFA9eN3qzhEu+8=",
"homepage": "https://registry.terraform.io/providers/hashicorp/google-beta",
"owner": "hashicorp",
"repo": "terraform-provider-google-beta",
"rev": "v6.46.0",
"rev": "v6.47.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-QQI1BfUgDRYwlqOC2+e/EMcDsEbZV8cAUnscnW8xVLk="
"vendorHash": "sha256-BzmaCp0QL2BbYn+NwlvPGV2CoDjKXr75HaPFVdrS5e4="
},
"googleworkspace": {
"hash": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=",
@@ -876,11 +876,11 @@
"vendorHash": null
},
"newrelic": {
"hash": "sha256-ymxR4LOgsMg8evg4nBjzJZ5rKi/ql4TLlYb9i9gzKK4=",
"hash": "sha256-4l7q9umrbic4lOKMtTWwBDRHMJUlVyrl5un7KAYYiAM=",
"homepage": "https://registry.terraform.io/providers/newrelic/newrelic",
"owner": "newrelic",
"repo": "terraform-provider-newrelic",
"rev": "v3.65.0",
"rev": "v3.66.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-+ogtadT0zekeaynXQCwDBrD+bBnKUsyzLGPQyLsCSR8="
},
@@ -1138,11 +1138,11 @@
"vendorHash": "sha256-75GQmp/ybD+VugrrB8qTbP3OPHy3eyBGe5u7CM7CRcc="
},
"routeros": {
"hash": "sha256-1qdq09QFijxQDUaoPJwJB4F5aZ0AHXJSGndcdR9iqOs=",
"hash": "sha256-q0ZRAip6mgHkdBcns8G7VlDnMNB+ux6ITKwcSL4WrcY=",
"homepage": "https://registry.terraform.io/providers/terraform-routeros/routeros",
"owner": "terraform-routeros",
"repo": "terraform-provider-routeros",
"rev": "v1.86.1",
"rev": "v1.86.2",
"spdx": "MPL-2.0",
"vendorHash": "sha256-et1xqcaCKTRz9bJjTlRnxhXBoc6PaeSwJgBI4pAzcdg="
},
+11 -12
View File
@@ -7,14 +7,14 @@
SDL2_mixer,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "abbaye-des-morts";
version = "2.0.5";
src = fetchFromGitHub {
owner = "nevat";
repo = "abbayedesmorts-gpl";
tag = "v${version}";
tag = "v${finalAttrs.version}";
sha256 = "sha256-muJt1cml0nYdgl0v8cudpUXcdSntc49e6zICTCwzkks=";
};
@@ -25,18 +25,17 @@ stdenv.mkDerivation rec {
];
makeFlags = [
"PREFIX=$(out)"
"PREFIX=${placeholder "out"}"
"DESTDIR="
];
]
++ lib.optional stdenv.isDarwin "PLATFORM=mac";
preBuild = lib.optionalString stdenv.cc.isClang ''
# Even with PLATFORM=mac, the Makefile specifies some GCC-specific CFLAGS that
# are not supported by modern Clang on macOS
postPatch = lib.optionalString stdenv.isDarwin ''
substituteInPlace Makefile \
--replace -fpredictive-commoning ""
'';
preInstall = ''
mkdir -p $out/bin
mkdir -p $out/share/applications
--replace-fail "-funswitch-loops" "" \
--replace-fail "-fgcse-after-reload" ""
'';
meta = {
@@ -46,4 +45,4 @@ stdenv.mkDerivation rec {
license = lib.licenses.gpl3;
maintainers = with lib.maintainers; [ marius851000 ];
};
}
})
+3 -3
View File
@@ -8,17 +8,17 @@
buildGoModule rec {
pname = "aliyun-cli";
version = "3.0.292";
version = "3.0.294";
src = fetchFromGitHub {
owner = "aliyun";
repo = "aliyun-cli";
tag = "v${version}";
hash = "sha256-/bw4ukQRQ7rJLa+Muy7KjgyBh7ffFGSJ/q5Wnd/y7FY=";
hash = "sha256-u7a90QObYcsZFLlKoaIanqadxrSaWEVB/FCHFBul/dI=";
fetchSubmodules = true;
};
vendorHash = "sha256-pa60hGn1UmzSgmopw+OAFgsL0o7mjEXTpYLAHgdTcMI=";
vendorHash = "sha256-Vp7cvIlswhRf1ntZESd7Oabg+xZ4UOFJGD2usRcnnhY=";
subPackages = [ "main" ];
+3 -3
View File
@@ -12,7 +12,7 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "arti";
version = "1.4.4";
version = "1.4.6";
src = fetchFromGitLab {
domain = "gitlab.torproject.org";
@@ -20,10 +20,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
owner = "core";
repo = "arti";
tag = "arti-v${finalAttrs.version}";
hash = "sha256-mLeiG+503+kuzNUC9Qh2JE1Mm8XEa6CDJYkouzGUJpQ=";
hash = "sha256-4HEJiA7FLM3NGV0dcx5aEwky8UTzVLR092b/0HTGCvY=";
};
cargoHash = "sha256-mjlrylfQZN8/zei/1enApYryhlv0zlghOPEr86iklg4=";
cargoHash = "sha256-ke58MnRYL2ZRck5UKCsGCqiiAZtnOZFTOaoQneP6tV0=";
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ];
-4
View File
@@ -38,10 +38,6 @@ buildDotnetModule rec {
passthru = {
updateScript = ./update.sh;
tests.version = testers.testVersion {
package = audiothekar;
command = "audiothekar-cli --version";
};
};
meta = with lib; {
+2 -2
View File
@@ -9,10 +9,10 @@
}:
let
pname = "beeper";
version = "4.1.20";
version = "4.1.64";
src = fetchurl {
url = "https://beeper-desktop.download.beeper.com/builds/Beeper-${version}.AppImage";
hash = "sha256-4sJ61j9/DdZM9mn3JqrvjlWPDb6nN4A4wzQR5lXthxU=";
hash = "sha256-8Gd7qSp0/anYLrLCUfq15OacVsKwFVWQxaVvN9xsXkY=";
};
appimageContents = appimageTools.extract {
inherit pname version src;
+3 -3
View File
@@ -1,6 +1,6 @@
# Generated by ./update.sh - do not update manually!
{
version = "1.16.5-4";
arm64-hash = "sha256-8APk13cLzhOaPXCpkdX5OLpXM/EV93uR2LHuMaBeUb0=";
x86_64-hash = "sha256-S7R4XmBnqyXugwf5henOZG5TzGUw4IrU42SXINm6Wcw=";
version = "1.17.0-2";
arm64-hash = "sha256-skqxt0IPn3X1ejltxTdT7Xm1zEeFTmyJdxRmNK8+fvY=";
x86_64-hash = "sha256-ZYTELa0syIS2fZCNNFHg7WlTh9+Zu7XxSJTAvwavg5w=";
}
@@ -1,282 +0,0 @@
diff --git a/apps/cli/package.json b/apps/cli/package.json
index 2ec4e6f697..db5981b5ec 100644
--- a/apps/cli/package.json
+++ b/apps/cli/package.json
@@ -85,7 +85,7 @@
"multer": "1.4.5-lts.2",
"node-fetch": "2.6.12",
"node-forge": "1.3.1",
- "open": "10.1.2",
+ "open": "8.4.2",
"papaparse": "5.5.3",
"proper-lockfile": "4.1.2",
"rxjs": "7.8.1",
diff --git a/apps/desktop/desktop_native/Cargo.lock b/apps/desktop/desktop_native/Cargo.lock
index 05663ea7e0..eadd75e598 100644
--- a/apps/desktop/desktop_native/Cargo.lock
+++ b/apps/desktop/desktop_native/Cargo.lock
@@ -162,7 +162,7 @@ dependencies = [
"serde_repr",
"tokio",
"url",
- "zbus 5.6.0",
+ "zbus",
]
[[package]]
@@ -900,7 +900,7 @@ dependencies = [
"widestring",
"windows 0.61.1",
"windows-future",
- "zbus 4.4.0",
+ "zbus",
"zbus_polkit",
"zeroizing-alloc",
]
@@ -2063,10 +2063,10 @@ dependencies = [
"sha2",
"subtle",
"tokio",
- "zbus 5.6.0",
- "zbus_macros 5.6.0",
+ "zbus",
+ "zbus_macros",
"zeroize",
- "zvariant 5.5.1",
+ "zvariant",
]
[[package]]
@@ -2715,17 +2715,6 @@ dependencies = [
"syn",
]
-[[package]]
-name = "sha1"
-version = "0.10.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "digest",
-]
-
[[package]]
name = "sha2"
version = "0.10.8"
@@ -3921,9 +3910,9 @@ dependencies = [
[[package]]
name = "zbus"
-version = "4.4.0"
+version = "5.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb97012beadd29e654708a0fdb4c84bc046f537aecfde2c3ee0a9e4b4d48c725"
+checksum = "59c333f648ea1b647bc95dc1d34807c8e25ed7a6feff3394034dc4776054b236"
dependencies = [
"async-broadcast",
"async-executor",
@@ -3938,90 +3927,37 @@ dependencies = [
"enumflags2",
"event-listener",
"futures-core",
- "futures-sink",
- "futures-util",
- "hex",
- "nix",
- "ordered-stream",
- "rand 0.8.5",
- "serde",
- "serde_repr",
- "sha1",
- "static_assertions",
- "tracing",
- "uds_windows",
- "windows-sys 0.52.0",
- "xdg-home",
- "zbus_macros 4.4.0",
- "zbus_names 3.0.0",
- "zvariant 4.2.0",
-]
-
-[[package]]
-name = "zbus"
-version = "5.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2522b82023923eecb0b366da727ec883ace092e7887b61d3da5139f26b44da58"
-dependencies = [
- "async-broadcast",
- "async-recursion",
- "async-trait",
- "enumflags2",
- "event-listener",
- "futures-core",
"futures-lite",
"hex",
"nix",
"ordered-stream",
"serde",
"serde_repr",
+ "static_assertions",
"tokio",
"tracing",
"uds_windows",
"windows-sys 0.59.0",
"winnow",
- "zbus_macros 5.6.0",
- "zbus_names 4.2.0",
- "zvariant 5.5.1",
+ "xdg-home",
+ "zbus_macros",
+ "zbus_names",
+ "zvariant",
]
[[package]]
name = "zbus_macros"
-version = "4.4.0"
+version = "5.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "267db9407081e90bbfa46d841d3cbc60f59c0351838c4bc65199ecd79ab1983e"
+checksum = "f325ad10eb0d0a3eb060203494c3b7ec3162a01a59db75d2deee100339709fc0"
dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
"syn",
- "zvariant_utils 2.1.0",
-]
-
-[[package]]
-name = "zbus_macros"
-version = "5.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05d2e12843c75108c00c618c2e8ef9675b50b6ec095b36dc965f2e5aed463c15"
-dependencies = [
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "syn",
- "zbus_names 4.2.0",
- "zvariant 5.5.1",
- "zvariant_utils 3.2.0",
-]
-
-[[package]]
-name = "zbus_names"
-version = "3.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c"
-dependencies = [
- "serde",
- "static_assertions",
- "zvariant 4.2.0",
+ "zbus_names",
+ "zvariant",
+ "zvariant_utils",
]
[[package]]
@@ -4033,20 +3969,20 @@ dependencies = [
"serde",
"static_assertions",
"winnow",
- "zvariant 5.5.1",
+ "zvariant",
]
[[package]]
name = "zbus_polkit"
-version = "4.0.0"
+version = "5.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00a29bfa927b29f91b7feb4e1990f2dd1b4604072f493dc2f074cf59e4e0ba90"
+checksum = "ad23d5c4d198c7e2641b33e6e0d1f866f117408ba66fe80bbe52e289eeb77c52"
dependencies = [
"enumflags2",
"serde",
"serde_repr",
"static_assertions",
- "zbus 4.4.0",
+ "zbus",
]
[[package]]
@@ -4149,19 +4085,6 @@ dependencies = [
"syn",
]
-[[package]]
-name = "zvariant"
-version = "4.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2084290ab9a1c471c38fc524945837734fbf124487e105daec2bb57fd48c81fe"
-dependencies = [
- "endi",
- "enumflags2",
- "serde",
- "static_assertions",
- "zvariant_derive 4.2.0",
-]
-
[[package]]
name = "zvariant"
version = "5.5.1"
@@ -4173,21 +4096,8 @@ dependencies = [
"serde",
"url",
"winnow",
- "zvariant_derive 5.5.1",
- "zvariant_utils 3.2.0",
-]
-
-[[package]]
-name = "zvariant_derive"
-version = "4.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73e2ba546bda683a90652bac4a279bc146adad1386f25379cf73200d2002c449"
-dependencies = [
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "syn",
- "zvariant_utils 2.1.0",
+ "zvariant_derive",
+ "zvariant_utils",
]
[[package]]
@@ -4200,18 +4110,7 @@ dependencies = [
"proc-macro2",
"quote",
"syn",
- "zvariant_utils 3.2.0",
-]
-
-[[package]]
-name = "zvariant_utils"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
+ "zvariant_utils",
]
[[package]]
diff --git a/package-lock.json b/package-lock.json
index 5df63a79dd..702b6d1c81 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -225,7 +225,7 @@
"multer": "1.4.5-lts.2",
"node-fetch": "2.6.12",
"node-forge": "1.3.1",
- "open": "10.1.2",
+ "open": "8.4.2",
"papaparse": "5.5.3",
"proper-lockfile": "4.1.2",
"rxjs": "7.8.1",
@@ -14,7 +14,7 @@
makeWrapper,
napi-rs-cli,
nix-update-script,
nodejs_20,
nodejs_22,
pkg-config,
rustc,
rustPlatform,
@@ -34,20 +34,18 @@ let
in
buildNpmPackage' rec {
pname = "bitwarden-desktop";
version = "2025.6.1";
version = "2025.7.0";
src = fetchFromGitHub {
owner = "bitwarden";
repo = "clients";
rev = "desktop-v${version}";
hash = "sha256-dYeq0YkQwmRve++RcMWnAuJyslaTZ4VIV4V/lMgSauQ=";
hash = "sha256-i1osaSK2Nnjnt2j/bS6VEMi4j5UvEEHf+RVt0901DvA=";
};
patches = [
./electron-builder-package-lock.patch
./dont-auto-setup-biometrics.patch
# The nixpkgs tooling trips over upstreams inconsistent lock files, so we fixed them by running npm install open@10.2.1 and cargo b
./fix-lock-files.diff
# ensures `app.getPath("exe")` returns our wrapper, not ${electron}/bin/electron
./set-exe-path.patch
@@ -67,9 +65,12 @@ buildNpmPackage' rec {
# will open releases page instead of trying to update files
substituteInPlace apps/desktop/src/main/updater.main.ts \
--replace-fail 'this.canUpdate =' 'this.canUpdate = false; let _dummy ='
# unneeded for desktop, and causes errors
rm -r apps/cli
'';
nodejs = nodejs_20;
nodejs = nodejs_22;
makeCacheWritable = true;
npmFlags = [
@@ -82,7 +83,7 @@ buildNpmPackage' rec {
"--ignore-scripts"
];
npmWorkspace = "apps/desktop";
npmDepsHash = "sha256-yzOz1X75Wz/NwjlGHL439bEek082vJBL/9imnla3SyU=";
npmDepsHash = "sha256-NnkT+NO3zUI71w9dSinnPeJbOlWBA4IHAxnMlYUmOT4=";
cargoDeps = rustPlatform.fetchCargoVendor {
inherit
@@ -92,7 +93,7 @@ buildNpmPackage' rec {
cargoRoot
patches
;
hash = "sha256-mt7zWKgH21khAIrfpBFzb+aS2V2mV56zMqCSLzDhGfQ=";
hash = "sha256-nhQUUj7Hz21fnbhqrQL4eYInPNlNLVgbkWylWMRJkAk=";
};
cargoRoot = "apps/desktop/desktop_native";
+3 -3
View File
@@ -16,18 +16,18 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "blade-formatter";
version = "1.43.0";
version = "1.44.2";
src = fetchFromGitHub {
owner = "shufo";
repo = "blade-formatter";
rev = "v${finalAttrs.version}";
hash = "sha256-jxRC7VYApAZrC/1b2r5cc9OCQ9/mA8ttizA4v0SY4U8=";
hash = "sha256-FrP+D7SYUPSn82TIRGh9mo/ZpbYxmiTOKagbl/9D7Hk=";
};
yarnOfflineCache = fetchYarnDeps {
yarnLock = finalAttrs.src + "/yarn.lock";
hash = "sha256-pWa2gI3RiZd5BJ2KJQHKH6+KBJasIVV5xnIoFi8jzlg=";
hash = "sha256-XUd1p9AQXVUtADERNcHY7pHkMCr2g7+N/Dy7z4hL0g4=";
};
nativeBuildInputs = [
+2 -2
View File
@@ -38,14 +38,14 @@ in
let
bolt = stdenv.mkDerivation (finalAttrs: {
pname = "bolt-launcher";
version = "0.18.0";
version = "0.19.0";
src = fetchFromGitHub {
owner = "AdamCake";
repo = "bolt";
tag = finalAttrs.version;
fetchSubmodules = true;
hash = "sha256-S9SZ9UfohEHfwmXmHsTeSW45BHTJA4wPdFQXsX3Pk34=";
hash = "sha256-RTLlNB6eiesXZayC69hpnXQsAgmPuaJTC+18Q6KzAP0=";
};
nativeBuildInputs = [
+2 -2
View File
@@ -11,13 +11,13 @@
buildGoModule rec {
pname = "bootdev-cli";
version = "1.19.2";
version = "1.20.0";
src = fetchFromGitHub {
owner = "bootdotdev";
repo = "bootdev";
tag = "v${version}";
hash = "sha256-jTI91t/gcEdOc3mwP0dFqL5sYeaC6nD96+RpuQfAf4s=";
hash = "sha256-Hm8fvY50stoeQE3A2HeMsL/uDo8+Y4zQx/Zv/ksi7gg=";
};
vendorHash = "sha256-jhRoPXgfntDauInD+F7koCaJlX4XDj+jQSe/uEEYIMM=";
+2 -2
View File
@@ -14,14 +14,14 @@
python3Packages.buildPythonPackage rec {
pname = "boxflat";
version = "1.34.2";
version = "1.34.2-1";
pyproject = true;
src = fetchFromGitHub {
owner = "Lawstorant";
repo = "boxflat";
tag = "v${version}";
hash = "sha256-u1rhZfYCQC0qm79cMCCBvlHC4F9rwkL6X72rylPhJwE=";
hash = "sha256-A18YhQp4USFQ4xoyR1Zc0o0fs5mVFVrvfbdPWvo1NXw=";
};
build-system = [ python3Packages.setuptools ];
+3 -3
View File
@@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-mutants";
version = "25.2.2";
version = "25.3.1";
src = fetchFromGitHub {
owner = "sourcefrog";
repo = "cargo-mutants";
rev = "v${version}";
hash = "sha256-VDXI/pR7lmIMrsHx9E+oWp0PPUcl83Hc98z6Sh18Hsc=";
hash = "sha256-T+BMLjp74IO71u/ftNfz67FPSt1LYCgsRP65gL0wScg=";
};
cargoHash = "sha256-fTGIFD6V7L3erzi2RexR9XJNIV/UTu8vwFnrNpeFE4A=";
cargoHash = "sha256-Q9+p1MbjF2pyw254X+K6GQSLKNbqjmFXDyZjCI31b7s=";
# too many tests require internet access
doCheck = false;
+3 -3
View File
@@ -6,7 +6,7 @@
cargo-shear,
}:
let
version = "1.4.1";
version = "1.5.0";
in
rustPlatform.buildRustPackage {
pname = "cargo-shear";
@@ -16,10 +16,10 @@ rustPlatform.buildRustPackage {
owner = "Boshen";
repo = "cargo-shear";
rev = "v${version}";
hash = "sha256-Ast944OrFyC6jHsL+aLp9zUK0hX7Xv+0EV1bH/PjDGA=";
hash = "sha256-UZOSdCErZ7dT1KiuyupD2KMf8JgPfBOZn1GFWNJFtFU=";
};
cargoHash = "sha256-NSBe42AGujyh3CSdJ9ON14IA9U63qNly96VMNbU+I84=";
cargoHash = "sha256-qVkM2Zg2R3ZzCBEJFMXY7hfptiBvDaA+nVO1SVUuUNg=";
# https://github.com/Boshen/cargo-shear/blob/a0535415a3ea94c86642f39f343f91af5cdc3829/src/lib.rs#L20-L23
SHEAR_VERSION = version;
+2 -2
View File
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "cnquery";
version = "11.65.0";
version = "11.66.1";
src = fetchFromGitHub {
owner = "mondoohq";
repo = "cnquery";
tag = "v${version}";
hash = "sha256-M2bx4wgVM79iXhtZDFvcOfifwbLCTQ0knTI3FAOzj3M=";
hash = "sha256-VgIjwHOs5JWWNP/ecGJxN65B1+1dAVzALkfljNExRTg=";
};
subPackages = [ "apps/cnquery" ];
@@ -7,16 +7,16 @@
}:
buildGoModule (finalAttrs: {
pname = "crowdsec-firewall-bouncer";
version = "0.0.33";
version = "0.0.34";
src = fetchFromGitHub {
owner = "crowdsecurity";
repo = "cs-firewall-bouncer";
tag = "v${finalAttrs.version}";
hash = "sha256-4fxxAW2sXGNxjsc75fd499ciuN8tjGqlpRIaHYUXwQ0=";
hash = "sha256-lDO9pwPkbI+FDTdXBv03c0p8wbkRUiIDNl1ip3AZo2g=";
};
vendorHash = "sha256-Bhp6Z2UlCJ32vdc3uINCGleZFP2WeUn/XK+Q29szUzQ=";
vendorHash = "sha256-SbpclloBgd9vffC0lBduGRqPOqmzQ0J91/KeDHCh0jo=";
ldflags = [
"-X github.com/crowdsecurity/go-cs-lib/version.Version=v${finalAttrs.version}"
@@ -19,17 +19,17 @@
let
deltachat-rpc-server' = deltachat-rpc-server.overrideAttrs rec {
version = "1.159.5";
version = "2.10.0";
src = fetchFromGitHub {
owner = "chatmail";
repo = "core";
tag = "v${version}";
hash = "sha256-qooN7XRWFqR/bVPAQ8e7KOYNnBD9E70uAesaLUUeXXs=";
hash = "sha256-boS8Awxp9Z/4TrYfqRF77K01dAcEZOfr+oOqMOEeUig=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
pname = "deltachat-core-rust";
inherit version src;
hash = "sha256-TmizhgXMYX0hn4GnsL1QiSyMdahebh0QFbk/cOA48jg=";
hash = "sha256-fSuVq0ODYvKLU2peQuutfuSerZl2cfRCu/w0E6eQRV8=";
};
};
electron = electron_37;
@@ -37,19 +37,19 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "deltachat-desktop";
version = "1.60.1";
version = "2.10.0";
src = fetchFromGitHub {
owner = "deltachat";
repo = "deltachat-desktop";
tag = "v${finalAttrs.version}";
hash = "sha256-WrP4C4zebbRdxy08oQzR3vkO2IBUfsRPnkU1aWqolB4=";
hash = "sha256-97a82xHoFWCdO6dB1nhTYqosWA2Cf6cRfg2eTaiZd8g=";
};
pnpmDeps = pnpm.fetchDeps {
inherit (finalAttrs) pname version src;
fetcherVersion = 1;
hash = "sha256-PBCmyNmlH88y5s7+8WHcei8SP3Q0lIAAnAQn9uaFxLc=";
hash = "sha256-SJyLLsUH1tm/ADJ6yJo5yCTE/rjHVOhHw3plGQUgD3M=";
};
nativeBuildInputs = [
+3 -3
View File
@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "deputy";
version = "0.6.0";
version = "0.6.1";
src = fetchFromGitHub {
owner = "filiptibell";
repo = "deputy";
tag = "v${finalAttrs.version}";
hash = "sha256-dTCikfHqfSVb1F6LYrLqFAEufD6dPgAi6F65yPlCO18=";
hash = "sha256-w5//fdH+95x6fneysUxjF0q9bwHNYqtTSods5QID01Y=";
};
cargoHash = "sha256-nGheg/HnkYsvfrsd/dPNbFQEHXFtjB5so436nrbKRqo=";
cargoHash = "sha256-TezOv07Dl99jw8FIqJvx6F8X8Au/aMPC/CXDYLkQDnE=";
nativeInstallCheckInputs = [ versionCheckHook ];
versionCheckProgramArg = "--version";
+56
View File
@@ -0,0 +1,56 @@
{
lib,
python3,
fetchFromGitHub,
}:
python3.pkgs.buildPythonApplication rec {
pname = "docstrfmt";
version = "1.10.0";
pyproject = true;
src = fetchFromGitHub {
owner = "LilSpazJoekp";
repo = "docstrfmt";
tag = "v${version}";
hash = "sha256-L7zz9FJRSiBWthME0zsUWHxeA+zVuxQpkyEVbNSSEQs=";
};
build-system = [
python3.pkgs.flit-core
];
dependencies = with python3.pkgs; [
black
click
docutils
libcst
platformdirs
sphinx
tabulate
toml
];
pythonRelaxDeps = [
"black"
"docutils"
];
nativeCheckInputs = with python3.pkgs; [
pytestCheckHook
pytest-aiohttp
];
pythonImportsCheck = [
"docstrfmt"
];
meta = {
description = "Formatter for reStructuredText";
homepage = "https://github.com/LilSpazJoekp/docstrfmt";
changelog = "https://github.com/LilSpazJoekp/docstrfmt/blob/${src.tag}/CHANGES.rst";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ doronbehar ];
mainProgram = "docstrfmt";
};
}
+16 -8
View File
@@ -5,27 +5,35 @@
}:
python3Packages.buildPythonApplication rec {
pname = "doge";
version = "3.8.0";
version = "3.9.0";
pyproject = true;
src = fetchFromGitHub {
owner = "Olivia5k";
repo = "doge";
rev = version;
hash = "sha256-CZw9Pz9YPVmDMOfDp5yIp/yStOvXEzAgb/HvKpxhQ8I=";
tag = version;
hash = "sha256-aJ1SFehjKiSc7osf5BOB1xjDnrkVXp37PQ5bNpbv1Mk=";
};
pyproject = true;
nativeBuildInputs = [ python3Packages.setuptools ];
propagatedBuildInputs = [ python3Packages.python-dateutil ];
build-system = [ python3Packages.hatchling ];
dependencies = with python3Packages; [
python-dateutil
fullmoon
];
meta = {
homepage = "https://github.com/Olivia5k/doge";
description = "Wow very terminal doge";
longDescription = ''
Doge is a simple motd script based on the slightly stupid but very funny doge meme.
It prints random grammatically incorrect statements that are sometimes based on things from your computer.
'';
homepage = "https://github.com/Olivia5k/doge";
license = lib.licenses.mit;
mainProgram = "doge";
maintainers = with lib.maintainers; [
Gonzih
quantenzitrone
];
mainProgram = "doge";
};
}
+3 -3
View File
@@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "dogedns";
version = "0.2.8";
version = "0.2.9";
src = fetchFromGitHub {
owner = "Dj-Codeman";
repo = "doge";
rev = "v${version}";
hash = "sha256-3wOka+MKSy2x3100eF0d9A5Jc0qFSNCiLsisHO1Uldc=";
hash = "sha256-SeC/GZ1AeEqRzxWc4oJ6JOvXfn3/LRcQz9uWXXqdTqU=";
};
cargoHash = "sha256-9Qm93Hmxutmg3oCXSVrCUAYA2W4gXR/LPC5zZ34x5jQ=";
cargoHash = "sha256-vLdfmaIOSxNqs1Hq6NJMA8HDZas4E9rc+VHnFSlX/wg=";
patches = [
# remove date info to make the build reproducible
+3 -3
View File
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "dyff";
version = "1.10.1";
version = "1.10.2";
src = fetchFromGitHub {
owner = "homeport";
repo = "dyff";
rev = "v${version}";
sha256 = "sha256-dioahL3dWK+rNAcThv2vYyoGaIIFhcd5li9gtwjtGzM=";
sha256 = "sha256-kmL1WzsfuV6O3mFryQKnUeImisMlLd3K43/00l6Trvs=";
};
vendorHash = "sha256-5uAe6bnYhncr2A+Y/HEjv9agvKp+1D2JH66zIDIeDro=";
vendorHash = "sha256-8xXw2ITHqw6dPtRuO4aesJzeobb/QGI+z1tn1ebNdzQ=";
subPackages = [
"cmd/dyff"
@@ -9,16 +9,16 @@
buildGoModule rec {
pname = "editorconfig-checker";
version = "3.3.0";
version = "3.4.0";
src = fetchFromGitHub {
owner = "editorconfig-checker";
repo = "editorconfig-checker";
rev = "v${version}";
hash = "sha256-TRbUehdHzgjc87O8/kZyC9c9ouxJrs/nSN24E5BOrzU=";
hash = "sha256-9Z2Yu515e2R8NbGmsVD6mM9XHXalutcS++T9I0p1jbY=";
};
vendorHash = "sha256-g7SSy55IKxfM1cjyy1n7As278HU+GdNeq1vSSM4B8GM=";
vendorHash = "sha256-7UyEvKA+0ll205/P69YfAFswM6fp8zBjzTfCryxMCQU=";
doCheck = false;
+4 -4
View File
@@ -12,11 +12,11 @@
stdenv.mkDerivation (finalAttrs: {
name = "eigenwallet";
version = "2.0.3";
version = "3.0.0-beta.8";
src = fetchurl {
url = "https://github.com/eigenwallet/core/releases/download/${finalAttrs.version}/UnstoppableSwap_${finalAttrs.version}_amd64.deb";
hash = "sha256-2uOsZ6IvaQes+FYGQ0cNYlySzjyNwf/3fqk3DJzN+WI=";
url = "https://github.com/eigenwallet/core/releases/download/${finalAttrs.version}/eigenwallet_${finalAttrs.version}_amd64.deb";
hash = "sha256-9quyDsCQsGGTESdBg5BLbUaXCWhhxz3xmqkanCIdreE=";
};
nativeBuildInputs = [
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
meta = {
description = "Protocol and desktop application for swapping Monero and Bitcoin";
homepage = "https://unstoppableswap.net";
homepage = "https://eigenwallet.org";
maintainers = with lib.maintainers; [ JacoMalan1 ];
license = lib.licenses.gpl3Only;
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
@@ -1,7 +1,7 @@
{
"version" = "1.11.108";
"version" = "1.11.109";
"hashes" = {
"desktopSrcHash" = "sha256-7qG2QyOgq2ATyXsr5jLxngxXvVaw52GYOD1LiUCGNNo=";
"desktopYarnHash" = "sha256-QLsKY0tDeY5dp6VLiPZhawa54SI2/A0W6UE0NoJ5dng=";
"desktopSrcHash" = "sha256-4M+1wOwyMVRdzXpgdBi9Fi4WM7MMypDHAOcifk3iejI=";
"desktopYarnHash" = "sha256-uff/bOv3Gs/fNk9oPbE0X7EjftrIr7p/wSLgv8SDzkg=";
};
}
@@ -1,7 +1,7 @@
{
"version" = "1.11.108";
"version" = "1.11.109";
"hashes" = {
"webSrcHash" = "sha256-2QNRygyyXMvHHSfd9CCusOQ5v/udOwrOdmnrSsatylI=";
"webYarnHash" = "sha256-JkXbGRanW+rRgQCVv8sCTzogHR5NKgesw/l166U1h9k=";
"webSrcHash" = "sha256-TTpaRMSi5YX95ZwfQA0XVLO52oPCu9VU0+dVylEQwhU=";
"webYarnHash" = "sha256-9HU2k6EX8v3JfPt8HYlLuSnkt7Y12f6AiNXB2e0lDWM=";
};
}
+2 -2
View File
@@ -8,13 +8,13 @@
buildDotnetModule rec {
pname = "garnet";
version = "1.0.80";
version = "1.0.81";
src = fetchFromGitHub {
owner = "microsoft";
repo = "garnet";
tag = "v${version}";
hash = "sha256-9B2Ai+W6+rZ8xLrrO7d8jd6LYWaMGIq3a+lz8rY32uA=";
hash = "sha256-CEpxV6BoTfkC3Lka1Xuci3uyUYoWxoyYKTQTco5NVY4=";
};
projectFile = "main/GarnetServer/GarnetServer.csproj";
+2 -2
View File
@@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
pname = "geomyidae";
version = "0.96";
version = "0.99";
src = fetchurl {
url = "gopher://bitreich.org/9/scm/geomyidae/tag/geomyidae-v${version}.tar.gz";
hash = "sha256-O6zccrz5qrtvafNQvM50U2JfG42LAWJJ/DXfiDKh4dc=";
hash = "sha256-QnAUqvyi+b14kIjqnreY6adFl62glRiuX9QiVamR6zw=";
};
buildInputs = [ libressl ];
+4 -4
View File
@@ -9,16 +9,16 @@
buildGo124Module rec {
pname = "go-camo";
version = "2.6.3";
version = "2.6.4";
src = fetchFromGitHub {
owner = "cactus";
repo = "go-camo";
rev = "v${version}";
hash = "sha256-uf/r+QDukuFbbsFQal0mfZaGHZYk1fGn8Kt1ipFD/vI=";
tag = "v${version}";
hash = "sha256-BdKIfDDN6GXc53SFDkJ8Dui5rrm27blA+EEOS/oAanE=";
};
vendorHash = "sha256-PQ9Q+xaziTASH361qeBW0mVDtcXwU3/Sm/V/O4T2AP8=";
vendorHash = "sha256-0DkIbD+9gIbARqvmudRavwcWVLADGKwEYMMX6a5Qoq4=";
nativeBuildInputs = [
installShellFiles
+5 -3
View File
@@ -18,17 +18,18 @@
webp-pixbuf-loader,
libsoup_3,
bash,
nix-update-script,
}:
python3Packages.buildPythonApplication rec {
pname = "gradia";
version = "1.7.1";
version = "1.9.0";
pyproject = false;
src = fetchFromGitHub {
owner = "AlexanderVanhee";
repo = "Gradia";
tag = "v${version}";
hash = "sha256-EyO09tKv0SjqMyYM5J8wdeIH6/vJgF7p7FLaTfJDqXY=";
hash = "sha256-iDldzS7LLJ/+CfKBpD50LW/YrZ2xb8aqZI9Bs1AOcCM=";
};
nativeBuildInputs = [
@@ -56,7 +57,6 @@ python3Packages.buildPythonApplication rec {
];
postInstall = ''
substituteInPlace $out/share/gradia/gradia/ui/image_exporters.py --replace-fail "/bin/bash" "${lib.getExe bash}"
export GDK_PIXBUF_MODULE_FILE="${
gnome._gdkPixbufCacheBuilder_DO_NOT_USE {
extraLoaders = [
@@ -71,6 +71,8 @@ python3Packages.buildPythonApplication rec {
makeWrapperArgs = [ "\${gappsWrapperArgs[@]}" ];
passthru.updateScript = nix-update-script { };
meta = {
description = "Make your screenshots ready for the world";
homepage = "https://github.com/AlexanderVanhee/Gradia";
+2 -2
View File
@@ -11,12 +11,12 @@
stdenv.mkDerivation rec {
pname = "grpc_cli";
version = "1.74.0";
version = "1.74.1";
src = fetchFromGitHub {
owner = "grpc";
repo = "grpc";
rev = "v${version}";
hash = "sha256-97+llHIubNYwULSD0KxEcGN+T8bQWufaEH6QT9oTgwg=";
hash = "sha256-QEIFv5zv1b0uggImklm4BSbnAbhN4xQ/K9OFLYMKbv0=";
fetchSubmodules = true;
};
nativeBuildInputs = [
+53
View File
@@ -0,0 +1,53 @@
{
lib,
rustPlatform,
fetchFromGitea,
pkg-config,
fontconfig,
freetype,
libxkbcommon,
wayland,
SDL2,
SDL2_image,
SDL2_gfx,
nix-update-script,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "hail";
version = "0.2.2";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "periwinkle";
repo = "hail";
tag = finalAttrs.version;
hash = "sha256-LJodAS24x/dBNyrUxT9F0FHnu4s+Cb+CCtoe7nPM66w=";
};
cargoHash = "sha256-kEPnfRY2McSVNBuBC9VSKK5p8JIUeZh/LeFZQa1Hn5U=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [
fontconfig
freetype
libxkbcommon
wayland
SDL2
SDL2_image
SDL2_gfx
];
passthru.updateScript = nix-update-script { };
meta = {
description = "Minimal speedrun timer";
homepage = "https://codeberg.org/periwinkle/hail";
changelog = "https://codeberg.org/periwinkle/hail/releases/tag/${finalAttrs.src.tag}";
license = lib.licenses.mpl20;
maintainers = with lib.maintainers; [ yiyu ];
mainProgram = "hail";
platforms = lib.platforms.linux;
};
})
@@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "hyprland-per-window-layout";
version = "2.14";
version = "2.15";
src = fetchFromGitHub {
owner = "coffebar";
repo = "hyprland-per-window-layout";
rev = version;
hash = "sha256-dYoHa4b7BZc/LGVLsNs/LTj4sSMaFel+QE0TUv5kGAk=";
hash = "sha256-SOT2nrk2JKTzKE1QNhjAY9zjyG5z5nYFz7RJRrS3Tsk=";
};
cargoHash = "sha256-wXPc3jAY8E0k8cn4Z2OIhCyrfszzlzFmhQZIZay16Ec=";
cargoHash = "sha256-VzxO5xn864gnMR62iszTNwz1tU7A59dhQspsla90aRs=";
meta = with lib; {
description = "Per window keyboard layout (language) for Hyprland wayland compositor";
+12 -12
View File
@@ -1,26 +1,26 @@
{
"version": "1.136.0",
"hash": "sha256-IMog1lvitT1fNKlT4pv/5Qlg/2JNkBNZrBu65NRAgJ0=",
"version": "1.137.3",
"hash": "sha256-oKDIx63LayDWhd4uE16rqFWmmwwSWUsUvgZKsgE3KWg=",
"components": {
"cli": {
"npmDepsHash": "sha256-+cMBzlvnSAwlutVm1F0Sa2LEAP6ppOvI9XjDb40xWW4=",
"version": "2.2.73"
"npmDepsHash": "sha256-Cjk95tsQM89LkMq6H3B5WYdYrMi3hB6d1XpN2xhHv2U=",
"version": "2.2.77"
},
"server": {
"npmDepsHash": "sha256-kVmoxOd7ErLmLKBkanb8IOUJ3ccpzUHBkaLgnvli0Uw=",
"version": "1.136.0"
"npmDepsHash": "sha256-CvczIXE3Z3LwZezG7kbfJqg2fak2BRXTr0op1Jo1LIg=",
"version": "1.137.3"
},
"web": {
"npmDepsHash": "sha256-CxQQbqIhqhWqtlV4BWQDPkg0tm3wPXC6BcCFb/6mM+o=",
"version": "1.136.0"
"npmDepsHash": "sha256-PcNgD/JFt3221Qgi54XzQZNa53iw3BUe31DM8k+nz/4=",
"version": "1.137.3"
},
"open-api/typescript-sdk": {
"npmDepsHash": "sha256-z9W3YGqoUV90TXoyEnR069pLvirzDAisgQZdaJEOlSg=",
"version": "1.136.0"
"npmDepsHash": "sha256-M4ahH6ZP0E3wEgK4VLqSsNjhMFNVTMeRFdzU9EO53vE=",
"version": "1.137.3"
},
"geonames": {
"timestamp": "20250725064853",
"hash": "sha256-UzP8JapHTCpk5/6X5usLLXQUfqEOUgkq76CTIBZoz08="
"timestamp": "20250801182552",
"hash": "sha256-jfC/FgfeSz1tdtYc1EqQ/HJw5LlYQSyGntPuXv24JVY="
}
}
}
+4 -3
View File
@@ -24,18 +24,18 @@
stdenv.mkDerivation (finalAttrs: {
pname = "impression";
version = "3.4.0";
version = "3.5.0";
src = fetchFromGitLab {
owner = "adhami3310";
repo = "Impression";
tag = "v${finalAttrs.version}";
hash = "sha256-YNRj44bgZfJYMBPI3q9OnWFaG6x1xez8LZM1sIti5mQ=";
hash = "sha256-LtCfqBtgtayjCuBukfjDtZfaGM7I2rOImxD2yvRITVk=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) pname version src;
hash = "sha256-uK5kPPBBa5hI4RHj1RRohur0jzkjwePafY6E9U9vEFk=";
hash = "sha256-chRsKBnl6QOJ4b1UZak5lnp4lQmXCyZXI/8iJs5lM/E=";
};
nativeBuildInputs = [
@@ -68,6 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
meta = {
description = "Straight-forward and modern application to create bootable drives";
homepage = "https://gitlab.com/adhami3310/Impression";
changelog = "https://gitlab.com/adhami3310/Impression/-/releases/v${finalAttrs.version}";
license = lib.licenses.gpl3Only;
mainProgram = "impression";
maintainers = with lib.maintainers; [ dotlambda ];
+3 -3
View File
@@ -48,7 +48,7 @@ in
stdenv.mkDerivation (finalAttrs: {
pname = "ipxe";
version = "1.21.1-unstable-2025-07-30";
version = "1.21.1-unstable-2025-08-07";
nativeBuildInputs = [
mtools
@@ -66,8 +66,8 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchFromGitHub {
owner = "ipxe";
repo = "ipxe";
rev = "f7a1e9ef8e1dc22ebded786507b872a45e3fb05d";
hash = "sha256-dNnZH6ENxx3K2lAIE0B8mLjOo05D/TBguarrGrxXozc=";
rev = "8460dc4e8ffc98db62377d1c5502d6aac40f5a64";
hash = "sha256-Xk1lbExR4dyiba4tF0Dm9/KtTVxc78Fs8gjmZU7pdpI=";
};
# Calling syslinux on a FAT image isn't going to work on Aarch64.
@@ -17,10 +17,10 @@
gmp,
gnutls,
llhttp,
jack,
jsoncpp,
libarchive,
libgit2,
libjack2,
libnatpmp,
libpulseaudio,
libupnp,
@@ -42,20 +42,14 @@
git,
networkmanager, # for libnm
python3,
qttools, # for translations
wrapQtAppsHook,
libnotify,
qt5compat,
qtbase,
qtdeclarative,
md4c,
html-tidy,
hunspell,
qrencode,
qtmultimedia,
qtnetworkauth,
qtpositioning,
qtsvg,
qtwebengine,
qtwebchannel,
qt6Packages,
wrapGAppsHook3,
zxing-cpp,
withWebengine ? true,
# for pjsip
@@ -206,7 +200,7 @@ stdenv.mkDerivation rec {
gmp
gnutls
llhttp
jack
libjack2
jsoncpp
libarchive
libgit2
@@ -241,6 +235,8 @@ stdenv.mkDerivation rec {
sed -i -e '/GIT_REPOSITORY/,+1c SOURCE_DIR ''${CMAKE_CURRENT_SOURCE_DIR}/qwindowkit' extras/build/cmake/contrib_tools.cmake
sed -i -e 's/if(DISTRO_NEEDS_QMSETUP_PATCH)/if(TRUE)/' CMakeLists.txt
cp -R --no-preserve=mode,ownership ${qwindowkit-src} qwindowkit
substituteInPlace CMakeLists.txt \
--replace-fail 'add_subdirectory(3rdparty/zxing-cpp EXCLUDE_FROM_ALL)' 'find_package(ZXing)'
'';
preConfigure = ''
@@ -255,29 +251,38 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
wrapGAppsHook3
wrapQtAppsHook
qt6Packages.wrapQtAppsHook
pkg-config
cmake
git
python3
qttools
qt6Packages.qttools # for translations
];
buildInputs = [
ffmpeg_6
html-tidy
hunspell
libnotify
md4c
networkmanager
qtbase
qt5compat
qrencode
qtnetworkauth
qtdeclarative
qtmultimedia
qtpositioning
qtsvg
qtwebchannel
zxing-cpp
]
++ lib.optionals withWebengine [ qtwebengine ];
++ (
with qt6Packages;
[
qtbase
qt5compat
qtnetworkauth
qtdeclarative
qtmultimedia
qtpositioning
qtsvg
qtwebchannel
]
++ lib.optionals withWebengine [ qtwebengine ]
);
cmakeFlags = lib.optionals (!withWebengine) [ "-DWITH_WEBENGINE=false" ];
@@ -9,18 +9,18 @@ buildGoModule (finalAttrs: {
# "chatgpt-cli" is taken by another package with the same upsteam name.
# To keep "pname" and "package attribute name" identical, the owners name (kardolus) gets prefixed as identifier.
pname = "kardolus-chatgpt-cli";
version = "1.8.5";
version = "1.8.6";
src = fetchFromGitHub {
owner = "kardolus";
repo = "chatgpt-cli";
rev = "v${finalAttrs.version}";
hash = "sha256-TXdxqPoyt3VUeHVkbB0UjNcCqaf+5Xve95RMQOEagTM=";
hash = "sha256-ggakrfeV6guGhBbA45A78oMFQSMqh9+yvJK+cic1JdY=";
};
vendorHash = null;
# The tests of kardolus/chatgpt-cli require an OpenAI API Key to be present in the environment,
# (e.g. https://github.com/kardolus/chatgpt-cli/blob/v1.8.5/test/contract/contract_test.go#L35)
# (e.g. https://github.com/kardolus/chatgpt-cli/blob/v1.8.6/test/contract/contract_test.go#L35)
# which will not be the case in the pipeline.
# Therefore, tests must be skipped.
doCheck = false;
+27 -13
View File
@@ -1,44 +1,58 @@
{
stdenv,
lib,
qt6,
python3,
fetchFromGitHub,
qt6,
archiveSupport ? true,
p7zip,
versionCheckHook,
nix-update-script,
python3,
archiveSupport ? true,
}:
python3.pkgs.buildPythonApplication rec {
pname = "kcc";
version = "7.5.1";
format = "setuptools";
version = "8.0.4";
pyproject = true;
src = fetchFromGitHub {
owner = "ciromattia";
repo = "kcc";
tag = "v${version}";
hash = "sha256-XB+xss/QiZuo6gWphyjFh9DO74O5tNqfX5LUzsa4gqo=";
hash = "sha256-8rnuSGlfwH5AVp8GQn3RTtiTYFdTNp7Wqq+ATibpkNA=";
};
nativeBuildInputs = [ qt6.wrapQtAppsHook ];
buildInputs = [ qt6.qtbase ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qt6.qtwayland ];
propagatedBuildInputs = with python3.pkgs; [
packaging
buildInputs = [ qt6.qtbase ];
build-system = with python3.pkgs; [ setuptools ];
dependencies = with python3.pkgs; [
packaging # undeclared dependency
pyside6
pillow
psutil
python-slugify
raven
requests
natsort
mozjpeg_lossless_optimization
natsort
distro
pyside6
numpy
];
qtWrapperArgs = lib.optionals archiveSupport [ ''--prefix PATH : ${lib.makeBinPath [ p7zip ]}'' ];
# Note: python scripts wouldn't get wrapped anyway, but let's be explicit about it
dontWrapQtApps = true;
makeWrapperArgs =
[
"\${qtWrapperArgs[@]}"
]
++ lib.optionals archiveSupport [
''--prefix PATH : ${lib.makeBinPath [ p7zip ]}''
];
nativeInstallCheckInputs = [ versionCheckHook ];
versionCheckProgram = "${placeholder "out"}/bin/kcc-c2e";
+2 -3
View File
@@ -54,9 +54,6 @@ stdenv.mkDerivation (finalAttrs: {
env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
# disable code signing on Darwin
env.CSC_IDENTITY_AUTO_DISCOVERY = "false";
postBuild = ''
cp -r ${electron.dist} electron-dist
chmod -R u+w electron-dist
@@ -68,7 +65,9 @@ stdenv.mkDerivation (finalAttrs: {
export npm_config_nodedir=${electron.headers}
npm run postinstall
# Explicitly set identity to null to avoid signing on darwin
yarn --offline run electron-builder --dir \
-c.mac.identity=null \
-c.electronDist=electron-dist \
-c.electronVersion=${electron.version}
'';
+2 -2
View File
@@ -22,11 +22,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "kstars";
version = "3.7.7";
version = "3.7.8";
src = fetchurl {
url = "mirror://kde/stable/kstars/${finalAttrs.version}/kstars-${finalAttrs.version}.tar.xz";
hash = "sha256-8tvWwmxFUSqnw5JPC/Bgao75eORoxUUF3MDLL+EgAkU=";
hash = "sha256-VbOu8p7Bq6UJBr05PVZein4LWzpdLo4838G1jXGNLAw=";
};
nativeBuildInputs = with kdePackages; [
+2 -2
View File
@@ -8,13 +8,13 @@
}:
buildGoModule rec {
pname = "lazygit";
version = "0.54.1";
version = "0.54.2";
src = fetchFromGitHub {
owner = "jesseduffield";
repo = "lazygit";
tag = "v${version}";
hash = "sha256-MTuVeKlytI7jp3pi2nuJqebG7DcEprfNQo9jf+c7Obg=";
hash = "sha256-LfSTbnSyRT1vdrEOs9Ur+0cGAz/pUUEVm8HhfE9VaYo=";
};
vendorHash = null;
+3 -3
View File
@@ -20,13 +20,13 @@
stdenv.mkDerivation rec {
pname = "libdeltachat";
version = "2.4.0";
version = "2.10.0";
src = fetchFromGitHub {
owner = "chatmail";
repo = "core";
tag = "v${version}";
hash = "sha256-r4QWP7KokTgOimMfJoJ4sIeLrg20IYjJge0o/fVUF5Y=";
hash = "sha256-boS8Awxp9Z/4TrYfqRF77K01dAcEZOfr+oOqMOEeUig=";
};
patches = [
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
cargoDeps = rustPlatform.fetchCargoVendor {
pname = "chatmail-core";
inherit version src;
hash = "sha256-PToZYRnAIcvbRBOzUHaFdtS6t0xCULcsSp4ydohCQi8=";
hash = "sha256-fSuVq0ODYvKLU2peQuutfuSerZl2cfRCu/w0E6eQRV8=";
};
nativeBuildInputs = [
@@ -7,13 +7,13 @@
stdenvNoCC.mkDerivation {
pname = "libretro-shaders-slang";
version = "0-unstable-2025-08-01";
version = "0-unstable-2025-08-07";
src = fetchFromGitHub {
owner = "libretro";
repo = "slang-shaders";
rev = "8fce5bb3cccc532f2a57aff46716cdfc55799e75";
hash = "sha256-x8Lrq+ECZZzJq9MYHNsJjNPx4Frj/ZzSdN/IM2Tg72g=";
rev = "a2ccf619c2df565ac8f3e66c91170faa5ba06aa4";
hash = "sha256-0OjqfYgxJGtFCuPFqlSorqOEOqCf0gdyDUzG15Z/FlA=";
};
dontConfigure = true;
@@ -37,7 +37,7 @@ let
pname = "librewolf-bin-unwrapped";
version = "141.0-1";
version = "141.0.3-1";
in
stdenv.mkDerivation {
@@ -47,9 +47,9 @@ stdenv.mkDerivation {
url = "https://gitlab.com/api/v4/projects/44042130/packages/generic/librewolf/${version}/librewolf-${version}-${arch}-package.tar.xz";
hash =
{
i686-linux = "sha256-nF9sGMMzLmVJapTyiU8y0ICIl26i+eloAHKJSVvSeuY=";
x86_64-linux = "sha256-mlvZ0faAXra6oZ4nsq6hiIgk/byoa0EmThvAkGpqQiU=";
aarch64-linux = "sha256-AfMmwQtfjWY0ImwQ/M+1liU3IzaxBVkIVLxSEQ7YTCw=";
i686-linux = "sha256-B3fTYNV6kHDo+Ae5r02oXIvcrzlnaZuOO/bAevjU3mk=";
x86_64-linux = "sha256-bIKqHQS4daqAQcbXHxLjWdK5MFrSg5ctzfhKe2OrO5c=";
aarch64-linux = "sha256-JPidpVXQ8DOwpmBUQn/aBJfydrUSfl6ekgnxCjL7Vgg=";
}
.${stdenv.hostPlatform.system} or throwSystem;
};
+13 -7
View File
@@ -72,13 +72,13 @@ let
in
effectiveStdenv.mkDerivation (finalAttrs: {
pname = "llama-cpp";
version = "6123";
version = "6134";
src = fetchFromGitHub {
owner = "ggml-org";
repo = "llama.cpp";
tag = "b${finalAttrs.version}";
hash = "sha256-4kqbKGPPOkOkHXA4IeLuj/0P5jpqtGlGuVKeUD4UhZY=";
hash = "sha256-J/Z6xrCfdSkf504AGiOmgRqgrOUXXTpqq5BpXwgOI4g=";
leaveDotGit = true;
postFetch = ''
git -C "$out" rev-parse --short HEAD > $out/COMMIT
@@ -99,10 +99,6 @@ effectiveStdenv.mkDerivation (finalAttrs: {
substituteInPlace ./ggml/src/ggml-metal/ggml-metal.m \
--replace-fail '[bundle pathForResource:@"ggml-metal" ofType:@"metal"];' "@\"$out/bin/ggml-metal.metal\";"
fi
substituteInPlace ./scripts/build-info.sh \
--replace-fail 'build_number="0"' 'build_number="${finalAttrs.version}"' \
--replace-fail 'build_commit="unknown"' "build_commit=\"$(cat COMMIT)\""
'';
nativeBuildInputs = [
@@ -124,10 +120,16 @@ effectiveStdenv.mkDerivation (finalAttrs: {
++ optionals vulkanSupport vulkanBuildInputs
++ [ curl ];
preConfigure = ''
prependToVar cmakeFlags "-DLLAMA_BUILD_COMMIT:STRING=$(cat COMMIT)"
'';
cmakeFlags = [
# -march=native is non-deterministic; override with platform-specific flags if needed
(cmakeBool "GGML_NATIVE" false)
(cmakeBool "LLAMA_BUILD_EXAMPLES" false)
(cmakeBool "LLAMA_BUILD_SERVER" true)
(cmakeBool "LLAMA_BUILD_TESTS" (finalAttrs.finalPackage.doCheck or false))
(cmakeBool "LLAMA_CURL" true)
(cmakeBool "BUILD_SHARED_LIBS" true)
(cmakeBool "GGML_BLAS" blasSupport)
@@ -137,6 +139,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
(cmakeBool "GGML_METAL" metalSupport)
(cmakeBool "GGML_RPC" rpcSupport)
(cmakeBool "GGML_VULKAN" vulkanSupport)
(cmakeFeature "LLAMA_BUILD_NUMBER" finalAttrs.version)
]
++ optionals cudaSupport [
(cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cudaPackages.flags.cmakeCudaArchitecturesString)
@@ -153,7 +156,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
++ optionals rpcSupport [
# This is done so we can move rpc-server out of bin because llama.cpp doesn't
# install rpc-server in their install target.
"-DCMAKE_SKIP_BUILD_RPATH=ON"
(cmakeBool "CMAKE_SKIP_BUILD_RPATH" true)
];
# upstream plans on adding targets at the cmakelevel, remove those
@@ -167,6 +170,9 @@ effectiveStdenv.mkDerivation (finalAttrs: {
''
+ optionalString rpcSupport "cp bin/rpc-server $out/bin/llama-rpc-server";
# the tests are failing as of 2025-08
doCheck = false;
passthru.updateScript = nix-update-script {
attrPath = "llama-cpp";
extraArgs = [
@@ -18,25 +18,16 @@ let
in
python3.pkgs.buildPythonApplication rec {
pname = "matrix-synapse";
version = "1.135.0";
version = "1.135.2";
format = "pyproject";
src = fetchFromGitHub {
owner = "element-hq";
repo = "synapse";
rev = "v${version}";
hash = "sha256-ygLWjI6HzBMTPDhEmf1rT18UhoRekzpG8DkeZXo2dts=";
hash = "sha256-4HAA9Xq4C3DHxz0BgqBitfM4wZwPSEu+IO/OPfHzLVw=";
};
patches = [
# Skip broken HTML preview test case with libxml >= 2.14
# https://github.com/element-hq/synapse/pull/18413
(fetchpatch {
url = "https://github.com/element-hq/synapse/commit/8aad32965888476b4660bf8228d2d2aa9ccc848b.patch";
hash = "sha256-EUEbF442nOAybMI8EL6Ee0ib3JqSlQQ04f5Az3quKko=";
})
];
cargoDeps = rustPlatform.fetchCargoVendor {
inherit pname version src;
hash = "sha256-4J92s6cSgsEIYQpbU6OOLI/USIJX2Gc7UdEHgWQgmXc=";
+3 -3
View File
@@ -28,13 +28,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "melonDS";
version = "1.0-unstable-2025-07-13";
version = "1.0-unstable-2025-08-10";
src = fetchFromGitHub {
owner = "melonDS-emu";
repo = "melonDS";
rev = "13a9825c9a84fdbf42d0d4b922f9c2e0920ed19e";
hash = "sha256-16QcMsYARA5tXeEtCyV2jsWSRwrcBJBYSxG5YtYMPa4=";
rev = "f9e46fdc29f8e55aca6bc121c424890faee2e51d";
hash = "sha256-g5TVvnCoWQej9v2aii5klx7gRzUrokiwy0By0G3LkiI=";
};
nativeBuildInputs = [
+3 -3
View File
@@ -8,16 +8,16 @@
buildGoModule rec {
pname = "mtail";
version = "3.2.8";
version = "3.2.11";
src = fetchFromGitHub {
owner = "jaqx0r";
repo = "mtail";
rev = "v${version}";
hash = "sha256-jRaIDYEzpSFOTPFks6lWMidxmcmHfym4kG71+byJ9vI=";
hash = "sha256-ScR07AHQBSXgVEHVQDyz/SJPMti+5TNAXlRjfTr7ZMU=";
};
vendorHash = "sha256-KZOcmZGv1kI9eDhQdtQeQ3ITyEw9vEDPz4RAz30pP9s=";
vendorHash = "sha256-+Ym+vn7yHUSS7So7m53cCUNSmznwgyvg+Xj4nKUbD7U=";
nativeBuildInputs = [
gotools # goyacc
+30 -35
View File
@@ -8,28 +8,27 @@
addBinToPathHook,
}:
let
test-data = fetchFromGitHub {
name = "test-data";
owner = "MultiQC";
repo = "test-data";
rev = "d775b73c106d48726653f2fd02e473b7acbd93d8";
hash = "sha256-uxBpMx22gWJmnbF9tVuVIdYdiqUh7n51swzu5hnfZQ0=";
};
in
python3Packages.buildPythonApplication rec {
pname = "multiqc";
version = "1.29";
format = "setuptools";
pyproject = true;
# Two data sources. One for the code, another for the test data
srcs = [
(fetchFromGitHub {
name = "multiqc";
owner = "MultiQC";
repo = "MultiQC";
tag = "v${version}";
hash = "sha256-KKLdDNf889lEbCyNpJFZoE8rNO50CRzNP4hKpKHRAcE=";
})
(fetchFromGitHub {
owner = "MultiQC";
repo = "test-data";
rev = "d775b73c106d48726653f2fd02e473b7acbd93d8";
hash = "sha256-uxBpMx22gWJmnbF9tVuVIdYdiqUh7n51swzu5hnfZQ0=";
name = "test-data";
})
];
src = fetchFromGitHub {
name = "multiqc";
owner = "MultiQC";
repo = "MultiQC";
tag = "v${version}";
hash = "sha256-KKLdDNf889lEbCyNpJFZoE8rNO50CRzNP4hKpKHRAcE=";
};
# Multiqc cannot remove temporary directories in some case.
# Default is 10 retries, lower it to 2
@@ -40,20 +39,19 @@ python3Packages.buildPythonApplication rec {
"max_retries: int = 2,"
'';
sourceRoot = "multiqc";
build-system = with python3Packages; [ setuptools ];
dependencies = with python3Packages; [
boto3
click
humanize
importlib-metadata
jinja2
kaleido
markdown
natsort
numpy
packaging
requests
polars
pillow
plotly
pyyaml
@@ -65,7 +63,11 @@ python3Packages.buildPythonApplication rec {
typeguard
tqdm
python-dotenv
natsort
tiktoken
jsonschema
polars
pyarrow
];
optional-dependencies = {
@@ -73,7 +75,7 @@ python3Packages.buildPythonApplication rec {
pre-commit-hooks
pdoc3
pytest
pytest-cov-stub
pytest-cov
pytest-xdist
syrupy
pygithub
@@ -87,26 +89,19 @@ python3Packages.buildPythonApplication rec {
];
};
# Some tests run subprocess.run() with "multiqc"
preCheck = ''
chmod -R u+w ../test-data
ln -s ../test-data .
ln -s ${test-data} ./test-data
'';
# Some tests run subprocess.run() with "ps"
nativeCheckInputs =
with python3Packages;
[
procps
pytest-cov
(with python3Packages; [
pytest-xdist
pytestCheckHook
syrupy
pygithub
versionCheckHook
]
])
++ [
addBinToPathHook
addBinToPathHook # Some tests run subprocess.run() with "multiqc"
procps # Some tests run subprocess.run() with "ps"
versionCheckHook
];
versionCheckProgramArg = "--version";
@@ -0,0 +1,5 @@
{ netbird }:
netbird.override {
componentName = "management";
}
@@ -0,0 +1,5 @@
{ netbird }:
netbird.override {
componentName = "relay";
}
@@ -0,0 +1,5 @@
{ netbird }:
netbird.override {
componentName = "signal";
}
+1 -1
View File
@@ -1,5 +1,5 @@
{ netbird }:
netbird.override {
ui = true;
componentName = "ui";
}
@@ -0,0 +1,5 @@
{ netbird }:
netbird.override {
componentName = "upload";
}
+74 -39
View File
@@ -12,39 +12,72 @@
libX11,
libXcursor,
libXxf86vm,
ui ? false,
netbird-ui,
versionCheckHook,
componentName ? "client",
}:
let
modules =
if ui then
{
"client/ui" = "netbird-ui";
}
else
{
client = "netbird";
management = "netbird-mgmt";
signal = "netbird-signal";
};
/*
License tagging is based off:
- https://github.com/netbirdio/netbird/blob/9e95841252c62b50ae93805c8dfd2b749ac95ea7/LICENSES/REUSE.toml
- https://github.com/netbirdio/netbird/blob/9e95841252c62b50ae93805c8dfd2b749ac95ea7/LICENSE#L1-L2
*/
availableComponents = {
client = {
module = "client";
binaryName = "netbird";
license = lib.licenses.bsd3;
versionCheckProgramArg = "version";
hasCompletion = true;
};
ui = {
module = "client/ui";
binaryName = "netbird-ui";
license = lib.licenses.bsd3;
};
upload = {
module = "upload-server";
binaryName = "netbird-upload";
license = lib.licenses.bsd3;
};
management = {
module = "management";
binaryName = "netbird-mgmt";
license = lib.licenses.agpl3Only;
versionCheckProgramArg = "--version";
hasCompletion = true;
};
signal = {
module = "signal";
binaryName = "netbird-signal";
license = lib.licenses.agpl3Only;
hasCompletion = true;
};
relay = {
module = "relay";
binaryName = "netbird-relay";
license = lib.licenses.agpl3Only;
};
};
isUI = componentName == "ui";
component = availableComponents.${componentName};
in
buildGoModule (finalAttrs: {
pname = "netbird";
version = "0.49.0";
pname = "netbird-${componentName}";
version = "0.54.0";
src = fetchFromGitHub {
owner = "netbirdio";
repo = "netbird";
tag = "v${finalAttrs.version}";
hash = "sha256-Hv0A9/NTMzRAf9YvYGvRLyy2gdigF9y2NfylE8bLcTw=";
hash = "sha256-qKYJa7q7scEbbxLHaosaurrjXR5ABxCAnuUcy80yKEc=";
};
vendorHash = "sha256-t/X/muMwHVwg8Or+pFTSEQEsnkKLuApoVUmMhyCImWI=";
vendorHash = "sha256-uVVm+iDGP2eZ5GVXWJrWZQ7LpHdZccRIiHPIFs6oAPo=";
nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config;
nativeBuildInputs = [ installShellFiles ] ++ lib.optional isUI pkg-config;
buildInputs = lib.optionals (stdenv.hostPlatform.isLinux && ui) [
buildInputs = lib.optionals (stdenv.hostPlatform.isLinux && isUI) [
gtk3
libayatana-appindicator
libX11
@@ -52,7 +85,7 @@ buildGoModule (finalAttrs: {
libXxf86vm
];
subPackages = lib.attrNames modules;
subPackages = [ component.module ];
ldflags = [
"-s"
@@ -73,35 +106,36 @@ buildGoModule (finalAttrs: {
'';
postInstall =
lib.concatStringsSep "\n" (
lib.mapAttrsToList (
module: binary:
let
builtBinaryName = lib.last (lib.splitString "/" component.module);
in
''
mv $out/bin/${builtBinaryName} $out/bin/${component.binaryName}
''
+
lib.optionalString
(stdenv.buildPlatform.canExecute stdenv.hostPlatform && (component.hasCompletion or false))
''
mv $out/bin/${lib.last (lib.splitString "/" module)} $out/bin/${binary}
installShellCompletion --cmd ${component.binaryName} \
--bash <($out/bin/${component.binaryName} completion bash) \
--fish <($out/bin/${component.binaryName} completion fish) \
--zsh <($out/bin/${component.binaryName} completion zsh)
''
+ lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform && !ui) ''
installShellCompletion --cmd ${binary} \
--bash <($out/bin/${binary} completion bash) \
--fish <($out/bin/${binary} completion fish) \
--zsh <($out/bin/${binary} completion zsh)
''
) modules
)
+ lib.optionalString (stdenv.hostPlatform.isLinux && ui) ''
# assemble & adjust netbird.desktop files for the GUI
+ lib.optionalString (stdenv.hostPlatform.isLinux && isUI) ''
install -Dm644 "$src/client/ui/assets/netbird-systemtray-connected.png" "$out/share/pixmaps/netbird.png"
install -Dm644 "$src/client/ui/build/netbird.desktop" "$out/share/applications/netbird.desktop"
substituteInPlace $out/share/applications/netbird.desktop \
--replace-fail "Exec=/usr/bin/netbird-ui" "Exec=$out/bin/netbird-ui"
--replace-fail "Exec=/usr/bin/netbird-ui" "Exec=$out/bin/${component.binaryName}"
'';
nativeInstallCheckInputs = [
versionCheckHook
];
versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}";
versionCheckProgramArg = "version";
# Disabled for the `netbird-ui` version because it does a network request.
doInstallCheck = !ui;
versionCheckProgram = "${placeholder "out"}/bin/${component.binaryName}";
versionCheckProgramArg = component.versionCheckProgramArg or "version";
doInstallCheck = component ? versionCheckProgramArg;
passthru = {
tests = {
@@ -115,11 +149,12 @@ buildGoModule (finalAttrs: {
homepage = "https://netbird.io";
changelog = "https://github.com/netbirdio/netbird/releases/tag/v${finalAttrs.version}";
description = "Connect your devices into a single secure private WireGuard®-based mesh network with SSO/MFA and simple access controls";
license = lib.licenses.bsd3;
license = component.license;
maintainers = with lib.maintainers; [
nazarewk
saturn745
loc
];
mainProgram = if ui then "netbird-ui" else "netbird";
mainProgram = component.binaryName;
};
})
File diff suppressed because it is too large Load Diff
+3 -3
View File
@@ -8,16 +8,16 @@
(buildNpmPackage.override { inherit nodejs; }) rec {
pname = "node-gyp";
version = "11.2.0";
version = "11.3.0";
src = fetchFromGitHub {
owner = "nodejs";
repo = "node-gyp";
tag = "v${version}";
hash = "sha256-NOVswjTByrQ+2z4H9wYd4YIWKhWIdgxpz2pE0dOK6qc=";
hash = "sha256-gWLoicQKbuk8fDsXwXOcqqz46XBiQYV/t42PgNnN/ek=";
};
npmDepsHash = "sha256-emCYKqe6Bn1hmUq9jPDo5Nu9n43s4kb0E8lQndVtmlQ=";
npmDepsHash = "sha256-nQOhjYzTY7wV9yR/Ej2aeixi4pEC2k94i7ANixO+KVk=";
postPatch = ''
ln -s ${./package-lock.json} package-lock.json
+3 -3
View File
@@ -7,13 +7,13 @@
stdenvNoCC.mkDerivation {
pname = "nu_scripts";
version = "0-unstable-2025-07-29";
version = "0-unstable-2025-08-04";
src = fetchFromGitHub {
owner = "nushell";
repo = "nu_scripts";
rev = "365b8839bad8c7d77c2361f2fc0d8b27bf14df92";
hash = "sha256-YasyvTR9DCZpHFNNrBxBR1MshLvJO8DUDXmYptVzzXk=";
rev = "ec945380be3981522f9bb55e764a5254a908e652";
hash = "sha256-0fw0fJSlUnT5vbBHDubqLrk3F+OU7CE15vIeU295C4w=";
};
installPhase = ''
+2 -2
View File
@@ -6,13 +6,13 @@
}:
stdenv.mkDerivation rec {
pname = "nvidia-modprobe";
version = "575.64.05";
version = "580.65.06";
src = fetchFromGitHub {
owner = "NVIDIA";
repo = "nvidia-modprobe";
rev = version;
hash = "sha256-nphye7WC6zrg78je1GMfYAhpb8FMZnoWrYoodj+nNgo=";
hash = "sha256-peEklk7lSnwz/RC6UlUEQf47clbTRL8M1xz8z4MgdHE=";
};
nativeBuildInputs = [ gnum4 ];
+3 -3
View File
@@ -23,7 +23,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "opengamepadui";
version = "0.40.4";
version = "0.41.0";
buildType = if withDebug then "debug" else "release";
@@ -31,12 +31,12 @@ stdenv.mkDerivation (finalAttrs: {
owner = "ShadowBlip";
repo = "OpenGamepadUI";
tag = "v${finalAttrs.version}";
hash = "sha256-o6n3b4dh3IHaRk2Zi7rt3gzKTZWt6s9L9WcG0WoCQ3U=";
hash = "sha256-8xYLPKCmpWENzG1D8q2yJeIZ5MdBLTio3LZ1BsY1HGg=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) src cargoRoot;
hash = "sha256-vgaa7Pe0lksiGEpQbn2he5CzhVWoHUSPuXqCwSkoDco=";
hash = "sha256-rs8L6dh1Ppmrez3aG9XwQAdfGnoXTlpNMXJvdAUyM6M=";
};
cargoRoot = "extensions";
@@ -8,7 +8,7 @@
}:
stdenv.mkDerivation rec {
pname = "open-timeline-io";
pname = "opentimelineio";
version = "0.17.0";
src = fetchFromGitHub {
+3 -3
View File
@@ -39,13 +39,13 @@
let
pname = "pcloud";
version = "1.14.13";
code = "XZevXB5ZOmw7nYNHSdpci0bD848nbhyClpf7";
version = "1.14.14";
code = "XZwGnW5ZrhkOy46busjMNcycWKNcbV5sKHb7";
# Archive link's codes: https://www.pcloud.com/release-notes/linux.html
src = fetchzip {
url = "https://api.pcloud.com/getpubzip?code=${code}&filename=pcloud-${version}.zip";
hash = "sha256-luyFMLNdbogaNF/4y9fZbZ1eBFPmyF2q/Xb1EfsSPz0=";
hash = "sha256-dWdv3Tvv34oFoolEVk1BHIymQOgHDEeum4fRELjyE/s=";
};
appimageContents = appimageTools.extractType2 {
+2 -2
View File
@@ -37,7 +37,7 @@
buildPythonPackage rec {
pname = "poetry";
version = "2.1.3";
version = "2.1.4";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -46,7 +46,7 @@ buildPythonPackage rec {
owner = "python-poetry";
repo = "poetry";
tag = version;
hash = "sha256-aMmYgFdQhgMd99atAtr5MD0yniaIi+QTPJ0rMI2jMxk=";
hash = "sha256-6QYg+QRZ60hgcAvKiUqC3gW7P0oK0vaFps9NYIPhBb8=";
};
build-system = [
+3 -3
View File
@@ -7,13 +7,13 @@
rustPlatform.buildRustPackage rec {
pname = "polarity";
version = "latest-unstable-2025-07-30";
version = "latest-unstable-2025-08-05";
src = fetchFromGitHub {
owner = "polarity-lang";
repo = "polarity";
rev = "2f7056d3c201680c9a7f267b4f39e82518bc5660";
hash = "sha256-9H6ICxrZICjfR+URnVVFGdk4lVUp89EIbaHrToDRUNQ=";
rev = "5adc14a5d3151ed124d89768c382e085caf612ac";
hash = "sha256-ByTUzruKM0u8SfRM88ogvsGw0JijWAVv8oidVdAGNUs=";
};
cargoHash = "sha256-SXGuf/JaBfPZgbCAfRmC2Gd82kOn54VQrc7FdmVJRuA=";
+2 -2
View File
@@ -6,14 +6,14 @@
}:
python3Packages.buildPythonApplication rec {
pname = "posting";
version = "2.7.0";
version = "2.7.1";
pyproject = true;
src = fetchFromGitHub {
owner = "darrenburns";
repo = "posting";
tag = version;
hash = "sha256-FkeQSU/gktCsCFoKAk0igfHj16WpxQG01WyAmBYLwX4=";
hash = "sha256-2mRLkZ4rr5awc8X3thllUlB/XpFGs6uaPsYreSPB/nw=";
};
pythonRelaxDeps = true;
+2 -2
View File
@@ -9,11 +9,11 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "proton-ge-bin";
version = "GE-Proton10-10";
version = "GE-Proton10-11";
src = fetchzip {
url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/${finalAttrs.version}/${finalAttrs.version}.tar.gz";
hash = "sha256-TJbeyJA9feyaBIYt5hwVUAAdev0SnoIqvhV7groxcu4=";
hash = "sha256-gTf8k0fx0KGCHVTQLkZli/CvZMkVVNpgBDpI/eiuynE=";
};
dontUnpack = true;
+2 -2
View File
@@ -18,11 +18,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "qownnotes";
appname = "QOwnNotes";
version = "25.7.9";
version = "25.8.2";
src = fetchurl {
url = "https://github.com/pbek/QOwnNotes/releases/download/v${finalAttrs.version}/qownnotes-${finalAttrs.version}.tar.xz";
hash = "sha256-rcBuGkoRel998i34e1kO8h/lqMZtgKnAipKGEF6xrhs=";
hash = "sha256-6N49s/TFV2xZJPC4nN60eovIAoEdMh0eF3ZtMRNVkLU=";
};
nativeBuildInputs = [
+111
View File
@@ -0,0 +1,111 @@
{
stdenv,
lib,
fetchFromGitHub,
fetchurl,
fetchpatch,
autoPatchelfHook,
makeWrapper,
nix-update-script,
glibcLocales,
python3Packages,
dotnetCorePackages,
gtk-sharp-3_0,
gtk3-x11,
dconf,
}:
let
pythonLibs =
with python3Packages;
makePythonPath [
construct
psutil
pyyaml
requests
tkinter
# from tools/csv2resd/requirements.txt
construct
# from tools/execution_tracer/requirements.txt
pyelftools
(robotframework.overrideDerivation (oldAttrs: {
src = fetchFromGitHub {
owner = "robotframework";
repo = "robotframework";
rev = "v6.1";
hash = "sha256-l1VupBKi52UWqJMisT2CVnXph3fGxB63mBVvYdM1NWE=";
};
patches = (oldAttrs.patches or [ ]) ++ [
(fetchpatch {
# utest: Improve filtering of output sugar for Python 3.13+
name = "python3.13-support.patch";
url = "https://github.com/robotframework/robotframework/commit/921e352556dc8538b72de1e693e2a244d420a26d.patch";
hash = "sha256-aSaror26x4kVkLVetPEbrJG4H1zstHsNWqmwqOys3zo=";
})
];
}))
];
in
stdenv.mkDerivation (finalAttrs: {
pname = "renode";
version = "1.16.0";
src = fetchurl {
url = "https://github.com/renode/renode/releases/download/v${finalAttrs.version}/renode-${finalAttrs.version}.linux-dotnet.tar.gz";
hash = "sha256-oNlTz5LBggPkjKM4TJO2UDKQdt2Ga7rBTdgyGjN8/zA=";
};
nativeBuildInputs = [
autoPatchelfHook
makeWrapper
];
propagatedBuildInputs = [
gtk-sharp-3_0
];
strictDeps = true;
installPhase = ''
runHook preInstall
mkdir -p $out/{bin,libexec/renode}
mv * $out/libexec/renode
mv .renode-root $out/libexec/renode
makeWrapper "$out/libexec/renode/renode" "$out/bin/renode" \
--prefix PATH : "$out/libexec/renode:${lib.makeBinPath [ dotnetCorePackages.runtime_8_0 ]}" \
--prefix GIO_EXTRA_MODULES : "${lib.getLib dconf}/lib/gio/modules" \
--suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ gtk3-x11 ]}" \
--prefix PYTHONPATH : "${pythonLibs}" \
--set LOCALE_ARCHIVE "${glibcLocales}/lib/locale/locale-archive"
makeWrapper "$out/libexec/renode/renode-test" "$out/bin/renode-test" \
--prefix PATH : "$out/libexec/renode:${lib.makeBinPath [ dotnetCorePackages.runtime_8_0 ]}" \
--prefix GIO_EXTRA_MODULES : "${lib.getLib dconf}/lib/gio/modules" \
--suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ gtk3-x11 ]}" \
--prefix PYTHONPATH : "${pythonLibs}" \
--set LOCALE_ARCHIVE "${glibcLocales}/lib/locale/locale-archive"
substituteInPlace "$out/libexec/renode/renode-test" \
--replace '$PYTHON_RUNNER' '${python3Packages.python}/bin/python3'
runHook postInstall
'';
passthru.updateScript = nix-update-script { };
meta = {
description = "Virtual development framework for complex embedded systems";
homepage = "https://renode.io";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [
otavio
znaniye
];
platforms = [ "x86_64-linux" ];
};
})
@@ -0,0 +1,38 @@
{
fetchurl,
renode-bin,
writeScript,
}:
renode-bin.overrideAttrs (
finalAttrs: _: {
pname = "renode-unstable";
version = "1.16.0+20250805git769469683";
src = fetchurl {
url = "https://builds.renode.io/renode-${finalAttrs.version}.linux-dotnet.tar.gz";
hash = "sha256-UZSfdJ14igoqaFCwCZmy29MfKZcxr7j8RtI/epHs2WI=";
};
passthru.updateScript =
let
versionRegex = "[0-9\\.\\+]+[^\\+]*.";
in
writeScript "${finalAttrs.pname}-updater" ''
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p common-updater-scripts curl gnugrep gnused pup
latestVersion=$(
curl -sS https://builds.renode.io \
| pup 'a text{}' \
| egrep 'renode-${versionRegex}\.linux-dotnet\.tar\.gz' \
| head -n1 \
| sed -e 's,renode-\(.*\)\.linux-dotnet\.tar\.gz,\1,g'
)
update-source-version ${finalAttrs.pname} "$latestVersion" \
--file=pkgs/by-name/re/${finalAttrs.pname}/package.nix \
--system=x86_64-linux
'';
}
)
+26 -32
View File
@@ -1,38 +1,32 @@
{
fetchFromGitHub,
nix-update-script,
renode,
fetchurl,
writeScript,
...
}:
renode.overrideAttrs (old: rec {
pname = "renode-unstable";
version = "1.16.0-unstable-2025-08-08";
renode.overrideAttrs (
finalAttrs: _: {
pname = "renode-unstable";
version = "1.16.0+20250805git769469683";
src = fetchFromGitHub {
owner = "renode";
repo = "renode";
rev = "194d90650a9337a05cd81e8855474773d23d4396";
hash = "sha256-oRtbjup5RKbVzKMTa0yiY1gGhDqUrQ4N3SgwQ7lm8Ho=";
fetchSubmodules = true;
};
src = fetchurl {
url = "https://builds.renode.io/renode-${finalAttrs.version}.linux-dotnet.tar.gz";
hash = "sha256-UZSfdJ14igoqaFCwCZmy29MfKZcxr7j8RtI/epHs2WI=";
prePatch = ''
substituteInPlace tools/building/createAssemblyInfo.sh \
--replace CURRENT_INFORMATIONAL_VERSION="`git rev-parse --short=8 HEAD`" \
CURRENT_INFORMATIONAL_VERSION="${builtins.substring 0 8 src.rev}"
'';
passthru = old.passthru // {
updateScript = nix-update-script {
extraArgs = [
"--version=branch"
];
};
passthru.updateScript =
let
versionRegex = "[0-9\\.\\+]+[^\\+]*.";
in
writeScript "${finalAttrs.pname}-updater" ''
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p common-updater-scripts curl gnugrep gnused pup
latestVersion=$(
curl -sS https://builds.renode.io \
| pup 'a text{}' \
| egrep 'renode-${versionRegex}\.linux-dotnet\.tar\.gz' \
| head -n1 \
| sed -e 's,renode-\(.*\)\.linux-dotnet\.tar\.gz,\1,g'
)
update-source-version ${finalAttrs.pname} "$latestVersion" \
--file=pkgs/by-name/re/${finalAttrs.pname}/package.nix \
--system=x86_64-linux
'';
}
)
};
})
+1192
View File
File diff suppressed because it is too large Load Diff
+141 -50
View File
@@ -1,21 +1,36 @@
{
stdenv,
lib,
fetchFromGitHub,
fetchurl,
fetchpatch,
autoPatchelfHook,
makeWrapper,
nix-update-script,
glibcLocales,
python3Packages,
dotnetCorePackages,
gtk-sharp-3_0,
gtk3-x11,
buildDotnetModule,
cmake,
dconf,
dotnet-runtime_8,
dotnet-sdk_6,
fetchFromGitHub,
fetchpatch,
gcc,
glibcLocales,
gtk3-x11,
gtk3,
lib,
mono,
nix-update-script,
python3Packages,
}:
let
resources = fetchFromGitHub {
owner = "renode";
repo = "renode-resources";
rev = "d3d69f8f17ed164ee23e46f0c06844a69bf4c004";
hash = "sha256-wR3heL58NOQLENwCzL4lPM4KuvT/ON7dlc/KUqrlRjg=";
};
assemblyVersion =
s:
let
part = lib.strings.splitString "-" s;
result = builtins.head part;
in
result;
pythonLibs =
with python3Packages;
makePythonPath [
@@ -48,58 +63,134 @@ let
];
}))
];
in
stdenv.mkDerivation (finalAttrs: {
buildDotnetModule rec {
pname = "renode";
version = "1.16.0";
src = fetchurl {
url = "https://github.com/renode/renode/releases/download/v${finalAttrs.version}/renode-${finalAttrs.version}.linux-dotnet.tar.gz";
hash = "sha256-oNlTz5LBggPkjKM4TJO2UDKQdt2Ga7rBTdgyGjN8/zA=";
src = fetchFromGitHub {
owner = "renode";
repo = "renode";
rev = "20ad06d9379997829df309c5724be94ba4effedd";
hash = "sha256-I/W3OAzHCN8rEIlDyBwI1ZDvKfHYYBDiqE9XkWHxo7o=";
fetchSubmodules = true;
};
nativeBuildInputs = [
autoPatchelfHook
makeWrapper
];
projectFile = "Renode_NET.sln";
propagatedBuildInputs = [
gtk-sharp-3_0
];
dotnet-runtime = dotnet-runtime_8;
dotnet-sdk = dotnet-sdk_6;
strictDeps = true;
nugetDeps = ./deps.json;
installPhase = ''
runHook preInstall
patches = [ ./renode-test.patch ];
mkdir -p $out/{bin,libexec/renode}
mv * $out/libexec/renode
mv .renode-root $out/libexec/renode
makeWrapper "$out/libexec/renode/renode" "$out/bin/renode" \
--prefix PATH : "$out/libexec/renode:${lib.makeBinPath [ dotnetCorePackages.runtime_8_0 ]}" \
--prefix GIO_EXTRA_MODULES : "${lib.getLib dconf}/lib/gio/modules" \
--suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ gtk3-x11 ]}" \
--prefix PYTHONPATH : "${pythonLibs}" \
--set LOCALE_ARCHIVE "${glibcLocales}/lib/locale/locale-archive"
makeWrapper "$out/libexec/renode/renode-test" "$out/bin/renode-test" \
--prefix PATH : "$out/libexec/renode:${lib.makeBinPath [ dotnetCorePackages.runtime_8_0 ]}" \
--prefix GIO_EXTRA_MODULES : "${lib.getLib dconf}/lib/gio/modules" \
--suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ gtk3-x11 ]}" \
--prefix PYTHONPATH : "${pythonLibs}" \
--set LOCALE_ARCHIVE "${glibcLocales}/lib/locale/locale-archive"
substituteInPlace "$out/libexec/renode/renode-test" \
--replace '$PYTHON_RUNNER' '${python3Packages.python}/bin/python3'
runHook postInstall
prePatch = ''
substituteInPlace tools/building/createAssemblyInfo.sh \
--replace CURRENT_INFORMATIONAL_VERSION="`git rev-parse --short=8 HEAD`" \
CURRENT_INFORMATIONAL_VERSION="${builtins.substring 0 8 src.rev}"
'';
postPatch = ''
# https://github.com/dotnet/roslyn/issues/37379#issuecomment-513371985
cat << EOF > Directory.Build.props
<Project>
<ItemGroup>
<SourceRoot Include="$(MSBuildThisFileDirectory)/"/>
</ItemGroup>
</Project>
EOF
patchShebangs build.sh tools/
# Fixes determinism build error
sed -i 's/AssemblyVersion("%VERSION%.*")/AssemblyVersion("${assemblyVersion version}")/g' src/Renode/Properties/AssemblyInfo.template
sed -i 's/AssemblyVersion("1.0.*")/AssemblyVersion("1.0.0.0")/g' lib/AntShell/AntShell/Properties/AssemblyInfo.cs lib/CxxDemangler/CxxDemangler/Properties/AssemblyInfo.cs
'';
# https://github.com/NixOS/nixpkgs/issues/38991
# bash: warning: setlocale: LC_ALL: cannot change locale (en_US.UTF-8)
env.LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive";
nativeBuildInputs = [
cmake
gcc
];
runtimeDeps = [
gtk3
mono
];
dontUseCmakeConfigure = true;
enableParallelBuilding = false;
preBuild = ''
mkdir -p lib/resources
ln -s ${resources}/* lib/resources/
mkdir output
mv src/Infrastructure/src/Emulator/Cores/linux-properties.csproj output/properties.csproj
sed -i "s#/usr/bin/gcc#${gcc}/bin/gcc#g" output/properties.csproj
sed -i "s#/usr/bin/ar#${gcc}/bin/ar#g" output/properties.csproj
# To fix value "" error in element <Import>
rm -rf src/Directory.Build.targets
CORES=(arm.le arm.be arm64.le arm-m.le arm-m.be ppc.le ppc.be ppc64.le ppc64.be i386.le x86_64.le riscv.le riscv64.le sparc.le sparc.be xtensa.le)
for core_config in ''${CORES[@]}
do
CORE="$(echo $core_config | cut -d '.' -f 1)"
ENDIAN="$(echo $core_config | cut -d '.' -f 2)"
BITS=32
if [[ $CORE =~ "64" ]]; then
BITS=64
fi
SOURCE="${src}/src/Infrastructure/src/Emulator/Cores"
CMAKE_CONF_FLAGS="-DTARGET_ARCH=$CORE -DTARGET_WORD_SIZE=$BITS -DCMAKE_BUILD_TYPE=Release -DCMAKE_LIBRARY_OUTPUT_DIRECTORY=$out/lib"
CORE_DIR=build/$CORE/$ENDIAN
mkdir -p $CORE_DIR
pushd $CORE_DIR
if [[ $ENDIAN == "be" ]]; then
CMAKE_CONF_FLAGS+=" -DTARGET_WORDS_BIGENDIAN=1"
fi
cmake $CMAKE_CONF_FLAGS -DHOST_ARCH=i386 $SOURCE
cmake --build . -j$NIX_BUILD_CORES
popd
done
mkdir -p src/Infrastructure/src/Emulator/Cores/bin/Release/lib
ln -s $out/lib/*.so src/Infrastructure/src/Emulator/Cores/bin/Release/lib
'';
dotnetInstallFlags = [ "-p:TargetFramework=net6.0" ];
postInstall = ''
mkdir -p $out/lib/renode
mv * .renode-root $out/lib/renode
makeWrapper "$out/lib/renode/renode-test" "$out/bin/renode-test" \
--prefix PATH : "$out/lib/renode:${lib.makeBinPath [ dotnet-sdk ]}" \
--prefix GIO_EXTRA_MODULES : "${lib.getLib dconf}/lib/gio/modules" \
--suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ gtk3-x11 ]}" \
--prefix PYTHONPATH : "${pythonLibs}" \
--set LOCALE_ARCHIVE "${glibcLocales}/lib/locale/locale-archive" \
'';
executables = [ "Renode" ];
passthru.updateScript = nix-update-script { };
meta = {
changelog = "https://github.com/renode/renode/blob/${version}/CHANGELOG.rst";
description = "Virtual development framework for complex embedded systems";
downloadPage = "https://github.com/renode/renode";
homepage = "https://renode.io";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [
@@ -108,4 +199,4 @@ stdenv.mkDerivation (finalAttrs: {
];
platforms = [ "x86_64-linux" ];
};
})
}
+28
View File
@@ -0,0 +1,28 @@
diff --git a/renode-test b/renode-test
index 0f8f8d0..1fdfe23 100755
--- a/renode-test
+++ b/renode-test
@@ -5,22 +5,17 @@ set -u
# this is to support running renode-test from an external directory and via a symlink
ROOT_PATH="$(cd $(dirname $(readlink -f $0 2>/dev/null || echo $0)); echo $PWD)"
-TESTS_FILE="$ROOT_PATH/tests/tests.yaml"
-TESTS_RESULTS="$ROOT_PATH/output/tests"
. "${ROOT_PATH}/tools/common.sh"
set +e
STTY_CONFIG=`stty -g 2>/dev/null`
-$PYTHON_RUNNER -u "`get_path "$ROOT_PATH/tests/run_tests.py"`" --exclude "skip_${DETECTED_OS}" --exclude "skip_host_${DETECTED_ARCH}" --properties-file "`get_path "$ROOT_PATH/output/properties.csproj"`" -r "`get_path "$TESTS_RESULTS"`" -t "`get_path "$TESTS_FILE"`" "$@"
+$PYTHON_RUNNER -u "`get_path "$ROOT_PATH/tests/run_tests.py"`" --exclude "skip_${DETECTED_OS}" -r $(pwd) --runner=dotnet "$@"
RESULT_CODE=$?
set -e
if [ -n "${STTY_CONFIG:-}" ]
then
- # SIGTTOU might be sent when trying to change the terminal settings when "renode-test" runs in the background so trap the signal.
- trap "" SIGTTOU
stty "$STTY_CONFIG"
- trap - SIGTTOU
fi
exit $RESULT_CODE
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule (finalAttrs: {
pname = "rqlite";
version = "8.43.0";
version = "8.43.2";
src = fetchFromGitHub {
owner = "rqlite";
repo = "rqlite";
tag = "v${finalAttrs.version}";
hash = "sha256-+liwTJP4JEVQCMHegg4Ewk4K+MEjbwZ8wo3aoRZo+S0=";
hash = "sha256-A/PP9jOEelELM3v36/b4YPbd/duzV3C/IXfHgmbjltY=";
};
vendorHash = "sha256-81Ueq2/aH0KNEuaNjpMVP1MIX68jY33G+v2oDzNvvo8=";
vendorHash = "sha256-3BdRYAc/gbtOtEMfBMOK5scP58r85WNq0In7qNBwY0E=";
subPackages = [
"cmd/rqlite"
@@ -12,15 +12,15 @@
rustPlatform.buildRustPackage rec {
pname = "rust-analyzer-unwrapped";
version = "2025-08-04";
version = "2025-08-11";
cargoHash = "sha256-+CT0Q/uOoYbe3mItVM9D2Taoa3CLHoDpDtRVzHxGHpI=";
cargoHash = "sha256-G1R3IiKbQg1Dl6OFJSto0w4c18OUIrAPRiM/YStfkl0=";
src = fetchFromGitHub {
owner = "rust-lang";
repo = "rust-analyzer";
rev = version;
hash = "sha256-M+bLCsYRYA7iudlZkeOf+Azm/1TUvihIq51OKia6KJ8=";
hash = "sha256-otzv/l7c1rL+eH1cuJnUZVp4DR2dMdEIfhtLxTelIBY=";
};
cargoBuildFlags = [
+2 -2
View File
@@ -9,13 +9,13 @@
buildGoModule rec {
pname = "rymdport";
version = "3.9.0";
version = "3.9.1";
src = fetchFromGitHub {
owner = "Jacalz";
repo = "rymdport";
rev = "v${version}";
hash = "sha256-Eezitq66NkTYUxGt5/sVrB486irPigeCARjZVW6nTK4=";
hash = "sha256-5INmb8zMFUB8ibA+ACNWoL54tOhWYHF85MZzRNRmJow=";
};
vendorHash = "sha256-WPJj3zlEJeghRw0lHHUXm7n0a6d8Yf78s7jnBwmAZ4U=";
@@ -7,11 +7,11 @@
let
pname = "simplex-chat-desktop";
version = "6.4.2";
version = "6.4.3.1";
src = fetchurl {
url = "https://github.com/simplex-chat/simplex-chat/releases/download/v${version}/simplex-desktop-x86_64.AppImage";
hash = "sha256-g3WsqLEOBcmeUEqNtC0ixJwDbGTvfSUi80pKPvAu6tM=";
hash = "sha256-rFNatd7mC96WrX6imDOdEMNkSokiSeYq0oFRh/HTEC8=";
};
appimageContents = appimageTools.extract {
+3 -3
View File
@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "snazy";
version = "0.57.3";
version = "0.58.1";
src = fetchFromGitHub {
owner = "chmouel";
repo = "snazy";
rev = version;
hash = "sha256-ACEIqMonc4AD84uTkHQZc2+vXjlXhKNLZqNxWm8RnBw=";
hash = "sha256-sm3FTQ3+cILoKkMe3qvZg2K+rspvJI3SXpDFD3YPXXk=";
};
cargoHash = "sha256-1o6/17H2D8gKpT2EefVfMD2Bp4/R9Xtg+/Eil32GzcM=";
cargoHash = "sha256-uRX6qE7tlCvJlWuLtgvuL2DLnqf7+exHLZjAoF0F2PM=";
nativeBuildInputs = [ installShellFiles ];
+41
View File
@@ -0,0 +1,41 @@
{
lib,
python3,
fetchFromGitHub,
}:
python3.pkgs.buildPythonApplication rec {
pname = "sphinx-lint";
version = "1.0.0";
pyproject = true;
src = fetchFromGitHub {
owner = "sphinx-contrib";
repo = "sphinx-lint";
tag = "v${version}";
hash = "sha256-VM8PyUZVQQFdXLR14eN7+hPT/iGOVHG6s1bcac4MPo4=";
};
build-system = [
python3.pkgs.hatch-vcs
python3.pkgs.hatchling
];
dependencies = with python3.pkgs; [
polib
regex
];
nativeCheckInputs = with python3.pkgs; [
pytestCheckHook
pytest-cov
];
meta = {
description = "Check for stylistic and formal issues in .rst and .py files included in the documentation";
homepage = "https://github.com/sphinx-contrib/sphinx-lint";
license = lib.licenses.psfl;
maintainers = with lib.maintainers; [ doronbehar ];
mainProgram = "sphinx-lint";
};
}
+3 -3
View File
@@ -6,18 +6,18 @@
buildGoModule rec {
pname = "sqldef";
version = "2.0.7";
version = "2.0.8";
src = fetchFromGitHub {
owner = "sqldef";
repo = "sqldef";
rev = "v${version}";
hash = "sha256-E/C2BBys5I5mC+tWgHhMNVH2ftvkzUqlrG3vJ3D7Lzg=";
hash = "sha256-woPRBrZvTSlNnzhGHqYFO4MJRlIuqXzcSBUzkF88aJw=";
};
proxyVendor = true;
vendorHash = "sha256-G6krEo6zutcjVhKF7ZYNulUG/lppSfDF2VMUv3g4JMk=";
vendorHash = "sha256-ZPDD7DtsgBW/l8pEO36pocJsjyXhAT5WD3vgJG3IKG4=";
ldflags = [
"-s"
+3 -3
View File
@@ -19,16 +19,16 @@
rustPlatform.buildRustPackage rec {
pname = "stgit";
version = "2.5.3";
version = "2.5.4";
src = fetchFromGitHub {
owner = "stacked-git";
repo = "stgit";
rev = "v${version}";
hash = "sha256-YrJf4uNICPmXpuJvf0QRDHpODw39Q+40SLZuoIwZ5qA=";
hash = "sha256-Tsh2VKnJUwxsrsSOKxJwcFIY8UZ9F7Ebi9lwe03fJZs=";
};
cargoHash = "sha256-Y3969dpfbKJR22yjw5MHsG3+EJyui0bQFQ585wLzXUk=";
cargoHash = "sha256-RiPLBK7CiotCduaYYbS3vkb9ezNwfbbx+QC4DGd3diU=";
nativeBuildInputs = [
pkg-config
+2 -2
View File
@@ -32,13 +32,13 @@
stdenv.mkDerivation rec {
pname = "sumo";
version = "1.23.1";
version = "1.24.0";
src = fetchFromGitHub {
owner = "eclipse";
repo = "sumo";
tag = "v${lib.replaceStrings [ "." ] [ "_" ] version}";
hash = "sha256-yXXOCvlHAzGmNQeXyWQtmq1UdkQ6qt4L9noUii/voP4=";
hash = "sha256-xf7/hUJpl+XmXx5MmFzYu2geFNe7JVaxDrraoqLrSuk=";
fetchSubmodules = true;
};
+2 -2
View File
@@ -6,14 +6,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "syrics";
version = "0.1.2.3";
version = "0.1.2.4";
pyproject = true;
src = fetchFromGitHub {
owner = "akashrchandran";
repo = "syrics";
tag = "v${version}";
hash = "sha256-uOk/9PzQgLXAy8eSp739fArq1/C7ZqdY9GoOJ3LObJ8=";
hash = "sha256-udW6i3nRWECXpQGGGK2U8QVRJVrsHeqjDK8QCMH5I8s=";
};
build-system = [
+2 -2
View File
@@ -7,13 +7,13 @@
buildGoModule rec {
pname = "typtea";
version = "0.1.4";
version = "0.1.5";
src = fetchFromGitHub {
owner = "ashish0kumar";
repo = "typtea";
tag = "v${version}";
hash = "sha256-JIb7MkqHHlKLTI+SY007RQS4DpmQS1y8SNUsYVevEEk=";
hash = "sha256-syN35y4oCm0P6N+UmbPrcfmGgJNuEjZ8wzW98xhM5NM=";
};
vendorHash = "sha256-LWY1Tnh4iyNAV7dNjlKdT9IwPJRN25HkEAGSkQIRe9I=";
+12 -21
View File
@@ -6,42 +6,33 @@
python3.pkgs.buildPythonApplication rec {
pname = "uwhoisd";
version = "0.1.0-unstable-2024-02-24";
version = "0.1.1";
pyproject = true;
src = fetchFromGitHub {
owner = "Lookyloo";
owner = "kgaughan";
repo = "uwhoisd";
rev = "31ce5e83b8fcf200098fd5120d9c856f3f80e3f7";
hash = "sha256-lnPGKF9pJ2NFIsx4HFdRip6R+vGVr9TYzvU89iwBc5g=";
tag = "v${version}";
hash = "sha256-ncllROnKFwsSalbkQIOt/sQO0qxybAgxrVnYOC+9InY=";
};
pythonRelaxDeps = [
"beautifulsoup4"
"tornado"
];
build-system = with python3.pkgs; [
poetry-core
hatchling
hatch-vcs
];
propagatedBuildInputs =
with python3.pkgs;
[
beautifulsoup4
publicsuffix2
redis
tornado
]
++ redis.optional-dependencies.hiredis;
dependencies = with python3.pkgs; [
beautifulsoup4
requests
];
# Project has no tests
doCheck = false;
meta = {
description = "Universal WHOIS proxy server";
homepage = "https://github.com/Lookyloo/uwhoisd";
changelog = "https://github.com/Lookyloo/uwhoisd/blob/${version}/ChangeLog";
homepage = "https://github.com/kgaughan/uwhoisd";
changelog = "https://github.com/kgaughan/uwhoisd/blob/${src.tag}/ChangeLog";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ fab ];
};
+1 -2
View File
@@ -141,8 +141,7 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [ dataDerivation ] ++ finalAttrs.buildInputs;
nativeBuildInputs = [ rsync ];
phases = [ "buildPhase" ];
buildPhase =
buildCommand =
let
Default_Data_Path =
if stdenv.hostPlatform.isDarwin then
@@ -8,10 +8,9 @@
}:
builtins.mapAttrs
(
name: buildPhase:
name: buildCommand:
stdenvNoCC.mkDerivation {
inherit name buildPhase;
phases = [ "buildPhase" ];
inherit name buildCommand;
nativeBuildInputs = [ unar ];
meta = {
sourceProvenance = with lib.sourceTypes; [
+6 -6
View File
@@ -1,14 +1,14 @@
{
"darwin": {
"hash": "sha256-s4SHM2pU1CZPJZFiWE5VDeSEprLsSYChFazNGOpz+oo=",
"version": "0.2025.08.06.08.12.stable_01"
"hash": "sha256-wO3xE8cSSMaYVc6eoswDcR3acBzWwB/BHbins8ciM4Y=",
"version": "0.2025.08.06.08.12.stable_02"
},
"linux_x86_64": {
"hash": "sha256-u0TH9u1o+g3GngEMg6r78fSZH778kGcKe5tB/lpExZE=",
"version": "0.2025.08.06.08.12.stable_01"
"hash": "sha256-/Nhy0fyslK8h5zzhwlDJT+6nhNmdBowj/jGOTCunX4w=",
"version": "0.2025.08.06.08.12.stable_02"
},
"linux_aarch64": {
"hash": "sha256-smg2QiXRlADGBKxl9Wlq2yWsCCi3JwjxhwR13yG70mA=",
"version": "0.2025.08.06.08.12.stable_01"
"hash": "sha256-Jqm2aUg11nrIZUofcLDYZ7BQtaSPx7KrrM91i0bc+ig=",
"version": "0.2025.08.06.08.12.stable_02"
}
}
+2 -2
View File
@@ -10,12 +10,12 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "wayland-bongocat";
version = "1.2.3";
version = "1.2.4";
src = fetchFromGitHub {
owner = "saatvik333";
repo = "wayland-bongocat";
tag = "v${finalAttrs.version}";
hash = "sha256-XCjOusgvTkEiID55MxP2ppVtKiDz5XAF1kSCIAXN3DQ=";
hash = "sha256-ek9sVzofW0sWJBCeudykdirDkF04YdR1gAcpeWqgQAQ=";
};
# Package dependencies

Some files were not shown because too many files have changed in this diff Show More