diff options
Diffstat (limited to 'pkgs/applications/misc')
65 files changed, 332 insertions, 591 deletions
diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/applications/misc/albert/default.nix index 5b1e1aac20c1a..0c4193aa2e5dd 100644 --- a/pkgs/applications/misc/albert/default.nix +++ b/pkgs/applications/misc/albert/default.nix @@ -1,32 +1,33 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, libqalculate -, muparser -, libarchive -, python3Packages -, qtbase -, qtscxml -, qtsvg -, qtdeclarative -, qtwayland -, qt5compat -, qttools -, wrapQtAppsHook -, nix-update-script -, pkg-config +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + libqalculate, + muparser, + libarchive, + python3Packages, + qtbase, + qtscxml, + qtsvg, + qtdeclarative, + qtwayland, + qt5compat, + qttools, + wrapQtAppsHook, + nix-update-script, + pkg-config, }: stdenv.mkDerivation (finalAttrs: { pname = "albert"; - version = "0.23.0"; + version = "0.24.2"; src = fetchFromGitHub { owner = "albertlauncher"; repo = "albert"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-L6qHaksArgwySk6J7N5zamUDWh5qa6zTtPFdpxU2NTM="; + sha256 = "sha256-Z88amcPb2jCJduRu8CGQ20y2o5cXmL4rpRL0hGCEYgM="; fetchSubmodules = true; }; @@ -36,24 +37,31 @@ stdenv.mkDerivation (finalAttrs: { wrapQtAppsHook ]; - buildInputs = [ - libqalculate - libarchive - muparser - qtbase - qtscxml - qtsvg - qtdeclarative - qtwayland - qt5compat - qttools - ] ++ (with python3Packages; [ python pybind11 ]); + buildInputs = + [ + libqalculate + libarchive + muparser + qtbase + qtscxml + qtsvg + qtdeclarative + qtwayland + qt5compat + qttools + ] + ++ (with python3Packages; [ + python + pybind11 + ]); postPatch = '' find -type f -name CMakeLists.txt -exec sed -i {} -e '/INSTALL_RPATH/d' \; - sed -i src/qtpluginprovider.cpp \ - -e "/QStringList dirs = {/a QFileInfo(\"$out/lib\").canonicalFilePath()," + # WARN: This is necessary for albert to detect the package libraries. + # Please check if the file below has changed upstream before updating. + sed -i src/app/qtpluginprovider.cpp \ + -e "/QStringList install_paths;/a install_paths << QFileInfo(\"$out/lib\").canonicalFilePath();" ''; postFixup = '' @@ -77,7 +85,11 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/albertlauncher/albert/blob/${finalAttrs.src.rev}/CHANGELOG.md"; # See: https://github.com/NixOS/nixpkgs/issues/279226 license = licenses.unfree; - maintainers = with maintainers; [ ericsagnes synthetica ]; + maintainers = with maintainers; [ + ericsagnes + synthetica + eljamm + ]; mainProgram = "albert"; platforms = platforms.linux; }; diff --git a/pkgs/applications/misc/bambu-studio/0002-fix-build-for-gcc-13.diff b/pkgs/applications/misc/bambu-studio/0002-fix-build-for-gcc-13.diff new file mode 100644 index 0000000000000..cc832bb107291 --- /dev/null +++ b/pkgs/applications/misc/bambu-studio/0002-fix-build-for-gcc-13.diff @@ -0,0 +1,38 @@ +diff --git a/src/slic3r/Utils/Http.cpp b/src/slic3r/Utils/Http.cpp +index 11a36dfabc..77a44e699b 100644 +--- a/src/slic3r/Utils/Http.cpp ++++ b/src/slic3r/Utils/Http.cpp +@@ -88,9 +88,13 @@ std::mutex g_mutex; + + struct form_file + { +- fs::ifstream ifs; ++ fs::ifstream ifs; + boost::filesystem::ifstream::off_type init_offset; + size_t content_length; ++ ++ form_file(fs::path const& p, const boost::filesystem::ifstream::off_type offset, const size_t content_length) ++ : ifs(p, std::ios::in | std::ios::binary), init_offset(offset), content_length(content_length) ++ {} + }; + + struct Http::priv +@@ -314,7 +318,7 @@ void Http::priv::form_add_file(const char *name, const fs::path &path, const cha + filename = path.string().c_str(); + } + +- form_files.emplace_back(form_file{{path, std::ios::in | std::ios::binary}, offset, length}); ++ form_files.emplace_back(path, offset, length); + auto &f = form_files.back(); + size_t size = length; + if (length == 0) { +@@ -381,7 +385,7 @@ void Http::priv::set_put_body(const fs::path &path) + boost::system::error_code ec; + boost::uintmax_t filesize = file_size(path, ec); + if (!ec) { +- putFile = std::make_unique<form_file>(form_file{{path, std::ios_base::binary | std::ios_base::in}, 0, 0}); ++ putFile = std::make_unique<form_file>(path, 0, 0); + ::curl_easy_setopt(curl, CURLOPT_UPLOAD, 1L); + ::curl_easy_setopt(curl, CURLOPT_READDATA, (void *) (putFile.get())); + ::curl_easy_setopt(curl, CURLOPT_INFILESIZE, filesize); + diff --git a/pkgs/applications/misc/bambu-studio/default.nix b/pkgs/applications/misc/bambu-studio/default.nix index 57ad17ea48774..70812441d3484 100644 --- a/pkgs/applications/misc/bambu-studio/default.nix +++ b/pkgs/applications/misc/bambu-studio/default.nix @@ -37,7 +37,6 @@ opencascade-occt_7_6, openvdb, pcre, - qhull, systemd, tbb_2021_11, webkitgtk, @@ -53,7 +52,7 @@ let "--enable-debug=no" ]; }); - openvdb_tbb_2021_8 = openvdb.overrideAttrs (old: rec { + openvdb_tbb_2021_8 = openvdb.overrideAttrs (old: { buildInputs = [ openexr boost179 diff --git a/pkgs/applications/misc/bambu-studio/dont-link-opencv-world.patch b/pkgs/applications/misc/bambu-studio/dont-link-opencv-world.patch new file mode 100644 index 0000000000000..f558b3099ac3b --- /dev/null +++ b/pkgs/applications/misc/bambu-studio/dont-link-opencv-world.patch @@ -0,0 +1,14 @@ +diff --git a/src/libslic3r/CMakeLists.txt b/src/libslic3r/CMakeLists.txt +index 38a1b2499..00c9060b3 100644 +--- a/src/libslic3r/CMakeLists.txt ++++ b/src/libslic3r/CMakeLists.txt +@@ -573,7 +573,8 @@ target_link_libraries(libslic3r + mcut + JPEG::JPEG + qoi +- opencv_world ++ opencv_core ++ opencv_imgproc + ) + + if(NOT WIN32) diff --git a/pkgs/applications/misc/bambu-studio/orca-slicer.nix b/pkgs/applications/misc/bambu-studio/orca-slicer.nix index af89be65246d3..7428453a20ccb 100644 --- a/pkgs/applications/misc/bambu-studio/orca-slicer.nix +++ b/pkgs/applications/misc/bambu-studio/orca-slicer.nix @@ -2,23 +2,42 @@ lib, fetchFromGitHub, bambu-studio, + opencv2, }: - bambu-studio.overrideAttrs ( finalAttrs: previousAttrs: { - version = "2.0.0"; + version = "2.1.1"; pname = "orca-slicer"; - # 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="; + hash = "sha256-7fusdSYpZb4sYl5L/+81PzMd42Nsejj+kCZsq0f7eIk="; }; + patches = + previousAttrs.patches + ++ [ + # FIXME: only required for 2.1.1, can be removed in the next version + ./0002-fix-build-for-gcc-13.diff + + ./dont-link-opencv-world.patch + ]; + + buildInputs = + previousAttrs.buildInputs + ++ [ + opencv2 + ]; + + preFixup = '' + gappsWrapperArgs+=( + # Fixes blackscreen dialogs + --set WEBKIT_DISABLE_COMPOSITING_MODE 1 + ) + ''; + # needed to prevent collisions between the LICENSE.txt files of # bambu-studio and orca-slicer. postInstall = '' @@ -26,7 +45,7 @@ bambu-studio.overrideAttrs ( ''; meta = with lib; { - description = "G-code generator for 3D printers (Bambu, Prusa, Voron, VzBot, RatRig, Creality, etc"; + 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; [ diff --git a/pkgs/applications/misc/bazecor/default.nix b/pkgs/applications/misc/bazecor/default.nix index ed1900836fccc..02d15b5068722 100644 --- a/pkgs/applications/misc/bazecor/default.nix +++ b/pkgs/applications/misc/bazecor/default.nix @@ -1,12 +1,12 @@ -{ lib -, appimageTools -, fetchurl +{ + lib, + appimageTools, + fetchurl, + makeWrapper, }: - -appimageTools.wrapAppImage rec { +let pname = "bazecor"; version = "1.3.11"; - src = appimageTools.extract { inherit pname version; src = fetchurl { @@ -18,11 +18,14 @@ appimageTools.wrapAppImage rec { postExtract = '' substituteInPlace \ $out/usr/lib/bazecor/resources/app/.webpack/main/index.js \ - --replace \ + --replace-fail \ 'checkUdev=()=>{try{if(c.default.existsSync(f))return c.default.readFileSync(f,"utf-8").trim()===l.trim()}catch(e){console.error(e)}return!1}' \ 'checkUdev=()=>{return 1}' ''; }; +in +appimageTools.wrapAppImage { + inherit pname version src; # also make sure to update the udev rules in ./10-dygma.rules; most recently # taken from @@ -35,14 +38,18 @@ appimageTools.wrapAppImage rec { # to allow non-root modifications to the keyboards. extraInstallCommands = '' - install -m 444 -D ${src}/Bazecor.desktop -t $out/share/applications - substituteInPlace $out/share/applications/Bazecor.desktop \ - --replace 'Exec=Bazecor' 'Exec=bazecor' + source "${makeWrapper}/nix-support/setup-hook" + wrapProgram $out/bin/bazecor \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" + install -m 444 -D ${src}/Bazecor.desktop -t $out/share/applications install -m 444 -D ${src}/bazecor.png -t $out/share/pixmaps mkdir -p $out/lib/udev/rules.d - ln -s --target-directory=$out/lib/udev/rules.d ${./10-dygma.rules} + install -m 444 -D ${./10-dygma.rules} $out/lib/udev/rules.d/10-dygma.rules + + substituteInPlace $out/share/applications/Bazecor.desktop \ + --replace-fail 'Exec=Bazecor' 'Exec=bazecor' ''; meta = { @@ -51,7 +58,10 @@ appimageTools.wrapAppImage rec { changelog = "https://github.com/Dygmalab/Bazecor/releases/tag/v${version}"; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ amesgen ]; + maintainers = with lib.maintainers; [ + amesgen + gcleroux + ]; platforms = [ "x86_64-linux" ]; mainProgram = "bazecor"; }; diff --git a/pkgs/applications/misc/bemenu/default.nix b/pkgs/applications/misc/bemenu/default.nix index d017f4306fe73..021b793015fff 100644 --- a/pkgs/applications/misc/bemenu/default.nix +++ b/pkgs/applications/misc/bemenu/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/Cloudef/bemenu"; description = "Dynamic menu library and client program inspired by dmenu"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ crertel ]; mainProgram = "bemenu"; platforms = with platforms; linux; }; diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 18d76788dadf6..0033d3e1bd2ab 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -7,6 +7,7 @@ SDL, addOpenGLRunpath, alembic, + blender, boost, brotli, callPackage, @@ -372,6 +373,20 @@ stdenv.mkDerivation (finalAttrs: { --render-frame 1 done ''; + tester-cudaAvailable = cudaPackages.writeGpuTestPython { } '' + import subprocess + subprocess.run([${ + lib.concatMapStringsSep ", " (x: ''"${x}"'') [ + (lib.getExe (blender.override { cudaSupport = true; })) + "--background" + "-noaudio" + "--python-exit-code" + "1" + "--python" + "${./test-cuda.py}" + ] + }], check=True) # noqa: E501 + ''; }; }; @@ -381,7 +396,8 @@ stdenv.mkDerivation (finalAttrs: { # They comment two licenses: GPLv2 and Blender License, but they # say: "We've decided to cancel the BL offering for an indefinite period." # OptiX, enabled with cudaSupport, is non-free. - license = with lib.licenses; [ gpl2Plus ] ++ lib.optional cudaSupport unfree; + license = with lib.licenses; [ gpl2Plus ] ++ lib.optional cudaSupport (unfree // { shortName = "NVidia OptiX EULA"; }); + platforms = [ "aarch64-linux" "x86_64-darwin" diff --git a/pkgs/applications/misc/blender/test-cuda.py b/pkgs/applications/misc/blender/test-cuda.py new file mode 100644 index 0000000000000..8a3ec57347592 --- /dev/null +++ b/pkgs/applications/misc/blender/test-cuda.py @@ -0,0 +1,8 @@ +import bpy + +preferences = bpy.context.preferences.addons["cycles"].preferences +devices = preferences.get_devices_for_type("CUDA") +ids = [d.id for d in devices] + +assert any("CUDA" in i for i in ids), f"CUDA not present in {ids}" +print("CUDA is available") diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 0e19d15973651..e1bf6cffb008d 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -21,12 +21,13 @@ , qmake , qtbase , qtwayland -, removeReferencesTo , speechd , sqlite , wrapQtAppsHook , xdg-utils , wrapGAppsHook3 +, popplerSupport ? true +, speechSupport ? true , unrarSupport ? false }: @@ -69,7 +70,6 @@ stdenv.mkDerivation (finalAttrs: { cmake pkg-config qmake - removeReferencesTo wrapGAppsHook3 wrapQtAppsHook ]; @@ -91,48 +91,48 @@ stdenv.mkDerivation (finalAttrs: { qtbase qtwayland sqlite + (python3Packages.python.withPackages + (ps: with ps; [ + (apsw.overrideAttrs (oldAttrs: { + setupPyBuildFlags = [ "--enable=load_extension" ]; + })) + beautifulsoup4 + css-parser + cssselect + python-dateutil + dnspython + faust-cchardet + feedparser + html2text + html5-parser + lxml + markdown + mechanize + msgpack + netifaces + pillow + pychm + pyqt-builder + pyqt6 + python + regex + sip + setuptools + zeroconf + jeepney + pycryptodome + xxhash + # the following are distributed with calibre, but we use upstream instead + odfpy + ] ++ lib.optionals (lib.lists.any (p: p == stdenv.hostPlatform.system) pyqt6-webengine.meta.platforms) [ + # much of calibre's functionality is usable without a web + # browser, so we enable building on platforms which qtwebengine + # does not support by simply omitting qtwebengine. + pyqt6-webengine + ] ++ lib.optional (unrarSupport) unrardll) + ) xdg-utils - ] ++ ( - with python3Packages; [ - (apsw.overrideAttrs (oldAttrs: { - setupPyBuildFlags = [ "--enable=load_extension" ]; - })) - beautifulsoup4 - css-parser - cssselect - python-dateutil - dnspython - faust-cchardet - feedparser - html2text - html5-parser - lxml - markdown - mechanize - msgpack - netifaces - pillow - pychm - pyqt-builder - pyqt6 - python - regex - sip - setuptools - speechd - zeroconf - jeepney - pycryptodome - xxhash - # the following are distributed with calibre, but we use upstream instead - odfpy - ] ++ lib.optionals (lib.lists.any (p: p == stdenv.hostPlatform.system) pyqt6-webengine.meta.platforms) [ - # much of calibre's functionality is usable without a web - # browser, so we enable building on platforms which qtwebengine - # does not support by simply omitting qtwebengine. - pyqt6-webengine - ] ++ lib.optional (unrarSupport) unrardll - ); + ] ++ lib.optional (speechSupport) speechd; installPhase = '' runHook preInstall @@ -149,7 +149,7 @@ stdenv.mkDerivation (finalAttrs: { export XDG_DATA_HOME=$out/share export XDG_UTILS_INSTALL_MODE="user" - ${python3Packages.python.pythonOnBuildForHost.interpreter} setup.py install --root=$out \ + python setup.py install --root=$out \ --prefix=$out \ --libdir=$out/lib \ --staging-root=$out \ @@ -173,23 +173,18 @@ stdenv.mkDerivation (finalAttrs: { dontWrapQtApps = true; dontWrapGApps = true; - # Remove some references to shrink the closure size. This reference (as of - # 2018-11-06) was a single string like the following: - # /nix/store/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx-podofo-0.9.6-dev/include/podofo/base/PdfVariant.h - preFixup = '' - remove-references-to -t ${podofo.dev} \ - $out/lib/calibre/calibre/plugins/podofo.so - - for program in $out/bin/*; do - wrapProgram $program \ - ''${qtWrapperArgs[@]} \ - ''${gappsWrapperArgs[@]} \ - --prefix PYTHONPATH : $PYTHONPATH \ - --prefix PATH : ${poppler_utils.out}/bin - done - ''; - - disallowedReferences = [ podofo.dev ]; + preFixup = + let + popplerArgs = "--prefix PATH : ${poppler_utils.out}/bin"; + in + '' + for program in $out/bin/*; do + wrapProgram $program \ + ''${qtWrapperArgs[@]} \ + ''${gappsWrapperArgs[@]} \ + ${if popplerSupport then popplerArgs else ""} + done + ''; meta = { homepage = "https://calibre-ebook.com"; diff --git a/pkgs/applications/misc/camunda-modeler/default.nix b/pkgs/applications/misc/camunda-modeler/default.nix index ce23411258420..8a8bf8ad5812c 100644 --- a/pkgs/applications/misc/camunda-modeler/default.nix +++ b/pkgs/applications/misc/camunda-modeler/default.nix @@ -9,11 +9,11 @@ stdenvNoCC.mkDerivation rec { pname = "camunda-modeler"; - version = "5.23.0"; + version = "5.25.0"; src = fetchurl { url = "https://github.com/camunda/camunda-modeler/releases/download/v${version}/camunda-modeler-${version}-linux-x64.tar.gz"; - hash = "sha256-x63UMIl0Wsr4qSEn19Of135PHKlpEVAZzhA2+ZjxNwY="; + hash = "sha256-4YeeeIC37s/cXZ4TjIxn/yvDVKP92f9uSBajLCj7NZw="; }; sourceRoot = "camunda-modeler-${version}-linux-x64"; diff --git a/pkgs/applications/misc/cartridges/default.nix b/pkgs/applications/misc/cartridges/default.nix deleted file mode 100644 index 3674d61fafcae..0000000000000 --- a/pkgs/applications/misc/cartridges/default.nix +++ /dev/null @@ -1,75 +0,0 @@ -{ blueprint-compiler -, desktop-file-utils -, fetchFromGitHub -, gobject-introspection -, lib -, libadwaita -, meson -, ninja -, python3Packages -, stdenv -, wrapGAppsHook4 -, nix-update-script -}: -stdenv.mkDerivation (finalAttrs: { - pname = "cartridges"; - version = "2.8.5"; - - src = fetchFromGitHub { - owner = "kra-mo"; - repo = "cartridges"; - rev = "v${finalAttrs.version}"; - hash = "sha256-7T+q3T8z8SCpAn3ayodZeETOsTwL+hhVWzY2JyBEoi4="; - }; - - pythonPath = with python3Packages; [ - pillow - pygobject3 - pyyaml - requests - ]; - - # TODO: remove this when #286814 hits master - mesonFlags = [ "-Dtiff_compression=jpeg" ]; - - buildInputs = [ - libadwaita - (python3Packages.python.withPackages (_: finalAttrs.pythonPath)) - ]; - - nativeBuildInputs = [ - blueprint-compiler - desktop-file-utils - gobject-introspection - meson - ninja - python3Packages.wrapPython - wrapGAppsHook4 - ]; - - dontWrapGApps = true; - - postFixup = '' - makeWrapperArgs+=("''${gappsWrapperArgs[@]}") - wrapPythonPrograms "$out/bin" "$out" "$pythonPath" - ''; - - passthru = { - updateScript = nix-update-script { }; - }; - - meta = with lib; { - description = "GTK4 + Libadwaita game launcher"; - mainProgram = "cartridges"; - longDescription = '' - A simple game launcher for all of your games. - It has support for importing games from Steam, Lutris, Heroic - and more with no login necessary. - You can sort and hide games or download cover art from SteamGridDB. - ''; - homepage = "https://apps.gnome.org/Cartridges/"; - license = licenses.gpl3Plus; - maintainers = [ maintainers.getchoo ]; - platforms = platforms.linux; - }; -}) diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix index f3429399b1633..d3c1ac3506528 100644 --- a/pkgs/applications/misc/cherrytree/default.nix +++ b/pkgs/applications/misc/cherrytree/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "cherrytree"; - version = "1.1.2"; + version = "1.1.3"; src = fetchFromGitHub { owner = "giuspen"; repo = "cherrytree"; rev = "refs/tags/v${version}"; - hash = "sha256-gDDFrF1yK6mWwkb3KJVRj6P5aiH1pQ/xL17XwVb4rfk="; + hash = "sha256-Xtm+SFJOSb04WlooRhTopYtyiXEOkOmiPojM8E7l5vY="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cobang/default.nix b/pkgs/applications/misc/cobang/default.nix index 49e3f13b6d2e5..0aca420fc7a45 100644 --- a/pkgs/applications/misc/cobang/default.nix +++ b/pkgs/applications/misc/cobang/default.nix @@ -24,14 +24,14 @@ buildPythonApplication rec { pname = "cobang"; - version = "0.12.0"; + version = "0.14.1"; pyproject = true; src = fetchFromGitHub { owner = "hongquan"; repo = "CoBang"; rev = "refs/tags/v${version}"; - hash = "sha256-4INScFnYSwVnGjaohgDL3Sv/NeIwiiyLux8c9/Y/Wq4="; + hash = "sha256-/8JtDoXFQGlM7tlwKd+WRIKpnKCD6OnMmbvElg7LbzU="; }; postPatch = '' diff --git a/pkgs/applications/misc/collision/default.nix b/pkgs/applications/misc/collision/default.nix index 8fd8ad8f33ba9..96f19b47968aa 100644 --- a/pkgs/applications/misc/collision/default.nix +++ b/pkgs/applications/misc/collision/default.nix @@ -5,7 +5,7 @@ , wrapGAppsHook4 , desktopToDarwinBundle , gobject-introspection -, gnome +, nautilus-python , python3 , libadwaita , openssl @@ -20,13 +20,13 @@ crystal.buildCrystalPackage rec { pname = "Collision"; - version = "3.8.0"; + version = "3.8.1"; src = fetchFromGitHub { owner = "GeopJr"; repo = "Collision"; rev = "v${version}"; - hash = "sha256-Bo/u0UYM/N7tLqdCs2OU5pdj2s9LXPooSR1PCGk9dSc="; + hash = "sha256-55qCHc+snMAUFAT31Z8EPtJ/HLrnv1BveCEzjkn7N5g="; }; postPatch = '' @@ -54,7 +54,7 @@ crystal.buildCrystalPackage rec { libadwaita openssl libxml2 - gnome.nautilus-python + nautilus-python python3.pkgs.pygobject3 ]; diff --git a/pkgs/applications/misc/collision/shards.nix b/pkgs/applications/misc/collision/shards.nix index e1b6032d5932d..0fe9fac03eb9c 100644 --- a/pkgs/applications/misc/collision/shards.nix +++ b/pkgs/applications/misc/collision/shards.nix @@ -11,8 +11,8 @@ }; gi-crystal = { url = "https://github.com/hugopl/gi-crystal.git"; - rev = "v0.22.2"; - sha256 = "0bpa1f8iaf97z2kbgjc7nc8km7nd7bppiwna319lm2hvm8m5pw15"; + rev = "v0.22.3"; + sha256 = "1xyj5bf3l2i1yzqxb8yyj0fc3kwi9nnd57n5dhs5xm9jxzcvw1kk"; }; gtk4 = { url = "https://github.com/hugopl/gtk4.cr.git"; diff --git a/pkgs/applications/misc/cum/default.nix b/pkgs/applications/misc/cum/default.nix index b06f77787ac0e..5431dab2cf4e3 100644 --- a/pkgs/applications/misc/cum/default.nix +++ b/pkgs/applications/misc/cum/default.nix @@ -31,7 +31,7 @@ buildPythonApplication rec { mainProgram = "cum"; homepage = "https://github.com/Hamuko/cum"; license = licenses.asl20; - maintainers = with maintainers; [ tadeokondrak ]; + maintainers = with maintainers; [ ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/misc/dasel/default.nix b/pkgs/applications/misc/dasel/default.nix index 56bd8bce5bc09..a9d7d2730a72c 100644 --- a/pkgs/applications/misc/dasel/default.nix +++ b/pkgs/applications/misc/dasel/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "dasel"; - version = "2.7.0"; + version = "2.8.0"; src = fetchFromGitHub { owner = "TomWright"; repo = "dasel"; rev = "v${version}"; - hash = "sha256-N3WeU+8KJwYKvuN4I1ZNEtIgLTmh/XgnhwATwV7dsvY="; + hash = "sha256-j9gwE/iLbBM8sdNZgc7hYnKhJEMkLn/g9HVlsKn4moo="; }; - vendorHash = "sha256-G9IdTMF5Lnwq38rdJtuvUjD4RBaSmCYs3g+ETz29Mec="; + vendorHash = "sha256-edyFs5oURklkqsTF7JA1in3XteSBx/6YEVu4MjIcGN4="; ldflags = [ "-s" "-w" "-X github.com/tomwright/dasel/v2/internal.Version=${version}" diff --git a/pkgs/applications/misc/elastic/default.nix b/pkgs/applications/misc/elastic/default.nix index ae614d35a4e05..d9d7681b36c82 100644 --- a/pkgs/applications/misc/elastic/default.nix +++ b/pkgs/applications/misc/elastic/default.nix @@ -11,21 +11,20 @@ , gtksourceview5 , blueprint-compiler , wrapGAppsHook4 -, appstream-glib , desktop-file-utils , template-glib }: stdenv.mkDerivation rec { pname = "elastic"; - version = "0.1.4"; + version = "0.1.5"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "elastic"; rev = version; - hash = "sha256-EExVhf71SEWVcAOAt+IuQH3umNOY4hzzkFVIqnESppo="; + hash = "sha256-y/XBXN5RIqnFmxnmkThBGW0B5owgy/1Q/6jmkBCi+rk="; }; nativeBuildInputs = [ @@ -34,7 +33,6 @@ stdenv.mkDerivation rec { vala pkg-config wrapGAppsHook4 - appstream-glib desktop-file-utils blueprint-compiler ]; diff --git a/pkgs/applications/misc/fff/default.nix b/pkgs/applications/misc/fff/default.nix index 351796a036d26..d7bb50f59e43f 100644 --- a/pkgs/applications/misc/fff/default.nix +++ b/pkgs/applications/misc/fff/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { mainProgram = "fff"; homepage = "https://github.com/dylanaraps/fff"; license = licenses.mit; - maintainers = [ maintainers.tadeokondrak ]; + maintainers = [ ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/misc/filet/default.nix b/pkgs/applications/misc/filet/default.nix index 2c03c6e76ea24..d9f7bd91ab2ec 100644 --- a/pkgs/applications/misc/filet/default.nix +++ b/pkgs/applications/misc/filet/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/buffet/filet"; license = licenses.mpl20; platforms = platforms.all; - maintainers = with maintainers; [ buffet ]; + maintainers = with maintainers; [ ]; mainProgram = "filet"; }; } diff --git a/pkgs/applications/misc/fluidd/default.nix b/pkgs/applications/misc/fluidd/default.nix index 3694f8e232201..c3d5340640b32 100644 --- a/pkgs/applications/misc/fluidd/default.nix +++ b/pkgs/applications/misc/fluidd/default.nix @@ -2,12 +2,12 @@ stdenvNoCC.mkDerivation rec { pname = "fluidd"; - version = "1.30.0"; + version = "1.30.1"; src = fetchurl { name = "fluidd-v${version}.zip"; url = "https://github.com/cadriel/fluidd/releases/download/v${version}/fluidd.zip"; - sha256 = "sha256-+nPVnKuZtYGFtqC48XNISSjay3lDAYR3l50kq026H3Q="; + sha256 = "sha256-R8lCAZkClmCFkiNPf9KGlzj2td3KxCx/7UkdTJgDtwY="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index 1172571488838..022416c37611f 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -9,13 +9,13 @@ buildPythonApplication rec { pname = "gallery-dl"; - version = "1.27.0"; + version = "1.27.1"; format = "setuptools"; src = fetchPypi { inherit version; pname = "gallery_dl"; - hash = "sha256-zMimHjaXgwOSt8HbSec4o0y3e9Xf6tFFiI4KzsrP850="; + hash = "sha256-S1RF0FNJ/oKTwq9SXXIOnqBIViGIYBVuxPjV/6fbeV8="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/misc/gcal/default.nix b/pkgs/applications/misc/gcal/default.nix index a6b98ccccf08e..8f345f39b534a 100644 --- a/pkgs/applications/misc/gcal/default.nix +++ b/pkgs/applications/misc/gcal/default.nix @@ -34,5 +34,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.romildo ]; + mainProgram = "gcal"; }; } diff --git a/pkgs/applications/misc/gpx-viewer/default.nix b/pkgs/applications/misc/gpx-viewer/default.nix index daaf92fc72de2..a04cf4ec7c773 100644 --- a/pkgs/applications/misc/gpx-viewer/default.nix +++ b/pkgs/applications/misc/gpx-viewer/default.nix @@ -7,7 +7,7 @@ , ninja , vala , pkg-config -, gnome +, adwaita-icon-theme , libchamplain , gdl , wrapGAppsHook3 @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { buildInputs = [ gdl libchamplain - gnome.adwaita-icon-theme + adwaita-icon-theme libxml2 ]; diff --git a/pkgs/applications/misc/harsh/default.nix b/pkgs/applications/misc/harsh/default.nix index dc1021c6d8484..cc576b7a0acf7 100644 --- a/pkgs/applications/misc/harsh/default.nix +++ b/pkgs/applications/misc/harsh/default.nix @@ -21,7 +21,7 @@ buildGoModule rec { homepage = "https://github.com/wakatara/harsh"; changelog = "https://github.com/wakatara/harsh/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ laurailway ]; + maintainers = with maintainers; [ ]; mainProgram = "harsh"; }; } diff --git a/pkgs/applications/misc/inochi2d/generic.nix b/pkgs/applications/misc/inochi2d/generic.nix index 6666a63ca1ed9..769b44204420c 100644 --- a/pkgs/applications/misc/inochi2d/generic.nix +++ b/pkgs/applications/misc/inochi2d/generic.nix @@ -13,7 +13,7 @@ dbus, freetype, SDL2, - gnome, + zenity, builderArgs, }: @@ -126,7 +126,7 @@ buildDubPackage ( postFixup = '' # Add support for `open file` dialog makeWrapper $out/share/${pname}/${pname} $out/bin/${pname} \ - --prefix PATH : ${lib.makeBinPath [ gnome.zenity ]} + --prefix PATH : ${lib.makeBinPath [ zenity ]} ''; meta = { diff --git a/pkgs/applications/misc/j4-dmenu-desktop/default.nix b/pkgs/applications/misc/j4-dmenu-desktop/default.nix index b4ea7d829a3ec..9a50ac48740b3 100644 --- a/pkgs/applications/misc/j4-dmenu-desktop/default.nix +++ b/pkgs/applications/misc/j4-dmenu-desktop/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.gpl3Only; mainProgram = "j4-dmenu-desktop"; maintainers = with maintainers; [ ericsagnes ]; - platforms = platforms.unix; + platforms = platforms.linux; }; }) diff --git a/pkgs/applications/misc/keeweb/default.nix b/pkgs/applications/misc/keeweb/default.nix index a7260dc509b72..33ebb9e329f25 100644 --- a/pkgs/applications/misc/keeweb/default.nix +++ b/pkgs/applications/misc/keeweb/default.nix @@ -13,7 +13,7 @@ , nss , udev , xorg -, gnome +, gnome-keyring , mesa , gtk3 , libusb1 @@ -54,7 +54,7 @@ let xorg.libXScrnSaver xorg.libXtst xorg.libxshmfence - gnome.gnome-keyring + gnome-keyring mesa gtk3 libusb1 diff --git a/pkgs/applications/misc/keymapp/default.nix b/pkgs/applications/misc/keymapp/default.nix deleted file mode 100644 index 59dae9589fa7a..0000000000000 --- a/pkgs/applications/misc/keymapp/default.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ stdenv -, lib -, fetchurl -, autoPatchelfHook -, wrapGAppsHook3 -, libusb1 -, webkitgtk -, gtk3 -, writeShellScript -, makeDesktopItem -, copyDesktopItems -}: -let - desktopItem = makeDesktopItem { - name = "keymapp"; - icon = "keymapp"; - desktopName = "Keymapp"; - categories = [ "Settings" "HardwareSettings" ]; - type = "Application"; - exec = "keymapp"; - }; -in -stdenv.mkDerivation rec { - pname = "keymapp"; - version = "1.1.1"; - - src = fetchurl { - url = "https://oryx.nyc3.cdn.digitaloceanspaces.com/keymapp/keymapp-${version}.tar.gz"; - hash = "sha256-tbRlJ65hHPBDwoXAXf++OdcW67RcqR1x1vfhbPCo1Ls="; - }; - - nativeBuildInputs = [ - copyDesktopItems - autoPatchelfHook - wrapGAppsHook3 - ]; - - buildInputs = [ - libusb1 - webkitgtk - gtk3 - ]; - - sourceRoot = "."; - - installPhase = '' - runHook preInstall - - install -m755 -D keymapp "$out/bin/${pname}" - install -Dm644 icon.png "$out/share/pixmaps/${pname}.png" - - runHook postInstall - ''; - - preFixup = '' - gappsWrapperArgs+=(--set-default '__NV_PRIME_RENDER_OFFLOAD' 1) - ''; - - desktopItems = [ desktopItem ]; - - meta = with lib; { - homepage = "https://www.zsa.io/flash/"; - description = "Application for ZSA keyboards"; - maintainers = with lib.maintainers; [ jankaifer shawn8901 ]; - platforms = platforms.linux; - license = lib.licenses.unfree; - }; -} diff --git a/pkgs/applications/misc/livecaptions/default.nix b/pkgs/applications/misc/livecaptions/default.nix deleted file mode 100644 index 2d52e96fe3597..0000000000000 --- a/pkgs/applications/misc/livecaptions/default.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - fetchurl, - meson, - ninja, - pkg-config, - cmake, - desktop-file-utils, - wrapGAppsHook4, - onnxruntime, - libadwaita, - libpulseaudio, - xorg, -}: let - aprilAsr = fetchFromGitHub { - name = "april-asr"; - owner = "abb128"; - repo = "april-asr"; - rev = "3308e68442664552de593957cad0fa443ea183dd"; - hash = "sha256-/cOZ2EcZu/Br9v0ComxnOegcEtlC9e8FYt3XHfah7mE="; - }; - - aprilModel = fetchurl { - name = "april-english-dev-01110_en.april"; - url = "https://april.sapples.net/april-english-dev-01110_en.april"; - hash = "sha256-d+uV0PpPdwijfoaMImUwHubELcsl5jymPuo9nLrbwfM="; - }; -in - stdenv.mkDerivation (finalAttrs: { - pname = "livecaptions"; - version = "0.4.1"; - - src = fetchFromGitHub { - owner = "abb128"; - repo = "LiveCaptions"; - rev = "v${finalAttrs.version}"; - hash = "sha256-x8NetSooIBlOKzKUMvDkPFtpD6EVGYECnaqWurySUDU="; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - cmake - desktop-file-utils # update-desktop-database - wrapGAppsHook4 - ]; - - buildInputs = [ - onnxruntime - libadwaita - libpulseaudio - xorg.libX11 - ]; - - postUnpack = '' - rm -r source/subprojects/april-asr - ln -sf ${aprilAsr} source/subprojects/april-asr - ''; - - preFixup = '' - gappsWrapperArgs+=( - --set APRIL_MODEL_PATH ${aprilModel} - ) - ''; - - meta = with lib; { - description = "Linux Desktop application that provides live captioning"; - homepage = "https://github.com/abb128/LiveCaptions"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [Scrumplex]; - mainProgram = "livecaptions"; - }; - }) diff --git a/pkgs/applications/misc/lutris/fhsenv.nix b/pkgs/applications/misc/lutris/fhsenv.nix index 6f9d023204012..0f2f1e9c08602 100644 --- a/pkgs/applications/misc/lutris/fhsenv.nix +++ b/pkgs/applications/misc/lutris/fhsenv.nix @@ -7,7 +7,7 @@ let qt5Deps = pkgs: with pkgs.qt5; [ qtbase qtmultimedia ]; - gnomeDeps = pkgs: with pkgs; [ gnome.zenity gtksourceview gnome-desktop gnome.libgnome-keyring webkitgtk ]; + gnomeDeps = pkgs: with pkgs; [ zenity gtksourceview gnome-desktop libgnome-keyring webkitgtk ]; xorgDeps = pkgs: with pkgs.xorg; [ libX11 libXrender libXrandr libxcb libXmu libpthreadstubs libXext libXdmcp libXxf86vm libXinerama libSM libXv libXaw libXi libXcursor libXcomposite diff --git a/pkgs/applications/misc/mob/default.nix b/pkgs/applications/misc/mob/default.nix index 7fb218266fa10..755cb735e737e 100644 --- a/pkgs/applications/misc/mob/default.nix +++ b/pkgs/applications/misc/mob/default.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "mob"; - version = "4.5.0"; + version = "5.0.0"; src = fetchFromGitHub { owner = "remotemobprogramming"; - repo = pname; + repo = "mob"; rev = "v${version}"; - sha256 = "sha256-uFtE7AprM/ye2sBQeszYy07RV7RmmqD9TGcTTuZwOfY="; + hash = "sha256-+pN+FGZCW5sPWpUNIYTFn26KBpHre+9PPBQwEcBNJWI="; }; vendorHash = null; diff --git a/pkgs/applications/misc/mobilecoin-wallet/default.nix b/pkgs/applications/misc/mobilecoin-wallet/default.nix index 42bbae72af5ae..91c59315ba6a9 100644 --- a/pkgs/applications/misc/mobilecoin-wallet/default.nix +++ b/pkgs/applications/misc/mobilecoin-wallet/default.nix @@ -2,22 +2,19 @@ let pname = "mobilecoin-wallet"; - version = "1.8.0"; - name = "${pname}-${version}"; + version = "1.9.1"; src = fetchurl { url = "https://github.com/mobilecoinofficial/desktop-wallet/releases/download/v${version}/MobileCoin.Wallet-${version}.AppImage"; - hash = "sha256-XGU/xxsMhOBAh+MeMtL2S707yH8HnoO9w5l7zqjO6rs="; + hash = "sha256-UCBQRcGFHMQlLGvChrrMmM0MYv7AZtlkngFK4ptIPU0="; }; - appimageContents = appimageTools.extractType2 { inherit name src; }; + appimageContents = appimageTools.extractType2 { inherit pname version src; }; in appimageTools.wrapType2 { - inherit name src; + inherit pname version src; extraPkgs = pkgs: [ pkgs.libsecret ]; extraInstallCommands = '' - mv $out/bin/${name} $out/bin/${pname} - mkdir -p $out/share/${pname} cp -a ${appimageContents}/locales $out/share/${pname} cp -a ${appimageContents}/resources $out/share/${pname} diff --git a/pkgs/applications/misc/moonlight-qt/darwin.diff b/pkgs/applications/misc/moonlight-qt/darwin.diff deleted file mode 100644 index 0c137fa0774c2..0000000000000 --- a/pkgs/applications/misc/moonlight-qt/darwin.diff +++ /dev/null @@ -1,38 +0,0 @@ ---- a/app/app.pro 2023-06-24 19:10:00.653377668 +0800 -+++ b/app/app.pro 2023-06-24 19:20:06.632188299 +0800 -@@ -49,19 +49,8 @@ - INCLUDEPATH += $$PWD/../libs/windows/include - LIBS += ws2_32.lib winmm.lib dxva2.lib ole32.lib gdi32.lib user32.lib d3d9.lib dwmapi.lib dbghelp.lib - } --macx { -- INCLUDEPATH += $$PWD/../libs/mac/include -- INCLUDEPATH += $$PWD/../libs/mac/Frameworks/SDL2.framework/Versions/A/Headers -- INCLUDEPATH += $$PWD/../libs/mac/Frameworks/SDL2_ttf.framework/Versions/A/Headers -- LIBS += -L$$PWD/../libs/mac/lib -F$$PWD/../libs/mac/Frameworks -- -- # QMake doesn't handle framework-style includes correctly on its own -- QMAKE_CFLAGS += -F$$PWD/../libs/mac/Frameworks -- QMAKE_CXXFLAGS += -F$$PWD/../libs/mac/Frameworks -- QMAKE_OBJECTIVE_CFLAGS += -F$$PWD/../libs/mac/Frameworks --} - --unix:!macx { -+unix { - CONFIG += link_pkgconfig - PKGCONFIG += openssl sdl2 SDL2_ttf opus - -@@ -120,13 +109,12 @@ - CONFIG += soundio discord-rpc - } - macx { -- LIBS += -lssl -lcrypto -lavcodec.60 -lavutil.58 -lopus -framework SDL2 -framework SDL2_ttf - LIBS += -lobjc -framework VideoToolbox -framework AVFoundation -framework CoreVideo -framework CoreGraphics -framework CoreMedia -framework AppKit -framework Metal - - # For libsoundio - LIBS += -framework CoreAudio -framework AudioUnit - -- CONFIG += ffmpeg soundio discord-rpc -+ CONFIG += ffmpeg soundio - } - - SOURCES += \ diff --git a/pkgs/applications/misc/moonlight-qt/default.nix b/pkgs/applications/misc/moonlight-qt/default.nix deleted file mode 100644 index 59c0b6eb8fbad..0000000000000 --- a/pkgs/applications/misc/moonlight-qt/default.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, wrapQtAppsHook -, pkg-config -, qmake -, qtquickcontrols2 -, SDL2 -, SDL2_ttf -, libva -, libvdpau -, libxkbcommon -, alsa-lib -, libpulseaudio -, openssl -, libopus -, ffmpeg -, wayland -, darwin -}: - -let - inherit (darwin.apple_sdk_11_0.frameworks) AVFoundation AppKit AudioUnit VideoToolbox; -in - -stdenv.mkDerivation rec { - pname = "moonlight-qt"; - version = "5.0.1"; - - src = fetchFromGitHub { - owner = "moonlight-stream"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-0ONjUqpM1tUnyaEnMgVl7ff6pND7kyqouv2mpgteZP0="; - fetchSubmodules = true; - }; - - patches = [ ./darwin.diff ]; - - nativeBuildInputs = [ - wrapQtAppsHook - pkg-config - qmake - ]; - - buildInputs = [ - qtquickcontrols2 - SDL2 - SDL2_ttf - openssl - libopus - ffmpeg - ] ++ lib.optionals stdenv.isLinux [ - libva - libvdpau - libxkbcommon - alsa-lib - libpulseaudio - wayland - ] ++ lib.optionals stdenv.isDarwin [ - AVFoundation - AppKit - AudioUnit - VideoToolbox - ]; - - postInstall = lib.optionalString stdenv.isDarwin '' - mkdir $out/Applications $out/bin - mv app/Moonlight.app $out/Applications - rm -r $out/Applications/Moonlight.app/Contents/Frameworks - ln -s $out/Applications/Moonlight.app/Contents/MacOS/Moonlight $out/bin/moonlight - ''; - - meta = with lib; { - description = "Play your PC games on almost any device"; - homepage = "https://moonlight-stream.org"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ luc65r ]; - platforms = platforms.all; - mainProgram = "moonlight"; - }; -} diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index 492722d33f49a..9422b6452cec2 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -208,7 +208,7 @@ stdenv.mkDerivation rec { description = "Lightweight PDF, XPS, and E-book viewer and toolkit written in portable C"; changelog = "https://git.ghostscript.com/?p=mupdf.git;a=blob_plain;f=CHANGES;hb=${version}"; license = licenses.agpl3Plus; - maintainers = with maintainers; [ vrthra fpletz lilyinstarlight ]; + maintainers = with maintainers; [ vrthra fpletz ]; platforms = platforms.unix; mainProgram = "mupdf"; }; diff --git a/pkgs/applications/misc/notify-osd-customizable/default.nix b/pkgs/applications/misc/notify-osd-customizable/default.nix index 49f6cf478fbbc..20fe2ad6d82b1 100644 --- a/pkgs/applications/misc/notify-osd-customizable/default.nix +++ b/pkgs/applications/misc/notify-osd-customizable/default.nix @@ -2,7 +2,7 @@ , dbus-glib , fetchurl , glib -, gnome +, gnome-common , libnotify , libtool , libwnck @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config makeWrapper libtool ]; buildInputs = [ glib libwnck libnotify dbus-glib - gsettings-desktop-schemas gnome.gnome-common + gsettings-desktop-schemas gnome-common ]; configureFlags = [ "--libexecdir=$(out)/bin" ]; diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index 000d94bbeec39..9ca05a653a358 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -13,7 +13,7 @@ let inherit (stdenv.hostPlatform) system; pname = "obsidian"; - version = "1.6.3"; + version = "1.6.5"; appname = "Obsidian"; meta = with lib; { description = "Powerful knowledge base that works on top of a local folder of plain text Markdown files"; @@ -23,10 +23,10 @@ let maintainers = with maintainers; [ atila conradmearns zaninime qbit kashw2 w-lfchen ]; }; - filename = if stdenv.isDarwin then "Obsidian-${version}-universal.dmg" else "obsidian-${version}.tar.gz"; + filename = if stdenv.isDarwin then "Obsidian-${version}.dmg" else "obsidian-${version}.tar.gz"; src = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}"; - hash = if stdenv.isDarwin then "sha256-o5ELpG82mJgcd9Pil6A99BPK6Hoa0OKJJkYpyfGJR9I=" else "sha256-ho8E2Iq+s/w8NjmxzZo/y5aj3MNgbyvIGjk3nSKPLDw="; + hash = if stdenv.isDarwin then "sha256-gA6FkCalGw0pgnCbOJliItLzMGr+CG9r6mSMdvVUAoQ=" else "sha256-9goJnKOgJk5TrFUNz4vff8704cvHfqZpGL/iBkcU2GY="; }; icon = fetchurl { diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index 9857865478a0e..83dc79a0598ac 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -116,13 +116,13 @@ let self: super: { octoprint = self.buildPythonPackage rec { pname = "OctoPrint"; - version = "1.10.1"; + version = "1.10.2"; src = fetchFromGitHub { owner = "OctoPrint"; repo = "OctoPrint"; rev = version; - hash = "sha256-kJTYIsbNr6cLzti8yg+IlXjbKwXuwumE3Wydy+oTeK4="; + hash = "sha256-vISMps2v18A7MkF24SyIcK5yOQsTxBQLnKybVd8R2FU="; }; propagatedBuildInputs = with self; [ diff --git a/pkgs/applications/misc/organicmaps/default.nix b/pkgs/applications/misc/organicmaps/default.nix index 5388b7b7485eb..d21e306c8a7a6 100644 --- a/pkgs/applications/misc/organicmaps/default.nix +++ b/pkgs/applications/misc/organicmaps/default.nix @@ -11,6 +11,7 @@ , qtbase , qtpositioning , qtsvg +, qtwayland , libGLU , libGL , zlib @@ -68,6 +69,7 @@ in stdenv.mkDerivation rec { qtbase qtpositioning qtsvg + qtwayland libGLU libGL zlib diff --git a/pkgs/applications/misc/otpclient/default.nix b/pkgs/applications/misc/otpclient/default.nix index 0ab84ea083720..8ca73be27547c 100644 --- a/pkgs/applications/misc/otpclient/default.nix +++ b/pkgs/applications/misc/otpclient/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "otpclient"; - version = "3.6.0"; + version = "3.7.0"; src = fetchFromGitHub { owner = "paolostivanin"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-3Nv2ci8MBjvWc7gF5UOJnyfSV8XK0REN1XwI8RUYgWI="; + hash = "sha256-Xw6Z/xDPQEVMdxMzrhtPAl3nOD7oMlZhKDb9bD8GEO8="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/parsec/bin.nix b/pkgs/applications/misc/parsec/bin.nix index e6c250afc321b..436822aa2b889 100644 --- a/pkgs/applications/misc/parsec/bin.nix +++ b/pkgs/applications/misc/parsec/bin.nix @@ -21,8 +21,7 @@ , libjpeg8 , curl , vulkan-loader -, gnome -, zenity ? gnome.zenity +, zenity }: stdenvNoCC.mkDerivation { diff --git a/pkgs/applications/misc/pass-secret-service/default.nix b/pkgs/applications/misc/pass-secret-service/default.nix index 1ce8511b27c7b..c377adc398915 100644 --- a/pkgs/applications/misc/pass-secret-service/default.nix +++ b/pkgs/applications/misc/pass-secret-service/default.nix @@ -72,6 +72,6 @@ python3.pkgs.buildPythonApplication rec { license = lib.licenses.gpl3Only; platforms = lib.platforms.all; mainProgram = "pass_secret_service"; - maintainers = with lib.maintainers; [ jluttine aidalgol ]; + maintainers = with lib.maintainers; [ jluttine ]; }; } diff --git a/pkgs/applications/misc/pdfarranger/default.nix b/pkgs/applications/misc/pdfarranger/default.nix index 7e0dc4c2fdb2c..5dda053eb7530 100644 --- a/pkgs/applications/misc/pdfarranger/default.nix +++ b/pkgs/applications/misc/pdfarranger/default.nix @@ -9,14 +9,14 @@ python3Packages.buildPythonApplication rec { pname = "pdfarranger"; - version = "1.10.1"; + version = "1.11.0"; pyproject = true; src = fetchFromGitHub { owner = "pdfarranger"; repo = "pdfarranger"; rev = "refs/tags/${version}"; - hash = "sha256-l//DeaIqUl6FdGFxM8yTKcTjVNvYMllorcoXoK33Iy4="; + hash = "sha256-bHV6EluA7xp+HyejnSWJwfRBDcTuZq5Gzz0KWIs0qhA="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/plank/default.nix b/pkgs/applications/misc/plank/default.nix index 69be975be0ba2..cd03f1521abfa 100644 --- a/pkgs/applications/misc/plank/default.nix +++ b/pkgs/applications/misc/plank/default.nix @@ -5,7 +5,7 @@ , cairo , dconf , glib -, gnome +, gnome-common , gtk3 , libwnck , libX11 @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook gettext - gnome.gnome-common + gnome-common libxml2 # xmllint pkg-config vala diff --git a/pkgs/applications/misc/pwsafe/default.nix b/pkgs/applications/misc/pwsafe/default.nix index 4dd5a5e2d280b..f752052da2c86 100644 --- a/pkgs/applications/misc/pwsafe/default.nix +++ b/pkgs/applications/misc/pwsafe/default.nix @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=${placeholder "out"}" ]; passthru.updateScript = gitUpdater { - ignoredVersions = "^([^1]|1[^.])"; # ignore anything other than 1.x + allowedVersions = "^1\\."; url = src.gitRepoUrl; }; diff --git a/pkgs/applications/misc/pytrainer/default.nix b/pkgs/applications/misc/pytrainer/default.nix index 57d5ae394381f..296a81e075da3 100644 --- a/pkgs/applications/misc/pytrainer/default.nix +++ b/pkgs/applications/misc/pytrainer/default.nix @@ -2,7 +2,7 @@ , python310 , fetchFromGitHub , gdk-pixbuf -, gnome +, adwaita-icon-theme , gpsbabel , glib-networking , glibcLocales @@ -55,7 +55,7 @@ in python.pkgs.buildPythonApplication rec { gtk3 webkitgtk glib-networking - gnome.adwaita-icon-theme + adwaita-icon-theme gdk-pixbuf ]; diff --git a/pkgs/applications/misc/qMasterPassword/default.nix b/pkgs/applications/misc/qMasterPassword/default.nix index e6a672040824b..a28e8d588693d 100644 --- a/pkgs/applications/misc/qMasterPassword/default.nix +++ b/pkgs/applications/misc/qMasterPassword/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/bkueng/qMasterPassword"; license = licenses.gpl3; - maintainers = with lib.maintainers; [ tadeokondrak teutat3s ]; + maintainers = with lib.maintainers; [ teutat3s ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/misc/qcad/default.nix b/pkgs/applications/misc/qcad/default.nix index 14b2f19ccd4bb..d4b014ea85ae0 100644 --- a/pkgs/applications/misc/qcad/default.nix +++ b/pkgs/applications/misc/qcad/default.nix @@ -18,14 +18,14 @@ mkDerivation rec { pname = "qcad"; - version = "3.30.0.0"; + version = "3.30.1.1"; src = fetchFromGitHub { name = "qcad-${version}-src"; owner = "qcad"; repo = "qcad"; rev = "v${version}"; - hash = "sha256-KpY/GjagRx0XkH18dDJcf6JfkT/0V8ZHJ5DHtAEUaF4="; + hash = "sha256-hZe1rTRkvdKC/row0Li6hsmOcLKkMULo9ScOvvjmWCA="; }; patches = [ diff --git a/pkgs/applications/misc/remnote/default.nix b/pkgs/applications/misc/remnote/default.nix deleted file mode 100644 index 0f6be51187fa1..0000000000000 --- a/pkgs/applications/misc/remnote/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ - lib, - fetchurl, - appimageTools, -}: -let - pname = "remnote"; - version = "1.16.18"; - src = fetchurl { - url = "https://download2.remnote.io/remnote-desktop2/RemNote-${version}.AppImage"; - hash = "sha256-ps7Rl1oA2QOPvO2XeCY8DrWtCV9WPlX9jbhypz2ZARA="; - }; - appimageContents = appimageTools.extractType2 { inherit pname version src; }; -in -appimageTools.wrapType2 { - inherit pname version src; - - extraInstallCommands = '' - install -Dm444 ${appimageContents}/remnote.desktop -t $out/share/applications - substituteInPlace $out/share/applications/remnote.desktop \ - --replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=remnote %u' - install -Dm444 ${appimageContents}/remnote.png -t $out/share/pixmaps - ''; - - meta = with lib; { - description = "Note-taking application focused on learning and productivity"; - homepage = "https://remnote.com/"; - maintainers = with maintainers; [ chewblacka ]; - license = licenses.unfree; - platforms = [ "x86_64-linux" ]; - mainProgram = "remnote"; - }; -} diff --git a/pkgs/applications/misc/rtfm/default.nix b/pkgs/applications/misc/rtfm/default.nix index 256ed98f9a8cd..53ad4f9aea9ed 100644 --- a/pkgs/applications/misc/rtfm/default.nix +++ b/pkgs/applications/misc/rtfm/default.nix @@ -18,14 +18,14 @@ let in crystal.buildCrystalPackage rec { pname = "rtfm"; - version = "0.4.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "hugopl"; repo = "rtfm"; rev = "v${version}"; name = "rtfm"; - hash = "sha256-cloaGlHjtwrjuPGzAG55B58w307R+TO+MixAWTw2ags="; + hash = "sha256-+s7KXl3+j/BaneOBqVAMJJhmrG6xtcGaHhYnMvUfiVA="; }; patches = [ diff --git a/pkgs/applications/misc/sc-im/default.nix b/pkgs/applications/misc/sc-im/default.nix index 2ec7f35a219b4..d4509411dcfee 100644 --- a/pkgs/applications/misc/sc-im/default.nix +++ b/pkgs/applications/misc/sc-im/default.nix @@ -46,6 +46,8 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=${placeholder "out"}" ]; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=implicit-function-declaration"; + postInstall = '' wrapProgram "$out/bin/sc-im" --prefix PATH : "${lib.makeBinPath [ gnuplot ]}" ''; diff --git a/pkgs/applications/misc/schemes/default.nix b/pkgs/applications/misc/schemes/default.nix index b3653d50646fb..bead03c4c7c8b 100644 --- a/pkgs/applications/misc/schemes/default.nix +++ b/pkgs/applications/misc/schemes/default.nix @@ -17,14 +17,14 @@ stdenv.mkDerivation rec { pname = "schemes"; - version = "0.2.0"; + version = "46.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "chergert"; repo = "schemes"; rev = version; - hash = "sha256-XUC24KzZSU4+F2JZMsydukvAwEGdMxCnkPG6QHnCw6w="; + hash = "sha256-m82jR958f1g/4gSJ4NbNa4fwxVseH399Z8JpWr7tLh8="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/snapper-gui/default.nix b/pkgs/applications/misc/snapper-gui/default.nix index 8029eee15f896..f4df09504fc26 100644 --- a/pkgs/applications/misc/snapper-gui/default.nix +++ b/pkgs/applications/misc/snapper-gui/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, python3, python3Packages -, gnome, gtk3, wrapGAppsHook3, gtksourceview3, snapper +, adwaita-icon-theme, gtk3, wrapGAppsHook3, gtksourceview3, snapper , gobject-introspection }: @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec { buildInputs = [ python3 - gnome.adwaita-icon-theme + adwaita-icon-theme ]; doCheck = false; # it doesn't have any tests diff --git a/pkgs/applications/misc/ssocr/default.nix b/pkgs/applications/misc/ssocr/default.nix index 4231adb65b410..520ea84ebd995 100644 --- a/pkgs/applications/misc/ssocr/default.nix +++ b/pkgs/applications/misc/ssocr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ssocr"; - version = "2.23.1"; + version = "2.24.0"; src = fetchFromGitHub { owner = "auerswal"; repo = "ssocr"; rev = "v${version}"; - sha256 = "sha256-EfZsTrZI6vKM7tB6mKNGEkdfkNFbN5p4TmymOJGZRBk="; + sha256 = "sha256-79AnlO5r3IWSsV7zcI8li63bWTa+jw99cdOFFOGFZ2w="; }; nativeBuildInputs = [ pkg-config ]; @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = [ maintainers.kroell ]; mainProgram = "ssocr"; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix index b5bf0696f7645..b66c4f74d724e 100644 --- a/pkgs/applications/misc/syncthingtray/default.nix +++ b/pkgs/applications/misc/syncthingtray/default.nix @@ -31,6 +31,7 @@ during runtime. Alternatively, one can edit the desktop file themselves after it is generated See: https://github.com/NixOS/nixpkgs/issues/199596#issuecomment-1310136382 */ , autostartExecPath ? "syncthingtray" +, versionCheckHook }: stdenv.mkDerivation (finalAttrs: { @@ -85,9 +86,10 @@ stdenv.mkDerivation (finalAttrs: { # Make binary available in PATH like on other platforms ln -s $out/Applications/syncthingtray.app/Contents/MacOS/syncthingtray $out/bin/syncthingtray ''; - installCheckPhase = '' - $out/bin/syncthingtray --help | grep ${finalAttrs.version} - ''; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; cmakeFlags = [ "-DQT_PACKAGE_PREFIX=Qt${lib.versions.major qtbase.version}" diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix index ef361fc6f14e1..6b0d3e95721b1 100644 --- a/pkgs/applications/misc/synergy/default.nix +++ b/pkgs/applications/misc/synergy/default.nix @@ -141,7 +141,7 @@ stdenv.mkDerivation rec { changelog = "https://github.com/symless/synergy-core/blob/${version}/ChangeLog"; mainProgram = lib.optionalString (!withGUI) "synergyc"; license = licenses.gpl2Only; - maintainers = with maintainers; [ talyz ivar ]; + maintainers = with maintainers; [ talyz ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/tabula-java/default.nix b/pkgs/applications/misc/tabula-java/default.nix index 4c437ea6df5de..011f92362a313 100644 --- a/pkgs/applications/misc/tabula-java/default.nix +++ b/pkgs/applications/misc/tabula-java/default.nix @@ -16,7 +16,7 @@ maven.buildMavenPackage rec { hash = "sha256-lg8/diyGhfkUU0w7PEOlxb1WNpJZVDDllxMMsTIU/Cw="; }; - mvnHash = "sha256-yULCBHgctZZU3Deod+nQujssmUy+kgdFdgE3NUuFhOw="; + mvnHash = "sha256-CXJm9YlYsYViChFcH9e2P9pxK0q/tLWODOzZPXZ8hK0="; mvnParameters = "compile assembly:single -Dmaven.test.skip=true"; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/thedesk/default.nix b/pkgs/applications/misc/thedesk/default.nix index b3292b8ebb5d0..d1c4dd88583a6 100644 --- a/pkgs/applications/misc/thedesk/default.nix +++ b/pkgs/applications/misc/thedesk/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "thedesk"; - version = "24.1.3"; + version = "24.2.1"; src = fetchurl { url = "https://github.com/cutls/TheDesk/releases/download/v${version}/${pname}_${version}_amd64.deb"; - sha256 = "sha256-Fq+kDdNR7G0Fbi++OFGxYbgFFOnpdzxy0JVh5t/i8hs="; + sha256 = "sha256-AdjygNnQ3qQB03cGcQ5EB0cY3XXWLrzfCqw/U8tq1Yo="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/ulauncher/default.nix b/pkgs/applications/misc/ulauncher/default.nix index 92d93b5095d13..438277bc98cd4 100644 --- a/pkgs/applications/misc/ulauncher/default.nix +++ b/pkgs/applications/misc/ulauncher/default.nix @@ -4,7 +4,7 @@ , python3Packages , gdk-pixbuf , glib -, gnome +, adwaita-icon-theme , gobject-introspection , gtk3 , wrapGAppsHook3 @@ -38,7 +38,7 @@ python3Packages.buildPythonApplication rec { buildInputs = [ glib - gnome.adwaita-icon-theme + adwaita-icon-theme gtk3 keybinder3 libappindicator diff --git a/pkgs/applications/misc/verbiste/default.nix b/pkgs/applications/misc/verbiste/default.nix index 9f27f8e73d7f3..2793ffcd0c639 100644 --- a/pkgs/applications/misc/verbiste/default.nix +++ b/pkgs/applications/misc/verbiste/default.nix @@ -1,18 +1,18 @@ -{ lib, stdenv, fetchurl, pkg-config, libgnomeui, libxml2 }: +{ lib, stdenv, fetchurl, pkg-config, gtk2, libxml2 }: stdenv.mkDerivation rec { pname = "verbiste"; - version = "0.1.47"; + version = "0.1.48"; src = fetchurl { - url = "https://perso.b2b2c.ca/~sarrazip/dev/${pname}-${version}.tar.gz"; - sha256 = "02kzin3pky2q2jnihrch8y0hy043kqqmzxq8j741x80kl0j1qxkm"; + url = "https://perso.b2b2c.ca/~sarrazip/dev/verbiste-${version}.tar.gz"; + hash = "sha256-qp0OFpH4DInWjzraDI6+CeKh85JkbwVYHlJruIrGnBM="; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libgnomeui libxml2 ]; + buildInputs = [ gtk2 libxml2 ]; enableParallelBuilding = true; diff --git a/pkgs/applications/misc/wthrr/default.nix b/pkgs/applications/misc/wthrr/default.nix index 5b3c6d2cd17ab..142d331be9f75 100644 --- a/pkgs/applications/misc/wthrr/default.nix +++ b/pkgs/applications/misc/wthrr/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "wthrr"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { - owner = "tobealive"; + owner = "ttytm"; repo = "wthrr-the-weathercrab"; rev = "v${version}"; - hash = "sha256-djrPBmXnUC8d6lWuiHyYY2so8/5RHLFYDu6xoHn6GRg="; + hash = "sha256-3bWO2Gl8/B2p4k/6QhlT46RvyMJJs7WkVcX35vWN2Fk="; }; - cargoHash = "sha256-PGbkGoWcFlTKpnrvMzrHvjFLIuohqEhVg4DYhAZOpkw="; + cargoHash = "sha256-8Uy+8UpCQyLaLsulpgC1w2XI9aqj2P5ebBlXqpuDIc4="; nativeBuildInputs = [ pkg-config @@ -29,6 +29,7 @@ rustPlatform.buildRustPackage rec { ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration ]; checkFlags = [ @@ -39,8 +40,8 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Weather companion for the terminal"; - homepage = "https://github.com/tobealive/wthrr-the-weathercrab"; - changelog = "https://github.com/tobealive/wthrr-the-weathercrab/releases/tag/${src.rev}"; + homepage = "https://github.com/ttytm/wthrr-the-weathercrab"; + changelog = "https://github.com/ttytm/wthrr-the-weathercrab/releases/tag/${src.rev}"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; mainProgram = "wthrr"; diff --git a/pkgs/applications/misc/xscope/default.nix b/pkgs/applications/misc/xscope/default.nix index 34425345f3d40..ed66ebc59313b 100644 --- a/pkgs/applications/misc/xscope/default.nix +++ b/pkgs/applications/misc/xscope/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { description = "program to monitor X11/Client conversations"; homepage = "https://cgit.freedesktop.org/xorg/app/xscope/"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ crertel ]; platforms = with platforms; unix; mainProgram = "xscope"; }; diff --git a/pkgs/applications/misc/yubioath-flutter/default.nix b/pkgs/applications/misc/yubioath-flutter/default.nix index da5cb37a978b0..c88a65d55d60c 100644 --- a/pkgs/applications/misc/yubioath-flutter/default.nix +++ b/pkgs/applications/misc/yubioath-flutter/default.nix @@ -6,7 +6,7 @@ , libnotify , libappindicator , pkg-config -, gnome +, gnome-screenshot , makeWrapper , removeReferencesTo }: @@ -67,7 +67,7 @@ flutter319.buildFlutterApplication rec { # Needed for QR scanning to work extraWrapProgramArgs = '' - --prefix PATH : ${lib.makeBinPath [ gnome.gnome-screenshot ]} + --prefix PATH : ${lib.makeBinPath [ gnome-screenshot ]} ''; nativeBuildInputs = [ |