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: 1d66d62bbc82
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 132b013b9ac9
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on May 30, 2019

  1. unit: 1.8.0 -> 1.9.0

    @Izorkin
    Izorkin committed May 30, 2019
    Copy the full SHA
    aa8a11c View commit details

Commits on Jun 5, 2019

  1. Merge pull request #62263 from Izorkin/nginx-unit 

    unit: 1.8.0 -> 1.9.0
    @worldofpeace
    worldofpeace authored Jun 5, 2019
    Copy the full SHA
    132b013 View commit details
Showing with 2 additions and 29 deletions.
  1. +2 −5 pkgs/servers/http/unit/default.nix
  2. +0 −24 pkgs/servers/http/unit/unit-rootless.patch
7 changes: 2 additions & 5 deletions pkgs/servers/http/unit/default.nix
View file
Original file line number Diff line number Diff line change
@@ -16,14 +16,14 @@
with stdenv.lib;

stdenv.mkDerivation rec {
version = "1.8.0";
version = "1.9.0";
name = "unit-${version}";

src = fetchFromGitHub {
owner = "nginx";
repo = "unit";
rev = "${version}";
sha256 = "1s5pfyhabnf9p5z2h1fh0wb4hqzkrha5bxahjnikmlkhw59s8zip";
sha256 = "0f7smgshfzksks2jfhi53g87wiyy38vwgj6aa70ql61m135dx7b1";
};

nativeBuildInputs = [ which ];
@@ -40,9 +40,6 @@ stdenv.mkDerivation rec {
++ optional withRuby ruby
++ optional withSSL openssl;

# Used patch to enable work with unprivileged user - https://github.com/nginx/unit/issues/228
patches = [ ./unit-rootless.patch ];

configureFlags = [
"--control=unix:/run/unit/control.unit.sock"
"--pid=/run/unit/unit.pid"
24 changes: 0 additions & 24 deletions pkgs/servers/http/unit/unit-rootless.patch
View file

This file was deleted.