Merge c111fb7e5e into haskell-updates

This commit is contained in:
nixpkgs-ci[bot]
2026-04-02 00:30:18 +00:00
committed by GitHub
266 changed files with 2600 additions and 1431 deletions
+7 -10
View File
@@ -26,10 +26,10 @@
# Libraries
/lib @infinisil @hsjobeki
/lib/generators.nix @infinisil @hsjobeki @Profpatsch
/lib/cli.nix @infinisil @hsjobeki @Profpatsch
/lib/debug.nix @infinisil @hsjobeki @Profpatsch
/lib/asserts.nix @infinisil @hsjobeki @Profpatsch
/lib/generators.nix @infinisil @hsjobeki
/lib/cli.nix @infinisil @hsjobeki
/lib/debug.nix @infinisil @hsjobeki
/lib/asserts.nix @infinisil @hsjobeki
/lib/path/* @infinisil @hsjobeki
/lib/fileset @infinisil @hsjobeki
/maintainers/github-teams.json @infinisil
@@ -75,7 +75,7 @@
/pkgs/pkgs-lib @Stunkymonkey @h7x4
# Nixpkgs build-support
/pkgs/build-support/writers @lassulus @Profpatsch
/pkgs/build-support/writers @lassulus
# Nixpkgs make-disk-image
/doc/build-helpers/images/makediskimage.section.md @raitobezarius
@@ -335,8 +335,8 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
/pkgs/build-support/dlang @jtbx @TomaSajt
# Dhall
/pkgs/development/dhall-modules @Gabriella439 @Profpatsch
/pkgs/development/interpreters/dhall @Gabriella439 @Profpatsch
/pkgs/development/dhall-modules @Gabriella439
/pkgs/development/interpreters/dhall @Gabriella439
# Agda
/pkgs/build-support/agda @NixOS/agda
@@ -349,9 +349,6 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
/pkgs/development/idris-modules @Infinisil
/pkgs/development/compilers/idris2 @mattpolzin
# Bazel
/pkgs/by-name/ba/bazel_7 @Profpatsch
# NixOS modules for e-mail and dns services
/nixos/modules/services/mail/mailman.nix @peti
/nixos/modules/services/mail/postfix.nix @peti
+2
View File
@@ -264,6 +264,8 @@
- Added `dell-bios-fan-control` package and service.
- Added `lovr` package, a LUA-based game engine for VR and XR applications.
- `openrgb` was updated to 1.0rc2, which now uses Plugin API version 4.
Some existing OpenRGB plugins may be incompatible or require updates.
+13 -2
View File
@@ -1322,13 +1322,24 @@ let
: 1\. Function argument
*/
pushDownProperties =
let
mapAttrsIfAttrs =
f: val:
if isAttrs val then
mapAttrs f val
else
# This does not actually work, since arriving here means we have e.g.
# (lib.mkIf cond nonAttrs), while an attrset is expected. However,
# avoiding the mapAttrs call here gives better errors later.
val;
in
cfg:
if cfg._type or "" == "merge" then
concatMap pushDownProperties cfg.contents
else if cfg._type or "" == "if" then
map (mapAttrs (n: v: mkIf cfg.condition v)) (pushDownProperties cfg.content)
map (mapAttrsIfAttrs (n: v: mkIf cfg.condition v)) (pushDownProperties cfg.content)
else if cfg._type or "" == "override" then
map (mapAttrs (n: v: mkOverride cfg.priority v)) (pushDownProperties cfg.content)
map (mapAttrsIfAttrs (n: v: mkOverride cfg.priority v)) (pushDownProperties cfg.content)
# FIXME: handle mkOrder?
else
[ cfg ];
+2
View File
@@ -171,6 +171,8 @@ checkConfigError() {
# Shorthand meta attribute does not duplicate the config
checkConfigOutput '^"one two"$' config.result ./shorthand-meta.nix
checkConfigError "In module .*test-push-down-non-attrs.nix., you're trying to define a value of type \`bool'\n\s*rather than an attribute set for the option" config ./test-push-down-non-attrs.nix
checkConfigOutput '^true$' config.result ./test-mergeAttrDefinitionsWithPrio.nix
# Check that a module argument is passed, also when a default is available
@@ -0,0 +1,5 @@
{ lib, ... }:
{
config = lib.mkIf true true;
}
-1
View File
@@ -41,7 +41,6 @@
"description": "Maintenance of https://bazel.build/ and related packages",
"id": 5468470,
"maintainers": {
"Profpatsch": 3153638
},
"members": {
"aherrmann": 732652,
+6 -6
View File
@@ -3882,6 +3882,12 @@
github = "brancz";
githubId = 4546722;
};
brandonchinn178 = {
email = "brandonchinn178@gmail.com";
name = "Brandon Chinn";
github = "brandonchinn178";
githubId = 6827922;
};
brantes = {
name = "Pedro Brantes";
email = "contact@brantes.simplelogin.com";
@@ -9881,12 +9887,6 @@
name = "Maximilian Siling";
keys = [ { fingerprint = "0BAF 2D87 CB43 746F 6237 2D78 DE60 31AB A0BB 269A"; } ];
};
Golo300 = {
email = "lanzingertm@gmail.com";
github = "Golo300";
githubId = 58785758;
name = "Tim Lanzinger";
};
gonsolo = {
email = "gonsolo@gmail.com";
github = "gonsolo";
+22
View File
@@ -80,6 +80,28 @@ in
systemd.sockets."polkit-agent-helper".wantedBy = [ "sockets.target" ];
systemd.services."polkit-agent-helper@".serviceConfig = lib.mkMerge [
# The upstream unit inherits stderr to the polkit agent, which causes
# agent processes to misinterpret diagnostic output from PAM modules
# as protocol errors, resulting in tight re-execution loops.
{ StandardError = "journal"; }
# The upstream unit uses PrivateDevices=yes and ProtectHome=yes,
# which prevents PAM modules from accessing hardware (e.g. FIDO
# tokens via /dev/hidraw*) or reading key files from home directories.
(lib.mkIf config.security.pam.u2f.enable {
# Override upstream PrivateDevices=yes to allow access to /dev/hidraw*
PrivateDevices = false;
DeviceAllow = [
"/dev/urandom r"
"char-hidraw rw"
];
# Override upstream ProtectHome=yes so pam_u2f can read
# ~/.config/Yubico/u2f_keys (the default key file location)
ProtectHome = "read-only";
})
];
# The polkit daemon reads action/rule files
environment.pathsToLink = [ "/share/polkit-1" ];
@@ -257,6 +257,7 @@ in
cfg.package
falcon
uvicorn
nominatim-api
];
NOMINATIM_DATABASE_DSN = nominatimApiDsn;
NOMINATIM_DATABASE_WEBUSER = cfg.database.apiUser;
@@ -157,6 +157,7 @@ let
--uid=nextcloud \
--same-dir \
--pty \
--pipe \
--wait \
--collect \
--service-type=exec \
+46 -2
View File
@@ -84,6 +84,7 @@ let
"Duplex"
"AutoNegotiation"
"WakeOnLan"
"WakeOnLanPassword"
"Port"
"Advertise"
"ReceiveChecksumOffload"
@@ -91,14 +92,57 @@ let
"TCPSegmentationOffload"
"TCP6SegmentationOffload"
"GenericSegmentationOffload"
"PartialGenericSegmentationOffload"
"GenericReceiveOffload"
"GenericReceiveOffloadHardware"
"LargeReceiveOffload"
"ReceivePacketSteeringCPUMask"
"ReceiveVLANCTAGHardwareAcceleration"
"TransmitVLANCTAGHardwareAcceleration"
"ReceiveVLANCTAGFilter"
"NTupleFilter"
"ReceiveFCS"
"ReceiveAll"
"RxChannels"
"TxChannels"
"OtherChannels"
"CombinedChannels"
"Property"
"ImportProperty"
"UnsetProperty"
"RxBufferSize"
"RxMiniBufferSize"
"RxJumboBufferSize"
"TxBufferSize"
"RxFlowControl"
"TxFlowControl"
"AutoNegotiationFlowControl"
"GenericSegmentOffloadMaxBytes"
"GenericSegmentOffloadMaxSegments"
"UseAdaptiveRxCoalesce"
"UseAdaptiveTxCoalesce"
"RxCoalesceSec"
"RxCoalesceIrqSec"
"RxCoalesceLowSec"
"RxCoalesceHighSec"
"TxCoalesceSec"
"TxCoalesceIrqSec"
"TxCoalesceLowSec"
"TxCoalesceHighSec"
"RxMaxCoalescedFrames"
"RxMaxCoalescedIrqFrames"
"RxMaxCoalescedLowFrames"
"RxMaxCoalescedHighFrames"
"TxMaxCoalescedFrames"
"TxMaxCoalescedIrqFrames"
"TxMaxCoalescedLowFrames"
"TxMaxCoalescedHighFrames"
"CoalescePacketRateLow"
"CoalescePacketRateHigh"
"CoalescePacketRateSampleIntervalSec"
"StatisticsBlockCoalesceSec"
"MDI"
"SR-IOVVirtualFunctions"
"ReceiveQueues"
"TransmitQueues"
"TransmitQueueLength"
@@ -155,8 +199,8 @@ let
(assertRange "CombinedChannels" 1 4294967295)
(assertInt "RxBufferSize")
(assertInt "TxBufferSize")
(assertRange "ReceiveQueues" 1 4096)
(assertRange "TransmitQueues" 1 4096)
(assertRange "ReceiveQueues" 1 16384)
(assertRange "TransmitQueues" 1 16384)
(assertRange "TransmitQueueLength" 1 4294967294)
];
};
@@ -57,7 +57,6 @@ in
boot.extraModulePackages = [
config.boot.kernelPackages.ena
];
boot.initrd.kernelModules = [ "xen-blkfront" ];
boot.initrd.availableKernelModules = [ "nvme" ];
boot.kernelParams =
let
+1
View File
@@ -87,6 +87,7 @@ rec {
(onFullSupported "nixos.tests.containers-ip")
(onSystems [ "x86_64-linux" ] "nixos.tests.docker")
(onFullSupported "nixos.tests.env")
(onSystems [ "x86_64-linux" "aarch64-linux" ] "nixos.tests.ec2-userdata")
# Way too many manual retries required on Hydra.
# Apparently it's hard to track down the cause.
+2 -2
View File
@@ -489,9 +489,8 @@ in
early-mount-options = runTest ./early-mount-options.nix;
earlyoom = runTestOn [ "x86_64-linux" ] ./earlyoom.nix;
easytier = runTest ./easytier.nix;
ec2-config = (handleTestOn [ "x86_64-linux" ] ./ec2.nix { }).boot-ec2-config or { };
ec2-image = runTest ./ec2-image.nix;
ec2-nixops = (handleTestOn [ "x86_64-linux" ] ./ec2.nix { }).boot-ec2-nixops or { };
ec2-userdata = (handleTestOn [ "x86_64-linux" ] ./ec2.nix { }).ec2-userdata or { };
echoip = runTest ./echoip.nix;
ejabberd = runTest ./xmpp/ejabberd.nix;
elk = handleTestOn [ "x86_64-linux" ] ./elk.nix { };
@@ -1221,6 +1220,7 @@ in
pam-oath-login = runTest ./pam/pam-oath-login.nix;
pam-pgsql = runTest ./pam/pam-pgsql.nix;
pam-u2f = runTest ./pam/pam-u2f.nix;
pam-u2f-polkit = runTest ./pam/pam-u2f-polkit.nix;
pam-ussh = runTest ./pam/pam-ussh.nix;
pam-zfs-key = runTest ./pam/zfs-key.nix;
pangolin = runTest ./pangolin.nix;
+2 -77
View File
@@ -18,12 +18,6 @@ let
../modules/testing/test-instrumentation.nix
../modules/profiles/qemu-guest.nix
{
# Hack to make the partition resizing work in QEMU.
boot.initrd.postDeviceCommands = mkBefore ''
ln -s vda /dev/xvda
ln -s vda1 /dev/xvda1
'';
amazonImage.format = "qcow2";
# In a NixOS test the serial console is occupied by the "backdoor"
@@ -31,30 +25,6 @@ let
# the configuration in virtualisation/amazon-image.nix.
systemd.services."serial-getty@ttyS0".enable = mkForce false;
# Needed by nixos-rebuild due to the lack of network
# access. Determined by trial and error.
system.extraDependencies = with pkgs; [
# Needed for a nixos-rebuild.
busybox
cloud-utils
desktop-file-utils
libxslt.bin
mkinitcpio-nfs-utils
stdenv
stdenvNoCC
texinfo
unionfs-fuse
lndir
# These are used in the configure-from-userdata tests
# for EC2. Httpd and valgrind are requested by the
# configuration.
apacheHttpd
apacheHttpd.doc
apacheHttpd.man
valgrind.doc
];
nixpkgs.pkgs = pkgs;
}
];
@@ -68,8 +38,8 @@ let
in
{
boot-ec2-nixops = makeEc2Test {
name = "nixops-userdata";
ec2-userdata = makeEc2Test {
name = "ec2-userdata";
meta.timeout = 600;
inherit image;
sshPublicKey = snakeOilPublicKey; # That's right folks! My user's key is also the host key!
@@ -116,49 +86,4 @@ in
machine.wait_for_file("/etc/ec2-metadata/user-data")
'';
};
boot-ec2-config = makeEc2Test {
name = "config-userdata";
meta.broken = true; # amazon-init wants to download from the internet while building the system
inherit image;
sshPublicKey = snakeOilPublicKey;
# ### https://channels.nixos.org/nixos-unstable nixos
userData = ''
{ pkgs, ... }:
{
imports = [
<nixpkgs/nixos/modules/virtualisation/amazon-image.nix>
<nixpkgs/nixos/modules/testing/test-instrumentation.nix>
<nixpkgs/nixos/modules/profiles/qemu-guest.nix>
];
environment.etc.testFile = {
text = "whoa";
};
networking.hostName = "ec2-test-vm"; # required by services.httpd
services.httpd = {
enable = true;
adminAddr = "test@example.org";
virtualHosts.localhost.documentRoot = "''${pkgs.valgrind.doc}/share/doc/valgrind/html";
};
networking.firewall.allowedTCPPorts = [ 80 ];
}
'';
script = ''
machine.start()
# amazon-init must succeed. if it fails, make the test fail
# immediately instead of timing out in wait_for_file.
machine.wait_for_unit("amazon-init.service")
machine.wait_for_file("/etc/testFile")
assert "whoa" in machine.succeed("cat /etc/testFile")
machine.wait_for_unit("httpd.service")
assert "Valgrind" in machine.succeed("curl http://localhost")
'';
};
}
+90
View File
@@ -0,0 +1,90 @@
{ hostPkgs, ... }:
{
name = "pam-u2f-polkit";
qemu.package = hostPkgs.qemu_test.override { u2fEmuSupport = true; };
nodes.machine =
{ pkgs, ... }:
{
virtualisation.qemu.options = [
"-usb"
"-device u2f-emulated"
];
security.polkit.enable = true;
security.pam.u2f.enable = true;
environment.systemPackages = with pkgs; [
libfido2
pam_u2f
];
};
testScript = ''
machine.wait_for_unit("multi-user.target")
# The upstream polkit-agent-helper@.service has PrivateDevices=yes and
# DevicePolicy=strict with only /dev/null allowed. This blocks hidraw.
# Verify that: run a command under the upstream defaults and show it fails.
machine.fail(
"systemd-run --wait --pipe "
"--property=PrivateDevices=yes "
"--property=DevicePolicy=strict "
"--property='DeviceAllow=/dev/null rw' "
"test -c /dev/hidraw0"
)
# The PR overrides PrivateDevices=no and adds DeviceAllow for hidraw.
# Verify that the actual polkit-agent-helper@ unit got these overrides.
props = machine.succeed("systemctl show polkit-agent-helper@dummy.service")
assert "PrivateDevices=no" in props, f"Expected PrivateDevices=no, got: {props}"
assert "ProtectHome=read-only" in props, f"Expected ProtectHome=read-only, got: {props}"
# Run fido2-token under the same constraints as the fixed service.
# This proves the device is not just visible but actually usable
# inside the polkit-agent-helper@ sandbox.
machine.succeed(
"systemd-run --wait --pipe "
"--property=PrivateDevices=no "
"--property=DevicePolicy=strict "
"--property='DeviceAllow=/dev/null rw' "
"--property='DeviceAllow=/dev/urandom r' "
"--property='DeviceAllow=char-hidraw rw' "
"--property=ProtectHome=read-only "
"--property=PrivateNetwork=yes "
"--property=ProtectSystem=strict "
"--property=ProtectKernelModules=yes "
"--property=ProtectKernelLogs=yes "
"--property=ProtectKernelTunables=yes "
"--property=ProtectControlGroups=yes "
"--property=ProtectClock=yes "
"--property=ProtectHostname=yes "
"--property=LockPersonality=yes "
"--property=MemoryDenyWriteExecute=yes "
"--property=NoNewPrivileges=yes "
"--property=PrivateTmp=yes "
"--property=RemoveIPC=yes "
"--property='RestrictAddressFamilies=AF_UNIX' "
"--property=RestrictNamespaces=yes "
"--property=RestrictRealtime=yes "
"--property=RestrictSUIDSGID=yes "
"--property=SystemCallArchitectures=native "
"fido2-token -I /dev/hidraw0"
)
# Also verify that pamu2fcfg can register a credential inside the sandbox
# (needs hidraw + urandom access)
machine.succeed(
"systemd-run --wait --pipe "
"--property=PrivateDevices=no "
"--property=DevicePolicy=strict "
"--property='DeviceAllow=/dev/null rw' "
"--property='DeviceAllow=/dev/urandom r' "
"--property='DeviceAllow=char-hidraw rw' "
"--property=ProtectHome=read-only "
"pamu2fcfg"
)
'';
}
+50 -9
View File
@@ -1,29 +1,70 @@
{ ... }:
{ hostPkgs, ... }:
{
name = "pam-u2f";
qemu.package = hostPkgs.qemu_test.override { u2fEmuSupport = true; };
nodes.machine =
{ ... }:
{ pkgs, ... }:
{
virtualisation.qemu.options = [
"-usb"
"-device u2f-emulated"
];
security.pam.u2f = {
enable = true;
control = "required";
control = "sufficient";
settings = {
cue = true;
debug = true;
interactive = true;
origin = "nixos-test";
# Freeform option
userpresence = 1;
origin = "pam://nixos-test";
};
};
users.users.alice = {
isNormalUser = true;
uid = 1000;
};
environment.systemPackages = with pkgs; [
libfido2
pam_u2f
];
# Allow non-root users to access the virtual U2F device
services.udev.extraRules = ''
KERNEL=="hidraw*", SUBSYSTEM=="hidraw", MODE="0666"
'';
};
testScript = ''
machine.wait_for_unit("multi-user.target")
machine.wait_until_succeeds("pgrep -f 'agetty.*tty1'")
# The virtual U2F device should be recognized
machine.succeed("fido2-token -L | grep -q hidraw")
# Register a U2F credential for alice
machine.succeed("mkdir -p /home/alice/.config/Yubico")
machine.succeed(
'egrep "auth required .*/lib/security/pam_u2f.so.*cue.*debug.*interactive.*origin=nixos-test.*userpresence=1" /etc/pam.d/ -R'
"pamu2fcfg -u alice -o pam://nixos-test"
" > /home/alice/.config/Yubico/u2f_keys"
)
machine.succeed("chown -R alice:users /home/alice/.config")
# Log in as alice on tty2. With control=sufficient, pam_u2f runs
# before pam_unix. The emulated device auto-approves user presence,
# so alice is authenticated by her U2F key no password needed.
machine.send_key("alt-f2")
machine.wait_until_succeeds("[ $(fgconsole) = 2 ]")
machine.wait_for_unit("getty@tty2.service")
machine.wait_until_tty_matches("2", "login: ")
machine.send_chars("alice\n")
# alice should get a shell without being asked for a password
machine.wait_until_succeeds("pgrep -u alice bash")
machine.send_chars("touch /tmp/u2f-login-success\n")
machine.wait_for_file("/tmp/u2f-login-success")
'';
}
+1
View File
@@ -56,6 +56,7 @@
# create admin
machine.wait_for_unit("multi-user.target")
machine.wait_for_open_port(${toString port})
machine.succeed("DJANGO_SUPERUSER_PASSWORD=admin pdfding-manage createsuperuser --no-input --username admin --email admin@localhost")
cookie_jar = "/tmp/cookies.txt"
+3 -1
View File
@@ -32,6 +32,7 @@
testScript =
{ nodes, ... }:
let
inherit (nodes.machine.services.pdfding) port;
stateDir = "/var/lib/pdfding";
in
# py
@@ -41,6 +42,7 @@
# create admin
machine.wait_for_unit("multi-user.target")
machine.wait_for_open_port(${toString port})
machine.succeed("DJANGO_SUPERUSER_PASSWORD=admin pdfding-manage createsuperuser --no-input --username admin --email admin@localhost")
@@ -74,7 +76,7 @@
interactive.nodes.machine =
{ config, ... }:
let
port = config.services.pdfding.port;
inherit (config.services.pdfding) port;
in
{
# not needed, only for manual interactive debugging
@@ -109,6 +109,7 @@ in
# create admin
machine.wait_for_unit("multi-user.target")
machine.wait_for_open_port(${toString port})
machine.succeed("DJANGO_SUPERUSER_PASSWORD=admin pdfding-manage createsuperuser --no-input --username admin --email admin@localhost")
# login
@@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "claude-code";
publisher = "anthropic";
version = "2.1.88";
hash = "sha256-iFH8siufDTje1zihRMqb/5CCYo5YHHdCZcuk8Hrj4Uk=";
version = "2.1.89";
hash = "sha256-9GASgI7ifhxAj4L6Xf1MGyGsiFcC5NZb2ICCjLUf5Qw=";
};
postInstall = ''
@@ -10,8 +10,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "vscode-pandoc";
publisher = "chrischinchilla";
version = "0.7.1";
hash = "sha256-sGZ0o3lyGs1N8v1gYcdsFYYQwNeMChW881EXe6NoBgU=";
version = "0.7.2";
hash = "sha256-Vq9VayQVhlz97Ml0nfBCwlF41V+TqA46jHHW7TMJLeI=";
};
nativeBuildInputs = [
jq
@@ -1007,8 +1007,8 @@ let
mktplcRef = {
name = "coder-remote";
publisher = "coder";
version = "1.13.2";
hash = "sha256-Dw8eJPpbeMz2taELHI0eYwO67SngCFel8wL/ZCGXQoM=";
version = "1.14.3";
hash = "sha256-W4VciZMvVtRcCibJP5UGTlHCrdF/AF167xlLvZs5BB4=";
};
meta = {
description = "Extension for Visual Studio Code to open any Coder workspace in VS Code with a single click";
@@ -1955,8 +1955,8 @@ let
mktplcRef = {
publisher = "github";
name = "vscode-pull-request-github";
version = "0.132.1";
hash = "sha256-iWDKJVgVhpycTNE044DSOf/uN0ZG4s2/JdpwBkka8sQ=";
version = "0.132.2";
hash = "sha256-1wBo1PaSZ0xNRIgdGAPQ7Jm4ywx4qc4kflZxHVAt2EA=";
};
meta = {
license = lib.licenses.mit;
@@ -3828,8 +3828,8 @@ let
mktplcRef = {
name = "ansible";
publisher = "redhat";
version = "26.3.0";
hash = "sha256-c6NcQsJe2sjJH/nBhStHYWKNSfJtU3CLHpv+2qPlyqM=";
version = "26.3.5";
hash = "sha256-IKSozGy4S04pSsbhpXVgsqQvJNzaxVkoSrLwhFb4Ag4=";
};
meta = {
description = "Ansible language support";
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
publisher = "github";
name = "copilot-chat";
version = "0.40.1";
hash = "sha256-wVxryUaW53xU4zZKU4t1pZaAB7BFIOkkcng91JnCLOk=";
version = "0.42.0";
hash = "sha256-iKDRDqQ8qJe2c4SQJBiJLCEtmVmcci6753+I7uH7YVk=";
};
meta = {
@@ -11,26 +11,26 @@ vscode-utils.buildVscodeMarketplaceExtension {
sources = {
"x86_64-linux" = {
arch = "linux-x64";
hash = "sha256-20YQYsNYvWDhFS8ZRtK9dtLtZ6wt1xGSsZjTNoXRr7g=";
hash = "sha256-4w/A3C9WWfKbZF3LnaLR9aZ78hvU+lrEXS8nnMbgzeA=";
};
"x86_64-darwin" = {
arch = "darwin-x64";
hash = "sha256-+h+2JMl1UMUM1fcB8ddo7R2RuaQdjjWcd74APwWw/uc=";
hash = "sha256-+2+geG0UcCf7L+SbgKGjMkmctH+3q7nLsZFsb/BrhF0=";
};
"aarch64-linux" = {
arch = "linux-arm64";
hash = "sha256-rwk+bkHfCRtYEWpMi9/BABvT+LkpWi8ezAE4TK7ttkg=";
hash = "sha256-QUopKDFQxWinvtkCkmRSCG2TpopGRRD8dXyfC3iww6Y=";
};
"aarch64-darwin" = {
arch = "darwin-arm64";
hash = "sha256-IbfqAZyAwS/01Mlniw+xOMktk4wQNXWTK5oyBX9g2sI=";
hash = "sha256-7ZglgfAbjdCS8R9MhX8qB7P4aCVDy76qFmQ7klzGbjg=";
};
};
in
{
name = "visualjj";
publisher = "visualjj";
version = "0.26.0";
version = "0.27.0";
}
// sources.${stdenvNoCC.hostPlatform.system}
or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}");
@@ -7,13 +7,13 @@
}:
mkLibretroCore rec {
core = "fbalpha2012";
version = "0-unstable-2025-12-12";
version = "0-unstable-2026-03-31";
src = fetchFromGitHub {
owner = "libretro";
repo = "fbalpha2012";
rev = "c547d8cf3f7748f4094cee658a5d31ec1b79ece4";
hash = "sha256-owy8IuJ/dAEbUH7hGCR3oLiI4tYuwsNfRYRl6LmyYfc=";
rev = "15af60bf24e3dc2267a38e3c8532450ebec86317";
hash = "sha256-7QfDk/j7akaORSekdx96mcDgsFp+kAq1/Cxtu3uPe4A=";
};
sourceRoot = "${src.name}/svn-current/trunk";
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "fmsx";
version = "0-unstable-2025-07-31";
version = "0-unstable-2026-03-31";
src = fetchFromGitHub {
owner = "libretro";
repo = "fmsx-libretro";
rev = "fbe4dfc4c3e3f7eb27089def3d663a905b181845";
hash = "sha256-1hZQO16SDB8n1wdTP67Kpns3izg/nPGl5M7wjFDBjGc=";
rev = "6b807c588d63677770f7f2ed8b94ca0e9da256ce";
hash = "sha256-vA9ODUtmmrDPbZjmRJ9IIFELLTD8g8aHmQdo/B/d1fQ=";
};
makefile = "Makefile";
@@ -6,13 +6,13 @@
}:
mkLibretroCore {
core = "mame2010";
version = "0-unstable-2024-10-23";
version = "0-unstable-2026-03-31";
src = fetchFromGitHub {
owner = "libretro";
repo = "mame2010-libretro";
rev = "c5b413b71e0a290c57fc351562cd47ba75bac105";
hash = "sha256-p+uEhxjr/07YJxInhW7oJDr8KurD36JxnSfJo17FOxM=";
rev = "29095383c0281100fee2ee09f1438d8ae990c510";
hash = "sha256-syp/hoo0xZEs3poQZU1Ow4qLHRCF+31u5GrYw8aKiv4=";
};
makefile = "Makefile";
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "mesen";
version = "0-unstable-2024-10-21";
version = "0-unstable-2026-03-31";
src = fetchFromGitHub {
owner = "libretro";
repo = "mesen";
rev = "791c5e8153ee6e29691d45b5df2cf1151ff416f9";
hash = "sha256-PEEGJsyT+D/JwBxH2H9OY2MwaGt1i+1kmDZUT6zROic=";
rev = "4df4d3681e89321cd4e571ee5cacfdef91842566";
hash = "sha256-f067kvu+Pp27iJiVAZczg49Qxz9DVPnGw/Hjwi6+a0Y=";
};
makefile = "Makefile";
@@ -14,13 +14,13 @@
}:
mkLibretroCore {
core = "play";
version = "0-unstable-2026-03-13";
version = "0-unstable-2026-03-31";
src = fetchFromGitHub {
owner = "jpd002";
repo = "Play-";
rev = "560781c201f8877d39a084d7e6ab583ffa25aa09";
hash = "sha256-Piwe54A1PNPfwy86bNMNhLsEYwwVqygysAvK6Iqt0mo=";
rev = "cd1dba563cb39925796175f2b8ce95a15c90ee1a";
hash = "sha256-nP22juzUOuD/SQqrIm3AXfa1x98Uqf9rKLhzhXA4yQI=";
fetchSubmodules = true;
};
@@ -26,6 +26,11 @@ stdenv.mkDerivation {
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-gfx/apngasm/files/apngasm-3.1.10-static.patch?id=45fd0cde71ca2ae0e7e38ab67400d84b86b593d7";
sha256 = "sha256-eKthgInWxXEqN5PupvVf9wVQDElxsPYRFXT7pMc6vIU=";
})
# Boost 1.89+ removed the boost_system CMake component
(fetchpatch {
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-gfx/apngasm/files/apngasm-3.1.10-boost-1.89.patch?id=87e57d47db8c7c68acb2dec534e70015d8b1d61e";
sha256 = "sha256-92oie9owUYP8a1hrJsFCRk8QI4AjTzMXTe+frlmbIuE=";
})
];
nativeBuildInputs = [ cmake ];
@@ -823,7 +823,7 @@
}
},
"ungoogled-chromium": {
"version": "146.0.7680.164",
"version": "146.0.7680.177",
"deps": {
"depot_tools": {
"rev": "42786f6e46c25c30dd58f69283ab6fcd0c959f58",
@@ -835,16 +835,16 @@
"hash": "sha256-wFCuu4GR0N7QZCwT8UAhqH5moicYQjZ4ZLI58AM4pJ0="
},
"ungoogled-patches": {
"rev": "146.0.7680.164-1",
"hash": "sha256-mqgmG+1TefLshc3QUQrGN2XB99FXJyexE6QI7uD3IXQ="
"rev": "146.0.7680.177-1",
"hash": "sha256-OMGjomgLuwO0KkqwW3IxLmSbpHM7ZbVUVOiPkQs/N6s="
},
"npmHash": "sha256-ByB1Ea5tduIJZXyydeBWsoS8OPABOgwHe+dNXRssdvc="
},
"DEPS": {
"src": {
"url": "https://chromium.googlesource.com/chromium/src.git",
"rev": "bbd8c5dd25fb2f569d98e626a9517cf2171abdff",
"hash": "sha256-hwZehtGUyuMdHisIaztsYlu0MEftbmmAqN/X+ias4nI=",
"rev": "ae03f7fb2cf1215853896d6a4c15fdceee2badb7",
"hash": "sha256-WVJ6dtDpXnp+Q8N/KEFJZWU9/4xEmpEYcu53MA94PZ8=",
"recompress": true
},
"src/third_party/clang-format/script": {
@@ -914,8 +914,8 @@
},
"src/third_party/angle": {
"url": "https://chromium.googlesource.com/angle/angle.git",
"rev": "e05753c6d05b17b23d514038957469c70b75475c",
"hash": "sha256-SMym7PN2acfw84Z95xWSbN/QV5UIDIOztWxFeTCfBsk="
"rev": "1c0f91aaa60a1f87725840495cbfd9717e7c77c8",
"hash": "sha256-9Me/9kdDgcDLGP/0lLWpj294IoUp0hDD5hfFjSZbTOc="
},
"src/third_party/angle/third_party/glmark2/src": {
"url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
@@ -954,8 +954,8 @@
},
"src/third_party/dawn": {
"url": "https://dawn.googlesource.com/dawn.git",
"rev": "a655251a59c4af3fbf8058bb2572d6a457f896d2",
"hash": "sha256-UKoDytne6QD2d6ojy4mYPjLbo9GB4xy1fUf9C1pLKaE="
"rev": "10fb89e3179bb7443e66911eb3c795c7aaf022e5",
"hash": "sha256-ATTNb61RG7hS1mapDw0o4ZyBeny4ONI8ZjJLpmbQaKU="
},
"src/third_party/dawn/third_party/glfw": {
"url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
@@ -1474,8 +1474,8 @@
},
"src/third_party/skia": {
"url": "https://skia.googlesource.com/skia.git",
"rev": "6a75afe9792764f6faa76ad50125781899ca05e8",
"hash": "sha256-S4AAmNw50ToTZIuHl41Pc+Z1MZfUVf0/ZGGIiEr5cXo="
"rev": "30d129c8800b5626c46fb83fa62db10b9b22b319",
"hash": "sha256-2/Deen9OwDgDRrm5j7Rw27Z2JUX1thX7mnKWRLJbEvM="
},
"src/third_party/smhasher/src": {
"url": "https://chromium.googlesource.com/external/smhasher.git",
@@ -1609,8 +1609,8 @@
},
"src/third_party/webrtc": {
"url": "https://webrtc.googlesource.com/src.git",
"rev": "b2a90ac0037ee7187102ce2c40e5007216ca9a58",
"hash": "sha256-rX6NEN0RbfHPRqJqkGhypwWt/NcREvPaanL+CDxwhA8="
"rev": "6733aa5ba16e1e1087f339d1151c80c924a6fbf8",
"hash": "sha256-g2GYFVTK8f296v7lUcYPqkI4qDoladsTpnKWb6SGRmw="
},
"src/third_party/wuffs/src": {
"url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git",
@@ -1639,8 +1639,8 @@
},
"src/v8": {
"url": "https://chromium.googlesource.com/v8/v8.git",
"rev": "0e999a528db40a3ef6fa917adf96370a18b87d70",
"hash": "sha256-rkSuZBdFUHJyYmqp2oN3mLjNtKjk569MocyvnICo+uw="
"rev": "0ad812d268a7820dba9bf848b416aeda4dd1b2e5",
"hash": "sha256-nG4goqqVAAWPMkq8296wCYhnwL93oAL+pF1oaMXyqZI="
}
}
}
@@ -10,13 +10,13 @@
buildMozillaMach rec {
pname = "firefox-devedition";
binaryName = "firefox-devedition";
version = "148.0b15";
version = "150.0b3";
applicationName = "Firefox Developer Edition";
requireSigning = false;
branding = "browser/branding/aurora";
src = fetchurl {
url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "32d7e4b9df739d5bdab2cd54250b1c7546d26b248a62e0bbc71e4b78b12d4e3d6d9451b631a0f18568f2540141786967a33b6543256a6ec6f4f245093d37a5d5";
sha512 = "1a1f9079b50bb632fe578be6452269db6195df0663165d3d3906897368d4d3752c51fb4ace9651881d5a4e9a5dd5dcb2bdf18efab193d80acac1c2f502ef11e1";
};
# buildMozillaMach sets MOZ_APP_REMOTINGNAME during configuration, but
@@ -191,13 +191,13 @@
"vendorHash": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk="
},
"cloudamqp_cloudamqp": {
"hash": "sha256-PAH7Avc6WQFQ7fXs7A//SxIEP88uSrN9sWlEYe9Zr+I=",
"hash": "sha256-WVEGtD5Hfb8xu/GymHMknK8n2KgOMW2EzBMvRmbKJug=",
"homepage": "https://registry.terraform.io/providers/cloudamqp/cloudamqp",
"owner": "cloudamqp",
"repo": "terraform-provider-cloudamqp",
"rev": "v1.43.1",
"rev": "v1.44.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-SrGNzwSdkMTyNuVgjUj0tID/Qu6BBusVn+NsgTk4RJI="
"vendorHash": "sha256-sagrygtfsZWQUuIuGTUldZYYR5OhQfpZDxDKZAaIR4Y="
},
"cloudflare_cloudflare": {
"hash": "sha256-D5Kk6xCz3CQWbGHjLKU/+SPBzCYFQlphCTMG6+LvFek=",
@@ -499,13 +499,13 @@
"vendorHash": "sha256-MYVkNvJ+rbwGw0htClIbmxk3YX2OK/ZO/QOTyMRFiug="
},
"hashicorp_aws": {
"hash": "sha256-/Eti2S6QIHmteilt0wFverousbOapfjBhWrxeCUpOQw=",
"hash": "sha256-EaNOYM4qpWiAsemTOMpFFwJLcrlOxMVgjuECh4KhUsM=",
"homepage": "https://registry.terraform.io/providers/hashicorp/aws",
"owner": "hashicorp",
"repo": "terraform-provider-aws",
"rev": "v6.37.0",
"rev": "v6.38.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-tsAxy5dt8mKtfR2o8dNgFSdjgjfIXD0ye004wPZ6fTk="
"vendorHash": "sha256-picwxtQOtsBX8SkA64+ekFNDC7zIpg0CG66kelO2THk="
},
"hashicorp_awscc": {
"hash": "sha256-68SdqhF4RA/rjVm89yAZb8MRdDPrcqrQ6lc3tJTIeng=",
@@ -1310,11 +1310,11 @@
"vendorHash": "sha256-omxEb+ntQuHDfS2Rmt0rj0BF0Q2T8DLhobLua2uU/0o="
},
"tencentcloudstack_tencentcloud": {
"hash": "sha256-iUbbxwnRgYtNq8a8qMYB/6HQ7QS/hrvlzL5MMS08rn0=",
"hash": "sha256-xsYh5gDneL3nQDUIHe3fRjObFTGp3ssPq8wlqPWsq7Y=",
"homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud",
"owner": "tencentcloudstack",
"repo": "terraform-provider-tencentcloud",
"rev": "v1.82.77",
"rev": "v1.82.82",
"spdx": "MPL-2.0",
"vendorHash": null
},
@@ -40,7 +40,7 @@ stdenv.mkDerivation {
description = "Mini Web server that let others upload files to your computer";
homepage = "http://stackp.online.fr/droopy";
license = lib.licenses.bsd3;
maintainers = [ lib.maintainers.Profpatsch ];
maintainers = [ ];
mainProgram = "droopy";
};
@@ -70,7 +70,7 @@ mkLinphoneDerivation (finalAttrs: {
"-DENABLE_UNIT_TESTS=NO" # Do not build test executables
];
NIX_LDFLAGS = "-lXext";
env.NIX_LDFLAGS = "-lXext";
meta = {
description = "Powerful and lightweight streaming engine specialized for voice/video telephony applications. Part of the Linphone project";
@@ -0,0 +1,74 @@
diff --git a/src/api/video/nv12_buffer.cc b/src/api/video/nv12_buffer.cc
index ca9dcd867..89d28f23c 100644
--- a/src/api/video/nv12_buffer.cc
+++ b/src/api/video/nv12_buffer.cc
@@ -16,6 +16,8 @@
#include "third_party/libyuv/include/libyuv/convert.h"
#include "third_party/libyuv/include/libyuv/scale.h"
+#include <cstring>
+
namespace webrtc {
namespace {
diff --git a/src/audio/utility/channel_mixer.cc b/src/audio/utility/channel_mixer.cc
index 0f1e66387..33b771b0c 100644
--- a/src/audio/utility/channel_mixer.cc
+++ b/src/audio/utility/channel_mixer.cc
@@ -15,6 +15,8 @@
#include "rtc_base/logging.h"
#include "rtc_base/numerics/safe_conversions.h"
+#include <cstring>
+
namespace webrtc {
ChannelMixer::ChannelMixer(ChannelLayout input_layout,
diff --git a/src/modules/audio_processing/aec3/alignment_mixer.cc b/src/modules/audio_processing/aec3/alignment_mixer.cc
index 7f076dea8..ffd7242b5 100644
--- a/src/modules/audio_processing/aec3/alignment_mixer.cc
+++ b/src/modules/audio_processing/aec3/alignment_mixer.cc
@@ -10,6 +10,7 @@
#include "modules/audio_processing/aec3/alignment_mixer.h"
#include <algorithm>
+#include <cstring>
#include "rtc_base/checks.h"
diff --git a/src/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc b/src/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc
index 7ef1a030e..5b9ab7137 100644
--- a/src/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc
+++ b/src/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc
@@ -18,6 +18,7 @@
#include <spa/param/video/format-utils.h>
#include <sys/mman.h>
+#include <cstring>
#include <vector>
#include "absl/memory/memory.h"
diff --git a/src/modules/video_coding/utility/ivf_file_reader.cc b/src/modules/video_coding/utility/ivf_file_reader.cc
index 4c08ca613..f82f2bfcb 100644
--- a/src/modules/video_coding/utility/ivf_file_reader.cc
+++ b/src/modules/video_coding/utility/ivf_file_reader.cc
@@ -10,6 +10,7 @@
#include "modules/video_coding/utility/ivf_file_reader.h"
+#include <cstring>
#include <string>
#include <vector>
diff --git a/src/net/dcsctp/packet/bounded_byte_writer.h b/src/net/dcsctp/packet/bounded_byte_writer.h
index d754549e4..bf5e3ed42 100644
--- a/src/net/dcsctp/packet/bounded_byte_writer.h
+++ b/src/net/dcsctp/packet/bounded_byte_writer.h
@@ -12,6 +12,7 @@
#define NET_DCSCTP_PACKET_BOUNDED_BYTE_WRITER_H_
#include <algorithm>
+#include <cstring>
#include "api/array_view.h"
@@ -31,6 +31,9 @@ let
};
patches = [
# fix build with latest glibc
# upstream PR: https://github.com/desktop-app/tg_owt/pull/172
./cstring-includes.patch
(fetchpatch {
url = "https://webrtc.googlesource.com/src/+/e7d10047096880feb5e9846375f2da54aef91202%5E%21/?format=TEXT";
decode = "base64 -d";
File diff suppressed because it is too large Load Diff
@@ -19,16 +19,16 @@ let
}:
buildGoModule rec {
pname = stname;
version = "2.0.12";
version = "2.0.15";
src = fetchFromGitHub {
owner = "syncthing";
repo = "syncthing";
tag = "v${version}";
hash = "sha256-bWClKODxzcSbKiKFcgDKbRGih8KaSeVpltiFDAE8sHM=";
hash = "sha256-v77ovjV+UoCRA1GteP+HDqC8dsRvtOhFX/IkSgSIf8Y=";
};
vendorHash = "sha256-Xiod2Bd+uXcOpZ0rt8my8jkNdkdUhuoz5fcce+6JMXY=";
vendorHash = "sha256-boYTLgvH+iWlh3y3Z0LPvSVGEget3X94AthtJKphhCw=";
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
# Recent versions of macOS seem to require binaries to be signed when
@@ -11,11 +11,11 @@
buildKodiAddon rec {
pname = "keymap";
namespace = "script.keymap";
version = "1.3.2";
version = "1.4.0";
src = fetchzip {
url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip";
sha256 = "sha256-y9bREG1fGY6TJYW4xMUBbsAp6DSzb78tY1+iyUrGjgQ=";
sha256 = "sha256-sbyI6ZK8HvXgMxNDtm2Tb/ub93IcdXB5PSdxoL+QIqU=";
};
propagatedBuildInputs = [
@@ -76,12 +76,17 @@ stdenv.mkDerivation {
src = "${virtualBoxNixGuestAdditionsBuilder}/VBoxGuestAdditions-${platform}.tar.bz2";
sourceRoot = ".";
KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
KERN_INCL = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/source/include";
hardeningDisable = [ "pic" ];
env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types -Wno-error=implicit-function-declaration";
env = {
NIX_CFLAGS_COMPILE = toString [
"-Wno-error=incompatible-pointer-types"
"-Wno-error=implicit-function-declaration"
];
KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
KERN_INCL = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/source/include";
};
nativeBuildInputs = [
patchelf
@@ -39,7 +39,7 @@ def urlopen(url_or_request):
with urlopen(f'{GAME_URL}/data.json') as response:
data = json.load(response)
GAME_ID = data['id']
IS_FREE = 'price' not in data
IS_FREE = 'price' not in data or data['price'] == '$0.00'
def api(path, params={}, download=False):
url = f'{ENDPOINT}{path}?{urllib.parse.urlencode({'api_key': API_KEY, **params})}'
+3 -3
View File
@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "ab-av1";
version = "0.11.1";
version = "0.11.2";
src = fetchFromGitHub {
owner = "alexheretic";
repo = "ab-av1";
tag = "v${finalAttrs.version}";
hash = "sha256-UiBgtA6i5rpXAtiPwihg7sUbmD6lou6IOsb//DWNWwU=";
hash = "sha256-kT0BJr4xoYigKObD6vZNRieslaJj/MWuqQmhYLWNwvs=";
};
cargoHash = "sha256-1/vxKOlbXZ8HXnVFM9dXB9crobBx8djGDKsjnzc/KwQ=";
cargoHash = "sha256-o64GrmHvwF2VUKw+nIRK0jesSuelxNo0TFnyKaP/YlQ=";
nativeBuildInputs = [ installShellFiles ];
@@ -18,13 +18,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "alpine-make-vm-image";
version = "0.13.3";
version = "0.13.4";
src = fetchFromGitHub {
owner = "alpinelinux";
repo = "alpine-make-vm-image";
tag = "v${finalAttrs.version}";
hash = "sha256-AIwT2JAGnMeMXUXZ0FRJthf22FvFfTTw/2LtZKPSj6g=";
hash = "sha256-U3eJ9wOxxbC9gEDBMXanBmEy0x6YBSsXXf6U5nzVoZ8=";
};
nativeBuildInputs = [ makeWrapper ];
@@ -7,13 +7,13 @@
stdenvNoCC.mkDerivation {
pname = "ananicy-rules-cachyos";
version = "0-unstable-2026-03-21";
version = "0-unstable-2026-03-30";
src = fetchFromGitHub {
owner = "CachyOS";
repo = "ananicy-rules";
rev = "a0305dc2070306a1af52aad9b03096a51f4147e8";
hash = "sha256-WAbJATvx5dWfpB0PYVVlRCVEygDzUU+qeOmhzRKA8GY=";
rev = "7460ed8d375425f50517119b0df3a57b876b504e";
hash = "sha256-hFBQGmGKUw/LT1DiyfnTsYO5Lt2c7LBMLRVBMmjYakY=";
};
dontConfigure = true;
+2 -2
View File
@@ -9,14 +9,14 @@
python3Packages.buildPythonApplication (finalAttrs: {
pname = "ansible-doctor";
version = "8.2.2";
version = "8.3.0";
pyproject = true;
src = fetchFromGitHub {
owner = "thegeeklab";
repo = "ansible-doctor";
tag = "v${finalAttrs.version}";
hash = "sha256-gezpY5iaFxNcngAyUnlVRPGo33zUgjdsm2zFlfWUWfA=";
hash = "sha256-lwN6pMKysycMOqVRNrK8+dgGfrsRF2B2EW1Kby0l/0I=";
};
build-system = with python3Packages; [
+9 -9
View File
@@ -1,22 +1,22 @@
{
"version": "1.20.6",
"version": "1.21.9",
"vscodeVersion": "1.107.0",
"sources": {
"x86_64-linux": {
"url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.20.6-5891862175809536/linux-x64/Antigravity.tar.gz",
"sha256": "ad382bf321a6216d07f95af1f613e03f5a07fdf6fc6632b769ce83d81afdd567"
"url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.21.9-4905428782546944/linux-x64/Antigravity.tar.gz",
"sha256": "85ea4d55f52d32fbbf9d92fddc747f10e8d04c1bd00a07721b571fa7f2ef5226"
},
"aarch64-linux": {
"url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.20.6-5891862175809536/linux-arm/Antigravity.tar.gz",
"sha256": "6e17f33d8ccb5622affb3590efccb87c3c4dd505f1d3b0f8506f1c20c39c026a"
"url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.21.9-4905428782546944/linux-arm/Antigravity.tar.gz",
"sha256": "76d56462e0fad95a98efaf25d06be9c4789e3b8551fe5b936a6858b14c723364"
},
"x86_64-darwin": {
"url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.20.6-5891862175809536/darwin-x64/Antigravity.zip",
"sha256": "4e56f3ac83bc0e1803b4d811585d567f3795b14ad57ccec1fcfe8cb02f7cb719"
"url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.21.9-4905428782546944/darwin-x64/Antigravity.zip",
"sha256": "a8ebdbf3b18c75d39b876541904c95576422e281fd92e45f7f7f4e7231ac769c"
},
"aarch64-darwin": {
"url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.20.6-5891862175809536/darwin-arm/Antigravity.zip",
"sha256": "c4392cc64a52b7b7066cb1c21c32918854b7cd7297b7efa3b14397fc7d05ad5a"
"url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.21.9-4905428782546944/darwin-arm/Antigravity.zip",
"sha256": "f9ec42d0a791cc13cbb57a1f7c36b2421e67f180cd0bdfb01fd8fa23ad87440b"
}
}
}
+13
View File
@@ -0,0 +1,13 @@
diff --git a/electron/main/index.ts b/electron/main/index.ts
index 78256e3..93e3881 100644
--- a/electron/main/index.ts
+++ b/electron/main/index.ts
@@ -4,6 +4,8 @@ import { createAppMenu } from './core/menu'
import { initAutoUpdater } from './core/updater'
import { createWindow, mainWindow } from './window'
+app.setDesktopName("Aonsoku.desktop")
+
export let isQuitting = false
const currentDesktop = process.env.XDG_CURRENT_DESKTOP ?? ''
+75 -30
View File
@@ -1,60 +1,102 @@
{
lib,
stdenv,
fetchFromGitHub,
rustPlatform,
cargo-tauri,
nodejs,
pnpm_8,
pnpm_9,
fetchPnpmDeps,
pnpmConfigHook,
pkg-config,
wrapGAppsHook3,
openssl,
webkitgtk_4_1,
glib-networking,
makeWrapper,
electron,
nix-update-script,
makeDesktopItem,
copyDesktopItems,
}:
rustPlatform.buildRustPackage (finalAttrs: {
stdenv.mkDerivation (finalAttrs: {
pname = "aonsoku";
version = "0.9.1";
version = "0.13.0";
src = fetchFromGitHub {
owner = "victoralvesf";
repo = "aonsoku";
tag = "v${finalAttrs.version}";
hash = "sha256-qlc7P222e6prYG30iVTAZhP772za3H7gVszfWvOr2NM=";
hash = "sha256-jpBO5MqOc18KGncpOWB/3IjCgkWb2zFfNxTpkcayZwo=";
};
# lockfileVersion: '6.0' need old pnpm
patches = [
./remove_updater.patch
./fix_appid.patch
];
pnpmDeps = fetchPnpmDeps {
inherit (finalAttrs) pname version src;
pnpm = pnpm_8;
pnpm = pnpm_9;
fetcherVersion = 3;
hash = "sha256-gOPjNZCljr8OvU/xLs9ZQ27dl3RatscXddOyPfSVdoE=";
hash = "sha256-B5bEAj6Ii/c7ZZobQmc8nHFbpBX9n/eYwRZ7lsLs3fk=";
};
cargoRoot = "src-tauri";
buildAndTestSubdir = finalAttrs.cargoRoot;
cargoHash = "sha256-8UtfL8iB1XKP31GT9Ok5hIQSobQTm681uiluG+IhK/s=";
patches = [ ./remove_updater.patch ];
nativeBuildInputs = [
nodejs
pnpm_9
pnpmConfigHook
pnpm_8
cargo-tauri.hook
pkg-config
wrapGAppsHook3
makeWrapper
electron
copyDesktopItems
];
buildInputs = [
openssl
webkitgtk_4_1
glib-networking
buildInputs = [ finalAttrs.pnpmDeps ];
desktopItems = [
(makeDesktopItem {
name = "aonsoku";
desktopName = "Aonsoku";
comment = "Modern desktop client for Navidrome/Subsonic servers";
exec = "Aonsoku";
icon = "aonsoku";
categories = [
"AudioVideo"
"Audio"
"Music"
"Player"
];
startupWMClass = "Aonsoku";
})
];
preConfigure = ''
export ELECTRON_SKIP_BINARY_DOWNLOAD=1
'';
buildPhase = ''
runHook preBuild
pnpm run electron:build
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir -p $out/lib/aonsoku/out
cp -r out/* $out/lib/aonsoku/out/
mkdir -p $out/lib/aonsoku/out/main/resources
cp -r resources/* $out/lib/aonsoku/out/main/resources/
cp -r node_modules $out/lib/aonsoku/
mkdir -p $out/bin
makeWrapper ${electron}/bin/electron $out/bin/Aonsoku \
--add-flags $out/lib/aonsoku/out/main/index.js \
--set ELECTRON_IS_DEV 0
mkdir -p $out/share/icons/hicolor/512x512/apps
cp resources/icons/icon.png \
$out/share/icons/hicolor/512x512/apps/aonsoku.png
runHook postInstall
'';
passthru.updateScript = nix-update-script { };
meta = {
@@ -62,7 +104,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
homepage = "https://github.com/victoralvesf/aonsoku";
changelog = "https://github.com/victoralvesf/aonsoku/releases/tag/v${finalAttrs.version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ genga898 ];
maintainers = with lib.maintainers; [
autrimpo
genga898
];
mainProgram = "Aonsoku";
};
})
+15 -39
View File
@@ -1,39 +1,15 @@
diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index 112ee8e..35137f2 100644
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -50,7 +50,6 @@ fn main() {
Ok(())
})
.plugin(tauri_plugin_shell::init())
- .plugin(tauri_plugin_updater::Builder::new().build())
.plugin(tauri_plugin_process::init())
.plugin(tauri_plugin_os::init())
.invoke_handler(tauri::generate_handler![commands::download_file])
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index 3afc5f6..19785e5 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -8,7 +8,6 @@
"bundle": {
"active": true,
"category": "Music",
- "createUpdaterArtifacts": true,
"targets": "all",
"icon": [
"icons/32x32.png",
@@ -26,14 +25,6 @@
"productName": "Aonsoku",
"mainBinaryName": "Aonsoku",
"identifier": "com.victoralvesf.aonsoku",
- "plugins": {
- "updater": {
- "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IDRDNTlENjZCNTJFRDdDRDAKUldUUWZPMVNhOVpaVENsbXg5RTM1TzFnME43TmZoaHU5bWplS1VSSW9YcE1QT0w1ZHRIWHNUOVoK",
- "endpoints": [
- "https://github.com/victoralvesf/aonsoku/releases/latest/download/latest.json"
- ]
- }
- },
"app": {
"withGlobalTauri": true,
"security": {
diff --git a/src/app/observers/update-observer.tsx b/src/app/observers/update-observer.tsx
index 7dd77aa..4a88a4f 100644
--- a/src/app/observers/update-observer.tsx
+++ b/src/app/observers/update-observer.tsx
@@ -30,8 +30,8 @@ export function UpdateObserver() {
const { data: updateCheckResult } = useQuery({
queryKey: [queryKeys.update.check],
- queryFn: async () => await window.api.checkForUpdates(),
- enabled: !remindOnNextBoot,
+ queryFn: async () => ({ files: [] }),
+ enabled: false,
refetchOnWindowFocus: false,
refetchOnMount: false,
staleTime: Infinity,
+2 -2
View File
@@ -16,13 +16,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "asn";
version = "0.80.4";
version = "0.80.5";
src = fetchFromGitHub {
owner = "nitefood";
repo = "asn";
tag = "v${finalAttrs.version}";
hash = "sha256-o0gHHV0tQeKd/qIGAMhA/cwUuCF7VLVDzngoFU8fGhI=";
hash = "sha256-o+qyNxEV2lPRsCNkkcZbj07hKw4eV45qhB8G34OWmgg=";
};
nativeBuildInputs = [
+1 -1
View File
@@ -39,6 +39,6 @@ stdenv.mkDerivation {
homepage = "https://beej.us/guide/bgnet/";
license = lib.licenses.unfree;
maintainers = with lib.maintainers; [ Profpatsch ];
maintainers = [ ];
};
}
+3 -3
View File
@@ -9,19 +9,19 @@
}:
let
version = "2.5.2";
version = "2.5.3";
src = fetchFromGitHub {
owner = "Azure";
repo = "azure-storage-fuse";
rev = "blobfuse2-${version}";
sha256 = "sha256-iTzVKb8z7lQh40iMZiwjeufColiwU2YrihBLNLjS6JI=";
sha256 = "sha256-PgpXlyFo+rE32wZfjx7h11YmNka4q/6Jbr03CsW0pZc=";
};
in
buildGoModule {
pname = "blobfuse";
inherit version src;
vendorHash = "sha256-9sT+8o+esVYdqYqAfkvyggqPiIIkG78krv+uID9+UBw=";
vendorHash = "sha256-I2/0BzT9KiMBpzReSll0dKY0uzULRx49fcVGD/z4BPQ=";
buildInputs = [ fuse3 ];
+2 -2
View File
@@ -19,13 +19,13 @@ in
llvmPackages.stdenv.mkDerivation (finalAttrs: {
pname = "c3c${optionalString debug "-debug"}";
version = "0.7.10";
version = "0.7.11";
src = fetchFromGitHub {
owner = "c3lang";
repo = "c3c";
tag = "v${finalAttrs.version}";
hash = "sha256-f4/tWe9pXogRNHLeMgwyK4yeQRWqeL+xPj6cwLWo2oo=";
hash = "sha256-M6lx7MHhR1ghR+stRGJB7NL2SwHoyFOfU2tKu9Hh2oU=";
};
cmakeBuildType = if debug then "Debug" else "Release";
+3 -3
View File
@@ -6,16 +6,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cargo-careful";
version = "0.4.9";
version = "0.4.10";
src = fetchFromGitHub {
owner = "RalfJung";
repo = "cargo-careful";
rev = "v${finalAttrs.version}";
hash = "sha256-huo5KFb+qoPVHNrnR+vb97iNinGaU5d3NbFhAgGCzCk=";
hash = "sha256-xnAPMSMpdnFF6hUU+SR+kyWsLNuD2dXYp0/qDF8QRfA=";
};
cargoHash = "sha256-mjGUSwqyqgnGwKjznj8KedIzOJi4GDldJEL0fzpuvec=";
cargoHash = "sha256-UiN2cWqwn+sJ56pODBilirw6jVnVz+rIsPuYVaNaSfM=";
meta = {
description = "Tool to execute Rust code carefully, with extra checking along the way";
+3 -3
View File
@@ -12,18 +12,18 @@
stdenv.mkDerivation (finalAttrs: {
pname = "cdk8s-cli";
version = "2.204.9";
version = "2.205.6";
src = fetchFromGitHub {
owner = "cdk8s-team";
repo = "cdk8s-cli";
rev = "v${finalAttrs.version}";
hash = "sha256-FV9/v8/UFrLtNPIZCh8No8A7n5oIzd9BlyjP1np8VZY=";
hash = "sha256-ZHorjCZbZ8Lu7DwhAbCC/uKNrg+rYwL75NCjKskh/JM=";
};
yarnOfflineCache = fetchYarnDeps {
inherit (finalAttrs) src;
hash = "sha256-4/1euuWSaZcRO2gwMj55g+m+K46D/bEd+yFJojGap5k=";
hash = "sha256-VAy3k99JB2j4MUCwXKyxSl+9OmGC1/xoJBF1/Xvuc54=";
};
nativeBuildInputs = [
+2 -2
View File
@@ -13,14 +13,14 @@
python3Packages.buildPythonApplication (finalAttrs: {
pname = "censor";
version = "0.4.0";
version = "0.6.0";
pyproject = false;
src = fetchFromCodeberg {
owner = "censor";
repo = "Censor";
tag = "v${finalAttrs.version}";
hash = "sha256-piRIa/weDhSve+NCtwq9vhzGyC7jmtyJ/x//llPGQn8=";
hash = "sha256-r5GhPr7dFLVy8nyKWg0poZSjWVrLrpnUHhe4MdEThvM=";
};
nativeBuildInputs = [
+3 -3
View File
@@ -16,16 +16,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "ciel";
version = "3.10.2";
version = "3.10.3";
src = fetchFromGitHub {
owner = "AOSC-Dev";
repo = "ciel-rs";
tag = "v${finalAttrs.version}";
hash = "sha256-lYw1Dzh3zQ9V5TqZGVJ5LTHuAsnEYsJsShkiJcXMGfc=";
hash = "sha256-y6AM3tLACJscGSVh3WhEONSkDmXC2KFL3VKt8a7CdGU=";
};
cargoHash = "sha256-RSdJFjFO0ah2WXazc2QDFQzvNwOKxe0IKiNIjRHO0EQ=";
cargoHash = "sha256-rgflNUoAOKzqXKMoSDbAgqV1tKbFgJUeH0K7RCVC1ME=";
nativeBuildInputs = [
pkg-config
+3 -1
View File
@@ -42,7 +42,9 @@ stdenv.mkDerivation (finalAttrs: {
substituteInPlace CMakeLists.txt \
--replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)" \
--replace-fail "CMAKE_POLICY(VERSION 2.8.7)" "CMAKE_POLICY(VERSION 3.10)" \
--replace-fail "CMAKE_POLICY(SET CMP0045 OLD)" ""
--replace-fail "CMAKE_POLICY(SET CMP0045 OLD)" "" \
--replace-fail "FIND_PACKAGE(Boost REQUIRED COMPONENTS filesystem system)" \
"FIND_PACKAGE(Boost REQUIRED COMPONENTS filesystem)"
'';
meta = {
+18 -18
View File
@@ -1,46 +1,46 @@
{
"version": "2.1.88",
"buildDate": "2026-03-30T22:06:06Z",
"version": "2.1.89",
"buildDate": "2026-03-31T23:01:10Z",
"platforms": {
"darwin-arm64": {
"binary": "claude",
"checksum": "fe0d191adb7b0d26badd1e303e95a63d62d526ca1fb5882f53644754e1e9fe95",
"size": 196192880
"checksum": "f903a5e53f845b1ac5566296b713193827665f28da16300fdca7539cb0669a7f",
"size": 196886384
},
"darwin-x64": {
"binary": "claude",
"checksum": "4036c17c5ebdeaf024f198b041e012e494b8cab8c7dec1bdde567ebbbfc5124d",
"size": 197703504
"checksum": "1322c5eecec8047e9cd7114f7d547ef6a9596563d6bbc7e594167d0f8bc8b406",
"size": 198397008
},
"linux-arm64": {
"binary": "claude",
"checksum": "2ba4ac149b2198c15e45837fc504146c735fc1e82b9fdf717c2a6b9e0f70c02c",
"size": 228330048
"checksum": "428301f56cf0139e6fbfa55e13be3f0f032ac1eb5ddb8849fbc703ee220c1cca",
"size": 228657728
},
"linux-x64": {
"binary": "claude",
"checksum": "ced6cac958fa4425b90e6c9341a26731715fcb1a253d5bc0f51c8d5a3a6ab66e",
"size": 228121216
"checksum": "903cb3c96b314d86856632c8702f5cdf971b804d0b19ef87446573bcd1d7df1c",
"size": 228473472
},
"linux-arm64-musl": {
"binary": "claude",
"checksum": "39fc36357d927750f6b2ef85afd30a50549e4ca7e3cd0887e6e7e76b2db8c56f",
"size": 221448640
"checksum": "7cb5fd60f3d2366672857077f3bd0f93ab83dffebd8f93c70344afa58bdb91ec",
"size": 221776320
},
"linux-x64-musl": {
"binary": "claude",
"checksum": "658327a04523e7e9a9578bc061c7c82804846d9fbff04c88177002f2f93cff5f",
"size": 222747072
"checksum": "60941916f0a5656a5952a0f2f54228f574f8756ea503119f858724ad43c9b28d",
"size": 223099328
},
"win32-x64": {
"binary": "claude.exe",
"checksum": "34a248b3f381f27e4adde1f4dc745f6b63aa28ff0c6eee550d47746a4d197ec0",
"size": 238212768
"checksum": "2e312000b538f11d13f1dfc52d4131996895b9a07bd8897d8f9153635d4ea092",
"size": 238557856
},
"win32-arm64": {
"binary": "claude.exe",
"checksum": "eee6beba9efb300d097a6fe4151c1d83cb84ea1598555fe358b07d33a434decc",
"size": 234668704
"checksum": "5f1d597c542aac3a11f557e12c92d0c49220ab77e741014b0599a572d81ca679",
"size": 235014304
}
}
}
+2 -2
View File
@@ -1,12 +1,12 @@
{
"name": "@anthropic-ai/claude-code",
"version": "2.1.88",
"version": "2.1.89",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "@anthropic-ai/claude-code",
"version": "2.1.88",
"version": "2.1.89",
"license": "SEE LICENSE IN README.md",
"bin": {
"claude": "cli.js"
+3 -3
View File
@@ -15,14 +15,14 @@
}:
buildNpmPackage (finalAttrs: {
pname = "claude-code";
version = "2.1.88";
version = "2.1.89";
src = fetchzip {
url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz";
hash = "sha256-LwTZaxp1Wq6BYQ/Los5aMHufGKb3NM7BuuW0Kaxo2QA=";
hash = "sha256-FoTm6KDr+8Dzhk4ibZUlU1QLPFdPm/OriUUWqAaFswg=";
};
npmDepsHash = "sha256-izy3dQProZIdUF5Z11fvGQOm/TBcWGhDK8GvNs8gG5E=";
npmDepsHash = "sha256-NI4F5bq0lEuMjLUdkGrml2aOzGbGkdyUckgfeVFEe8o=";
strictDeps = true;
+20
View File
@@ -0,0 +1,20 @@
# not a stable interface, do not reference outside the codex package but make a copy if you need
{
lib,
stdenv,
fetchurl,
}:
{
fetchLibrustyV8 =
args:
fetchurl {
name = "librusty_v8-${args.version}";
url = "https://github.com/denoland/rusty_v8/releases/download/v${args.version}/librusty_v8_release_${stdenv.hostPlatform.rust.rustcTarget}.a.gz";
sha256 = args.shas.${stdenv.hostPlatform.system};
meta = {
inherit (args) version;
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
};
};
}
+12
View File
@@ -0,0 +1,12 @@
# auto-generated file -- DO NOT EDIT!
{ fetchLibrustyV8 }:
fetchLibrustyV8 {
version = "146.4.0";
shas = {
x86_64-linux = "sha256-5ktNmeSuKTouhGJEqJuAF4uhA4LBP7WRwfppaPUpEVM=";
aarch64-linux = "sha256-2/FlsHyBvbBUvARrQ9I+afz3vMGkwbW0d2mDpxBi7Ng=";
x86_64-darwin = "sha256-YwzSQPG77NsHFBfcGDh6uBz2fFScHFFaC0/Pnrpke7c=";
aarch64-darwin = "sha256-v+LJvjKlbChUbw+WWCXuaPv2BkBfMQzE4XtEilaM+Yo=";
};
}
+12 -5
View File
@@ -1,15 +1,19 @@
{
lib,
stdenv,
callPackage,
rustPlatform,
fetchFromGitHub,
installShellFiles,
cargo,
bubblewrap,
clang,
cmake,
gitMinimal,
libcap,
libclang,
librusty_v8 ? callPackage ./librusty_v8.nix {
inherit (callPackage ./fetchers.nix { }) fetchLibrustyV8;
},
makeBinaryWrapper,
nix-update-script,
pkg-config,
@@ -20,18 +24,18 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "codex";
version = "0.116.0";
version = "0.118.0";
src = fetchFromGitHub {
owner = "openai";
repo = "codex";
tag = "rust-v${finalAttrs.version}";
hash = "sha256-PTsKphg3gPlBUs5oMM34RhJJ4jxvD6hand5aVjXcuZ4=";
hash = "sha256-FdtV+CIqTInnegcXrXBxw4aE0JnNDh4GdYKwUDjSk9Y=";
};
sourceRoot = "${finalAttrs.src.name}/codex-rs";
cargoHash = "sha256-X5Yh8+3UrCZfzIplb4OzFfcfoklMu3FikU9vZ6CJbfc=";
cargoHash = "sha256-7rexlmc79eUkwcqTa8rN3GFDy1dWs+0h/SUllZqAcpM=";
nativeBuildInputs = [
clang
@@ -64,6 +68,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
"-Wno-error=character-conversion"
]
);
RUSTY_V8_ARCHIVE = librusty_v8;
};
# NOTE: part of the test suite requires access to networking, local shells,
@@ -82,7 +87,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
'';
postFixup = ''
wrapProgram $out/bin/codex --prefix PATH : ${lib.makeBinPath [ ripgrep ]}
wrapProgram $out/bin/codex --prefix PATH : ${
lib.makeBinPath ([ ripgrep ] ++ lib.optionals stdenv.hostPlatform.isLinux [ bubblewrap ])
}
'';
doInstallCheck = true;
+6
View File
@@ -47,6 +47,12 @@ stdenv.mkDerivation (finalAttrs: {
})
];
postPatch = ''
substituteInPlace CMakeLists.txt \
--replace-fail 'find_package(Boost COMPONENTS system filesystem regex REQUIRED)' \
'find_package(Boost COMPONENTS filesystem regex REQUIRED)'
'';
nativeBuildInputs = [
cmake
xmlstarlet
@@ -0,0 +1,49 @@
diff --git a/src/compress_pptx/__main__.py b/src/compress_pptx/__main__.py
index 433b6d8..f86c2e2 100644
--- a/src/compress_pptx/__main__.py
+++ b/src/compress_pptx/__main__.py
@@ -101,7 +101,7 @@ def main():
"--ffmpeg-path",
type=str,
help="Path to ffmpeg executable",
- default="ffmpeg",
+ default="@ffmpeg@",
)
cli_args = parser.parse_args()
diff --git a/src/compress_pptx/compress_pptx.py b/src/compress_pptx/compress_pptx.py
index 0cb5b42..0845aef 100644
--- a/src/compress_pptx/compress_pptx.py
+++ b/src/compress_pptx/compress_pptx.py
@@ -131,7 +131,7 @@ class CompressPptx:
ffmpeg_video_codec: Optional[str] = None,
ffmpeg_audio_codec: Optional[str] = None,
ffmpeg_extra_options: Optional[str] = None,
- ffmpeg_path: str = "ffmpeg",
+ ffmpeg_path: str = "@ffmpeg@",
) -> None:
"""
Compress images in a PowerPoint file or extract media.
@@ -187,19 +187,9 @@ class CompressPptx:
self.file_list: List[FileObj] = []
- # Check for ImageMagick - prefer 'magick' but fall back to 'convert'/'identify'
- if which("magick") is not None:
- self.magick_cmd = "magick"
- self.convert_cmd = ["magick", "convert"]
- self.identify_cmd = ["magick", "identify"]
- elif which("convert") is not None and which("identify") is not None:
- self.magick_cmd = "convert"
- self.convert_cmd = ["convert"]
- self.identify_cmd = ["identify"]
- else:
- raise CompressPptxError(
- "ImageMagick not found in PATH. Make sure you have installed ImageMagick and that either 'magick' or 'convert'/'identify' commands are available."
- )
+ self.magick_cmd = "@magick@"
+ self.convert_cmd = ["@magick@", "convert"]
+ self.identify_cmd = ["@magick@", "identify"]
required_executables = []
# add ffmpeg to required executables if user wants media files to be compressed
+54
View File
@@ -0,0 +1,54 @@
{
lib,
python3Packages,
fetchFromGitHub,
# patches
replaceVars,
ffmpeg,
imagemagick,
}:
python3Packages.buildPythonApplication (finalAttrs: {
pname = "compress-pptx";
version = "1.3.1";
pyproject = true;
src = fetchFromGitHub {
owner = "slhck";
repo = "compress-pptx";
tag = "v${finalAttrs.version}";
hash = "sha256-+67EdAEWsRY11Pkie6AOz7Sl7MSTMGxZoQYS+M2x07Y=";
};
patches = [
(replaceVars ./inject-dependency-paths.patch {
ffmpeg = lib.getExe ffmpeg;
magick = lib.getExe imagemagick;
})
];
build-system = with python3Packages; [ uv-build ];
dependencies = with python3Packages; [
ffmpeg-progress-yield
tqdm
];
nativeCheckInputs = [
python3Packages.pytestCheckHook
];
meta = {
description = "Compress PPTX files";
longDescription = ''
Compress a PPTX or POTX file, converting all PNG/TIFF images to lossy
JPEGs.
'';
homepage = "https://github.com/slhck/compress-pptx";
license = lib.licenses.mit;
changelog = "https://github.com/slhck/compress-pptx/releases/tag/${finalAttrs.src.tag}";
mainProgram = "compress-pptx";
maintainers = with lib.maintainers; [ artur-sannikov ];
};
})
+4 -4
View File
@@ -1,8 +1,8 @@
[
{
"pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
"version": "10.0.3",
"hash": "sha256-ShB94jEtsq5X5r6xDZQ+wotZYG3OPKOCHNGy4B7NVFs="
"version": "10.0.5",
"hash": "sha256-KrP+hE3gk7pATbJYZsJ1LHiXjzLA+ntHW7G/VGgHk2g="
},
{
"pname": "Serilog",
@@ -41,7 +41,7 @@
},
{
"pname": "Tmds.DBus",
"version": "0.90.3",
"hash": "sha256-/yBQpjsIqbY4JFBxxVKXPR2S/N1TMLG5QPXvScSCdEk="
"version": "0.91.1",
"hash": "sha256-MtHZFutIm0VKVkM/kRMucZIRL0jAEEPSj2D2MLxbAH4="
}
]
@@ -14,13 +14,13 @@
buildDotnetModule rec {
pname = "crossmacro-daemon";
version = "0.9.9";
version = "1.0.1";
src = fetchFromGitHub {
owner = "alper-han";
repo = "CrossMacro";
tag = "v${version}";
hash = "sha256-LYjGuv+LMqug0sba64sGi9U+9XlK/A4CO+9H/6drgMw=";
hash = "sha256-ki5zEFqa9wSGw2jidGoN0Zb69to7ilXgb9fqrjo40ks=";
};
projectFile = "src/CrossMacro.Daemon/CrossMacro.Daemon.csproj";
+28 -28
View File
@@ -1,8 +1,8 @@
[
{
"pname": "Avalonia",
"version": "11.3.12",
"hash": "sha256-T2y8aoKUSfXqmV2RL1QStytzJkc/SZYfIdJihB5UWR0="
"version": "11.3.13",
"hash": "sha256-9khLyFw6dk82UhmQoGf0R2HA5AmRyGA0pydM+unZ+ww="
},
{
"pname": "Avalonia.BuildServices",
@@ -11,53 +11,53 @@
},
{
"pname": "Avalonia.Controls.ColorPicker",
"version": "11.3.12",
"hash": "sha256-zNpmfOTfw+gKZp8VPpfHe2hjqhrRmExf7lxqLf5OvDg="
"version": "11.3.13",
"hash": "sha256-hzGLVkFxGDxqYE0+1J6Ze/akUUmhnGiNaeHeNx9JYlg="
},
{
"pname": "Avalonia.Diagnostics",
"version": "11.3.12",
"hash": "sha256-iDH6DjRKqm4YLXBq2JGg9IkkEGm3Rq1FQWyr/L+VaVA="
"version": "11.3.13",
"hash": "sha256-hGiZB8zq56ByjzSf1o3XEJ0rHTnVNrGrVm3xgwVwleg="
},
{
"pname": "Avalonia.Fonts.Inter",
"version": "11.3.12",
"hash": "sha256-yr4/zpUbmQuVzdupV5v87qNO24sPOVhnnJ1SeiLxMx8="
"version": "11.3.13",
"hash": "sha256-cP7mpGsk+qAMzsfbrq42pujN8ZLsD+PSjXGDnMIjVp4="
},
{
"pname": "Avalonia.FreeDesktop",
"version": "11.3.12",
"hash": "sha256-NTcYVHn13lFQjTNezmpmPGjxsBzryXorK0K6hl4ZZto="
"version": "11.3.13",
"hash": "sha256-YLAdQj/8zmrKJp7+7EQY6bmDXfCiBtUHYrVw0KPpXNw="
},
{
"pname": "Avalonia.Remote.Protocol",
"version": "11.3.12",
"hash": "sha256-dF93nP1Cd7ZdzrO7ScGHchxYxCjWN45AjiqiO1J+cmU="
"version": "11.3.13",
"hash": "sha256-HrT+dI3NLTVv5NpmhEb1ZVrXF4hgC0IkQ23VZVmw/qc="
},
{
"pname": "Avalonia.Skia",
"version": "11.3.12",
"hash": "sha256-gRMjH7igRIm22zQV0WxtwFHe8AiMTcaPlR0sC5lJy+w="
"version": "11.3.13",
"hash": "sha256-kNIZ8HpNiQIqEyYYlJ/ND/tBGT5KY3jeL8W6GFTJIvU="
},
{
"pname": "Avalonia.Themes.Fluent",
"version": "11.3.12",
"hash": "sha256-4TTsW7zLF0Z9C1lzPsPfekHpHrSx7RB7I63j/cKUX8U="
"version": "11.3.13",
"hash": "sha256-bAIaj72UKH5Lxv1bLcXt5bPuB51pYGOJHO1gGs1uGrM="
},
{
"pname": "Avalonia.Themes.Simple",
"version": "11.3.12",
"hash": "sha256-EIuAcUmoL7/y4lUfdSg120/l/v3zQytC2rfr0b6jKiM="
"version": "11.3.13",
"hash": "sha256-PzCYsrELqrINWcTzIHpnKQ757xsiYMEBa6fTUQGg3zE="
},
{
"pname": "Avalonia.X11",
"version": "11.3.12",
"hash": "sha256-SEc0GaZTh1eGNFWHT6lGiN6LD0qE+ubTK7Efl0H/Q2w="
"version": "11.3.13",
"hash": "sha256-Eeeq4K4q2GihIVFhCKFjTc+di/M39OgfFyF7aaZOJdg="
},
{
"pname": "CommunityToolkit.Mvvm",
"version": "8.4.0",
"hash": "sha256-a0D550q+ffreU9Z+kQPdzJYPNaj1UjgyPofLzUg02ZI="
"version": "8.4.2",
"hash": "sha256-jLS1vo6V+fHsJs80HYT77oJE6IEC68fIgkLpYODjWAU="
},
{
"pname": "HarfBuzzSharp",
@@ -91,13 +91,13 @@
},
{
"pname": "Microsoft.Extensions.DependencyInjection",
"version": "10.0.3",
"hash": "sha256-h/wiSaVtRCIGdkv6/soA41Dhdlmu2I9hjv/swP8OjDk="
"version": "10.0.5",
"hash": "sha256-ofDRirUV9XLSz4oksCqErwBJFtAieHACFfyZukHKFng="
},
{
"pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
"version": "10.0.3",
"hash": "sha256-ShB94jEtsq5X5r6xDZQ+wotZYG3OPKOCHNGy4B7NVFs="
"version": "10.0.5",
"hash": "sha256-KrP+hE3gk7pATbJYZsJ1LHiXjzLA+ntHW7G/VGgHk2g="
},
{
"pname": "Serilog",
@@ -161,8 +161,8 @@
},
{
"pname": "Tmds.DBus",
"version": "0.90.3",
"hash": "sha256-/yBQpjsIqbY4JFBxxVKXPR2S/N1TMLG5QPXvScSCdEk="
"version": "0.91.1",
"hash": "sha256-MtHZFutIm0VKVkM/kRMucZIRL0jAEEPSj2D2MLxbAH4="
},
{
"pname": "Tmds.DBus.Protocol",
+2 -2
View File
@@ -29,13 +29,13 @@
buildDotnetModule rec {
pname = "crossmacro";
version = "0.9.9";
version = "1.0.1";
src = fetchFromGitHub {
owner = "alper-han";
repo = "CrossMacro";
tag = "v${version}";
hash = "sha256-LYjGuv+LMqug0sba64sGi9U+9XlK/A4CO+9H/6drgMw=";
hash = "sha256-ki5zEFqa9wSGw2jidGoN0Zb69to7ilXgb9fqrjo40ks=";
};
projectFile = "src/CrossMacro.UI.Linux/CrossMacro.UI.Linux.csproj";
+3 -3
View File
@@ -8,16 +8,16 @@
buildGoModule (finalAttrs: {
pname = "ctlptl";
version = "0.9.0";
version = "0.9.1";
src = fetchFromGitHub {
owner = "tilt-dev";
repo = "ctlptl";
rev = "v${finalAttrs.version}";
hash = "sha256-y957JaHg2SnDC6yvwI/0fBFjbEKOfKFsNqOOrqQe+TU=";
hash = "sha256-vbg3gaVCFkQ6jKguNq6ClstEKpTrk9ryUG572emEY4U=";
};
vendorHash = "sha256-gJiarW1uYr5vl9nt+JN6/yRyYr9J0sfDVZcNLLcwPJY=";
vendorHash = "sha256-b9lzCNjO0rrK/kJlw5dssuQD/cyf/Wu/LJ2YNQ645LE=";
nativeBuildInputs = [ installShellFiles ];
+2 -2
View File
@@ -6,14 +6,14 @@
python3Packages.buildPythonApplication (finalAttrs: {
pname = "cyclonedx-python";
version = "7.2.2";
version = "7.3.0";
pyproject = true;
src = fetchFromGitHub {
owner = "CycloneDX";
repo = "cyclonedx-python";
tag = "v${finalAttrs.version}";
hash = "sha256-nTQ0y2zn4idg6x8qVjK8DeZVCMnlXLEJg89ISYabp68=";
hash = "sha256-mBOkSgHGKc77zhcMmdsrlZLXsK2t00VFiGW5eSN2lxc=";
};
build-system = with python3Packages; [ poetry-core ];
+8 -2
View File
@@ -12,11 +12,13 @@
libxtst,
coreutils,
gnugrep,
zulu,
preferGtk3 ? true,
preferZulu ? false,
}:
let
jre' = jdk.override { enableJavaFX = true; };
jre' = (if preferZulu then zulu else jdk).override { enableJavaFX = true; };
gtk' = if preferGtk3 then gtk3 else gtk2;
in
stdenv.mkDerivation (finalAttrs: {
@@ -80,7 +82,11 @@ stdenv.mkDerivation (finalAttrs: {
description = "Java application which presents a Microsoft Exchange server as local CALDAV, IMAP and SMTP servers";
homepage = "https://davmail.sourceforge.net/";
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ peterhoeg ];
maintainers = with lib.maintainers; [
peterhoeg
doronbehar
shymega
];
platforms = lib.platforms.all;
mainProgram = "davmail";
};
+3 -3
View File
@@ -8,15 +8,15 @@
}:
let
version = "7.1.110";
version = "7.1.120";
srcs = {
x86_64-linux = fetchurl {
url = "https://github.com/aunetx/deezer-linux/releases/download/v${version}/deezer-desktop-${version}-x64.tar.xz";
hash = "sha256-g8HAAp36l0GrAg/bJOjlvNT13Z9p/geDbA5XQCk3QvM=";
hash = "sha256-RrsM8Rx/uYJpH9+w/XX0RoPw+N/+nzJCC+KFdbYzSdc=";
};
aarch64-linux = fetchurl {
url = "https://github.com/aunetx/deezer-linux/releases/download/v${version}/deezer-desktop-${version}-arm64.tar.xz";
hash = "sha256-W6br5bvRwgrfSiwwO5OMwfReev7t3mvI6L0zTIIDiwI=";
hash = "sha256-WgCfX7Av8YoCHmhACyyVtxut0FUfAdgTAXaIBydWTRI=";
};
};
+2 -2
View File
@@ -5,14 +5,14 @@
}:
python3Packages.buildPythonApplication (finalAttrs: {
pname = "djhtml";
version = "3.0.10";
version = "3.0.11";
pyproject = true;
src = fetchFromGitHub {
owner = "rtts";
repo = "djhtml";
tag = finalAttrs.version;
hash = "sha256-7K7/Zm6ORfza9AD+Jyl+0Q5zlxgF+WpH3a1O18VpT5k=";
hash = "sha256-l3qxPwnEyJ0sZWquaol0bOX7QvImLc8IRTfyE2yqXCo=";
};
build-system = [ python3Packages.setuptools ];
@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "dn42-registry-wizard";
version = "0.4.17";
version = "0.4.19";
src = fetchFromGitHub {
owner = "Kioubit";
repo = "dn42_registry_wizard";
tag = "v${finalAttrs.version}";
hash = "sha256-wczsDKHcf/izEhJp9THL9yoEfZHTZ0FoVU4CTxmNuAY=";
hash = "sha256-axtNkBX0OTm/3HwpZATsAefW/LEFDtTODLJgHJiFws8=";
};
cargoHash = "sha256-Op0xjblw3fB1boRaYoVH9O+c2Zodi/TtJ6sQSiz/rLo=";
cargoHash = "sha256-VfdxsS8VIgDDyhNXML5jVl+9uxwHa83aWB6nJ7mHflI=";
postInstall = ''
mv $out/bin/{registry_wizard,dn42-registry-wizard}
+6 -1
View File
@@ -28,7 +28,12 @@ stdenv.mkDerivation {
configFile =
if lib.isDerivation conf || builtins.isPath conf then conf else writeText "blocks.def.h" conf;
in
lib.optionalString (conf != null) "cp ${configFile} blocks.def.h";
lib.optionalString (conf != null) "cp ${configFile} blocks.def.h"
+ ''
# gcc15
substituteInPlace dwmblocks.c \
--replace-fail 'void termhandler()' 'void termhandler(int signum)'
'';
makeFlags = [ "PREFIX=$(out)" ];
+3 -3
View File
@@ -6,18 +6,18 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "emmylua_doc_cli";
version = "0.21.0";
version = "0.22.0";
src = fetchFromGitHub {
owner = "EmmyLuaLs";
repo = "emmylua-analyzer-rust";
tag = finalAttrs.version;
hash = "sha256-2H/8ILVk5QnLe099a25pzMEqJLRFDxMG/fQ3f5UwgmI=";
hash = "sha256-Zj5nLeTH/4sVElYP+erg6bSTX8jFqF7sqiXfaMam8pE=";
};
buildAndTestSubdir = "crates/emmylua_doc_cli";
cargoHash = "sha256-QdL4KtQ4sJUaviqMzxmC1KW4Qy5wO7c5koy0Pl8Eua0=";
cargoHash = "sha256-JNirHIKXFsiLme5oByerHjB/3lumuAr2u3pNfxh4qa0=";
nativeInstallCheckInputs = [
versionCheckHook
+2 -2
View File
@@ -8,13 +8,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "ethercat";
version = "1.6.8";
version = "1.6.9";
src = fetchFromGitLab {
owner = "etherlab.org";
repo = "ethercat";
tag = finalAttrs.version;
hash = "sha256-yIlaAjPNcA7yIiCe+2kwk5IHIkwUv8bTxK0H3hu91MI=";
hash = "sha256-Msx0i1SAwlSMD3+vjGRNe36Yx9qdUYokVekGytZptqk=";
};
separateDebugInfo = true;
+3 -3
View File
@@ -15,13 +15,13 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "eww";
version = "0.6.0-unstable-2025-06-30";
version = "0.6.0-unstable-2026-03-05";
src = fetchFromGitHub {
owner = "elkowar";
repo = "eww";
rev = "fddb4a09b107237819e661151e007b99b5cab36d";
hash = "sha256-PJW4LvW9FmkG9HyUtgXOq7MDjYtBc/iJuOxyf29nD0Y=";
rev = "865cf631d5bbb5f9fccc99b3f4cc80b9eeada18c";
hash = "sha256-fL12XFMsf/efSlbzQc7cCI366CwETkM6sWpEfcF9s6A=";
};
cargoHash = "sha256-Kf99eojqXvdbZ3eRS8GBgyLYNpZKJGIJtsOsvhhSVDk=";
+1 -1
View File
@@ -96,6 +96,6 @@ stdenv.mkDerivation {
description = "Set of utilities for working with file descriptors";
license = lib.licenses.gpl2Only;
platforms = lib.platforms.linux;
maintainers = [ lib.maintainers.Profpatsch ];
maintainers = [ ];
};
}
+2 -2
View File
@@ -6,10 +6,10 @@
let
pname = "fflogs";
version = "9.0.24";
version = "9.0.33";
src = fetchurl {
url = "https://github.com/RPGLogs/Uploaders-fflogs/releases/download/v${version}/fflogs-v${version}.AppImage";
hash = "sha256-9L9eNpK2MI3P+mhUDCAzfi3YDdWpHGjiUS5LjksUjqo=";
hash = "sha256-gUIETMc0JQXONBt0+Pw52y37Pw4Wh5CHo1uY6IBhvkc=";
};
extracted = appimageTools.extractType2 { inherit pname version src; };
in
@@ -8,11 +8,11 @@
let
pname = "fiddler-everywhere";
version = "7.7.1";
version = "7.7.2";
src = fetchurl {
url = "https://downloads.getfiddler.com/linux/fiddler-everywhere-${version}.AppImage";
hash = "sha256-mwHtT7GAR7CdOVvFPpzqF6j1Ed5kBlJ39RyITg1BgAs=";
hash = "sha256-kxS15ymgc8qJANYUnrm8TbuFIYsGlw23pfuuKrROQyE=";
};
appimageContents = appimageTools.extract {
+3 -3
View File
@@ -24,18 +24,18 @@
stdenv.mkDerivation (finalAttrs: {
pname = "flare";
version = "0.20.1";
version = "0.20.2";
src = fetchFromGitLab {
owner = "schmiddi-on-mobile";
repo = "flare";
tag = finalAttrs.version;
hash = "sha256-DVbN+VUk7K2CBwQ4rOGIJj+KYOlB9TeDUGE+s5docok=";
hash = "sha256-LjUd+tq4nBJtBXeOH1SyjKS37R8f5rVvDk+jTR/Mdvs=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) pname version src;
hash = "sha256-/3xcouWXUxoVFHV05eD4IEuQbPAn+iFIwB8tP+jJm+4=";
hash = "sha256-dXPCyHc6+iS4YMIVy0vOkPG57GEW1ce5sSgyw6k0M3U=";
};
nativeBuildInputs = [
@@ -67,7 +67,10 @@ stdenv.mkDerivation rec {
- A81
- A81H
- C80
- C801
- C80H
- C80S1
- C80Y1
- D80
- D80 Pro
- Y8
+1 -1
View File
@@ -32,7 +32,7 @@ let
description = "Proxy client based on ClashMeta, simple and easy to use";
homepage = "https://github.com/chen08209/FlClash";
license = with lib.licenses; [ gpl3Plus ];
maintainers = [ ];
maintainers = with lib.maintainers; [ VZstless ];
};
core = buildGoModule {
@@ -1,13 +0,0 @@
diff --git a/_scripts/build.js b/_scripts/build.js
index ee1b7fa1c..1a4c9c6b2 100644
--- a/_scripts/build.js
+++ b/_scripts/build.js
@@ -16,7 +16,7 @@ if (platform === 'darwin') {
arch = Arch.arm64
}
- targets = Platform.MAC.createTarget(['DMG', 'zip', '7z'], arch)
+ targets = Platform.MAC.createTarget(['dir'], arch)
} else if (platform === 'win32') {
let arch = Arch.x64
+5 -5
View File
@@ -20,13 +20,13 @@ let
in
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "freetube";
version = "0.23.15";
version = "0.24.0";
src = fetchFromGitHub {
owner = "FreeTubeApp";
repo = "FreeTube";
tag = "v${finalAttrs.version}-beta";
hash = "sha256-tYRvR75qbJwt6U4KzT9jrJjO5UznpoALqhUTDkeUlzI=";
hash = "sha256-4XyN7ENsDwLNB/dt7pp8z0sbdmHSNIyVEHlp5GXIues=";
};
# Darwin requires writable Electron dist
@@ -45,12 +45,12 @@ stdenvNoCC.mkDerivation (finalAttrs: {
(replaceVars ./patch-build-script.patch {
electron-version = electron.version;
})
./darwin-targets.patch
./targets.patch
];
yarnOfflineCache = fetchYarnDeps {
yarnLock = "${finalAttrs.src}/yarn.lock";
hash = "sha256-sxDlPB3CWbFAm3WZ6AlwuVu/4UFR9Stl3q0wpkUXPPU=";
hash = "sha256-9rO/XYfOf1TEQOpb5clCfdTiuDeynpnk6L4WpcIIWGk=";
};
nativeBuildInputs = [
@@ -70,7 +70,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
makeWrapper ${lib.getExe electron} $out/bin/freetube \
--add-flags "$out/share/freetube/resources/app.asar" \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
install -D _icons/icon.svg $out/share/icons/hicolor/scalable/apps/freetube.svg
''
@@ -1,13 +1,13 @@
diff --git a/_scripts/ebuilder.config.js b/_scripts/ebuilder.config.js
index 14d0d9df1..c5fc569c8 100644
--- a/_scripts/ebuilder.config.js
+++ b/_scripts/ebuilder.config.js
@@ -1,6 +1,8 @@
const { name, productName } = require('../package.json')
diff --git a/_scripts/ebuilder.config.mjs b/_scripts/ebuilder.config.mjs
index bef1f6f1d..d2ee86611 100644
--- a/_scripts/ebuilder.config.mjs
+++ b/_scripts/ebuilder.config.mjs
@@ -2,6 +2,8 @@ import packageDetails from '../package.json' with { type: 'json' }
const config = {
/** @type {import('electron-builder').Configuration} */
export default {
+ electronVersion: "@electron-version@",
+ electronDist: "electron-dist",
appId: `io.freetubeapp.${name}`,
copyright: 'Copyleft © 2020-2025 freetubeapp@protonmail.com',
appId: `io.freetubeapp.${packageDetails.name}`,
copyright: 'Copyleft © 2020-2026 freetubeapp@protonmail.com',
// asar: false,
+22
View File
@@ -0,0 +1,22 @@
diff --git a/_scripts/build.mjs b/_scripts/build.mjs
index 1617f1ad5..b9a1de43b 100644
--- a/_scripts/build.mjs
+++ b/_scripts/build.mjs
@@ -14,7 +14,7 @@ if (platform === 'darwin') {
arch = Arch.arm64
}
- targets = Platform.MAC.createTarget(['DMG', 'zip', '7z'], arch)
+ targets = Platform.MAC.createTarget(['dir'], arch)
} else if (platform === 'win32') {
let arch = Arch.x64
@@ -34,7 +34,7 @@ if (platform === 'darwin') {
arch = Arch.armv7l
}
- targets = Platform.LINUX.createTarget(['deb', 'zip', '7z', 'rpm', 'AppImage', 'pacman'], arch)
+ targets = Platform.LINUX.createTarget(['dir'], arch)
}
const output = await build({ targets, config, publish: 'never' })
+1 -1
View File
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
meta = {
description = "Extract the initial/default boot image from a CD image if existent";
homepage = "https://userpages.uni-koblenz.de/~krienke/ftp/noarch/geteltorito/";
maintainers = [ lib.maintainers.Profpatsch ];
maintainers = [ ];
license = lib.licenses.gpl2Only;
mainProgram = "geteltorito";
};
+2 -2
View File
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "gh-token";
version = "2.0.9";
version = "2.0.10";
src = fetchFromGitHub {
owner = "Link-";
repo = "gh-token";
rev = "v${version}";
hash = "sha256-ff3Dzajh/7p0yNSKCHJzJcqkTpf09zuZ6Hp0ygDv6o0=";
hash = "sha256-pjOGEd2c2yRua3qOTEKuTg89YbVBTAIvvZ/Rd8NFesI=";
};
vendorHash = "sha256-brAFqWdvaJwURdWb9m8x21nhuXeRxIJX6FsUfGiFIWQ=";
+9
View File
@@ -2,6 +2,7 @@
lib,
buildGoModule,
fetchFromGitHub,
fetchpatch,
testers,
ginkgo,
}:
@@ -18,6 +19,14 @@ buildGoModule (finalAttrs: {
};
vendorHash = "sha256-I3n1FPINb/nhi4QUzRFEspn7REN1dQEPg8Bhb3PemQU=";
patches = [
# Add ArtifactDir() to support Go 1.26 testing.TB interface
# https://github.com/onsi/ginkgo/pull/1648
(fetchpatch {
url = "https://github.com/onsi/ginkgo/pull/1648.patch";
hash = "sha256-O8YWPAvf0ukPWSTm6+YKnV/L+qSL0RCoBswmiQVXOKI=";
})
];
# integration tests expect more file changes
# types tests are missing CodeLocation
excludedPackages = [
+3 -3
View File
@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "git-gamble";
version = "2.11.0";
version = "2.12.0";
src = fetchFromGitLab {
owner = "pinage404";
repo = "git-gamble";
rev = "version/${finalAttrs.version}";
hash = "sha256-b7jGrt8uJ9arH4EEsOOPCIcQmhwrrJb8uXcSsZPFrNQ=";
hash = "sha256-6pH1gqZaMhXlm1JNu2D7JPO8KF9bA/DxqzM7t+2BUwQ=";
};
cargoHash = "sha256-lf66me4ot5lvrz2JTj8MreaHyVwOcFSVfPGX9lBTKug=";
cargoHash = "sha256-LKwhkZstsccnpg347xtryukx2d6AFbCJVJBB3bnN3bc=";
nativeCheckInputs = [ gitMinimal ];
preCheck = ''
@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "github-distributed-owners";
version = "0.1.11";
version = "0.1.12";
src = fetchFromGitHub {
owner = "andrewring";
repo = "github-distributed-owners";
tag = "v${finalAttrs.version}";
hash = "sha256-oLRcH1lgRxlYIlyk3bPWO5YmCIq462YUjBjMSPOF7Ic=";
hash = "sha256-Ry7l4hiVWtSm47DYG38N0L7V/z5wNfPm9tt+8Zs5tsI=";
};
cargoHash = "sha256-pt/GoXF/uSU78pZqG8PgFe+tlbwZH2qpGQD7jgC52NM=";
cargoHash = "sha256-xLc9T2rS511/qWyZpqSNFVyfyf4+gzheOF95TpVlUfc=";
nativeInstallCheckInputs = [ versionCheckHook ];
doInstallCheck = true;
+8 -3
View File
@@ -11,13 +11,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "glaze";
version = "7.1.0";
version = "7.2.2";
src = fetchFromGitHub {
owner = "stephenberry";
repo = "glaze";
tag = "v${finalAttrs.version}";
hash = "sha256-W48BDsxUrFjjqUFwBcBqHr5Y7h+BtGGWdioGukBqzbE=";
hash = "sha256-E92oxXOcmA4d3s2k0D+DppnHt0Ks900+3W0XoGbbcG4=";
};
nativeBuildInputs = [ cmake ];
@@ -31,9 +31,14 @@ stdenv.mkDerivation (finalAttrs: {
];
meta = {
homepage = "https://stephenberry.github.io/glaze/";
changelog = "https://github.com/stephenberry/glaze/releases/tag/v${finalAttrs.version}";
description = "Extremely fast, in memory, JSON and interface library for modern C++";
platforms = lib.platforms.all;
maintainers = with lib.maintainers; [ moni ];
maintainers = with lib.maintainers; [
moni
miniharinn
];
license = lib.licenses.mit;
};
})
+3 -3
View File
@@ -10,16 +10,16 @@
buildGoModule (finalAttrs: {
pname = "go-crx3";
version = "1.6.0";
version = "1.7.0";
src = fetchFromGitHub {
owner = "mmadfox";
repo = "go-crx3";
tag = "v${finalAttrs.version}";
hash = "sha256-XNUOnm898GtCIojWR4tCHZNDHhh+DfJvvBvTDBI8Wzg=";
hash = "sha256-2AuVcQIurylmxAT/QUhYvymACWDeUBUn0ukSSn5IzWA=";
};
vendorHash = "sha256-LEIB/VZA3rqTeH9SesZ/jrfVddl6xtmoRWHP+RwGmCk=";
vendorHash = "sha256-00NpGn0moeDhP8oP7hueRyVnB1enS8iN2fTDfTckIqY=";
ldflags = [
"-s"

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