Unverified Commit ae8a34a2 authored by Fabian Affolter's avatar Fabian Affolter Committed by GitHub
Browse files

Merge pull request #269074 from risicle/ris-apache-airflow-2.7.3 

apache-airflow: 2.7.1 -> 2.7.3, fix build
parents 9048a435 8f5fa257

pkgs/servers/apache-airflow/default.nix

+29 −0
Original line number Diff line number Diff line
@@ -7,6 +7,17 @@ 
let

  python = python3.override {

    packageOverrides = pySelf: pySuper: {

      flask = pySuper.flask.overridePythonAttrs (o: rec {

        version = "2.2.5";

        src = fetchPypi {

          pname = "Flask";

          inherit version;

          hash = "sha256-7e6bCn/yZiG9WowQ/0hK4oc3okENmbC7mmhQx/uXeqA=";

        };

        nativeBuildInputs = (o.nativeBuildInputs or []) ++ [

          pySelf.setuptools

        ];

      });

      # flask-appbuilder doesn't work with sqlalchemy 2.x, flask-appbuilder 3.x

      # https://github.com/dpgaspar/Flask-AppBuilder/issues/2038

      flask-appbuilder = pySuper.flask-appbuilder.overridePythonAttrs (o: {
@@ -21,6 +32,24 @@ let 
        };

        format = "setuptools";

      });

      httpcore = pySuper.httpcore.overridePythonAttrs (o: rec {

        # nullify upstream's pytest flags which cause

        # "TLS/SSL connection has been closed (EOF)"

        # with pytest-httpbin 1.x

        preCheck = ''

          substituteInPlace pyproject.toml \

            --replace '[tool.pytest.ini_options]' '[tool.notpytest.ini_options]'

        '';

      });

      pytest-httpbin = pySuper.pytest-httpbin.overridePythonAttrs (o: rec {

        version = "1.0.2";

        src = fetchFromGitHub {

          owner = "kevin1024";

          repo = "pytest-httpbin";

          rev = "refs/tags/v${version}";

          hash = "sha256-S4ThQx4H3UlKhunJo35esPClZiEn7gX/Qwo4kE1QMTI=";

        };

      });

      # apache-airflow doesn't work with sqlalchemy 2.x

      # https://github.com/apache/airflow/issues/28723

      sqlalchemy = pySuper.sqlalchemy.overridePythonAttrs (o: rec {

pkgs/servers/apache-airflow/providers.nix

+12 −12

File changed.

Preview size limit exceeded, changes collapsed.

pkgs/servers/apache-airflow/python-package.nix

+3 −3
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ 
, enabledProviders ? []

}:

let

  version = "2.7.1";

  version = "2.7.3";



  airflow-src = fetchFromGitHub rec {

    owner = "apache";
@@ -96,7 +96,7 @@ let 
    # Download using the git protocol rather than using tarballs, because the

    # GitHub archive tarballs don't appear to include tests

    forceFetchGit = true;

    hash = "sha256-TxlOdazdaEKt9U+t/zjRChUABLhVTqXvH8nUbYrRrQs=";

    hash = "sha256-+YbiKFZLigSDbHPaUKIl97kpezW1rIt/j09MMa6lwhQ=";

  };



  # airflow bundles a web interface, which is built using webpack by an undocumented shell script in airflow's source tree.
@@ -110,7 +110,7 @@ let 


    offlineCache = fetchYarnDeps {

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

      hash = "sha256-ZUvjSA6BKj27xTNieVBBXm6oCTAWIvxk2menQMt91uE=";

      hash = "sha256-WQKuQgNp35fU6z7owequXOSwoUGJDJYcUgkjPDMOops=";

    };



    distPhase = "true";