Unverified Commit 9395b1bc authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

lasuite-docs: 4.0.0 -> 4.1.0; python3Packages.django-lasuite: 0.0.18 -> 0.0.22 (#469628)

parents 65fa2882 8ba7d9e5

pkgs/by-name/la/lasuite-docs-collaboration-server/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -13,20 +13,20 @@ 


stdenv.mkDerivation rec {

  pname = "lasuite-docs-collaboration-server";

  version = "4.0.0";

  version = "4.1.0";



  src = fetchFromGitHub {

    owner = "suitenumerique";

    repo = "docs";

    tag = "v${version}";

    hash = "sha256-rhbS6NYk8sZmtrNpKJrm24vOwAJGEDVS9fpFWuyvPGA=";

    hash = "sha256-vZkqHlZ1aDOXcrdyV8BXmI95AmMalXOuVLS9XWB/YxU=";

  };



  sourceRoot = "source/src/frontend";



  offlineCache = fetchYarnDeps {

    yarnLock = "${src}/src/frontend/yarn.lock";

    hash = "sha256-ZMeLHpwM0yZvYmA/HSuWbcdqxOH707NNzXppEzV2wEw=";

    hash = "sha256-3yRKWIOPBRrOxBWUW3C5xFjb2dcA6c3cMOD8PZWjHNA=";

  };



  nativeBuildInputs = [

pkgs/by-name/la/lasuite-docs-frontend/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -12,20 +12,20 @@ 


stdenv.mkDerivation rec {

  pname = "lasuite-docs-frontend";

  version = "4.0.0";

  version = "4.1.0";



  src = fetchFromGitHub {

    owner = "suitenumerique";

    repo = "docs";

    tag = "v${version}";

    hash = "sha256-rhbS6NYk8sZmtrNpKJrm24vOwAJGEDVS9fpFWuyvPGA=";

    hash = "sha256-vZkqHlZ1aDOXcrdyV8BXmI95AmMalXOuVLS9XWB/YxU=";

  };



  sourceRoot = "source/src/frontend";



  offlineCache = fetchYarnDeps {

    yarnLock = "${src}/src/frontend/yarn.lock";

    hash = "sha256-ZMeLHpwM0yZvYmA/HSuWbcdqxOH707NNzXppEzV2wEw=";

    hash = "sha256-3yRKWIOPBRrOxBWUW3C5xFjb2dcA6c3cMOD8PZWjHNA=";

  };



  nativeBuildInputs = [

pkgs/by-name/la/lasuite-docs/package.nix

+47 −51
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 
  python3,

  fetchFromGitHub,

  nixosTests,

  fetchPypi,

  fetchYarnDeps,

  nodejs,

  yarnBuildHook,
@@ -15,23 +14,15 @@ let 
    self = python3;

    packageOverrides = self: super: {

      django = super.django_5_2;

      django-csp = super.django-csp.overridePythonAttrs rec {

        version = "4.0";

        src = fetchPypi {

          inherit version;

          pname = "django_csp";

          hash = "sha256-snAQu3Ausgo9rTKReN8rYaK4LTOLcPvcE8OjvShxKDM=";

        };

      };

    };

  };



  version = "4.0.0";

  version = "4.1.0";

  src = fetchFromGitHub {

    owner = "suitenumerique";

    repo = "docs";

    tag = "v${version}";

    hash = "sha256-rhbS6NYk8sZmtrNpKJrm24vOwAJGEDVS9fpFWuyvPGA=";

    hash = "sha256-vZkqHlZ1aDOXcrdyV8BXmI95AmMalXOuVLS9XWB/YxU=";

  };



  mail-templates = stdenv.mkDerivation {
@@ -71,7 +62,9 @@ python.pkgs.buildPythonApplication rec { 


  build-system = with python.pkgs; [ setuptools ];



  dependencies = with python.pkgs; [

  dependencies =

    with python.pkgs;

    [

      beautifulsoup4

      boto3

      celery
@@ -110,7 +103,10 @@ python.pkgs.buildPythonApplication rec { 
      requests

      sentry-sdk

      whitenoise

  ];

    ]

    ++ celery.optional-dependencies.redis

    ++ django-lasuite.optional-dependencies.all

    ++ django-storages.optional-dependencies.s3;



  pythonRelaxDeps = true;

pkgs/by-name/la/lasuite-meet/package.nix

+43 −38
Original line number Diff line number Diff line
@@ -32,7 +32,9 @@ python.pkgs.buildPythonApplication rec { 


  build-system = with python.pkgs; [ setuptools ];



  dependencies = with python.pkgs; [

  dependencies =

    with python.pkgs;

    [

      aiohttp

      boto3

      brevo-python
@@ -69,7 +71,10 @@ python.pkgs.buildPythonApplication rec { 
      requests

      sentry-sdk

      whitenoise

  ];

    ]

    ++ celery.optional-dependencies.redis

    ++ django-lasuite.optional-dependencies.all

    ++ django-storages.optional-dependencies.s3;



  pythonRelaxDeps = true;

pkgs/development/python-modules/django-lasuite/default.nix

+13 −5
Original line number Diff line number Diff line
@@ -15,20 +15,21 @@ 
  pytest-django,

  responses,

  celery,

  freezegun,

  pytestCheckHook,

  nixosTests,

}:



buildPythonPackage rec {

  pname = "django-lasuite";

  version = "0.0.18";

  version = "0.0.22";

  pyproject = true;



  src = fetchFromGitHub {

    owner = "suitenumerique";

    repo = "django-lasuite";

    tag = "v${version}";

    hash = "sha256-kXRaoVOyabGPCnO8uyWHbpE0zOIYZkHcqmWNSz0BHZY=";

    hash = "sha256-T9FLxgWePifYIiD2Ivbfir2dlpUvZl2jj8y86VbxVDk=";

  };



  build-system = [ hatchling ];
@@ -44,15 +45,22 @@ buildPythonPackage rec { 
    requests-toolbelt

  ];



  optional-dependencies = lib.fix (self: {

    all = with self; configuration ++ malware_detection;

    configuration = [ django-configurations ];

    malware_detection = [ celery ];

  });



  pythonRelaxDeps = true;



  nativeCheckInputs = [

    celery

    factory-boy

    freezegun

    pytestCheckHook

    pytest-django

    factory-boy

    responses

  ];

  ]

  ++ lib.concatAttrValues optional-dependencies;



  preCheck = ''

    export PYTHONPATH=tests:$PYTHONPATH