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

Commits on Apr 15, 2020

  1. podman: 1.8.2 -> 1.9.0 

    https://github.com/containers/libpod/releases/tag/v1.9.0
    @zowoq
    zowoq committed Apr 15, 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
    05be03f View commit details

Commits on Apr 16, 2020

  1. Merge pull request #85335 from zowoq/podman 

    podman: 1.8.2 -> 1.9.0
    @marsam
    marsam authored Apr 16, 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
    2da9490 View commit details
Showing with 16 additions and 8 deletions.
  1. +16 −8 pkgs/applications/virtualization/podman/default.nix
24 changes: 16 additions & 8 deletions pkgs/applications/virtualization/podman/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,32 @@
{ stdenv, fetchFromGitHub, pkgconfig, installShellFiles
, buildGoPackage, gpgme, lvm2, btrfs-progs, libseccomp, systemd
{ stdenv
, fetchFromGitHub
, pkg-config
, installShellFiles
, buildGoPackage
, gpgme
, lvm2
, btrfs-progs
, libseccomp
, systemd
, go-md2man
}:

buildGoPackage rec {
pname = "podman";
version = "1.8.2";
version = "1.9.0";

src = fetchFromGitHub {
owner = "containers";
repo = "libpod";
rev = "v${version}";
sha256 = "1nxlkqz1ffa3l2yf4rmsxj788dx6xdp8pbi55m9jc9k1vqwc9hxs";
owner = "containers";
repo = "libpod";
rev = "v${version}";
sha256 = "19y48lpf7pvw5f5pzpknn92rq9xwbrpvi8mj7mc4dby6skqadrk4";
};

goPackagePath = "github.com/containers/libpod";

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

nativeBuildInputs = [ pkgconfig go-md2man installShellFiles ];
nativeBuildInputs = [ pkg-config go-md2man installShellFiles ];

buildInputs = stdenv.lib.optionals stdenv.isLinux [ btrfs-progs libseccomp gpgme lvm2 systemd ];