Unverified Commit c38fee78 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #311756 from mjoerg/lektor-3.4.0b11

lektor: 3.4.0b8 -> 3.4.0b12
parents 489d8c1c 537ab77e
Loading
Loading
Loading
Loading
+15 −16
Original line number Diff line number Diff line
@@ -23,19 +23,23 @@ let
in
python.pkgs.buildPythonApplication rec {
  pname = "lektor";
  version = "3.4.0b8";
  version = "3.4.0b12";
  format = "pyproject";

  src = fetchFromGitHub {
    owner = "lektor";
    repo = pname;
    rev = "refs/tags/v${version}";
    hash = "sha256-FtmRW4AS11zAX2jvGY8XTsPrN3mhHkIWoFY7sXmqG/U=";
    # fix for case-insensitive filesystems
    postFetch = ''
      rm -f $out/tests/demo-project/content/icc-profile-test/{LICENSE,license}.txt
    '';
    hash = "sha256-y0/fYuiIB/O5tsYKjzOPnCafOIZCn4Z5OITPMcnHd/M=";
  };

  npmDeps = fetchNpmDeps {
    src = "${src}/frontend";
    hash = "sha256-Z7LP9rrVSzKoLITUarsnRbrhIw7W7TZSZUgV/OT+m0M=";
    src = "${src}/${npmRoot}";
    hash = "sha256-LXe5/u4nAGig8RSu6r8Qsr3p3Od8eoMxukW8Z4HkJ44=";
  };

  npmRoot = "frontend";
@@ -50,8 +54,6 @@ python.pkgs.buildPythonApplication rec {
  propagatedBuildInputs = with python.pkgs; [
    babel
    click
    exifread
    filetype
    flask
    inifile
    jinja2
@@ -71,11 +73,6 @@ python.pkgs.buildPythonApplication rec {
    pytest-click
    pytest-mock
    pytestCheckHook
    pythonRelaxDepsHook
  ];

  pythonRelaxDeps = [
    "werkzeug"
  ];

  postInstall = ''
@@ -90,16 +87,18 @@ python.pkgs.buildPythonApplication rec {
    # Tests require network access
    "test_path_installed_plugin_is_none"
    "test_VirtualEnv_run_pip_install"
    # expects FHS paths
    "test_VirtualEnv_executable"
  ];

  meta = with lib; {
  postCheck = ''
    make test-js
  '';

  meta = {
    description = "A static content management system";
    homepage = "https://www.getlektor.com/";
    changelog = "https://github.com/lektor/lektor/blob/v${version}/CHANGES.md";
    license = licenses.bsd0;
    license = lib.licenses.bsd3;
    mainProgram = "lektor";
    maintainers = with maintainers; [ ];
    maintainers = [ ];
  };
}