diff options
Diffstat (limited to 'pkgs/applications')
21 files changed, 117 insertions, 56 deletions
diff --git a/pkgs/applications/audio/mpc/default.nix b/pkgs/applications/audio/mpc/default.nix index 8fdd05776c9..cebf08f1908 100644 --- a/pkgs/applications/audio/mpc/default.nix +++ b/pkgs/applications/audio/mpc/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , installShellFiles , libiconv , libmpdclient @@ -21,6 +22,14 @@ stdenv.mkDerivation rec { hash = "sha256-2FjYBfak0IjibuU+CNQ0y9Ei8hTZhynS/BK2DNerhVw="; }; + patches = [ + # fix the build with meson 0.60 (https://github.com/MusicPlayerDaemon/mpc/pull/76) + (fetchpatch { + url = "https://github.com/MusicPlayerDaemon/mpc/commit/b656ca4b6c2a0d5b6cebd7f7daa679352f664e0e.patch"; + sha256 = "sha256-fjjSlCKxgkz7Em08CaK7+JAzl8YTzLcpGGMz2HJlsVw="; + }) + ]; + buildInputs = [ libmpdclient ] diff --git a/pkgs/applications/audio/parlatype/default.nix b/pkgs/applications/audio/parlatype/default.nix index 7b448cc69af..c1bb1102bf1 100644 --- a/pkgs/applications/audio/parlatype/default.nix +++ b/pkgs/applications/audio/parlatype/default.nix @@ -40,8 +40,6 @@ stdenv.mkDerivation rec { hicolor-icon-theme ]; - mesonFlags = [ "-Dlibreoffice=false" ]; - postPatch = '' chmod +x data/meson_post_install.py patchShebangs data/meson_post_install.py diff --git a/pkgs/applications/audio/shortwave/default.nix b/pkgs/applications/audio/shortwave/default.nix index 0f4ffa14228..49492d05d15 100644 --- a/pkgs/applications/audio/shortwave/default.nix +++ b/pkgs/applications/audio/shortwave/default.nix @@ -80,6 +80,7 @@ stdenv.mkDerivation rec { desktop. It is the successor to the older Gradio application. ''; maintainers = with maintainers; [ lasandell ]; + broken = true; # incompatible with latest libadwaita license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/pkgs/applications/audio/squishyball/default.nix b/pkgs/applications/audio/squishyball/default.nix index b44efc1534f..4a7f819e290 100644 --- a/pkgs/applications/audio/squishyball/default.nix +++ b/pkgs/applications/audio/squishyball/default.nix @@ -16,8 +16,6 @@ stdenv.mkDerivation rec { buildInputs = [ flac libao libvorbis ncurses opusfile ]; - NIX_CFLAGS_COMPILE = "-DNCURSES_INTERNALS"; - patches = [ ./gnu-screen.patch ]; postInstall = '' diff --git a/pkgs/applications/audio/zrythm/default.nix b/pkgs/applications/audio/zrythm/default.nix index 8963cff4d12..70b7fbb745f 100644 --- a/pkgs/applications/audio/zrythm/default.nix +++ b/pkgs/applications/audio/zrythm/default.nix @@ -13,7 +13,6 @@ , curl , dconf , libepoxy -, ffmpeg , fftw , fftwFloat , flex @@ -95,7 +94,6 @@ stdenv.mkDerivation rec { curl dconf libepoxy - ffmpeg fftw fftwFloat flex @@ -133,10 +131,9 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - "-Denable_ffmpeg=true" - "-Denable_rtmidi=true" - "-Denable_rtaudio=true" - "-Denable_sdl=true" + "-Drtmidi=enabled" + "-Drtaudio=enabled" + "-Dsdl=enabled" "-Dcarla=enabled" "-Dmanpage=true" # "-Duser_manual=true" # needs sphinx-intl diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix index d9092b55011..0e2ffe46d20 100644 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -5,6 +5,7 @@ , appstream-glib , desktop-file-utils , fetchurl +, fetchpatch , flatpak , gnome , libgit2-glib @@ -18,7 +19,7 @@ , jsonrpc-glib , libdazzle , libpeas -, libportal +, libportal-gtk3 , libxml2 , meson , ninja @@ -48,6 +49,15 @@ stdenv.mkDerivation rec { sha256 = "4iUPyOnp8gAsRS5ZUNgmhXNNPESAs1Fnq1CKyHAlCeE="; }; + patches = [ + # Fix build with latest libportal + # https://gitlab.gnome.org/GNOME/gnome-builder/-/merge_requests/486 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-builder/-/commit/b3bfa0df53a3749c3b73cb6c4bad5cab3fa549a1.patch"; + sha256 = "B/uCcYavFvOAPhLHZ4MRNENDd6VytILiGYwDZRUSxTE="; + }) + ]; + nativeBuildInputs = [ appstream-glib desktop-file-utils @@ -69,7 +79,7 @@ stdenv.mkDerivation rec { glade libgit2-glib libpeas - libportal + libportal-gtk3 vte gspell gtk3 diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index 42cae799285..51a9b9af5bf 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub }: rec { - version = "8.2.3877"; + version = "8.2.4186"; src = fetchFromGitHub { owner = "vim"; repo = "vim"; rev = "v${version}"; - sha256 = "sha256-NqTO2TdhOs63eP7CdWY9U9nbR7No3hqPV5rGhYF9arA="; + sha256 = "0g276mbmq69z7c4kgj59r0azxmx9ih2sd8v83dx2gfph6wgw65ph"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/graphics/gcolor3/default.nix b/pkgs/applications/graphics/gcolor3/default.nix index 2771559416b..63725b97431 100644 --- a/pkgs/applications/graphics/gcolor3/default.nix +++ b/pkgs/applications/graphics/gcolor3/default.nix @@ -6,7 +6,7 @@ , pkg-config , libxml2 , gtk3 -, libportal +, libportal-gtk3 , wrapGAppsHook }: @@ -33,12 +33,16 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 - libportal + libportal-gtk3 ]; postPatch = '' chmod +x meson_install.sh # patchShebangs requires executable file patchShebangs meson_install.sh + + # https://gitlab.gnome.org/World/gcolor3/merge_requests/151 + substituteInPlace meson.build --replace "dependency(${"\n"} 'libportal'" "dependency(${"\n"} 'libportal-gtk3'" + substituteInPlace src/gcolor3-color-selection.c --replace "libportal/portal-gtk3.h" "libportal-gtk3/portal-gtk3.h" ''; meta = with lib; { diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix index 268e59d910b..fe387ddc273 100644 --- a/pkgs/applications/graphics/graphicsmagick/default.nix +++ b/pkgs/applications/graphics/graphicsmagick/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "graphicsmagick"; - version = "1.3.36"; + version = "1.3.37"; src = fetchurl { url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz"; - sha256 = "0ilg6fkppb4avzais1dvi3qf6ln7v3mzj7gjm83w7pwwfpg3ynsx"; + sha256 = "sha256-kNwi8ae9JA5MkGWpQJYr8T2kPJm8w2yxEcw8Gg10d9Q="; }; patches = [ diff --git a/pkgs/applications/kde/kamoso.nix b/pkgs/applications/kde/kamoso.nix index 9baa06275a7..c80ed0c511e 100644 --- a/pkgs/applications/kde/kamoso.nix +++ b/pkgs/applications/kde/kamoso.nix @@ -34,7 +34,7 @@ mkDerivation { ]; qtWrapperArgs = [ - "--prefix GST_PLUGIN_PATH : ${lib.makeSearchPath "lib/gstreamer-1.0" gst}" + "--prefix GST_PLUGIN_PATH : ${lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" gst}" ]; meta = { diff --git a/pkgs/applications/misc/iptsd/default.nix b/pkgs/applications/misc/iptsd/default.nix index 297ea6dc6a2..7347c4b7849 100644 --- a/pkgs/applications/misc/iptsd/default.nix +++ b/pkgs/applications/misc/iptsd/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { --replace "install_dir: rulesdir" "install_dir: datadir" \ ''; mesonFlags = [ - "-Dsystemd=true" + "-Dservice_manager=systemd" "-Dsample_config=false" "-Ddebug_tool=false" ]; diff --git a/pkgs/applications/misc/metadata-cleaner/default.nix b/pkgs/applications/misc/metadata-cleaner/default.nix index f113eed155f..01c8ade58c4 100644 --- a/pkgs/applications/misc/metadata-cleaner/default.nix +++ b/pkgs/applications/misc/metadata-cleaner/default.nix @@ -9,7 +9,7 @@ , itstool , libadwaita , librsvg -, meson_0_60 +, meson , ninja , pkg-config , poppler_gi @@ -35,7 +35,7 @@ python3.pkgs.buildPythonApplication rec { glib gtk4 itstool - meson_0_60 + meson ninja pkg-config wrapGAppsHook diff --git a/pkgs/applications/misc/notejot/default.nix b/pkgs/applications/misc/notejot/default.nix index aad182bd187..24525443935 100644 --- a/pkgs/applications/misc/notejot/default.nix +++ b/pkgs/applications/misc/notejot/default.nix @@ -17,21 +17,27 @@ stdenv.mkDerivation rec { pname = "notejot"; - version = "3.2.0"; + version = "3.3.3"; # make sure to recheck src.rev src = fetchFromGitHub { owner = "lainsce"; repo = pname; - rev = version; - hash = "sha256-WyW1tGhO3+OykNa8BRavi93cBMOSBJw0M+0bwQHJOjU="; + # Note from Fedora spec file: + # https://src.fedoraproject.org/rpms/notejot/blob/bbe621cef4d5a2c27eed029063b8e8cfd7c8d400/f/notejot.spec + # Upstream confusingly made several bugfix post-releases of version 3.3.3, + # tagged as 3.4.x, but with prominent notices like "This is still 3.3.3". We + # respect upstream’s wishes (and the version numbers inside the source tarball) + # by packaging these releases as 3.3.3 with appropriate snapshot info. + # https://github.com/lainsce/notejot/releases/tag/3.4.9 + # + # Note that sometimes upstream don't update their version in meson.build + # (https://github.com/lainsce/notejot/issues/236), always follow the version + # from Fedora Rawhide. + # https://github.com/lainsce/notejot/blob/3.4.9/meson.build#L1 + rev = "3.4.9"; + hash = "sha256-42k9CAnXAb7Ic580SIa95MDCkCWtso1F+0eD69HX8WI="; }; - patches = [ - # build: use gtk4-update-icon-cache - # https://github.com/lainsce/notejot/pull/307 - ./use-gtk4-update-icon-cache.patch - ]; - nativeBuildInputs = [ meson ninja diff --git a/pkgs/applications/misc/notejot/use-gtk4-update-icon-cache.patch b/pkgs/applications/misc/notejot/use-gtk4-update-icon-cache.patch deleted file mode 100644 index 9431c43cef6..00000000000 --- a/pkgs/applications/misc/notejot/use-gtk4-update-icon-cache.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/build-aux/post_install.py b/build-aux/post_install.py -index 1278304..fface6d 100644 ---- a/build-aux/post_install.py -+++ b/build-aux/post_install.py -@@ -2,11 +2,13 @@ - import os - import subprocess - --schemadir = os.path.join(os.environ['MESON_INSTALL_PREFIX'], 'share', 'glib-2.0', 'schemas') -+install_prefix = os.environ['MESON_INSTALL_PREFIX'] -+icondir = os.path.join(install_prefix, 'share', 'icons', 'hicolor') -+schemadir = os.path.join(install_prefix, 'share', 'glib-2.0', 'schemas') - - if not os.environ.get('DESTDIR'): - print('Compiling gsettings schemas…') - subprocess.call(['glib-compile-schemas', schemadir], shell=False) - - print('Rebuilding desktop icons cache...') -- subprocess.call(['gtk-update-icon-cache', '/usr/share/icons/hicolor/'], shell=False) -+ subprocess.call(['gtk4-update-icon-cache', '-qtf', icondir], shell=False) diff --git a/pkgs/applications/misc/qt-video-wlr/default.nix b/pkgs/applications/misc/qt-video-wlr/default.nix index bdb434085da..ffd22be085e 100644 --- a/pkgs/applications/misc/qt-video-wlr/default.nix +++ b/pkgs/applications/misc/qt-video-wlr/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, pkg-config, meson, ninja, wayland, pixman, cairo, librsvg, wayland-protocols, wlroots, libxkbcommon, gst_all_1, wrapQtAppsHook, qtbase, qtmultimedia }: let - gstreamerPath = with gst_all_1; lib.makeSearchPath "lib/gstreamer-1.0" [ + gstreamerPath = with gst_all_1; lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" [ gstreamer gst-plugins-base gst-plugins-good diff --git a/pkgs/applications/networking/browsers/nyxt/default.nix b/pkgs/applications/networking/browsers/nyxt/default.nix index 59bb2adbf51..ccbc7a8dc8f 100644 --- a/pkgs/applications/networking/browsers/nyxt/default.nix +++ b/pkgs/applications/networking/browsers/nyxt/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { xclip notify-osd enchant ] ++ gstBuildInputs; - GST_PLUGIN_SYSTEM_PATH_1_0 = lib.concatMapStringsSep ":" (p: "${p}/lib/gstreamer-1.0") gstBuildInputs; + GST_PLUGIN_SYSTEM_PATH_1_0 = lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" gstBuildInputs; dontWrapGApps = true; installPhase = '' diff --git a/pkgs/applications/networking/irc/hexchat/default.nix b/pkgs/applications/networking/irc/hexchat/default.nix index 504481479ed..fbe9971f1d7 100644 --- a/pkgs/applications/networking/irc/hexchat/default.nix +++ b/pkgs/applications/networking/irc/hexchat/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { done ''; - mesonFlags = [ "-Dwith-lua=lua" "-Dwith-text=true" ]; + mesonFlags = [ "-Dwith-lua=lua" "-Dtext-frontend=true" ]; postInstall = '' wrapProgram $out/bin/hexchat --prefix PYTHONPATH : "$PYTHONPATH" diff --git a/pkgs/applications/office/gtg/default.nix b/pkgs/applications/office/gtg/default.nix index 4b9237d23ce..6d536ea60a3 100644 --- a/pkgs/applications/office/gtg/default.nix +++ b/pkgs/applications/office/gtg/default.nix @@ -1,5 +1,6 @@ { lib , fetchFromGitHub +, fetchpatch , meson , python3Packages , ninja @@ -25,6 +26,13 @@ python3Packages.buildPythonApplication rec { sha256 = "0b2slm7kjq6q8c7v4m7aqc8m1ynjxn3bl7445srpv1xc0dilq403"; }; + patches = [ + # fix build with meson 0.60 (https://github.com/getting-things-gnome/gtg/pull/729) + (fetchpatch { + url = "https://github.com/getting-things-gnome/gtg/commit/1809d10663ae3d8f69c04138b66f9b4e66ee14f6.patch"; + sha256 = "sha256-bYr5PAsuvcSqTf0vaJj2APtuBrwHdhXJxtXoAb7CfGk="; + }) + ]; nativeBuildInputs = [ meson diff --git a/pkgs/applications/version-management/commitizen/default.nix b/pkgs/applications/version-management/commitizen/default.nix new file mode 100644 index 00000000000..fddffe6d198 --- /dev/null +++ b/pkgs/applications/version-management/commitizen/default.nix @@ -0,0 +1,49 @@ +{ buildPythonApplication +, lib +, fetchFromGitHub +, poetry +, termcolor +, questionary +, colorama +, decli +, tomlkit +, jinja2 +, pyyaml +, argcomplete +, typing-extensions +}: + +buildPythonApplication rec { + pname = "commitizen"; + version = "2.20.3"; + + src = fetchFromGitHub { + owner = "commitizen-tools"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-rAm2GTRxZIHQmn/FM0IwwH/2h+oOvzGmeVr5xkvD/zA="; + }; + + format = "pyproject"; + + nativeBuildInputs = [ poetry ]; + + propagatedBuildInputs = [ + termcolor + questionary + colorama + decli + tomlkit + jinja2 + pyyaml + argcomplete + typing-extensions + ]; + + meta = with lib; { + description = "Tool to create committing rules for projects, auto bump versions, and generate changelogs"; + homepage = "https://github.com/commitizen-tools/commitizen"; + license = licenses.mit; + maintainers = with maintainers; [ lovesegfault ]; + }; +} diff --git a/pkgs/applications/video/kooha/default.nix b/pkgs/applications/video/kooha/default.nix index f5be8664739..667dfd83d2c 100644 --- a/pkgs/applications/video/kooha/default.nix +++ b/pkgs/applications/video/kooha/default.nix @@ -68,6 +68,7 @@ stdenv.mkDerivation rec { # Fixes https://github.com/NixOS/nixpkgs/issues/31168 postPatch = '' patchShebangs build-aux/meson_post_install.py + substituteInPlace meson.build --replace '>= 1.0.0-alpha.1' '>= 1.0.0' ''; installCheckPhase = '' diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index 72ca71d5896..194525dcffb 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, substituteAll, swaybg -, meson_0_60, ninja, pkg-config, wayland-scanner, scdoc +, meson, ninja, pkg-config, wayland-scanner, scdoc , wayland, libxkbcommon, pcre, json_c, dbus, libevdev , pango, cairo, libinput, libcap, pam, gdk-pixbuf, librsvg , wlroots, wayland-protocols, libdrm @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - meson_0_60 ninja pkg-config wayland-scanner scdoc + meson ninja pkg-config wayland-scanner scdoc ]; buildInputs = [ |