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: 8a3693b20783
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0028f5de89ab
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Nov 21, 2018

  1. uwsgi: build with PCRE support (#50896) 

     (#50896)
    @c0bw3b
    c0bw3b authored Nov 21, 2018
    Copy the full SHA
    0028f5d View commit details
Showing with 3 additions and 3 deletions.
  1. +3 −3 pkgs/servers/uwsgi/default.nix
6 changes: 3 additions & 3 deletions pkgs/servers/uwsgi/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, pkgconfig, jansson
{ stdenv, lib, fetchurl, pkgconfig, jansson, pcre
# plugins: list of strings, eg. [ "python2" "python3" ]
, plugins
, pam, withPAM ? false
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {

nativeBuildInputs = [ python3 pkgconfig ];

buildInputs = [ jansson ]
buildInputs = [ jansson pcre ]
++ lib.optional withPAM pam
++ lib.optional withSystemd systemd
++ lib.concatMap (x: x.inputs) needed
@@ -92,7 +92,7 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_LINK = [ "-lsystemd" ] ++ lib.concatMap (x: x.NIX_CFLAGS_LINK or []) needed;

meta = with stdenv.lib; {
homepage = http://uwsgi-docs.readthedocs.org/en/latest/;
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 ];