From 5d255c0660e1065d43a217f17b06e2818fbb2a04 Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Fri, 4 Sep 2020 00:55:05 +0200 Subject: [PATCH 1/2] maintainers: add dandellion --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a35b7956d3c..b40ce4548e5 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1873,6 +1873,12 @@ githubId = 1918; name = "David Anderson"; }; + dandellion = { + email = "daniel@dodsorf.as"; + github = "dali99"; + githubId = 990767; + name = "Daniel Olsen"; + }; danharaj = { email = "dan@obsidian.systems"; github = "danharaj"; From fdefec4f3dd7624ec5d93ad070f329bae178f901 Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Fri, 4 Sep 2020 00:55:42 +0200 Subject: [PATCH 2/2] vcsi: init at 7.0.12 --- pkgs/tools/video/vcsi/default.nix | 28 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/tools/video/vcsi/default.nix diff --git a/pkgs/tools/video/vcsi/default.nix b/pkgs/tools/video/vcsi/default.nix new file mode 100644 index 00000000000..84e6c2e6d41 --- /dev/null +++ b/pkgs/tools/video/vcsi/default.nix @@ -0,0 +1,28 @@ +{ lib, python3Packages, ffmpeg }: + +python3Packages.buildPythonApplication rec { + pname = "vcsi"; + version = "7.0.12"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "0dks0yr2a0cpr32vrwhdrhsb4qyj7rz1yv44fjbr8z8j8p84yjx5"; + }; + + propagatedBuildInputs = with python3Packages; [ + numpy + pillow + jinja2 + texttable + parsedatetime + ]; + + makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ ffmpeg ]}" ]; + + meta = with lib; { + description = "Create video contact sheets"; + homepage = "https://github.com/amietn/vcsi"; + license = licenses.mit; + maintainers = with maintainers; [ dandellion ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 043cd123261..b348ffccfc8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7619,6 +7619,8 @@ in vbetool = callPackage ../tools/system/vbetool { }; + vcsi = callPackage ../tools/video/vcsi { }; + vde2 = callPackage ../tools/networking/vde2 { }; vboot_reference = callPackage ../tools/system/vboot_reference {};