nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-06-05 21:03:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

pixelfed: 0.12.6 -> 0.12.7; fix build (#526840)

Browse Source
This commit is contained in:
Ivan Mincik
2026-06-05 08:40:59 +00:00
committed by GitHub
parent b7d7a5bca5 fd38c2f3a2
commit 1cedf3af27
3 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/tests/web-apps/pixelfed/default.nix
View File

@@ -4,6 +4,7 @@
let let
supportedSystems = [ supportedSystems = [
"x86_64-linux" "x86_64-linux"
"aarch64-linux"
"i686-linux" "i686-linux"
]; ];
in in

17
nixos/tests/web-apps/pixelfed/standard.nix
View File

@@ -4,7 +4,7 @@
nodes = { nodes = {
server = server =
{ pkgs, ... }: { pkgs, lib, ... }:
{ {
services.pixelfed = { services.pixelfed = {
enable = true; enable = true;
@@ -19,16 +19,25 @@
); );
settings."FORCE_HTTPS_URLS" = false; settings."FORCE_HTTPS_URLS" = false;
}; };
# to prevent getting killed by oom
virtualisation.memorySize = 2048;
virtualisation.emptyDiskImages = [ 4096 ];
swapDevices = [ { device = "/dev/vdb"; } ];
# allows running nixos test on qemu without kvm, eg. github actions on aarch64-linux
systemd.settings.Manager.DefaultDeviceTimeoutSec = lib.mkForce 1800;
boot.initrd.kernelModules = [ "virtio_console" ];
}; };
}; };
testScript = '' testScript = ''
# Wait for Pixelfed PHP pool # Wait for Pixelfed PHP pool
server.wait_for_unit("phpfpm-pixelfed.service") server.wait_for_unit("phpfpm-pixelfed.service", timeout=1800)
# Wait for NGINX # Wait for NGINX
server.wait_for_unit("nginx.service") server.wait_for_unit("nginx.service", timeout=1800)
# Wait for HTTP port # Wait for HTTP port
server.wait_for_open_port(80) server.wait_for_open_port(80, timeout=1800)
# Access the homepage. # Access the homepage.
server.succeed("curl -H 'Host: pixelfed.local' http://localhost") server.succeed("curl -H 'Host: pixelfed.local' http://localhost")
# Create an account # Create an account

12
pkgs/by-name/pi/pixelfed/package.nix
View File

@@ -7,19 +7,21 @@
dataDir ? "/var/lib/pixelfed", dataDir ? "/var/lib/pixelfed",
runtimeDir ? "/run/pixelfed", runtimeDir ? "/run/pixelfed",
}: }:
let
php.buildComposerProject2 (finalAttrs: { php' = php.withExtensions ({ enabled, all }: enabled ++ (with all; [ ffi ]));
in
php'.buildComposerProject2 (finalAttrs: {
pname = "pixelfed"; pname = "pixelfed";
version = "0.12.6"; version = "0.12.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "pixelfed"; owner = "pixelfed";
repo = "pixelfed"; repo = "pixelfed";
tag = "v${finalAttrs.version}"; tag = "v${finalAttrs.version}";
hash = "sha256-FxJWoFNyIGQ6o9g2Q0/jaBMyeH8UnbTgha2goHAurvY="; hash = "sha256-Ay1WJWEPwzeTtScaj+g72lsoWODeHWtjnQT5aa6epbU=";
}; };
vendorHash = "sha256-4x+vvkQUhqxBwm+9Lx7n6Ww6qvfLwqd8IXXCuCSAijE="; vendorHash = "sha256-RNJzvWrKfxr2uBFtc05N1pUfBmvy01JiJHMWgtJ01pA=";
postInstall = '' postInstall = ''
chmod -R u+w $out/share chmod -R u+w $out/share