From 8d7de802deae32c27ee41ac501381165a544d25c Mon Sep 17 00:00:00 2001 From: Daniel Ziltener Date: Wed, 20 Dec 2023 14:49:17 +0100 Subject: [PATCH] Add podman-compose, maybe fix nwg-displays. --- zilti/packages/nwg-displays.scm | 7 +++--- zilti/packages/podman-compose.scm | 38 +++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 4 deletions(-) create mode 100644 zilti/packages/podman-compose.scm diff --git a/zilti/packages/nwg-displays.scm b/zilti/packages/nwg-displays.scm index 5eb01fa..717c632 100644 --- a/zilti/packages/nwg-displays.scm +++ b/zilti/packages/nwg-displays.scm @@ -3,7 +3,7 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix gexp) - #:use-module (guix build-system python) + #:use-module (guix build-system pyproject) #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) #:use-module (gnu packages) @@ -31,8 +31,7 @@ (list gobject-introspection python-wheel)) (inputs - (list gtk+ - gtk-layer-shell)) + (list gtk+)) (propagated-inputs (list atk gdk-pixbuf @@ -42,7 +41,7 @@ python-gst python-pygobject wlr-randr)) - (build-system python-build-system) + (build-system pyproject-build-system) (arguments (list #:tests? #f #:phases diff --git a/zilti/packages/podman-compose.scm b/zilti/packages/podman-compose.scm new file mode 100644 index 0000000..7d804e7 --- /dev/null +++ b/zilti/packages/podman-compose.scm @@ -0,0 +1,38 @@ +(define-module (zilti packages podman-compose) + #:use-module (guix) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix gexp) + #:use-module (guix build-system pyproject) + #:use-module (guix git-download) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (gnu packages) + #:use-module (gnu packages gtk) + #:use-module (gnu packages glib) + #:use-module (gnu packages gstreamer) + #:use-module (gnu packages python) + #:use-module (gnu packages python-build) + #:use-module (gnu packages python-xyz) + #:use-module (gnu packages wm)) + +(define-public podman-compose + (package + (name "podman-compose") + (version "1.0.6") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/containers/podman-compose.git") + (commit (string-append "v" version)))) + (sha256 + (base32 + "11dwpifkm20vyi6r3fgmiiqc01mpm4r8l0p5gfh0bawi2gklrhsf")))) + (propagated-inputs + (list python-pyyaml + python-dotenv)) + (build-system pyproject-build-system) + (home-page "https://github.com/containers/podman-compose") + (synopsis "a script to run docker-compose.yml using podman") + (description "An implementation of Compose Spec with Podman backend.") + (license license:gpl2)))