From 4fbe7b0c921df08c164fbf60a5fec4cc60c0bac0 Mon Sep 17 00:00:00 2001
From: Kerstin Humm <kerstin@erictapen.name>
Date: Thu, 29 Aug 2024 18:02:16 +0200
Subject: [PATCH] weblate: move extras from overrides into dependencies, add
 MIT license

some files are actually licensed by MIT
---
 pkgs/by-name/we/weblate/package.nix | 139 ++++++++++++++--------------
 1 file changed, 70 insertions(+), 69 deletions(-)

diff --git a/pkgs/by-name/we/weblate/package.nix b/pkgs/by-name/we/weblate/package.nix
index b27850ddbc68..93b73293955a 100644
--- a/pkgs/by-name/we/weblate/package.nix
+++ b/pkgs/by-name/we/weblate/package.nix
@@ -23,12 +23,6 @@ let
         # https://github.com/encode/django-rest-framework/discussions/9342
         disabledTests = (old.disabledTests or [ ]) ++ [ "test_invalid_inputs" ];
       });
-      celery = prev.celery.overridePythonAttrs (old: {
-        dependencies = old.dependencies ++ prev.celery.optional-dependencies.redis;
-      });
-      python-redis-lock = prev.python-redis-lock.overridePythonAttrs (old: {
-        dependencies = old.dependencies ++ prev.python-redis-lock.optional-dependencies.django;
-      });
     };
   };
 in
@@ -47,7 +41,7 @@ python.pkgs.buildPythonApplication rec {
     owner = "WeblateOrg";
     repo = "weblate";
     rev = "refs/tags/weblate-${version}";
-    hash = "sha256-mVcVthOiUTTYGRIp6pcubMsHZW55P86ZCfeno6JjN4I=";
+    hash = "sha256-h5+0lOMD+H0ehtZ0bngA9bI5va1I5KjZH9boaEtXJPo=";
   };
 
   patches = [
@@ -76,67 +70,71 @@ python.pkgs.buildPythonApplication rec {
       ${python.pythonOnBuildForHost.interpreter} manage.py compress
     '';
 
-  dependencies = with python.pkgs; [
-    aeidon
-    ahocorasick-rs
-    borgbackup
-    celery
-    certifi
-    charset-normalizer
-    django-crispy-bootstrap3
-    cryptography
-    cssselect
-    cython
-    cyrtranslit
-    diff-match-patch
-    django-appconf
-    django-celery-beat
-    django-compressor
-    django-cors-headers
-    django-crispy-forms
-    django-filter
-    django-redis
-    django-otp
-    django-otp-webauthn
-    django
-    djangorestframework
-    filelock
-    fluent-syntax
-    gitpython
-    hiredis
-    html2text
-    iniparse
-    jsonschema
-    lxml
-    mistletoe
-    nh3
-    openpyxl
-    packaging
-    phply
-    pillow
-    pycairo
-    pygments
-    pygobject3
-    pyicumessageformat
-    pyparsing
-    python-dateutil
-    python-redis-lock
-    qrcode
-    rapidfuzz
-    redis
-    requests
-    ruamel-yaml
-    sentry-sdk
-    siphashc
-    social-auth-app-django
-    social-auth-core
-    tesserocr
-    translate-toolkit
-    translation-finder
-    user-agents
-    weblate-language-data
-    weblate-schemas
-  ];
+  dependencies =
+    with python.pkgs;
+    [
+      aeidon
+      ahocorasick-rs
+      (toPythonModule (borgbackup.override { python3 = python; }))
+      celery
+      certifi
+      charset-normalizer
+      django-crispy-bootstrap3
+      cryptography
+      cssselect
+      cython
+      cyrtranslit
+      diff-match-patch
+      django-appconf
+      django-celery-beat
+      django-compressor
+      django-cors-headers
+      django-crispy-forms
+      django-filter
+      django-redis
+      django-otp
+      django-otp-webauthn
+      django
+      djangorestframework
+      filelock
+      fluent-syntax
+      gitpython
+      hiredis
+      html2text
+      iniparse
+      jsonschema
+      lxml
+      mistletoe
+      nh3
+      openpyxl
+      packaging
+      phply
+      pillow
+      pycairo
+      pygments
+      pygobject3
+      pyicumessageformat
+      pyparsing
+      python-dateutil
+      python-redis-lock
+      qrcode
+      rapidfuzz
+      redis
+      requests
+      ruamel-yaml
+      sentry-sdk
+      siphashc
+      social-auth-app-django
+      social-auth-core
+      tesserocr
+      translate-toolkit
+      translation-finder
+      user-agents
+      weblate-language-data
+      weblate-schemas
+    ]
+    ++ python-redis-lock.optional-dependencies.django
+    ++ celery.optional-dependencies.redis;
 
   optional-dependencies = {
     postgres = with python.pkgs; [ psycopg ];
@@ -164,7 +162,10 @@ python.pkgs.buildPythonApplication rec {
   meta = with lib; {
     description = "Web based translation tool with tight version control integration";
     homepage = "https://weblate.org/";
-    license = licenses.gpl3Plus;
+    license = with licenses; [
+      gpl3Plus
+      mit
+    ];
     platforms = platforms.linux;
     maintainers = with maintainers; [ erictapen ];
   };