Unverified Commit a3002886 authored by Yt's avatar Yt Committed by GitHub
Browse files

treewide: fix python packages broken from adding throws in python-aliases.nix (#395785)

parents 02326c14 71db90e9
Loading
Loading
Loading
Loading
+3 −2
Original line number Diff line number Diff line
{
  lib,
  buildPythonApplication,
  python3Packages,
  fetchPypi,
  hatch-vcs,
  hatchling,
  pynput,
  xdg-base-dirs,
}:
@@ -18,7 +19,7 @@ buildPythonApplication rec {
    hash = "sha256-vUlNqSVdGhfN5WjDjf1ub32Y2WoBndIdFzfCNwo5+Vg=";
  };

  nativeBuildInputs = with python3Packages; [
  nativeBuildInputs = [
    hatch-vcs
    hatchling
  ];
+5 −2
Original line number Diff line number Diff line
@@ -2,7 +2,10 @@
  lib,
  buildPythonApplication,
  fetchPypi,
  python3Packages,
  libevdev,
  paramiko,
  pynput,
  screeninfo,
}:

buildPythonApplication rec {
@@ -14,7 +17,7 @@ buildPythonApplication rec {
    hash = "sha256-82P9tE3jiUlKBGZCiWDoL+9VJ06Bc+If+aMfcEEU90U=";
  };

  propagatedBuildInputs = with python3Packages; [
  propagatedBuildInputs = [
    screeninfo
    paramiko
    pynput
+2 −2
Original line number Diff line number Diff line
{
  lib,
  stdenv,
  python3,
  python,
  qt5,
  fetchFromGitHub,
  wrapPython,
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
    sha256 = "07snhwmqqp52vdgr66vx50zxx0nmpmns5cdjgh50hzlhji2z1fl9";
  };

  buildInputs = [ python3 ];
  buildInputs = [ python ];
  pythonPath = [
    pyqt5.dev
    pyserial
+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@
  zstd,
  nix-update-script,
  bzip2,
  python3Packages,
  python3,
}:

stdenv.mkDerivation (finalAttrs: {
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {

  nativeBuildInputs = [
    cmake
    python3Packages.python
    python3
  ];

  buildInputs = [
+11 −9
Original line number Diff line number Diff line
@@ -5,20 +5,22 @@
  fetchpatch,
  blas,
  boost186,
  buildPythonPackage,
  cmake,
  doxygen,
  eigen,
  hdf5,
  isPy27,
  lapack,
  mpi,
  mpi4py,
  numpy,
  pkg-config,
  pkgconfig,
  ply,
  pybind11,
  pytest,
  python,
  pythonPackages,
  scotch,
  setuptools,
  six,
@@ -33,7 +35,7 @@
let
  version = "2019.1.0";

  dijitso = pythonPackages.buildPythonPackage {
  dijitso = buildPythonPackage {
    pname = "dijitso";
    inherit version;
    src = fetchurl {
@@ -61,7 +63,7 @@ let
    };
  };

  fiat = pythonPackages.buildPythonPackage {
  fiat = buildPythonPackage {
    pname = "fiat";
    inherit version;
    src = fetchurl {
@@ -101,7 +103,7 @@ let
    };
  };

  ufl = pythonPackages.buildPythonPackage {
  ufl = buildPythonPackage {
    pname = "ufl";
    inherit version;
    src = fetchurl {
@@ -126,7 +128,7 @@ let
    };
  };

  ffc = pythonPackages.buildPythonPackage {
  ffc = buildPythonPackage {
    pname = "ffc";
    inherit version;
    src = fetchurl {
@@ -257,10 +259,10 @@ let
      license = lib.licenses.lgpl3;
    };
  };
  python-dolfin = pythonPackages.buildPythonPackage rec {
  python-dolfin = buildPythonPackage rec {
    pname = "dolfin";
    inherit version;
    disabled = pythonPackages.isPy27;
    disabled = isPy27;
    src = dolfin.src;
    sourceRoot = "${pname}-${version}/python";
    nativeBuildInputs = [
@@ -286,8 +288,8 @@ let
      mpi4py
      numpy
      ufl
      pythonPackages.pkgconfig
      pythonPackages.pybind11
      pkgconfig
      pybind11
    ];
    doCheck = false; # Tries to orte_ess_init and call ssh to localhost
    passthru.tests = {
Loading