Merge master into staging-nixos

This commit is contained in:
nixpkgs-ci[bot]
2026-05-05 00:36:35 +00:00
committed by GitHub
180 changed files with 1037 additions and 885 deletions
+3 -1
View File
@@ -155,7 +155,9 @@
- `eslint` has been updated from version 9 to version 10. Please see https://eslint.org/blog/2026/02/eslint-v10.0.0-released/ for details about the breaking changes included in the update.
- `minio_legacy_fs` has been removed. If you used that package, migrate your data to be compatible with the newest minio and use the package `minio`.
- `minio` has been abandoned by upstream and security issues won't be fixed. It is scheduled to be removed for 26.11. Users should migrate to alternatives such as Garage, SeaweedFS, or Ceph. S3-compatible clients such as rclone can be used to move data.
`minio_legacy_fs` has been removed. Users should migrate to alternatives such as Garage, SeaweedFS, or Ceph. S3-compatible clients such as rclone can be used to move data.
- `mercure` has been update to `0.21.4` (or later). Version [0.21.0](https://github.com/dunglas/mercure/releases/v0.21.0) and [0.21.2](https://github.com/dunglas/mercure/releases/tag/v0.21.2) introduce breaking changes to the package.
+1 -4
View File
@@ -40,8 +40,7 @@
"bazel": {
"description": "Maintenance of https://bazel.build/ and related packages",
"id": 5468470,
"maintainers": {
},
"maintainers": {},
"members": {
"aherrmann": 732652,
"avdv": 3471749,
@@ -128,7 +127,6 @@
"HeitorAugustoLN": 44377258,
"Pandapip1": 45835846,
"a-kenji": 65275785,
"ahoneybun": 4884946,
"drakon64": 6444703,
"michaelBelsanti": 62124625,
"thefossguy": 44400303
@@ -213,7 +211,6 @@
"fulsomenko": 14945057,
"gador": 1883533,
"griff": 4368,
"groodt": 343415,
"gshpychka": 23005347,
"hexagonal-sun": 222664,
"heywoodlh": 18178614,
+6 -19
View File
@@ -132,12 +132,6 @@
githubId = 56617252;
matrix = "@oxc45:matrix.org";
};
_0xd61 = {
email = "dgl@degit.co";
name = "Daniel Glinka";
github = "0xd61";
githubId = 8351869;
};
_0xErwin1 = {
email = "ignacio@feuer.me";
name = "Ignacio Perez";
@@ -2913,6 +2907,12 @@
githubId = 1017537;
name = "Bruno Bieth";
};
bad3r = {
name = "Bad3r";
email = "github@unsigned.sh";
github = "Bad3r";
githubId = 25513724;
};
badele = {
name = "Bruno Adelé";
email = "brunoadele@gmail.com";
@@ -10455,13 +10455,6 @@
githubId = 9850776;
name = "Hans-Jörg Schurr";
};
HaoZeke = {
email = "r95g10@gmail.com";
github = "HaoZeke";
githubId = 4336207;
name = "Rohit Goswami";
keys = [ { fingerprint = "74B1 F67D 8E43 A94A 7554 0768 9CCC E364 02CB 49A6"; } ];
};
happy-river = {
email = "happyriver93@runbox.com";
github = "happy-river";
@@ -24431,12 +24424,6 @@
githubId = 2320433;
name = "Sam Boosalis";
};
sbruder = {
email = "nixos@sbruder.de";
github = "sbruder";
githubId = 15986681;
name = "Simon Bruder";
};
scandiravian = {
email = "nixos@scandiravian.com";
github = "scandiravian";
@@ -53,9 +53,7 @@ let
|| (instance.token != null && instance.tokenFile == null);
in
{
meta.maintainers = with lib.maintainers; [
hexa
];
meta.maintainers = [ ];
options.services.gitea-actions-runner = with types; {
package = mkPackageOption pkgs "gitea-actions-runner" { };
@@ -7,7 +7,7 @@
}:
let
cfg = config.services.nixseparatedebuginfod2;
url = "127.0.0.1:${toString cfg.port}";
address = "127.0.0.1:${toString cfg.port}";
in
{
imports = [
@@ -40,16 +40,16 @@ in
};
};
config = lib.mkIf cfg.enable {
systemd.services.nixseparatedebuginfod2 = {
systemd.sockets.nixseparatedebuginfod2 = {
wantedBy = [ "multi-user.target" ];
path = [ config.nix.package ];
socketConfig.ListenStream = [ address ];
};
systemd.services.nixseparatedebuginfod2 = {
serviceConfig = {
ExecStart = [
(utils.escapeSystemdExecArgs (
[
(lib.getExe cfg.package)
"--listen-address"
url
"--expiration"
cfg.cacheExpirationDelay
]
@@ -59,6 +59,7 @@ in
]) cfg.substituters)
))
];
Type = "notify";
Restart = "on-failure";
CacheDirectory = "nixseparatedebuginfod2";
DynamicUser = true;
@@ -101,7 +102,7 @@ in
};
};
environment.debuginfodServers = [ "http://${url}" ];
environment.debuginfodServers = [ "http://${address}" ];
};
}
@@ -163,14 +163,6 @@ in
};
assertions = [
{
assertion = lib.pathExists (toString (genAssetsDrv cfg.assets) + "/share/v2ray");
message = ''
Packages in `assets` has no preset paths included.
Please set `assetsPath` instead.
'';
}
{
assertion = !((config.services.dae.config != null) && (config.services.dae.configFile != null));
message = ''
+7 -3
View File
@@ -121,15 +121,18 @@ in
StateDirectory = "openbao";
StateDirectoryMode = "0700";
RuntimeDirectory = "openbao";
RuntimeDirectoryMode = "0700";
RuntimeDirectoryMode = "0755";
DynamicUser = true;
User = "openbao";
Group = "openbao";
CapabilityBoundingSet = "";
DynamicUser = true;
LimitCORE = 0;
LockPersonality = true;
MemorySwapMax = 0;
MemoryZSwapMax = 0;
PrivateUsers = true;
PrivateUsers = "identity";
ProcSubset = "pid";
ProtectClock = true;
ProtectControlGroups = true;
@@ -152,6 +155,7 @@ in
"@system-service"
"@resources"
"~@privileged"
"@chown"
];
UMask = "0077";
};
@@ -201,7 +201,11 @@ let
''}
ssl_protocols ${cfg.sslProtocols};
${optionalString (cfg.sslCiphers != null) "ssl_ciphers ${cfg.sslCiphers};"}
${optionalString (cfg.sslCiphers != null)
"ssl_ciphers ${
if lib.isList cfg.sslCiphers then (lib.concatStringsSep ":" cfg.sslCiphers) else cfg.sslCiphers
};"
}
${optionalString (cfg.sslDhparam != false)
"ssl_dhparam ${
if cfg.sslDhparam == true then config.security.dhparams.params.nginx.path else cfg.sslDhparam
@@ -968,16 +972,33 @@ in
};
sslCiphers = mkOption {
type = types.nullOr types.str;
type = types.nullOr (types.either types.str (types.listOf types.str));
# Keep in sync with https://ssl-config.mozilla.org/#server=nginx&config=intermediate
default = "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-CHACHA20-POLY1305";
description = "Ciphers to choose from when negotiating TLS handshakes.";
default = [
"ECDHE-ECDSA-AES128-GCM-SHA256"
"ECDHE-RSA-AES128-GCM-SHA256"
"ECDHE-ECDSA-AES256-GCM-SHA384"
"ECDHE-RSA-AES256-GCM-SHA384"
"ECDHE-ECDSA-CHACHA20-POLY1305"
"ECDHE-RSA-CHACHA20-POLY1305"
"DHE-RSA-AES128-GCM-SHA256"
"DHE-RSA-AES256-GCM-SHA384"
"DHE-RSA-CHACHA20-POLY1305"
];
description = ''
List of available cipher suites to choose from when negotiating TLS sessions.
:::{.warn}
This option only handles cipher suites up to TLSv1.2. Use
`ssl_conf_command CipherSuites` to configure TLSv1.3 cipher suites.
:::
'';
};
sslProtocols = mkOption {
type = types.str;
default = "TLSv1.2 TLSv1.3";
example = "TLSv1 TLSv1.1 TLSv1.2 TLSv1.3";
example = "TLSv1.3";
description = "Allowed TLS protocol versions.";
};
+2 -2
View File
@@ -2,8 +2,8 @@
{
name = "invidious";
meta = with pkgs.lib.maintainers; {
maintainers = [ sbruder ];
meta = {
maintainers = [ ];
};
nodes = {
+1 -2
View File
@@ -44,8 +44,7 @@
start_all()
cache.wait_for_unit("nginx.service")
cache.wait_for_open_port(80)
machine.wait_for_unit("nixseparatedebuginfod2.service")
machine.wait_for_open_port(1949)
machine.wait_for_unit("nixseparatedebuginfod2.socket")
with subtest("check that the binary cache works"):
machine.succeed("nix-store --extra-substituters http://cache --option require-sigs false -r ${pkgs.sl}")
+20 -1
View File
@@ -33,6 +33,14 @@ in
unix = {
type = "unix";
};
unix-custom = {
type = "unix";
address = "/run/openbao/world-accessible.sock";
socket_mode = "0222";
socket_user = "openbao";
socket_group = "openbao";
};
};
cluster_addr = "https://127.0.0.1:8201";
@@ -50,6 +58,9 @@ in
testScript =
{ nodes, ... }:
let
inherit (nodes.machine.services.openbao.settings) listener;
in
''
import json
@@ -58,7 +69,15 @@ in
with subtest("Wait for OpenBao to start up"):
machine.wait_for_unit("openbao.service")
machine.wait_for_open_port(8200)
machine.wait_for_open_unix_socket("${nodes.machine.services.openbao.settings.listener.unix.address}")
machine.wait_for_open_unix_socket("${listener.unix.address}")
machine.wait_for_open_unix_socket("${listener.unix-custom.address}")
with subtest("Check Unix Socket listeners"):
t.assertEqual("srwx------ openbao:openbao", machine.succeed("stat --printf '%A %U:%G' ${listener.unix.address}"))
machine.fail("su -l nobody -s /bin/sh -c 'curl --fail --silent --unix-socket ${listener.unix.address} localhost'")
t.assertEqual("s-w--w--w- openbao:openbao", machine.succeed("stat --printf '%A %U:%G' ${listener.unix-custom.address}"))
machine.succeed("su -l nobody -s /bin/sh -c 'curl --fail --silent --unix-socket ${listener.unix-custom.address} localhost'")
with subtest("Check that the web UI is being served"):
machine.succeed("curl -L --fail --show-error --silent $BAO_ADDR | grep '<title>OpenBao</title>'")
+1 -1
View File
@@ -30,7 +30,7 @@
machine.log(json.dumps(response, indent=2))
assert response["dane"]["policy"] == "", f"Unexpected DANE policy for localhost: {response["dane"]["policy"]}"
assert response["mta-sts"]["policy"] == "", f"Unexpected MTA-STS policy for localhost: {response["mta-sts"]["policy"]}"
assert response["mta-sts"]["policy"] == "TEMP", f"Unexpected MTA-STS policy for localhost: {response["mta-sts"]["policy"]}"
machine.log(machine.execute("systemd-analyze security postfix-tlspol.service | grep -v ")[1])
'';
@@ -1346,8 +1346,8 @@ let
mktplcRef = {
publisher = "discloud";
name = "discloud";
version = "2.28.7";
hash = "sha256-0RCuCZXDJ9svmI9Kc6vBE/l0f33aB3BXCFuHLFpa8nI=";
version = "2.29.5";
hash = "sha256-oWrGDJHVQ8Gwjrh6vlQPKoFlBx3wxzLbMkH0gDFa5jg=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/discloud.discloud/changelog";
@@ -1375,8 +1375,8 @@ let
mktplcRef = {
name = "competitive-programming-helper";
publisher = "DivyanshuAgrawal";
version = "2026.4.1776958969";
hash = "sha256-Ng9Yw1Jq2lSLqczHj6tjhtINfzx1bOXlVN0K1pogIKw=";
version = "2026.5.1777808848";
hash = "sha256-HzevH4HO9QVkSwARx5EF5ylKE3bjOgWt7eSPP5rHEUw=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/DivyanshuAgrawal.competitive-programming-helper/changelog";
@@ -2324,8 +2324,8 @@ let
mktplcRef = {
name = "vscode-vibrancy-continued";
publisher = "illixion";
version = "1.1.76";
hash = "sha256-QMKEFoqOzlSduwjefou1ozt3WbSbeXfxEGj6KMqR3eY=";
version = "1.1.77";
hash = "sha256-khxajorzIntF2YwKVd6aZ1+doEr2oN4OliBpc7TTB7o=";
};
meta = {
downloadPage = "https://marketplace.visualstudio.com/items?itemName=illixion.vscode-vibrancy-continued";
@@ -2918,8 +2918,8 @@ let
mktplcRef = {
name = "marp-vscode";
publisher = "marp-team";
version = "3.4.1";
hash = "sha256-SS9GMib7ixL/KuMbavUVcOW6EBxxLN83ujg+clrTKrs=";
version = "3.5.0";
hash = "sha256-BH+9HK08+G2hZTanOuBplxl/cYpGrIqrapFGjNIX4QA=";
};
meta = {
license = lib.licenses.mit;
@@ -3861,8 +3861,8 @@ let
mktplcRef = {
name = "ansible";
publisher = "redhat";
version = "26.4.4";
hash = "sha256-fBwehxNmePQuM+kJ4cigVQCZ9UqBlBcT6+xD/gDCv64=";
version = "26.4.6";
hash = "sha256-ckirgCt6+mdnWkvmLwpH7YwqOxQ+JEeRE0/NJGCi7rU=";
};
meta = {
description = "Ansible language support";
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "lean4";
publisher = "leanprover";
version = "0.0.234";
hash = "sha256-pChzzyJ49LAlSHWl83G6GaH3mTJB2ZZTjMygxWpubtE=";
version = "0.0.236";
hash = "sha256-N4Y71r22e5MNLOYVFVF3FYnzoQTHIAoC/t3zv+5eB80=";
};
meta = {
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
publisher = "ms-python";
name = "black-formatter";
version = "2025.2.0";
hash = "sha256-EPtxcp42KunVwVdT/xhVzuwvQ+5VswGNnOZpYXZOP04=";
version = "2026.4.0";
hash = "sha256-lt/68RWEpoBFTBWEsSSb/KL6BRmdt8mELBA1ypb5Pm0=";
};
meta = {
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
publisher = "ms-python";
name = "isort";
version = "2025.0.0";
hash = "sha256-nwt9Pv084jt9nWvxSXLIWu7981UGSbCgVRTrFfJA6q4=";
version = "2026.4.0";
hash = "sha256-9UwAZfr8MnshHvZFCXl2v8IpgFJJrYuM5Z6Zn/uqlOQ=";
};
meta = {
description = "Import sorting extension for Visual Studio Code using isort";
@@ -8,13 +8,13 @@
}:
mkLibretroCore {
core = "mednafen-psx" + lib.optionalString withHw "-hw";
version = "0-unstable-2026-04-20";
version = "0-unstable-2026-05-01";
src = fetchFromGitHub {
owner = "libretro";
repo = "beetle-psx-libretro";
rev = "48f2ceb50392a9c142f10312ba4461e60c6b91ff";
hash = "sha256-lrrmGAnBNXU871GGDhQfRSVrYv/jebaUKtyMeyWm7GY=";
rev = "ab72423afd429c1e96ca56fbd39094a71270842b";
hash = "sha256-j1ZCbB0hKcxay/0BkkuoncYPAkMTgSGEAOzYNgJaAh4=";
};
extraBuildInputs = lib.optionals withHw [
@@ -11,13 +11,13 @@
}:
mkLibretroCore {
core = "pcsx2";
version = "0-unstable-2026-02-06";
version = "0-unstable-2026-05-01";
src = fetchFromGitHub {
owner = "libretro";
repo = "ps2";
rev = "416291ad7dc3caf5df4501c9249cbbe30cbef811";
hash = "sha256-rdrUsrezAfsbR7xd6ykIjB8cc4USUQcOMJV5mxbVn2o=";
rev = "1b048a1783263a0584e3f663fe46b1a6fd163ff9";
hash = "sha256-5me+ETLmJrVmpkGi1TJ5LWiPp+AKiwHPl7AlG0cp+8o=";
fetchSubmodules = true;
};
@@ -191,13 +191,13 @@
"vendorHash": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk="
},
"cloudamqp_cloudamqp": {
"hash": "sha256-bkd0q7S/AtsX0q/sHGiwGql6xcjgH9WIM40FFzQSei8=",
"hash": "sha256-AUoXyFw5GL8wSYVfi4GZp/nhJd6VRusyKgw1B3J/LL8=",
"homepage": "https://registry.terraform.io/providers/cloudamqp/cloudamqp",
"owner": "cloudamqp",
"repo": "terraform-provider-cloudamqp",
"rev": "v1.44.4",
"rev": "v1.45.2",
"spdx": "MPL-2.0",
"vendorHash": "sha256-sagrygtfsZWQUuIuGTUldZYYR5OhQfpZDxDKZAaIR4Y="
"vendorHash": "sha256-59bhibkok4w7dLTf96jZGk2di6TpR6IAqp0i3xmtlyI="
},
"cloudflare_cloudflare": {
"hash": "sha256-2hlL7N6jP7or3l0HczbRhnAmMYJ0XQTXl0f+sIFdlZc=",
@@ -499,13 +499,13 @@
"vendorHash": "sha256-MYVkNvJ+rbwGw0htClIbmxk3YX2OK/ZO/QOTyMRFiug="
},
"hashicorp_aws": {
"hash": "sha256-ztoQ8xF42QdVNNBEh1Gcpvs1WjRwNB1RDTbU97sQ5jo=",
"hash": "sha256-M18L1hMZOy0g5UvlllqELkO4DZxYxDYjcSxBLGglzw8=",
"homepage": "https://registry.terraform.io/providers/hashicorp/aws",
"owner": "hashicorp",
"repo": "terraform-provider-aws",
"rev": "v6.42.0",
"rev": "v6.43.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-koqH8h1oixv+cH6y9Z5mjgIVGB/XWHSo/UCgQW6bh2U="
"vendorHash": "sha256-4I3YwVn3lGSDXKLqzlOlY4TlaSSJk6uKBNeCn7IdX6w="
},
"hashicorp_awscc": {
"hash": "sha256-SMG66AP5IWbnwUOQBsf0p1WT1ht4a740Z7ltLgyhN2o=",
@@ -706,13 +706,13 @@
"vendorHash": null
},
"hetznercloud_hcloud": {
"hash": "sha256-KDtsI3AKz4xFFBxiPmjP3nHA4MDbs0ubEZPcG8HtCv0=",
"hash": "sha256-2dKJLOhOkCKsAgjapmF0NvupszhILt+1lSH9TRqH44s=",
"homepage": "https://registry.terraform.io/providers/hetznercloud/hcloud",
"owner": "hetznercloud",
"repo": "terraform-provider-hcloud",
"rev": "v1.61.0",
"rev": "v1.62.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-4XBSqaUCiYyCeWCFBuguuy/0z/4+UoKfySey4vlvNLk="
"vendorHash": "sha256-fWnf2l9a7bzXtofA+Aow6F17K+slpMpXEYZPuqDNwfg="
},
"huaweicloud_huaweicloud": {
"hash": "sha256-Eg811AwJwuHZ/270+TNh6JskCGRUt0ikk6yShjtVtcU=",
@@ -751,11 +751,11 @@
"vendorHash": null
},
"integrations_github": {
"hash": "sha256-lP2z7RTaiLvnKQ2nyyUUOV9KjcLAKBDUyIqi0Lv1mqQ=",
"hash": "sha256-OpuKe7/Ymr46J41zgYdk1Qet+trEGTafl6TM23PV1lA=",
"homepage": "https://registry.terraform.io/providers/integrations/github",
"owner": "integrations",
"repo": "terraform-provider-github",
"rev": "v6.12.0",
"rev": "v6.12.1",
"spdx": "MIT",
"vendorHash": "sha256-qzyV/rgQ79XvoTBRjjIsPFfqAXLROiIAlY7Y/d8SYcM="
},
@@ -1202,13 +1202,13 @@
"vendorHash": "sha256-mHf4ZG0hk/YTofuU80sVl1g78P6T+sbBMuPenE8uGQ0="
},
"siderolabs_talos": {
"hash": "sha256-9VL2aa6wZFAfQ/rkfMKwWdDU9Vs6GwZzsvQpUfm7rME=",
"hash": "sha256-/NACmEpodBNx+Q2M9y3JnKpw9a3Y1eFDdTQ+48MXAc8=",
"homepage": "https://registry.terraform.io/providers/siderolabs/talos",
"owner": "siderolabs",
"repo": "terraform-provider-talos",
"rev": "v0.10.1",
"rev": "v0.11.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-i5Qi2rs1NpOlOkM80Uj0GfQRbobp9+6lAgt2iN2uEn0="
"vendorHash": "sha256-AhBeh63wxdrjUW+HJ4a/oRNgMYiAt+cfvoa8De2FyTY="
},
"skytap_skytap": {
"hash": "sha256-JII4czazo6Di2sad1uFHMKDO2gWgZlQE8l/+IRYHQHU=",
@@ -1310,11 +1310,11 @@
"vendorHash": "sha256-omxEb+ntQuHDfS2Rmt0rj0BF0Q2T8DLhobLua2uU/0o="
},
"tencentcloudstack_tencentcloud": {
"hash": "sha256-vngfpLrxer7DQN6Gtapfaw1GMUF2/uGC+xcLvhN5pWI=",
"hash": "sha256-0P8NdAc4X7fpjHHdB7aGw3syOqdOyM6GVhWRLhFShVs=",
"homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud",
"owner": "tencentcloudstack",
"repo": "terraform-provider-tencentcloud",
"rev": "v1.82.89",
"rev": "v1.82.91",
"spdx": "MPL-2.0",
"vendorHash": null
},
+3 -3
View File
@@ -6,17 +6,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "anchor";
version = "1.0.1";
version = "1.0.2";
src = fetchFromGitHub {
owner = "solana-foundation";
repo = "anchor";
tag = "v${finalAttrs.version}";
hash = "sha256-lpLNocNrSWkf/b34PCmUKqFumdo3LcOyGMtN8O2ciEU=";
hash = "sha256-J8q+oNT6x36LlTO/szlkxIcT5oFJ3y8b3YyqwBjDYX8=";
fetchSubmodules = true;
};
cargoHash = "sha256-Nx5g+X9cPL71Gf9J/Zp5u6H8rrbDQW6KqTc/Ti+mzow=";
cargoHash = "sha256-c+xhJas+SnnUshhpLx+C/4SH0uow/QG/1NlAbz9ePDc=";
# Only build the anchor-cli package
cargoBuildFlags = [
+2 -2
View File
@@ -8,13 +8,13 @@
buildGoModule (finalAttrs: {
pname = "asccli";
version = "1.2.5";
version = "1.2.7";
src = fetchFromGitHub {
owner = "rorkai";
repo = "App-Store-Connect-CLI";
tag = "${finalAttrs.version}";
hash = "sha256-9zGLR+lXxR0ku758wmNlglgUYLXa9p/fsZ4p7a7/+E4=";
hash = "sha256-VGXGm7SA26O2BnidbnSJy9r7sdhHi1ekxaiKoqiW9iw=";
};
vendorHash = "sha256-712Q7KiFQyTDjX4Srhukv3eQ84MRjnQxrpgBfqK2xa4=";
+49
View File
@@ -0,0 +1,49 @@
{
lib,
fetchFromGitHub,
rustPlatform,
cmake,
gitMinimal,
versionCheckHook,
nix-update-script,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "aube";
version = "1.8.0";
src = fetchFromGitHub {
owner = "endevco";
repo = "aube";
tag = "v${finalAttrs.version}";
hash = "sha256-GiWg0f1LMGH0yEr97w2+p6CpC9zv4ZmP19gMsBlc+8w=";
};
cargoHash = "sha256-0L8bPxICB816zjZ6k98gg9isHocbb2oSAtDi8o7rG3U=";
nativeBuildInputs = [ cmake ]; # libz-ng-sys
nativeCheckInputs = [ gitMinimal ];
postInstall = ''
rm -f $out/bin/generate-settings-docs
'';
__darwinAllowLocalNetworking = true;
nativeInstallCheckInputs = [ versionCheckHook ];
doInstallCheck = true;
passthru.updateScript = nix-update-script { extraArgs = [ "--use-github-releases" ]; };
__structuredAttrs = true;
meta = {
description = "Fast Node.js package manager";
homepage = "https://github.com/endevco/aube";
changelog = "https://github.com/endevco/aube/blob/v${finalAttrs.version}/CHANGELOG.md";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ chillcicada ];
mainProgram = "aube";
};
})
+3 -3
View File
@@ -10,17 +10,17 @@
}:
buildGoModule (finalAttrs: {
pname = "aws-vault";
version = "7.10.2";
version = "7.10.4";
src = fetchFromGitHub {
owner = "ByteNess";
repo = "aws-vault";
rev = "v${finalAttrs.version}";
hash = "sha256-d8Rk+Qkfv4fcQYt+U/QF1hF+c03dj2dWHRUtuxIi73U=";
hash = "sha256-Feb/GFi5bpfZQcBW7ydNgCXZJZHeu7Iv352i9UwVgE8=";
};
proxyVendor = true;
vendorHash = "sha256-dub/57nE3ERKJEsx5bjTWjJBwIeJcmNSYoG/7iZqe+0=";
vendorHash = "sha256-ogAwkoOw/Toh1JtAjcZHxu2MzzDlv33tfoOYCeV0vN0=";
nativeBuildInputs = [
installShellFiles
+3 -3
View File
@@ -15,17 +15,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "awww";
version = "0.12.0";
version = "0.12.1";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "LGFae";
repo = "awww";
tag = "v${finalAttrs.version}";
hash = "sha256-bvO+gfuUOVUiBEwAJ5A2RjpysPzCfyXD+DM8piOa1+4=";
hash = "sha256-owyQdC2vi0kYC119fzyVQp0J4G0t1n4xXUwryhlBbqA=";
};
cargoHash = "sha256-4ApaMiVqXD4RlyWFMk2wKsyo37FT/OeVly/H88pF7oc=";
cargoHash = "sha256-huw9vzLzXE7eu1ksB6a/SJAtp4xLc2hDb0RHS8O28MY=";
buildInputs = [
lz4
+3 -3
View File
@@ -8,16 +8,16 @@
buildGoModule (finalAttrs: {
pname = "azurehound";
version = "2.12.0";
version = "2.12.1";
src = fetchFromGitHub {
owner = "SpecterOps";
repo = "AzureHound";
tag = "v${finalAttrs.version}";
hash = "sha256-+3h9/R909/Bkxq0Y7oN0xpE6OH8+0Xvs/8X1NBQFrMg=";
hash = "sha256-qJ7mzG1G9ck4xM9dB9rcpojGCAbUoZ8bKZwuZV5bhjA=";
};
vendorHash = "sha256-QCZFIDUL/RbSMrDfQ8L0A6xJPcWJorBXvHhdIA1WK4Q=";
vendorHash = "sha256-WF46wXaNU/Em0KpF6hkuuJ+7K1IKLGqpNS/HxpxX5WY=";
nativeInstallCheckInputs = [ versionCheckHook ];
+10 -1
View File
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
fetchpatch,
installShellFiles,
nixosTests,
}:
@@ -11,12 +12,20 @@ stdenv.mkDerivation (finalAttrs: {
pname = "beanstalkd";
src = fetchFromGitHub {
owner = "kr";
owner = "beanstalkd";
repo = "beanstalkd";
rev = "v${finalAttrs.version}";
hash = "sha256-xoudhPad4diGGE8iZaY1/4LiENlKT2dYcIR6wlQdlTU=";
};
patches = [
# Fix build with GCC 15, remove after next update
(fetchpatch {
url = "https://github.com/beanstalkd/beanstalkd/commit/85070765.patch";
hash = "sha256-QDDypvrQtjlG7iPE0GfvpZMActIw1gRx36+BpZ6WjMw=";
})
];
hardeningDisable = [ "fortify" ];
makeFlags = [ "PREFIX=${placeholder "out"}" ];
+1 -1
View File
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
meta = {
description = "Convenient free open source bilibili live recording tool";
homepage = "https://rec.danmuji.org/";
changelog = "https://github.com/BililiveRecorder/BililiveRecorder/releases/tag/${finalAttrs.version}";
changelog = "https://github.com/BililiveRecorder/BililiveRecorder/releases/tag/v${finalAttrs.version}";
mainProgram = "BililiveRecorder";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ zaldnoay ];
+3 -3
View File
@@ -10,16 +10,16 @@
}:
rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } (finalAttrs: {
pname = "bpftop";
version = "0.8.0";
version = "0.9.0";
src = fetchFromGitHub {
owner = "Netflix";
repo = "bpftop";
tag = "v${finalAttrs.version}";
hash = "sha256-2W00L4JudB7D3IBpY9But+I5erU5+Hf/M2h3jERYObc=";
hash = "sha256-QukcBq80tASPSHRg1yRouYiZqvca+ipp6RGzXqP2CwA=";
};
cargoHash = "sha256-5VzItvqcBzXGAMEY6ZgvJSDkA+fF7ega4NSEaskhL5w=";
cargoHash = "sha256-33VamoVq8O4cgdweWRaDqo5ey2lbLAHoPQVPgmyQwh0=";
buildInputs = [
elfutils
+3 -3
View File
@@ -8,16 +8,16 @@
buildGoModule (finalAttrs: {
pname = "brutespray";
version = "2.6.0";
version = "2.6.1";
src = fetchFromGitHub {
owner = "x90skysn3k";
repo = "brutespray";
tag = "v${finalAttrs.version}";
hash = "sha256-3reINgcdkmtFafliltWnnp/OJq40cBrNPOsFGnHoP7Q=";
hash = "sha256-3CDvsYCiVuWr+Hp2NSzecmHl69Xf9Mcl1umqKW09OlQ=";
};
vendorHash = "sha256-tupN2ammezQ36IA/LsB0pesiEDFbzRq3mXA3X0NjrC8=";
vendorHash = "sha256-odRe6Jd0MIOyahoMfZJgSbv+AHeUUvWLeENaQFmT9R4=";
nativeBuildInputs = [ makeBinaryWrapper ];
+2 -2
View File
@@ -22,7 +22,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "ccache";
version = "4.13.2";
version = "4.13.5";
src = fetchFromGitHub {
owner = "ccache";
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
exit 1
fi
'';
hash = "sha256-6csG4nUscuqaN6juMwICngaKd4CQgC+17tJfMc6aGLI=";
hash = "sha256-v8TgVoLIKhNgcmTLbgqAYuJLUHJEOh/yDVPig/LfPMk=";
};
outputs = [
+3 -3
View File
@@ -12,18 +12,18 @@
stdenv.mkDerivation (finalAttrs: {
pname = "cdk8s-cli";
version = "2.206.7";
version = "2.206.10";
src = fetchFromGitHub {
owner = "cdk8s-team";
repo = "cdk8s-cli";
rev = "v${finalAttrs.version}";
hash = "sha256-DdGowXfYJqCDqsNl+CDD2rqFZoPRJQrnfdfzmRb3W4A=";
hash = "sha256-fSv5TQ+b7ZG7GBkXzeYytuHUqLZCiWHPVPTyLbzB57k=";
};
yarnOfflineCache = fetchYarnDeps {
inherit (finalAttrs) src;
hash = "sha256-I4gcymDvMlP0WcyNafbHvZAAJbN/9Z8+wM7mauFRuM0=";
hash = "sha256-CJ/GKWS4HMINKCo2lNdbVahaGnpNXVV9uNExF6kXeI0=";
};
nativeBuildInputs = [
+2 -2
View File
@@ -6,11 +6,11 @@
}:
let
pname = "chatbox";
version = "1.20.1";
version = "1.20.3";
src = fetchurl {
url = "https://download.chatboxai.app/releases/Chatbox-${version}-x86_64.AppImage";
hash = "sha256-975ythOgMwN0/EbXB9GCxnS0aO4z9NxRpfASborU+As=";
hash = "sha256-m2nCVYa2OGd1vV685+0Z3K6g4LjkHL5edhJ43ENWAZM=";
};
appimageContents = appimageTools.extract { inherit pname version src; };
+2 -2
View File
@@ -6,14 +6,14 @@
python3Packages.buildPythonApplication (finalAttrs: {
pname = "check-jsonschema";
version = "0.37.1";
version = "0.37.2";
pyproject = true;
src = fetchFromGitHub {
owner = "python-jsonschema";
repo = "check-jsonschema";
tag = finalAttrs.version;
hash = "sha256-DbEzK2G5Y/9eZF7oX2xIz7gtQ++Cwe+W26+ByaeHBiA=";
hash = "sha256-Uflc92J8oSl633FD+DDIDGXvrFCfwpyxTqoNHLcHEpE=";
};
build-system = with python3Packages; [ setuptools ];
+2 -2
View File
@@ -6,13 +6,13 @@
buildGoModule (finalAttrs: {
pname = "checkip";
version = "0.53.0";
version = "0.53.1";
src = fetchFromGitHub {
owner = "jreisinger";
repo = "checkip";
tag = "v${finalAttrs.version}";
hash = "sha256-n8TsbuaTsPC8CdWaUshCl4ILYJ6lkqfhFb52RGIl/f0=";
hash = "sha256-z/6r1t6CZI4Q+Xr30u3NZgVLgeB0NCnSH8tSieAOys4=";
};
vendorHash = "sha256-5sUBrzo6wJfaMMvgNflcjB2QNSIeaD2TN7qBao53NFs=";
+2 -2
View File
@@ -33,13 +33,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "chez-scheme";
version = "10.3.0";
version = "10.4.0";
src = fetchFromGitHub {
owner = "cisco";
repo = "ChezScheme";
tag = "v${finalAttrs.version}";
hash = "sha256-5h9W4Tdn8EKEhdecKttLOn8J2OfNp5iaIg017UIk3CI=";
hash = "sha256-eZws5ezk5nCZglVBvdhOGp5CnfwiHTAGPb6+w+BHemk=";
# Vendored nanopass and stex
fetchSubmodules = true;
};
+3 -3
View File
@@ -12,18 +12,18 @@
stdenv.mkDerivation (finalAttrs: {
pname = "commitlint";
version = "20.5.0";
version = "20.5.3";
src = fetchFromGitHub {
owner = "conventional-changelog";
repo = "commitlint";
tag = "v${finalAttrs.version}";
hash = "sha256-AVc3uToQ3hvpesWkhIdYfvawoIJmDW+T5pHonujaL/s=";
hash = "sha256-mdylzB/60wuSmlBpNu96n+mxbkq18AmtUcy4kvMkzEs=";
};
yarnOfflineCache = fetchYarnDeps {
inherit (finalAttrs) src;
hash = "sha256-SOUweX/dvA67E6Vjpq3WLITbh6bevErV0wGZgWQ3U7o=";
hash = "sha256-XHtWaXVCdDuulrQY24/6XvDoqGOFQFSc6COmpIxbPvs=";
};
nativeBuildInputs = [
+2 -2
View File
@@ -5,12 +5,12 @@
}:
stdenv.mkDerivation (finalAttrs: {
version = "2.21.0";
version = "2.22.0";
pname = "commons-io";
src = fetchurl {
url = "mirror://apache/commons/io/binaries/commons-io-${finalAttrs.version}-bin.tar.gz";
hash = "sha256-x2Szn/hbuYWX+8J0ZHV9XAY0L5PQlvtIKpV2MJSic4w=";
hash = "sha256-DQ17WESs+TMizYkp7yG103LZdS8i+XqEkfFrlttoTm8=";
};
installPhase = ''
+3 -3
View File
@@ -6,16 +6,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "complgen";
version = "0.9.0";
version = "0.9.1";
src = fetchFromGitHub {
owner = "adaszko";
repo = "complgen";
tag = "v${finalAttrs.version}";
hash = "sha256-izIPX493EBqDgS58asiwFHF8XMNjVaFpXkOyiBb2688=";
hash = "sha256-qBn3e0SRu+JTNzBNy3pmtRUESXhFBr+V+2Wb2GFZBGY=";
};
cargoHash = "sha256-S1nt28qpgTy3mQN8wh/Nai6H/mq5eR09s7jRgGaFLkA=";
cargoHash = "sha256-1clMiilBCZCU05AgoWkEbwWQV+9WWxgKHuOlbGquY4g=";
meta = {
changelog = "https://github.com/adaszko/complgen/blob/v${finalAttrs.version}/CHANGELOG.md";
+1 -1
View File
@@ -133,7 +133,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
homepage = "https://conan.io";
changelog = "https://github.com/conan-io/conan/releases/tag/${finalAttrs.src.tag}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ HaoZeke ];
maintainers = [ ];
mainProgram = "conan";
};
})
+3 -3
View File
@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cotp";
version = "1.9.9";
version = "1.9.10";
src = fetchFromGitHub {
owner = "replydev";
repo = "cotp";
rev = "v${finalAttrs.version}";
hash = "sha256-P7QeT3q//nmv11i0pELfTCC/wi9jHqbYClqSvvkvqwA=";
hash = "sha256-yVzVo4l2bMZXrWlDfJXSgHUmic7Fe0Og+I5ROv3iQCQ=";
};
cargoHash = "sha256-PhUHFLl0yr/eWy2A+zp+gTNlW+zbruCqQLkHA6Ivf04=";
cargoHash = "sha256-M0lI/DAMUVRMNbvoLc2w7PtU0rjjXiMYZM6vzfdEi0s=";
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libxcb ];
+2 -2
View File
@@ -9,14 +9,14 @@
python3Packages.buildPythonApplication (finalAttrs: {
pname = "cplay-ng";
version = "5.4.0";
version = "5.5.0";
pyproject = true;
src = fetchFromGitHub {
owner = "xi";
repo = "cplay-ng";
tag = finalAttrs.version;
hash = "sha256-ob5wX+Q5XKB/fTYG5phLU61imonpk2A/fk5cg/dfr1Y=";
hash = "sha256-Pc2cneDGNE8EqRi21h/B25jGUZJteXlGxlRgbzcyVKM=";
};
nativeBuildInputs = [ makeWrapper ];
+1 -1
View File
@@ -71,6 +71,6 @@ clangStdenv.mkDerivation rec {
homepage = "https://dseams.info";
license = lib.licenses.gpl3Plus;
platforms = [ "x86_64-linux" ];
maintainers = [ lib.maintainers.HaoZeke ];
maintainers = [ ];
};
}
+2 -2
View File
@@ -6,13 +6,13 @@
buildGoModule (finalAttrs: {
pname = "ddns-go";
version = "6.16.10";
version = "6.17.0";
src = fetchFromGitHub {
owner = "jeessy2";
repo = "ddns-go";
rev = "v${finalAttrs.version}";
hash = "sha256-P9jc3MSMzHWQSi5rqaqAlX5/lgF8cNvvZXnsZ/yo5Fk=";
hash = "sha256-si1+L523iXBhH/Jo7zm0M/zT5d/hrZvDTYS4WMaFdSQ=";
};
vendorHash = "sha256-MbITJ2MxyTNE6LS9rQZ10IVgQuXpmbPf5HQgoy2OuOc=";
+3 -3
View File
@@ -27,15 +27,15 @@ assert lib.assertMsg (lib.elem true [
rustPlatform.buildRustPackage rec {
pname = "diesel-cli";
version = "2.3.8";
version = "2.3.9";
src = fetchCrate {
inherit version;
crateName = "diesel_cli";
hash = "sha256-FpWLktMLgagRDf6cBfZKb2l9kIogooPVlUPien4rGek=";
hash = "sha256-aFve5n38EO7cqfYcb0AIEbOfY+Xs3oXlUIkNJdBxXr4=";
};
cargoHash = "sha256-ivB/iSDu2gzj3KAbK7Pq4DUfSeuc8h4okytuftqoylM=";
cargoHash = "sha256-TAkZLwVaMvopkbh9kPvIhEHckQom+k8rkVNut7a31do=";
nativeBuildInputs = [
installShellFiles
+4 -4
View File
@@ -11,16 +11,16 @@
buildGoModule (finalAttrs: {
pname = "discordo";
version = "0-unstable-2026-04-23";
version = "0-unstable-2026-04-30";
src = fetchFromGitHub {
owner = "ayn2op";
repo = "discordo";
rev = "eaaf87c76d23288cc3b162fa41974b8ee1157177";
hash = "sha256-G2UuoHMMoPoJ57kRrwN9cqQNfEdhRJra5okXEKR12Aw=";
rev = "be527a152b209b302d506d9cafbf2870f0145d58";
hash = "sha256-v3u46r6BlpP0rkahTkaT0h+hCKDe2VaV029Apqt8Zws=";
};
vendorHash = "sha256-I4LFqFSxqwSzZ4uCGGeYbc3oqoNi07xbkFKe4TmP04o=";
vendorHash = "sha256-URBaO9wjCWIoOtux1xYCX/y/6+hKPS6ZEm9HDznKqHs=";
env.CGO_ENABLED = 1;
+2 -2
View File
@@ -6,13 +6,13 @@
buildGoModule (finalAttrs: {
pname = "dnsproxy";
version = "0.81.2";
version = "0.81.3";
src = fetchFromGitHub {
owner = "AdguardTeam";
repo = "dnsproxy";
tag = "v${finalAttrs.version}";
hash = "sha256-YjiLhfwuwuGvefySCi+eWSBj4hIOQTy4vGSifFcPDcA=";
hash = "sha256-HEjwO9iKNKQj7XIJ7Me0Nt9H9AP6AVgm4Ox8VcfVgyQ=";
};
vendorHash = "sha256-liX+AMxVBkxJSv1Ltt924Hjf10fho4G6tyt82tkzWZA=";
+3 -3
View File
@@ -9,15 +9,15 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "doh-proxy-rust";
version = "0.9.15";
version = "0.9.16";
src = fetchCrate {
inherit (finalAttrs) version;
crateName = "doh-proxy";
hash = "sha256-uqFqDaq5a9wW46pTLfVN+5WuyYGvm3ZYQCtC6jkG1kg=";
hash = "sha256-V/mWMKBsCStQovgvMtRP66+OsNF2TC0GarYY51C/Zik=";
};
cargoHash = "sha256-eYhax+TM3N75qj0tyHioUeUt159ZfkuFFIZK1jUbojw=";
cargoHash = "sha256-daXXjD789tJBph00FPlm2C5gW3jwcTTAZ5TVeDJz8lU=";
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
libiconv
+3 -3
View File
@@ -8,16 +8,16 @@
buildGoModule (finalAttrs: {
pname = "dyff";
version = "1.11.4";
version = "1.12.0";
src = fetchFromGitHub {
owner = "homeport";
repo = "dyff";
rev = "v${finalAttrs.version}";
sha256 = "sha256-ca7mNC5QVAZIfxHBAkIffBiuQa6VKNObO5XTnoR1i0k=";
sha256 = "sha256-4d6FP6k1atqCRw4rB1l1N9x8G1MFJiNCfyun85KY4FI=";
};
vendorHash = "sha256-XGEe7uunEWmiOTWF7sOBDNh3GZ2f1pCvm8HTyS+gOWY=";
vendorHash = "sha256-NJ/ekcYUT2DUdQygg41tnPRMWtZwNGrZDxbsp2tih9w=";
subPackages = [
"cmd/dyff"
+7 -9
View File
@@ -2,9 +2,10 @@
lib,
stdenvNoCC,
fetchzip,
installFonts,
}:
stdenvNoCC.mkDerivation rec {
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "encode-sans";
version = "1.002";
@@ -13,13 +14,10 @@ stdenvNoCC.mkDerivation rec {
hash = "sha256-TPAUc5msAUgJZHibjgYaS2TOuzKFy0rje9ZQTXE6s+w=";
};
installPhase = ''
runHook preInstall
nativeBuildInputs = [ installFonts ];
install -Dm644 *.ttf -t $out/share/fonts/truetype
install -Dm644 README.md FONTLOG.txt -t $out/share/doc/${pname}-${version}
runHook postInstall
postInstall = ''
install -Dm644 README.md FONTLOG.txt -t $out/share/doc/${finalAttrs.pname}-${finalAttrs.version}
'';
meta = {
@@ -34,7 +32,7 @@ stdenvNoCC.mkDerivation rec {
'';
homepage = "https://github.com/impallari/Encode-Sans";
license = lib.licenses.ofl;
maintainers = [ ];
maintainers = with lib.maintainers; [ pancaek ];
platforms = lib.platforms.all;
};
}
})
@@ -9,16 +9,16 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "encrypted-dns-server";
version = "0.9.19";
version = "0.9.20";
src = fetchFromGitHub {
owner = "DNSCrypt";
repo = "encrypted-dns-server";
tag = finalAttrs.version;
hash = "sha256-c1QamH+MiB4uDbRQx/uzh8HNyQ9npBeMUprM4V8VKLo=";
hash = "sha256-tyNyIgfOVTSuDiBUILdcNsHt0aRcn7cxiS0CND6FUS4=";
};
cargoHash = "sha256-io8ejF7ShSDJVadp7cPdkCfZy/mv0v4wwuvrCtkxnTE=";
cargoHash = "sha256-u8u6doAf8PjkaVqZN2JCdp6wXjilGGzlloePH0DNrt4=";
nativeBuildInputs = [ pkg-config ];
@@ -0,0 +1,37 @@
From 3635c26d6d5ec08b197c4903ed46a3221e574899 Mon Sep 17 00:00:00 2001
From: Lukas Sabota <lukas@lwsabota.com>
Date: Sun, 19 Apr 2026 13:05:51 -0400
Subject: [PATCH] cmake: fix qt6 build on linux
---
src/CMakeLists.txt | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7a432669..16386a70 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -47,8 +47,6 @@ if ( ${QT} EQUAL 6 )
find_package( Qt6 COMPONENTS Help QUIET)
find_package( Qt6 COMPONENTS Qml)
find_package( Qt6 COMPONENTS UiTools)
- add_definitions( ${Qt6Widgets_DEFINITIONS} ${Qt6Qml_DEFINITIONS} ${Qt6Network_DEFINITIONS} ${Qt6Help_DEFINITIONS} ${Qt6OpenGLWidgets_DEFINITIONS} )
- # add_definitions(${Qt6UiTools_DEFINITIONS}) # Leave ${Qt6UiTools_DEFINITIONS} out as this is causing a build error
include_directories( ${Qt6Widgets_INCLUDE_DIRS} ${Qt6Qml_INCLUDE_DIRS} ${Qt6UiTools_INCLUDE_DIRS} ${Qt6Network_INCLUDE_DIRS} ${Qt6Help_INCLUDE_DIRS} ${Qt6OpenGLWidgets_INCLUDE_DIRS} )
if (${Qt6Help_FOUND})
@@ -757,6 +755,11 @@ target_link_libraries( ${APP_NAME}
${SYS_LIBS}
)
+if(NOT MSVC)
+ # Add minizip subdirectory so #include<unzip.h> works without the "minizip" subdirectory in the directive
+ target_include_directories(${APP_NAME} PRIVATE ${MINIZIP_INCLUDE_DIRS}/minizip)
+endif()
+
if (WIN32)
# target_link_libraries( ${APP_NAME} wsock32 ws2_32 )
--
2.51.2
@@ -1,39 +0,0 @@
From 8c648b4a68e5ebadb4d0f08728e44078954cebae Mon Sep 17 00:00:00 2001
From: kuflierl <41301536+kuflierl@users.noreply.github.com>
Date: Fri, 27 Mar 2026 01:28:17 +0100
Subject: [PATCH] fix: build with minizip 1.3.2
---
src/drivers/Qt/AboutWindow.cpp | 2 +-
src/drivers/Qt/fceuWrapper.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/drivers/Qt/AboutWindow.cpp b/src/drivers/Qt/AboutWindow.cpp
index 025cf360..5638a3c1 100644
--- a/src/drivers/Qt/AboutWindow.cpp
+++ b/src/drivers/Qt/AboutWindow.cpp
@@ -23,7 +23,7 @@
#include <stdlib.h>
#include <string.h>
#include <string>
-#include <unzip.h>
+#include <minizip/unzip.h>
#ifdef _S9XLUA_H
#include <lua.h>
diff --git a/src/drivers/Qt/fceuWrapper.cpp b/src/drivers/Qt/fceuWrapper.cpp
index 8d241258..5e48eaf7 100644
--- a/src/drivers/Qt/fceuWrapper.cpp
+++ b/src/drivers/Qt/fceuWrapper.cpp
@@ -23,7 +23,7 @@
#include <stdlib.h>
#include <stdint.h>
#include <limits.h>
-#include <unzip.h>
+#include <minizip/unzip.h>
#include <QFileInfo>
#include <QStyleFactory>
--
2.51.2
+6 -5
View File
@@ -31,17 +31,18 @@ assert lib.elem ___qtVersion [
];
stdenv.mkDerivation (finalAttrs: {
pname = "fceux";
version = "2.6.6-unstable-2025-01-20";
version = "2.6.6-unstable-2026-04-13";
src = fetchFromGitHub {
owner = "TASEmulators";
repo = "fceux";
rev = "2b8f6e76271341616920bb7e0c54ee48570783d3";
hash = "sha256-2QDiAk2HO9oQ1gNvc7QFZSCbWkCDYW5OJWT8f4bmXyg=";
rev = "1e1168db6662ce86848460b5d078e17c6dc6e2ce";
hash = "sha256-FHNMDvEMgKnZjpm0DEN2rj0aI3T244zfcS+NEYWytaU=";
};
patches = [
./0001-fix-build-with-minizip-1.3.2.patch
# https://github.com/TASEmulators/fceux/pull/834
./0001-cmake-fix-qt6-build-on-linux.patch
];
nativeBuildInputs = [
@@ -76,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
changelog = "https://github.com/TASEmulators/fceux/blob/${finalAttrs.src.rev}/changelog.txt";
license = with lib.licenses; [ gpl2Plus ];
mainProgram = "fceux";
maintainers = with lib.maintainers; [ sbruder ];
maintainers = with lib.maintainers; [ kuflierl ];
platforms = lib.platforms.linux;
};
})
+2 -2
View File
@@ -9,13 +9,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "fdkaac";
version = "1.0.6";
version = "1.0.7";
src = fetchFromGitHub {
owner = "nu774";
repo = "fdkaac";
rev = "v${finalAttrs.version}";
hash = "sha256-nVVeYk7t4+n/BsOKs744stsvgJd+zNnbASk3bAgFTpk=";
hash = "sha256-Yx+adbWs1qmuK+geHjCj7i56URDLVrUdLbJ2gKrJ1Oo=";
};
nativeBuildInputs = [
+2 -2
View File
@@ -6,11 +6,11 @@
let
pname = "fluent-reader";
version = "1.2.1";
version = "1.2.2";
src = fetchurl {
url = "https://github.com/yang991178/fluent-reader/releases/download/v${version}/Fluent.Reader.${version}.AppImage";
hash = "sha256-83bqDyiPcAKIEejIPLSVLb8hxAtNogF98nYbOCjZtsg=";
hash = "sha256-AJxE1X6X/KJg/6xWZQJyvgHj9TabFBk2TQdotDs4iWQ=";
};
appimageContents = appimageTools.extractType2 { inherit pname version src; };
+4 -3
View File
@@ -9,16 +9,16 @@
}:
buildGoModule (finalAttrs: {
pname = "fluxcd-operator";
version = "0.40.0";
version = "0.48.0";
src = fetchFromGitHub {
owner = "controlplaneio-fluxcd";
repo = "fluxcd-operator";
tag = "v${finalAttrs.version}";
hash = "sha256-31C+QsuXTQEPUKe3h/u52RXF9FxHidQxIZkrhLvOcuU=";
hash = "sha256-Ggx38aF9o7dMFcQxYbx5hSXCE2oRRTgvUvXCAJJN6V8=";
};
vendorHash = "sha256-pbEdlq1qOKuxRqLTY4NE/+yfjph8PKcsJOiRc/Tw+Og=";
vendorHash = "sha256-xG4mJQfww/pMIg9zK2XpDw7XGCLHvJPXLvBspdSRAcg=";
ldflags = [
"-s"
@@ -61,6 +61,7 @@ buildGoModule (finalAttrs: {
license = lib.licenses.agpl3Only;
maintainers = with lib.maintainers; [
mattfield
stealthybox
];
mainProgram = "flux-operator";
};
+2 -2
View File
@@ -8,13 +8,13 @@
buildGoModule (finalAttrs: {
pname = "forgejo-mcp";
version = "2.18.0";
version = "2.19.0";
src = fetchFromCodeberg {
owner = "goern";
repo = "forgejo-mcp";
tag = "v${finalAttrs.version}";
hash = "sha256-KWNRQJHW9+21+azIKjO2ryAPEDS7Ka0BuFnCFIko+FY=";
hash = "sha256-5bFqM2SGKexB9DvS6NYeuRZ/xiPGQcKgKf8Il62y09Q=";
};
vendorHash = "sha256-5CV4drUaYKtZ/RoydAatblhsqU8VWYzYByjhcb9KZVY=";
+4 -4
View File
@@ -16,17 +16,17 @@
buildGoModule (finalAttrs: {
pname = "fyne";
# This is the current latest version
# version "1.26.1" was a typo of "1.7.0" - maybe, don't "upgrade" to it
version = "1.7.0";
# version "1.26.1" was a typo of "1.7.1" - maybe, don't "upgrade" to it
version = "1.7.1";
src = fetchFromGitHub {
owner = "fyne-io";
repo = "tools";
rev = "v${finalAttrs.version}";
hash = "sha256-x2OfiFn5VHE3OrlfSMUQY1mckdnCcDpq1vqLmRi6yAg=";
hash = "sha256-NmO0AtD2lJMBOnlgFm6dXRp6NWMuyAIlckYLHugeJ1Q=";
};
vendorHash = "sha256-J5JxKN0i5nbLTBgwZ5HJPFiqHd7yvP+YkyvPteD2xF0=";
vendorHash = "sha256-pTVl9NMqoLqRYrNFWSoagpELwbsW7t5kHYo+fEFQie0=";
nativeBuildInputs = [ pkg-config ];
+1 -1
View File
@@ -76,6 +76,6 @@ stdenv.mkDerivation {
license = lib.licenses.mit;
platforms = lib.platforms.linux;
mainProgram = "gf2";
maintainers = with lib.maintainers; [ _0xd61 ];
maintainers = [ ];
};
}
+3 -3
View File
@@ -6,13 +6,13 @@
buildGoModule (finalAttrs: {
pname = "gh-poi";
version = "0.17.0";
version = "0.17.1";
src = fetchFromGitHub {
owner = "seachicken";
repo = "gh-poi";
rev = "v${finalAttrs.version}";
hash = "sha256-GFJWZBVRE6tz033NI5zcJIs3ziVa1KoPggKn/o65mDE=";
hash = "sha256-sDir+/b2NmHkROx4gf9OwKpLjZCgkUmaj7IdQDIllsk=";
};
ldflags = [
@@ -23,7 +23,7 @@ buildGoModule (finalAttrs: {
vendorHash = "sha256-o3ys+Em27sx3VS3AQIP7G/tWRiBlPnvBq37jLtj9QVQ=";
# Skip checks because some of test suites require fixture.
# See: https://github.com/seachicken/gh-poi/blob/v0.17.0/.github/workflows/contract-test.yml#L28-L29
# See: https://github.com/seachicken/gh-poi/blob/v0.17.1/.github/workflows/contract-test.yml#L28-L29
doCheck = false;
meta = {
+3 -3
View File
@@ -7,16 +7,16 @@
}:
buildGoModule rec {
pname = "git-pkgs";
version = "0.15.3";
version = "0.15.4";
src = fetchFromGitHub {
owner = "git-pkgs";
repo = "git-pkgs";
tag = "v${version}";
hash = "sha256-VYITWQfinKxDjShApjoN7h8JKbyW8ft09e6TSYtdjT8=";
hash = "sha256-/egkYzrRtYy94fRDDEsFFTj+c0yorm8REaqedQSJyEw=";
};
vendorHash = "sha256-0QddQURXTZV/nKhARA7PVu61Mr/VZojf5mrvZvd7uWQ=";
vendorHash = "sha256-eVa2tNLy2Oul1Uqq5Bf1arvjvH9ic24rc6NBDPu1gvk=";
subPackages = [ "." ];
+3 -3
View File
@@ -10,15 +10,15 @@
buildGoModule (finalAttrs: {
pname = "gitsign";
version = "0.14.0";
version = "0.15.0";
src = fetchFromGitHub {
owner = "sigstore";
repo = "gitsign";
rev = "v${finalAttrs.version}";
hash = "sha256-jqWMZATeimmgyb0yD5dzp9h31c9RaClpH2cA+bvhxpg=";
hash = "sha256-oY4My+ZmkGWsVL031A01qZGJPSEQURrqFC8qH9WcUiw=";
};
vendorHash = "sha256-NZvJGexfCjxCQI8R/thv0Z2PaMNSkkGmyPUFJyYxdgM=";
vendorHash = "sha256-fjrdQZVXgBvdKQFnmjtLShBHsKNIp5Y/uW7aU2cP1aY=";
subPackages = [
"."
+72
View File
@@ -0,0 +1,72 @@
{
lib,
rustPlatform,
stdenvNoCC,
fetchFromGitHub,
pkg-config,
openssl,
libgit2,
libssh2,
gitMinimal,
versionCheckHook,
nix-update-script,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "gittype";
version = "0.10.0";
src = fetchFromGitHub {
owner = "unhappychoice";
repo = "gittype";
tag = "v${finalAttrs.version}";
hash = "sha256-pzJWXVCGUn85OCHMRlMY5ufrGyJyuhhkYLUk4e01Ri0=";
};
cargoHash = "sha256-E1LKaiTClHmrF7zhGEj1rfELKryIiyVKIf/8Rozm1RQ=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [
openssl
libgit2
libssh2
];
env = {
OPENSSL_NO_VENDOR = 1;
LIBGIT2_NO_VENDOR = 1;
LIBSSH2_SYS_USE_PKG_CONFIG = 1;
};
nativeCheckInputs = [ gitMinimal ];
checkFlags = [
"--skip=unit::domain::services::challenge_generator::challenge_generator_tests::"
]
++ lib.optionals stdenvNoCC.hostPlatform.isDarwin [
"--skip=unit::domain::services::scoring::tracker::stage::test_pause_resume"
"--skip=unit::domain::services::scoring::calculator::stage::test_calculate_with_pauses"
"--skip=unit::domain::services::scoring::calculator::stage::test_pause_resume"
];
nativeInstallCheckInputs = [ versionCheckHook ];
versionCheckProgramArg = "--version";
doInstallCheck = true;
__structuredAttrs = true;
passthru.updateScript = nix-update-script { };
meta = {
description = "CLI code-typing game that turns your source code into typing challenges";
homepage = "https://github.com/unhappychoice/gittype";
changelog = "https://github.com/unhappychoice/gittype/releases/tag/${finalAttrs.src.tag}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ chillcicada ];
mainProgram = "gittype";
# corrupted size vs. prev_size
# error: test failed, to rerun pass `--test mod`
broken = stdenvNoCC.hostPlatform.isAarch64 && stdenvNoCC.hostPlatform.isLinux;
};
})
+2 -2
View File
@@ -8,13 +8,13 @@
buildGoModule (finalAttrs: {
pname = "glooctl";
version = "1.21.3";
version = "1.21.4";
src = fetchFromGitHub {
owner = "solo-io";
repo = "gloo";
rev = "v${finalAttrs.version}";
hash = "sha256-JAubNKBcXrNsqv7mcN8I8KYQAyj6KvjbKnr9LKG2wsg=";
hash = "sha256-cG3WKpvIanWneBYw98nprbmoTHaFbdRopJ4p5oaJkyU=";
};
vendorHash = "sha256-8iRotQm41EcqjHUK92wpNFcq/ODDbhAhcKSxSRFmGrA=";
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule (finalAttrs: {
pname = "go-dnscollector";
version = "2.2.2";
version = "2.2.3";
src = fetchFromGitHub {
owner = "dmachard";
repo = "go-dnscollector";
tag = "v${finalAttrs.version}";
hash = "sha256-Vqru5JK3QCz1ij08ezuJgozhJaEplp92c2jBOiijB+M=";
hash = "sha256-hqSfL3R0fp7uYBGoD1Wu0ZNLq1VnOvcN0n8zzfRXTfA=";
};
vendorHash = "sha256-wyfbxdmF3OeWgZ9IeiCyo9PZFnSfnCmlZXM5/1Jq38w=";
vendorHash = "sha256-i1Ogo5zRYaEgiYMMTUjI2WiL2gABw2r31/WslXLzowI=";
subPackages = [ "." ];
+2 -2
View File
@@ -5,13 +5,13 @@
}:
buildGoModule (finalAttrs: {
pname = "go-grip";
version = "0.9.1";
version = "0.9.2";
src = fetchFromGitHub {
owner = "chrishrb";
repo = "go-grip";
tag = "v${finalAttrs.version}";
hash = "sha256-uDDzkkCX/tUKRCJYt/3Qsh4qObaCNaW9I801jQphM4A=";
hash = "sha256-O3f7kLlcWfpxZb2mw+nNjmsGX4YiuzIfN5e6KE+CJDs=";
};
vendorHash = "sha256-QsLiCsFY6nI85jsEZtAgmObEKpBSZWhzZk+TlukM8JU=";
@@ -7,18 +7,18 @@
buildGoModule (finalAttrs: {
pname = "google-alloydb-auth-proxy";
version = "1.14.2";
version = "1.14.3";
src = fetchFromGitHub {
owner = "GoogleCloudPlatform";
repo = "alloydb-auth-proxy";
tag = "v${finalAttrs.version}";
hash = "sha256-0EfEnpBUpvP+9OfMMn29GDWusO8+L6U5AUNCfEmWEow=";
hash = "sha256-QIM5KkDBU24tLRAXH+vxzauT0QCX7BALe+/MXWfNcwE=";
};
subPackages = [ "." ];
vendorHash = "sha256-AgFQzqoDTI488bZtxVlajxVSc697sJY3kMOhyNVMUuA=";
vendorHash = "sha256-BFou5CoJYdVBylVVn5aRV0D4jv9967/GwrLTfDpqU1E=";
checkFlags = [
"-short"
+1 -1
View File
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
meta = {
description = "GUI application for removing noise (hiss, pops and clicks) from audio files";
homepage = "https://github.com/AlisterH/gwc/";
changelog = "https://github.com/AlisterH/gwc/blob/${finalAttrs.version}/Changelog";
changelog = "https://github.com/AlisterH/gwc/blob/${finalAttrs.version}/ChangeLog";
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ magnetophon ];
platforms = lib.platforms.linux;
@@ -0,0 +1,53 @@
{
buildNpmPackage,
headlamp-server,
}:
buildNpmPackage {
pname = "headlamp-frontend";
inherit (headlamp-server) version src;
strictDeps = true;
__structuredAttrs = true;
sourceRoot = "${headlamp-server.src.name}/frontend";
npmDepsHash = "sha256-cjar6j5Wzh5monp9YxrsrnGDxgjlT+YRFh5mgZcImKI=";
postPatch = ''
chmod -R u+w ../app
cp ${headlamp-server.src}/app/package.json ../app/package.json
substituteInPlace package.json --replace-fail '"prebuild": "npm run make-version",' ""
'';
preBuild = ''
cat > .env <<EOF
REACT_APP_HEADLAMP_VERSION=${headlamp-server.version}
REACT_APP_HEADLAMP_GIT_VERSION=v${headlamp-server.version}
REACT_APP_HEADLAMP_PRODUCT_NAME=Headlamp
REACT_APP_ENABLE_REACT_QUERY_DEVTOOLS=false
REACT_APP_HEADLAMP_SIDEBAR_DEFAULT_OPEN=true
EOF
'';
env = {
PUBLIC_URL = "./";
NODE_OPTIONS = "--max-old-space-size=8096";
};
installPhase = ''
runHook preInstall
cp -r build $out
runHook postInstall
'';
meta = {
inherit (headlamp-server.meta)
description
homepage
changelog
license
maintainers
;
};
}
@@ -0,0 +1,49 @@
{
lib,
buildGoModule,
fetchFromGitHub,
}:
buildGoModule rec {
pname = "headlamp-server";
version = "0.41.0";
strictDeps = true;
__structuredAttrs = true;
src = fetchFromGitHub {
owner = "kubernetes-sigs";
repo = "headlamp";
tag = "v${version}";
hash = "sha256-ZXyE4oPkwimnU2ArOiTCnLxzaI5z/7T/SHS9aqP2DGM=";
};
modRoot = "backend";
vendorHash = "sha256-JjfB93C97yTbUTUbs7wEB/iFtuRzHzFXGyRHDAec7X8=";
# Don't embed frontend - Electron serves it directly. This also prevents
# the server from auto-opening a browser window.
ldflags = [
"-s"
"-w"
"-X github.com/kubernetes-sigs/headlamp/backend/pkg/kubeconfig.Version=${version}"
"-X github.com/kubernetes-sigs/headlamp/backend/pkg/kubeconfig.AppName=Headlamp"
];
subPackages = [ "cmd" ];
postInstall = ''
mv $out/bin/cmd $out/bin/headlamp-server
'';
meta = {
description = "An easy-to-use and extensible Kubernetes web UI";
homepage = "https://headlamp.dev";
changelog = "https://github.com/kubernetes-sigs/headlamp/releases/tag/v${version}";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ dylanmtaylor ];
mainProgram = "headlamp-server";
};
}
+118
View File
@@ -0,0 +1,118 @@
{
buildNpmPackage,
headlamp-server,
headlamp-frontend,
electron,
makeWrapper,
makeDesktopItem,
copyDesktopItems,
}:
buildNpmPackage {
pname = "headlamp";
inherit (headlamp-server) version src;
strictDeps = true;
__structuredAttrs = true;
sourceRoot = "${headlamp-server.src.name}/app";
npmDepsHash = "sha256-FcV2ORs96Rj/OyCbBCBo/ZmcwvjDLPKkn0i4m+0gXIE=";
env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
postPatch = ''
chmod u+w ..
'';
npmBuildScript = "compile-electron";
nativeBuildInputs = [
makeWrapper
copyDesktopItems
];
desktopItems = [
(makeDesktopItem {
name = "headlamp";
desktopName = "Headlamp";
comment = "An easy-to-use and extensible Kubernetes web UI";
exec = "headlamp";
icon = "headlamp";
categories = [
"Network"
"System"
];
startupWMClass = "Headlamp";
})
];
installPhase = ''
runHook preInstall
# Electron app
install -Dt $out/lib/headlamp/app package.json
install -Dt $out/lib/headlamp/app/build build/main.js build/preload.js
# Production dependencies only
npm prune --omit=dev
rm -rf node_modules/.bin
cp -r node_modules $out/lib/headlamp/app/
# Resources directory (where process.resourcesPath should point)
mkdir -p $out/lib/headlamp/resources
cp -r ${headlamp-frontend} $out/lib/headlamp/resources/frontend
chmod -R u+w $out/lib/headlamp/resources/frontend
ln -s ${headlamp-server}/bin/headlamp-server $out/lib/headlamp/resources/headlamp-server
mkdir -p $out/lib/headlamp/resources/.plugins
cp ${headlamp-server.src}/app/app-build-manifest.json $out/lib/headlamp/resources/
# i18n locales
mkdir -p $out/lib/headlamp/resources/frontend/i18n
cp -r ${headlamp-server.src}/frontend/src/i18n/locales $out/lib/headlamp/resources/frontend/i18n/locales
# Entry point that sets process.resourcesPath before loading the real main
cat > $out/lib/headlamp/app/main.js <<ENTRY
const path = require('path');
const { app } = require('electron');
const resourcesPath = path.resolve(__dirname, '..', 'resources');
Object.defineProperty(process, 'resourcesPath', {
get: () => resourcesPath,
configurable: false,
});
app.setVersion('${headlamp-server.version}');
app.setName('Headlamp');
require('./build/main.js');
ENTRY
# Point package.json main at our wrapper
substituteInPlace $out/lib/headlamp/app/package.json \
--replace-fail '"main": "build/main.js"' '"main": "main.js"'
# Icons
for size in 16 32; do
mkdir -p $out/share/icons/hicolor/''${size}x''${size}/apps
cp ${headlamp-server.src}/frontend/public/favicon-''${size}x''${size}.png $out/share/icons/hicolor/''${size}x''${size}/apps/headlamp.png
done
mkdir -p $out/share/icons/hicolor/192x192/apps
cp ${headlamp-server.src}/frontend/public/android-chrome-192x192.png $out/share/icons/hicolor/192x192/apps/headlamp.png
mkdir -p $out/share/icons/hicolor/512x512/apps
cp ${headlamp-server.src}/frontend/public/android-chrome-512x512.png $out/share/icons/hicolor/512x512/apps/headlamp.png
# Wrapper
mkdir -p $out/bin
makeWrapper ${electron}/bin/electron $out/bin/headlamp \
--add-flags $out/lib/headlamp/app \
--prefix PATH : ${headlamp-server}/bin
runHook postInstall
'';
passthru = {
frontend = headlamp-frontend;
};
meta = headlamp-server.meta // {
mainProgram = "headlamp";
};
}
+3 -3
View File
@@ -10,16 +10,16 @@
buildGoModule (finalAttrs: {
pname = "helmfile";
version = "1.4.4";
version = "1.4.5";
src = fetchFromGitHub {
owner = "helmfile";
repo = "helmfile";
rev = "v${finalAttrs.version}";
hash = "sha256-pKVybLbXihoyUR567JKkUoT79q5vtet1yoCaUcM2b8g=";
hash = "sha256-SSJYxrIfHDt99e1D85GSZB4acVSTkqJgs0Itcc6OXJc=";
};
vendorHash = "sha256-d98aK0mkN0pboxCryOI3bmky927MrrAmifJnsjA4EEE=";
vendorHash = "sha256-8JEKAiEwkzjFzoMVyPd2Wmpt/Fjh+j9ocmIn5cQBVqE=";
proxyVendor = true; # darwin/linux hash mismatch
-1
View File
@@ -61,7 +61,6 @@ stdenv.mkDerivation (finalAttrs: {
license = lib.licenses.gpl3Only;
mainProgram = "httpdirfs";
maintainers = with lib.maintainers; [
sbruder
schnusch
anthonyroussel
];
-48
View File
@@ -1,48 +0,0 @@
{
lib,
stdenv,
fetchFromGitHub,
autoreconfHook,
openssl,
}:
stdenv.mkDerivation {
pname = "httperf";
version = "0.9.1";
src = fetchFromGitHub {
repo = "httperf";
owner = "httperf";
rev = "3209c7f9b15069d4b79079e03bafba5b444569ff";
sha256 = "0p48z9bcpdjq3nsarl26f0xbxmqgw42k5qmfy8wv5bcrz6b3na42";
};
nativeBuildInputs = [ autoreconfHook ];
propagatedBuildInputs = [ openssl ];
configurePhase = ''
runHook preConfigure
autoreconf -i
mkdir -pv build
cd build
../configure
runHook postConfigure
'';
installPhase = ''
mkdir -vp $out/bin
mv -v src/httperf $out/bin
'';
meta = {
description = "HTTP load generator";
homepage = "https://github.com/httperf/httperf";
maintainers = [ ];
license = lib.licenses.gpl2Plus;
platforms = lib.platforms.all;
mainProgram = "httperf";
};
}
+2 -2
View File
@@ -11,12 +11,12 @@
buildGoModule (finalAttrs: {
pname = "imgproxy";
version = "3.31.2";
version = "3.31.3";
src = fetchFromGitHub {
owner = "imgproxy";
repo = "imgproxy";
hash = "sha256-gKSSdBtmCSiiBPon3Fj+TGyGSITND5C+hUW9xdjJPZs=";
hash = "sha256-sfxHtg6vpMuUeMA8/mh+x6Mrn3tzGYBsggAS6IhTpKo=";
rev = "v${finalAttrs.version}";
};
@@ -6,13 +6,13 @@
}:
buildGoModule (finalAttrs: {
pname = "infrastructure-agent";
version = "1.74.1";
version = "1.74.2";
src = fetchFromGitHub {
owner = "newrelic";
repo = "infrastructure-agent";
rev = finalAttrs.version;
hash = "sha256-btvhrVt6xU1IMEyjs873EeErtRKzoD/PvfTRHzBw0UI=";
hash = "sha256-8viB1wHkoPF1WSEcfay3KHGgakW6coCP4jHtJTGFAAs=";
};
vendorHash = "sha256-xkoNVXRm8OkVd2f3cSFE1QIF6EHhh8AQh/YZYt22+MU=";
-1
View File
@@ -141,7 +141,6 @@ crystal.buildCrystalPackage rec {
maintainers = with lib.maintainers; [
_999eagle
GaetanLepage
sbruder
];
};
}
-37
View File
@@ -1,37 +0,0 @@
{
lib,
stdenv,
fetchurl,
pkg-config,
libbsd,
microsoft-gsl,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "iqueue";
version = "0.1.0";
src = fetchurl {
url = "https://github.com/twosigma/iqueue/releases/download/v${finalAttrs.version}/iqueue-${finalAttrs.version}.tar.gz";
sha256 = "0049fnr02k15gr21adav33swrwxrpbananilnrp63vp5zs5v9m4x";
};
doCheck = true;
nativeBuildInputs = [ pkg-config ];
buildInputs = [
libbsd
microsoft-gsl
];
env.NIX_CFLAGS_COMPILE = toString [
# Needed with GCC 12
"-Wno-error=array-parameter"
"-Wno-error=misleading-indentation"
];
meta = {
homepage = "https://github.com/twosigma/iqueue";
description = "Indexed queue";
license = lib.licenses.asl20;
platforms = [ "x86_64-linux" ];
};
})
+2 -2
View File
@@ -11,14 +11,14 @@
python3Packages.buildPythonApplication (finalAttrs: {
pname = "jj-pre-push";
version = "0.4.0";
version = "0.4.4";
pyproject = true;
src = fetchFromGitHub {
owner = "acarapetis";
repo = "jj-pre-push";
tag = "v${finalAttrs.version}";
hash = "sha256-LULCTpsxTflqWm5ZVFHbnTI/2+4xI9MX4kbAtYzBIAI=";
hash = "sha256-TekLYlx2b+gcf0UzLOqWv2VtwS6etE/uPBQwc99z1Lw=";
};
postPatch = ''
+2 -2
View File
@@ -9,13 +9,13 @@
buildGoModule rec {
pname = "jx";
version = "3.16.71";
version = "3.17.0";
src = fetchFromGitHub {
owner = "jenkins-x";
repo = "jx";
rev = "v${version}";
sha256 = "sha256-Yc7I5gh9SRXwmKIjuWPK3/cs+rnQ3Nhr1OruIcSu5Vo=";
sha256 = "sha256-lQE3caEXPXL9QQDsItOExxBTdqrJQR9x6UcyA2/f+T4=";
};
vendorHash = "sha256-1ErjD+1MdbKN4EPaQX0jxNzoN9dB8beH1csdx1IPKl8=";
+2 -2
View File
@@ -11,13 +11,13 @@
buildGoModule (finalAttrs: {
pname = "kaniko";
version = "1.25.13";
version = "1.25.14";
src = fetchFromGitHub {
owner = "chainguard-dev";
repo = "kaniko";
rev = "v${finalAttrs.version}";
hash = "sha256-5Cz6RVoG4HBSpVLux1AKRQt64VzXdGDNG5WvJEDPxUo=";
hash = "sha256-V6kIEuHYHV3XfuW7Jd/XmPy0XQX449rMH5YxbTtCvZo=";
};
vendorHash = null;
+2 -2
View File
@@ -7,13 +7,13 @@
buildGoModule (finalAttrs: {
pname = "koffan";
version = "2.10.0";
version = "2.11.0";
src = fetchFromGitHub {
owner = "PanSalut";
repo = "Koffan";
tag = "v${finalAttrs.version}";
hash = "sha256-euGjcluk2xC+RgryFscP29ONT2prqR0/UxeqMosb2l4=";
hash = "sha256-TaZ65WE6EfrENpB/c3oTDgMEsnBkiEt62B4jDEWCf98=";
};
vendorHash = "sha256-BYehi5LQQ0MIsKG/fN3DHaQwKVmxUFrvWGrKZeKj+ow=";
+2 -2
View File
@@ -8,13 +8,13 @@
}:
buildGoModule (finalAttrs: {
pname = "lazycommit";
version = "1.4.2";
version = "1.5.3";
src = fetchFromGitHub {
owner = "m7medvision";
repo = "lazycommit";
tag = "v${finalAttrs.version}";
hash = "sha256-tS5jWucT4/1YRAXySUnElEkjaF2+Bl7O3taSzZf2NF0=";
hash = "sha256-ygWGR7CNLV5Z9MOl45Y57aay8PYt/5PnYZCJCJy0fFg=";
};
vendorHash = "sha256-4OPCUWXxsAnzxsqZPHhjvhxQQf5Knm7nGqrdjH4I4YY=";
+2 -2
View File
@@ -11,13 +11,13 @@
buildGoModule rec {
pname = "lazysql";
version = "0.4.8";
version = "0.4.9";
src = fetchFromGitHub {
owner = "jorgerojas26";
repo = "lazysql";
rev = "v${version}";
hash = "sha256-/qNtrR316hOlSRfbBS4V2gRnYLgQlZsou9WqTQPtiIM=";
hash = "sha256-KRyR4MZK9/gXj3EaAN/JGtzcou8SR+JJ8ZMWGKBu9mU=";
};
vendorHash = "sha256-FbAt/HsjoxqAKWQqqWN2xuyyTG2Ic4DcyEU4O0rjpQE=";
+2 -2
View File
@@ -7,13 +7,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "libkqueue";
version = "2.6.4";
version = "2.7.0";
src = fetchFromGitHub {
owner = "mheily";
repo = "libkqueue";
rev = "v${finalAttrs.version}";
sha256 = "sha256-Lex/EmVMESScungJ6r/Br7TaoC4fcDHvDBJpryoe84E=";
sha256 = "sha256-hT7/0Cy4UCKN16Rlwyjj1AAYC4/n1+170xsnYrjiglQ=";
};
nativeBuildInputs = [ cmake ];
@@ -2,9 +2,10 @@
lib,
stdenvNoCC,
fetchFromGitHub,
installFonts,
}:
stdenvNoCC.mkDerivation rec {
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "libre-baskerville";
version = "1.000";
@@ -15,13 +16,10 @@ stdenvNoCC.mkDerivation rec {
hash = "sha256-1EXi1hxFpc7pFsLbEj1xs9LqjeIf3XBol/8HdKNROUU=";
};
installPhase = ''
runHook preInstall
nativeBuildInputs = [ installFonts ];
install -m444 -Dt $out/share/fonts/truetype *.ttf
install -m444 -Dt $out/share/doc/${pname}-${version} README.md FONTLOG.txt
runHook postInstall
postInstall = ''
install -m444 -Dt $out/share/doc/${finalAttrs.pname}-${finalAttrs.version} README.md FONTLOG.txt
'';
meta = {
@@ -34,7 +32,7 @@ stdenvNoCC.mkDerivation rec {
'';
homepage = "http://www.impallari.com/projects/overview/libre-baskerville";
license = lib.licenses.ofl;
maintainers = [ ];
maintainers = with lib.maintainers; [ pancaek ];
platforms = lib.platforms.all;
};
}
})
-1
View File
@@ -54,7 +54,6 @@ stdenv.mkDerivation (finalAttrs: {
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [
frogamic
sbruder
];
};
})
-51
View File
@@ -1,51 +0,0 @@
{
lib,
rustPlatform,
fetchFromGitHub,
pkg-config,
openssl,
unstableGitUpdater,
}:
rustPlatform.buildRustPackage {
pname = "lunatic";
version = "0.13.2-unstable-2025-03-29";
src = fetchFromGitHub {
owner = "lunatic-solutions";
repo = "lunatic";
rev = "28a2f387ebf6a64ce4b87e2638812e2c032d5049";
hash = "sha256-FnUYnSWarQf68jBfSlIKVZbQHJt5U93MvA6rbNJE23U=";
};
cargoHash = "sha256-+2koGrhM9VMLh8uO1YcaugcfmZaCP4S2twKem+y2oks=";
nativeBuildInputs = [
pkg-config
];
buildInputs = [
openssl
];
checkFlags = [
# requires simd support which is not always available on hydra
"--skip=state::tests::import_filter_signature_matches"
];
passthru.updateScript = unstableGitUpdater {
tagPrefix = "v";
branch = "main";
};
meta = {
description = "Erlang inspired runtime for WebAssembly";
homepage = "https://lunatic.solutions";
changelog = "https://github.com/lunatic-solutions/lunatic/blob/main/CHANGELOG.md";
license = with lib.licenses; [
mit # or
asl20
];
maintainers = [ ];
};
}
@@ -1,73 +0,0 @@
diff --git a/package-lock.json b/package-lock.json
index 2d9324c..d3324fc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -60,7 +60,7 @@
"css-loader": "^7.1.3",
"css-minimizer-webpack-plugin": "^7.0.4",
"del": "^6.1.1",
- "electron": "37.6.1",
+ "electron": "40.0.0",
"electron-builder": "^26.8.0",
"electron-debug": "^3.2.0",
"electron-devtools-installer": "github:lyswhut/electron-devtools-installer#64596d615c1fc891eefd8aef1dfcb2c87aaadf03",
@@ -7539,15 +7539,15 @@
}
},
"node_modules/electron": {
- "version": "37.6.1",
- "resolved": "https://registry.npmjs.org/electron/-/electron-37.6.1.tgz",
- "integrity": "sha512-aHtJVNjqf0lk7dlPoc1X+fMBpZtLn+XGvP6IYc3gooTwsD1D/Ic2SBRC9SnIk6LkWTsDaSF9jgH1d9Q7eABy/Q==",
+ "version": "40.0.0",
+ "resolved": "https://registry.npmjs.org/electron/-/electron-40.0.0.tgz",
+ "integrity": "sha512-UyBy5yJ0/wm4gNugCtNPjvddjAknMTuXR2aCHioXicH7aKRKGDBPp4xqTEi/doVcB3R+MN3wfU9o8d/9pwgK2A==",
"dev": true,
"hasInstallScript": true,
"license": "MIT",
"dependencies": {
"@electron/get": "^2.0.0",
- "@types/node": "^22.7.7",
+ "@types/node": "^24.9.0",
"extract-zip": "^2.0.1"
},
"bin": {
@@ -7868,15 +7868,22 @@
}
},
"node_modules/electron/node_modules/@types/node": {
- "version": "22.19.11",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-22.19.11.tgz",
- "integrity": "sha512-BH7YwL6rA93ReqeQS1c4bsPpcfOmJasG+Fkr6Y59q83f9M1WcBRHR2vM+P9eOisYRcN3ujQoiZY8uk5W+1WL8w==",
+ "version": "24.10.13",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-24.10.13.tgz",
+ "integrity": "sha512-oH72nZRfDv9lADUBSo104Aq7gPHpQZc4BTx38r9xf9pg5LfP6EzSyH2n7qFmmxRQXh7YlUXODcYsg6PuTDSxGg==",
"dev": true,
"license": "MIT",
"dependencies": {
- "undici-types": "~6.21.0"
+ "undici-types": "~7.16.0"
}
},
+ "node_modules/electron/node_modules/undici-types": {
+ "version": "7.16.0",
+ "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz",
+ "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==",
+ "dev": true,
+ "license": "MIT"
+ },
"node_modules/emoji-regex": {
"version": "8.0.0",
"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
diff --git a/package.json b/package.json
index 4a17ca0..6e03adf 100644
--- a/package.json
+++ b/package.json
@@ -133,7 +133,7 @@
"css-loader": "^7.1.3",
"css-minimizer-webpack-plugin": "^7.0.4",
"del": "^6.1.1",
- "electron": "37.6.1",
+ "electron": "40.0.0",
"electron-builder": "^26.8.0",
"electron-debug": "^3.2.0",
"electron-devtools-installer": "github:lyswhut/electron-devtools-installer#64596d615c1fc891eefd8aef1dfcb2c87aaadf03",
+3 -8
View File
@@ -11,7 +11,6 @@
makeDesktopItem,
electron_40,
nodejs_22,
commandLineArgs ? "",
}:
@@ -20,13 +19,13 @@ let
in
buildNpmPackage (finalAttrs: {
pname = "lx-music-desktop";
version = "2.12.1";
version = "2.12.2";
src = fetchFromGitHub {
owner = "lyswhut";
repo = "lx-music-desktop";
tag = "v${finalAttrs.version}";
hash = "sha256-bhgXNk1WUVYb5/42uLIi+V8Ivc9/ykul+Um6QmGlvyk=";
hash = "sha256-0hUm7BfjI4x22DsAPX/VZo+IKInSl6hhylTK0awPhYo=";
};
desktopItems = [
@@ -57,7 +56,6 @@ buildNpmPackage (finalAttrs: {
(replaceVars ./electron-builder.patch {
electron_version = electron.version;
})
./electron-version.patch
];
nativeBuildInputs = [
@@ -65,10 +63,7 @@ buildNpmPackage (finalAttrs: {
copyDesktopItems
];
# Npm 11 (nodejs 24) can't resolve all dependencies from the prefetched cache.
nodejs = nodejs_22;
npmDepsHash = "sha256-62ytK6WNwdkKfci2gsC+WVDcNi247IXqFGBWa5a5J5c=";
npmDepsHash = "sha256-iIymnYIAE8rFEa8I2nVt2JrMyRiZL5nBS+HfNoDN1Hk=";
makeCacheWritable = true;
+2 -2
View File
@@ -6,11 +6,11 @@
stdenvNoCC.mkDerivation rec {
pname = "lxgw-neoxihei";
version = "1.242";
version = "1.300";
src = fetchurl {
url = "https://github.com/lxgw/LxgwNeoXiHei/releases/download/v${version}/LXGWNeoXiHei.ttf";
hash = "sha256-ASRBAmlDa2QmNXO6t/uXrqw9rZMgednoxCcIxqEzC/g=";
hash = "sha256-n5b5sYmn3X/Eo4jwwt4G/6N17iVBPucW0KTlP/M+Xcc=";
};
dontUnpack = true;
+3 -3
View File
@@ -29,13 +29,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "melonds";
version = "1.1-unstable-2026-04-20";
version = "1.1-unstable-2026-04-30";
src = fetchFromGitHub {
owner = "melonDS-emu";
repo = "melonDS";
rev = "42e09ba54980b64c59991e446b5384484f5619a3";
hash = "sha256-sHRVDrPsBOrAsQhuLzocKzAwbaloo4YSQjIZF22O+Ww=";
rev = "a4d41faae34da170a19aad859e748af0aafa2e6d";
hash = "sha256-dqtjgOMwDp90p4HytNYDTvCIWr2vrPWNqZBX3M9Wc4o=";
};
nativeBuildInputs = [
+6
View File
@@ -21,6 +21,12 @@ stdenv.mkDerivation (finalAttrs: {
sha256 = "sha256-ElKmi+ANuB3LPwZTMcr5HEMESjDwENbYnNIGdRP24d0=";
};
postPatch = ''
# gcc15
substituteInPlace mlvwm/functions.h \
--replace-fail "void (*action)();" "void (*action)(char *);"
'';
nativeBuildInputs = [ installShellFiles ];
buildInputs = [
+2 -2
View File
@@ -13,13 +13,13 @@ assert blas.isILP64 == lapack.isILP64;
stdenv.mkDerivation (finalAttrs: {
pname = "mopac";
version = "23.2.4";
version = "23.2.5";
src = fetchFromGitHub {
owner = "openmopac";
repo = "mopac";
rev = "v${finalAttrs.version}";
hash = "sha256-Pc9o2ZEHNhU0Dy36vR8egt6hSbTdVmRhSHXB+zNexi0=";
hash = "sha256-/A/JmXdTlnQjTCfuph0jth6p9TA28KQmHwmd/P2L/ao=";
};
nativeBuildInputs = [
+18 -10
View File
@@ -79,8 +79,6 @@ let
systemd
];
version = "2025.14";
selectSystem =
attrs:
attrs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
@@ -91,17 +89,20 @@ let
};
hash = selectSystem {
x86_64-linux = "sha256-JHuYHi4uBHzMopa45ipwsdx/3Ox/FxN3lYhBACQOCkE=";
aarch64-linux = "sha256-miCh1x6sCcAbg9iX7SJzYcxJ8DIQVNdrg6b39ht8gTw=";
x86_64-linux = "sha256-HleajbEbw5Z1ab/E4zSR+GxDOIuvegP4N9yRFZYv7z4=";
aarch64-linux = "sha256-Mm2F6PB15pHgRpsw1c1PjmIAcuGaqhfAeZS5HXdoWRQ=";
};
in
stdenv.mkDerivation {
stdenv.mkDerivation (finalAttrs: {
pname = "mullvad-vpn";
inherit version;
version = "2026.1";
__structuredAttrs = true;
strictDeps = true;
src = fetchurl {
url = "https://github.com/mullvad/mullvadvpn-app/releases/download/${version}/MullvadVPN-${version}_${platform}.deb";
url = "https://github.com/mullvad/mullvadvpn-app/releases/download/${finalAttrs.version}/MullvadVPN-${finalAttrs.version}_${platform}.deb";
inherit hash;
};
@@ -124,6 +125,10 @@ stdenv.mkDerivation {
wayland
];
postPatch = ''
patchShebangs opt/Mullvad\ VPN/mullvad-vpn
'';
installPhase = ''
runHook preInstall
@@ -166,13 +171,16 @@ stdenv.mkDerivation {
meta = {
homepage = "https://github.com/mullvad/mullvadvpn-app";
description = "Client for Mullvad VPN";
changelog = "https://github.com/mullvad/mullvadvpn-app/blob/${version}/CHANGELOG.md";
changelog = "https://github.com/mullvad/mullvadvpn-app/blob/${finalAttrs.version}/CHANGELOG.md";
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
license = lib.licenses.gpl3Only;
mainProgram = "mullvad-vpn";
platforms = lib.platforms.unix;
badPlatforms = [ lib.systems.inspect.patterns.isDarwin ];
maintainers = [
maintainers = with lib.maintainers; [
jackr
airone01
sigmasquadron
];
};
}
})
@@ -6,13 +6,13 @@
}:
buildGoModule (finalAttrs: {
pname = "n8n-task-runner-launcher";
version = "1.4.4";
version = "1.4.5";
src = fetchFromGitHub {
owner = "n8n-io";
repo = "task-runner-launcher";
tag = finalAttrs.version;
hash = "sha256-jn1zGADBk8adbainTRvT+Q8AqLK7KHJ7FN9Du9ytPig=";
hash = "sha256-7V//x/AG/3dNWIAQpjBrcOJNn9T9iboKEvJvDV2EK5A=";
};
vendorHash = "sha256-5dcIELsNFGB5qTmfpY/YRWeN2z9GdanysGw4Lqpfsi0=";
@@ -10,24 +10,30 @@
elfutils,
nix,
nixosTests,
systemd,
util-linux,
cacert,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "nixseparatedebuginfod2";
version = "1.0.1";
version = "2.0.0";
src = fetchFromGitHub {
owner = "symphorien";
repo = "nixseparatedebuginfod2";
tag = "v${finalAttrs.version}";
hash = "sha256-INY9mLJ+7i3BoShqFZMELm9aXiDbZkuLyokgm42kEbo=";
hash = "sha256-D327Pz3oHOHgfekXnDRQ0l+GrIcFUK1zcIqzR2Y3zqU=";
};
cargoHash = "sha256-6JyC0CLGnkbQWp8l27DXZ04Gt0nsNNSBFfcvAQtllE4=";
cargoHash = "sha256-iAhm54jb+5Nv/XG6GYpoEgPjYmBTHvEnnmynFF8D8n4=";
buildInputs = [
libarchive
openssl
]
++ lib.optionals stdenv.hostPlatform.isLinux [
systemd
];
nativeBuildInputs = [ pkg-config ];
@@ -37,6 +43,13 @@ rustPlatform.buildRustPackage (finalAttrs: {
bubblewrap
elfutils
nix
util-linux
cacert
];
# disable systemd feature on non linux
cargoBuildFlags = lib.optionals (!stdenv.hostPlatform.isLinux) [
"--no-default-features"
];
env.OPENSSL_NO_VENDOR = "1";
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule (finalAttrs: {
pname = "panicparse";
version = "2.4.0";
version = "2.5.0";
src = fetchFromGitHub {
owner = "maruel";
repo = "panicparse";
rev = "v${finalAttrs.version}";
sha256 = "sha256-EBNOHI04v47sXAWrjHsU4pixP4TPOuHy8S3YmlkiLN4=";
sha256 = "sha256-vVCPfuLAKPTt5IWI4aNSocZXf9Mct9GoF3Cvgq6lAow=";
};
vendorHash = "sha256-/w/dtt55NVHoJ5AeHsqH/IRe3bJq1YvpasLh8Zn8Ckg=";
vendorHash = "sha256-eCojW2t8n+xhah5UCshGprj7cZ1Kmh0Z+B2V8Y+wW1w=";
subPackages = [ "." ];
+2 -2
View File
@@ -41,13 +41,13 @@ let
in
stdenv.mkDerivation rec {
pname = "peergos";
version = "1.24.0";
version = "1.25.0";
src = fetchFromGitHub {
owner = "Peergos";
repo = "web-ui";
rev = "v${version}";
hash = "sha256-qZUYtiqEoYs7gal164Qnum83xgRq/wPXz7cLiuqM278=";
hash = "sha256-OA9Wt8nkXaYRu2gE9jyL6CYGv3OQd5uFUZQ1jCxD0KE=";
fetchSubmodules = true;
};
+7 -10
View File
@@ -11,12 +11,12 @@
libcap,
librsvg,
libusb1,
makeWrapper,
openssl,
patchelf,
stdenv,
systemdMinimal,
onetbb,
wrapGAppsHook3,
writeTextDir,
}:
@@ -27,6 +27,7 @@ let
libraryPath = lib.makeLibraryPath libraries;
libraries = [
gdk-pixbuf
glib
glibc
gtk3
icu
@@ -39,8 +40,6 @@ let
onetbb
];
gdkLoadersCache = "${gdk-pixbuf.out}/${gdk-pixbuf.moduleDir}.cache";
in
stdenv.mkDerivation {
pname = "picoscope";
@@ -56,9 +55,11 @@ stdenv.mkDerivation {
nativeBuildInputs = [
dpkg
makeWrapper
wrapGAppsHook3
];
dontWrapGApps = true;
buildInputs = libraries;
installPhase = ''
@@ -78,17 +79,13 @@ stdenv.mkDerivation {
# LD_LIBRARY_PATH: not strictly needed for the main exe (rpath already covers it), but required
# for dlopened plugins that ignore rpath or use absolute sonames.
# GDK_PIXBUF_MODULE_FILE: points gdk-pixbuf to Nixs loader cache so image loaders (gif/svg/png)
# come from our matched version, not the host. This fixes the “g_module_*” symbol errors.
# GIO_MODULE_DIR: restricts GIO to GLibs core modules only (no dconf/gvfs host bleed-through).
# SSL_CERT_DIR/SSL_CERT_FILE: Gives OpenSSL a known CA bundle so any HTTPS inside the app works
# without querying host paths.
makeWrapper $out/lib/PicoScope.GTK $out/bin/picoscope \
--set LD_LIBRARY_PATH "$out/lib:${libraryPath}" \
--set GDK_PIXBUF_MODULE_FILE "${gdkLoadersCache}" \
--set GIO_MODULE_DIR "${glib.out}/lib/gio/modules" \
--set SSL_CERT_DIR "${cacert}/etc/ssl/certs" \
--set SSL_CERT_FILE "${cacert}/etc/ssl/certs/ca-bundle.crt"
--set SSL_CERT_FILE "${cacert}/etc/ssl/certs/ca-bundle.crt" \
''${gappsWrapperArgs[@]}
runHook postInstall
'';

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