Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 138f2cc707d7
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: cb0e20d6db96
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Feb 4, 2019

  1. buildbot: fix CVE-2019-7313

    @veprbl
    veprbl committed Feb 4, 2019
    Copy the full SHA
    fe792ef View commit details

Commits on Feb 15, 2019

  1. python/grpcio: fix darwin build 

    grpcio currently does not build on Darwin (10.13.6). Due to the
following issues:

* ar is invoked with incorrect flags (#33765).
* libtool cannot be found, with a libtool dependency, with libtool
  the option '-no_warning_for_no_symbols' is not recognized.
* the module build cannot find boringssl that is packaged with
  python-grpcio when pkgconfig is not installed (grpc/#10058).

(cherry picked from commit 4beb94d)
    @danieldk @matthewbauer
    danieldk authored and matthewbauer committed Feb 15, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    vbgl Vincent Laporte
    GPG key ID: EBD582ADDDB1F81F
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    cb0e20d View commit details
Showing with 17 additions and 3 deletions.
  1. +7 −2 pkgs/development/python-modules/grpcio/default.nix
  2. +10 −1 pkgs/development/tools/build-managers/buildbot/default.nix
9 changes: 7 additions & 2 deletions pkgs/development/python-modules/grpcio/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{ stdenv, buildPythonPackage, fetchPypi, lib
, six, protobuf3_5, enum34, futures, isPy26, isPy27, isPy34 }:
{ stdenv, buildPythonPackage, fetchPypi, lib, darwin
, six, protobuf3_5, enum34, futures, isPy26, isPy27, isPy34, pkgconfig }:

with stdenv.lib;
buildPythonPackage rec {
pname = "grpcio";
version = "1.9.1";
@@ -14,6 +15,10 @@ buildPythonPackage rec {
++ lib.optionals (isPy26 || isPy27 || isPy34) [ enum34 ]
++ lib.optionals (isPy26 || isPy27) [ futures ];

nativeBuildInputs = [ pkgconfig ] ++ optional stdenv.isDarwin darwin.cctools;

preBuild = optionalString stdenv.isDarwin "unset AR";

meta = with stdenv.lib; {
description = "HTTP/2-based RPC framework";
license = lib.licenses.bsd3;
11 changes: 10 additions & 1 deletion pkgs/development/tools/build-managers/buildbot/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, lib, openssh, buildbot-worker, buildbot-pkg, pythonPackages, runCommand, makeWrapper }:
{ stdenv, lib, fetchpatch, openssh, buildbot-worker, buildbot-pkg, pythonPackages, runCommand, makeWrapper }:

let
withPlugins = plugins: runCommand "wrapped-${package.name}" {
@@ -74,6 +74,15 @@ let
# This patch disables the test that tries to read /etc/os-release which
# is not accessible in sandboxed builds.
./skip_test_linux_distro.patch

# CVE-2019-7313
# https://github.com/buildbot/buildbot/wiki/CRLF-injection-in-Buildbot-login-and-logout-redirect-code
# https://github.com/buildbot/buildbot/compare/v1.8.0...v1.8.1
(fetchpatch {
url = "https://github.com/buildbot/buildbot/commit/bdae9fea4e8978b19e12425776b2d083febd91a6.diff";
sha256 = "18fbcbqphs8jjmfvjjcbcnv5wj87mj6jv9lmx17lfhpi5hg2axph";
stripLen = 1;
})
];

postPatch = ''