uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead
https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948 this can do it nicely. Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
Anton Arapov
Alan Daniels
commit
56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
13
pkgs/servers/uwsgi/additional-php-ldflags.patch
Normal file
13
pkgs/servers/uwsgi/additional-php-ldflags.patch
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/plugins/php/uwsgiplugin.py b/plugins/php/uwsgiplugin.py
|
||||
index d930c44e..2fcbc22a 100644
|
||||
--- a/plugins/php/uwsgiplugin.py
|
||||
+++ b/plugins/php/uwsgiplugin.py
|
||||
@@ -17,6 +17,8 @@ php_version = os.popen(PHPPATH + ' --version').read().rstrip().split('.')[0]
|
||||
CFLAGS = [os.popen(PHPPATH + ' --includes').read().rstrip(), '-Wno-sign-compare']
|
||||
LDFLAGS = os.popen(PHPPATH + ' --ldflags').read().rstrip().split()
|
||||
|
||||
+LDFLAGS.append(os.environ.get('UWSGICONFIG_PHP_LDFLAGS', []))
|
||||
+
|
||||
if ld_run_path:
|
||||
LDFLAGS.append('-L%s' % ld_run_path)
|
||||
os.environ['LD_RUN_PATH'] = ld_run_path
|
||||
141
pkgs/servers/uwsgi/default.nix
Normal file
141
pkgs/servers/uwsgi/default.nix
Normal file
|
|
@ -0,0 +1,141 @@
|
|||
{ stdenv, nixosTests, lib, fetchurl, pkg-config, jansson, pcre
|
||||
# plugins: list of strings, eg. [ "python2" "python3" ]
|
||||
, plugins ? []
|
||||
, pam, withPAM ? stdenv.isLinux
|
||||
, systemd, withSystemd ? stdenv.isLinux
|
||||
, libcap, withCap ? stdenv.isLinux
|
||||
, python2, python3, ncurses
|
||||
, ruby, php
|
||||
}:
|
||||
|
||||
let php-embed = php.override {
|
||||
embedSupport = true;
|
||||
apxs2Support = false;
|
||||
};
|
||||
|
||||
pythonPlugin = pkg : lib.nameValuePair "python${if pkg.isPy2 then "2" else "3"}" {
|
||||
interpreter = pkg.pythonForBuild.interpreter;
|
||||
path = "plugins/python";
|
||||
inputs = [ pkg ncurses ];
|
||||
install = ''
|
||||
install -Dm644 uwsgidecorators.py $out/${pkg.sitePackages}/uwsgidecorators.py
|
||||
${pkg.pythonForBuild.executable} -m compileall $out/${pkg.sitePackages}/
|
||||
${pkg.pythonForBuild.executable} -O -m compileall $out/${pkg.sitePackages}/
|
||||
'';
|
||||
};
|
||||
|
||||
available = lib.listToAttrs [
|
||||
(pythonPlugin python2)
|
||||
(pythonPlugin python3)
|
||||
(lib.nameValuePair "rack" {
|
||||
path = "plugins/rack";
|
||||
inputs = [ ruby ];
|
||||
})
|
||||
(lib.nameValuePair "cgi" {
|
||||
# usage: https://uwsgi-docs.readthedocs.io/en/latest/CGI.html?highlight=cgi
|
||||
path = "plugins/cgi";
|
||||
inputs = [ ];
|
||||
})
|
||||
(lib.nameValuePair "php" {
|
||||
# usage: https://uwsgi-docs.readthedocs.io/en/latest/PHP.html#running-php-apps-with-nginx
|
||||
path = "plugins/php";
|
||||
inputs = [
|
||||
php-embed
|
||||
php-embed.extensions.session
|
||||
php-embed.extensions.session.dev
|
||||
php-embed.unwrapped.dev
|
||||
] ++ php-embed.unwrapped.buildInputs;
|
||||
})
|
||||
];
|
||||
|
||||
getPlugin = name:
|
||||
let all = lib.concatStringsSep ", " (lib.attrNames available);
|
||||
in if lib.hasAttr name available
|
||||
then lib.getAttr name available // { inherit name; }
|
||||
else throw "Unknown UWSGI plugin ${name}, available : ${all}";
|
||||
|
||||
needed = builtins.map getPlugin plugins;
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "uwsgi";
|
||||
version = "2.0.20";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://projects.unbit.it/downloads/${pname}-${version}.tar.gz";
|
||||
sha256 = "1yfz5h07rxzrqf1rdj5fzhk47idgglxj7kqr8zl8lgcpv1kriaw8";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./no-ext-session-php_session.h-on-NixOS.patch
|
||||
./additional-php-ldflags.patch
|
||||
./missing-arginfo-php8.patch # https://github.com/unbit/uwsgi/issues/2356
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ python3 pkg-config ];
|
||||
|
||||
buildInputs = [ jansson pcre ]
|
||||
++ lib.optional withPAM pam
|
||||
++ lib.optional withSystemd systemd
|
||||
++ lib.optional withCap libcap
|
||||
++ lib.concatMap (x: x.inputs) needed
|
||||
;
|
||||
|
||||
basePlugins = lib.concatStringsSep ","
|
||||
( lib.optional withPAM "pam"
|
||||
++ lib.optional withSystemd "systemd_logger"
|
||||
);
|
||||
|
||||
UWSGI_INCLUDES = lib.optionalString withCap "${libcap.dev}/include";
|
||||
|
||||
passthru = {
|
||||
inherit python2 python3;
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
for f in uwsgiconfig.py plugins/*/uwsgiplugin.py; do
|
||||
substituteInPlace "$f" \
|
||||
--replace pkg-config "$PKG_CONFIG"
|
||||
done
|
||||
${lib.optionalString (lib.versionAtLeast php.version "8") ''
|
||||
sed -e "s/ + php_version//" -i plugins/php/uwsgiplugin.py
|
||||
''}
|
||||
'';
|
||||
|
||||
configurePhase = ''
|
||||
export pluginDir=$out/lib/uwsgi
|
||||
substituteAll ${./nixos.ini} buildconf/nixos.ini
|
||||
'';
|
||||
|
||||
# this is a hack to make the php plugin link with session.so (which on nixos is a separate package)
|
||||
# the hack works in coordination with ./additional-php-ldflags.patch
|
||||
UWSGICONFIG_PHP_LDFLAGS = lib.optionalString (builtins.any (x: x.name == "php") needed)
|
||||
(lib.concatStringsSep "," [
|
||||
"-Wl"
|
||||
"-rpath=${php-embed.extensions.session}/lib/php/extensions/"
|
||||
"--library-path=${php-embed.extensions.session}/lib/php/extensions/"
|
||||
"-l:session.so"
|
||||
]);
|
||||
|
||||
buildPhase = ''
|
||||
mkdir -p $pluginDir
|
||||
python3 uwsgiconfig.py --build nixos
|
||||
${lib.concatMapStringsSep ";" (x: "${x.preBuild or ""}\n ${x.interpreter or "python3"} uwsgiconfig.py --plugin ${x.path} nixos ${x.name}") needed}
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
install -Dm755 uwsgi $out/bin/uwsgi
|
||||
${lib.concatMapStringsSep "\n" (x: x.install or "") needed}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://uwsgi-docs.readthedocs.org/en/latest/";
|
||||
description = "A fast, self-healing and developer/sysadmin-friendly application container server coded in pure C";
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ abbradar schneefux globin ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
|
||||
passthru.tests.uwsgi = nixosTests.uwsgi;
|
||||
|
||||
}
|
||||
49
pkgs/servers/uwsgi/missing-arginfo-php8.patch
Normal file
49
pkgs/servers/uwsgi/missing-arginfo-php8.patch
Normal file
|
|
@ -0,0 +1,49 @@
|
|||
diff --git a/plugins/php/php_plugin.c b/plugins/php/php_plugin.c
|
||||
index ca0ef6c1..00c39b09 100644
|
||||
--- a/plugins/php/php_plugin.c
|
||||
+++ b/plugins/php/php_plugin.c
|
||||
@@ -257,6 +257,9 @@ PHP_MINIT_FUNCTION(uwsgi_php_minit) {
|
||||
return SUCCESS;
|
||||
}
|
||||
|
||||
+ZEND_BEGIN_ARG_INFO_EX(arginfo_void, 0, 0, 0)
|
||||
+ZEND_END_ARG_INFO()
|
||||
+
|
||||
PHP_FUNCTION(uwsgi_version) {
|
||||
RETURN_STRING(UWSGI_VERSION);
|
||||
}
|
||||
@@ -488,20 +491,20 @@ PHP_FUNCTION(uwsgi_signal) {
|
||||
}
|
||||
|
||||
zend_function_entry uwsgi_php_functions[] = {
|
||||
- PHP_FE(uwsgi_version, NULL)
|
||||
- PHP_FE(uwsgi_setprocname, NULL)
|
||||
- PHP_FE(uwsgi_worker_id, NULL)
|
||||
- PHP_FE(uwsgi_masterpid, NULL)
|
||||
- PHP_FE(uwsgi_signal, NULL)
|
||||
-
|
||||
- PHP_FE(uwsgi_rpc, NULL)
|
||||
-
|
||||
- PHP_FE(uwsgi_cache_get, NULL)
|
||||
- PHP_FE(uwsgi_cache_set, NULL)
|
||||
- PHP_FE(uwsgi_cache_update, NULL)
|
||||
- PHP_FE(uwsgi_cache_del, NULL)
|
||||
- PHP_FE(uwsgi_cache_clear, NULL)
|
||||
- PHP_FE(uwsgi_cache_exists, NULL)
|
||||
+ PHP_FE(uwsgi_version, arginfo_void)
|
||||
+ PHP_FE(uwsgi_setprocname, arginfo_void)
|
||||
+ PHP_FE(uwsgi_worker_id, arginfo_void)
|
||||
+ PHP_FE(uwsgi_masterpid, arginfo_void)
|
||||
+ PHP_FE(uwsgi_signal, arginfo_void)
|
||||
+
|
||||
+ PHP_FE(uwsgi_rpc, arginfo_void)
|
||||
+
|
||||
+ PHP_FE(uwsgi_cache_get, arginfo_void)
|
||||
+ PHP_FE(uwsgi_cache_set, arginfo_void)
|
||||
+ PHP_FE(uwsgi_cache_update, arginfo_void)
|
||||
+ PHP_FE(uwsgi_cache_del, arginfo_void)
|
||||
+ PHP_FE(uwsgi_cache_clear, arginfo_void)
|
||||
+ PHP_FE(uwsgi_cache_exists, arginfo_void)
|
||||
{ NULL, NULL, NULL},
|
||||
};
|
||||
|
||||
6
pkgs/servers/uwsgi/nixos.ini
Normal file
6
pkgs/servers/uwsgi/nixos.ini
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
[uwsgi]
|
||||
plugin_dir = @pluginDir@
|
||||
main_plugin = @basePlugins@
|
||||
json = true
|
||||
yaml = false
|
||||
inherit = base
|
||||
|
|
@ -0,0 +1,29 @@
|
|||
From 6b9b3559d8ce59eda6c5cd6f04224cebaaa5d0ea Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?=D0=94=D0=B0=D0=BC=D1=98=D0=B0=D0=BD=20=D0=93=D0=B5=D0=BE?=
|
||||
=?UTF-8?q?=D1=80=D0=B3=D0=B8=D0=B5=D0=B2=D1=81=D0=BA=D0=B8?=
|
||||
<gdamjan@gmail.com>
|
||||
Date: Tue, 8 Sep 2020 17:11:39 +0200
|
||||
Subject: [PATCH] no ext/session/php_session.h on NixOS
|
||||
|
||||
on NixOS php_session.h is in its own package, and is not installed in
|
||||
ext/session/
|
||||
---
|
||||
plugins/php/common.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/plugins/php/common.h b/plugins/php/common.h
|
||||
index 9bf1c069..be93f519 100644
|
||||
--- a/plugins/php/common.h
|
||||
+++ b/plugins/php/common.h
|
||||
@@ -10,7 +10,7 @@
|
||||
#endif
|
||||
#include "ext/standard/info.h"
|
||||
|
||||
-#include "ext/session/php_session.h"
|
||||
+#include "php_session.h"
|
||||
|
||||
#include <uwsgi.h>
|
||||
|
||||
--
|
||||
2.28.0
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue