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

Commits on Apr 9, 2020

  1. skopeo: 1.41.0 -> 0.2.0 

    https://github.com/containers/skopeo/releases/tag/v0.2.0
    @zowoq
    zowoq committed Apr 9, 2020
    Copy the full SHA
    c5bd085 View commit details

Commits on Apr 10, 2020

  1. Merge pull request #84861 from zowoq/skopeo 

    skopeo: 1.41.0 -> 0.2.0
    @marsam
    marsam authored Apr 10, 2020
    Copy the full SHA
    4bf632f View commit details
Showing with 16 additions and 6 deletions.
  1. +16 −6 pkgs/development/tools/skopeo/default.nix
22 changes: 16 additions & 6 deletions pkgs/development/tools/skopeo/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,27 @@
{ stdenv, lib, buildGoPackage, fetchFromGitHub, runCommand
, gpgme, libgpgerror, lvm2, btrfs-progs, pkgconfig, libselinux
, go-md2man }:
{ stdenv
, lib
, buildGoPackage
, fetchFromGitHub
, runCommand
, gpgme
, libgpgerror
, lvm2
, btrfs-progs
, pkg-config
, libselinux
, go-md2man
}:

with stdenv.lib;

let
version = "0.1.41";
version = "0.2.0";

src = fetchFromGitHub {
rev = "v${version}";
owner = "containers";
repo = "skopeo";
sha256 = "0aqw17irj2wn4a8g9hzfm5z5azqq33z6r1dbg1gyn2c8qxy1vfxs";
sha256 = "09zqzrw6f1s6kaknnj3hra3xz4nq6y86vmw5vk8p4f6g7cwakg1x";
};

defaultPolicyFile = runCommand "skopeo-default-policy.json" {} "cp ${src}/default-policy.json $out";
@@ -28,7 +38,7 @@ buildGoPackage {

excludedPackages = "integration";

nativeBuildInputs = [ pkgconfig (lib.getBin go-md2man) ];
nativeBuildInputs = [ pkg-config (lib.getBin go-md2man) ];
buildInputs = [ gpgme ] ++ lib.optionals stdenv.isLinux [ libgpgerror lvm2 btrfs-progs libselinux ];

buildFlagsArray = ''