mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-17 19:21:04 +00:00
Merge pull request #311201 from Sigmanificient/python-revemove-38
python3Packages.{pxml,cadquery,globre,cryptacular,pathlib}, cq-editor: remove
This commit is contained in:
Martin Weinelt
GitHub
commit
0cb78770f6
|
|
@ -1,63 +0,0 @@
|
|||
{ lib
|
||||
, mkDerivationWith
|
||||
, python3Packages
|
||||
, fetchFromGitHub
|
||||
, wrapQtAppsHook
|
||||
}:
|
||||
|
||||
mkDerivationWith python3Packages.buildPythonApplication rec {
|
||||
pname = "cq-editor";
|
||||
version = "0.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CadQuery";
|
||||
repo = "CQ-editor";
|
||||
rev = version;
|
||||
sha256 = "1970izjaa60r5cg9i35rzz9lk5c5d8q1vw1rh2skvfbf63z1hnzv";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./spyder4.patch
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
cadquery
|
||||
logbook
|
||||
pyqt5
|
||||
pyparsing
|
||||
pyqtgraph
|
||||
spyder
|
||||
path
|
||||
qtconsole
|
||||
requests
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ wrapQtAppsHook ];
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=("''${qtWrapperArgs[@]}")
|
||||
'';
|
||||
|
||||
nativeCheckInputs = with python3Packages; [
|
||||
pytest
|
||||
pytest-xvfb
|
||||
pytest-mock
|
||||
pytest-cov
|
||||
pytest-repeat
|
||||
pytest-qt
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
pytest --no-xvfb
|
||||
'';
|
||||
|
||||
# requires X server
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "CadQuery GUI editor based on PyQT";
|
||||
homepage = "https://github.com/CadQuery/CQ-editor";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ costrouc marcus7070 ];
|
||||
};
|
||||
|
||||
}
|
||||
|
|
@ -1,100 +0,0 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, toPythonModule
|
||||
, pythonOlder
|
||||
, pythonAtLeast
|
||||
, fetchFromGitHub
|
||||
, pyparsing
|
||||
, opencascade-occt
|
||||
, stdenv
|
||||
, python
|
||||
, cmake
|
||||
, swig
|
||||
, freetype
|
||||
, libGL
|
||||
, libGLU
|
||||
, libX11
|
||||
, six
|
||||
, pytest
|
||||
, makeFontsConf
|
||||
, freefont_ttf
|
||||
, Cocoa
|
||||
}:
|
||||
|
||||
let
|
||||
pythonocc-core-cadquery = toPythonModule (stdenv.mkDerivation {
|
||||
pname = "pythonocc-core-cadquery";
|
||||
version = "0.18.2";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CadQuery";
|
||||
repo = "pythonocc-core";
|
||||
# no proper release to to use, this commit copied from the Anaconda receipe
|
||||
rev = "701e924ae40701cbe6f9992bcbdc2ef22aa9b5ab";
|
||||
sha256 = "07zmiiw74dyj4v0ar5vqkvk30wzcpjjzbi04nsdk5mnlzslmyi6c";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
swig
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
python
|
||||
opencascade-occt
|
||||
freetype
|
||||
libGL
|
||||
libGLU
|
||||
libX11
|
||||
] ++ lib.optionals stdenv.isDarwin [ Cocoa ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
six
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-Wno-dev"
|
||||
"-DPYTHONOCC_INSTALL_DIRECTORY=${placeholder "out"}/${python.sitePackages}/OCC"
|
||||
];
|
||||
});
|
||||
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "cadquery";
|
||||
version = "2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CadQuery";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1n63b6cjjrdwdfmwq0zx1xabjnhndk9mgfkm4w7z9ardcfpvg84l";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
opencascade-occt
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pyparsing
|
||||
pythonocc-core-cadquery
|
||||
];
|
||||
|
||||
FONTCONFIG_FILE = makeFontsConf {
|
||||
fontDirectories = [ freefont_ttf ];
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytest
|
||||
];
|
||||
|
||||
disabled = pythonOlder "3.6" || pythonAtLeast "3.8";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Parametric scripting language for creating and traversing CAD models";
|
||||
homepage = "https://github.com/CadQuery/cadquery";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ marcus7070 ];
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, isPy27, pythonAtLeast
|
||||
, coverage, nose, pbkdf2 }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cryptacular";
|
||||
version = "1.6.2";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "7b529cb2b8a3c7e5be77921bf1ebc653d4d3a8f791375cc6f971b20db2404176";
|
||||
};
|
||||
|
||||
buildInputs = [ coverage nose ];
|
||||
propagatedBuildInputs = [ pbkdf2 ];
|
||||
|
||||
# TODO: tests fail: TypeError: object of type 'NoneType' has no len()
|
||||
doCheck = false;
|
||||
|
||||
# Python >=2.7.15, >=3.6.5 are incompatible:
|
||||
# https://bitbucket.org/dholth/cryptacular/issues/11
|
||||
disabled = isPy27 || pythonAtLeast "3.6";
|
||||
|
||||
meta = with lib; {
|
||||
maintainers = with maintainers; [ domenkozar ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
{ lib
|
||||
, pythonAtLeast
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, nose
|
||||
, coverage
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "globre";
|
||||
version = "0.1.5";
|
||||
format = "setuptools";
|
||||
# https://github.com/metagriffin/globre/issues/7
|
||||
disabled = pythonAtLeast "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1qhjpg0722871dm5m7mmldf6c7mx58fbdvk1ix5i3s9py82448gf";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [ nose coverage ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/metagriffin/globre";
|
||||
description = "A python glob-like regular expression generation library.";
|
||||
maintainers = with maintainers; [ glittershark ];
|
||||
license = licenses.gpl3;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, unittestCheckHook
|
||||
, pythonAtLeast
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pathlib";
|
||||
version = "1.0.1";
|
||||
format = "setuptools";
|
||||
disabled = pythonAtLeast "3.4"; # Was added to std library in Python 3.4
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "17zajiw4mjbkkv6ahp3xf025qglkj0805m9s41c45zryzj6p2h39";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [ unittestCheckHook ];
|
||||
|
||||
meta = {
|
||||
description = "Object-oriented filesystem paths";
|
||||
homepage = "https://pathlib.readthedocs.org/";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,37 +0,0 @@
|
|||
{ lib
|
||||
, pythonAtLeast
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, blessings
|
||||
, six
|
||||
, nose
|
||||
, coverage
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pxml";
|
||||
version = "0.2.13";
|
||||
format = "setuptools";
|
||||
disabled = pythonAtLeast "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0c9zzfv6ciyf9qm7556wil45xxgykg1cj8isp1b88gimwcb2hxg4";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ blessings six ];
|
||||
nativeCheckInputs = [ nose coverage ];
|
||||
|
||||
# test_prefixedWhitespace fails due to a python3 StringIO issue requiring
|
||||
# bytes rather than str
|
||||
checkPhase = ''
|
||||
nosetests -e 'test_prefixedWhitespace'
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/metagriffin/pxml";
|
||||
description = ''A python library and command-line tool to "prettify" and colorize XML.'';
|
||||
maintainers = with maintainers; [ glittershark ];
|
||||
license = licenses.gpl3;
|
||||
};
|
||||
}
|
||||
|
|
@ -3,9 +3,6 @@
|
|||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, six
|
||||
, enum34
|
||||
, pathlib
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -21,8 +18,7 @@ buildPythonPackage rec {
|
|||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
propagatedBuildInputs = [ six ]
|
||||
++ lib.optionals (pythonOlder "3.4") [ enum34 pathlib ];
|
||||
propagatedBuildInputs = [ six ];
|
||||
|
||||
# Test suite is broken.
|
||||
# See https://github.com/Kronuz/pyScss/issues/415
|
||||
|
|
|
|||
|
|
@ -3,15 +3,12 @@
|
|||
, fetchFromGitHub
|
||||
, boto3
|
||||
, diskcache
|
||||
, enum34
|
||||
, packaging
|
||||
, pathlib
|
||||
, numpy
|
||||
, requests
|
||||
, scikit-image
|
||||
, six
|
||||
, pytestCheckHook
|
||||
, isPy27
|
||||
, tifffile
|
||||
}:
|
||||
|
||||
|
|
@ -36,7 +33,7 @@ buildPythonPackage rec {
|
|||
scikit-image
|
||||
six
|
||||
tifffile
|
||||
] ++ lib.optionals isPy27 [ pathlib enum34 ];
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
|
|
|
|||
|
|
@ -1,11 +1,9 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, isPy27
|
||||
, psycopg2
|
||||
, pymysql
|
||||
, sqlalchemy
|
||||
, pathlib
|
||||
, six
|
||||
, flask
|
||||
, pendulum
|
||||
|
|
@ -17,7 +15,6 @@
|
|||
, pytest-sugar
|
||||
, postgresql
|
||||
, postgresqlTestHook
|
||||
,
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "sqlbag";
|
||||
|
|
@ -46,8 +43,7 @@ buildPythonPackage rec {
|
|||
pymysql
|
||||
|
||||
setuptools # needed for 'pkg_resources'
|
||||
]
|
||||
++ lib.optional isPy27 pathlib;
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
|
|
@ -91,5 +87,6 @@ buildPythonPackage rec {
|
|||
homepage = "https://github.com/djrobstep/sqlbag";
|
||||
license = with licenses; [ unlicense ];
|
||||
maintainers = with maintainers; [ soispha ];
|
||||
broken = true; # Fails to build against the current flask version
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -231,6 +231,7 @@ mapAliases ({
|
|||
clang_10 = throw "clang_10 has been removed from nixpkgs"; # Added 2024-01-26
|
||||
clang_11 = throw "clang_11 has been removed from nixpkgs"; # Added 2023-01-24
|
||||
|
||||
cq-editor = throw "cq-editor has been removed, as it use a dependency that was disabled since python 3.8 and was last updated in 2021"; # Added 2024-05-13
|
||||
### D ###
|
||||
|
||||
dagger = throw "'dagger' has been removed from nixpkgs, as the trademark policy of the upstream project is incompatible"; # Added 2023-10-16
|
||||
|
|
|
|||
|
|
@ -30169,8 +30169,6 @@ with pkgs;
|
|||
|
||||
cplay-ng = callPackage ../applications/audio/cplay-ng { };
|
||||
|
||||
cq-editor = libsForQt5.callPackage ../applications/graphics/cq-editor { };
|
||||
|
||||
cqrlog = callPackage ../applications/radio/cqrlog {
|
||||
hamlib = hamlib_4;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -80,6 +80,7 @@ mapAliases ({
|
|||
bt_proximity = bt-proximity; # added 2021-07-02
|
||||
BTrees = btrees; # added 2023-02-19
|
||||
cacheyou = throw "cacheyou has been removed, as it was no longer used for the only consumer pdm"; # added 2023-12-21
|
||||
cadquery = throw "cadquery was removed, because it was disabled on all python version since 3.8 and marked as broken"; # added 2024-05-13
|
||||
carrot = throw "carrot has been removed, as its development was discontinued in 2012"; # added 2022-01-18
|
||||
cchardet = faust-cchardet; # added 2023-03-02
|
||||
cepa = throw "cepa has been removed, as onionshare switched back to stem"; # added 2024-05-07
|
||||
|
|
@ -93,6 +94,7 @@ mapAliases ({
|
|||
coronavirus = throw "coronavirus was removed, because the source is not providing the data anymore."; # added 2023-05-04
|
||||
covCore = cov-core; # added 2024-01-03
|
||||
cozy = throw "cozy was removed because it was not actually https://pypi.org/project/Cozy/."; # added 2022-01-14
|
||||
cryptacular = throw "cryptacular was removed, because it was disabled on all python version since 3.6 and last updated in 2021"; # Added 2024-05-13
|
||||
cryptography_vectors = "cryptography_vectors is no longer exposed in python*Packages because it is used for testing cryptography only."; # Added 2022-03-23
|
||||
cx_Freeze = cx-freeze; # added 2023-08-02
|
||||
cx_oracle = cx-oracle; # added 2024-01-03
|
||||
|
|
@ -193,6 +195,7 @@ mapAliases ({
|
|||
GitPython = gitpython; # added 2022-10-28
|
||||
glances = throw "glances has moved to pkgs.glances"; # added 2020-20-28
|
||||
glasgow = throw "glasgow has been promoted to a top-level attribute name: `pkgs.glasgow`"; # added 2023-02-05
|
||||
globre = throw "globre was removed, because it was disabled on all python version since 3.7 and last updated in 2020."; # added 2024-05-13
|
||||
google_api_python_client = google-api-python-client; # added 2021-03-19
|
||||
googleapis_common_protos = googleapis-common-protos; # added 2021-03-19
|
||||
google-apitools = throw "google-apitools was removed because it is deprecated and unsupported by upstream"; # added 2023-02-25
|
||||
|
|
@ -307,6 +310,7 @@ mapAliases ({
|
|||
pafy = throw "pafy has been removed because it is unmaintained and only a dependency of mps-youtube, itself superseded by yewtube"; # Added 2023-01-19
|
||||
pam = python-pam; # added 2020-09-07.
|
||||
PasteDeploy = pastedeploy; # added 2021-10-07
|
||||
pathlib = throw "pathlib was removed as it has been integrated in python standard library in version 3.4"; # added 2024-05-13
|
||||
pathpy = path; # added 2022-04-12
|
||||
pcbnew-transition = pcbnewtransition; # added 2024-03-21
|
||||
pdfposter = throw "pdfposter was promoted to a top-level attribute"; # Added 2023-06-29
|
||||
|
|
@ -327,6 +331,7 @@ mapAliases ({
|
|||
pur = throw "pur has been renamed to pkgs.pur"; # added 2021-11-08
|
||||
pushbullet = pushbullet-py; # Added 2022-10-15
|
||||
Pweave = pweave; # added 2023-02-19
|
||||
pxml = throw "pxml was removed, because it was disabled on all python version since 3.8 and last updated in 2020."; # added 2024-05-13
|
||||
py-radix = throw "py-radix has been removed, since it abandoned"; # added 2023-07-07
|
||||
py_stringmatching = py-stringmatching; # added 2023-11-12
|
||||
pyalmond = throw "pyalmond has been removed, since its API endpoints have been shutdown"; # added 2023-02-02
|
||||
|
|
|
|||
|
|
@ -1858,10 +1858,6 @@ self: super: with self; {
|
|||
|
||||
cachy = callPackage ../development/python-modules/cachy { };
|
||||
|
||||
cadquery = callPackage ../development/python-modules/cadquery {
|
||||
inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa;
|
||||
};
|
||||
|
||||
caffe = toPythonModule (pkgs.caffe.override {
|
||||
pythonSupport = true;
|
||||
inherit (self) python numpy boost;
|
||||
|
|
@ -2571,8 +2567,6 @@ self: super: with self; {
|
|||
|
||||
crownstone-uart = callPackage ../development/python-modules/crownstone-uart { };
|
||||
|
||||
cryptacular = callPackage ../development/python-modules/cryptacular { };
|
||||
|
||||
cryptg = callPackage ../development/python-modules/cryptg { };
|
||||
|
||||
cryptodatahub = callPackage ../development/python-modules/cryptodatahub { };
|
||||
|
|
@ -4842,8 +4836,6 @@ self: super: with self; {
|
|||
|
||||
glob2 = callPackage ../development/python-modules/glob2 { };
|
||||
|
||||
globre = callPackage ../development/python-modules/globre { };
|
||||
|
||||
globus-sdk = callPackage ../development/python-modules/globus-sdk { };
|
||||
|
||||
glom = callPackage ../development/python-modules/glom { };
|
||||
|
|
@ -9523,8 +9515,6 @@ self: super: with self; {
|
|||
|
||||
pathlib2 = callPackage ../development/python-modules/pathlib2 { };
|
||||
|
||||
pathlib = callPackage ../development/python-modules/pathlib { };
|
||||
|
||||
pathlib-abc = callPackage ../development/python-modules/pathlib-abc { };
|
||||
|
||||
pathos = callPackage ../development/python-modules/pathos { };
|
||||
|
|
@ -10541,8 +10531,6 @@ self: super: with self; {
|
|||
debugger = pkgs.gdb;
|
||||
};
|
||||
|
||||
pxml = callPackage ../development/python-modules/pxml { };
|
||||
|
||||
py-air-control = callPackage ../development/python-modules/py-air-control { };
|
||||
|
||||
py-air-control-exporter = callPackage ../development/python-modules/py-air-control-exporter { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue