Skip to content

Commit 4b3841f

Browse files
fabafffabaff
authored
python313Packages.deprecat: remove, python313Packages.ciscoconfparse: remove, python313Packages.ciscoconfparse2: init at 0.8.6 (#388215)
2 parents 310517b + 191cb1c commit 4b3841f

File tree

7 files changed

+172
-122
lines changed

7 files changed

+172
-122
lines changed

‎pkgs/development/python-modules/ciscoconfparse/default.nix‎

Lines changed: 0 additions & 74 deletions
This file was deleted.

‎pkgs/development/python-modules/ciscoconfparse2/default.nix‎

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
{
2+
lib,
3+
attrs,
4+
buildPythonPackage,
5+
dnspython,
6+
fetchFromGitHub,
7+
hatchling,
8+
hier-config,
9+
loguru,
10+
macaddress,
11+
passlib,
12+
pyparsing,
13+
pytest-cov-stub,
14+
pytestCheckHook,
15+
pyyaml,
16+
rich,
17+
scrypt,
18+
tomlkit,
19+
typeguard,
20+
}:
21+
22+
buildPythonPackage rec {
23+
pname = "ciscoconfparse2";
24+
version = "0.8.6";
25+
pyproject = true;
26+
27+
src = fetchFromGitHub {
28+
owner = "mpenning";
29+
repo = "ciscoconfparse2";
30+
tag = version;
31+
hash = "sha256-ICv8H64aVC8Q/rl4lnSmBQ7CsaV3KtlIf/g3WZTJL9s=";
32+
};
33+
34+
pythonRelaxDeps = [
35+
"attrs"
36+
"hier-config"
37+
"passlib"
38+
"typeguard"
39+
];
40+
41+
build-system = [ hatchling ];
42+
43+
dependencies = [
44+
attrs
45+
dnspython
46+
hier-config
47+
loguru
48+
macaddress
49+
passlib
50+
pyparsing
51+
pyyaml
52+
rich
53+
scrypt
54+
tomlkit
55+
typeguard
56+
];
57+
58+
nativeCheckInputs = [
59+
pytest-cov-stub
60+
pytestCheckHook
61+
];
62+
63+
pythonImportsCheck = [ "ciscoconfparse2" ];
64+
65+
disabledTests = [
66+
# Fixtures are missing
67+
"testParse_parse_syntax"
68+
"testParse_syntax"
69+
"testVal_IOSHSRPGroups"
70+
"testVal_IOSSDWAN"
71+
"testVal_junos_factory"
72+
"testVal_JunosCfgLine"
73+
"testValues_ccp_script_entry_cliapplication"
74+
"testValues_Diff"
75+
"testValues_IOSCfgLine"
76+
"testValues_pickle"
77+
"testValues_save_as_01"
78+
];
79+
80+
meta = {
81+
description = "Module to parse, audit, query, build and modify device configurations";
82+
homepage = "https://github.com/mpenning/ciscoconfparse2";
83+
changelog = "https://github.com/mpenning/ciscoconfparse2/blob/${src.tag}/CHANGES.md";
84+
license = lib.licenses.gpl3Only;
85+
maintainers = with lib.maintainers; [ fab ];
86+
};
87+
}

‎pkgs/development/python-modules/deprecat/default.nix‎

Lines changed: 0 additions & 45 deletions
This file was deleted.

‎pkgs/development/python-modules/hier-config/default.nix‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
{
2+
lib,
3+
buildPythonPackage,
4+
fetchFromGitHub,
5+
poetry-core,
6+
pydantic,
7+
pytestCheckHook,
8+
pyyaml,
9+
}:
10+
11+
buildPythonPackage rec {
12+
pname = "hier-config";
13+
version = "3.2.2";
14+
pyproject = true;
15+
16+
src = fetchFromGitHub {
17+
owner = "netdevops";
18+
repo = "hier_config";
19+
tag = "v${version}";
20+
hash = "sha256-3xSxzdIxoQgJtA3CX141jP2Zl2j8Dwfplv4JYpHpCdQ=";
21+
};
22+
23+
build-system = [ poetry-core ];
24+
25+
dependencies = [ pydantic ];
26+
27+
nativeCheckInputs = [
28+
pytestCheckHook
29+
pyyaml
30+
];
31+
32+
pythonImportsCheck = [ "hier_config" ];
33+
34+
meta = {
35+
description = "Module to handle hierarchical configurations";
36+
homepage = "https://github.com/netdevops/hier_config";
37+
changelog = "https://github.com/netdevops/hier_config/releases/tag/v${src.tag}";
38+
license = lib.licenses.mit;
39+
maintainers = with lib.maintainers; [ fab ];
40+
};
41+
}

‎pkgs/development/python-modules/scrypt/default.nix‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
{
2+
lib,
3+
buildPythonPackage,
4+
fetchFromGitHub,
5+
openssl,
6+
pytestCheckHook,
7+
setuptools,
8+
}:
9+
10+
buildPythonPackage rec {
11+
pname = "scrypt";
12+
version = "0.8.27";
13+
pyproject = true;
14+
15+
src = fetchFromGitHub {
16+
owner = "holgern";
17+
repo = "py-scrypt";
18+
tag = "v${version}";
19+
hash = "sha256-r5tXRq4VFieqw3Plx6W5imDIeGIldW1BREdm6/Kav3M=";
20+
};
21+
22+
build-system = [ setuptools ];
23+
24+
buildInputs = [ openssl ];
25+
26+
nativeCheckInputs = [ pytestCheckHook ];
27+
28+
pythonImportsCheck = [ "scrypt" ];
29+
30+
meta = {
31+
description = "Python bindings for the scrypt key derivation function";
32+
homepage = "https://github.com/holgern/py-scrypt";
33+
changelog = "https://github.com/holgern/py-scrypt/releases/tag/${src.tag}";
34+
license = lib.licenses.bsd2;
35+
maintainers = with lib.maintainers; [ fab ];
36+
};
37+
}

‎pkgs/top-level/python-aliases.nix‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ mapAliases ({
122122
chia-rs = throw "chia-rs has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # added 2023-11-26
123123
class-registry = phx-class-registry; # added 2021-10-05
124124
cirq-ft = throw "cirq-ft is not longer provieded by cirq upstream"; # added 2024-08-31
125+
ciscoconfparse = throw "ciscoconfparse was archived by upstream, use ciscoconfparse2"; # added 2025-03-08
125126
cld2-cffi = throw "cld2-cffi has been removed, as the last release was in 2016"; # added 2024-05-20
126127
clvm = throw "clvm has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # added 2023-11-26
127128
clvm-rs = throw "clvm-rs has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # added 2023-11-26
@@ -152,6 +153,7 @@ mapAliases ({
152153
debian = python-debian; # added 2024-12-10
153154
deep_merge = throw "deep_merge has been removed, since it is no longer maintained and may be broken."; # added 2023-10-09
154155
demjson = throw "demjson has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18
156+
deprecat = throw "deprecat has been removed, it unmaintained and archived by upstream"; # added 2025-03-08
155157
descartes = throw "descartes has been removed, since it is abandoned and broken"; # added 2023-06-21
156158
detox = throw "detox is no longer maintained, and was broken since may 2019"; # added 2020-07-04
157159
dftfit = throw "dftfit dependency lammps-cython no longer builds"; # added 2021-07-04

‎pkgs/top-level/python-packages.nix‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2362,7 +2362,7 @@ self: super: with self; {
23622362

23632363
cirq-web = callPackage ../development/python-modules/cirq-web { };
23642364

2365-
ciscoconfparse = callPackage ../development/python-modules/ciscoconfparse { };
2365+
ciscoconfparse2 = callPackage ../development/python-modules/ciscoconfparse2 { };
23662366

23672367
ciscomobilityexpress = callPackage ../development/python-modules/ciscomobilityexpress { };
23682368

@@ -3250,8 +3250,6 @@ self: super: with self; {
32503250

32513251
deploykit = callPackage ../development/python-modules/deploykit { };
32523252

3253-
deprecat = callPackage ../development/python-modules/deprecat { };
3254-
32553253
deprecated = callPackage ../development/python-modules/deprecated { };
32563254

32573255
deprecation = callPackage ../development/python-modules/deprecation { };
@@ -6036,6 +6034,8 @@ self: super: with self; {
60366034

60376035
hid-parser = callPackage ../development/python-modules/hid-parser { };
60386036

6037+
hier-config = callPackage ../development/python-modules/hier-config { };
6038+
60396039
hieroglyph = callPackage ../development/python-modules/hieroglyph { };
60406040

60416041
hijri-converter = callPackage ../development/python-modules/hijri-converter { };
@@ -14902,6 +14902,8 @@ self: super: with self; {
1490214902

1490314903
scripttest = callPackage ../development/python-modules/scripttest { };
1490414904

14905+
scrypt = callPackage ../development/python-modules/scrypt { };
14906+
1490514907
scikit-survival = callPackage ../development/python-modules/scikit-survival { };
1490614908

1490714909
scs = callPackage ../development/python-modules/scs {

0 commit comments

Comments
 (0)