diff options
| author | lewo <lewo@abesis.fr> | 2019-01-20 18:32:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-20 18:32:34 +0100 |
| commit | bc41317e24317b0f506287f2d5bab00140b9b50e (patch) | |
| tree | b17c8e4f2cbfa4439373f81f865e12e4b5d2ca2a | |
| parent | befc464d4c7898e5da14f4aa5ee4f7602a006465 (diff) | |
| parent | 2660bc201b4b7b817831a85968cb8d2366ea5207 (diff) | |
| download | nixpkgs-bc41317e24317b0f506287f2d5bab00140b9b50e.tar nixpkgs-bc41317e24317b0f506287f2d5bab00140b9b50e.tar.gz nixpkgs-bc41317e24317b0f506287f2d5bab00140b9b50e.tar.bz2 nixpkgs-bc41317e24317b0f506287f2d5bab00140b9b50e.tar.lz nixpkgs-bc41317e24317b0f506287f2d5bab00140b9b50e.tar.xz nixpkgs-bc41317e24317b0f506287f2d5bab00140b9b50e.tar.zst nixpkgs-bc41317e24317b0f506287f2d5bab00140b9b50e.zip | |
Merge pull request #53924 from nzhang-zh/oci-image-tool
oci-image-tool: init at 1.0.0-rc1
| -rw-r--r-- | maintainers/maintainer-list.nix | 5 | ||||
| -rw-r--r-- | pkgs/tools/misc/oci-image-tool/default.nix | 23 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 30 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 94b2a285ee0..2da8781cfa6 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3255,6 +3255,11 @@ github = "nyarly"; name = "Judson Lester"; }; + nzhang-zh = { + email = "n.zhang.hp.au@gmail.com"; + github = "nzhang-zh"; + name = "Ning Zhang"; + }; obadz = { email = "obadz-nixos@obadz.com"; github = "obadz"; diff --git a/pkgs/tools/misc/oci-image-tool/default.nix b/pkgs/tools/misc/oci-image-tool/default.nix new file mode 100644 index 00000000000..6d508a48901 --- /dev/null +++ b/pkgs/tools/misc/oci-image-tool/default.nix @@ -0,0 +1,23 @@ +{ lib, fetchFromGitHub, buildGoPackage }: + +buildGoPackage rec { + name = "oci-image-tool-${version}"; + version = "1.0.0-rc1"; + + goPackagePath = "github.com/opencontainers/image-tools"; + subPackages = [ "cmd/oci-image-tool" ]; + + src = fetchFromGitHub { + owner = "opencontainers"; + repo = "image-tools"; + rev = "v${version}"; + sha256 = "0c4n69smqlkf0r6khy9gbg5f810qh9g8jqsl9kibb0dyswizr14r"; + }; + + meta = { + description = "A collection of tools for working with the OCI image format specification"; + homepage = https://github.com/opencontainers/image-tools; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ nzhang-zh ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d65dfadb826..465f86e1b76 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4582,6 +4582,8 @@ in obexd = callPackage ../tools/bluetooth/obexd { }; + oci-image-tool = callPackage ../tools/misc/oci-image-tool { }; + ocproxy = callPackage ../tools/networking/ocproxy { }; ocserv = callPackage ../tools/networking/ocserv { }; |