Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5b1522155d90
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3c83ad6ac13b
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Aug 27, 2019

  1. mod_wsgi: allow building this module with python 2.x and 3.x 

    (cherry picked from commit 79c6d22)
    @peti
    peti committed Aug 27, 2019
    Copy the full SHA
    cab4546 View commit details

  2. Merge pull request #67565 from peti/t/mod_wsgi3 

    mod_wsgi: allow building this module with python 2.x and 3.x
    @globin
    globin authored Aug 27, 2019
    Copy the full SHA
    3c83ad6 View commit details
Showing with 5 additions and 3 deletions.
  1. +2 −2 pkgs/servers/http/apache-modules/mod_wsgi/default.nix
  2. +3 −1 pkgs/top-level/all-packages.nix
4 changes: 2 additions & 2 deletions pkgs/servers/http/apache-modules/mod_wsgi/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, apacheHttpd, python2 }:
{ stdenv, fetchurl, apacheHttpd, python, ncurses }:

stdenv.mkDerivation rec {
name = "mod_wsgi-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1q75ifadjd5frr5i2b9swbjiwfv4fr4ny8npsm09w6mjp7w0bgjw";
};

buildInputs = [ apacheHttpd python2 ];
buildInputs = [ apacheHttpd python ncurses ];

patchPhase = ''
sed -r -i -e "s|^LIBEXECDIR=.*$|LIBEXECDIR=$out/modules|" \
4 changes: 3 additions & 1 deletion pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -13546,7 +13546,9 @@ in

mod_python = callPackage ../servers/http/apache-modules/mod_python { };

mod_wsgi = callPackage ../servers/http/apache-modules/mod_wsgi { };
mod_wsgi = self.mod_wsgi2;
mod_wsgi2 = callPackage ../servers/http/apache-modules/mod_wsgi { python = python2; ncurses = null; };
mod_wsgi3 = callPackage ../servers/http/apache-modules/mod_wsgi { python = python3; };

php = pkgs.php.override { inherit apacheHttpd; };