diff options
Diffstat (limited to 'pkgs/applications')
6 files changed, 120 insertions, 90 deletions
diff --git a/pkgs/applications/audio/pyradio/default.nix b/pkgs/applications/audio/pyradio/default.nix index e3bf3acf98d9b..72cbfd443c08b 100644 --- a/pkgs/applications/audio/pyradio/default.nix +++ b/pkgs/applications/audio/pyradio/default.nix @@ -6,13 +6,13 @@ python3Packages.buildPythonApplication rec { pname = "pyradio"; - version = "0.9.3.2"; + version = "0.9.3.4"; src = fetchFromGitHub { owner = "coderholic"; repo = "pyradio"; rev = "refs/tags/${version}"; - hash = "sha256-aIWU68bdPUsIh8QRNnF0NcK7FemmYyUHbJg9KcUALBk="; + hash = "sha256-QifBzQsvYU5kP5mnidOgWGBh3h2MvJm8Wo0i1v6j/cU="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/default.nix index 1286c9fc6466d..e714a20cb3794 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/default.nix @@ -1,21 +1,26 @@ -{ lib, melpaBuild, fetchurl, writeText }: +{ + lib, + melpaBuild, + fetchzip, + writeText, +}: melpaBuild rec { pname = "ebuild-mode"; - version = "1.67"; + version = "1.70"; - src = fetchurl { - url = "https://dev.gentoo.org/~ulm/emacs/ebuild-mode-${version}.tar.xz"; - hash = "sha256-5qxHpu1BLtI8LFnL/sAoqmo80zeyElxIdFtAsfMefUE="; + src = fetchzip { + url = "https://gitweb.gentoo.org/proj/ebuild-mode.git/snapshot/ebuild-mode-${version}.tar.bz2"; + hash = "sha256-dOm3xJMFLelwcImIwckeQHx1GqV9PB+I45QA9UT1nCM="; }; # not used but needs to be set; why? - commit = "e7b45096283ac8836f208babddfd1ea1c1d1d1d"; + commit = "a643f177b58aa8869f2f24814e990320aa4f0f96"; recipe = writeText "recipe" '' (ebuild-mode - :url "https://anongit.gentoo.org/git/proj/ebuild-mode.git" - :fetcher git) + :url "https://gitweb.gentoo.org/proj/ebuild-mode.git" + :fetcher git) ''; meta = { diff --git a/pkgs/applications/misc/bambu-studio/default.nix b/pkgs/applications/misc/bambu-studio/default.nix index 64fa760ef9d24..43b6cb8769ef7 100644 --- a/pkgs/applications/misc/bambu-studio/default.nix +++ b/pkgs/applications/misc/bambu-studio/default.nix @@ -1,49 +1,50 @@ -{ stdenv -, lib -, openexr -, jemalloc -, c-blosc -, binutils -, fetchFromGitHub -, cmake -, pkg-config -, wrapGAppsHook -, boost179 -, cereal -, cgal_5 -, curl -, dbus -, eigen -, expat -, gcc-unwrapped -, glew -, glfw -, glib -, glib-networking -, gmp -, gstreamer -, gst-plugins-base -, gst-plugins-bad -, gst-plugins-good -, gtest -, gtk3 -, hicolor-icon-theme -, ilmbase -, libpng -, mesa -, mpfr -, nlopt -, opencascade-occt -, openvdb -, pcre -, qhull -, systemd -, tbb_2021_11 -, webkitgtk -, wxGTK31 -, xorg -, fetchpatch -, withSystemd ? stdenv.isLinux +{ + stdenv, + lib, + openexr, + jemalloc, + c-blosc, + binutils, + fetchFromGitHub, + cmake, + pkg-config, + wrapGAppsHook, + boost179, + cereal, + cgal_5, + curl, + dbus, + eigen, + expat, + gcc-unwrapped, + glew, + glfw, + glib, + glib-networking, + gmp, + gstreamer, + gst-plugins-base, + gst-plugins-bad, + gst-plugins-good, + gtest, + gtk3, + hicolor-icon-theme, + ilmbase, + libpng, + mesa, + mpfr, + nlopt, + opencascade-occt, + openvdb, + pcre, + qhull, + systemd, + tbb_2021_11, + webkitgtk, + wxGTK31, + xorg, + fetchpatch, + withSystemd ? stdenv.isLinux, }: let wxGTK31' = wxGTK31.overrideAttrs (old: { @@ -53,7 +54,14 @@ let ]; }); openvdb_tbb_2021_8 = openvdb.overrideAttrs (old: rec { - buildInputs = [ openexr boost179 tbb_2021_11 jemalloc c-blosc ilmbase ]; + buildInputs = [ + openexr + boost179 + tbb_2021_11 + jemalloc + c-blosc + ilmbase + ]; }); in stdenv.mkDerivation rec { @@ -106,9 +114,7 @@ stdenv.mkDerivation rec { webkitgtk wxGTK31' xorg.libX11 - ] ++ lib.optionals withSystemd [ - systemd - ] ++ checkInputs; + ] ++ lib.optionals withSystemd [ systemd ] ++ checkInputs; patches = [ # Fix for webkitgtk linking @@ -169,11 +175,8 @@ stdenv.mkDerivation rec { # needed to prevent collisions between the LICENSE.txt files of # bambu-studio and orca-slicer. postInstall = '' - mkdir -p $out/share/doc - mv $out/LICENSE.txt $out/share/doc/LICENSE.txt - if [ -f $out/README.md ]; then - mv $out/README.md $out/share/doc/README.md - fi + mv $out/LICENSE.txt $out/share/BambuStudio/LICENSE.txt + mv $out/README.md $out/share/BambuStudio/README.md ''; meta = with lib; { diff --git a/pkgs/applications/misc/bambu-studio/orca-slicer.nix b/pkgs/applications/misc/bambu-studio/orca-slicer.nix index 5e10050078d6c..af89be65246d3 100644 --- a/pkgs/applications/misc/bambu-studio/orca-slicer.nix +++ b/pkgs/applications/misc/bambu-studio/orca-slicer.nix @@ -1,27 +1,41 @@ -{ lib, fetchFromGitHub, makeDesktopItem, bambu-studio }: +{ + lib, + fetchFromGitHub, + bambu-studio, +}: -bambu-studio.overrideAttrs (finalAttrs: previousAttrs: { - version = "2.0.0"; - pname = "orca-slicer"; +bambu-studio.overrideAttrs ( + finalAttrs: previousAttrs: { + version = "2.0.0"; + pname = "orca-slicer"; - # Don't inherit patches from bambu-studio - patches = [ - ./0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch - ]; + # Don't inherit patches from bambu-studio + patches = [ ./0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch ]; - src = fetchFromGitHub { - owner = "SoftFever"; - repo = "OrcaSlicer"; - rev = "v${finalAttrs.version}"; - hash = "sha256-YlLDUH3ODIfax5QwnsVJi1JjZ9WtxP3ssqRP1C4d4bw="; - }; + src = fetchFromGitHub { + owner = "SoftFever"; + repo = "OrcaSlicer"; + rev = "v${finalAttrs.version}"; + hash = "sha256-YlLDUH3ODIfax5QwnsVJi1JjZ9WtxP3ssqRP1C4d4bw="; + }; - meta = with lib; { - description = "G-code generator for 3D printers (Bambu, Prusa, Voron, VzBot, RatRig, Creality, etc"; - homepage = "https://github.com/SoftFever/OrcaSlicer"; - license = licenses.agpl3Only; - maintainers = with maintainers; [ zhaofengli ovlach pinpox ]; - mainProgram = "orca-slicer"; - platforms = platforms.linux; - }; -}) + # needed to prevent collisions between the LICENSE.txt files of + # bambu-studio and orca-slicer. + postInstall = '' + mv $out/LICENSE.txt $out/share/OrcaSlicer/LICENSE.txt + ''; + + meta = with lib; { + description = "G-code generator for 3D printers (Bambu, Prusa, Voron, VzBot, RatRig, Creality, etc"; + homepage = "https://github.com/SoftFever/OrcaSlicer"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ + zhaofengli + ovlach + pinpox + ]; + mainProgram = "orca-slicer"; + platforms = platforms.linux; + }; + } +) diff --git a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix index 5e61fc78091e6..0f27e7a770223 100644 --- a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix +++ b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "chatterino2"; - version = "2.4.6"; + version = "2.5.0"; src = fetchFromGitHub { owner = "Chatterino"; repo = pname; rev = "v${version}"; - sha256 = "sha256-CQviw5Fw6v5EwjCldAQoJfAIZMWKBfBzUIQZEgW34k0="; + sha256 = "sha256-uR2X0NNSLyOx5n3mZcp6+wW/7L7rHHH2MlOF+c0Uzm0="; fetchSubmodules = true; }; nativeBuildInputs = [ cmake pkg-config qt6.wrapQtAppsHook ]; diff --git a/pkgs/applications/office/paperwork/paperwork-backend.nix b/pkgs/applications/office/paperwork/paperwork-backend.nix index 4460e50ab6246..b5620d3f40df0 100644 --- a/pkgs/applications/office/paperwork/paperwork-backend.nix +++ b/pkgs/applications/office/paperwork/paperwork-backend.nix @@ -1,6 +1,7 @@ { buildPythonPackage , lib , fetchFromGitLab +, fetchpatch , pyenchant , scikit-learn , pypillowfight @@ -33,6 +34,13 @@ buildPythonPackage rec { sourceRoot = "${src.name}/paperwork-backend"; patches = [ + # fixes building with recent scipy + # remove on next release + (fetchpatch { + url = "https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/commit/abcebfe9714644d4e259e53b10e0e9417b5b864f.patch"; + hash = "sha256-YjVpphThW5Livs+PZJZDSgJvhLSXhZ1bnlWMwfY4HTg="; + }) + # disables a flaky test https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/issues/1035#note_1493700 ./flaky_test.patch ]; |