From e4ffd9c09c6944acfdc4ce006a551a5d20e9fb33 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Mar 2025 16:40:22 +0000 Subject: [PATCH 1/6] python312Packages.rtslib: 2.2.0 -> 2.2.2 --- .../python-modules/rtslib/default.nix | 33 ++++++++++++++----- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/rtslib/default.nix b/pkgs/development/python-modules/rtslib/default.nix index 814e7515b543..3ee775443e85 100644 --- a/pkgs/development/python-modules/rtslib/default.nix +++ b/pkgs/development/python-modules/rtslib/default.nix @@ -2,23 +2,31 @@ lib, fetchFromGitHub, buildPythonPackage, + + # build-system hatchling, hatch-vcs, - six, + + # dependencies pyudev, - pygobject3, }: buildPythonPackage rec { pname = "rtslib"; - version = "2.2.0"; + version = "2.2.2"; pyproject = true; + # TypeError: 'method' object does not support the context manager protocol + postPatch = '' + substituteInPlace rtslib/root.py \ + --replace-fail "Path(restore_file).open" "Path(restore_file).open('r')" + ''; + src = fetchFromGitHub { owner = "open-iscsi"; repo = "${pname}-fb"; tag = "v${version}"; - hash = "sha256-lBYckQlnvIQ6lSENctYsMhzULi1MJAVUyF06Ul56LzA="; + hash = "sha256-FuXO/yGZBR+QRvB5s1tE77hjnisSfjjHSCPLvGJOYdM="; }; build-system = [ @@ -27,16 +35,23 @@ buildPythonPackage rec { ]; dependencies = [ - six pyudev - pygobject3 ]; - meta = with lib; { + postInstall = '' + install -Dm555 scripts/targetctl -t $out/bin + ''; + + # No tests + doCheck = false; + + meta = { description = "Python object API for managing the Linux LIO kernel target"; mainProgram = "targetctl"; homepage = "https://github.com/open-iscsi/rtslib-fb"; - license = licenses.asl20; - platforms = platforms.linux; + changelog = "https://github.com/open-iscsi/rtslib-fb/releases/tag/v${version}"; + license = lib.licenses.asl20; + platforms = lib.platforms.linux; + mainProgram = "targetctl"; }; } From 68c06a055ac83cace7e733dc4815d08ddabd9696 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Mar 2025 22:08:23 +0100 Subject: [PATCH 2/6] python312Packages.rtslib: rename to rtslib-fb --- nixos/modules/services/networking/iscsi/target.nix | 4 ++-- pkgs/by-name/ta/targetcli/package.nix | 2 +- .../python-modules/{rtslib => rtslib-fb}/default.nix | 4 ++-- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) rename pkgs/development/python-modules/{rtslib => rtslib-fb}/default.nix (96%) diff --git a/nixos/modules/services/networking/iscsi/target.nix b/nixos/modules/services/networking/iscsi/target.nix index bfc229376895..f6c0739d0622 100644 --- a/nixos/modules/services/networking/iscsi/target.nix +++ b/nixos/modules/services/networking/iscsi/target.nix @@ -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"; }; }; diff --git a/pkgs/by-name/ta/targetcli/package.nix b/pkgs/by-name/ta/targetcli/package.nix index 9498717b22d6..de02714be0ac 100644 --- a/pkgs/by-name/ta/targetcli/package.nix +++ b/pkgs/by-name/ta/targetcli/package.nix @@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ configshell - rtslib + rtslib-fb pygobject3 ]; diff --git a/pkgs/development/python-modules/rtslib/default.nix b/pkgs/development/python-modules/rtslib-fb/default.nix similarity index 96% rename from pkgs/development/python-modules/rtslib/default.nix rename to pkgs/development/python-modules/rtslib-fb/default.nix index 3ee775443e85..e9eba892e89d 100644 --- a/pkgs/development/python-modules/rtslib/default.nix +++ b/pkgs/development/python-modules/rtslib-fb/default.nix @@ -12,7 +12,7 @@ }: buildPythonPackage rec { - pname = "rtslib"; + pname = "rtslib-fb"; version = "2.2.2"; pyproject = true; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "open-iscsi"; - repo = "${pname}-fb"; + repo = "rtslib-fb"; tag = "v${version}"; hash = "sha256-FuXO/yGZBR+QRvB5s1tE77hjnisSfjjHSCPLvGJOYdM="; }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index ae5fdce752b2..1bb761ce2f3d 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -647,6 +647,7 @@ mapAliases ({ ronin = throw "ronin has been removed because it was unmaintained since 2018"; # added 2024-08-21 ROPGadget = ropgadget; # added 2021-07-06 rotate-backups = throw "rotate-backups was removed in favor of the top-level rotate-backups"; # added 2021-07-01 + rtslib = rtslib-fb; # added 2025-03-14 ruamel_base = ruamel-base; # added 2021-11-01 ruamel_yaml = ruamel-yaml; # added 2021-11-01 ruamel_yaml_clib = ruamel-yaml-clib; # added 2021-11-01 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 22227021a161..01cbe3947a26 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14696,7 +14696,7 @@ self: super: with self; { inherit (pkgs) libspatialindex; }; - rtslib = callPackage ../development/python-modules/rtslib { }; + rtslib-fb = callPackage ../development/python-modules/rtslib-fb { }; rtsp-to-webrtc = callPackage ../development/python-modules/rtsp-to-webrtc { }; From 32c6c9048edd80d8fa30b6d8cf55bd2a0bbb9e11 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Mar 2025 22:17:25 +0100 Subject: [PATCH 3/6] targetcli: 2.1.58 -> 3.0.1 Diff: https://github.com/open-iscsi/targetcli-fb/compare/v2.1.58...v3.0.1 --- pkgs/by-name/ta/targetcli/package.nix | 28 +++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/ta/targetcli/package.nix b/pkgs/by-name/ta/targetcli/package.nix index de02714be0ac..d34ab31b9d3a 100644 --- a/pkgs/by-name/ta/targetcli/package.nix +++ b/pkgs/by-name/ta/targetcli/package.nix @@ -1,6 +1,6 @@ { lib, - python3, + python3Packages, fetchFromGitHub, nixosTests, wrapGAppsNoGuiHook, @@ -8,24 +8,30 @@ glib, }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "targetcli"; - version = "2.1.58"; + 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; [ + dependencies = with python3Packages; [ configshell 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"; }; } From b6ec380f6656bfee6f02c4862364fcfe5746508a Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Mar 2025 22:30:48 +0100 Subject: [PATCH 4/6] python312Packages.rtslib-fb: remove meta.mainProgram as it does not exist --- pkgs/development/python-modules/rtslib-fb/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/rtslib-fb/default.nix b/pkgs/development/python-modules/rtslib-fb/default.nix index e9eba892e89d..ab2f3b9d5553 100644 --- a/pkgs/development/python-modules/rtslib-fb/default.nix +++ b/pkgs/development/python-modules/rtslib-fb/default.nix @@ -47,7 +47,6 @@ buildPythonPackage rec { meta = { description = "Python object API for managing the Linux LIO kernel target"; - mainProgram = "targetctl"; homepage = "https://github.com/open-iscsi/rtslib-fb"; changelog = "https://github.com/open-iscsi/rtslib-fb/releases/tag/v${version}"; license = lib.licenses.asl20; From 6e79d0d383c2dd3770d12495fea84a0f35a298fa Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Mar 2025 22:21:25 +0100 Subject: [PATCH 5/6] targetcli: rename to targetcli-fb --- nixos/modules/services/networking/iscsi/target.nix | 2 +- pkgs/by-name/ta/{targetcli => targetcli-fb}/package.nix | 2 +- pkgs/top-level/aliases.nix | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) rename pkgs/by-name/ta/{targetcli => targetcli-fb}/package.nix (97%) diff --git a/nixos/modules/services/networking/iscsi/target.nix b/nixos/modules/services/networking/iscsi/target.nix index f6c0739d0622..3154271b4dd6 100644 --- a/nixos/modules/services/networking/iscsi/target.nix +++ b/nixos/modules/services/networking/iscsi/target.nix @@ -34,7 +34,7 @@ in mode = "0600"; }; - environment.systemPackages = with pkgs; [ targetcli ]; + environment.systemPackages = with pkgs; [ targetcli-fb ]; boot.kernelModules = [ "configfs" diff --git a/pkgs/by-name/ta/targetcli/package.nix b/pkgs/by-name/ta/targetcli-fb/package.nix similarity index 97% rename from pkgs/by-name/ta/targetcli/package.nix rename to pkgs/by-name/ta/targetcli-fb/package.nix index d34ab31b9d3a..dd169518ef0e 100644 --- a/pkgs/by-name/ta/targetcli/package.nix +++ b/pkgs/by-name/ta/targetcli-fb/package.nix @@ -9,7 +9,7 @@ }: python3Packages.buildPythonApplication rec { - pname = "targetcli"; + pname = "targetcli-fb"; version = "3.0.1"; pyproject = true; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index e9aab7b7b809..601b40ab9992 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1473,6 +1473,7 @@ mapAliases { taskwarrior = lib.warnOnInstantiate "taskwarrior was replaced by taskwarrior3, which requires manual transition from taskwarrior 2.6, read upstream's docs: https://taskwarrior.org/docs/upgrade-3/" taskwarrior2; taplo-cli = taplo; # Added 2022-07-30 taplo-lsp = taplo; # Added 2022-07-30 + targetcli = targetcli-fb; # Added 2025-03-14 taro = taproot-assets; # Added 2023-07-04 tbb_2021_5 = throw "tbb_2021_5 has been removed from nixpkgs, as it broke with GCC 14"; tcl-fcgi = tclPackages.tcl-fcgi; # Added 2024-10-02 From 988fef7fbf622984ae22d0ff62c97d14d48f9f05 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 15 Mar 2025 00:41:30 +0100 Subject: [PATCH 6/6] python312Packages.configshell: rename to configshell-fb --- pkgs/by-name/nv/nvmet-cli/package.nix | 2 +- pkgs/by-name/sp/spdk/package.nix | 2 +- pkgs/by-name/ta/targetcli-fb/package.nix | 2 +- .../{configshell => configshell-fb}/default.nix | 11 +++++------ pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) rename pkgs/development/python-modules/{configshell => configshell-fb}/default.nix (77%) diff --git a/pkgs/by-name/nv/nvmet-cli/package.nix b/pkgs/by-name/nv/nvmet-cli/package.nix index beaeea887c39..00bfcef2829e 100644 --- a/pkgs/by-name/nv/nvmet-cli/package.nix +++ b/pkgs/by-name/nv/nvmet-cli/package.nix @@ -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; diff --git a/pkgs/by-name/sp/spdk/package.nix b/pkgs/by-name/sp/spdk/package.nix index 738779b2325b..7a3e57071253 100644 --- a/pkgs/by-name/sp/spdk/package.nix +++ b/pkgs/by-name/sp/spdk/package.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ - python3.pkgs.configshell + python3.pkgs.configshell-fb ]; postPatch = '' diff --git a/pkgs/by-name/ta/targetcli-fb/package.nix b/pkgs/by-name/ta/targetcli-fb/package.nix index dd169518ef0e..a8db141a5e64 100644 --- a/pkgs/by-name/ta/targetcli-fb/package.nix +++ b/pkgs/by-name/ta/targetcli-fb/package.nix @@ -32,7 +32,7 @@ python3Packages.buildPythonApplication rec { buildInputs = [ glib ]; dependencies = with python3Packages; [ - configshell + configshell-fb rtslib-fb pygobject3 ]; diff --git a/pkgs/development/python-modules/configshell/default.nix b/pkgs/development/python-modules/configshell-fb/default.nix similarity index 77% rename from pkgs/development/python-modules/configshell/default.nix rename to pkgs/development/python-modules/configshell-fb/default.nix index df0a5aa19170..6fb61a2831db 100644 --- a/pkgs/development/python-modules/configshell/default.nix +++ b/pkgs/development/python-modules/configshell-fb/default.nix @@ -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 = [ ]; }; } diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 1bb761ce2f3d..c7f689980f04 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -135,6 +135,7 @@ mapAliases ({ command_runner = command-runner; # added 2024-03-06 CommonMark = commonmark; # added 2023-02-1 ConfigArgParse = configargparse; # added 2021-03-18 + configshell = configshell-fb; # added 2025-03-14 coronavirus = throw "coronavirus was removed, because the source is not providing the data anymore."; # added 2023-05-04 covCore = throw "covCore was renamed to cov-core and subsequently removed since it has ben unmaintained since 2014"; # added 2024-05-20 cov-core = throw "cov-core has been removed, it was archived and unmaintained since 2014"; # added 2024-05-21 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 01cbe3947a26..4f1e323d1deb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2650,7 +2650,7 @@ self: super: with self; { configparser = callPackage ../development/python-modules/configparser { }; - configshell = callPackage ../development/python-modules/configshell { }; + configshell-fb = callPackage ../development/python-modules/configshell-fb { }; configupdater = callPackage ../development/python-modules/configupdater { };