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

Commits on Jan 15, 2020

  1. buildah: 1.12.0 -> 1.13.1 

    Changelog:
- https://github.com/containers/buildah/releases/tag/v1.13.0
- https://github.com/containers/buildah/releases/tag/v1.13.1
    @marsam
    marsam committed Jan 15, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    marsam Mario Rodas
    GPG key ID: 4C4BEFD7B18DC5E8
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9e3456a View commit details

  2. Merge pull request #77715 from marsam/update-buildah 

    buildah: 1.12.0 -> 1.13.1
    @marsam
    marsam authored Jan 15, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    312edfe View commit details
Showing with 4 additions and 6 deletions.
  1. +4 −6 pkgs/development/tools/buildah/default.nix
10 changes: 4 additions & 6 deletions pkgs/development/tools/buildah/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,24 +4,20 @@

buildGoPackage rec {
pname = "buildah";
version = "1.12.0";
version = "1.13.1";

src = fetchFromGitHub {
owner = "containers";
repo = "buildah";
rev = "v${version}";
sha256 = "0lsjsfp6ls38vlgibbnsyd1m7jvmjwdmpyrd0qigp4aa2abwi4dg";
sha256 = "0swhpdr970ik6fhvmj45r84lsp1n6rxm0bgv9i1lvrxy1mdv7r9x";
};

outputs = [ "bin" "man" "out" ];

goPackagePath = "github.com/containers/buildah";
excludedPackages = [ "tests" ];

# Disable module-mode, because Go 1.13 automatically enables it if there is
# go.mod file. Remove after https://github.com/NixOS/nixpkgs/pull/73380
GO111MODULE = "off";

nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gpgme libgpgerror lvm2 btrfs-progs ostree libselinux libseccomp ];

@@ -31,6 +27,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
'';

postBuild = ''
@@ -40,6 +37,7 @@ buildGoPackage rec {
meta = with stdenv.lib; {
description = "A tool which facilitates building OCI images";
homepage = "https://github.com/containers/buildah";
changelog = "https://github.com/containers/buildah/releases/tag/v${version}";
license = licenses.asl20;
maintainers = with maintainers; [ Profpatsch vdemeester saschagrunert ];
};