From 6e453fe75c455f9a7dcfe6687baca490eaf993ba Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Fri, 24 Dec 2021 16:37:48 +0100 Subject: [PATCH 1/2] staticjinja: 4.1.1 -> 4.1.2 --- pkgs/development/python-modules/staticjinja/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/staticjinja/default.nix b/pkgs/development/python-modules/staticjinja/default.nix index d0c4d39f1165..42a69a5ae707 100644 --- a/pkgs/development/python-modules/staticjinja/default.nix +++ b/pkgs/development/python-modules/staticjinja/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "staticjinja"; - version = "4.1.1"; + version = "4.1.2"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "staticjinja"; repo = pname; rev = version; - sha256 = "sha256-Bpgff3VaTylnYpkWoaWEiRWu4sYSP6dLbHDOjAhj7BM="; + sha256 = "sha256-YHhGohA24D4O/Bj7JZTj8qaEGEZAupvxWcZYjWFTHmM="; }; nativeBuildInputs = [ From 937b599abef6af8bbd537297826e75cea37834d5 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Fri, 24 Dec 2021 16:53:10 +0100 Subject: [PATCH 2/2] staticjinja: add minimal template test --- .../python-modules/staticjinja/default.nix | 6 ++++-- .../staticjinja/test-minimal-template/default.nix | 11 +++++++++++ .../test-minimal-template/templates/include | 1 + .../staticjinja/test-minimal-template/templates/index | 1 + 4 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/python-modules/staticjinja/test-minimal-template/default.nix create mode 100644 pkgs/development/python-modules/staticjinja/test-minimal-template/templates/include create mode 100644 pkgs/development/python-modules/staticjinja/test-minimal-template/templates/index diff --git a/pkgs/development/python-modules/staticjinja/default.nix b/pkgs/development/python-modules/staticjinja/default.nix index 42a69a5ae707..44cd64821d9d 100644 --- a/pkgs/development/python-modules/staticjinja/default.nix +++ b/pkgs/development/python-modules/staticjinja/default.nix @@ -12,6 +12,7 @@ , testVersion , tomlkit , staticjinja +, callPackage }: buildPythonPackage rec { @@ -51,8 +52,9 @@ buildPythonPackage rec { export PATH="$PATH:$out/bin"; ''; - passthru.tests.version = testVersion { - package = staticjinja; + passthru.tests = { + version = testVersion { package = staticjinja; }; + minimal-template = callPackage ./test-minimal-template {}; }; meta = with lib; { diff --git a/pkgs/development/python-modules/staticjinja/test-minimal-template/default.nix b/pkgs/development/python-modules/staticjinja/test-minimal-template/default.nix new file mode 100644 index 000000000000..e51a619c9e90 --- /dev/null +++ b/pkgs/development/python-modules/staticjinja/test-minimal-template/default.nix @@ -0,0 +1,11 @@ +{ stdenv, staticjinja }: + +stdenv.mkDerivation { + name = "staticjinja-test-minimal-template"; + meta.timeout = 30; + buildCommand = '' + ${staticjinja}/bin/staticjinja build --srcpath ${./templates} + grep 'Hello World!' index + touch $out + ''; +} diff --git a/pkgs/development/python-modules/staticjinja/test-minimal-template/templates/include b/pkgs/development/python-modules/staticjinja/test-minimal-template/templates/include new file mode 100644 index 000000000000..216e97ce0822 --- /dev/null +++ b/pkgs/development/python-modules/staticjinja/test-minimal-template/templates/include @@ -0,0 +1 @@ +World diff --git a/pkgs/development/python-modules/staticjinja/test-minimal-template/templates/index b/pkgs/development/python-modules/staticjinja/test-minimal-template/templates/index new file mode 100644 index 000000000000..03e1043180d8 --- /dev/null +++ b/pkgs/development/python-modules/staticjinja/test-minimal-template/templates/index @@ -0,0 +1 @@ +Hello {% include './include' %}!