diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2018-09-04 13:06:45 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2018-09-04 13:06:45 +0200 |
commit | 1428d00aa4a58095ba510145eb25233591ac6051 (patch) | |
tree | b4f73764acaeb3c21a70a9c57cca55e59681515c /pkgs/applications | |
parent | e3ee9c098a64deb30e8d9edb180e613b93046f45 (diff) | |
parent | 6767396e380b39128e5decf30d6cb87481a75490 (diff) | |
download | nixlib-1428d00aa4a58095ba510145eb25233591ac6051.tar nixlib-1428d00aa4a58095ba510145eb25233591ac6051.tar.gz nixlib-1428d00aa4a58095ba510145eb25233591ac6051.tar.bz2 nixlib-1428d00aa4a58095ba510145eb25233591ac6051.tar.lz nixlib-1428d00aa4a58095ba510145eb25233591ac6051.tar.xz nixlib-1428d00aa4a58095ba510145eb25233591ac6051.tar.zst nixlib-1428d00aa4a58095ba510145eb25233591ac6051.zip |
Merge branch 'master' into staging-next
Hydra: ?compare=1477053
Diffstat (limited to 'pkgs/applications')
33 files changed, 310 insertions, 111 deletions
diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index ffaa94575275..2256fa1893db 100644 --- a/pkgs/applications/audio/lollypop/default.nix +++ b/pkgs/applications/audio/lollypop/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { gobjectIntrospection meson ninja + python36Packages.python pkgconfig wrapGAppsHook wrapPython diff --git a/pkgs/applications/audio/pulseeffects/default.nix b/pkgs/applications/audio/pulseeffects/default.nix index 0949611224df..46d4f971420a 100644 --- a/pkgs/applications/audio/pulseeffects/default.nix +++ b/pkgs/applications/audio/pulseeffects/default.nix @@ -4,6 +4,7 @@ , ninja , pkgconfig , itstool +, python3 , libxml2 , desktop-file-utils , wrapGAppsHook @@ -58,6 +59,7 @@ in stdenv.mkDerivation rec { pkgconfig libxml2 itstool + python3 desktop-file-utils wrapGAppsHook ]; diff --git a/pkgs/applications/audio/sayonara/default.nix b/pkgs/applications/audio/sayonara/default.nix index 1bf1a8b2c49e..fbe90c5377df 100644 --- a/pkgs/applications/audio/sayonara/default.nix +++ b/pkgs/applications/audio/sayonara/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, cmake, qt5, zlib, taglib, pkgconfig, pcre, gst_all_1 }: let - version = "1.0.0-git5-20180115"; + version = "1.1.1-git1-20180828"; in stdenv.mkDerivation { name = "sayonara-player-${version}"; src = fetchurl { url = "https://sayonara-player.com/sw/sayonara-player-${version}.tar.gz"; - sha256 = "1fl7zplnrrvbv1xm4g348bpd46jj39jvbm808hyjjq92i64wqg37"; + sha256 = "0rvy47qvavrp03zjdrw025dmq9fq5aaii3q1qq8b94byarl0c5kn"; }; nativeBuildInputs = [ cmake pkgconfig ]; @@ -39,7 +39,7 @@ stdenv.mkDerivation { { description = "Sayonara music player"; homepage = https://sayonara-player.com/; license = licenses.gpl3; - platforms = qt5.qtbase.meta.platforms; + platforms = platforms.linux; maintainers = [ maintainers.deepfire ]; }; } diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index cd031ce5ac8c..23e0584cb7f0 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -31,9 +31,10 @@ , stdenv , unzip , which -, writeTextFile +, runCommand , xkeyboard_config , zlib +, makeDesktopItem }: let @@ -113,6 +114,17 @@ let ''; }; + desktopItem = makeDesktopItem { + name = drvName; + exec = pname; + icon = drvName; + desktopName = "Android Studio (${channel} channel)"; + comment = "The official Android IDE"; + categories = "Development;IDE;"; + startupNotify = "true"; + extraEntries="StartupWMClass=jetbrains-studio"; + }; + # Android Studio downloads prebuilt binaries as part of the SDK. These tools # (e.g. `mksdcard`) have `/lib/ld-linux.so.2` set as the interpreter. An FHS # environment is used as a work around for that. @@ -120,18 +132,15 @@ let name = "${drvName}-fhs-env"; multiPkgs = pkgs: [ pkgs.ncurses5 ]; }; - -in - writeTextFile { - name = "${drvName}-wrapper"; - # TODO: Rename preview -> beta (and add -stable suffix?): - destination = "/bin/${pname}"; - executable = true; - text = '' +in runCommand + "${drvName}-wrapper" + { + startScript = '' #!${bash}/bin/bash ${fhsEnv}/bin/${drvName}-fhs-env ${androidStudio}/bin/studio.sh ''; - } // { + preferLocalBuild = true; + allowSubstitutes = false; meta = with stdenv.lib; { description = "The Official IDE for Android (${channel} channel)"; longDescription = '' @@ -146,3 +155,12 @@ in maintainers = with maintainers; [ primeos ]; }; } + '' + mkdir -p $out/{bin,share/pixmaps} + + # TODO: Rename preview -> beta (and add -stable suffix?): + echo -n "$startScript" > $out/bin/${pname} + chmod +x $out/bin/${pname} + ln -s ${androidStudio}/bin/studio.png $out/share/pixmaps/${drvName}.png + ln -s ${desktopItem}/share/applications $out/share/applications + '' diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index bec845b815ce..addae2674684 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -146,6 +146,12 @@ self: (attrs.nativeBuildInputs or []) ++ [ external.git ]; }); + magit-todos = super.magit-todos.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + # missing OCaml merlin = markBroken super.merlin; diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix index 61086b96230e..98927cbd9873 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix @@ -151,6 +151,12 @@ self: (attrs.nativeBuildInputs or []) ++ [ external.git ]; }); + magit-todos = super.magit-todos.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + # missing OCaml merlin = markBroken super.merlin; diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix index db2d07db31e7..6fcf9d7d3a9d 100644 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -52,6 +52,7 @@ in stdenv.mkDerivation { meson ninja pkgconfig + python3 python3.pkgs.wrapPython wrapGAppsHook ]; diff --git a/pkgs/applications/graphics/gcolor3/default.nix b/pkgs/applications/graphics/gcolor3/default.nix index 09d1a86db8e3..cd43cd2fe723 100644 --- a/pkgs/applications/graphics/gcolor3/default.nix +++ b/pkgs/applications/graphics/gcolor3/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub, gnome3, libtool, intltool, pkgconfig, gtk3, hicolor-icon-theme, wrapGAppsHook } : +{ stdenv, fetchFromGitHub, fetchpatch, gnome3, meson, ninja, gettext, pkgconfig, libxml2, gtk3, hicolor-icon-theme, wrapGAppsHook }: let - version = "2.2"; + version = "2.3"; in stdenv.mkDerivation { name = "gcolor3-${version}"; @@ -9,23 +9,35 @@ in stdenv.mkDerivation { owner = "hjdskes"; repo = "gcolor3"; rev = "v${version}"; - sha256 = "1rbahsi33pfggpj5cigy6wy5333g3rpm8v2q0b35c6m7pwhmf2gr"; + sha256 = "186j72kwsqdcakvdik9jl18gz3csdj53j3ylwagr9gfwmy0nmyjb"; }; - nativeBuildInputs = [ gnome3.gnome-common libtool intltool pkgconfig hicolor-icon-theme wrapGAppsHook ]; + patches = [ + # Fix darwin build + (fetchpatch { + url = https://github.com/Hjdskes/gcolor3/commit/9130ffeff091fbafff6a0c8f06b09f54657d5dfd.patch; + sha256 = "1kn5hx536wivafb4awg7lsa8h32njy0lynmn7ci9y78dlp54057r"; + }) + (fetchpatch { + url = https://github.com/Hjdskes/gcolor3/commit/8d89081a8e13749f5a9051821114bc5fe814eaf3.patch; + sha256 = "1ldyr84dl2g6anqkp2mpxsrcr41fcqwi6ck14rfhai7rgrm8yar3"; + }) + ]; - buildInputs = [ gtk3 ]; + nativeBuildInputs = [ meson ninja gettext pkgconfig libxml2 wrapGAppsHook ]; - configureScript = "./autogen.sh"; + buildInputs = [ gtk3 hicolor-icon-theme ]; - # clang-4.0: error: argument unused during compilation: '-pthread' - NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.cc.isClang "-Wno-error=unused-command-line-argument"; + postPatch = '' + chmod +x meson_install.sh # patchShebangs requires executable file + patchShebangs meson_install.sh + ''; - meta = { + meta = with stdenv.lib; { description = "A simple color chooser written in GTK3"; homepage = https://hjdskes.github.io/projects/gcolor3/; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ jtojnar ]; - platforms = stdenv.lib.platforms.unix; + license = licenses.gpl2; + maintainers = with maintainers; [ jtojnar ]; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/graphics/imgcat/default.nix b/pkgs/applications/graphics/imgcat/default.nix index ad2cb4198d2d..a98029dd5807 100644 --- a/pkgs/applications/graphics/imgcat/default.nix +++ b/pkgs/applications/graphics/imgcat/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "imgcat-${version}"; version = "2.3.0"; - buildTools = [ autoconf automake libtool ncurses ]; + buildInputs = [ autoconf automake libtool ncurses ]; preConfigure = '' ${autoconf}/bin/autoconf diff --git a/pkgs/applications/graphics/imv/default.nix b/pkgs/applications/graphics/imv/default.nix index e9a0dccd30a9..9def3f16ad03 100644 --- a/pkgs/applications/graphics/imv/default.nix +++ b/pkgs/applications/graphics/imv/default.nix @@ -1,25 +1,32 @@ -{ stdenv, fetchgit, SDL2, SDL2_ttf, freeimage, fontconfig }: +{ stdenv, fetchFromGitHub, SDL2, SDL2_ttf +, freeimage, fontconfig, pkgconfig +, asciidoc, docbook_xsl, libxslt, cmocka +}: stdenv.mkDerivation rec { name = "imv-${version}"; - version = "2.1.3"; + version = "3.0.0"; - src = fetchgit { - url = "https://github.com/eXeC64/imv.git"; - rev = "e59d0e9e120f1dbde9ab068748a190e93978e5b7"; - sha256 = "0j48dk1bcbh5541522qkn487637wcx104zckrnxa5g3nirfqa7r7"; + src = fetchFromGitHub { + owner = "eXeC64"; + repo = "imv"; + rev = "v${version}"; + sha256 = "0j5aykdkm1g518ism5y5flhwxvjvl92ksq989fhl2wpnv0la82jp"; }; - buildInputs = [ SDL2 SDL2_ttf freeimage fontconfig ]; + buildInputs = [ + SDL2 SDL2_ttf freeimage fontconfig pkgconfig + asciidoc docbook_xsl libxslt cmocka + ]; - configurePhase = "substituteInPlace Makefile --replace /usr $out"; + installFlags = [ "PREFIX=$(out)" "CONFIGPREFIX=$(out)/etc" ]; meta = with stdenv.lib; { description = "A command line image viewer for tiling window managers"; homepage = https://github.com/eXeC64/imv; license = licenses.gpl2; maintainers = with maintainers; [ rnhmjoj ]; - platforms = platforms.unix; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/graphics/photoflow/default.nix b/pkgs/applications/graphics/photoflow/default.nix index ffef558e84dd..6f3bf69889c5 100644 --- a/pkgs/applications/graphics/photoflow/default.nix +++ b/pkgs/applications/graphics/photoflow/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, gettext, glib, libxml2, pkgconfig, swig, automake, gobjectIntrospection, cmake, ninja, libtiff, libjpeg, fftw, exiv2, lensfun, gtkmm2, libraw, lcms2, libexif, vips, expat, pcre, pugixml }: stdenv.mkDerivation { - name = "photoflow-unstable-2018-03-06"; + name = "photoflow-unstable-2018-08-28"; src = fetchFromGitHub { owner = "aferrero2707"; repo = "PhotoFlow"; - rev = "f9bbea183fa02412d1d17075955d2284eeaf8174"; - sha256 = "1fsk7kdmlkd64wcswbxrl87aqwmzqak6p3s38ggxzx2h51fa7lmf"; + rev = "df03f2538ddd232e693c307db4ab63eb5bdfea38"; + sha256 = "08ybhv08h24y4li8wb4m89xgrz1szlwpksf6vjharp8cznn4y4x9"; }; nativeBuildInputs = [ @@ -50,6 +50,7 @@ stdenv.mkDerivation { homepage = https://aferrero2707.github.io/PhotoFlow/; license = licenses.gpl3Plus; maintainers = [ maintainers.MtP ]; - platforms = platforms.all; + platforms = platforms.linux; + broken = stdenv.isAarch64; }; } diff --git a/pkgs/applications/misc/fbreader/default.nix b/pkgs/applications/misc/fbreader/default.nix index 6fa34a008e77..548966764fe6 100644 --- a/pkgs/applications/misc/fbreader/default.nix +++ b/pkgs/applications/misc/fbreader/default.nix @@ -1,38 +1,68 @@ -{ stdenv, fetchurl, pkgconfig, bzip2, curl, expat, fribidi -, libunibreak, qt4, sqlite, zlib }: +{ stdenv, fetchFromGitHub, pkgconfig +, bzip2, curl, expat, fribidi, libunibreak, sqlite, zlib +, uiTarget ? if !stdenv.isDarwin then "desktop" else "macosx" +, uiType ? if !stdenv.isDarwin then "qt4" else "cocoa" +, qt4, gtk2 +, AppKit, Cocoa +}: + +with stdenv.lib; + +assert elem uiTarget [ "desktop" "macosx" ]; +assert elem uiType [ "qt4" "gtk" "cocoa" ]; +assert uiTarget == "macosx" -> uiType == "cocoa"; + +# Note: "qt" uiType option mentioned in ${src}/README.build is qt3, +# which is way to old and no longer in nixpkgs. stdenv.mkDerivation { - name = "fbreader-0.99.4"; + name = "fbreader-${uiType}-0.99.6"; - src = fetchurl { - url = https://fbreader.org/files/desktop/fbreader-sources-0.99.4.tgz; - sha256 = "1sdq3vvwkq4bkyrvh0p884d66gaddz8hlab3m798ji9ixbak2z1x"; + src = fetchFromGitHub { + owner = "geometer"; + repo = "FBReader"; + rev = "9e608db14372ae580beae4976eec7241fa069e75"; + sha256 = "0lzafk02mv0cf2l2a61q5y4743zi913byik4bw1ix0gr1drnsa7y"; }; + patches = [ ./typecheck.patch ]; + + postPatch = '' + cat << EOF > makefiles/target.mk + TARGET_ARCH = ${uiTarget} + TARGET_STATUS = release + UI_TYPE = ${uiType} + EOF + + substituteInPlace makefiles/arch/desktop.mk \ + --replace ccache "" \ + --replace moc-qt4 moc + + # libunibreak supersedes liblinebreak + substituteInPlace zlibrary/text/Makefile \ + --replace -llinebreak -lunibreak + ''; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ - bzip2 curl expat fribidi libunibreak - qt4 sqlite zlib - ]; + bzip2 curl expat fribidi libunibreak sqlite zlib + ] + ++ optional (uiType == "qt4") qt4 + ++ optional (uiType == "gtk") gtk2 + ++ optionals (uiType == "cocoa") [ AppKit Cocoa ]; makeFlags = "INSTALLDIR=$(out)"; NIX_CFLAGS_COMPILE = [ "-Wno-error=narrowing" ]; # since gcc-6 - patchPhase = '' - # don't try to use ccache - substituteInPlace makefiles/arch/desktop.mk \ - --replace "CCACHE = " "# CCACHE = " - - substituteInPlace fbreader/desktop/Makefile \ - --replace "/usr/share" "$out/share" - ''; - meta = with stdenv.lib; { description = "An e-book reader for Linux"; homepage = http://www.fbreader.org/; license = licenses.gpl3; - platforms = platforms.linux; # possibly also on unix general + broken = stdenv.isDarwin # untested, might work + || uiType == "gtk"; # builds, but the result is unusable, hangs a lot + platforms = platforms.unix; maintainers = [ maintainers.coroa ]; - }; + }; } diff --git a/pkgs/applications/misc/fbreader/typecheck.patch b/pkgs/applications/misc/fbreader/typecheck.patch new file mode 100644 index 000000000000..cbac290e69c2 --- /dev/null +++ b/pkgs/applications/misc/fbreader/typecheck.patch @@ -0,0 +1,11 @@ +diff --git a/fbreader/src/database/booksdb/BooksDB.cpp b/fbreader/src/database/booksdb/BooksDB.cpp +index e33a22e76..1b6092800 100644 +--- a/fbreader/src/database/booksdb/BooksDB.cpp ++++ b/fbreader/src/database/booksdb/BooksDB.cpp +@@ -146,5 +146,5 @@ shared_ptr<Book> BooksDB::loadBook(const std::string &fileName) { + myFindFileId->setFileName(fileName); + if (!myFindFileId->run()) { +- return false; ++ return 0; + } + ((DBIntValue&)*myLoadBook->parameter("@file_id").value()) = myFindFileId->fileId(); diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index ed0dd3ba5be3..33ffb6b5acb3 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -2,29 +2,34 @@ stdenv.mkDerivation rec { name = "gpxsee-${version}"; - version = "4.19"; + version = "5.17"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - sha256 = "1xjf2aawf633c1ydhpcsjhdlfkjkfsjbcgjd737xpfv1wjz99l4l"; + sha256 = "0fr835glvwnpq6sy181z0gskvwfrmvh7115r3d92xy71v8b1l5ib"; }; - nativeBuildInputs = [ qmake qttools ]; + nativeBuildInputs = [ qmake ]; + buildInputs = [ qttools ]; preConfigure = '' substituteInPlace src/config.h --replace /usr/share/gpxsee $out/share/gpxsee lrelease lang/*.ts ''; - preFixup = '' + installPhase = '' install -Dm755 GPXSee $out/bin/GPXSee - mkdir -p $out/share/gpxsee - cp pkg/maps.txt $out/share/gpxsee + cp -r pkg/csv $out/share/gpxsee/ + cp -r pkg/maps $out/share/gpxsee/ + mkdir -p $out/share/gpxsee/translations + cp -r lang/*.qm $out/share/gpxsee/translations ''; + enableParallelBuilding = true; + meta = with stdenv.lib; { homepage = http://www.gpxsee.org/; description = "GPX viewer and analyzer"; diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix index d3fff65a3995..c34167b4ddb8 100644 --- a/pkgs/applications/misc/kitty/default.nix +++ b/pkgs/applications/misc/kitty/default.nix @@ -26,6 +26,8 @@ buildPythonApplication rec { nativeBuildInputs = [ pkgconfig which sphinx ]; + outputs = [ "out" "terminfo" ]; + postPatch = '' substituteInPlace kitty/utils.py \ --replace "find_library('startup-notification-1')" "'${libstartup_notification}/lib/libstartup-notification-1.so'" @@ -47,11 +49,19 @@ buildPythonApplication rec { runHook postInstall ''; + postInstall = '' + mkdir -p $terminfo/share + mv $out/share/terminfo $terminfo/share/terminfo + + mkdir -p $out/nix-support + echo "$terminfo" >> $out/nix-support/propagated-user-env-packages + ''; + meta = with stdenv.lib; { homepage = https://github.com/kovidgoyal/kitty; description = "A modern, hackable, featureful, OpenGL based terminal emulator"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ tex ]; + maintainers = with maintainers; [ tex rvolosatovs ]; }; } diff --git a/pkgs/applications/misc/sequeler/default.nix b/pkgs/applications/misc/sequeler/default.nix index 35242822d4a0..cc676bb28e2e 100644 --- a/pkgs/applications/misc/sequeler/default.nix +++ b/pkgs/applications/misc/sequeler/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub -, meson, ninja, pkgconfig, vala, gobjectIntrospection, gettext, wrapGAppsHook, desktop-file-utils +, meson, ninja, pkgconfig, vala, gobjectIntrospection, gettext, wrapGAppsHook, python3, desktop-file-utils , gtk3, glib, granite, libgee, libgda, gtksourceview, libxml2, libsecret }: @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { sha256 = "04x3fg665201g3zy66sicfna4vac4n1pmrahbra90gvfzaia1cai"; }; - nativeBuildInputs = [ meson ninja pkgconfig vala gobjectIntrospection gettext wrapGAppsHook desktop-file-utils ]; + nativeBuildInputs = [ meson ninja pkgconfig vala gobjectIntrospection gettext wrapGAppsHook python3 desktop-file-utils ]; buildInputs = [ gtk3 glib granite libgee sqlGda gtksourceview libxml2 libsecret ]; diff --git a/pkgs/applications/misc/tootle/default.nix b/pkgs/applications/misc/tootle/default.nix index b2aab54c1047..d15b8111fb0b 100644 --- a/pkgs/applications/misc/tootle/default.nix +++ b/pkgs/applications/misc/tootle/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub -, meson, ninja, pkgconfig +, meson, ninja, pkgconfig, python3 , gnome3, vala, gobjectIntrospection, wrapGAppsHook , gtk3, granite , json-glib, glib, glib-networking @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { sha256 = "022h1rh1jk3m1f9al0s1rylmnqnkydyc81idfc8jf1g0frnvn5i6"; }; - nativeBuildInputs = [ meson ninja pkgconfig vala gobjectIntrospection wrapGAppsHook ]; + nativeBuildInputs = [ meson ninja pkgconfig python3 vala gobjectIntrospection wrapGAppsHook ]; buildInputs = [ gtk3 granite json-glib glib glib-networking gnome3.libgee gnome3.libsoup gnome3.gsettings-desktop-schemas diff --git a/pkgs/applications/networking/corebird/default.nix b/pkgs/applications/networking/corebird/default.nix index 56947d6650e4..5dd4cbb52c2a 100644 --- a/pkgs/applications/networking/corebird/default.nix +++ b/pkgs/applications/networking/corebird/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, glib, gtk3, json-glib, sqlite, libsoup, gettext, vala_0_40 , meson, ninja, pkgconfig, gnome3, gst_all_1, wrapGAppsHook, gobjectIntrospection -, glib-networking }: +, glib-networking, python3 }: stdenv.mkDerivation rec { version = "1.7.4"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - meson ninja vala_0_40 pkgconfig wrapGAppsHook + meson ninja vala_0_40 pkgconfig wrapGAppsHook python3 gobjectIntrospection # for setup hook ]; diff --git a/pkgs/applications/networking/feedreaders/feedreader/default.nix b/pkgs/applications/networking/feedreaders/feedreader/default.nix index d2991c3ba1c9..158b02cff5b9 100644 --- a/pkgs/applications/networking/feedreaders/feedreader/default.nix +++ b/pkgs/applications/networking/feedreaders/feedreader/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, vala_0_40, gettext +{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, vala_0_40, gettext, python3 , appstream-glib, desktop-file-utils, glibcLocales, wrapGAppsHook , curl, glib, gnome3, gst_all_1, json-glib, libnotify, libsecret, sqlite }: @@ -18,7 +18,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ meson ninja pkgconfig vala_0_40 gettext appstream-glib desktop-file-utils - glibcLocales wrapGAppsHook + python3 glibcLocales wrapGAppsHook ]; buildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix b/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix index 9ec9a3451bef..163f0ba3f497 100644 --- a/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix +++ b/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, boost }: +{ stdenv, fetchFromGitHub, cmake, boost166 }: stdenv.mkDerivation rec { name = "SkypeExport-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ boost ]; + buildInputs = [ boost166 ]; preConfigure = "cd src/SkypeExport/_gccbuild/linux"; installPhase = "install -Dt $out/bin SkypeExport"; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix index a6d893fd95a4..d4a26a266c30 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix @@ -1,30 +1,32 @@ -{ stdenv, fetchgit, pkgconfig, pidgin, json-glib, glib, http-parser } : +{ stdenv, fetchgit, pkgconfig, pidgin, json-glib, glib, http-parser, sqlite, olm, libgcrypt } : let - version = "2016-07-11"; + version = "2018-08-03"; in stdenv.mkDerivation rec { name = "purple-matrix-unstable-${version}"; src = fetchgit { url = "https://github.com/matrix-org/purple-matrix"; - rev = "f9d36198a57de1cd1740a3ae11c2ad59b03b724a"; - sha256 = "1mmyvc70gslniphmcpk8sfl6ylik6dnprqghx4n47gsj1sb1cy00"; + rev = "5a7166a3f54f85793c6b60662f8d12196aeaaeb0"; + sha256 = "0ph0s24b37d1c50p8zbzgf4q2xns43a8v6vk85iz633wdd72zsa0"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ pidgin json-glib glib http-parser ]; + buildInputs = [ pidgin json-glib glib http-parser sqlite olm libgcrypt ]; - installPhase = '' - install -Dm755 -t $out/lib/pidgin/ libmatrix.so - for size in 16 22 48; do - install -TDm644 matrix-"$size"px.png $out/pixmaps/pidgin/protocols/$size/matrix.png - done - ''; + hardeningDisable = [ "fortify" ]; # upstream compiles with -O0 - meta = { + makeFlags = [ + "DESTDIR=$(out)" + "PLUGIN_DIR_PURPLE=/lib/pidgin/" + "DATA_ROOT_DIR_PURPLE=/share" + ]; + + meta = with stdenv.lib; { homepage = https://github.com/matrix-org/purple-matrix; description = "Matrix support for Pidgin / libpurple"; - license = stdenv.lib.licenses.gpl2; + license = licenses.gpl2; + maintainers = with maintainers; [ symphorien ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix index 7c6f33935dc0..0fdd8dfb4bd3 100644 --- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix @@ -1,24 +1,24 @@ { stdenv, fetchFromGitHub, cmake , qt5, libidn, qca2-qt5, libXScrnSaver, hunspell -, libgcrypt, libotr, html-tidy, libgpgerror +, libgcrypt, libotr, html-tidy, libgpgerror, libsignal-protocol-c }: stdenv.mkDerivation rec { name = "psi-plus-${version}"; - version = "1.2.235"; + version = "1.3.410"; src = fetchFromGitHub { owner = "psi-plus"; repo = "psi-plus-snapshots"; rev = "${version}"; - sha256 = "0rc65gs6m3jxg407r99kikdylvrar5mq7x5m66ma604yk5igwg47"; + sha256 = "02m984z2dfmlx522q9x1z0aalvi2mi48s5ghhs80hr5afnfyc5w6"; }; resources = fetchFromGitHub { owner = "psi-plus"; repo = "resources"; - rev = "8f5038380e1be884b04b5a1ad3cc3385e793f668"; - sha256 = "1b8a2aixg966fzjwp9hz51rc31imyvpx014mp2fsm47k8na4470d"; + rev = "c0bfb8a025eeec82cd0a23a559e0aa3da15c3ec3"; + sha256 = "1q7v01w085vk7ml6gwis7j409w6f5cplpm7c0ajs4i93c4j53xdf"; }; postUnpack = '' @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { buildInputs = [ qt5.qtbase qt5.qtmultimedia qt5.qtx11extras qt5.qttools qt5.qtwebkit libidn qca2-qt5 libXScrnSaver hunspell - libgcrypt libotr html-tidy libgpgerror + libgcrypt libotr html-tidy libgpgerror libsignal-protocol-c ]; enableParallelBuilding = true; @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "XMPP (Jabber) client"; maintainers = with maintainers; [ orivej ]; + license = licenses.gpl2; platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/psi/default.nix b/pkgs/applications/networking/instant-messengers/psi/default.nix index 37d9de8794e5..daa9d04cfb53 100644 --- a/pkgs/applications/networking/instant-messengers/psi/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi/default.nix @@ -22,9 +22,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { description = "Psi, an XMPP (Jabber) client"; - maintainers = [ stdenv.lib.maintainers.raskin ]; + maintainers = [ maintainers.raskin ]; + license = licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/ipfs-cluster/default.nix b/pkgs/applications/networking/ipfs-cluster/default.nix new file mode 100644 index 000000000000..33b9f6151399 --- /dev/null +++ b/pkgs/applications/networking/ipfs-cluster/default.nix @@ -0,0 +1,41 @@ +{ stdenv, buildGoPackage, fetchFromGitHub, fetchgx, gx-go }: + +buildGoPackage rec { + name = "ipfs-cluster-${version}"; + version = "0.5.0"; + rev = "v${version}"; + + goPackagePath = "github.com/ipfs/ipfs-cluster"; + + extraSrcPaths = [ + (fetchgx { + inherit name src; + sha256 = "0jwz3kd07i5fs0sxds80j8d338skhgxgxra377qxsk0cr2hhj2vm"; + }) + ]; + + src = fetchFromGitHub { + owner = "ipfs"; + repo = "ipfs-cluster"; + inherit rev; + sha256 = "132whjyplcifq8747hcdrgbc0amhp618dg049jq5nyslcxfgdypm"; + }; + + nativeBuildInputs = [ gx-go ]; + + preBuild = '' + # fetchgx stores packages by their ipfs hash + # this will rewrite github.com/ imports to gx/ipfs/ + cd go/src/${goPackagePath} + gx-go rewrite + ''; + + meta = with stdenv.lib; { + description = "Allocate, replicate, and track Pins across a cluster of IPFS daemons"; + homepage = https://cluster.ipfs.io/; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ jglukasik ]; + }; +} + diff --git a/pkgs/applications/networking/sync/casync/default.nix b/pkgs/applications/networking/sync/casync/default.nix index bea6a0780ed9..8d9b941e26e4 100644 --- a/pkgs/applications/networking/sync/casync/default.nix +++ b/pkgs/applications/networking/sync/casync/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub -, meson, ninja, pkgconfig, sphinx +, meson, ninja, pkgconfig, python3, sphinx , acl, curl, fuse, libselinux, udev, xz, zstd , fuseSupport ? true , selinuxSupport ? true @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optionals (fuseSupport) [ fuse ] ++ stdenv.lib.optionals (selinuxSupport) [ libselinux ] ++ stdenv.lib.optionals (udevSupport) [ udev ]; - nativeBuildInputs = [ meson ninja pkgconfig sphinx ]; + nativeBuildInputs = [ meson ninja pkgconfig python3 sphinx ]; checkInputs = [ glibcLocales rsync ]; postPatch = '' diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index 337c166a79ac..54d612387ac4 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "rclone-${version}"; - version = "1.42"; + version = "1.43"; goPackagePath = "github.com/ncw/rclone"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "ncw"; repo = "rclone"; rev = "v${version}"; - sha256 = "0r85d45q0jdfwcrblq1rd698cw3h6mc9h4dmlhzl982zpkncijqj"; + sha256 = "1khg5jsrjmnblv8zg0zqs1n0hmjv05pjj94m9d7jbp9d936lxsxx"; }; outputs = [ "bin" "out" "man" ]; diff --git a/pkgs/applications/networking/transporter/default.nix b/pkgs/applications/networking/transporter/default.nix index d084461a9b2d..55abd22b605c 100644 --- a/pkgs/applications/networking/transporter/default.nix +++ b/pkgs/applications/networking/transporter/default.nix @@ -5,6 +5,7 @@ , pkgconfig , granite , vala_0_40 +, python3 , gnome3 , libxml2 , gettext @@ -37,6 +38,7 @@ in stdenv.mkDerivation rec { ninja pkgconfig vala_0_40 + python3 wrapGAppsHook ]; diff --git a/pkgs/applications/science/misc/snakemake/default.nix b/pkgs/applications/science/misc/snakemake/default.nix new file mode 100644 index 000000000000..6b0570814f2b --- /dev/null +++ b/pkgs/applications/science/misc/snakemake/default.nix @@ -0,0 +1,41 @@ +{ + stdenv +, python +}: + +python.buildPythonPackage rec { + pname = "snakemake"; + version = "5.2.2"; + + propagatedBuildInputs = with python; [ + appdirs + ConfigArgParse + datrie + docutils + jsonschema + pyyaml + ratelimiter + requests + wrapt + ]; + + src = python.fetchPypi { + inherit pname version; + sha256 = "adffe7e24b4a613a9e8bf0a2a320b3cea236d86afb9132bb0bbbc08b8e35a3a3"; + }; + + doCheck = false; # Tests depend on Google Cloud credentials at ${HOME}/gcloud-service-key.json + + meta = with stdenv.lib; { + homepage = http://snakemake.bitbucket.io; + license = licenses.mit; + description = "Python-based execution environment for make-like workflows"; + longDescription = '' + Snakemake is a workflow management system that aims to reduce the complexity of + creating workflows by providing a fast and comfortable execution environment, + together with a clean and readable specification language in Python style. Snakemake + workflows are essentially Python scripts extended by declarative code to define + rules. Rules describe how to create output files from input files. + ''; + }; +} diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 592b348d03fd..c6eb563155f6 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -7,13 +7,13 @@ with stdenv.lib; buildGoPackage rec { name = "gitea-${version}"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "go-gitea"; repo = "gitea"; rev = "v${version}"; - sha256 = "0gp777x8yjbqvz9i79qv3bn3hrlp1bn7ib57r7w5a7jmr9rd0nca"; + sha256 = "06h6v9py35mm0xk9l8xrq02vvr5vzl15gfbw9qqvpn8kiamkn53r"; }; patches = [ ./static-root-path.patch ]; diff --git a/pkgs/applications/video/gnome-mpv/default.nix b/pkgs/applications/video/gnome-mpv/default.nix index 1bb77ffc4a80..75a299d46c7d 100644 --- a/pkgs/applications/video/gnome-mpv/default.nix +++ b/pkgs/applications/video/gnome-mpv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja +{ stdenv, fetchFromGitHub, meson, ninja, python3 , gettext, pkgconfig, desktop-file-utils, wrapGAppsHook , appstream-glib, epoxy, glib, gtk3, mpv }: @@ -15,13 +15,14 @@ stdenv.mkDerivation rec { sha256 = "1cjhw3kz163iwj2japhnv354i1lr112xyyfkxw82cwy2554cfim4"; }; - nativeBuildInputs = [ meson ninja appstream-glib gettext pkgconfig desktop-file-utils wrapGAppsHook ]; + nativeBuildInputs = [ meson ninja python3 appstream-glib gettext pkgconfig desktop-file-utils wrapGAppsHook ]; buildInputs = [ epoxy glib gtk3 mpv ]; enableParallelBuilding = true; postPatch = '' - patchShebangs . + patchShebangs meson_post_install.py + patchShebangs src/generate_authors.py sed -i '/gtk-update-icon-cache/s/^/#/' meson_post_install.py ''; diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index 5ca678a2e175..454665455c51 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -189,7 +189,7 @@ in stdenv.mkDerivation rec { wrapProgram $out/bin/$p \ --prefix PATH ":" "${lib.makeBinPath [ python2 glxinfo xdpyinfo ]}" \ --prefix LD_LIBRARY_PATH ":" "${lib.makeLibraryPath - [ curl systemd libmad libvdpau libcec libcec_platform rtmpdump libass ]}" + ([ curl systemd libmad libvdpau libcec libcec_platform rtmpdump libass ] ++ lib.optional nfsSupport libnfs)}" done substituteInPlace $out/share/xsessions/kodi.desktop \ diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index ef01ac4cdae3..3f0fb0e8022c 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -12,13 +12,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "mkvtoolnix-${version}"; - version = "25.0.0"; + version = "26.0.0"; src = fetchFromGitLab { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "04m57719q7q0h0gcj1b2bh8xbdcl5bijic4hw71xf9xd19a95k78"; + sha256 = "0dq0lbr6kzj455mv4z6a851n7ff3xlmsxklijiyp4drn1jf0q1pb"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix index cea85f553b5f..adb5d237f54f 100644 --- a/pkgs/applications/video/pitivi/default.nix +++ b/pkgs/applications/video/pitivi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, wrapGAppsHook +{ stdenv, fetchurl, pkgconfig, intltool, itstool, python3, wrapGAppsHook , python3Packages, gst, gtk3 , gobjectIntrospection, librsvg, gnome3, libnotify , meson, ninja @@ -43,7 +43,7 @@ in python3Packages.buildPythonApplication rec { patchShebangs ./getenvvar.py ''; - nativeBuildInputs = [ meson ninja pkgconfig intltool itstool wrapGAppsHook ]; + nativeBuildInputs = [ meson ninja pkgconfig intltool itstool python3 wrapGAppsHook ]; buildInputs = [ gobjectIntrospection gtk3 librsvg gnome3.gnome-desktop gnome3.gsound |