mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-06-05 21:03:40 +00:00
pixelfed: 0.12.6 -> 0.12.7; fix build (#526840)
This commit is contained in:
@@ -4,6 +4,7 @@
|
||||
let
|
||||
supportedSystems = [
|
||||
"x86_64-linux"
|
||||
"aarch64-linux"
|
||||
"i686-linux"
|
||||
];
|
||||
in
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
nodes = {
|
||||
server =
|
||||
{ pkgs, ... }:
|
||||
{ pkgs, lib, ... }:
|
||||
{
|
||||
services.pixelfed = {
|
||||
enable = true;
|
||||
@@ -19,16 +19,25 @@
|
||||
);
|
||||
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 = ''
|
||||
# Wait for Pixelfed PHP pool
|
||||
server.wait_for_unit("phpfpm-pixelfed.service")
|
||||
server.wait_for_unit("phpfpm-pixelfed.service", timeout=1800)
|
||||
# Wait for NGINX
|
||||
server.wait_for_unit("nginx.service")
|
||||
server.wait_for_unit("nginx.service", timeout=1800)
|
||||
# Wait for HTTP port
|
||||
server.wait_for_open_port(80)
|
||||
server.wait_for_open_port(80, timeout=1800)
|
||||
# Access the homepage.
|
||||
server.succeed("curl -H 'Host: pixelfed.local' http://localhost")
|
||||
# Create an account
|
||||
|
||||
@@ -7,19 +7,21 @@
|
||||
dataDir ? "/var/lib/pixelfed",
|
||||
runtimeDir ? "/run/pixelfed",
|
||||
}:
|
||||
|
||||
php.buildComposerProject2 (finalAttrs: {
|
||||
let
|
||||
php' = php.withExtensions ({ enabled, all }: enabled ++ (with all; [ ffi ]));
|
||||
in
|
||||
php'.buildComposerProject2 (finalAttrs: {
|
||||
pname = "pixelfed";
|
||||
version = "0.12.6";
|
||||
version = "0.12.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pixelfed";
|
||||
repo = "pixelfed";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-FxJWoFNyIGQ6o9g2Q0/jaBMyeH8UnbTgha2goHAurvY=";
|
||||
hash = "sha256-Ay1WJWEPwzeTtScaj+g72lsoWODeHWtjnQT5aa6epbU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-4x+vvkQUhqxBwm+9Lx7n6Ww6qvfLwqd8IXXCuCSAijE=";
|
||||
vendorHash = "sha256-RNJzvWrKfxr2uBFtc05N1pUfBmvy01JiJHMWgtJ01pA=";
|
||||
|
||||
postInstall = ''
|
||||
chmod -R u+w $out/share
|
||||
|
||||
Reference in New Issue
Block a user