Commit 54378108 authored by Robert Schütz's avatar Robert Schütz
Browse files

treewide: replace passthru.optional-dependencies with optional-dependencies

parent 8637e879
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -32,9 +32,9 @@ python3.pkgs.buildPythonApplication rec {
    rich-pixels
    textual
    textual-universal-directorytree
  ] ++ lib.attrVals extras passthru.optional-dependencies;
  ] ++ lib.attrVals extras optional-dependencies;

  passthru.optional-dependencies = with python3.pkgs; {
  optional-dependencies = with python3.pkgs; {
    all = [
      pyarrow
      textual-universal-directorytree.optional-dependencies.remote
+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ python.pkgs.buildPythonApplication rec {
      watchdog
    ];

  passthru.optional-dependencies = with python3.pkgs; {
  optional-dependencies = with python3.pkgs; {
    aws = [ boto3 ];
    azure = [
      azure-storage-blob
+2 −2
Original line number Diff line number Diff line
@@ -36,9 +36,9 @@ python3Packages.buildPythonApplication rec {
    setuptools
    wxpython
  ]
  ++ lib.flatten (lib.attrValues passthru.optional-dependencies);
  ++ lib.flatten (lib.attrValues optional-dependencies);

  passthru.optional-dependencies = with python3Packages; {
  optional-dependencies = with python3Packages; {
    cam = [
      opencv4
    ];
+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec {
    pexpect
  ];

  passthru.optional-dependencies = with python3.pkgs; {
  optional-dependencies = with python3.pkgs; {
    dev = [
      mypy
      pytest
+2 −2
Original line number Diff line number Diff line
@@ -4,8 +4,8 @@
, withGUI ? true
}:
let
  mandown' = python3Packages.mandown.overrideAttrs (prev: {
    propagatedBuildInputs = prev.propagatedBuildInputs ++ lib.optionals withGUI prev.passthru.optional-dependencies.gui;
  mandown' = python3Packages.mandown.overridePythonAttrs (prev: {
    propagatedBuildInputs = prev.propagatedBuildInputs ++ lib.optionals withGUI prev.optional-dependencies.gui;
  });
  mandownApp = python3Packages.toPythonApplication mandown';
in
Loading