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

Commits on May 6, 2020

  1. podman: Link directly to podman.man instead of maping over outputs 

    This seems brittle and fails on Hydra / OfBorg but not locally.
    @adisbladis @zowoq
    adisbladis authored and zowoq committed May 6, 2020
    Copy the full SHA
    ba798d2 View commit details

  2. podman: disable on darwin

    @zowoq
    zowoq committed May 6, 2020
    Copy the full SHA
    5012fc2 View commit details

  3. Merge pull request #87076 from zowoq/podman-wrapper 

    podman: fix wrapper
    @adisbladis
    adisbladis authored May 6, 2020
    Copy the full SHA
    1d53e7d View commit details
Showing with 2 additions and 6 deletions.
  1. +1 −0 pkgs/applications/virtualization/podman/default.nix
  2. +1 −6 pkgs/applications/virtualization/podman/wrapper.nix
1 change: 1 addition & 0 deletions pkgs/applications/virtualization/podman/default.nix
View file
Original file line number Diff line number Diff line change
@@ -54,5 +54,6 @@ buildGoPackage rec {
license = licenses.asl20;
maintainers = with maintainers; [ marsam ] ++ teams.podman.members;
platforms = platforms.unix;
broken = stdenv.isDarwin;
};
}
7 changes: 1 addition & 6 deletions pkgs/applications/virtualization/podman/wrapper.nix
View file
Original file line number Diff line number Diff line change
@@ -43,12 +43,7 @@ in runCommand podman.name {
];

} ''
# Symlink everything but $out from podman-unwrapped
${
lib.concatMapStringsSep "\n"
(o: "ln -s ${podman.${o}} ${placeholder o}")
(builtins.filter (o: o != "out")
podman.outputs)}
ln -s ${podman.man} $man
mkdir -p $out/bin
ln -s ${podman-unwrapped}/share $out/share