diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-09-28 18:05:16 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-09-28 18:05:16 +0000 |
commit | d2b7f4ad5f78a0f9989cb30f1f8f595dbc0dbb27 (patch) | |
tree | 9e2c6d8c5ab6b5548c74f5e790a24effa463bd2c /pkgs/applications/virtualization | |
parent | 20b80093057fc6ef03012733a277aa44d0300eeb (diff) | |
parent | 8f267bdfbe31b01eb82ca36a27e67f159a4a2f3e (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/virtualization')
-rw-r--r-- | pkgs/applications/virtualization/docker/compose.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/virtualization/pods/default.nix | 59 |
2 files changed, 62 insertions, 3 deletions
diff --git a/pkgs/applications/virtualization/docker/compose.nix b/pkgs/applications/virtualization/docker/compose.nix index 57e0d76e41453..ad6a02ec3b027 100644 --- a/pkgs/applications/virtualization/docker/compose.nix +++ b/pkgs/applications/virtualization/docker/compose.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "docker-compose"; - version = "2.11.1"; + version = "2.11.2"; src = fetchFromGitHub { owner = "docker"; repo = "compose"; rev = "v${version}"; - sha256 = "sha256-S7mRSpqZTL38YlYHqtXdib7LZqodfEFqdAB98sAXOkA="; + sha256 = "sha256-L43BIkRaPAU0zgdVsf1a3OinbspiU0LfWZPssS91wTE="; }; - vendorSha256 = "sha256-aD0h7vSUkxaGBeN2S2GOEwKpXHKyvnwbOB7pABgBmCY="; + vendorSha256 = "sha256-PZumm//BV9iAkq1Kb9xNenqVrx73ZZUHTCUSVNqqEXA="; ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ]; diff --git a/pkgs/applications/virtualization/pods/default.nix b/pkgs/applications/virtualization/pods/default.nix new file mode 100644 index 0000000000000..5d811b59066b0 --- /dev/null +++ b/pkgs/applications/virtualization/pods/default.nix @@ -0,0 +1,59 @@ +{ lib +, stdenv +, fetchFromGitHub +, desktop-file-utils +, glib +, gtk4 +, meson +, ninja +, pkg-config +, rustPlatform +, wrapGAppsHook +, gtksourceview5 +, libadwaita +}: + +stdenv.mkDerivation rec { + pname = "pods"; + version = "1.0.0-beta.4"; + + src = fetchFromGitHub { + owner = "marhkb"; + repo = pname; + rev = "v${version}"; + sha256 = "1j5rz43860n17qcxmc5dj8sll3y593jj9zz1sfvnx4g0694sp0cl"; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + sha256 = "sha256-tj0ROO8HmFWyQLYDrdywOneHz6X43dRZJFTB+aw+m7o="; + }; + + nativeBuildInputs = [ + desktop-file-utils + glib + gtk4 + meson + ninja + pkg-config + rustPlatform.cargoSetupHook + rustPlatform.rust.cargo + rustPlatform.rust.rustc + wrapGAppsHook + ]; + + buildInputs = [ + gtk4 + gtksourceview5 + libadwaita + ]; + + meta = with lib; { + description = "A podman desktop application"; + homepage = "https://github.com/marhkb/pods"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ figsoda ]; + platforms = platforms.linux; + }; +} |