diff options
Diffstat (limited to 'pkgs/applications')
21 files changed, 186 insertions, 75 deletions
diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index 0b9f81533020..6c2a7d9fe334 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -26,6 +26,10 @@ let mopidy-mpd = callPackage ./mpd.nix { }; + mopidy-mpris = callPackage ./mpris.nix { }; + + mopidy-somafm = callPackage ./somafm.nix { }; + mopidy-spotify-tunigo = callPackage ./spotify-tunigo.nix { }; mopidy-youtube = callPackage ./youtube.nix { }; diff --git a/pkgs/applications/audio/mopidy/gmusic.nix b/pkgs/applications/audio/mopidy/gmusic.nix index 3dea9156f8fc..1e5e42ac2f34 100644 --- a/pkgs/applications/audio/mopidy/gmusic.nix +++ b/pkgs/applications/audio/mopidy/gmusic.nix @@ -1,19 +1,20 @@ -{ stdenv, fetchurl, pythonPackages, mopidy }: +{ stdenv, python3Packages, mopidy }: -pythonPackages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "mopidy-gmusic"; - version = "3.0.0"; + version = "4.0.0"; - src = fetchurl { - url = "https://github.com/mopidy/mopidy-gmusic/archive/v${version}.tar.gz"; - sha256 = "0a2s4xrrhnkv85rx4w5bj6ih9xm34jy0q71fdvbzmi827g9dw5sz"; + src = python3Packages.fetchPypi { + inherit version; + pname = "Mopidy-GMusic"; + sha256 = "14yswmlfs659rs3k595606m77lw9c6pjykb5pikqw21sb97haxl3"; }; propagatedBuildInputs = [ mopidy - pythonPackages.requests - pythonPackages.gmusicapi - pythonPackages.cachetools + python3Packages.requests + python3Packages.gmusicapi + python3Packages.cachetools ]; doCheck = false; diff --git a/pkgs/applications/audio/mopidy/mpris.nix b/pkgs/applications/audio/mopidy/mpris.nix new file mode 100644 index 000000000000..16fbfab380ba --- /dev/null +++ b/pkgs/applications/audio/mopidy/mpris.nix @@ -0,0 +1,27 @@ +{ stdenv, python3Packages, mopidy }: + +python3Packages.buildPythonApplication rec { + pname = "mopidy-mpris"; + version = "3.0.1"; + + src = python3Packages.fetchPypi { + inherit version; + pname = "Mopidy-MPRIS"; + sha256 = "0qk46aq5r92qgkldzl41x09naww1gv92l4c4hknyl7yymyvm9lr2"; + }; + + propagatedBuildInputs = [ + mopidy + python3Packages.pydbus + ]; + + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://www.mopidy.com/; + description = "Mopidy extension for controlling Mopidy through D-Bus using the MPRIS specification"; + license = licenses.asl20; + maintainers = [ maintainers.nickhu ]; + }; +} + diff --git a/pkgs/applications/audio/mopidy/somafm.nix b/pkgs/applications/audio/mopidy/somafm.nix new file mode 100644 index 000000000000..2e3380fa20f8 --- /dev/null +++ b/pkgs/applications/audio/mopidy/somafm.nix @@ -0,0 +1,26 @@ +{ stdenv, python3Packages, mopidy }: + +python3Packages.buildPythonApplication rec { + pname = "mopidy-somafm"; + version = "2.0.0"; + + src = python3Packages.fetchPypi { + inherit version; + pname = "Mopidy-SomaFM"; + sha256 = "1j88rrliys8hqvnb35k1xqw88bvrllcb4rb53lgh82byhscsxlf3"; + }; + + propagatedBuildInputs = [ + mopidy + ]; + + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://www.mopidy.com/; + description = "Mopidy extension for playing music from SomaFM"; + license = licenses.mit; + maintainers = [ maintainers.nickhu ]; + }; +} + diff --git a/pkgs/applications/audio/mopidy/youtube.nix b/pkgs/applications/audio/mopidy/youtube.nix index b8e22a41cabf..ac16c182a50e 100644 --- a/pkgs/applications/audio/mopidy/youtube.nix +++ b/pkgs/applications/audio/mopidy/youtube.nix @@ -1,17 +1,23 @@ -{ stdenv, fetchFromGitHub, pythonPackages, mopidy }: +{ stdenv, python3Packages, mopidy }: -pythonPackages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "mopidy-youtube"; - version = "2.0.2"; + version = "3.0"; - src = fetchFromGitHub { - owner = "mopidy"; - repo = "mopidy-youtube"; - rev = "v${version}"; - sha256 = "06r3ikyg2ch5n7fbn3sgj04hk6icpfpk1r856qch41995k3bbfg7"; + src = python3Packages.fetchPypi { + inherit version; + pname = "Mopidy-YouTube"; + sha256 = "0x1q9rfnjx65n6hi8s5rw5ff4xv55h63zy52fwm8aksdnzppr7gd"; }; - propagatedBuildInputs = with pythonPackages; [ mopidy pafy ]; + patchPhase = "sed s/bs4/beautifulsoup4/ -i setup.cfg"; + + propagatedBuildInputs = [ + mopidy + python3Packages.beautifulsoup4 + python3Packages.cachetools + python3Packages.youtube-dl + ]; doCheck = false; diff --git a/pkgs/applications/blockchains/ergo/default.nix b/pkgs/applications/blockchains/ergo/default.nix new file mode 100644 index 000000000000..bae7326c2554 --- /dev/null +++ b/pkgs/applications/blockchains/ergo/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, makeWrapper, jre }: + +stdenv.mkDerivation rec { + pname = "ergo"; + version = "3.2.5"; + + src = fetchurl { + url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar"; + sha256 = "0vaq6cqz03ps0fg3rvk298jnbf8mazvmyfcj7zsf1cgw41xdjjcf"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + dontUnpack = true; + + installPhase = '' + makeWrapper ${jre}/bin/java $out/bin/ergo --add-flags "-jar $src" + ''; + + meta = with stdenv.lib; { + description = "Open protocol that implements modern scientific ideas in the blockchain area"; + homepage = "https://ergoplatform.org/en/"; + license = licenses.cc0; + platforms = platforms.all; + maintainers = with maintainers; [ mmahut ]; + }; +} diff --git a/pkgs/applications/editors/lite/default.nix b/pkgs/applications/editors/lite/default.nix index 107be4338324..34800d7f0235 100644 --- a/pkgs/applications/editors/lite/default.nix +++ b/pkgs/applications/editors/lite/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "lite"; - version = "1.03"; + version = "1.05"; src = fetchFromGitHub { owner = "rxi"; repo = pname; rev = "v${version}"; - sha256 = "1h8z4fav5ns9sm92axs3k9v6jgkqq0vg9mixza14949blr426mlj"; + sha256 = "0xh29ddl5h92n1c4nlh4kx9mchwkzn4r3l16kklix3a1jm1c878a"; }; nativeBuildInputs = [ makeWrapper pkg-config ]; diff --git a/pkgs/applications/graphics/nomacs/default.nix b/pkgs/applications/graphics/nomacs/default.nix index a6bda01ebb64..67e95aec7585 100644 --- a/pkgs/applications/graphics/nomacs/default.nix +++ b/pkgs/applications/graphics/nomacs/default.nix @@ -55,7 +55,7 @@ mkDerivation rec { meta = with stdenv.lib; { homepage = "https://nomacs.org"; description = "Qt-based image viewer"; - maintainers = [maintainers.ahmedtd]; + maintainers = with stdenv.lib.maintainers; [ mindavi ]; license = licenses.gpl3Plus; repositories.git = "https://github.com/nomacs/nomacs.git"; inherit (qtbase.meta) platforms; diff --git a/pkgs/applications/graphics/nomacs/nomacs-iostream.patch b/pkgs/applications/graphics/nomacs/nomacs-iostream.patch deleted file mode 100644 index 53224e0260eb..000000000000 --- a/pkgs/applications/graphics/nomacs/nomacs-iostream.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/src/DkCore/DkMetaData.cpp b/src/DkCore/DkMetaData.cpp -index d195757e..affec7be 100644 ---- a/src/DkCore/DkMetaData.cpp -+++ b/src/DkCore/DkMetaData.cpp -@@ -42,6 +42,8 @@ - #include <QApplication> - #pragma warning(pop) // no warnings from includes - end - -+#include <iostream> -+ - namespace nmc { - - // DkMetaDataT -------------------------------------------------------------------- -diff --git a/src/DkGui/DkNoMacs.cpp b/src/DkGui/DkNoMacs.cpp -index 6a412f70..bbfba233 100644 ---- a/src/DkGui/DkNoMacs.cpp -+++ b/src/DkGui/DkNoMacs.cpp -@@ -96,6 +96,8 @@ - #include <QWinTaskbarButton> - #endif - -+#include <iostream> -+ - namespace nmc { - - DkNomacsOSXEventFilter::DkNomacsOSXEventFilter(QObject *parent) : QObject(parent) { diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index ca5eb34b9562..7fe94cd2ff84 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "hugo"; - version = "0.71.0"; + version = "0.71.1"; buildInputs = [ libsass ]; @@ -10,7 +10,7 @@ buildGoModule rec { owner = "gohugoio"; repo = pname; rev = "v${version}"; - sha256 = "1cjf69y8wvjq7kpncvqzmhc03pmf21nfxqpdnh64v34d14gpa1aa"; + sha256 = "0kx3q2i5p8k1dfkh02ns5ns97aqqvdcs0kx4bl9d38jk3lw3jrgh"; }; golibsass = fetchFromGitHub { diff --git a/pkgs/applications/misc/pastel/default.nix b/pkgs/applications/misc/pastel/default.nix index 90b42ba72b7f..348ea4b991ec 100644 --- a/pkgs/applications/misc/pastel/default.nix +++ b/pkgs/applications/misc/pastel/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "pastel"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = pname; rev = "v${version}"; - sha256 = "1xrg25w175m2iz7q9v7c05a0p0v5rr71vd4m3v6p0lqvij3sih4s"; + sha256 = "00xxrssa3gbr5w2jsqlf632jlzc0lc2rpybnbv618ndy5lxidnw0"; }; - cargoSha256 = "17rw9wp9mfv38h0azdjwl60bxdknb5q84ia0a2r1vi91gz6275cs"; + cargoSha256 = "1ji64h0f8f2sq12cx33kymypzar9swhaj903gclf3jdwgna77326"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; diff --git a/pkgs/applications/misc/zola/default.nix b/pkgs/applications/misc/zola/default.nix index 6616f7e4294e..d88d7296fd64 100644 --- a/pkgs/applications/misc/zola/default.nix +++ b/pkgs/applications/misc/zola/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "zola"; - version = "0.10.1"; + version = "0.11.0"; src = fetchFromGitHub { owner = "getzola"; repo = pname; rev = "v${version}"; - sha256 = "07zg4ia983rgvgvmw4xbi347lr4rxlf1xv8rw72cflc74kyia67n"; + sha256 = "137ak9gzcn3689fmcb90wa4szw43rh2m51mf26l77a5gksn5y6cn"; }; - cargoSha256 = "13lnl01h8k8xv2ls1kjskfnyjmmk8iyk2mvbk01p2wmhp5m876md"; + cargoSha256 = "0v40bcqh48dlhdc0kz7wm3q9r3i1m6j9s74bfiv237dqx5dymmsg"; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ openssl ] diff --git a/pkgs/applications/networking/ids/snort/default.nix b/pkgs/applications/networking/ids/snort/default.nix index 92415148ed5e..49f7bbfd8120 100644 --- a/pkgs/applications/networking/ids/snort/default.nix +++ b/pkgs/applications/networking/ids/snort/default.nix @@ -1,16 +1,16 @@ -{stdenv, fetchurl, libpcap, pcre, libdnet, daq, zlib, flex, bison, makeWrapper}: +{stdenv, pkgconfig, luajit, openssl, fetchurl, libpcap, pcre, libdnet, daq, zlib, flex, bison, makeWrapper}: stdenv.mkDerivation rec { - version = "2.9.11.1"; + version = "2.9.16"; pname = "snort"; src = fetchurl { name = "${pname}-${version}.tar.gz"; url = "https://snort.org/downloads/archive/snort/${pname}-${version}.tar.gz"; - sha256 = "1ka67zrrhs32c729v4h76mvv2723mij0adxx0iaza2d1qpm3lswz"; + sha256 = "1mxspk0060f62xp631w589b9ryb21qygn020az3dw2fsy7nxi24n"; }; - buildInputs = [ makeWrapper libpcap pcre libdnet daq zlib flex bison ]; + buildInputs = [ makeWrapper pkgconfig luajit openssl libpcap pcre libdnet daq zlib flex bison ]; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 92307547531d..566371e3af03 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -15,11 +15,11 @@ assert pulseaudioSupport -> libpulseaudio != null; let inherit (stdenv.lib) concatStringsSep makeBinPath optional; - version = "5.0.408598.0517"; + version = "5.0.413237.0524"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz"; - sha256 = "1irpnrxl91pc9naz0d9m252scnbfdbdi7yh19hd3arvk3fppjk7w"; + sha256 = "09hr31pzjgwaa898akl953k7fcshkq8r065i2047mk247bjy278k"; }; }; diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index e82769ad317a..c188e46d0076 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -27,11 +27,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "mutt"; - version = "1.14.1"; + version = "1.14.2"; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz"; - sha256 = "09a4hhl9h6y57yfq1gx83fzqxp3wb88y17rl8f54ndpp6p1n9m9m"; + sha256 = "0cdcls0x6f2w99hkjz48hxhnx86w3bnyxzibchdc9yspih770bz2"; }; patches = optional smimeSupport (fetchpatch { diff --git a/pkgs/applications/science/biology/bppsuite/default.nix b/pkgs/applications/science/biology/bppsuite/default.nix new file mode 100644 index 000000000000..564a38708bcd --- /dev/null +++ b/pkgs/applications/science/biology/bppsuite/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchFromGitHub, cmake, bpp-core, bpp-seq, bpp-phyl, bpp-popgen }: + +stdenv.mkDerivation rec { + pname = "bppsuite"; + + inherit (bpp-core) version; + + src = fetchFromGitHub { + owner = "BioPP"; + repo = pname; + rev = "v${version}"; + sha256 = "1wdwcgczqbc3m116vakvi0129wm3acln3cfc7ivqnalwvi6lrpds"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ bpp-core bpp-seq bpp-phyl bpp-popgen ]; + + meta = bpp-core.meta // { + changelog = "https://github.com/BioPP/bppsuite/blob/master/ChangeLog"; + }; +} diff --git a/pkgs/applications/science/logic/sad/default.nix b/pkgs/applications/science/logic/sad/default.nix index f9b82b5d733b..f1066abf6931 100644 --- a/pkgs/applications/science/logic/sad/default.nix +++ b/pkgs/applications/science/logic/sad/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { }; buildInputs = [ haskell.compiler.ghc844 spass ]; patches = [ - ./patch + ./patch.patch # Since the LTS 12.0 update, <> is an operator in Prelude, colliding with # the <> operator with a different meaning defined by this package ./monoid.patch diff --git a/pkgs/applications/science/logic/sad/patch b/pkgs/applications/science/logic/sad/patch.patch index a5b1d6177083..a5b1d6177083 100644 --- a/pkgs/applications/science/logic/sad/patch +++ b/pkgs/applications/science/logic/sad/patch.patch diff --git a/pkgs/applications/science/physics/xflr5/default.nix b/pkgs/applications/science/physics/xflr5/default.nix new file mode 100644 index 000000000000..85838b04cbf1 --- /dev/null +++ b/pkgs/applications/science/physics/xflr5/default.nix @@ -0,0 +1,23 @@ +{ stdenv, lib, fetchurl, wrapQtAppsHook, qmake }: + +stdenv.mkDerivation rec { + pname = "xflr5"; + version = "6.47"; + + src = fetchurl { + url = "mirror://sourceforge/xflr5/${pname}_v${version}_src.tar.gz"; + sha256 = "02x3r9iv3ndwxa65mxn9m5dlhcrnjiq7cffi6rmb456gs3v3dnav"; + }; + + enableParallelBuilding = true; + + nativeBuildInputs = [ qmake wrapQtAppsHook ]; + + meta = with stdenv.lib; { + description = "An analysis tool for airfoils, wings and planes"; + homepage = https://sourceforge.net/projects/xflr5/; + license = licenses.gpl3; + maintainers = [ maintainers.esclear ]; + platforms = platforms.linux; + }; +} \ No newline at end of file diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix index 2386ac87ceab..300570f7efd2 100644 --- a/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -2,25 +2,27 @@ buildGoModule rec { pname = "gh"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "08fy3677yq52x40rab49ijhw4r25ls2807dbv9wpna6w07n7r8v7"; + sha256 = "050wqjng0l42ilaiglwm1mzrrmnk0bg9icnzq9sm88axgl4xpmdy"; }; vendorSha256 = "0s99bjmsafnzhl3s2lcybxgsw1s4i1h3vh6p40gz4vsfhndidqrq"; - buildFlagsArray = [ - "-ldflags=-s -w -X github.com/cli/cli/command.Version=${version}" - ]; + nativeBuildInputs = [ installShellFiles ]; + + buildPhase = '' + make GH_VERSION=${version} bin/gh manpages + ''; - subPackages = [ "cmd/gh" ]; + installPhase = '' + install -Dm755 bin/gh -t $out/bin + installManPage share/man/*/*.[1-9] - nativeBuildInputs = [ installShellFiles ]; - postInstall = '' for shell in bash fish zsh; do $out/bin/gh completion -s $shell > gh.$shell installShellCompletion gh.$shell @@ -33,4 +35,4 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ zowoq ]; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/virtualization/conmon/default.nix b/pkgs/applications/virtualization/conmon/default.nix index bb693c121d82..be6196855e2b 100644 --- a/pkgs/applications/virtualization/conmon/default.nix +++ b/pkgs/applications/virtualization/conmon/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "conmon"; - version = "2.0.16"; + version = "2.0.17"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "0z0hds95mjxm703ig2aisghvpd2l3wn6m72jnnlv8jnz2iq2nc4g"; + sha256 = "01bicv0qr4aiahkw9cp6igk3jv1fqkbxmsp80nfvq6rxx873v0q7"; }; nativeBuildInputs = [ pkg-config ]; |