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

Commits on Apr 19, 2020

  1. buildah: installShellCompletion

    @zowoq
    zowoq committed Apr 19, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    epiteff
    GPG key ID: 94F82827CA03B374
    Verified
    Learn about vigilant mode
    Copy the full SHA
    7adb983 View commit details

  2. conmon: installFlags

    @zowoq
    zowoq committed Apr 19, 2020
    Copy the full SHA
    9123c8c View commit details

Commits on Apr 20, 2020

  1. Merge pull request #85526 from zowoq/misc 

    buildah, conmon: misc fixes
    @marsam
    marsam authored Apr 20, 2020
    Copy the full SHA
    c3945dc View commit details
Showing with 19 additions and 10 deletions.
  1. +3 −3 pkgs/applications/virtualization/conmon/default.nix
  2. +16 −7 pkgs/development/tools/buildah/default.nix
6 changes: 3 additions & 3 deletions pkgs/applications/virtualization/conmon/default.nix
View file
Original file line number Diff line number Diff line change
@@ -18,10 +18,10 @@ stdenv.mkDerivation rec {
};

nativeBuildInputs = [ pkg-config ];
buildInputs = [ glib systemd ] ++
stdenv.lib.optionals (!stdenv.hostPlatform.isMusl) [ glibc glibc.static ];
buildInputs = [ glib systemd ]
++ stdenv.lib.optionals (!stdenv.hostPlatform.isMusl) [ glibc glibc.static ];

installPhase = "install -Dm755 bin/${pname} $out/bin/${pname}";
installFlags = [ "PREFIX=$(out)" ];

meta = with stdenv.lib; {
homepage = "https://github.com/containers/conmon";
23 changes: 16 additions & 7 deletions pkgs/development/tools/buildah/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,24 @@
{ stdenv, buildGoPackage, fetchFromGitHub
, gpgme, libgpgerror, lvm2, btrfs-progs, pkg-config, libselinux, libseccomp
{ stdenv
, buildGoPackage
, fetchFromGitHub
, installShellFiles
, pkg-config
, gpgme
, libgpgerror
, lvm2
, btrfs-progs
, libselinux
, libseccomp
}:

buildGoPackage rec {
pname = "buildah";
version = "1.14.8";

src = fetchFromGitHub {
owner = "containers";
repo = "buildah";
rev = "v${version}";
owner = "containers";
repo = "buildah";
rev = "v${version}";
sha256 = "187cvb3i5cwm7cwxmzpl2ca7900yb6v6b6cybyz5mnd5ccy5ff1q";
};

@@ -18,7 +27,7 @@ buildGoPackage rec {
goPackagePath = "github.com/containers/buildah";
excludedPackages = [ "tests" ];

nativeBuildInputs = [ pkg-config ];
nativeBuildInputs = [ installShellFiles pkg-config ];
buildInputs = [ gpgme libgpgerror lvm2 btrfs-progs libselinux libseccomp ];

patches = [ ./disable-go-module-mode.patch ];
@@ -27,7 +36,7 @@ buildGoPackage rec {
pushd go/src/${goPackagePath}
make GIT_COMMIT="unknown"
install -Dm755 buildah $bin/bin/buildah
install -Dm444 contrib/completions/bash/buildah $bin/share/bash-completion/completions/buildah
installShellCompletion --bash contrib/completions/bash/buildah
'';

postBuild = ''