diff options
Diffstat (limited to 'pkgs/applications')
65 files changed, 2062 insertions, 1855 deletions
diff --git a/pkgs/applications/audio/carla/default.nix b/pkgs/applications/audio/carla/default.nix index 110507616616..8a566c249917 100644 --- a/pkgs/applications/audio/carla/default.nix +++ b/pkgs/applications/audio/carla/default.nix @@ -15,13 +15,13 @@ assert withGtk3 -> gtk3 != null; stdenv.mkDerivation rec { pname = "carla"; - version = "2.1.1"; + version = "2.2.0"; src = fetchFromGitHub { owner = "falkTX"; repo = pname; rev = "v${version}"; - sha256 = "0c3y4a6cgi4bv1mg57i3qn5ia6pqjqlaylvkapj6bmpsw71ig22g"; + sha256 = "B4xoRuNEW4Lz9haP8fqxOTcysGTNEXFOq9UXqUJLSFw="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/friture/default.nix b/pkgs/applications/audio/friture/default.nix index b93ad14f55ee..e4bd79a08e31 100644 --- a/pkgs/applications/audio/friture/default.nix +++ b/pkgs/applications/audio/friture/default.nix @@ -32,9 +32,8 @@ in py.buildPythonApplication rec { ./unlock_constraints.patch ]; - postFixup = '' - wrapQtApp $out/bin/friture - wrapQtApp $out/bin/.friture-wrapped + preFixup = '' + makeWrapperArgs+=("''${qtWrapperArgs[@]}") ''; meta = with lib; { diff --git a/pkgs/applications/audio/helio-workstation/default.nix b/pkgs/applications/audio/helio-workstation/default.nix index 3ada3224e33e..5fbfdc787eb7 100644 --- a/pkgs/applications/audio/helio-workstation/default.nix +++ b/pkgs/applications/audio/helio-workstation/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "helio-workstation"; - version = "2.2"; + version = "3.1"; src = fetchFromGitHub { owner = "helio-fm"; repo = pname; rev = version; fetchSubmodules = true; - sha256 = "16iwj4mjs1nm8dlk70q97svp3vkcgs7hdj9hfda9h67acn4a8vvk"; + sha256 = "10pna4k43g648gapviykq2zk82iwy5rqff4lbfh5vzxqpg5v4ma6"; }; buildInputs = [ @@ -22,7 +22,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig makeWrapper ]; - preBuild = "cd Projects/LinuxMakefile"; + preBuild = '' + cd Projects/LinuxMakefile + substituteInPlace Makefile --replace alsa "alsa jack" + ''; buildFlags = [ "CONFIG=Release64" ]; installPhase = '' diff --git a/pkgs/applications/audio/munt/default.nix b/pkgs/applications/audio/munt/default.nix index bf9710fb17ee..2e072efe7991 100644 --- a/pkgs/applications/audio/munt/default.nix +++ b/pkgs/applications/audio/munt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchFromGitHub, cmake, qtbase, alsaLib, makeDesktopItem }: +{ stdenv, mkDerivation, fetchFromGitHub, cmake, qtbase, alsaLib, makeDesktopItem, libjack2 }: let desktopItem = makeDesktopItem rec { @@ -9,14 +9,14 @@ let categories = "Audio;AudioVideo;"; }; in mkDerivation rec { - version = "2.4.0"; + version = "2.4.1"; pname = "munt"; src = fetchFromGitHub { owner = pname; repo = pname; rev = with stdenv.lib.versions; "libmt32emu_${major version}_${minor version}_${patch version}"; - sha256 = "0521i7js5imlsxj6n7181w5szfjikam0k4vq1d2ilkqgcwrkg6ln"; + sha256 = "0bszhkbz24hhx32f973l6h5lkyn4lxhqrckiwmv765d1sba8n5bk"; }; postInstall = '' @@ -26,7 +26,7 @@ in mkDerivation rec { dontFixCmake = true; nativeBuildInputs = [ cmake ]; - buildInputs = [ qtbase alsaLib ]; + buildInputs = [ qtbase alsaLib libjack2 ]; meta = with stdenv.lib; { description = "Multi-platform software synthesiser emulating Roland MT-32, CM-32L, CM-64 and LAPC-I devices"; diff --git a/pkgs/applications/audio/puddletag/default.nix b/pkgs/applications/audio/puddletag/default.nix index 47ea078c4b2d..56fcdcc94cd2 100644 --- a/pkgs/applications/audio/puddletag/default.nix +++ b/pkgs/applications/audio/puddletag/default.nix @@ -30,5 +30,6 @@ python3Packages.buildPythonApplication rec { license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.linux; + broken = true; # Needs Qt wrapping }; } diff --git a/pkgs/applications/audio/soundkonverter/default.nix b/pkgs/applications/audio/soundkonverter/default.nix index 3e133a0caa15..992dd728e765 100644 --- a/pkgs/applications/audio/soundkonverter/default.nix +++ b/pkgs/applications/audio/soundkonverter/default.nix @@ -3,7 +3,7 @@ mkDerivation, fetchFromGitHub, fetchpatch, lib, makeWrapper, cmake, extra-cmake-modules, pkgconfig, libkcddb, kconfig, kconfigwidgets, ki18n, kdelibs4support, kio, solid, kwidgetsaddons, kxmlgui, - qtbase, phonon, + qtbase, phonon, taglib, # optional backends withCD ? true, cdparanoia, @@ -43,7 +43,7 @@ let runtimeDeps = [] ++ lib.optionals withMp3 [ lame mp3gain ] ++ lib.optionals withAac [ faad2 aacgain ]; -in +in mkDerivation rec { name = "soundkonverter"; version = "3.0.1"; @@ -67,7 +67,7 @@ mkDerivation rec { propagatedBuildInputs = [ libkcddb kconfig kconfigwidgets ki18n kdelibs4support kio solid kwidgetsaddons kxmlgui qtbase phonon]; buildInputs = [ taglib ] ++ runtimeDeps; # encoder plugins go to ${out}/lib so they're found by kbuildsycoca5 - cmakeFlags = [ "-DCMAKE_INSTALL_PREFIX=$out" ]; + cmakeFlags = [ "-DCMAKE_INSTALL_PREFIX=$out" ]; sourceRoot = "source/src"; # add runt-time deps to PATH postInstall = '' @@ -79,26 +79,26 @@ mkDerivation rec { description = "Audio file converter, CD ripper and Replay Gain tool"; longDescription = '' soundKonverter is a frontend to various audio converters. - + The key features are: - Audio file conversion - Replay Gain calculation - CD ripping - + soundKonverter supports reading and writing tags and covers for many formats, so they are preserved when converting files. - + It is extendable by plugins and supports many backends including: - + - Audio file conversion Backends: faac, faad, ffmpeg, flac, lame, mplayer, neroaac, timidity, fluidsynth, vorbistools, opustools, sox, twolame, flake, mac, shorten, wavpack and speex Formats: ogg vorbis, mp3, flac, wma, aac, ac3, opus, alac, mp2, als, amr nb, amr wb, ape, speex, m4a, mp1, musepack shorten, tta, wavpack, ra, midi, mod, 3gp, rm, avi, mkv, ogv, mpeg, mov, mp4, flv, wmv and rv - + - Replay Gain calculation Backends: aacgain, metaflac, mp3gain, vorbisgain, wvgain, mpcgain Formats: aac, mp3, flac, ogg vorbis, wavpack, musepack - + - CD ripping Backends: cdparanoia ''; diff --git a/pkgs/applications/backup/vorta/default.nix b/pkgs/applications/backup/vorta/default.nix index 3c6a9587a656..fc7e6c0fc359 100644 --- a/pkgs/applications/backup/vorta/default.nix +++ b/pkgs/applications/backup/vorta/default.nix @@ -28,8 +28,8 @@ buildPythonApplication rec { # QT setup in tests broken. doCheck = false; - postFixup = '' - wrapQtApp $out/bin/vorta + preFixup = '' + makeWrapperArgs+=("''${qtWrapperArgs[@]}") ''; meta = with lib; { diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index f07854ca8a59..d9b829132021 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -9,9 +9,9 @@ let inherit buildFHSUserEnv; }; stableVersion = { - version = "4.0.1.0"; # "Android Studio 4.0.1" - build = "193.6626763"; - sha256Hash = "15vm7fvi8c286wx9f28z6ysvm8wqqda759qql0zy9simwx22gy7j"; + version = "4.0.2.0"; # "Android Studio 4.0.2" + build = "193.6821437"; + sha256Hash = "sha256-v3lug8XCl4tekMBP4N1wS925FnDaSMDf6SIJhwKydzY="; }; betaVersion = { version = "4.1.0.18"; # "Android Studio 4.1 RC 3" diff --git a/pkgs/applications/editors/retext/default.nix b/pkgs/applications/editors/retext/default.nix index 7752313b2a7e..c32e83157561 100644 --- a/pkgs/applications/editors/retext/default.nix +++ b/pkgs/applications/editors/retext/default.nix @@ -46,11 +46,13 @@ in python.pkgs.buildPythonApplication { propagatedBuildInputs = [ pythonEnv ]; postInstall = '' - wrapQtApp "$out/bin/retext" \ - --set ASPELL_CONF "dict-dir ${buildEnv { + makeWrapperArgs+=("''${qtWrapperArgs[@]}") + makeWrapperArgs+=( + "--set" "ASPELL_CONF" "dict-dir ${buildEnv { name = "aspell-all-dicts"; paths = map (path: "${path}/lib/aspell") enchantAspellDicts; }}" + ) ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 73fc1d3752d6..6d87551a4538 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -11,8 +11,8 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "103p0daf13zsqz2481pw6zpr6n0vaf57dq89i4djcm449i9c959i"; - x86_64-darwin = "0bxggvi0wzsy801iylszqp8rv6kij6j2v05b6qyf6af7j3cmd1qf"; + x86_64-linux = "12nrv037an4f6h8hrbmysc0lk5wm492hywa7lp64n4d308zg5567"; + x86_64-darwin = "1z22hn2ngx2x5l9h6zsblpyzr85lyjzv2ayplscbgaa9ff52l429"; }.${system}; in callPackage ./generic.nix rec { @@ -21,7 +21,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.49.3"; + version = "1.50.0"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index 130c0af6ee20..da66b0d9d252 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -10,7 +10,7 @@ let [ qscintilla-qt5 gdal jinja2 numpy psycopg2 chardet dateutil pyyaml pytz requests urllib3 pygments pyqt5 sip owslib six ]; in mkDerivation rec { - version = "3.10.9"; + version = "3.10.10"; pname = "qgis"; name = "${pname}-unwrapped-${version}"; @@ -18,7 +18,7 @@ in mkDerivation rec { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "0d646hvrhhgsw789qc2g3iblmsvr64qh15jck1jkaljzrj3qbml6"; + sha256 = "yZBG+bpJA7iKkUEjVo45d+bmRp9WS7mk8z96FLf0ZQ0="; }; passthru = { diff --git a/pkgs/applications/gis/zombietrackergps/default.nix b/pkgs/applications/gis/zombietrackergps/default.nix new file mode 100644 index 000000000000..4db60e53ad2a --- /dev/null +++ b/pkgs/applications/gis/zombietrackergps/default.nix @@ -0,0 +1,57 @@ +{ mkDerivation +, lib +, fetchFromGitLab +, qmake +, qtbase +, qtcharts +, qtsvg +, marble +, qtwebengine +, ldutils +}: + +mkDerivation rec { + pname = "zombietrackergps"; + version = "1.01"; + + src = fetchFromGitLab { + owner = "ldutils-projects"; + repo = pname; + rev = "v_${version}"; + sha256 = "0h354ydbahy8rpkmzh5ym5bddbl6irjzklpcg6nbkv6apry84d48"; + }; + + buildInputs = [ + ldutils + qtbase + qtcharts + qtsvg + marble.dev + qtwebengine + ]; + + nativeBuildInputs = [ + qmake + ]; + + prePatch = '' + sed -ie "s,INCLUDEPATH += /usr/include/libldutils,INCLUDEPATH += ${ldutils}," ZombieTrackerGPS.pro + ''; + + preConfigure = '' + export LANG=en_US.UTF-8 + export INSTALL_ROOT=$out + ''; + + postConfigure = '' + substituteInPlace Makefile --replace '$(INSTALL_ROOT)' "" + ''; + + meta = with lib; { + description = "GPS track manager for Qt using KDE Marble maps"; + homepage = "https://gitlab.com/ldutils-projects/zombietrackergps"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ sohalt ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/graphics/c3d/default.nix b/pkgs/applications/graphics/c3d/default.nix index 61efec8dc9d4..425ede037593 100644 --- a/pkgs/applications/graphics/c3d/default.nix +++ b/pkgs/applications/graphics/c3d/default.nix @@ -1,13 +1,14 @@ -{ stdenv, fetchgit, cmake, itk4, Cocoa }: +{ stdenv, fetchFromGitHub, cmake, itk4, Cocoa }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "c3d"; - version = "unstable-2019-10-22"; + version = "unstable-2020-10-05"; - src = fetchgit { - url = "https://github.com/pyushkevich/c3d"; - rev = "c04e2b84568654665c64d8843378c8bbd58ba9b0"; - sha256 = "0lzldxvshl9q362mg76byc7s5zc9qx7mxf2wgyij5vysx8mihx3q"; + src = fetchFromGitHub { + owner = "pyushkevich"; + repo = pname; + rev = "0a87e3972ea403babbe2d05ec6d50855e7c06465"; + sha256 = "0wsmkifqrcfy13fnwvinmnq1m0lkqmpyg7bgbwnb37mbrlbq06wf"; }; nativeBuildInputs = [ cmake ]; @@ -15,11 +16,11 @@ stdenv.mkDerivation { ++ stdenv.lib.optional stdenv.isDarwin Cocoa; meta = with stdenv.lib; { - homepage = "http://www.itksnap.org/c3d"; + homepage = "https://github.com/pyushkevich/c3d"; description = "Medical imaging processing tool"; maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.unix; - license = licenses.gpl2; + license = licenses.gpl3; broken = stdenv.isAarch64; # /build/git-3453f61/itkextras/OneDimensionalInPlaceAccumulateFilter.txx:311:10: fatal error: xmmintrin.h: No such file or directory }; diff --git a/pkgs/applications/graphics/cq-editor/default.nix b/pkgs/applications/graphics/cq-editor/default.nix index 036edf80ab90..cf94f4fa32d1 100644 --- a/pkgs/applications/graphics/cq-editor/default.nix +++ b/pkgs/applications/graphics/cq-editor/default.nix @@ -2,6 +2,7 @@ , mkDerivationWith , python3Packages , fetchFromGitHub +, wrapQtAppsHook }: mkDerivationWith python3Packages.buildPythonApplication rec { @@ -27,8 +28,9 @@ mkDerivationWith python3Packages.buildPythonApplication rec { requests ]; - postFixup = '' - wrapQtApp "$out/bin/cq-editor" + nativeBuildInputs = [ wrapQtAppsHook ]; + preFixup = '' + makeWrapperArgs+=("''${qtWrapperArgs[@]}") ''; checkInputs = with python3Packages; [ diff --git a/pkgs/applications/graphics/f3d/default.nix b/pkgs/applications/graphics/f3d/default.nix new file mode 100644 index 000000000000..c81ba1240173 --- /dev/null +++ b/pkgs/applications/graphics/f3d/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitLab, cmake, vtk_9, libX11, libGL, Cocoa, OpenGL }: + +stdenv.mkDerivation rec { + pname = "f3d"; + version = "1.0.1"; + + src = fetchFromGitLab { + domain = "gitlab.kitware.com"; + owner = "f3d"; + repo = "f3d"; + rev = "v${version}"; + sha256 = "0a6r0jspkhl735f6zmnhby1g4dlmjqd5izgsp5yfdcdhqj4j63mg"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ vtk_9 ] + ++ stdenv.lib.optionals stdenv.isLinux [ libGL libX11 ] + ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa OpenGL ]; + + meta = with stdenv.lib; { + description = "Fast and minimalist 3D viewer using VTK"; + homepage = "https://kitware.github.io/F3D"; + license = licenses.bsd3; + maintainers = with maintainers; [ bcdarwin ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/applications/graphics/lazpaint/default.nix b/pkgs/applications/graphics/lazpaint/default.nix index d8ea4924318e..3f8d507e9927 100644 --- a/pkgs/applications/graphics/lazpaint/default.nix +++ b/ |