diff --git a/Documentation/Changelog/4.1.0.rst b/Documentation/Changelog/4.1.0.rst new file mode 100644 index 0000000..0685fa4 --- /dev/null +++ b/Documentation/Changelog/4.1.0.rst @@ -0,0 +1,27 @@ +4.1.9 +===== + +Breaking +-------- + +Nothing + +Features +-------- + +Nothing + +Fixes +----- + +Nothing + +Tasks +----- + +* Add image handling support in nix shell. + +Deprecation +----------- + +Nothing diff --git a/Tests/Functional/AbstractFunctionalTestCase.php b/Tests/Functional/AbstractFunctionalTestCase.php index 41b2683..536ac7c 100644 --- a/Tests/Functional/AbstractFunctionalTestCase.php +++ b/Tests/Functional/AbstractFunctionalTestCase.php @@ -79,9 +79,9 @@ abstract class AbstractFunctionalTestCase extends FunctionalTestCase ], 'GFX' => [ 'processor_enabled' => true, - 'processor_path' => '/usr/bin/', - 'processor_path_lzw' => '/usr/bin/', - 'processor' => 'ImageMagick', + 'processor_path' => getenv('GRAPHICSMAGICK_PATH') ?: '/usr/bin/', + 'processor_path_lzw' => getenv('GRAPHICSMAGICK_PATH') ?: '/usr/bin/', + 'processor' => getenv('GRAPHICSMAGICK_PATH') ? 'GraphicsMagick' : 'ImageMagick', ], ]); diff --git a/ext_emconf.php b/ext_emconf.php index f763d4b..028c3cf 100644 --- a/ext_emconf.php +++ b/ext_emconf.php @@ -9,7 +9,7 @@ $EM_CONF['events'] = [ 'author' => 'Dirk Koritnik, Daniel Siepmann', 'author_email' => 'koritnik@werkraum-media.de, coding@daniel-siepmann.de', 'state' => 'stable', - 'version' => '4.0.1', + 'version' => '4.1.0', 'constraints' => [ 'depends' => [ 'typo3' => '', diff --git a/shell.nix b/shell.nix index 9ebd466..70c6e7d 100644 --- a/shell.nix +++ b/shell.nix @@ -129,6 +129,8 @@ in pkgs.mkShell { composer ]; + GRAPHICSMAGICK_PATH = pkgs.lib.makeBinPath [ pkgs.graphicsmagick ] + "/"; + shellHook = '' export typo3DatabaseDriver=pdo_sqlite '';