Unverified Commit d2fcc2fd authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

python312Packages.rtslib: 2.2.0 -> 2.2.2 (#389871)

parents e74ac85c 988fef7f

nixos/modules/services/networking/iscsi/target.nix

+3 −3
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ in 
      mode = "0600";

    };



    environment.systemPackages = with pkgs; [ targetcli ];

    environment.systemPackages = with pkgs; [ targetcli-fb ];



    boot.kernelModules = [

      "configfs"
@@ -52,8 +52,8 @@ in 
      wantedBy = [ "multi-user.target" ];

      serviceConfig = {

        Type = "oneshot";

        ExecStart = "${pkgs.python3.pkgs.rtslib}/bin/targetctl restore";

        ExecStop = "${pkgs.python3.pkgs.rtslib}/bin/targetctl clear";

        ExecStart = "${lib.getExe pkgs.python3Packages.rtslib-fb} restore";

        ExecStop = "${lib.getExe pkgs.python3Packages.rtslib-fb} clear";

        RemainAfterExit = "yes";

      };

    };

pkgs/by-name/nv/nvmet-cli/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec { 


  buildInputs = with python3Packages; [ nose2 ];



  propagatedBuildInputs = with python3Packages; [ configshell ];

  propagatedBuildInputs = with python3Packages; [ configshell-fb ];



  # This package requires the `nvmet` kernel module to be loaded for tests.

  doCheck = false;

pkgs/by-name/sp/spdk/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec { 
  ];



  propagatedBuildInputs = [

    python3.pkgs.configshell

    python3.pkgs.configshell-fb

  ];



  postPatch = ''

pkgs/by-name/ta/targetcli/package.nix→pkgs/by-name/ta/targetcli-fb/package.nix

+21 −13
Original line number Diff line number Diff line 
{

  lib,

  python3,

  python3Packages,

  fetchFromGitHub,

  nixosTests,

  wrapGAppsNoGuiHook,
@@ -8,26 +8,32 @@ 
  glib,

}:



python3.pkgs.buildPythonApplication rec {

  pname = "targetcli";

  version = "2.1.58";

python3Packages.buildPythonApplication rec {

  pname = "targetcli-fb";

  version = "3.0.1";

  pyproject = true;



  src = fetchFromGitHub {

    owner = "open-iscsi";

    repo = "${pname}-fb";

    rev = "v${version}";

    hash = "sha256-9QYo7jGk9iWr26j0qPQCqYsJ+vLXAsO4Xs7+7VT9/yc=";

    repo = "targetcli-fb";

    tag = "v${version}";

    hash = "sha256-jRujBgUdeJY8ekVBDscitajDhYohlx/BS4wn+jFkZSg=";

  };



  build-system = with python3Packages; [

    hatch-vcs

    hatchling

  ];



  nativeBuildInputs = [

    wrapGAppsNoGuiHook

    gobject-introspection

  ];

  buildInputs = [ glib ];



  propagatedBuildInputs = with python3.pkgs; [

    configshell

    rtslib

  dependencies = with python3Packages; [

    configshell-fb

    rtslib-fb

    pygobject3

  ];
@@ -40,11 +46,13 @@ python3.pkgs.buildPythonApplication rec { 
    inherit (nixosTests) iscsi-root;

  };



  meta = with lib; {

  meta = {

    description = "Command shell for managing the Linux LIO kernel target";

    homepage = "https://github.com/open-iscsi/targetcli-fb";

    license = licenses.asl20;

    changelog = "https://github.com/open-iscsi/targetcli-fb/releases/tag/v${version}";

    license = lib.licenses.asl20;

    maintainers = [ ];

    platforms = platforms.linux;

    platforms = lib.platforms.linux;

    mainProgram = "targetcli";

  };

}

pkgs/development/python-modules/configshell/default.nix→pkgs/development/python-modules/configshell-fb/default.nix

+5 −6
Original line number Diff line number Diff line
@@ -9,15 +9,13 @@ 
}:



buildPythonPackage rec {

  pname = "configshell";

  pname = "configshell-fb";

  version = "2.0.0";

  pyproject = true;



  disabled = pythonOlder "3.9";



  src = fetchFromGitHub {

    owner = "open-iscsi";

    repo = "${pname}-fb";

    repo = "configshell-fb";

    tag = "v${version}";

    hash = "sha256-lP3WT9ASEj6WiCrurSU/e9FhIaeoQW/n9hi1XZMnV4Q=";

  };
@@ -36,10 +34,11 @@ buildPythonPackage rec { 


  pythonImportsCheck = [ "configshell" ];



  meta = with lib; {

  meta = {

    description = "Python library for building configuration shells";

    homepage = "https://github.com/open-iscsi/configshell-fb";

    license = licenses.asl20;

    changelog = "https://github.com/open-iscsi/configshell-fb/releases/tag/v${version}";

    license = lib.licenses.asl20;

    maintainers = [ ];

  };

}