diff options
Diffstat (limited to 'pkgs/applications')
10 files changed, 66 insertions, 54 deletions
diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index de84fcdce8dab..0d7964e2e6559 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -4247,6 +4247,18 @@ final: prev: meta.homepage = "https://github.com/liuchengxu/graphviz.vim/"; }; + grapple-nvim = buildVimPlugin { + pname = "grapple.nvim"; + version = "2024-04-11"; + src = fetchFromGitHub { + owner = "cbochs"; + repo = "grapple.nvim"; + rev = "12172536620464f8cc124e07c6e3ccd306ea3c5c"; + sha256 = "0rpiq47zb0ms6bbbd3c1ywmq5vc88132xcqwfnbfn3d2hrvbz8d1"; + }; + meta.homepage = "https://github.com/cbochs/grapple.nvim/"; + }; + gruber-darker-nvim = buildVimPlugin { pname = "gruber-darker.nvim"; version = "2024-01-08"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index ca18c766c3df6..ace647e29b522 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -353,6 +353,7 @@ https://github.com/rmagatti/goto-preview/,, https://github.com/junegunn/goyo.vim/,, https://github.com/brymer-meneses/grammar-guard.nvim/,HEAD, https://github.com/liuchengxu/graphviz.vim/,, +https://github.com/cbochs/grapple.nvim/,HEAD, https://github.com/blazkowolf/gruber-darker.nvim/,, https://github.com/gruvbox-community/gruvbox/,,gruvbox-community https://github.com/morhetz/gruvbox/,, diff --git a/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix b/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix index bd640845331fb..d510549f767be 100644 --- a/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix +++ b/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "cloudfoundry-cli"; - version = "8.7.9"; + version = "8.7.10"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-uFYeiw2hdX25mUBdudNCC4ZuFEoWyfghWmQR8IsQy+w="; + sha256 = "sha256-hzXNaaL6CLVRIy88lCJ87q0V6A+ld1GPDcUagsvMXY0="; }; - vendorHash = "sha256-lvSo8kl2du6Sv7zY3uheXaO6Qg+nblW0jpp2q8+1vyk="; + vendorHash = "sha256-zDE+9OsnX3S7SPTVW3hR1rO++6Wdk00zy2msu+jUNlw="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/cluster/nixops/plugins/nixops-digitalocean.nix b/pkgs/applications/networking/cluster/nixops/plugins/nixops-digitalocean.nix index e35b4cd07f380..f3f62e9407293 100644 --- a/pkgs/applications/networking/cluster/nixops/plugins/nixops-digitalocean.nix +++ b/pkgs/applications/networking/cluster/nixops/plugins/nixops-digitalocean.nix @@ -4,7 +4,8 @@ , unstableGitUpdater , poetry-core , nixops -, digital-ocean +, python-digitalocean +, pythonOlder }: buildPythonPackage { @@ -12,6 +13,8 @@ buildPythonPackage { version = "unstable-2022-08-14"; pyproject = true; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "nix-community"; repo = "nixops-digitalocean"; @@ -34,7 +37,7 @@ buildPythonPackage { ]; propagatedBuildInputs = [ - digital-ocean + python-digitalocean ]; pythonImportsCheck = [ "nixops_digitalocean" ]; diff --git a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix index 19c91baf9a43e..5e61fc78091e6 100644 --- a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix +++ b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, cmake, pkg-config, fetchFromGitHub, qtbase, qtsvg, qtmultimedia, qtimageformats, qttools, boost, openssl, wrapQtAppsHook, libsecret }: +{ stdenv, lib, cmake, pkg-config, fetchFromGitHub, qt6, boost, openssl, libsecret }: stdenv.mkDerivation rec { pname = "chatterino2"; @@ -10,8 +10,20 @@ stdenv.mkDerivation rec { sha256 = "sha256-CQviw5Fw6v5EwjCldAQoJfAIZMWKBfBzUIQZEgW34k0="; fetchSubmodules = true; }; - nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; - buildInputs = [ qtbase qtsvg qtmultimedia qtimageformats qttools boost openssl libsecret ]; + nativeBuildInputs = [ cmake pkg-config qt6.wrapQtAppsHook ]; + buildInputs = [ + qt6.qtbase + qt6.qtsvg + qt6.qtimageformats + qt6.qttools + qt6.qt5compat + boost + openssl + libsecret + ] ++ lib.optionals stdenv.isLinux [ + qt6.qtwayland + ]; + cmakeFlags = [ "-DBUILD_WITH_QT6=ON" ]; postInstall = lib.optionalString stdenv.isDarwin '' mkdir -p "$out/Applications" mv bin/chatterino.app "$out/Applications/" @@ -32,6 +44,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/Chatterino/chatterino2/blob/master/CHANGELOG.md"; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ rexim ]; + maintainers = with maintainers; [ rexim supa ]; }; } diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index d002cf5dffbc6..2009c6f9a0bcb 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -21,14 +21,14 @@ let pname = "qownnotes"; appname = "QOwnNotes"; - version = "24.4.1"; + version = "24.4.2"; in stdenv.mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/pbek/QOwnNotes/releases/download/v${version}/qownnotes-${version}.tar.xz"; - hash = "sha256-E4tLlzjIOElsZr2jcbsnge5jJqKQ0kWf86tFonZ1+Zs="; + hash = "sha256-HnWxIcOy7Te6Q5YfZYhvITpfsgeQw8Tt/Nr++wcpxEU="; }; nativeBuildInputs = [ @@ -55,11 +55,11 @@ stdenv.mkDerivation { postInstall = '' installShellCompletion --cmd ${appname} \ - --bash <(xvfb-run $out/bin/${appname} --completion bash --allow-multiple-instances) \ - --fish <(xvfb-run $out/bin/${appname} --completion fish --allow-multiple-instances) + --bash <(xvfb-run $out/bin/${appname} --completion bash) \ + --fish <(xvfb-run $out/bin/${appname} --completion fish) installShellCompletion --cmd ${pname} \ - --bash <(xvfb-run $out/bin/${appname} --completion bash --allow-multiple-instances) \ - --fish <(xvfb-run $out/bin/${appname} --completion fish --allow-multiple-instances) + --bash <(xvfb-run $out/bin/${appname} --completion bash) \ + --fish <(xvfb-run $out/bin/${appname} --completion fish) '' # Create a lowercase symlink for Linux + lib.optionalString stdenv.isLinux '' diff --git a/pkgs/applications/radio/limesuite/default.nix b/pkgs/applications/radio/limesuite/default.nix index f92b63a9ba983..d8d7bcd22d0a8 100644 --- a/pkgs/applications/radio/limesuite/default.nix +++ b/pkgs/applications/radio/limesuite/default.nix @@ -2,7 +2,7 @@ , sqlite, wxGTK32, libusb1, soapysdr , mesa_glu, libX11, gnuplot, fltk , GLUT -, withGui ? !stdenv.isDarwin # withGui transitively depends on mesa, which is broken on darwin +, withGui ? false }: stdenv.mkDerivation rec { @@ -48,6 +48,7 @@ stdenv.mkDerivation rec { license = licenses.asl20; maintainers = with maintainers; [ markuskowa ]; platforms = platforms.unix; + badPlatforms = lib.optionals withGui platforms.darwin; # withGui transitively depends on mesa, which is broken on darwin }; } diff --git a/pkgs/applications/video/anilibria-winmaclinux/0003-build-with-vlc.patch b/pkgs/applications/video/anilibria-winmaclinux/0003-build-with-vlc.patch deleted file mode 100644 index 6bdfcf2c2d2a4..0000000000000 --- a/pkgs/applications/video/anilibria-winmaclinux/0003-build-with-vlc.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/AniLibria.pro b/AniLibria.pro -index 407dbde..ae69502 100644 ---- a/AniLibria.pro -+++ b/AniLibria.pro -@@ -21,17 +21,17 @@ windows { - DEFINES += NO_NEED_STANDART_PLAYER - } - --#unix { --# LIBS += -lvlc -+unix { -+ LIBS += -lvlc - - # INCLUDEPATH += /usr/include/ - # DEPENDPATH += /usr/include/ - --# INCLUDEPATH += /usr/include/vlc/plugins --# DEPENDPATH += /usr/include/vlc/plugins -+ INCLUDEPATH += @VLC_PATH@/vlc/plugins -+ DEPENDPATH += @VLC_PATH@/vlc/plugins - --# CONFIG += buildwithvlc --#} -+ CONFIG += buildwithvlc -+} - - buildwithvlc { - DEFINES += USE_VLC_PLAYER diff --git a/pkgs/applications/video/anilibria-winmaclinux/default.nix b/pkgs/applications/video/anilibria-winmaclinux/default.nix index d35947be850b1..522c37f3a625f 100644 --- a/pkgs/applications/video/anilibria-winmaclinux/default.nix +++ b/pkgs/applications/video/anilibria-winmaclinux/default.nix @@ -11,23 +11,27 @@ , wrapQtAppsHook , makeDesktopItem , copyDesktopItems -, libvlc + +, withVLC ? true , libvlc +, withMPV ? true , mpv-unwrapped }: mkDerivation rec { pname = "anilibria-winmaclinux"; - version = "1.2.15"; + version = "1.2.16.1"; src = fetchFromGitHub { owner = "anilibria"; repo = "anilibria-winmaclinux"; rev = version; - sha256 = "sha256-pfM3o4H3XJ4ZE0FXVR1k8pc7lr7SOQjKEMWuG9YkvvI="; + hash = "sha256-QQliz/tLeYsWgh/ZAO7FfbApAEqWhWoaQe9030QZxA8="; }; sourceRoot = "${src.name}/src"; - qmakeFlags = [ "PREFIX=${placeholder "out"}" "CONFIG+=unixvlc" ]; + qmakeFlags = [ "PREFIX=${placeholder "out"}" ] + ++ lib.optionals withVLC [ "CONFIG+=unixvlc" ] + ++ lib.optionals withMPV [ "CONFIG+=unixmpv" ]; patches = [ ./0001-fix-installation-paths.patch @@ -61,14 +65,15 @@ mkDerivation rec { qtquickcontrols2 qtwebsockets qtmultimedia - libvlc ] ++ (with gst_all_1; [ gst-plugins-bad gst-plugins-good gst-plugins-base gst-libav gstreamer - ]); + ]) + ++ lib.optionals withVLC [ libvlc ] + ++ lib.optionals withMPV [ mpv-unwrapped.dev ]; desktopItems = [ (makeDesktopItem (rec { diff --git a/pkgs/applications/video/streamlink-twitch-gui/bin.nix b/pkgs/applications/video/streamlink-twitch-gui/bin.nix index ac74ed748f41c..543b2b524708f 100644 --- a/pkgs/applications/video/streamlink-twitch-gui/bin.nix +++ b/pkgs/applications/video/streamlink-twitch-gui/bin.nix @@ -1,6 +1,7 @@ { autoPatchelfHook , fetchurl , lib +, copyDesktopItems , makeDesktopItem , makeWrapper , stdenv @@ -52,6 +53,7 @@ stdenv.mkDerivation rec { alsa-lib autoPatchelfHook cairo + copyDesktopItems cups.lib dbus.lib expat @@ -92,8 +94,12 @@ stdenv.mkDerivation rec { # Install all files, remove unnecessary ones cp -a . $out/opt/${basename}/ rm -r $out/opt/${basename}/{{add,remove}-menuitem.sh,credits.html,icons/} - ln -s "$out/opt/${basename}/${basename}" $out/bin/ - cp -r "${desktopItem}/share/applications" $out/share/ + ln -s $out/opt/${basename}/${basename} $out/bin/ + for res in 16 32 48 64 128 256; do + install -Dm644 \ + icons/icon-"$res".png \ + $out/share/icons/hicolor/"$res"x"$res"/apps/${basename}.png + done runHook postInstall ''; @@ -105,14 +111,14 @@ stdenv.mkDerivation rec { ) ''; - desktopItem = makeDesktopItem { + desktopItems = [(makeDesktopItem { name = basename; exec = basename; icon = basename; desktopName = "Streamlink Twitch GUI"; genericName = meta.description; categories = [ "AudioVideo" "Network" ]; - }; + })]; meta = with lib; { description = "Twitch.tv browser for Streamlink"; |