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

Commits on Jul 23, 2020

  1. podman: 2.0.2 -> 2.0.3 

    https://github.com/containers/podman/releases/tag/v2.0.3
    @zowoq
    zowoq committed Jul 23, 2020
    Copy the full SHA
    8f5763a View commit details

  2. podman: don't use wrapper on darwin

    @zowoq
    zowoq committed Jul 23, 2020
    Copy the full SHA
    02b8361 View commit details

Commits on Jul 24, 2020

  1. Merge pull request #93722 from zowoq/podman 

    podman: 2.0.2 -> 2.0.3
    @marsam
    marsam authored Jul 24, 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
    c6abc25 View commit details
Showing with 6 additions and 3 deletions.
  1. +2 −2 pkgs/applications/virtualization/podman/default.nix
  2. +4 −1 pkgs/top-level/all-packages.nix
4 changes: 2 additions & 2 deletions pkgs/applications/virtualization/podman/default.nix
View file
Original file line number Diff line number Diff line change
@@ -16,13 +16,13 @@

buildGoModule rec {
pname = "podman";
version = "2.0.2";
version = "2.0.3";

src = fetchFromGitHub {
owner = "containers";
repo = "podman";
rev = "v${version}";
sha256 = "12iqj71xjszbjbbz5f2dk5chcvfrrq0n737ki7xxkjcw38k2cnqz";
sha256 = "1jqdv3kij2q97qn4niqxxgfva9ajr4wjgx40qk5yhs01d3g0qgmd";
};

vendorSha256 = null;
5 changes: 4 additions & 1 deletion pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -6113,7 +6113,10 @@ in

podiff = callPackage ../tools/text/podiff { };

podman = callPackage ../applications/virtualization/podman/wrapper.nix { };
podman = if stdenv.isDarwin then
callPackage ../applications/virtualization/podman { }
else
callPackage ../applications/virtualization/podman/wrapper.nix { };
podman-unwrapped = callPackage ../applications/virtualization/podman { };

podman-compose = python3Packages.callPackage ../applications/virtualization/podman-compose {};