diff options
Diffstat (limited to 'pkgs/applications')
14 files changed, 160 insertions, 78 deletions
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index e0b07daa0f38f..42a41199f747a 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -316,6 +316,53 @@ self: super: { ''; }); + coq_nvim = super.coq_nvim.overrideAttrs (old: { + passthru.python3Dependencies = ps: with ps; [ + pynvim + pyyaml + (buildPythonPackage { + pname = "pynvim_pp"; + version = "unstable-2023-05-17"; + format = "pyproject"; + propagatedBuildInputs = [ setuptools pynvim ]; + src = fetchFromGitHub { + owner = "ms-jpq"; + repo = "pynvim_pp"; + rev = "91d91ec0cb173ce19d8c93c7999f5038cf08c046"; + fetchSubmodules = false; + hash = "sha256-wycN9U3f3o0onmx60Z4Ws4DbBxsNwHjLTCB9UgjssLI="; + }; + meta = with lib; { + homepage = "https://github.com/ms-jpq/pynvim_pp"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ GaetanLepage ]; + }; + }) + (buildPythonPackage { + pname = "std2"; + version = "unstable-2023-05-17"; + format = "pyproject"; + propagatedBuildInputs = [ setuptools ]; + src = fetchFromGitHub { + owner = "ms-jpq"; + repo = "std2"; + rev = "d6a7a719ef902e243b7bbd162defed762a27416f"; + fetchSubmodules = false; + hash = "sha256-dtQaeB4Xkz+wcF0UkM+SajekSkVVPdoJs9n1hHQLR1k="; + }; + doCheck = true; + meta = with lib; { + homepage = "https://github.com/ms-jpq/std2"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ GaetanLepage ]; + }; + }) + ]; + + # We need some patches so it stops complaining about not being in a venv + patches = [ ./patches/coq_nvim/emulate-venv.patch ]; + }); + cpsm = super.cpsm.overrideAttrs (old: { nativeBuildInputs = [ cmake ]; buildInputs = [ diff --git a/pkgs/applications/editors/vim/plugins/patches/coq_nvim/emulate-venv.patch b/pkgs/applications/editors/vim/plugins/patches/coq_nvim/emulate-venv.patch new file mode 100644 index 0000000000000..da0222fbbe421 --- /dev/null +++ b/pkgs/applications/editors/vim/plugins/patches/coq_nvim/emulate-venv.patch @@ -0,0 +1,35 @@ +diff --git a/coq/__main__.py b/coq/__main__.py +index 5a6c6fd2..e0d9eec8 100644 +--- a/coq/__main__.py ++++ b/coq/__main__.py +@@ -78,7 +78,7 @@ _EXEC_PATH = Path(executable) + _EXEC_PATH = _EXEC_PATH.parent.resolve(strict=True) / _EXEC_PATH.name + _REQ = REQUIREMENTS.read_text() + +-_IN_VENV = _RT_PY == _EXEC_PATH ++_IN_VENV = True + + + if command == "deps": +@@ -152,7 +152,7 @@ elif command == "run": + try: + if not _IN_VENV: + raise ImportError() +- elif lock != _REQ: ++ elif False: + raise ImportError() + else: + import pynvim_pp +diff --git a/coq/consts.py b/coq/consts.py +index 5a027fe9..a3e0c5a4 100644 +--- a/coq/consts.py ++++ b/coq/consts.py +@@ -9,7 +9,7 @@ TOP_LEVEL = Path(__file__).resolve(strict=True).parent.parent + REQUIREMENTS = TOP_LEVEL / "requirements.txt" + + +-VARS = TOP_LEVEL / ".vars" ++VARS = Path.home() / ".cache/coq_nvim/vars" + + RT_DIR = VARS / "runtime" + RT_PY = RT_DIR / "Scripts" / "python.exe" if IS_WIN else RT_DIR / "bin" / "python3" diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 7262ecc75c24b..5060a0c621c81 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -612,8 +612,8 @@ let mktplcRef = { name = "chatgpt-reborn"; publisher = "chris-hayes"; - version = "3.16.1"; - sha256 = "sha256-RVPA+O0QOtFArWzcuwXMZSpwB3zrPAzVCbEjOzUNH4I="; + version = "3.16.3"; + sha256 = "wkitG5gmYKYKXRw/zVW04HN1dePiTjbnynFOY/bwxfI="; }; }; @@ -1331,8 +1331,8 @@ let mktplcRef = { name = "chatgpt-vscode"; publisher = "genieai"; - version = "0.0.7"; - sha256 = "sha256-dWp9OYj9OCsNdZiYbgAWWo/OXMjBSlB7sIupdqnQTiU="; + version = "0.0.8"; + sha256 = "RKvmZkegFs4y+sEVaamPRO1F1E+k4jJyI0Q9XqKowrQ="; }; }; @@ -1340,8 +1340,8 @@ let mktplcRef = { publisher = "github"; name = "codespaces"; - version = "1.14.1"; - sha256 = "sha256-oiAn/tW4jfccsY8zH6L7UzldeM7sV9tllSvgZD8c9aY="; + version = "1.14.7"; + sha256 = "pcZGMxTVnMeD6rnNV0d9Wysk6MrYiYcJ+byuH9VR0ds="; }; meta = { license = lib.licenses.unfree; }; }; @@ -1350,8 +1350,8 @@ let mktplcRef = { publisher = "github"; name = "copilot"; - version = "1.78.9758"; - sha256 = "sha256-qIaaM72SenMv+vtkTMBodD2JsroZLpw8qEttr5aIDQk="; + version = "1.86.82"; + sha256 = "isaqjrAmu/08gnNKQPeMV4Xc8u0Hx8gB2c78WE54kYQ="; }; meta = { description = "GitHub Copilot uses OpenAI Codex to suggest code and entire functions in real-time right from your editor."; @@ -1404,8 +1404,8 @@ let # the VSCode Marketplace and use a calver scheme. We should avoid # using preview versions, because they can require insider versions # of VS Code - version = "0.60.0"; - sha256 = "sha256-VAoKNRYrzUXUQSDAX8NM17aknCUxMRsTRd5adQu+w/s="; + version = "0.64.0"; + sha256 = "tgQD3o5uMbWofVx7FPyWT1yaeu2e4aPxterN4yXA33U="; }; meta = { license = lib.licenses.mit; }; }; @@ -1614,8 +1614,8 @@ let mktplcRef = { name = "latex-workshop"; publisher = "James-Yu"; - version = "9.8.1"; - sha256 = "sha256-89jP/kd5A6UQOcln9mb6DGvWQD8CiKcg+YYRpzZIDJQ="; + version = "9.10.0"; + sha256 = "s0+8952svPSA69M4H29zuIxUWV6xNRpIqLNd8pzGJhY="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/James-Yu.latex-workshop/changelog"; diff --git a/pkgs/applications/emulators/citra/default.nix b/pkgs/applications/emulators/citra/default.nix index b27c8fb245366..cdebb980b24fa 100644 --- a/pkgs/applications/emulators/citra/default.nix +++ b/pkgs/applications/emulators/citra/default.nix @@ -1,42 +1,42 @@ { branch -, libsForQt5 +, qt6Packages , fetchFromGitHub , fetchurl }: let - # Fetched from https://api.citra-emu.org/gamedb, last updated 2022-05-02 + # Fetched from https://api.citra-emu.org/gamedb # Please make sure to update this when updating citra! compat-list = fetchurl { name = "citra-compat-list"; - url = "https://web.archive.org/web/20220502114622/https://api.citra-emu.org/gamedb/"; - sha256 = "sha256-blIlaYaUQjw7Azgg+Dd7ZPEQf+ddZMO++Yxinwe+VG0="; + url = "https://web.archive.org/web/20230512234055/https://api.citra-emu.org/gamedb/"; + hash = "sha256-J+zqtWde5NgK2QROvGewtXGRAWUTNSKHNMG6iu9m1fU="; }; in { - nightly = libsForQt5.callPackage ./generic.nix rec { + nightly = qt6Packages.callPackage ./generic.nix rec { pname = "citra-nightly"; - version = "1873"; + version = "1907"; src = fetchFromGitHub { owner = "citra-emu"; repo = "citra-nightly"; rev = "nightly-${version}"; - sha256 = "1csn9n1s2mvxwk2mahwm8mc4zgn40im374hcsqgz8gaxjkmnx288"; + sha256 = "l4pqok42/ybnRX90Qwhcgm2JR4/9C5bbCTk3j4QuWtw="; fetchSubmodules = true; }; inherit branch compat-list; }; - canary = libsForQt5.callPackage ./generic.nix rec { + canary = qt6Packages.callPackage ./generic.nix rec { pname = "citra-canary"; - version = "2440"; + version = "2484"; src = fetchFromGitHub { owner = "citra-emu"; repo = "citra-canary"; rev = "canary-${version}"; - sha256 = "06f2qnvywyaf8jc43jrzjhfshj3k21ggk8wdrvd9wjsmrryvqgbz"; + sha256 = "IgCpqt3rKV9IqNstF4QwnJlE3hPH+BkIhaOvEmshh0U="; fetchSubmodules = true; }; diff --git a/pkgs/applications/emulators/citra/generic.nix b/pkgs/applications/emulators/citra/generic.nix index fc1a9340a492c..75048ef533494 100644 --- a/pkgs/applications/emulators/citra/generic.nix +++ b/pkgs/applications/emulators/citra/generic.nix @@ -50,6 +50,8 @@ stdenv.mkDerivation rec { "-DCITRA_USE_BUNDLED_FFMPEG=OFF" "-DCITRA_USE_BUNDLED_QT=OFF" "-DUSE_SYSTEM_SDL2=ON" + "-DCMAKE_INSTALL_INCLUDEDIR=include" + "-DCMAKE_INSTALL_LIBDIR=lib" # We dont want to bother upstream with potentially outdated compat reports "-DCITRA_ENABLE_COMPATIBILITY_REPORTING=ON" diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix index 858252a840f46..ec3024d48d1d6 100644 --- a/pkgs/applications/misc/dunst/default.nix +++ b/pkgs/applications/misc/dunst/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, makeWrapper -, pkg-config, which, perl, jq, libXrandr +, pkg-config, which, perl, jq, libXrandr, coreutils , cairo, dbus, systemd, gdk-pixbuf, glib, libX11, libXScrnSaver , wayland, wayland-protocols , libXinerama, libnotify, pango, xorgproto, librsvg @@ -39,6 +39,9 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/dunst \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" + wrapProgram $out/bin/dunstctl \ + --prefix PATH : "${lib.makeBinPath [ coreutils dbus ]}" + install -D contrib/_dunst.zshcomp $out/share/zsh/site-functions/_dunst install -D contrib/_dunstctl.zshcomp $out/share/zsh/site-functions/_dunstctl substituteInPlace $out/share/zsh/site-functions/_dunstctl \ diff --git a/pkgs/applications/misc/klipperscreen/default.nix b/pkgs/applications/misc/klipperscreen/default.nix index ef51ec96ac842..e970c25725489 100644 --- a/pkgs/applications/misc/klipperscreen/default.nix +++ b/pkgs/applications/misc/klipperscreen/default.nix @@ -1,28 +1,54 @@ -{ lib, stdenv, writeText, python3Packages, fetchFromGitHub, gtk3, gobject-introspection, gdk-pixbuf, wrapGAppsHook, librsvg }: -python3Packages.buildPythonPackage rec { +{ lib +, python3 +, fetchFromGitHub +, wrapGAppsHook +, gobject-introspection +, gitUpdater +}: python3.pkgs.buildPythonApplication rec { pname = "KlipperScreen"; version = "0.3.2"; + format = "other"; src = fetchFromGitHub { owner = "jordanruthe"; - repo = pname; + repo = "KlipperScreen"; rev = "v${version}"; hash = "sha256-LweO5EVWr3OxziHrjtQDdWyUBCVUJ17afkw7RCZWgcg="; }; - patches = [ ./fix-paths.diff ]; - buildInputs = [ gtk3 librsvg ]; - nativeBuildInputs = [ wrapGAppsHook gdk-pixbuf gobject-introspection ]; + nativeBuildInputs = [ + gobject-introspection + wrapGAppsHook + ]; - propagatedBuildInputs = with python3Packages; [ jinja2 netifaces requests websocket-client pycairo pygobject3 mpv six dbus-python numpy pycairo ]; + pythonPath = with python3.pkgs; [ + jinja2 + netifaces + requests + websocket-client + pycairo + pygobject3 + mpv + six + dbus-python + ]; - preBuild = '' - ln -s ${./setup.py} setup.py + dontWrapGApps = true; + + preFixup = '' + mkdir -p $out/bin + cp -r . $out/dist + gappsWrapperArgs+=(--set PYTHONPATH "$PYTHONPATH") + wrapGApp $out/dist/screen.py + ln -s $out/dist/screen.py $out/bin/KlipperScreen ''; + passthru.updateScript = gitUpdater { url = meta.homepage; }; + meta = with lib; { description = "Touchscreen GUI for the Klipper 3D printer firmware"; - homepage = "https://github.com/jordanruthe/${pname}"; + homepage = "https://github.com/jordanruthe/KlipperScreen"; license = licenses.agpl3; + maintainers = with maintainers; [ cab404 ]; }; } diff --git a/pkgs/applications/misc/klipperscreen/fix-paths.diff b/pkgs/applications/misc/klipperscreen/fix-paths.diff deleted file mode 100644 index 71ce60fe56e80..0000000000000 --- a/pkgs/applications/misc/klipperscreen/fix-paths.diff +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/screen.py b/screen.py -index 4fd75cd..a10779a 100755 ---- a/screen.py -+++ b/screen.py -@@ -48,7 +48,7 @@ PRINTER_BASE_STATUS_OBJECTS = [ - 'exclude_object', - ] - --klipperscreendir = pathlib.Path(__file__).parent.resolve() -+klipperscreendir = pathlib.Path(functions.__file__).parent.parent.resolve() - - - def set_text_direction(lang=None): -@@ -254,7 +254,7 @@ class KlipperScreen(Gtk.Window): - def _load_panel(self, panel, *args): - if panel not in self.load_panel: - logging.debug(f"Loading panel: {panel}") -- panel_path = os.path.join(os.path.dirname(__file__), 'panels', f"{panel}.py") -+ panel_path = os.path.join(klipperscreendir, 'panels', f"{panel}.py") - logging.info(f"Panel path: {panel_path}") - if not os.path.exists(panel_path): - logging.error(f"Panel {panel} does not exist") diff --git a/pkgs/applications/misc/klipperscreen/setup.py b/pkgs/applications/misc/klipperscreen/setup.py deleted file mode 100644 index 946b517b78beb..0000000000000 --- a/pkgs/applications/misc/klipperscreen/setup.py +++ /dev/null @@ -1,11 +0,0 @@ -from setuptools import setup - -setup( - name='KlipperScreen', - install_requires=[], - packages=['styles', 'panels', 'ks_includes', 'ks_includes.widgets'], - package_data={'ks_includes': ['defaults.conf', 'locales/**', 'emptyCursor.xbm'], 'styles': ['**']}, - entry_points={ - 'console_scripts': ['KlipperScreen=screen:main'] - }, -) diff --git a/pkgs/applications/networking/browsers/polypane/default.nix b/pkgs/applications/networking/browsers/polypane/default.nix index 6d264e9abc49d..5d4978090c013 100644 --- a/pkgs/applications/networking/browsers/polypane/default.nix +++ b/pkgs/applications/networking/browsers/polypane/default.nix @@ -2,12 +2,12 @@ let pname = "polypane"; - version = "13.0.3"; + version = "13.1.2"; src = fetchurl { url = "https://github.com/firstversionist/${pname}/releases/download/v${version}/${pname}-${version}.AppImage"; name = "${pname}-${version}.AppImage"; - sha256 = "sha256-wMWO8eRH8O93m4/HaRTdG3DhyCvHWw+s3sAtN+VLBeY="; + sha256 = "sha256-wwZqcW+xIKKpUDoULT6gBi7Qbmumi8ZNwd+CpQqLprM="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix index cfe014b902e92..eeac2cfc5bb86 100644 --- a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "signal-cli"; - version = "0.11.9.1"; + version = "0.11.10"; # Building from source would be preferred, but is much more involved. src = fetchurl { url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}-Linux.tar.gz"; - hash = "sha256-LhTv3ycJXr2vt0vyXfCd1ABro4q7CfBma63Zd1osBhA="; + hash = "sha256-8iWUhneAialoEn3igxxTGJBmopbZHHqkvtJPZEESWM0="; }; buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ]; diff --git a/pkgs/applications/office/treesheets/default.nix b/pkgs/applications/office/treesheets/default.nix index d5d47c307f218..d46f9adfb0ad1 100644 --- a/pkgs/applications/office/treesheets/default.nix +++ b/pkgs/applications/office/treesheets/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "treesheets"; - version = "unstable-2023-05-17"; + version = "unstable-2023-05-18"; src = fetchFromGitHub { owner = "aardappel"; repo = "treesheets"; - rev = "9c59ce89a0d9bcf6f0c65e9e9453ad433222c603"; - sha256 = "uBoHaamFZ6m328NWkbTWMbc1OSFuyif+3OcCvwTwKfU="; + rev = "750530c925da889834a69689e067dda1a8d8cdeb"; + sha256 = "4yN/ZS0f7En/LJzf2lJBqAB60Oy5+5UX+ROlUWAARKs="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/ani-cli/default.nix b/pkgs/applications/video/ani-cli/default.nix index bcbb680e60002..5ae2b22884333 100644 --- a/pkgs/applications/video/ani-cli/default.nix +++ b/pkgs/applications/video/ani-cli/default.nix @@ -12,13 +12,13 @@ stdenvNoCC.mkDerivation rec { pname = "ani-cli"; - version = "4.2"; + version = "4.3"; src = fetchFromGitHub { owner = "pystardust"; repo = "ani-cli"; rev = "v${version}"; - hash = "sha256-XXD55sxgKg8qSdXV7mbnSCQJ4fNgWFG5IiR1QTjDkHI="; + hash = "sha256-Wo3ydCylrqfmB4EgYsmc7BfXLPD1BxdDFGY4KeUfGfE="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/window-managers/sway/osd.nix b/pkgs/applications/window-managers/sway/osd.nix index 6e4c57c4954f6..bc634d1b34be9 100644 --- a/pkgs/applications/window-managers/sway/osd.nix +++ b/pkgs/applications/window-managers/sway/osd.nix @@ -2,7 +2,7 @@ , rustPlatform , fetchFromGitHub , pkg-config -, gtk3 +, wrapGAppsHook , gtk-layer-shell , libpulseaudio }: @@ -20,10 +20,12 @@ rustPlatform.buildRustPackage { cargoHash = "sha256-ZcgrUcRQTcEYhw2mpJDuYDz3I/u/2Q+O60ajXYRMeow="; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + wrapGAppsHook + pkg-config + ]; buildInputs = [ - gtk3 gtk-layer-shell libpulseaudio ]; |