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: b9d98c06ebcb
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: 0b32220c0746
Choose a head ref
  • 4 commits
  • 2 files changed
  • 4 contributors

Commits on May 30, 2018

  1. openshift: Fix path to mount and findmnt command 

    Fix openshift oc cluster up mount

(cherry picked from commit fd09c3d)
Reason: The basic functionality to spin up a local cluster using "oc
cluster up" is broken due to wrong paths to mount and findmnt.
    @jensbin
    jensbin committed May 30, 2018
    Copy the full SHA
    82b02fd View commit details

Commits on May 31, 2018

  1. openshift: fix mkdir command

    @jensbin
    jensbin committed May 31, 2018
    Copy the full SHA
    3641ef4 View commit details

  2. Merge pull request #41272 from jensbin/openshift_fix 

    openshift: Fix path to mount and findmnt command
    @xeji
    xeji authored May 31, 2018
    Copy the full SHA
    8b4f5f4 View commit details

  3. perlPackages.DBDPg: disable tests 

    Build was broken because tests freeze in sandbox, disable them.
Fixes #41199.

(cherry picked from commit 828ddc2)
    @xeji
    xeji committed May 31, 2018
    Copy the full SHA
    0b32220 View commit details
Showing with 16 additions and 1 deletion.
  1. +13 −1 pkgs/applications/networking/cluster/openshift/default.nix
  2. +3 −0 pkgs/development/perl-modules/DBD-Pg/default.nix
14 changes: 13 additions & 1 deletion pkgs/applications/networking/cluster/openshift/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, fetchpatch, removeReferencesTo, which, go_1_9, go-bindata, makeWrapper, rsync
{ stdenv, lib, fetchFromGitHub, fetchpatch, removeReferencesTo, which, go_1_9, go-bindata, makeWrapper, rsync, utillinux
, iptables, coreutils, kerberos, clang
, components ? [
"cmd/oc"
@@ -37,6 +37,18 @@ in stdenv.mkDerivation rec {

patchPhase = ''
patchShebangs ./hack
substituteInPlace pkg/oc/bootstrap/docker/host/host.go \
--replace 'nsenter --mount=/rootfs/proc/1/ns/mnt findmnt' \
'nsenter --mount=/rootfs/proc/1/ns/mnt ${utillinux}/bin/findmnt'
substituteInPlace pkg/oc/bootstrap/docker/host/host.go \
--replace 'nsenter --mount=/rootfs/proc/1/ns/mnt mount' \
'nsenter --mount=/rootfs/proc/1/ns/mnt ${utillinux}/bin/mount'
substituteInPlace pkg/oc/bootstrap/docker/host/host.go \
--replace 'nsenter --mount=/rootfs/proc/1/ns/mnt mkdir' \
'nsenter --mount=/rootfs/proc/1/ns/mnt ${coreutils}/bin/mkdir'
'';

buildPhase = ''
3 changes: 3 additions & 0 deletions pkgs/development/perl-modules/DBD-Pg/default.nix
View file
Original file line number Diff line number Diff line change
@@ -13,6 +13,9 @@ buildPerlPackage rec {

makeMakerFlags = "POSTGRES_HOME=${postgresql}";

# tests freeze in a sandbox
doCheck = false;

meta = {
homepage = http://search.cpan.org/dist/DBD-Pg/;
description = "DBI PostgreSQL interface";