gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #330855 from emilazy/push-mrtsqsqnwxry

Browse Source 
{openlp,python3Packages.sqlalchemy-migrate,python3Packages.tempita}: drop
This commit is contained in:
Emily
2024-08-09 23:11:09 +01:00
committed by GitHub
parent 3a084b4848 f409d1bb66
commit 2c79576ca5
9 changed files with 3 additions and 325 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/misc/openlp/default.nix
-87
View File
@@ -1,87 +0,0 @@
# This file contains all runtime glue: Bindings to optional runtime dependencies
# for pdfSupport, presentationSupport, and media playback.
{ lib, mkDerivation, wrapGAppsHook3, python3Packages
# qt deps
, qtbase, qtmultimedia
# optional deps
, pdfSupport ? false, mupdf # alternatively could use ghostscript
, presentationSupport ? false, libreoffice-unwrapped
, vlcSupport ? false
, gstreamerSupport ? false, gst_all_1, gstPlugins ? (gst: [
gst.gst-plugins-base
gst.gst-plugins-good
gst.gst-plugins-bad
gst.gst-plugins-ugly
])
#, enableMySql ? false # Untested. If interested, contact maintainer.
#, enablePostgreSql ? false # Untested. If interested, contact maintainer.
#, enableJenkinsApi ? false # Untested. If interested, contact maintainer.
}:
let p = gstPlugins gst_all_1;
# If gstreamer is activated but no plugins are given, it will at runtime
# create the false illusion of being usable.
in assert gstreamerSupport -> (builtins.isList p && builtins.length p > 0);
let
# optional packages
libreofficePath = "${libreoffice-unwrapped}/lib/libreoffice/program";
# lib functions
inherit (lib.lists) optional optionals;
wrapSetVar = var: ''--set ${var} "''$${var}"'';
# base pkg/lib
baseLib = python3Packages.callPackage ./lib.nix { };
in mkDerivation {
pname = baseLib.pname + lib.optionalString (pdfSupport && presentationSupport && vlcSupport && gstreamerSupport) "-full";
inherit (baseLib) version src;
nativeBuildInputs = [ python3Packages.wrapPython wrapGAppsHook3 ];
buildInputs = [ qtbase ] ++ optionals gstreamerSupport
([ qtmultimedia.bin gst_all_1.gstreamer ] ++ gstPlugins gst_all_1);
propagatedBuildInputs = optional pdfSupport mupdf
++ optional presentationSupport libreoffice-unwrapped;
pythonPath = [ baseLib ] ++ optional vlcSupport python3Packages.python-vlc;
# ++ optional enableMySql mysql-connector # Untested. If interested, contact maintainer.
# ++ optional enablePostgreSql psycopg2 # Untested. If interested, contact maintainer.
# ++ optional enableJenkinsApi jenkinsapi # Untested. If interested, contact maintainer.
PYTHONPATH = libreofficePath;
URE_BOOTSTRAP = "vnd.sun.star.pathname:${libreofficePath}/fundamentalrc";
UNO_PATH = libreofficePath;
LD_LIBRARY_PATH = libreofficePath;
JAVA_HOME = "${libreoffice-unwrapped.jdk.home}";
dontWrapQtApps = true;
dontWrapGApps = true;
# defined in gappsWrapperHook
wrapPrefixVariables = optionals presentationSupport
[ "PYTHONPATH" "LD_LIBRARY_PATH" "JAVA_HOME" ];
makeWrapperArgs = [
"\${gappsWrapperArgs[@]}"
"\${qtWrapperArgs[@]}"
] ++ optionals presentationSupport
([ "--prefix PATH : ${libreoffice-unwrapped}/bin" ]
++ map wrapSetVar [ "URE_BOOTSTRAP" "UNO_PATH" ]);
installPhase = ''
install -D openlp.py $out/bin/openlp
'';
preFixup = ''
wrapPythonPrograms
'';
meta = baseLib.meta // {
hydraPlatforms = [ ]; # this is only the wrapper; baseLib gets built
};
passthru = {
inherit baseLib;
};
}
pkgs/applications/misc/openlp/lib.nix
-103
View File
@@ -1,103 +0,0 @@
# This file contains the base package, some of which is compiled.
# Runtime glue to optinal runtime dependencies is in 'default.nix'.
{ fetchurl, lib, qt5
# python deps
, python, buildPythonPackage
, alembic, beautifulsoup4, chardet, lxml, mako, pyenchant
, pyqt5-webkit, pyxdg, sip4, sqlalchemy, sqlalchemy-migrate
}:
buildPythonPackage rec {
pname = "openlp";
version = "2.4.6";
src = fetchurl {
url = "https://get.openlp.org/${version}/OpenLP-${version}.tar.gz";
sha256 = "f63dcf5f1f8a8199bf55e806b44066ad920d26c9cf67ae432eb8cdd1e761fc30";
};
doCheck = false;
# FIXME: checks must be disabled because they are lacking the qt env.
# They fail like this, even if built and wrapped with all Qt and
# runtime dependencies:
#
# running install tests
# qt.qpa.plugin: Could not find the Qt platform plugin "xcb" in ""
# This application failed to start because no Qt platform plugin could be initialized. Reinstalling the application may fix this problem.
#
# Available platform plugins are: wayland-egl, wayland, wayland-xcomposite-egl, wayland-xcomposite-glx.
#
# See also https://discourse.nixos.org/t/qt-plugin-path-unset-in-test-phase/
#nativeCheckInputs = [ mock nose ];
nativeBuildInputs = [ qt5.qttools ];
propagatedBuildInputs = [
alembic
beautifulsoup4
chardet
lxml
mako
pyenchant
pyqt5-webkit
pyxdg
sip4
sqlalchemy
sqlalchemy-migrate
];
prePatch = ''
echo 'from vlc import *' > openlp/core/ui/media/vendor/vlc.py
'';
dontWrapQtApps = true;
dontWrapGApps = true;
postInstall = ''
( # use subshell because of cd
tdestdir="$out/i18n"
mkdir -p "$tdestdir"
cd ./resources/i18n
for file in *.ts; do
lconvert -i "$file" -o "$tdestdir/''${file%%ts}qm"
done
)
'';
preFixup = ''
rm -r $out/${python.sitePackages}/tests
rm -r $out/bin
'';
meta = with lib; {
description = "Free church presentation software";
homepage = "https://openlp.org/";
downloadPage = "https://openlp.org/#downloads";
platforms = platforms.unix;
license = licenses.gpl2Only;
maintainers = [ maintainers.jorsn ];
longDescription = ''
OpenLP is a free church presentation software.
Features:
* Cross platform between Linux, Windows, OS X and FreeBSD
* Display songs, Bible verses, presentations, images, audio and video
* Control OpenLP remotely via the Android remote, iOS remote or mobile web browser
* Quickly and easily import songs from other popular presentation packages
* Easy enough to use to get up and running in less than 10 minutes
Remark: This pkg only supports sqlite dbs. If you wish to have support for
mysql or postgresql dbs, or Jenkins, please contact the maintainer.
Bugs which affect this software packaged in Nixpkgs:
1. The package must disable checks, because they are lacking the qt env.
(see pkg source and https://discourse.nixos.org/t/qt-plugin-path-unset-in-test-phase/)
2. There is a segfault on exit. Not a real problem, according to debug log, everything
shuts down correctly. Maybe related to https://forums.openlp.org/discussion/3620/crash-on-exit.
Plan: Wait for OpenLP-3, since it is already in beta 1
(2021-02-09; news: https://openlp.org/blog/).
'';
};
}
pkgs/development/python-modules/sqlalchemy-migrate/default.nix
-83
View File
@@ -1,83 +0,0 @@
{
lib,
stdenv,
buildPythonPackage,
fetchPypi,
fetchpatch,
python,
scripttest,
pytz,
pbr,
tempita,
decorator,
sqlalchemy,
six,
sqlparse,
testrepository,
}:
buildPythonPackage rec {
pname = "sqlalchemy-migrate";
version = "0.13.0";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "1y0lcqii7b4vp7yh9dyxrl4i77hi8jkkw7d06mgdw2h458ljxh0b";
};
patches = [
# See: https://review.openstack.org/#/c/608382/
# https://github.com/openstack/sqlalchemy-migrate/pull/18
(fetchpatch {
url = "https://github.com/openstack/sqlalchemy-migrate/commit/a5d69a17d9354ec1a792493280f96484740cf7ff.patch";
sha256 = "1qyfq2m7w7xqf0r9bc2x42qcra4r9k9l9g1jy5j0fvlb6bvvjj07";
})
./python3.11-comp.diff
];
postPatch = ''
substituteInPlace test-requirements.txt \
--replace "ibm_db_sa>=0.3.0;python_version<'3.0'" "" \
--replace "ibm-db-sa-py3;python_version>='3.0'" "" \
--replace "tempest-lib>=0.1.0" "" \
--replace "testtools>=0.9.34,<0.9.36" "" \
--replace "pylint" ""
'';
nativeCheckInputs = [
scripttest
pytz
testrepository
];
propagatedBuildInputs = [
pbr
tempita
decorator
sqlalchemy
six
sqlparse
];
doCheck = !stdenv.isDarwin;
checkPhase = ''
export PATH=$PATH:$out/bin
echo sqlite:///__tmp__ > test_db.cfg
# depends on ibm_db_sa
rm migrate/tests/changeset/databases/test_ibmdb2.py
# wants very old testtools
rm migrate/tests/versioning/test_schema.py
# transient failures on py27
substituteInPlace migrate/tests/versioning/test_util.py --replace "test_load_model" "noop"
${python.interpreter} setup.py test
'';
meta = with lib; {
homepage = "https://opendev.org/x/sqlalchemy-migrate";
description = "Schema migration tools for SQLAlchemy";
license = licenses.asl20;
maintainers = teams.openstack.members ++ (with maintainers; [ makefu ]);
broken = lib.versionAtLeast sqlalchemy.version "2.0.0";
};
}
pkgs/development/python-modules/sqlalchemy-migrate/python3.11-comp.diff
-13
View File
@@ -1,13 +0,0 @@
diff --git a/migrate/versioning/shell.py b/migrate/versioning/shell.py
index 5fb86b1..fae0ce4 100644
--- a/migrate/versioning/shell.py
+++ b/migrate/versioning/shell.py
@@ -108,7 +108,7 @@ def main(argv=None, **kwargs):
parser.error("Invalid command %s" % command)
parser.set_usage(inspect.getdoc(command_func))
- f_args, f_varargs, f_kwargs, f_defaults = inspect.getargspec(command_func)
+ f_args, f_varargs, f_kwargs, f_defaults, _, _, _ = inspect.getfullargspec(command_func)
for arg in f_args:
parser.add_option(
"--%s" % arg,
pkgs/development/python-modules/tempita/default.nix
-27
View File
@@ -1,27 +0,0 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
nose,
}:
buildPythonPackage {
version = "0.5.3-2016-09-28";
format = "setuptools";
pname = "tempita";
src = fetchFromGitHub {
owner = "agramfort";
repo = "tempita";
rev = "47414a7c6e46a9a9afe78f0bce2ea299fa84d10";
sha256 = "0f33jjjs5rvp7ar2j6ggyfykcrsrn04jaqcq71qfvycf6b7nw3rn";
};
buildInputs = [ nose ];
meta = {
homepage = "https://github.com/agramfort/tempita";
description = "Very small text templating language";
license = lib.licenses.mit;
};
}
pkgs/top-level/aliases.nix
+1
View File
@@ -1095,6 +1095,7 @@ mapAliases ({
openjfx19 = throw "OpenJFX 19 was removed as it has reached its end of life"; # Added 2024-08-01
openjfx20 = throw "OpenJFX 20 was removed as it has reached its end of life"; # Added 2024-08-01
openjpeg_2 = openjpeg; # Added 2021-01-25
openlp = throw "openlp has been removed for now because the outdated version depended on insecure and removed packages and it needs help to upgrade and maintain it; see https://github.com/NixOS/nixpkgs/pull/314882"; # Added 2024-07-29
openmpt123 = libopenmpt; # Added 2021-09-05
openssl_3_0 = openssl_3; # Added 2022-06-27
openvpn_24 = throw "openvpn_24 has been removed, because it went EOL. 2.5.x or newer is still available"; # Added 2023-01-23
pkgs/top-level/all-packages.nix
-8
View File
@@ -36863,14 +36863,6 @@ with pkgs;
octopus = callPackage ../applications/science/chemistry/octopus { };
openlp = libsForQt5.callPackage ../applications/misc/openlp { };
openlpFull = openlp.override {
pdfSupport = true;
presentationSupport = true;
vlcSupport = true;
gstreamerSupport = true;
};
autodock-vina = callPackage ../applications/science/chemistry/autodock-vina { };
dkh = callPackage ../applications/science/chemistry/dkh { };
pkgs/top-level/python-aliases.nix
+2
View File
@@ -561,6 +561,7 @@ mapAliases ({
sphinxcontrib_newsfeed = sphinxcontrib-newsfeed; # added 2023-07-20
sphinxcontrib_plantuml = sphinxcontrib-plantuml; # added 2021-08-02
sphinx-navtree = throw "sphinx-navtree has been removed since it is not compatible with sphinx 3.3 and unmaintained"; # added 2023-07-03
sqlalchemy-migrate = throw "sqlalchemy-migrate has been removed because it is abandoned upstream and incompatible with SQLAlchemy 2"; # added 2024-07-29
sqlalchemy_migrate = sqlalchemy-migrate; # added 2021-10-28
SQLAlchemy-ImageAttach = throw "sqlalchemy-imageattach has been removed as it is incompatible with sqlalchemy 1.4 and unmaintained"; # added 2022-04-23
sqlsoup = throw "sqlsoup has been removed as it is incompatible with modern SQLAlchemy and unmaintained"; # added 2024-05-13
@@ -570,6 +571,7 @@ mapAliases ({
suseapi = throw "suseapi has been removed because it is no longer maintained"; # added 2023-02-27
synologydsm-api = py-synologydsm-api; # added 2024-07-29
sysv_ipc = sysv-ipc; # added 2024-01-07
tempita = throw "tempita has been removed because it is unmaintained and the upstream repository is gone"; # added 2024-07-29
tensorflow-bin_2 = tensorflow-bin; # added 2021-11-25
tensorflow-build_2 = tensorflow-build; # added 2021-11-25
tensorflow-estimator = tensorflow-estimator-bin; # added 2023-01-17
pkgs/top-level/python-packages.nix
-4
View File
@@ -14870,8 +14870,6 @@ self: super: with self; {
sqlalchemy-jsonfield = callPackage ../development/python-modules/sqlalchemy-jsonfield { };
sqlalchemy-migrate = callPackage ../development/python-modules/sqlalchemy-migrate { };
sqlalchemy-mixins = callPackage ../development/python-modules/sqlalchemy-mixins { };
sqlalchemy-utils = callPackage ../development/python-modules/sqlalchemy-utils { };
@@ -15298,8 +15296,6 @@ self: super: with self; {
tempest = callPackage ../development/python-modules/tempest { };
tempita = callPackage ../development/python-modules/tempita { };
templateflow = callPackage ../development/python-modules/templateflow { };
tempora = callPackage ../development/python-modules/tempora { };