diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-12-25 18:01:38 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-12-25 18:01:38 +0000 |
commit | 583c7499e53869b76501eb3fb5b73aa71519f84b (patch) | |
tree | 5ad816257894e5c48e08476831615c8580c6f29e /pkgs/servers/http | |
parent | b48679133ad34e9175476cacd6bdbd888a15b2cb (diff) | |
parent | 949dfd39600bbfa11173a51f94f08a7765538bb5 (diff) |
Merge staging-next into staging
Diffstat (limited to 'pkgs/servers/http')
-rw-r--r-- | pkgs/servers/http/apache-modules/mod_python/default.nix | 34 | ||||
-rw-r--r-- | pkgs/servers/http/apache-modules/mod_wsgi/default.nix | 14 |
2 files changed, 23 insertions, 25 deletions
diff --git a/pkgs/servers/http/apache-modules/mod_python/default.nix b/pkgs/servers/http/apache-modules/mod_python/default.nix index 1b8ef94fae95c..1b7a7c31d4beb 100644 --- a/pkgs/servers/http/apache-modules/mod_python/default.nix +++ b/pkgs/servers/http/apache-modules/mod_python/default.nix @@ -1,36 +1,32 @@ -{ lib, stdenv, fetchurl, apacheHttpd, python2, libintl }: +{ lib, stdenv, fetchFromGitHub, apacheHttpd, python3, libintl }: stdenv.mkDerivation rec { pname = "mod_python"; - version = "3.5.0"; + version = "unstable-2022-10-18"; - src = fetchurl { - url = "http://dist.modpython.org/dist/${pname}-${version}.tgz"; - sha256 = "146apll3yfqk05s8fkf4acmxzqncl08bgn4rv0c1rd4qxmc91w0f"; + src = fetchFromGitHub { + owner = "grisha"; + repo = pname; + rev = "d066b07564d2194839eceb535485eb1ba0c292d8"; + hash = "sha256-EH8wrXqUAOFWyPKfysGeiIezgrVc789RYO4AHeSA6t4="; }; patches = [ ./install.patch ]; - postPatch = '' - substituteInPlace dist/version.sh \ - --replace 'GIT=`git describe --always`' "" \ - --replace '-$GIT' "" - ''; - - installFlags = [ "LIBEXECDIR=${placeholder "out"}/modules" ]; - - preInstall = '' - mkdir -p $out/modules $out/bin - ''; + installFlags = [ + "LIBEXECDIR=$(out)/modules" + "BINDIR=$(out)/bin" + ]; passthru = { inherit apacheHttpd; }; - buildInputs = [ apacheHttpd python2 ] + buildInputs = [ apacheHttpd python3 ] ++ lib.optional stdenv.isDarwin libintl; - meta = { + meta = with lib; { homepage = "http://modpython.org/"; description = "An Apache module that embeds the Python interpreter within the server"; - platforms = lib.platforms.unix; + platforms = platforms.unix; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix index 7185b1c81270a..497cc5b1ea0ae 100644 --- a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix +++ b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, apacheHttpd, python, ncurses }: +{ lib, stdenv, fetchFromGitHub, apacheHttpd, python3, ncurses }: stdenv.mkDerivation rec { pname = "mod_wsgi"; @@ -11,14 +11,16 @@ stdenv.mkDerivation rec { hash = "sha256-6rRHdgdTb94kqIpWJOJOwoIsaXb/c4XY3q331GwQyf0="; }; - buildInputs = [ apacheHttpd python ncurses ]; + buildInputs = [ apacheHttpd python3 ncurses ]; - patchPhase = '' - sed -r -i -e "s|^LIBEXECDIR=.*$|LIBEXECDIR=$out/modules|" \ - ${if stdenv.isDarwin then "-e 's|/usr/bin/lipo|lipo|'" else ""} \ - configure + postPatch = '' + substituteInPlace configure --replace '/usr/bin/lipo' 'lipo' ''; + makeFlags = [ + "LIBEXECDIR=$(out)/modules" + ]; + meta = { homepage = "https://github.com/GrahamDumpleton/mod_wsgi"; description = "Host Python applications in Apache through the WSGI interface"; |