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

Commits on Apr 18, 2020

  1. docker: add git to extraPath 

    When building a docker container from git, docker was missing the git
binary in $PATH.
    Milan Pässler committed Apr 18, 2020

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    08d83c1 View commit details

Commits on Apr 19, 2020

  1. Merge pull request #85514 from petabyteboy/feature/docker 

    docker: add git to extraPath
    @offlinehacker
    offlinehacker authored Apr 19, 2020

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    bc0e5f8 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 pkgs/applications/virtualization/docker/default.nix
4 changes: 2 additions & 2 deletions pkgs/applications/virtualization/docker/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchFromGitHub, makeWrapper, removeReferencesTo, pkgconfig
, go-md2man, go, containerd, runc, docker-proxy, tini, libtool
, sqlite, iproute, lvm2, systemd
, btrfs-progs, iptables, e2fsprogs, xz, utillinux, xfsprogs
, btrfs-progs, iptables, e2fsprogs, xz, utillinux, xfsprogs, git
, procps, libseccomp
}:

@@ -123,7 +123,7 @@ rec {

outputs = ["out" "man"];

extraPath = optionals (stdenv.isLinux) (makeBinPath [ iproute iptables e2fsprogs xz xfsprogs procps utillinux ]);
extraPath = optionals (stdenv.isLinux) (makeBinPath [ iproute iptables e2fsprogs xz xfsprogs procps utillinux git ]);

installPhase = optionalString (stdenv.isLinux) ''
install -Dm755 ./components/engine/bundles/dynbinary-daemon/dockerd $out/libexec/docker/dockerd