Merge branch 'master' into staging-next
This commit is contained in:
Jan Tojnar
@@ -12,7 +12,7 @@
|
||||
, at-spi2-atk
|
||||
, gnutar
|
||||
, atomEnv
|
||||
, kerberos
|
||||
, libkrb5
|
||||
}:
|
||||
|
||||
# from justinwoo/azuredatastudio-nix
|
||||
@@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
|
||||
at-spi2-core
|
||||
at-spi2-atk
|
||||
stdenv.cc.cc.lib
|
||||
kerberos
|
||||
libkrb5
|
||||
]
|
||||
)
|
||||
targetPath
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
{ stdenv, lib, fetchFromGitHub, makeWrapper
|
||||
, curl, python3, bind, iproute, bc, gitMinimal }:
|
||||
, curl, python3, bind, iproute2, bc, gitMinimal }:
|
||||
let
|
||||
version = "1.23.0";
|
||||
deps = lib.makeBinPath [
|
||||
curl
|
||||
python3
|
||||
bind.dnsutils
|
||||
iproute
|
||||
iproute2
|
||||
bc
|
||||
gitMinimal
|
||||
];
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, python3Packages }:
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, python3Packages, libspnav }:
|
||||
|
||||
let
|
||||
|
||||
@@ -6,13 +6,13 @@ let
|
||||
|
||||
octoprint = stdenv.mkDerivation rec {
|
||||
pname = "Cura-OctoPrintPlugin";
|
||||
version = "3.5.16";
|
||||
version = "3.5.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fieldOfView";
|
||||
repo = pname;
|
||||
rev = "8affa8aa9796cb37129d3b7222fff03f86c936cd";
|
||||
sha256 = "0l4qfcashkdmpdm8nm3klz6hmi1f0bmbpb9b1yn4mvg0fam6c5xi";
|
||||
rev = "7bd73946fbf22d18337dc900a81a011ece26bee0";
|
||||
sha256 = "057b2f5f49p96lkh2wsr9w6yh2003x4a85irqsgbzp6igmk8imdn";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
@@ -32,6 +32,35 @@ let
|
||||
};
|
||||
};
|
||||
|
||||
rawmouse = stdenv.mkDerivation rec {
|
||||
pname = "RawMouse";
|
||||
version = "1.0.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "smartavionics";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1cj40pgsfcwliz47mkiqjbslkwcm34qb1pajc2mcljgflcnickly";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
substituteInPlace RawMouse/config.json --replace \
|
||||
/usr/local/lib/libspnav.so ${libspnav}/lib/libspnav.so
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/lib/cura/plugins/RawMouse
|
||||
cp -rv . $out/lib/cura/plugins/RawMouse/
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Cura plugin for HID mice such as 3Dconnexion spacemouse";
|
||||
homepage = "https://github.com/smartavionics/RawMouse";
|
||||
license = licenses.agpl3Plus;
|
||||
maintainers = with maintainers; [ gebner ];
|
||||
};
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
in self
|
||||
|
||||
@@ -18,13 +18,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dbeaver-ce";
|
||||
version = "21.0.1"; # When updating also update fetchedMavenDeps.sha256
|
||||
version = "21.0.2"; # When updating also update fetchedMavenDeps.sha256
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dbeaver";
|
||||
repo = "dbeaver";
|
||||
rev = version;
|
||||
sha256 = "sha256-9l8604STqmdoUjD+EJCp4aDk4juKsPCmFnD/WYpajxo=";
|
||||
sha256 = "sha256-3EMSiEq1wdg4dxBU90RVVv0Hrf5dXPc1MPI0+WMk48k=";
|
||||
};
|
||||
|
||||
fetchedMavenDeps = stdenv.mkDerivation {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ lib, fetchFromGitHub, fetchpatch, mkDerivation
|
||||
, qtbase, qtsvg, qtserialport, qtwebengine, qtmultimedia, qttools
|
||||
, qtconnectivity, qtcharts, libusb-compat-0_1
|
||||
, yacc, flex, zlib, qmake, makeDesktopItem, makeWrapper
|
||||
, bison, flex, zlib, qmake, makeDesktopItem, makeWrapper
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -29,7 +29,7 @@ in mkDerivation rec {
|
||||
qtbase qtsvg qtserialport qtwebengine qtmultimedia qttools zlib
|
||||
qtconnectivity qtcharts libusb-compat-0_1
|
||||
];
|
||||
nativeBuildInputs = [ flex makeWrapper qmake yacc ];
|
||||
nativeBuildInputs = [ flex makeWrapper qmake bison ];
|
||||
|
||||
patches = [
|
||||
# allow building with bison 3.7
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libzen, libmediainfo, zlib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "20.09";
|
||||
version = "21.03";
|
||||
pname = "mediainfo";
|
||||
src = fetchurl {
|
||||
url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
|
||||
sha256 = "0rqg9z7s5bk7vlvjrs4gackzg7ib05a0dffi2ihsjf5a7kw7wcir";
|
||||
sha256 = "07h2a1lbw5ak6c9bcn8qydchl0wpgk945rf9sfcqjyv05h5wll6y";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
|
||||
@@ -2,14 +2,14 @@
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "mob";
|
||||
version = "1.3.0";
|
||||
version = "1.4.0";
|
||||
goPackagePath = "github.com/remotemobprogramming/mob";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "remotemobprogramming";
|
||||
repo = pname;
|
||||
sha256 = "sha256-uzWr6wWO6niocJ8yLc1Uu9Wt/FXlCuQrC0RJkgVlphM=";
|
||||
sha256 = "sha256-JiTRTH8ai27H1xySyKTWiu/MG0C61Tz+hVI6tkSRp+k=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -1,11 +1,27 @@
|
||||
{ stdenv, lib, fetchurl, fetchpatch, pkg-config, freetype, harfbuzz, openjpeg
|
||||
, jbig2dec, libjpeg , darwin
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, pkg-config
|
||||
, freetype
|
||||
, harfbuzz
|
||||
, openjpeg
|
||||
, jbig2dec
|
||||
, libjpeg
|
||||
, darwin
|
||||
, gumbo
|
||||
, enableX11 ? true, libX11, libXext, libXi, libXrandr
|
||||
, enableCurl ? true, curl, openssl
|
||||
, enableGL ? true, freeglut, libGLU
|
||||
, enableX11 ? true
|
||||
, libX11
|
||||
, libXext
|
||||
, libXi
|
||||
, libXrandr
|
||||
, enableCurl ? true
|
||||
, curl
|
||||
, openssl
|
||||
, enableGL ? true
|
||||
, freeglut
|
||||
, libGLU
|
||||
}:
|
||||
|
||||
let
|
||||
|
||||
# OpenJPEG version is hardcoded in package source
|
||||
@@ -13,7 +29,8 @@ let
|
||||
lib.versions.majorMinor (lib.getVersion openjpeg);
|
||||
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.18.0";
|
||||
pname = "mupdf";
|
||||
|
||||
@@ -52,17 +69,21 @@ in stdenv.mkDerivation rec {
|
||||
# Use shared libraries to decrease size
|
||||
buildFlags = [ "shared" ];
|
||||
|
||||
makeFlags = [ "prefix=$(out) USE_SYSTEM_LIBS=yes" ];
|
||||
makeFlags = [ "prefix=$(out)" "USE_SYSTEM_LIBS=yes" ]
|
||||
++ lib.optionals (!enableX11) [ "HAVE_X11=no" ]
|
||||
++ lib.optionals (!enableGL) [ "HAVE_GLUT=no" ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ freetype harfbuzz openjpeg jbig2dec libjpeg freeglut libGLU gumbo ]
|
||||
++ lib.optionals enableX11 [ libX11 libXext libXi libXrandr ]
|
||||
++ lib.optionals enableCurl [ curl openssl ]
|
||||
++ lib.optionals enableGL (
|
||||
if stdenv.isDarwin then
|
||||
with darwin.apple_sdk.frameworks; [ GLUT OpenGL ]
|
||||
else
|
||||
[ freeglut libGLU ])
|
||||
;
|
||||
buildInputs = [ freetype harfbuzz openjpeg jbig2dec libjpeg gumbo ]
|
||||
++ lib.optionals enableX11 [ libX11 libXext libXi libXrandr ]
|
||||
++ lib.optionals enableCurl [ curl openssl ]
|
||||
++ lib.optionals enableGL (
|
||||
if stdenv.isDarwin then
|
||||
with darwin.apple_sdk.frameworks; [ GLUT OpenGL ]
|
||||
else
|
||||
[ freeglut libGLU ]
|
||||
)
|
||||
;
|
||||
outputs = [ "bin" "dev" "out" "man" "doc" ];
|
||||
|
||||
preConfigure = ''
|
||||
@@ -85,6 +106,7 @@ in stdenv.mkDerivation rec {
|
||||
EOF
|
||||
|
||||
moveToOutput "bin" "$bin"
|
||||
'' + lib.optionalString enableX11 ''
|
||||
ln -s "$bin/bin/mupdf-x11" "$bin/bin/mupdf"
|
||||
mkdir -p $bin/share/applications
|
||||
cat > $bin/share/applications/mupdf.desktop <<EOF
|
||||
|
||||
@@ -0,0 +1,86 @@
|
||||
# This file contains all runtime glue: Bindings to optional runtime dependencies
|
||||
# for pdfSupport, presentationSupport, and media playback.
|
||||
{ lib, mkDerivation, wrapGAppsHook, 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 {
|
||||
inherit (baseLib) pname version src;
|
||||
|
||||
nativeBuildInputs = [ python3Packages.wrapPython wrapGAppsHook ];
|
||||
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;
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,103 @@
|
||||
# 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_with_qtwebkit, pyxdg, sip, 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/
|
||||
|
||||
#checkInputs = [ mock nose ];
|
||||
nativeBuildInputs = [ qt5.qttools ];
|
||||
propagatedBuildInputs = [
|
||||
alembic
|
||||
beautifulsoup4
|
||||
chardet
|
||||
lxml
|
||||
Mako
|
||||
pyenchant
|
||||
pyqt5_with_qtwebkit
|
||||
pyxdg
|
||||
sip
|
||||
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/).
|
||||
'';
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,25 @@
|
||||
{ buildGoModule, fetchFromSourcehut, lib }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "openring";
|
||||
version = "unstable-2021-04-03";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~sircmpwn";
|
||||
repo = pname;
|
||||
rev = "f13edb5dfd882ce608d61cf6b6740650ce9d84a3";
|
||||
sha256 = "sha256-Z65V77JZ9jCzBg7T2+d5Agxxd+MV2R7nYcLedYP5eOE=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-BbBTmkGyLrIWphXC+dBaHaVzHuXRZ+4N/Jt2k3nF7Z4=";
|
||||
|
||||
# The package has no tests.
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A webring for static site generators";
|
||||
homepage = "https://git.sr.ht/~sircmpwn/openring";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ sumnerevans ];
|
||||
};
|
||||
}
|
||||
@@ -4,7 +4,7 @@
|
||||
, makeWrapper
|
||||
, pkg-config
|
||||
, which
|
||||
, yacc
|
||||
, bison
|
||||
, gnuplot
|
||||
, libxls
|
||||
, libxml2
|
||||
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
|
||||
makeWrapper
|
||||
pkg-config
|
||||
which
|
||||
yacc
|
||||
bison
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -1,29 +1,30 @@
|
||||
{ lib
|
||||
, fetchurl
|
||||
, mkDerivation
|
||||
, libkcddb
|
||||
, kinit
|
||||
, kdelibs4support
|
||||
, solid
|
||||
, kxmlgui
|
||||
, karchive
|
||||
, kfilemetadata
|
||||
, khtml
|
||||
, knewstuff
|
||||
, libksane
|
||||
, cmake
|
||||
, exempi
|
||||
, extra-cmake-modules
|
||||
, libcdio
|
||||
, poppler
|
||||
, makeWrapper
|
||||
, karchive
|
||||
, kdoctools
|
||||
, kfilemetadata
|
||||
, khtml
|
||||
, kitemmodels
|
||||
, knewstuff
|
||||
, kxmlgui
|
||||
, libcdio
|
||||
, libkcddb
|
||||
, libksane
|
||||
, makeWrapper
|
||||
, poppler
|
||||
, qtcharts
|
||||
, qtwebengine
|
||||
, solid
|
||||
, taglib
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
name = "tellico";
|
||||
version = "3.3.3";
|
||||
pname = "tellico";
|
||||
version = "3.4";
|
||||
|
||||
src = fetchurl {
|
||||
# version 3.3.0 just uses 3.3 in its name
|
||||
@@ -31,7 +32,7 @@ mkDerivation rec {
|
||||
"https://tellico-project.org/files/tellico-${version}.tar.xz"
|
||||
"https://tellico-project.org/files/tellico-${lib.versions.majorMinor version}.tar.xz"
|
||||
];
|
||||
sha256 = "sha256-9cdbUTa2Mt3/yNylOSdGjgDETD74sR0dU4C58uW0Y6o=";
|
||||
sha256 = "sha256-YXMJrAkfehe3ox4WZ19igyFbXwtjO5wxN3bmgP01jPs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -43,17 +44,18 @@ mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
exempi
|
||||
extra-cmake-modules
|
||||
karchive
|
||||
libkcddb
|
||||
kdelibs4support
|
||||
kfilemetadata
|
||||
khtml
|
||||
kitemmodels
|
||||
knewstuff
|
||||
kxmlgui
|
||||
libcdio
|
||||
libkcddb
|
||||
libksane
|
||||
poppler
|
||||
qtcharts
|
||||
qtwebengine
|
||||
solid
|
||||
taglib
|
||||
];
|
||||
|
||||
Reference in New Issue
Block a user