diff options
Diffstat (limited to 'pkgs/applications')
35 files changed, 526 insertions, 463 deletions
diff --git a/pkgs/applications/altcoins/jormungandr/default.nix b/pkgs/applications/altcoins/jormungandr/default.nix new file mode 100644 index 0000000000000..d58e05184b636 --- /dev/null +++ b/pkgs/applications/altcoins/jormungandr/default.nix @@ -0,0 +1,38 @@ +{ stdenv +, fetchgit +, rustPlatform +, openssl +, pkgconfig +, protobuf +, rustup +}: + +rustPlatform.buildRustPackage rec { + pname = "jormungandr"; + version = "0.3.1"; + + src = fetchgit { + url = "https://github.com/input-output-hk/${pname}"; + rev = "v${version}"; + sha256 = "0ys8sw73c7binxnl79dqi7sxva62bgifbhgyzvvjvmjjdxgq4kfp"; + fetchSubmodules = true; + }; + + cargoSha256 = "0fphjzz78ym15qbka01idnq6vkyf4asrnhrhvxngwc3bifmnj937"; + + nativeBuildInputs = [ pkgconfig protobuf rustup ]; + buildInputs = [ openssl ]; + + PROTOC = "${protobuf}/bin/protoc"; + + # Disabling integration tests + doCheck = false; + + meta = with stdenv.lib; { + description = "An aspiring blockchain node"; + homepage = "https://input-output-hk.github.io/jormungandr/"; + license = licenses.mit; + maintainers = [ maintainers.mmahut ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/audio/chuck/clang.patch b/pkgs/applications/audio/chuck/clang.patch deleted file mode 100644 index 77227ef0fd44a..0000000000000 --- a/pkgs/applications/audio/chuck/clang.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff --git a/src/ugen_osc.cpp b/src/ugen_osc.cpp -index 6b93c6b..dbefe4f 100644 ---- a/src/ugen_osc.cpp -+++ b/src/ugen_osc.cpp -@@ -1232,7 +1232,7 @@ CK_DLL_CTRL( gen5_coeffs ) - Chuck_Array8 * in_args = (Chuck_Array8 *)GET_CK_OBJECT(ARGS); - - // fprintf(stdout, "calling gen10coeffs, %d\n", weights); -- if(in_args<0) return; -+ if(in_args!=0) return; - size = in_args->size(); - if(size >= genX_MAX_COEFFS) size = genX_MAX_COEFFS - 1; - -@@ -1287,7 +1287,7 @@ CK_DLL_CTRL( gen7_coeffs ) - Chuck_Array8 * in_args = (Chuck_Array8 *)GET_CK_OBJECT(ARGS); - - // fprintf(stdout, "calling gen10coeffs, %d\n", weights); -- if(in_args<0) return; -+ if(in_args!=0) return; - size = in_args->size(); - if(size >= genX_MAX_COEFFS) size = genX_MAX_COEFFS - 1; - -@@ -1340,7 +1340,7 @@ CK_DLL_CTRL( gen9_coeffs ) - Chuck_Array8 * weights = (Chuck_Array8 *)GET_CK_OBJECT(ARGS); - - // fprintf(stdout, "calling gen10coeffs, %d\n", weights); -- if(weights<0) return; -+ if(weights!=0) return; - size = weights->size(); - if(size >= genX_MAX_COEFFS) size = genX_MAX_COEFFS - 1; - -@@ -1390,7 +1390,7 @@ CK_DLL_CTRL( gen10_coeffs ) - Chuck_Array8 * weights = (Chuck_Array8 *)GET_CK_OBJECT(ARGS); - - // fprintf(stdout, "calling gen10coeffs, %d\n", weights); -- if(weights<0) return; -+ if(weights!=0) return; - size = weights->size(); - if(size >= genX_MAX_COEFFS) size = genX_MAX_COEFFS - 1; - -@@ -1441,7 +1441,7 @@ CK_DLL_CTRL( gen17_coeffs ) - Chuck_Array8 * weights = (Chuck_Array8 *)GET_CK_OBJECT(ARGS); - - // fprintf(stdout, "calling gen17coeffs, %d\n", weights); -- if(weights<0) return; -+ if(weights!=0) return; - size = weights->size(); - if(size >= genX_MAX_COEFFS) size = genX_MAX_COEFFS - 1; - -@@ -1502,7 +1502,7 @@ CK_DLL_CTRL( curve_coeffs ) - Chuck_Array8 * weights = (Chuck_Array8 *)GET_CK_OBJECT(ARGS); - - // fprintf(stdout, "calling gen17coeffs, %d\n", weights); -- if(weights<0) goto done; -+ if(weights!=0) goto done; - - nargs = weights->size(); - if (nargs < 5 || (nargs % 3) != 2) { // check number of args diff --git a/pkgs/applications/audio/chuck/darwin-limits.patch b/pkgs/applications/audio/chuck/darwin-limits.patch index 3387f72554418..dc98a17269131 100644 --- a/pkgs/applications/audio/chuck/darwin-limits.patch +++ b/pkgs/applications/audio/chuck/darwin-limits.patch @@ -1,5 +1,5 @@ ---- a/src/util_string.cpp 2014-10-27 22:52:11.875981552 +0100 -+++ b/src/util_string.cpp 2014-10-27 22:54:18.613001994 +0100 +--- a/src/core/util_string.cpp 2014-10-27 22:52:11.875981552 +0100 ++++ b/src/core/util_string.cpp 2014-10-27 22:54:18.613001994 +0100 @@ -40,6 +40,10 @@ #include <linux/limits.h> #endif // __PLATFORM_LINUX__ diff --git a/pkgs/applications/audio/chuck/default.nix b/pkgs/applications/audio/chuck/default.nix index 6113a776a6720..da26a7188357d 100644 --- a/pkgs/applications/audio/chuck/default.nix +++ b/pkgs/applications/audio/chuck/default.nix @@ -3,12 +3,12 @@ }: stdenv.mkDerivation rec { - version = "1.3.5.2"; + version = "1.4.0.0"; name = "chuck-${version}"; src = fetchurl { url = "http://chuck.cs.princeton.edu/release/files/chuck-${version}.tgz"; - sha256 = "02z7sglax3j09grj5s1skmw8z6wz7b21hjrm95nrrdpwbxabh079"; + sha256 = "1b17rsf7bv45gfhyhfmpz9d4rkxn24c0m2hgmpfjz3nlp0rf7bic"; }; nativeBuildInputs = [ flex bison which ]; @@ -17,16 +17,15 @@ stdenv.mkDerivation rec { ++ lib.optional (!stdenv.isDarwin) alsaLib ++ lib.optional stdenv.isDarwin [ AppKit Carbon CoreAudio CoreMIDI CoreServices Kernel ]; - patches = [ ./clang.patch ./darwin-limits.patch ]; + patches = [ ./darwin-limits.patch ]; NIX_CFLAGS_COMPILE = lib.optional stdenv.isDarwin "-Wno-missing-sysroot"; NIX_LDFLAGS = lib.optional stdenv.isDarwin "-framework MultitouchSupport"; postPatch = '' - substituteInPlace src/makefile --replace "/usr/bin" "$out/bin" - substituteInPlace src/makefile.osx \ + substituteInPlace src/core/makefile.x/makefile.osx \ --replace "weak_framework" "framework" \ - --replace "MACOSX_DEPLOYMENT_TARGET=10.5" "MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET" + --replace "MACOSX_DEPLOYMENT_TARGET=10.9" "MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET" ''; makeFlags = [ "-C src" "DESTDIR=$(out)/bin" ]; @@ -36,7 +35,7 @@ stdenv.mkDerivation rec { description = "Programming language for real-time sound synthesis and music creation"; homepage = http://chuck.cs.princeton.edu; license = licenses.gpl2; - platforms = with platforms; linux ++ darwin; + platforms = platforms.unix; maintainers = with maintainers; [ ftrvxmtrx ]; }; } diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index 9015a8c749a89..c1379c57fe5be 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -4,13 +4,13 @@ pythonPackages.buildPythonApplication rec { pname = "mopidy"; - version = "2.2.2"; + version = "2.2.3"; src = fetchFromGitHub { owner = "mopidy"; repo = "mopidy"; rev = "v${version}"; - sha256 = "01vl162c7ssf69b0m65ys9fxnsqnfa1whwbprnc063lkcnrnlkr1"; + sha256 = "0i9rpnlmgrnkgmr9hyx9sky9gzj2cjhay84a0yaijwcb9nmr8nnc"; }; nativeBuildInputs = [ wrapGAppsHook ]; diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix index 4a70474017817..3a663fd33c811 100644 --- a/pkgs/applications/audio/mopidy/iris.nix +++ b/pkgs/applications/audio/mopidy/iris.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonApplication rec { pname = "Mopidy-Iris"; - version = "3.38.0"; + version = "3.39.0"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "0w86g037jdihh6a16x7y82qk8yk30frkj23k9axcj9fjyp30r0x5"; + sha256 = "1d2g66gvm7yaz4nbxlh23lj2xfkhi3hsg2k646m1za510f8dzlag"; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 6e926fe11c3de..4c08a8d285d46 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, squashfsTools, xorg, alsaLib, makeWrapper, openssl, freetype , glib, pango, cairo, atk, gdk_pixbuf, gtk2, cups, nspr, nss, libpng, libnotify , libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_3, curl, zlib, gnome3 -, at-spi2-atk +, at-spi2-atk, at-spi2-core, apulse }: let @@ -10,20 +10,22 @@ let # If an update breaks things, one of those might have valuable info: # https://aur.archlinux.org/packages/spotify/ # https://community.spotify.com/t5/Desktop-Linux - version = "1.0.96.181.gf6bc1b6b-12"; + version = "1.1.10.546.ge08ef575-19"; # To get the latest stable revision: # curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated' # To get general information: # curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.' # More examples of api usage: # https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py - rev = "30"; + rev = "36"; deps = [ alsaLib + apulse atk at-spi2-atk + at-spi2-core cairo cups curl @@ -72,7 +74,7 @@ stdenv.mkDerivation { # https://community.spotify.com/t5/Desktop-Linux/Redistribute-Spotify-on-Linux-Distributions/td-p/1695334 src = fetchurl { url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${rev}.snap"; - sha512 = "859730fbc80067f0828f7e13eee9a21b13b749f897a50e17c2da4ee672785cfd79e1af6336e609529d105e040dc40f61b6189524783ac93d49f991c4ea8b3c56"; + sha512 = "c49f1a86a9b737e64a475bbe62754a36f607669e908eb725a2395f0a0a6b95968e0c8ce27ab2c8b6c92fe8cbacb1ef58de11c79b92dc0f58c2c6d3a140706a1f"; }; buildInputs = [ squashfsTools makeWrapper ]; @@ -134,6 +136,8 @@ stdenv.mkDerivation { librarypath="${stdenv.lib.makeLibraryPath deps}:$libdir" wrapProgram $out/share/spotify/spotify \ --prefix LD_LIBRARY_PATH : "$librarypath" \ + --prefix LD_LIBRARY_PATH : "${apulse}/lib/apulse" \ + --set APULSE_PLAYBACK_DEVICE plug:dmix \ --prefix PATH : "${gnome3.zenity}/bin" # fix Icon line in the desktop file (#48062) @@ -158,7 +162,7 @@ stdenv.mkDerivation { homepage = https://www.spotify.com/; description = "Play music from the Spotify music service"; license = licenses.unfree; - maintainers = with maintainers; [ eelco ftrvxmtrx sheenobu mudri timokau ]; + maintainers = with maintainers; [ eelco ftrvxmtrx sheenobu mudri timokau angristan ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 97681afbe15ec..20332a1bdd806 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -233,6 +233,12 @@ self: # upstream issue: missing file header textmate = markBroken super.textmate; + treemacs-magit = super.treemacs-magit.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + # missing OCaml utop = markBroken super.utop; diff --git a/pkgs/applications/editors/ghostwriter/default.nix b/pkgs/applications/editors/ghostwriter/default.nix index a65954d7d2aee..1e07902365d23 100644 --- a/pkgs/applications/editors/ghostwriter/default.nix +++ b/pkgs/applications/editors/ghostwriter/default.nix @@ -1,9 +1,8 @@ -{ stdenv, fetchFromGitHub, qmake, pkgconfig, qttools, qtwebengine, hunspell }: +{ stdenv, mkDerivation, fetchFromGitHub, qmake, pkgconfig, qttools, qtwebengine, hunspell }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "ghostwriter"; version = "1.8.0"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "wereturtle"; diff --git a/pkgs/applications/graphics/goxel/default.nix b/pkgs/applications/graphics/goxel/default.nix index 2957192f16e58..b25ba8f567dfe 100644 --- a/pkgs/applications/graphics/goxel/default.nix +++ b/pkgs/applications/graphics/goxel/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "goxel-${version}"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "guillaumechereau"; repo = "goxel"; rev = "v${version}"; - sha256 = "1vd1vw5pplm4ig9f5gwnbvndnag1h7j0jj0cnj78gpiv96qak2vw"; + sha256 = "1mdw4bs7hvfn0yngd9ial5wzlfkcbhr3wzldb1w7s3s48agixkdr"; }; patches = [ ./disable-imgui_ini.patch ]; diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index b022f52300739..6b4ca4e035501 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, poppler_utils, pkgconfig, libpng , imagemagick, libjpeg, fontconfig, podofo, qtbase, qmake, icu, sqlite , makeWrapper, unrarSupport ? false, chmlib, python2Packages, libusb1, libmtp -, xdg_utils, makeDesktopItem, wrapGAppsHook, removeReferencesTo +, xdg_utils, makeDesktopItem, wrapGAppsHook, removeReferencesTo, qt5 }: stdenv.mkDerivation rec { @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ makeWrapper pkgconfig qmake removeReferencesTo ]; + nativeBuildInputs = [ makeWrapper pkgconfig qmake removeReferencesTo qt5.wrapQtAppsHook ]; buildInputs = [ poppler_utils libpng imagemagick libjpeg @@ -48,6 +48,11 @@ stdenv.mkDerivation rec { odfpy ]); + qtWrapperArgs = [ + "--prefix PYTHONPATH: $PYTHONPATH" + "--prefix PATH: ${poppler_utils.out}/bin}" + ]; + installPhase = '' runHook preInstall @@ -70,9 +75,8 @@ stdenv.mkDerivation rec { sed -i "s/env python[0-9.]*/python/" $PYFILES sed -i "2i import sys; sys.argv[0] = 'calibre'" $out/bin/calibre - for a in $out/bin/*; do - wrapProgram $a --prefix PYTHONPATH : $PYTHONPATH \ - --prefix PATH : ${poppler_utils.out}/bin + for program in $out/bin/*; do + wrapQtApp $program done # Replace @out@ by the output path. @@ -95,6 +99,10 @@ stdenv.mkDerivation rec { remove-references-to -t ${podofo.dev} $out/lib/calibre/calibre/plugins/podofo.so ''; + postFixup = '' + + ''; + disallowedReferences = [ podofo.dev ]; calibreDesktopItem = makeDesktopItem { diff --git a/pkgs/applications/misc/clipmenu/default.nix b/pkgs/applications/misc/clipmenu/default.nix index 7a47a0e3bc0bb..e6e4ede6ac141 100644 --- a/pkgs/applications/misc/clipmenu/default.nix +++ b/pkgs/applications/misc/clipmenu/default.nix @@ -1,6 +1,6 @@ -{ clipnotify, makeWrapper, xsel, dmenu2, utillinux, gawk, stdenv, fetchFromGitHub, lib }: +{ clipnotify, makeWrapper, xsel, dmenu, utillinux, gawk, stdenv, fetchFromGitHub, lib }: let - runtimePath = lib.makeBinPath [ clipnotify xsel dmenu2 utillinux gawk ]; + runtimePath = lib.makeBinPath [ clipnotify xsel dmenu utillinux gawk ]; in stdenv.mkDerivation rec { name = "clipmenu-${version}"; diff --git a/pkgs/applications/misc/dmenu2/default.nix b/pkgs/applications/misc/dmenu2/default.nix deleted file mode 100644 index 3d5676033593f..0000000000000 --- a/pkgs/applications/misc/dmenu2/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{stdenv, fetchhg, libX11, libXinerama, libXft, zlib}: - -with stdenv.lib; - -stdenv.mkDerivation rec { - name = "dmenu2-0.3pre-2014-07-08"; - - src = fetchhg { - url = "https://bitbucket.org/melek/dmenu2"; - rev = "36cb94a16edf928bdaaa636123392517ed469be0"; - sha256 = "1b17z5ypg6ij7zz3ncp3irc87raccna10y4w490c872a99lp23lv"; - }; - - buildInputs = [ libX11 libXinerama zlib libXft ]; - - postPatch = '' - sed -ri -e 's!\<(dmenu|stest)\>!'"$out/bin"'/&!g' dmenu_run - ''; - - preConfigure = [ ''sed -i "s@PREFIX = /usr/local@PREFIX = $out@g" config.mk'' ]; - - meta = { - description = "A patched fork of the original dmenu - an efficient dynamic menu for X"; - homepage = https://bitbucket.org/melek/dmenu2; - license = licenses.mit; - maintainers = [ maintainers.cstrahan ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/applications/misc/gpx-viewer/default.nix b/pkgs/applications/misc/gpx-viewer/default.nix index a5ee6c8e4ae57..735818171e805 100644 --- a/pkgs/applications/misc/gpx-viewer/default.nix +++ b/pkgs/applications/misc/gpx-viewer/default.nix @@ -15,10 +15,10 @@ stdenv.mkDerivation rec { }; patchFlags = [ "-p0" ]; + configureFlags = [ "--disable-database-updates" ]; + nativeBuildInputs = [ intltool pkgconfig - shared-mime-info # For update-mime-database - desktop-file-utils # For update-desktop-database wrapGAppsHook # Fix error: GLib-GIO-ERROR **: No GSettings schemas are installed on the system ]; buildInputs = [ gdl libchamplain gnome3.adwaita-icon-theme libxml2 ]; diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index 8c9833ae40d1c..e326e9c100873 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchFromGitHub, qmake, qttools, makeWrapper }: +{ mkDerivation, lib, fetchFromGitHub, qmake, qttools }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "gpxsee"; - version = "7.9"; + version = "7.11"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - sha256 = "029l5dhc9nnxiw7p0s4gyfkcqw709z7lz96aq8krs75mfk4fv07k"; + sha256 = "1b4ky7m990h3rmam9lb1w6vns1mxd8ri6is3a8qgdl8kd6xcl5d7"; }; - nativeBuildInputs = [ qmake makeWrapper ]; + nativeBuildInputs = [ qmake ]; buildInputs = [ qttools ]; preConfigure = '' @@ -20,12 +20,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - postInstall = '' - wrapProgram $out/bin/gpxsee \ - --prefix XDG_DATA_DIRS ":" $out/share - ''; - - meta = with stdenv.lib; { + meta = with lib; { homepage = https://www.gpxsee.org/; description = "GPS log file viewer and analyzer"; longDescription = '' diff --git a/pkgs/applications/misc/mako/default.nix b/pkgs/applications/misc/mako/default.nix index 32aa15b09e495..0f7c55645ba21 100644 --- a/pkgs/applications/misc/mako/default.nix +++ b/pkgs/applications/misc/mako/default.nix @@ -1,33 +1,22 @@ { stdenv, fetchFromGitHub, meson, ninja, pkgconfig, scdoc , systemd, pango, cairo, gdk_pixbuf -, wayland, wayland-protocols -, fetchpatch }: +, wayland, wayland-protocols }: stdenv.mkDerivation rec { pname = "mako"; - version = "1.3"; + version = "1.4"; src = fetchFromGitHub { owner = "emersion"; repo = pname; rev = "v${version}"; - sha256 = "17azdc37xsbmx13fkfp23vg9lznrv9fh6nhagn64wdq3nhsxm3b6"; + sha256 = "11ymiq6cr2ma0iva1mqybn3j6k73bsc6lv6pcbdq7hkhd4f9b7j9"; }; - # to be removed with next release - patches = [ - (fetchpatch { - url = "https://github.com/emersion/mako/commit/ca8e763f06756136c534b1bbd2e5b536be6b1995.patch"; - sha256 = "09mi7nn2vwc69igxxc6y2m36n3snhsz0ady99yabhrzl17k4ryds"; - }) - ]; - nativeBuildInputs = [ meson ninja pkgconfig scdoc wayland-protocols ]; buildInputs = [ systemd pango cairo gdk_pixbuf wayland ]; - mesonFlags = [ - "-Dicons=enabled" "-Dman-pages=enabled" "-Dzsh-completions=true" - ]; + mesonFlags = [ "-Dzsh-completions=true" ]; meta = with stdenv.lib; { description = "A lightweight Wayland notification daemon"; diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix index e6507845d4cc7..9ca8c696184cb 100644 --- a/pkgs/applications/misc/polybar/default.nix +++ b/pkgs/applications/misc/polybar/default.nix @@ -26,17 +26,18 @@ assert i3GapsSupport -> ! i3Support && jsoncpp != null && i3-gaps != null; stdenv.mkDerivation rec { pname = "polybar"; - version = "3.3.1"; + version = "3.4.0"; src = fetchFromGitHub { owner = "jaagr"; repo = pname; rev = version; - sha256 = "0qwi6q3qkrz2ip1jd4pxlnsrs2a9ywxyf8rgvbzyilr334rsiywh"; + sha256 = "1g3zj0788cdlm8inpl19279bw8zjcy7dzj7q4f1l2d8c8g1jhv0m"; fetchSubmodules = true; }; meta = with stdenv.lib; { + homepage = "https://polybar.github.io/"; description = "A fast and easy-to-use tool for creating status bars"; longDescription = '' Polybar aims to help users build beautiful and highly customizable @@ -68,8 +69,8 @@ stdenv.mkDerivation rec { ]; postConfigure = '' - substituteInPlace ../include/settings.hpp --replace \ - "${stdenv.cc}" "${stdenv.cc.name}" + substituteInPlace generated-sources/settings.hpp \ + --replace "${stdenv.cc}" "${stdenv.cc.name}" ''; postInstall = if (i3Support || i3GapsSupport) then '' diff --git a/pkgs/applications/misc/translate-shell/default.nix b/pkgs/applications/misc/translate-shell/default.nix index 9fb8469cf27a0..a2f6980abd9e2 100644 --- a/pkgs/applications/misc/translate-shell/default.nix +++ b/pkgs/applications/misc/translate-shell/default.nix @@ -1,15 +1,14 @@ { stdenv, fetchFromGitHub, makeWrapper, curl, fribidi, rlwrap, gawk, groff, ncurses }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "translate-shell"; - version = "0.9.6.10"; + version = "0.9.6.11"; src = fetchFromGitHub { owner = "soimort"; repo = "translate-shell"; rev = "v${version}"; - sha256 = "1dmh3flldfhnqfay3a6c5hanqcjwrmbly1bq8mlk022qfi1fv33y"; + sha256 = "137fz3ahzf65hfqcs4k7hhrmfjlhlw7wr3gfsvk88bnyqkyw44sm"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index af72e0a8d9ad4..585b4eef9ea36 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -3,11 +3,9 @@ , gtk, girara, gettext, libxml2, check , sqlite, glib, texlive, libintl, libseccomp , file, librsvg -, gtk-mac-integration, synctexSupport ? true +, gtk-mac-integration }: -assert synctexSupport -> texlive != null; - with stdenv.lib; stdenv.mkDerivation rec { @@ -29,7 +27,8 @@ stdenv.mkDerivation rec { # "-Dseccomp=enabled" "-Dmanpages=enabled" "-Dconvert-icon=enabled" - ] ++ optional synctexSupport "-Dsynctex=enabled"; + "-Dsynctex=enabled" + ]; nativeBuildInputs = [ meson ninja pkgconfig desktop-file-utils python3.pkgs.sphinx @@ -38,8 +37,8 @@ stdenv.mkDerivation rec { buildInputs = [ gtk girara libintl sqlite glib file librsvg - ] ++ optional synctexSupport texlive.bin.core - ++ optional stdenv.isLinux libseccomp + texlive.bin.core + ] ++ optional stdenv.isLinux libseccomp ++ optional stdenv.isDarwin gtk-mac-integration; doCheck = true; diff --git a/pkgs/applications/misc/zathura/default.nix b/pkgs/applications/misc/zathura/default.nix index e3db15ca78d4f..1548b0581b656 100644 --- a/pkgs/applications/misc/zathura/default.nix +++ b/pkgs/applications/misc/zathura/default.nix @@ -1,7 +1,6 @@ { config, pkgs # zathura_pdf_mupdf fails to load _opj_create_decompress at runtime on Darwin (https://github.com/NixOS/nixpkgs/pull/61295#issue-277982980) -, useMupdf ? config.zathura.useMupdf or (!pkgs.stdenv.isDarwin) -, synctexSupport ? true }: +, useMupdf ? config.zathura.useMupdf or (!pkgs.stdenv.isDarwin) }: let callPackage = pkgs.newScope self; @@ -9,9 +8,7 @@ let self = rec { gtk = pkgs.gtk3; - zathura_core = callPackage ./core { - inherit synctexSupport; - }; + zathura_core = callPackage ./core { }; zathura_pdf_poppler = callPackage ./pdf-poppler { }; diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix index 63a127def7f5f..fec737ddb2aef 100644 --- a/pkgs/applications/networking/cluster/nomad/default.nix +++ b/pkgs/applications/networking/cluster/nomad/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "nomad-${version}"; - version = "0.9.3"; + version = "0.9.4"; rev = "v${version}"; goPackagePath = "github.com/hashicorp/nomad"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "hashicorp"; repo = "nomad"; inherit rev; - sha256 = "0hn9rr5v2y2pw0pmn27gz8dx5n964dsaf48sh0jhwc95b5q1rjwr"; + sha256 = "1jgvnmmrz7ffpm6aamdrvklj94n7b43swk9cycqhlfbnzijianpn"; }; # We disable Nvidia GPU scheduling on Linux, as it doesn't work there: diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index cb192bddcaf69..02803daa219ef 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -97,8 +97,8 @@ in rec { terraform_0_11-full = terraform_0_11.full; terraform_0_12 = pluggable (generic { - version = "0.12.5"; - sha256 = "0p064rhaanwx4szs8hv6mdqad8d2bgfd94h2la11j58xbsxc7hap"; + version = "0.12.6"; + sha256 = "0vxvciv4amblxx50wivlm60fyj1ardfgdpj3l8cj9fhi79b3khxl"; patches = [ ./provider-path.patch ]; passthru = { inherit plugins; }; }); diff --git a/pkgs/applications/networking/ids/suricata/default.nix b/pkgs/applications/networking/ids/suricata/default.nix new file mode 100644 index 0000000000000..3cd5fe4b8ea5d --- /dev/null +++ b/pkgs/applications/networking/ids/suricata/default.nix @@ -0,0 +1,125 @@ +{ stdenv +, lib +, fetchurl +, pkgconfig +, makeWrapper +, file +, geoip +, hyperscan +, jansson +, libcap_ng +, libevent +, libnet +, libnetfilter_log +, libnetfilter_queue +, libnfnetlink +, libpcap +, libyaml +, luajit +, nspr +, nss +, pcre +, python +, zlib +, redisSupport ? true, redis, hiredis +, rustSupport ? true, rustc, cargo +}: let + libmagic = file; + hyperscanSupport = stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux"; +in +stdenv.mkDerivation rec { + pname = "suricata"; + version = "4.1.4"; + + src = fetchurl { + url = "https://www.openinfosecfoundation.org/download/${pname}-${version}.tar.gz"; + sha256 = "02901wjf90171rhkymcgp0h48hkn3wv8iwrhz4d8ppraz68hv99d"; + }; + + nativeBuildInputs = [ + makeWrapper + pkgconfig + ]; + + buildInputs = [ + geoip + jansson + libcap_ng + libevent + libmagic + libnet + libnetfilter_log + libnetfilter_queue + libnfnetlink + libpcap + libyaml + luajit + nspr + nss + pcre + python + zlib + ] + ++ lib.optional hyperscanSupport [ hyperscan ] + ++ lib.optional redisSupport [ redis hiredis ] + ++ lib.optional rustSupport [ rustc cargo ] + ; + + enableParallelBuilding = true; + + configureFlags = [ + "--disable-gccmarch-native" + "--enable-afl" + "--enable-af-packet" + "--enable-gccprotect" + "--enable-geoip" + "--enable-luajit" + "--enable-nflog" + "--enable-nfqueue" + "--enable-pie" + "--disable-prelude" + "--enable-python" + "--enable-unix-socket" + "--localstatedir=/var" + "--sysconfdir=/etc" + "--with-libnet-includes=${libnet}/include" + "--with-libnet-libraries=${libnet}/lib" + ] + ++ lib.optional hyperscanSupport [ + "--with-libhs-includes=${hyperscan}/include" + "--with-libhs-libraries=${hyperscan}/lib" + ] + ++ lib.optional redisSupport [ "--enable-hiredis" ] + ++ lib.optional rustSupport [ + "--enable-rust" + "--enable-rust-experimental" + ]; + + installFlags = [ + "e_localstatedir=\${TMPDIR}" + "e_logdir=\${TMPDIR}" + "e_logcertsdir=\${TMPDIR}" + "e_logfilesdir=\${TMPDIR}" + "e_rundir=\${TMPDIR}" + "e_sysconfdir=\${out}/etc/suricata" + "e_sysconfrulesdir=\${out}/etc/suricata/rules" + "localstatedir=\${TMPDIR}" + "runstatedir=\${TMPDIR}" + "sysconfdir=\${out}/etc" + ]; + + installTargets = "install install-conf"; + + postInstall = '' + wrapProgram "$out/bin/suricatasc" \ + --prefix PYTHONPATH : $PYTHONPATH:$(toPythonPath "$out") + ''; + + meta = with stdenv.lib; { + description = "A free and open source, mature, fast and robust network threat detection engine"; + homepage = "https://suricata-ids.org"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ magenbluten ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index 5d28daf816d10..45544a7d2a906 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -6,7 +6,7 @@ at-spi2-atk, libuuid, nodePackages let - version = "4.0.0"; + version = "4.0.1"; rpath = stdenv.lib.makeLibraryPath [ alsaLib @@ -51,7 +51,7 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://downloads.slack-edge.com/linux_releases/slack-desktop-${version}-amd64.deb"; - sha256 = "911a4c05fb4f85181df13f013e82440b0d171862c9cb137dc19b6381d47bd57e"; + sha256 = "1g7c8jka750pblsfzjvfyf7sp1m409kybqagml9miif1v71scxv2"; } else throw "Slack is not supported on ${stdenv.hostPlatform.system}"; @@ -113,6 +113,7 @@ in stdenv.mkDerivation { description = "Desktop client for Slack"; homepage = https://slack.com; license = licenses.unfree; + maintainers = [ maintainers.mmahut ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 3e5294815084b..13c03b4190976 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -1,18 +1,159 @@ -{ qt5 }: - -let - mkTelegram = args: qt5.callPackage (import ./generic.nix args) { }; - stableVersion = { - stable = true; - version = "1.7.14"; - sha256Hash = "1bw804a9kffmn23wv0570wihbvfm7jy9cqmxlv196f4j7bw7zkv3"; +{ mkDerivation, lib, fetchFromGitHub, fetchsvn +, pkgconfig, pythonPackages, cmake, wrapGAppsHook, wrapQtAppsHook, gcc8 +, qtbase, qtimageformats, gtk3, libappindicator-gtk3, libnotify, xdg_utils +, dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3 +}: + +with lib; + +mkDerivation rec { + name = "telegram-desktop-${version}"; + version = "1.7.14"; + + # Telegram-Desktop with submodules + src = fetchFromGitHub { + owner = "telegramdesktop"; + repo = "tdesktop"; + rev = "v${version}"; + sha256 = "1bw804a9kffmn23wv0570wihbvfm7jy9cqmxlv196f4j7bw7zkv3"; + fetchSubmodules = true; + }; + + # Arch patches (svn export telegram-desktop/trunk) + archPatches = fetchsvn { + url = "svn://svn.archlinux.org/community/telegram-desktop/trunk"; # svn log svn://svn.archlinux.org/community/telegram-desktop/trunk - archPatchesRevision = "487779"; - archPatchesHash = "0f09hvimb66xqksb2v0zc4ryshx7y7z0rafzjd99x37rpib9f3kq"; + rev = "487779"; + sha256 = "0f09hvimb66xqksb2v0zc4ryshx7y7z0rafzjd99x37rpib9f3kq"; + }; + + patches = [ + "${archPatches}/tdesktop.patch" + "${archPatches}/no-gtk2.patch" + # "${archPatches}/Use-system-wide-font.patch" + "${archPatches}/tdesktop_lottie_animation_qtdebug.patch" + "${archPatches}/issue6219.patch" + ]; + + postPatch = '' + substituteInPlace Telegram/SourceFiles/platform/linux/linux_libs.cpp \ + --replace '"appindicator3"' '"${libappindicator-gtk3}/lib/libappindicator3.so"' + substituteInPlace Telegram/SourceFiles/platform/linux/linux_libnotify.cpp \ + --replace '"notify"' '"${libnotify}/lib/libnotify.so"' + ''; + + nativeBuildInputs = [ pkgconfig pythonPackages.gyp cmake wrapGAppsHook wrapQtAppsHook gcc8 ]; + + # We want to run wrapProgram manually (with additional parameters) + dontWrapGApps = true; + dontWrapQtApps = true; + + buildInputs = [ + qtbase qtimageformats gtk3 libappindicator-gtk3 + dee ffmpeg openalSoft minizip libopus alsaLib libpulseaudio range-v3 + ]; + + enableParallelBuilding = true; + + GYP_DEFINES = concatStringsSep "," [ + "TDESKTOP_DISABLE_CRASH_REPORTS" + "TDESKTOP_DISABLE_AUTOUPDATE" + "TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME" + ]; + + NIX_CFLAGS_COMPILE = [ + "-DTDESKTOP_DISABLE_CRASH_REPORTS" + "-DTDESKTOP_DISABLE_AUTOUPDATE" + "-DTDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME" + "-I${minizip}/include/minizip" + # See Telegram/gyp/qt.gypi + "-I${getDev qtbase}/mkspecs/linux-g++" + ] ++ concatMap (x: [ + "-I${getDev qtbase}/include/${x}" + "-I${getDev qtbase}/include/${x}/${qtbase.version}" + "-I${getDev qtbase}/include/${x}/${qtbase.version}/${x}" + "-I${getDev libopus}/include/opus" + "-I${getDev alsaLib}/include/alsa" + "-I${getDev libpulseaudio}/include/pulse" + ]) [ "QtCore" "QtGui" "QtDBus" ]; + CPPFLAGS = NIX_CFLAGS_COMPILE; + + preConfigure = '' + patch -R -Np1 -i "${archPatches}/demibold.patch" + + pushd "Telegram/ThirdParty/libtgvoip" + patch -Np1 -i "${archPatches}/libtgvoip.patch" + popd + + # disable static-qt for rlottie + sed "/RLOTTIE_WITH_STATIC_QT/d" -i "Telegram/gyp/lib_rlottie.gyp" + + sed -i Telegram/gyp/telegram_linux.gypi \ + -e 's,/usr,/does-not-exist,g' \ + -e 's,appindicator-0.1,appindicator3-0.1,g' \ + -e 's,-flto,,g' + + sed -i Telegram/gyp/qt.gypi \ + -e "s,/usr/include/qt/QtCore/,${qtbase.dev}/include/QtCore/,g" \ + -e 's,\d+",\d+" | head -n1,g' + sed -i Telegram/gyp/qt_moc.gypi \ + -e "s,/usr/bin/moc,moc,g" + sed -i Telegram/gyp/qt_rcc.gypi \ + -e "s,/usr/bin/rcc,rcc,g" + + # Build system assumes x86, but it works fine on non-x86 if we patch this one flag out + sed -i Telegram/ThirdParty/libtgvoip/libtgvoip.gyp \ + -e "/-msse2/d" + + gyp \ + -Dapi_id=17349 \ + -Dapi_hash=344583e45741c457fe1862106095a5eb \ + -Dbuild_defines=${GYP_DEFINES} \ + -Gconfig=Release \ + --depth=Telegram/gyp \ + --generator-output=../.. \ + -Goutput_dir=out \ + --format=cmake \ + Telegram/gyp/Telegram.gyp + + cd out/Release + + NUM=$((`wc -l < CMakeLists.txt` - 2)) + sed -i "$NUM r $archPatches/CMakeLists.inj" CMakeLists.txt + + export ASM=$(type -p gcc) + ''; + + cmakeFlags = [ "-UTDESKTOP_OFFICIAL_TARGET" ]; + + installPhase = '' + install -Dm755 Telegram $out/bin/telegram-desktop + + mkdir -p $out/share/applications $out/share/kde4/services + install -m444 "$src/lib/xdg/telegramdesktop.desktop" "$out/share/applications/telegram-desktop.desktop" + sed "s,/usr/bin,$out/bin,g" $archPatches/tg.protocol > $out/share/kde4/services/tg.protocol + for icon_size in 16 32 48 64 128 256 512; do + install -Dm644 "../../../Telegram/Resources/art/icon''${icon_size}.png" "$out/share/icons/hicolor/''${icon_size}x''${icon_size}/apps/telegram.png" + done + ''; + + postFixup = '' + # This is necessary to run Telegram in a pure environment. + # We also use gappsWrapperArgs from wrapGAppsHook. + wrapProgram $out/bin/telegram-desktop \ + "''${gappsWrapperArgs[@]}" \ + "''${qtWrapperArgs[@]}" \ + --prefix PATH : ${xdg_utils}/bin \ + --set XDG_RUNTIME_DIR "XDG-RUNTIME-DIR" + sed -i $out/bin/telegram-desktop \ + -e "s,'XDG-RUNTIME-DIR',\"\''${XDG_RUNTIME_DIR:-/run/user/\$(id --user)}\"," + ''; + + meta = { + description = "Telegram Desktop messaging app"; + license = licenses.gpl3; + platforms = platforms.linux; + homepage = https://desktop.telegram.org/; + maintainers = with maintainers; [ primeos abbradar ]; }; -in { - stable = mkTelegram stableVersion; - preview = mkTelegram (stableVersion // { - stable = false; - }); } diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix deleted file mode 100644 index ab5f6c154df40..0000000000000 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix +++ /dev/null @@ -1,161 +0,0 @@ -{ stable, version, sha256Hash, archPatchesRevision, archPatchesHash }: - -{ mkDerivation, lib, fetchFromGitHub, fetchsvn -, pkgconfig, pythonPackages, cmake, wrapGAppsHook, wrapQtAppsHook, gcc8 -, qtbase, qtimageformats, gtk3, libappindicator-gtk3, libnotify, xdg_utils -, dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3 -}: - -with lib; - -mkDerivation rec { - name = "telegram-desktop-${version}"; - inherit version; - - # Telegram-Desktop with submodules - src = fetchFromGitHub { - owner = "telegramdesktop"; - repo = "tdesktop"; - rev = "v${version}"; - sha256 = sha256Hash; - fetchSubmodules = true; - }; - - # Arch patches (svn export telegram-desktop/trunk) - archPatches = fetchsvn { - url = "svn://svn.archlinux.org/community/telegram-desktop/trunk"; - rev = archPatchesRevision; - sha256 = archPatchesHash; - }; - - patches = [ - "${archPatches}/tdesktop.patch" - "${archPatches}/no-gtk2.patch" - # "${archPatches}/Use-system-wide-font.patch" - "${archPatches}/tdesktop_lottie_animation_qtdebug.patch" - "${archPatches}/issue6219.patch" - ]; - - postPatch = '' - substituteInPlace Telegram/SourceFiles/platform/linux/linux_libs.cpp \ - --replace '"appindicator3"' '"${libappindicator-gtk3}/lib/libappindicator3.so"' - substituteInPlace Telegram/SourceFiles/platform/linux/linux_libnotify.cpp \ - --replace '"notify"' '"${libnotify}/lib/libnotify.so"' - ''; - - nativeBuildInputs = [ pkgconfig pythonPackages.gyp cmake wrapGAppsHook wrapQtAppsHook gcc8 ]; - - # We want to run wrapProgram manually (with additional parameters) - dontWrapGApps = true; - - buildInputs = [ - qtbase qtimageformats gtk3 libappindicator-gtk3 - dee ffmpeg openalSoft minizip libopus alsaLib libpulseaudio range-v3 - ]; - - enableParallelBuilding = true; - - GYP_DEFINES = concatStringsSep "," [ - "TDESKTOP_DISABLE_CRASH_REPORTS" - "TDESKTOP_DISABLE_AUTOUPDATE" - "TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME" - ]; - - NIX_CFLAGS_COMPILE = [ - "-DTDESKTOP_DISABLE_CRASH_REPORTS" - "-DTDESKTOP_DISABLE_AUTOUPDATE" - "-DTDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME" - "-I${minizip}/include/minizip" - # See Telegram/gyp/qt.gypi - "-I${getDev qtbase}/mkspecs/linux-g++" - ] ++ concatMap (x: [ - "-I${getDev qtbase}/include/${x}" - "-I${getDev qtbase}/include/${x}/${qtbase.version}" - "-I${getDev qtbase}/include/${x}/${qtbase.version}/${x}" - "-I${getDev libopus}/include/opus" - "-I${getDev alsaLib}/include/alsa" - "-I${getDev libpulseaudio}/include/pulse" - ]) [ "QtCore" "QtGui" "QtDBus" ]; - CPPFLAGS = NIX_CFLAGS_COMPILE; - - preConfigure = '' - patch -R -Np1 -i "${archPatches}/demibold.patch" - - pushd "Telegram/ThirdParty/libtgvoip" - patch -Np1 -i "${archPatches}/libtgvoip.patch" - popd - - # disable static-qt for rlottie - sed "/RLOTTIE_WITH_STATIC_QT/d" -i "Telegram/gyp/lib_rlottie.gyp" - - sed -i Telegram/gyp/telegram_linux.gypi \ - -e 's,/usr,/does-not-exist,g' \ - -e 's,appindicator-0.1,appindicator3-0.1,g' \ - -e 's,-flto,,g' - - sed -i Telegram/gyp/qt.gypi \ - -e "s,/usr/include/qt/QtCore/,${qtbase.dev}/include/QtCore/,g" \ - -e 's,\d+",\d+" | head -n1,g' - sed -i Telegram/gyp/qt_moc.gypi \ - -e "s,/usr/bin/moc,moc,g" - sed -i Telegram/gyp/qt_rcc.gypi \ - -e "s,/usr/bin/rcc,rcc,g" - - # Build system assumes x86, but it works fine on non-x86 if we patch this one flag out - sed -i Telegram/ThirdParty/libtgvoip/libtgvoip.gyp \ - -e "/-msse2/d" - - gyp \ - -Dapi_id=17349 \ - -Dapi_hash=344583e45741c457fe1862106095a5eb \ - -Dbuild_defines=${GYP_DEFINES} \ - -Gconfig=Release \ - --depth=Telegram/gyp \ - --generator-output=../.. \ - -Goutput_dir=out \ - --format=cmake \ - Telegram/gyp/Telegram.gyp - - cd out/Release - - NUM=$((`wc -l < CMakeLists.txt` - 2)) - sed -i "$NUM r $archPatches/CMakeLists.inj" CMakeLists.txt - - export ASM=$(type -p gcc) - ''; - - cmakeFlags = [ "-UTDESKTOP_OFFICIAL_TARGET" ]; - - installPhase = '' - install -Dm755 Telegram $out/bin/telegram-desktop - - mkdir -p $out/share/applications $out/share/kde4/services - install -m444 "$src/lib/xdg/telegramdesktop.desktop" "$out/share/applications/telegram-desktop.desktop" - sed "s,/usr/bin,$out/bin,g" $archPatches/tg.protocol > $out/share/kde4/services/tg.protocol - for icon_size in 16 32 48 64 128 256 512; do - install -Dm644 "../../../Telegram/Resources/art/icon''${icon_size}.png" "$out/share/icons/hicolor/''${icon_size}x''${icon_size}/apps/telegram.png" - done - ''; - - dontWrapQtApps = true; - postFixup = '' - # This is necessary to run Telegram in a pure environment. - # We also use gappsWrapperArgs from wrapGAppsHook. - wrapProgram $out/bin/telegram-desktop \ - "''${gappsWrapperArgs[@]}" \ - "''${qtWrapperArgs[@]}" \ - --prefix PATH : ${xdg_utils}/bin \ - --set XDG_RUNTIME_DIR "XDG-RUNTIME-DIR" - sed -i $out/bin/telegram-desktop \ - -e "s,'XDG-RUNTIME-DIR',\"\''${XDG_RUNTIME_DIR:-/run/user/\$(id --user)}\"," - ''; - - meta = { - description = "Telegram Desktop messaging app " - + (if stable then "(stable version)" else "(pre-release)"); - license = licenses.gpl3; - platforms = platforms.linux; - homepage = https://desktop.telegram.org/; - maintainers = with maintainers; [ primeos abbradar ]; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 5e9d078f8c4f8..8aa732fd6ba73 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, makeWrapper, makeDesktopItem, autoPatchelfHook, env +{ stdenv, fetchurl, mkDerivation, autoPatchelfHook +, fetchFromGitHub # Dynamic libraries , dbus, glib, libGL, libX11, libXfixes, libuuid, libxcb, qtbase, qtdeclarative , qtimageformats, qtlocation, qtquickcontrols, qtquickcontrols2, qtscript, qtsvg @@ -21,23 +22,26 @@ let }; }; - qtDeps = [ - qtbase qtdeclarative qtlocation qtquickcontrols qtquickcontrols2 qtscript - qtwebchannel qtwebengine qtimageformats qtsvg qttools qtwayland - ]; - - qtEnv = env "zoom-us-qt-${qtbase.version}" qtDeps; + # Used for icons, appdata, and desktop file. + desktopIntegration = fetchFromGitHub { + owner = "flathub"; + repo = "us.zoom.Zoom"; + rev = "0d294e1fdd2a4ef4e05d414bc680511f24d835d7"; + sha256 = "0rm188844a10v8d6zgl2pnwsliwknawj09b02iabrvjw5w1lp6wl"; + }; -in stdenv.mkDerivation { +in mkDerivation { name = "zoom-us-${version}"; src = srcs.${stdenv.hostPlatform.system}; - nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; + nativeBuildInputs = [ autoPatchelfHook ]; buildInputs = [ - dbus glib libGL libX11 libXfixes libuuid libxcb qtEnv libjpeg_turbo - ] ++ qtDeps; + dbus glib libGL libX11 libXfixes libuuid libxcb libjpeg_turbo + qtbase qtdeclarative qtlocation qtquickcontrols qtquickcontrols2 qtscript + qtwebchannel qtwebengine qtimageformats qtsvg qttools qtwayland + ]; runtimeDependencies = optional pulseaudioSupport libpulseaudio; @@ -60,33 +64,43 @@ in stdenv.mkDerivation { in '' runHook preInstall - packagePath=$out/share/zoom-us - mkdir -p $packagePath $out/bin + mkdir -p $out/{bin,share/zoom-us} - cp -ar ${files} $packagePath + cp -ar ${files} $out/share/zoom-us # TODO Patch this somehow; tries to dlopen './libturbojpeg.so' from cwd - ln -s $(readlink -e "${libjpeg_turbo.out}/lib/libturbojpeg.so") $packagePath/libturbojpeg.so - - ln -s ${qtEnv}/bin/qt.conf $packagePath - - makeWrapper $packagePath/zoom $out/bin/zoom-us \ - --prefix PATH : "${makeBinPath [ coreutils glib.dev pciutils procps qttools.dev utillinux ]}" \ - --prefix LD_PRELOAD : "${libv4l}/lib/libv4l/v4l2convert.so" \ - --run "cd $packagePath" + ln -s $(readlink -e "${libjpeg_turbo.out}/lib/libturbojpeg.so") $out/share/zoom-us/libturbojpeg.so runHook postInstall ''; - postInstall = (makeDesktopItem { - name = "zoom-us"; - exec = "$out/bin/zoom-us %U"; - icon = "$out/share/zoom-us/application-x-zoom.png"; - desktopName = "Zoom"; - genericName = "Video Conference"; - categories = "Network;Application;"; - mimeType = "x-scheme-handler/zoommtg;"; - }).buildCommand; + postInstall = '' + mkdir -p $out/share/{applications,appdata,icons} + + # Desktop File + cp ${desktopIntegration}/us.zoom.Zoom.desktop $out/share/applications + substituteInPlace $out/share/applications/us.zoom.Zoom.desktop \ + --replace "Exec=zoom" "Exec=$out/bin/zoom-us" + + # Appdata + cp ${desktopIntegration}/us.zoom.Zoom.appdata.xml $out/share/appdata + + # Icons + for icon_size in 64 96 128 256; do + path=$icon_size'x'$icon_size + icon=${desktopIntegration}/us.zoom.Zoom.$icon_size.png + + mkdir -p $out/share/icons/hicolor/$path/apps + cp $icon $out/share/icons/hicolor/$path/apps/us.zoom.Zoom.png + done + + ln -s $out/share/zoom-us/zoom $out/bin/zoom-us + ''; + + qtWrapperArgs = [ + ''--prefix PATH : ${makeBinPath [ coreutils glib.dev pciutils procps qttools.dev utillinux ]}'' + ''--prefix LD_PRELOAD : ${libv4l}/lib/libv4l/v4l2convert.so'' + ]; passthru.updateScript = ./update.sh; diff --git a/pkgs/applications/networking/mailreaders/aerc/default.nix b/pkgs/applications/networking/mailreaders/aerc/default.nix index 0f681c47aa730..b94ce26956624 100644 --- a/pkgs/applications/networking/mailreaders/aerc/default.nix +++ b/pkgs/applications/networking/mailreaders/aerc/default.nix @@ -1,15 +1,15 @@ { stdenv, buildGoModule, fetchurl -, go, scdoc +, go, ncurses, scdoc , python3, perl, w3m, dante }: buildGoModule rec { pname = "aerc"; - version = "0.1.4"; + version = "0.2.1"; src = fetchurl { url = "https://git.sr.ht/~sircmpwn/aerc/archive/${version}.tar.gz"; - sha256 = "0vlqgcjbq6yp7ffrfs3zwa9hrm4vyx9245v9pkqdn328xlff3h55"; + sha256 = "1ky1nl5b54lf5jnac2kb5404fplwnwypjplas8imdlsf517fw32n"; }; nativeBuildInputs = [ @@ -38,12 +38,13 @@ buildGoModule rec { ''; postFixup = '' - wrapProgram $out/bin/aerc --prefix PATH ":" "$out/share/aerc/filters" + wrapProgram $out/bin/aerc --prefix PATH ":" \ + "$out/share/aerc/filters:${stdenv.lib.makeBinPath [ ncurses.dev ]}" wrapProgram $out/share/aerc/filters/html --prefix PATH ":" \ ${stdenv.lib.makeBinPath [ w3m dante ]} ''; - modSha256 = "0v1b76nax5295bjrq19wdzm2ixiszlk7j1v1k9sjz4la07h5bvfj"; + modSha256 = "0fc9m1qb8innypc8cxzbqyrfkawawyaqq3gqy7lqwmyh32f300jh"; meta = with stdenv.lib; { description = "aerc is an email client for your terminal"; diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index 9642c54a26a15..9f641061bd86c 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -14,7 +14,7 @@ assert iceSupport -> zeroc_ice != null; with stdenv.lib; let - generic = overrides: source: stdenv.mkDerivation (source // overrides // { + generic = overrides: source: (if source.qtVersion == 5 then qt5.mkDerivation else stdenv.mkDerivation) (source // overrides // { name = "${overrides.type}-${source.version}"; patches = (source.patches or []) ++ optional jackSupport ./mumble-jack-support.patch; @@ -26,7 +26,7 @@ let # protobuf is freezed to 3.6 because of this bug: https://github.com/mumble-voip/mumble/issues/3617 # this could be reverted to the latest version in a future release of mumble as it is already fixed in master buildInputs = [ boost protobuf3_6 avahi ] - ++ { qt4 = [ qt4 ]; qt5 = [ qt5.qtbase ]; }."qt${toString source.qtVersion}" + ++ optional (source.qtVersion == 4) qt4 ++ (overrides.buildInputs or [ ]); qmakeFlags = [ @@ -45,20 +45,23 @@ let ++ (overrides.configureFlags or [ ]); preConfigure = '' - qmakeFlags="$qmakeFlags DEFINES+=PLUGIN_PATH=$out/lib" + qmakeFlags="$qmakeFlags DEFINES+=PLUGIN_PATH=$out/lib/mumble" patchShebangs scripts ''; makeFlags = [ "release" ]; installPhase = '' - mkdir -p $out/{lib,bin} - find release -type f -not -name \*.\* -exec cp {} $out/bin \; - find release -type f -name \*.\* -exec cp {} $out/lib \; + runHook preInstall + ${overrides.installPhase} + + # doc stuff mkdir -p $out/share/man/man1 - cp man/mum* $out/share/man/man1 - '' + (overrides.installPhase or ""); + install -Dm644 man/mum* $out/share/man/man1/ + + runHook postInstall + ''; enableParallelBuilding = true; @@ -74,7 +77,7 @@ let client = source: generic { type = "mumble"; - nativeBuildInputs = optionals (source.qtVersion == 5) [ qt5.qttools ]; + nativeBuildInputs = optional (source.qtVersion == 5) qt5.qttools; buildInputs = [ libopus libsndfile speex ] ++ optional (source.qtVersion == 5) qt5.qtsvg ++ optional stdenv.isLinux alsaLib @@ -89,12 +92,19 @@ let NIX_CFLAGS_COMPILE = optional speechdSupport "-I${speechd}/include/speech-dispatcher"; installPhase = '' - mkdir -p $out/share/applications - cp scripts/mumble.desktop $out/share/applications - - mkdir -p $out/share/icons{,/hicolor/scalable/apps} - cp icons/mumble.svg $out/share/icons - ln -s $out/share/icons/mumble.svg $out/share/icons/hicolor/scalable/apps + # bin stuff + install -Dm755 release/mumble $out/bin/mumble + install -Dm755 scripts/mumble-overlay $out/bin/mumble-overlay + + # lib stuff + mkdir -p $out/lib/mumble + cp -P release/libmumble.so* $out/lib + cp -P release/libcelt* $out/lib/mumble + cp -P release/plugins/* $out/lib/mumble + + # icons + install -Dm644 scripts/mumble.desktop $out/share/applications/mumble.desktop + install -Dm644 icons/mumble.svg $out/share/icons/hicolor/scalable/apps/mumble.svg ''; } source; @@ -110,6 +120,11 @@ let ]; buildInputs = [ libcap ] ++ optional iceSupport zeroc_ice; + + installPhase = '' + # bin stuff + install -Dm755 release/murmurd $out/bin/murmurd + ''; }; stableSource = rec { @@ -138,26 +153,24 @@ let ]; }; - gitSource = rec { - version = "2019-07-10"; + rcSource = rec { + version = "1.3.0-rc2"; qtVersion = 5; # Needs submodules src = fetchFromGitHub { owner = "mumble-voip"; repo = "mumble"; - rev = "41b265584654c7ac216fd3ccb9c141734d3f839b"; + rev = version; sha256 = "00irlzz5q4drmsfbwrkyy7p7w8a5fc1ip5vyicq3g3cy58dprpqr"; fetchSubmodules = true; }; }; in { mumble = client stableSource; - mumble_git = client gitSource; + mumble_rc = client rcSource; murmur = server stableSource; - murmur_git = (server gitSource).overrideAttrs (old: { + murmur_rc = (server rcSource).overrideAttrs (old: { meta = old.meta // { broken = iceSupport; }; - - nativeBuildInputs = old.nativeBuildInputs or [] ++ [ qt5.wrapQtAppsHook ]; }); } diff --git a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix index 060de50f9b792..316b664c07058 100644 --- a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pythonPackages, gettext, git }: +{ stdenv, fetchFromGitHub, pythonPackages, gettext, git, qt5 }: let inherit (pythonPackages) buildPythonApplication pyqt5 sip pyinotify; @@ -16,9 +16,16 @@ in buildPythonApplication rec { buildInputs = [ git gettext ]; propagatedBuildInputs = [ pyqt5 sip pyinotify ]; + nativeBuildInputs = [ qt5.wrapQtAppsHook ]; doCheck = false; + postFixup = '' + wrapQtApp bin/git-cola + wrapQtApp bin/git-dag + + ''; + meta = with stdenv.lib; { homepage = https://github.com/git-cola/git-cola; description = "A sleek and powerful Git GUI"; diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 748e473be3dd6..378a272dbf637 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -8,13 +8,13 @@ with stdenv.lib; buildGoPackage rec { pname = "gitea"; - version = "1.8.3"; + version = "1.9.0"; src = fetchFromGitHub { owner = "go-gitea"; repo = "gitea"; rev = "v${version}"; - sha256 = "1q3wslf9s4dg7h1f41rh9rb7qlbsqz8k3xffmlzdbbgfdrm7sym1"; + sha256 = "1z7rkhxkymv7rgc7blh9ps5sqrgl4sryf0rqcp16nh9n5snfm1rm"; # Required to generate the same checksum on MacOS due to unicode encoding differences # More information: https://github.com/NixOS/nixpkgs/pull/48128 extraPostFetch = '' diff --git a/pkgs/applications/video/k9copy/default.nix b/pkgs/applications/video/k9copy/default.nix index 1e8883eae7ffa..02a0f275f570e 100644 --- a/pkgs/applications/video/k9copy/default.nix +++ b/pkgs/applications/video/k9copy/default.nix @@ -56,5 +56,8 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ flosse ]; platforms = stdenv.lib.platforms.unix; + # TODO: The software is deprecated and the build is broken, see: + # https://github.com/NixOS/nixpkgs/pull/63260#issuecomment-503506487 + broken = true; }; } diff --git a/pkgs/applications/video/makemkv/builder.sh b/pkgs/applications/video/makemkv/builder.sh deleted file mode 100644 index 416d5c0f0b073..0000000000000 --- a/pkgs/applications/video/makemkv/builder.sh +++ /dev/null @@ -1,40 +0,0 @@ -source $stdenv/setup -set -x - -lib=" \ - makemkv-oss-${ver}/out/libdriveio.so.0 \ - makemkv-oss-${ver}/out/libmakemkv.so.1 \ - makemkv-oss-${ver}/out/libmmbd.so.0 \ - " - -bin=" \ - makemkv-oss-${ver}/out/makemkv \ - makemkv-bin-${ver}/bin/amd64/makemkvcon \ - " - -tar xzf ${src_bin} -tar xzf ${src_oss} - -( - cd makemkv-oss-${ver} - ./configure --prefix=$out - make -) - -chmod +x ${bin} - -libPath="${libPath}:${out}/lib" # XXX: der. This should be in the nix file? - -for i in ${bin} ; do - patchelf \ - --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath $libPath \ - ${i} -done - -mkdir -p $out/bin -mkdir -p $out/lib -mkdir -p $out/share/MakeMKV -cp ${lib} ${out}/lib -cp ${bin} ${out}/bin -cp makemkv-bin-${ver}/src/share/* $out/share/MakeMKV diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index f9b5c4c019656..f3d8b4ae569be 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -1,34 +1,45 @@ -{ stdenv, fetchurl -, openssl, qt5, libGLU_combined, zlib, pkgconfig, libav +{ stdenv, mkDerivation, fetchurl, autoPatchelfHook +, ffmpeg, openssl, qtbase, zlib, pkgconfig }: -stdenv.mkDerivation rec { - name = "makemkv-${ver}"; - ver = "1.14.4"; - builder = ./builder.sh; - +let + version = "1.14.4"; # Using two URLs as the first one will break as soon as a new version is released src_bin = fetchurl { urls = [ - "http://www.makemkv.com/download/makemkv-bin-${ver}.tar.gz" - "http://www.makemkv.com/download/old/makemkv-bin-${ver}.tar.gz" + "http://www.makemkv.com/download/makemkv-bin-${version}.tar.gz" + "http://www.makemkv.com/download/old/makemkv-bin-${version}.tar.gz" ]; sha256 = "0vmmvldmwmq9g202abblj6l15kb8z3b0c6mcc03f30s2yci6ij33"; }; - src_oss = fetchurl { urls = [ - "http://www.makemkv.com/download/makemkv-oss-${ver}.tar.gz" - "http://www.makemkv.com/download/old/makemkv-oss-${ver}.tar.gz" + "http://www.makemkv.com/download/makemkv-oss-${version}.tar.gz" + "http://www.makemkv.com/download/old/makemkv-oss-${version}.tar.gz" ]; sha256 = "0n1nlq17dxcbgk9xqf7nv6zykvh91yhsjqdhq55947wc11fxjqa0"; }; +in mkDerivation { + pname = "makemkv"; + inherit version; + + srcs = [ src_bin src_oss ]; + + sourceRoot = "makemkv-oss-${version}"; + + nativeBuildInputs = [ autoPatchelfHook pkgconfig ]; + + buildInputs = [ ffmpeg openssl qtbase zlib ]; + + installPhase = '' + runHook preInstall - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [openssl qt5.qtbase libGLU_combined zlib libav]; + install -Dm555 -t $out/bin out/makemkv ../makemkv-bin-${version}/bin/amd64/makemkvcon + install -D -t $out/lib out/lib{driveio,makemkv,mmbd}.so.* + install -D -t $out/share/MakeMKV ../makemkv-bin-${version}/src/share/* - libPath = stdenv.lib.makeLibraryPath [stdenv.cc.cc openssl libGLU_combined qt5.qtbase zlib ] - + ":" + stdenv.cc.cc + "/lib64"; + runHook postInstall + ''; meta = with stdenv.lib; { description = "Convert blu-ray and dvd to mkv"; diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 0990062bf0224..983bdff106ed4 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -1,4 +1,5 @@ { config, stdenv +, mkDerivation , fetchFromGitHub , cmake , fdk_aac @@ -34,7 +35,7 @@ let optional = stdenv.lib.optional; -in stdenv.mkDerivation rec { +in mkDerivation rec { name = "obs-studio-${version}"; version = "23.2.1"; |