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

Commits on May 9, 2017

  1. gitlab: 8.17.5 -> 8.17.6 

    Security release: https://about.gitlab.com/2017/05/08/gitlab-9-dot-1-dot-3-security-release/

(cherry picked from commit 326efe5)
    @fpletz
    fpletz committed May 9, 2017
    Copy the full SHA
    08cf608 View commit details

  2. bind: disable seccomp by default 

    Fixes #25645 & #23431.

(cherry picked from commit eb79649)
    @fpletz
    fpletz committed May 9, 2017
    Copy the full SHA
    09373fa View commit details
Showing with 8 additions and 6 deletions.
  1. +3 −3 pkgs/applications/version-management/gitlab/default.nix
  2. +5 −3 pkgs/servers/dns/bind/default.nix
6 changes: 3 additions & 3 deletions pkgs/applications/version-management/gitlab/default.nix
View file
Original file line number Diff line number Diff line change
@@ -18,11 +18,11 @@ let
};
};

version = "8.17.5";
version = "8.17.6";

gitlabDeb = fetchurl {
url = "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/jessie/gitlab-ce_${version}-ce.0_amd64.deb/download";
sha256 = "1ga5ki1bh66sdk5yizjy0dqcg85hrzkdp0ag3si942yv28sjy1xk";
sha256 = "1pr8nfnkzmicn5nxjkq48l4nfjsp6v5j3v8p7cp8r86lgfdc6as3";
};

in
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
owner = "gitlabhq";
repo = "gitlabhq";
rev = "v${version}";
sha256 = "0wvszxm28c80qwx6np5mi36saxzzg4n7jcp4ckvhhr3jvczn9m8g";
sha256 = "1yyyn2j0a457q2xbcxz6b33r23myr8kxbm9whj2dwrrbp4p273hr";
};

patches = [
8 changes: 5 additions & 3 deletions pkgs/servers/dns/bind/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{ stdenv, lib, fetchurl, openssl, libtool, perl, libxml2
, libseccomp ? null }:
, enableSeccomp ? false, libseccomp ? null }:

assert enableSeccomp -> libseccomp != null;

let version = "9.10.4-P6"; in

@@ -17,7 +19,7 @@ stdenv.mkDerivation rec {
stdenv.lib.optional stdenv.isDarwin ./darwin-openssl-linking-fix.patch;

buildInputs = [ openssl libtool perl libxml2 ] ++
stdenv.lib.optional stdenv.isLinux libseccomp;
stdenv.lib.optional enableSeccomp libseccomp;

STD_CDEFINES = [ "-DDIG_SIGCHASE=1" ]; # support +sigchase

@@ -35,7 +37,7 @@ stdenv.mkDerivation rec {
"--without-pkcs11"
"--without-purify"
"--without-python"
] ++ lib.optional (stdenv.isi686 || stdenv.isx86_64) "--enable-seccomp";
] ++ lib.optional enableSeccomp "--enable-seccomp";

postInstall = ''
moveToOutput bin/bind9-config $dev