diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/misc')
22 files changed, 279 insertions, 71 deletions
diff --git a/nixpkgs/pkgs/applications/misc/cambrinary/default.nix b/nixpkgs/pkgs/applications/misc/cambrinary/default.nix new file mode 100644 index 000000000000..67e325cbce02 --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/cambrinary/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonApplication +, fetchFromGitHub +, aiohttp +, beautifulsoup4 +}: + +buildPythonApplication rec { + pname = "cambrinary"; + version = "unstable-2023-07-16"; + format = "flit"; + + src = fetchFromGitHub { + owner = "xueyuanl"; + repo = "cambrinary"; + rev = "f0792ef70654a48a7677b6e1a7dee454b2c0971c"; + hash = "sha256-wDcvpKAY/6lBjO5h3qKH3+Y2G2gm7spcKCXFMt/bAtE="; + }; + + propagatedBuildInputs = [ + aiohttp + beautifulsoup4 + ]; + + pythonImportsCheck = [ "cambrinary" ]; + + meta = with lib; { + description = "Cambridge dictionary in a terminal"; + homepage = "https://github.com/xueyuanl/cambrinary"; + license = licenses.gpl3Only; + platforms = platforms.unix; + maintainers = with maintainers; [ azahi ]; + }; +} diff --git a/nixpkgs/pkgs/applications/misc/electrum/default.nix b/nixpkgs/pkgs/applications/misc/electrum/default.nix index 9137dc74d726..a1300983d28f 100644 --- a/nixpkgs/pkgs/applications/misc/electrum/default.nix +++ b/nixpkgs/pkgs/applications/misc/electrum/default.nix @@ -11,7 +11,7 @@ }: let - version = "4.4.5"; + version = "4.4.6"; libsecp256k1_name = if stdenv.isLinux then "libsecp256k1.so.{v}" @@ -28,7 +28,7 @@ let owner = "spesmilo"; repo = "electrum"; rev = version; - sha256 = "sha256-R5jFxqaKnqQ+WNp4l0u34wMFxlbIsQ+9qDQxiQEu6kM="; + sha256 = "sha256-nd435CgF0a6JOni/OXcxkciVCR1aQqzfGfDSg1gPQ8Q="; postFetch = '' mv $out ./all @@ -44,7 +44,7 @@ python3.pkgs.buildPythonApplication { src = fetchurl { url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "sha256-rTQcnEfHaFrLvPnI1IZl9uk2D0NFLn0PSaGsI9KyLr4="; + sha256 = "sha256-BxxC1xVKToUjgBo4mEeK9Tdhbd/+doHcTTJsXDtaELg="; }; postUnpack = '' diff --git a/nixpkgs/pkgs/applications/misc/free42/default.nix b/nixpkgs/pkgs/applications/misc/free42/default.nix index ce86dfdea979..dd8405772caf 100644 --- a/nixpkgs/pkgs/applications/misc/free42/default.nix +++ b/nixpkgs/pkgs/applications/misc/free42/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "free42"; - version = "3.0.20"; + version = "3.0.21"; src = fetchFromGitHub { owner = "thomasokken"; repo = pname; rev = "v${version}"; - hash = "sha256-Dqrys7bAkSnpbOF0D17RDYi7q47ExlM75d5OOAnHCVU="; + hash = "sha256-zRO0buYfKtybUisWZJRkvLJVLJYZwLcDnT04rnQWy+s="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/misc/gimoji/default.nix b/nixpkgs/pkgs/applications/misc/gimoji/default.nix index 726965afec1a..24fd6cf2ea18 100644 --- a/nixpkgs/pkgs/applications/misc/gimoji/default.nix +++ b/nixpkgs/pkgs/applications/misc/gimoji/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "gimoji"; - version = "0.5.1"; + version = "0.6.1"; src = fetchFromGitHub { owner = "zeenix"; repo = "gimoji"; rev = version; - hash = "sha256-8aMm6OHDYBGvLYrQmQh33SI3jap6fS7lgOYDn9lWS18="; + hash = "sha256-7UzdZsidLHLZBj7mpRJQhvr3VP7HtkKPfAc7dnxS7kE="; }; - cargoHash = "sha256-IENW19FlqWLk7K0+r9IUhXkS7C/wmik2bGDZdRk0jzA="; + cargoHash = "sha256-oWImiIUFgy/pKHlZPPd1IWDG5l5LYCWTYJjgEqiXzLA="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AppKit diff --git a/nixpkgs/pkgs/applications/misc/kile-wl/default.nix b/nixpkgs/pkgs/applications/misc/kile-wl/default.nix index 0da4889ebdf3..ce62acb284e8 100644 --- a/nixpkgs/pkgs/applications/misc/kile-wl/default.nix +++ b/nixpkgs/pkgs/applications/misc/kile-wl/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { pname = "kile-wl"; - version = "unstable-2021-09-30"; + version = "2.0"; src = fetchFromGitLab { owner = "snakedye"; @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { url = "https://gitlab.com/snakedye/kile.git"; }; - cargoSha256 = "sha256-W7rq42Pz+l4TSsR/h2teRTbl3A1zjOcIx6wqgnwyQNA="; + cargoSha256 = "sha256-xXliFNm9YDGsAATpMATui7f2IcfKCrB0B7O5dSYuBVQ="; nativeBuildInputs = [ scdoc ]; diff --git a/nixpkgs/pkgs/applications/misc/mupdf/default.nix b/nixpkgs/pkgs/applications/misc/mupdf/default.nix index d00b9103d8f0..6e3d37e2ef38 100644 --- a/nixpkgs/pkgs/applications/misc/mupdf/default.nix +++ b/nixpkgs/pkgs/applications/misc/mupdf/default.nix @@ -27,6 +27,11 @@ , freeglut , libGLU , xcbuild + +# for passthru.tests +, cups-filters +, python3 +, zathura }: let @@ -146,6 +151,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.tests = { + inherit cups-filters zathura; + inherit (python3.pkgs) pikepdf pymupdf; + }; + meta = with lib; { homepage = "https://mupdf.com"; description = "Lightweight PDF, XPS, and E-book viewer and toolkit written in portable C"; diff --git a/nixpkgs/pkgs/applications/misc/nimbo/default.nix b/nixpkgs/pkgs/applications/misc/nimbo/default.nix index 5ad86eeccd44..ffc01c747f9b 100644 --- a/nixpkgs/pkgs/applications/misc/nimbo/default.nix +++ b/nixpkgs/pkgs/applications/misc/nimbo/default.nix @@ -52,6 +52,6 @@ python3.pkgs.buildPythonApplication rec { description = "Run machine learning jobs on AWS with a single command"; homepage = "https://github.com/nimbo-sh/nimbo"; license = licenses.bsl11; - maintainers = with maintainers; [ alexeyre noreferences ]; + maintainers = with maintainers; [ noreferences ]; }; } diff --git a/nixpkgs/pkgs/applications/misc/octoprint/default.nix b/nixpkgs/pkgs/applications/misc/octoprint/default.nix index fffc7d441953..5f5c2b897a02 100644 --- a/nixpkgs/pkgs/applications/misc/octoprint/default.nix +++ b/nixpkgs/pkgs/applications/misc/octoprint/default.nix @@ -100,7 +100,7 @@ let filetype flask flask-babel - flask_assets + flask-assets flask-login flask-limiter frozendict diff --git a/nixpkgs/pkgs/applications/misc/openrgb-plugins/effects/default.nix b/nixpkgs/pkgs/applications/misc/openrgb-plugins/effects/default.nix index 05cdd0ce5cc3..01ff20071516 100644 --- a/nixpkgs/pkgs/applications/misc/openrgb-plugins/effects/default.nix +++ b/nixpkgs/pkgs/applications/misc/openrgb-plugins/effects/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitLab -, fetchpatch , qtbase , openrgb , glib @@ -13,24 +12,16 @@ stdenv.mkDerivation rec { pname = "openrgb-plugin-effects"; - version = "0.8"; + version = "0.9"; src = fetchFromGitLab { owner = "OpenRGBDevelopers"; repo = "OpenRGBEffectsPlugin"; rev = "release_${version}"; - hash = "sha256-2F6yeLWgR0wCwIj75+d1Vdk45osqYwRdenK21lcRoOg="; + hash = "sha256-8BnHifcFf7ESJgJi/q3ca38zuIVa++BoGlkWxj7gpog="; fetchSubmodules = true; }; - patches = [ - # Add install rule - (fetchpatch { - url = "https://gitlab.com/OpenRGBDevelopers/OpenRGBEffectsPlugin/-/commit/75f1b3617d9cabfb3b04a7afc75ce0c1b8514bc0.patch"; - hash = "sha256-X+zMNE3OCZNmUb68S4683r/RbE+CDrI/Jv4BMWPI47E="; - }) - ]; - postPatch = '' # Use the source of openrgb from nixpkgs instead of the submodule rm -r OpenRGB diff --git a/nixpkgs/pkgs/applications/misc/openrgb-plugins/hardwaresync/default.nix b/nixpkgs/pkgs/applications/misc/openrgb-plugins/hardwaresync/default.nix index 539c203325fb..5d0c4e966128 100644 --- a/nixpkgs/pkgs/applications/misc/openrgb-plugins/hardwaresync/default.nix +++ b/nixpkgs/pkgs/applications/misc/openrgb-plugins/hardwaresync/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitLab -, fetchpatch , qtbase , openrgb , glib @@ -14,28 +13,15 @@ stdenv.mkDerivation rec { pname = "openrgb-plugin-hardwaresync"; - version = "0.8"; + version = "0.9"; src = fetchFromGitLab { owner = "OpenRGBDevelopers"; repo = "OpenRGBHardwareSyncPlugin"; rev = "release_${version}"; - hash = "sha256-P+IitP8pQLUkBdMfcNw4fOggqyFfg6lNlnSfUGjddzo="; + hash = "sha256-3sQFiqmXhuavce/6v3XBpp6PAduY7t440nXfbfCX9a0="; }; - patches = [ - (fetchpatch { - name = "use-pkgconfig"; - url = "https://gitlab.com/OpenRGBDevelopers/OpenRGBHardwareSyncPlugin/-/commit/df2869d679ea43119fb9b174cd0b2cb152022685.patch"; - hash = "sha256-oBtrHwpvB8Z3xYi4ucDSuw+5WijPEbgBW7vLGELFjfw="; - }) - (fetchpatch { - name = "add-install-rule"; - url = "https://gitlab.com/OpenRGBDevelopers/OpenRGBHardwareSyncPlugin/-/commit/bfbaa0a32ed05112e0cc8b6b2a8229945596e522.patch"; - hash = "sha256-76UMMzeXnyQRCEE1tGPNR5XSHTT480rQDnJ9hWhfIqY="; - }) - ]; - postPatch = '' # Use the source of openrgb from nixpkgs instead of the submodule rmdir OpenRGB diff --git a/nixpkgs/pkgs/applications/misc/openrgb/default.nix b/nixpkgs/pkgs/applications/misc/openrgb/default.nix index 41d855cd333f..e0832ff2459c 100644 --- a/nixpkgs/pkgs/applications/misc/openrgb/default.nix +++ b/nixpkgs/pkgs/applications/misc/openrgb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "openrgb"; - version = "0.8"; + version = "0.9"; src = fetchFromGitLab { owner = "CalcProgrammer1"; repo = "OpenRGB"; rev = "release_${version}"; - sha256 = "sha256-46dL1D5oVlw6mNuFDCbbrUDmq42yFXV/qFJ1JnPT5/s="; + sha256 = "sha256-XBLj4EfupyeVHRc0pVI7hrXFoCNJ7ak2yO0QSfhBsGU="; }; nativeBuildInputs = [ qmake pkg-config wrapQtAppsHook ]; diff --git a/nixpkgs/pkgs/applications/misc/privacyidea/default.nix b/nixpkgs/pkgs/applications/misc/privacyidea/default.nix index b05d6d482a2a..ce6adcef7ff1 100644 --- a/nixpkgs/pkgs/applications/misc/privacyidea/default.nix +++ b/nixpkgs/pkgs/applications/misc/privacyidea/default.nix @@ -24,7 +24,7 @@ let alembic = super.alembic.overridePythonAttrs (lib.const { doCheck = false; }); - flask_migrate = super.flask_migrate.overridePythonAttrs (oldAttrs: rec { + flask-migrate = super.flask-migrate.overridePythonAttrs (oldAttrs: rec { version = "2.7.0"; src = fetchPypi { pname = "Flask-Migrate"; @@ -198,8 +198,8 @@ python3'.pkgs.buildPythonPackage rec { ]; propagatedBuildInputs = with python3'.pkgs; [ - cryptography pyrad pymysql python-dateutil flask-versioned flask_script - defusedxml croniter flask_migrate pyjwt configobj sqlsoup pillow + cryptography pyrad pymysql python-dateutil flask-versioned flask-script + defusedxml croniter flask-migrate pyjwt configobj sqlsoup pillow python-gnupg passlib pyopenssl beautifulsoup4 smpplib flask-babel ldap3 huey pyyaml qrcode oauth2client requests lxml cbor2 psycopg2 pydash ecdsa google-auth importlib-metadata argon2-cffi bcrypt segno diff --git a/nixpkgs/pkgs/applications/misc/retool/default.nix b/nixpkgs/pkgs/applications/misc/retool/default.nix new file mode 100644 index 000000000000..a88e719c6ddd --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/retool/default.nix @@ -0,0 +1,58 @@ +{ lib +, stdenv +, python3 +, fetchFromGitHub +, qt6 +}: + +python3.pkgs.buildPythonApplication { + pname = "retool"; + version = "unstable-2023-08-24"; + + format = "pyproject"; + disabled = python3.pkgs.pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "unexpectedpanda"; + repo = "retool"; + rev = "d8acdb960d35b5a6b01d7dc66b7e40b3ec451301"; + hash = "sha256-6y/7RR7O2xYKXdxaFtkRfnSlwygp/LRDUozUJo6ue7s="; + }; + + patches = [ + # pythonRelaxDepsHook will not work in this package until + # https://github.com/NixOS/nixpkgs/pull/248516 hits master + ./relax_deps.patch + ]; + + nativeBuildInputs = with python3.pkgs; [ + poetry-core + qt6.wrapQtAppsHook + ]; + + buildInputs = [ + qt6.qtbase + ] ++ + lib.optionals (stdenv.isLinux) [ + qt6.qtwayland + ]; + + propagatedBuildInputs = with python3.pkgs; [ + alive-progress + lxml + psutil + validators + pyside6 + strictyaml + ]; + + # Upstream has no tests + doCheck = false; + + meta = with lib; { + description = "A better filter tool for Redump and No-Intro dats"; + homepage = "https://github.com/unexpectedpanda/retool"; + license = licenses.bsd3; + maintainers = with maintainers; [ thiagokokada ]; + }; +} diff --git a/nixpkgs/pkgs/applications/misc/retool/relax_deps.patch b/nixpkgs/pkgs/applications/misc/retool/relax_deps.patch new file mode 100644 index 000000000000..528d2b47d970 --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/retool/relax_deps.patch @@ -0,0 +1,25 @@ +diff --git a/pyproject.toml b/pyproject.toml +index 6e62347..34600a0 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -13,12 +13,14 @@ packages = [ + + [tool.poetry.dependencies] + python = ">=3.10,<3.12" +-strictyaml = "^1.6.2" +-lxml = "^4.9.2" +-PySide6 = "^6.4.2" +-validators = "^0.20.0" +-alive-progress = "^3.0.1" +-psutil = "^5.9.4" ++strictyaml = "*" ++lxml = "*" ++# ERROR: Could not find a version that satisfies the requirement PySide6 (from retool) (from versions: none) ++# ERROR: No matching distribution found for PySide6 ++# PySide6 = "*" ++validators = "*" ++alive-progress = "*" ++psutil = "*" + + [tool.poetry.scripts] + retool = "retool:main" diff --git a/nixpkgs/pkgs/applications/misc/safecloset/default.nix b/nixpkgs/pkgs/applications/misc/safecloset/default.nix new file mode 100644 index 000000000000..17be18f6585a --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/safecloset/default.nix @@ -0,0 +1,41 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, stdenv +, darwin +, xorg +}: + +rustPlatform.buildRustPackage rec { + pname = "safecloset"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "Canop"; + repo = "safecloset"; + rev = "v${version}"; + hash = "sha256-HY8HaWGsqKUsqNLFpxrGJvAcVD68fqKX2v7xCiEKuDM="; + }; + + cargoHash = "sha256-geZoqfPgYUd4X903EM7+gq/VPvIClAmlC0nkqWriB0M="; + + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.AppKit + ] ++ lib.optionals stdenv.isLinux [ + xorg.libxcb + ]; + + checkFlags = [ + # skip flaky test + "--skip=timer::timer_tests::test_timer_reset" + ]; + + meta = with lib; { + description = "Cross-platform secure TUI secret locker"; + homepage = "https://github.com/Canop/safecloset"; + changelog = "https://github.com/Canop/safecloset/blob/${src.rev}/CHANGELOG.md"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ figsoda ]; + mainProgram = "safecloset"; + }; +} diff --git a/nixpkgs/pkgs/applications/misc/scli/default.nix b/nixpkgs/pkgs/applications/misc/scli/default.nix index 4da57993fb87..7791f694e857 100644 --- a/nixpkgs/pkgs/applications/misc/scli/default.nix +++ b/nixpkgs/pkgs/applications/misc/scli/default.nix @@ -53,6 +53,6 @@ python3.pkgs.buildPythonApplication rec { description = "Simple terminal user interface for Signal"; homepage = "https://github.com/isamert/scli"; license = licenses.gpl3Only; - maintainers = with maintainers; [ alexeyre ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/applications/misc/swaynag-battery/default.nix b/nixpkgs/pkgs/applications/misc/swaynag-battery/default.nix index 71d15aa06584..b58758d8a417 100644 --- a/nixpkgs/pkgs/applications/misc/swaynag-battery/default.nix +++ b/nixpkgs/pkgs/applications/misc/swaynag-battery/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { hash = "sha256-7f9+4Fzw5B5ATuud4MJC3iyuNRTx6kwJ7/KsusGtQM8="; }; - vendorSha256 = "h9Zj3zmQ0Xpili5Pl6CXh1L0bb2uL1//B79I4/ron08="; + vendorHash = "sha256-h9Zj3zmQ0Xpili5Pl6CXh1L0bb2uL1//B79I4/ron08="; meta = with lib; { homepage = "https://github.com/m00qek/swaynag-battery"; diff --git a/nixpkgs/pkgs/applications/misc/tomato-c/default.nix b/nixpkgs/pkgs/applications/misc/tomato-c/default.nix new file mode 100644 index 000000000000..9f87712399f2 --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/tomato-c/default.nix @@ -0,0 +1,67 @@ +{ lib +, stdenv +, fetchFromGitHub +, libnotify +, makeWrapper +, mpv +, ncurses +, pkg-config +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "tomato-c"; + version = "unstable-2023-08-21"; + + src = fetchFromGitHub { + owner = "gabrielzschmitz"; + repo = "Tomato.C"; + rev = "6e43e85aa15f3d96811311a3950eba8ce9715634"; + hash = "sha256-RpKkQ7xhM2XqfZdXra0ju0cTBL3Al9NMVQ/oleFydDs="; + }; + + postPatch = '' + substituteInPlace Makefile \ + --replace "sudo " "" + substituteInPlace notify.c \ + --replace "/usr/local" "${placeholder "out"}" + substituteInPlace util.c \ + --replace "/usr/local" "${placeholder "out"}" + substituteInPlace tomato.desktop \ + --replace "/usr/local" "${placeholder "out"}" + ''; + + nativeBuildInputs = [ + makeWrapper + pkg-config + ]; + + buildInputs = [ + libnotify + mpv + ncurses + ]; + + installFlags = [ + "PREFIX=${placeholder "out"}" + "CPPFLAGS=$NIX_CFLAGS_COMPILE" + "LDFLAGS=$NIX_LDFLAGS" + ]; + + postFixup = '' + for file in $out/bin/*; do + wrapProgram $file \ + --prefix PATH : ${lib.makeBinPath [ libnotify mpv ]} + done + ''; + + strictDeps = true; + + meta = { + homepage = "https://github.com/gabrielzschmitz/Tomato.C"; + description = " A pomodoro timer written in pure C"; + license = with lib.licenses; [ gpl3Plus ]; + maintainers = with lib.maintainers; [ AndersonTorres ]; + mainProgram = "tomato"; + platforms = lib.platforms.unix; + }; +}) diff --git a/nixpkgs/pkgs/applications/misc/uni/default.nix b/nixpkgs/pkgs/applications/misc/uni/default.nix index 61ea6578787f..5f7db6f85bf7 100644 --- a/nixpkgs/pkgs/applications/misc/uni/default.nix +++ b/nixpkgs/pkgs/applications/misc/uni/default.nix @@ -1,4 +1,7 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib +, buildGoModule +, fetchFromGitHub +}: buildGoModule rec { pname = "uni"; @@ -7,17 +10,22 @@ buildGoModule rec { src = fetchFromGitHub { owner = "arp242"; repo = "uni"; - rev = "v${version}"; - sha256 = "kWiglMuJdcD7z2MDfz1MbItB8r9BJ7LUqfPfJa8QkLA="; + rev = "refs/tags/v${version}"; + hash = "sha256-kWiglMuJdcD7z2MDfz1MbItB8r9BJ7LUqfPfJa8QkLA="; }; - vendorSha256 = "6HNFCUSJA6oduCx/SCUQQeCHGS7ohaWRunixdwMurBw="; + vendorHash = "sha256-6HNFCUSJA6oduCx/SCUQQeCHGS7ohaWRunixdwMurBw="; - ldflags = [ "-s" "-w" "-X main.version=${version}" ]; + ldflags = [ + "-s" + "-w" + "-X=main.version=${version}" + ]; meta = with lib; { homepage = "https://github.com/arp242/uni"; description = "Query the Unicode database from the commandline, with good support for emojis"; + changelog = "https://github.com/arp242/uni/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ chvp ]; }; diff --git a/nixpkgs/pkgs/applications/misc/waybar/default.nix b/nixpkgs/pkgs/applications/misc/waybar/default.nix index eca16f3d7dbd..d2e49ee8fb90 100644 --- a/nixpkgs/pkgs/applications/misc/waybar/default.nix +++ b/nixpkgs/pkgs/applications/misc/waybar/default.nix @@ -44,7 +44,8 @@ , cavaSupport ? true , evdevSupport ? true -, hyprlandSupport ? false +, experimentalPatches ? true +, hyprlandSupport ? true , inputSupport ? true , jackSupport ? true , mpdSupport ? true @@ -89,10 +90,6 @@ stdenv.mkDerivation (finalAttrs: { popd ''; - # Patch for workspaces support in wlr/workspaces - # See https://wiki.hyprland.org/Useful-Utilities/Status-Bars/#waybar - patches = lib.optional hyprlandSupport [ ./hyprland.diff ]; - nativeBuildInputs = [ meson ninja @@ -120,7 +117,7 @@ stdenv.mkDerivation (finalAttrs: { wayland wlroots ] - ++ lib.optionals cavaSupport [ + ++ lib.optionals cavaSupport [ SDL2 alsa-lib fftw @@ -166,8 +163,7 @@ stdenv.mkDerivation (finalAttrs: { "tests" = runTests; "upower_glib" = upowerSupport; "wireplumber" = wireplumberSupport; - }) - ++ lib.optional hyprlandSupport (lib.mesonBool "experimental" true); + }) ++ lib.optional experimentalPatches (lib.mesonBool "experimental" true); preFixup = lib.optionalString withMediaPlayer '' cp $src/resources/custom_modules/mediaplayer.py $out/bin/waybar-mediaplayer.py @@ -189,6 +185,7 @@ stdenv.mkDerivation (finalAttrs: { minijackson rodrgz synthetica + khaneliman ]; inherit (wlroots.meta) platforms; }; diff --git a/nixpkgs/pkgs/applications/misc/waybar/hyprland.diff b/nixpkgs/pkgs/applications/misc/waybar/hyprland.diff deleted file mode 100644 index d3febdae4a1f..000000000000 --- a/nixpkgs/pkgs/applications/misc/waybar/hyprland.diff +++ /dev/null @@ -1,12 +0,0 @@ ---- a/src/modules/wlr/workspace_manager.cpp -+++ b/src/modules/wlr/workspace_manager.cpp -@@ -523,7 +523,8 @@ - if (action.empty()) - return true; - else if (action == "activate") { -- zext_workspace_handle_v1_activate(workspace_handle_); -+ const std::string command = "hyprctl dispatch workspace " + name_; -+ system(command.c_str()); - } else if (action == "close") { - zext_workspace_handle_v1_remove(workspace_handle_); - } else { diff --git a/nixpkgs/pkgs/applications/misc/xmrig/default.nix b/nixpkgs/pkgs/applications/misc/xmrig/default.nix index 812ecfb16d17..2a6ac97c9c31 100644 --- a/nixpkgs/pkgs/applications/misc/xmrig/default.nix +++ b/nixpkgs/pkgs/applications/misc/xmrig/default.nix @@ -59,6 +59,9 @@ stdenv.mkDerivation rec { runHook postInstall ''; + # https://github.com/NixOS/nixpkgs/issues/245534 + hardeningDisable = [ "fortify" ]; + meta = with lib; { description = "Monero (XMR) CPU miner"; homepage = "https://github.com/xmrig/xmrig"; |