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

Merge pull request #237092 from NixOS/revert-237054-keyutils-pytest-runner

Revert "python310Packages.keyutils: remove"
parents 083b4e95 cb665974
Loading
Loading
Loading
Loading
+28 −0
Original line number Diff line number Diff line
{ lib, buildPythonPackage, fetchFromGitHub, keyutils, pytest-runner, pytest }:

buildPythonPackage rec {
  pname = "keyutils";
  version = "0.6";

  # github version comes bundled with tests
  src = fetchFromGitHub {
    owner = "sassoftware";
    repo = "python-keyutils";
    rev = version;
    sha256 = "0pfqfr5xqgsqkxzrmj8xl2glyl4nbq0irs0k6ik7iy3gd3mxf5g1";
  };

  postPatch = ''
    substituteInPlace setup.py --replace '"pytest-runner"' ""
  '';

  buildInputs = [ keyutils ];
  nativeCheckInputs = [ pytest pytest-runner ];

  meta = {
    description = "A set of python bindings for keyutils";
    homepage = "https://github.com/sassoftware/python-keyutils";
    license = lib.licenses.asl20;
    maintainers = with lib.maintainers; [ primeos ];
  };
}
+0 −1
Original line number Diff line number Diff line
@@ -157,7 +157,6 @@ mapAliases ({
  jupyter_server = jupyter-server; # added 2023-01-05
  Kajiki = kajiki; # added 2023-02-19
  Keras = keras; # added 2021-11-25
  keyutils = throw "keyutils no longer builds and is unmaintained"; # added 2023-06-10
  ldap = python-ldap; # added 2022-09-16
  lammps-cython = throw "lammps-cython no longer builds and is unmaintained"; # added 2021-07-04
  logilab_astng = throw "logilab-astng has not been released since 2013 and is unmaintained"; # added 2022-11-29
+4 −0
Original line number Diff line number Diff line
@@ -5451,6 +5451,10 @@ self: super: with self; {

  keystoneauth1 = callPackage ../development/python-modules/keystoneauth1 { };

  keyutils = callPackage ../development/python-modules/keyutils {
    inherit (pkgs) keyutils;
  };

  kicad = toPythonModule (pkgs.kicad.override {
    python3 = python;
  }).src;