diff options
Diffstat (limited to 'pkgs/applications')
9 files changed, 98 insertions, 46 deletions
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix index 0f28ed8f8f028..7e59c5f067f2a 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix @@ -57,6 +57,8 @@ in inherit (pkgs) python3 git go gopls pyright; }; + lspce = callPackage ./manual-packages/lspce { }; + matrix-client = callPackage ./manual-packages/matrix-client { _map = self.map; }; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/default.nix new file mode 100644 index 0000000000000..29157c802411a --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/default.nix @@ -0,0 +1,72 @@ +{ lib +, emacs +, f +, fetchFromGitHub +, markdown-mode +, rustPlatform +, trivialBuild +, yasnippet +}: + +let + version = "unstable-2023-10-30"; + + src = fetchFromGitHub { + owner = "zbelial"; + repo = "lspce"; + rev = "34c59787bcdbf414c92d9b3bf0a0f5306cb98d64"; + hash = "sha256-kUHGdeJo2zXA410FqXGclgXmgWrll30Zv8fSprcmnIo="; + }; + + meta = { + homepage = "https://github.com/zbelial/lspce"; + description = "LSP Client for Emacs implemented as a module using rust"; + license = lib.licenses.gpl3Only; + maintainers = [ lib.maintainers.marsam ]; + inherit (emacs.meta) platforms; + }; + + lspce-module = rustPlatform.buildRustPackage { + inherit version src meta; + pname = "lspce-module"; + + cargoHash = "sha256-eqSromwJrFhtJWedDVJivfbKpAtSFEtuCP098qOxFgI="; + + checkFlags = [ + # flaky test + "--skip=msg::tests::serialize_request_with_null_params" + ]; + + postFixup = '' + for f in $out/lib/*; do + mv $f $out/lib/lspce-module.''${f##*.} + done + ''; + }; +in +trivialBuild rec { + inherit version src meta; + pname = "lspce"; + + preBuild = '' + ln -s ${lspce-module}/lib/lspce-module* . + + # Fix byte-compilation + substituteInPlace lspce-util.el \ + --replace "(require 'yasnippet)" "(require 'yasnippet)(require 'url-util)" + substituteInPlace lspce-calltree.el \ + --replace "(require 'compile)" "(require 'compile)(require 'cl-lib)" + ''; + + buildInputs = propagatedUserEnvPkgs; + + propagatedUserEnvPkgs = [ + f + markdown-mode + yasnippet + ]; + + postInstall = '' + install lspce-module* $LISPDIR + ''; +} diff --git a/pkgs/applications/emulators/yuzu/sources.nix b/pkgs/applications/emulators/yuzu/sources.nix index 3371bf15c5c99..24997cbdcdc40 100644 --- a/pkgs/applications/emulators/yuzu/sources.nix +++ b/pkgs/applications/emulators/yuzu/sources.nix @@ -1,19 +1,19 @@ # Generated by ./update.sh - do not update manually! -# Last updated: 2023-10-20 +# Last updated: 2023-11-05 { compatList = { - rev = "9d17cbd71408476c6a28cbf0fa8177155c511681"; + rev = "e9c4e5da6e5e88e889c87582dfd826d204ca8782"; hash = "sha256:1hdsza3wf9a0yvj6h55gsl7xqvhafvbz1i8paz9kg7l49b0gnlh1"; }; mainline = { - version = "1595"; - hash = "sha256:09b0w6z4w9z4ms2pvik2vrmklfcx25jxcgs61bff3nflilnw9m97"; + version = "1611"; + hash = "sha256:18rrw63j2zjwakbn99wbzprb1rpmlznl6gb09ay9sq8brxy7zjsv"; }; ea = { - version = "3940"; - distHash = "sha256:0g0vv274sh3iy56n7s324km87g302005ahi9zh2qhwkiirbnc811"; - fullHash = "sha256:0ywppc4z5d4b1zl1cr8yfnba58hgi0z2szficwpinapai7q0pyid"; + version = "3966"; + distHash = "sha256:1p60455s0h3dwigxm2lxdfgxgv4l2ibwybisja1khcy4i8lgss03"; + fullHash = "sha256:1jq2bfbv9a6i3dlqsdgmi87rccvks45iyybxwf8p6rxdjqh4bvl2"; }; } diff --git a/pkgs/applications/graphics/xpano/default.nix b/pkgs/applications/graphics/xpano/default.nix index a2ecaec7c37a2..c52d729f9b51a 100644 --- a/pkgs/applications/graphics/xpano/default.nix +++ b/pkgs/applications/graphics/xpano/default.nix @@ -15,21 +15,16 @@ stdenv.mkDerivation rec { pname = "xpano"; - version = "0.16.1"; + version = "0.17.0"; src = fetchFromGitHub { owner = "krupkat"; repo = pname; rev = "v${version}"; - sha256 = "1f95spf7bbbdvbr4gqfyrs161049jj1wnkvf5wgsd0ga3vb15mcj"; + sha256 = "aKO9NYHFjb69QopseNOJvUvvVT1povP9tyGSOHJFWVo="; fetchSubmodules = true; }; - patches = [ - # force install desktop + icon files - ./skip_prefix_check.patch - ]; - nativeBuildInputs = [ cmake ninja @@ -42,7 +37,7 @@ stdenv.mkDerivation rec { SDL2 gtk3 spdlog - # exiv2 # TODO: enable when 0.28.0 is available + exiv2 ]; checkInputs = [ @@ -53,6 +48,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_TESTING=ON" + "-DXPANO_INSTALL_DESKTOP_FILES=ON" ]; meta = with lib; { diff --git a/pkgs/applications/graphics/xpano/skip_prefix_check.patch b/pkgs/applications/graphics/xpano/skip_prefix_check.patch deleted file mode 100644 index 496cbc718bef7..0000000000000 --- a/pkgs/applications/graphics/xpano/skip_prefix_check.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -167,7 +167,6 @@ install(FILES - TYPE BIN - ) - --if(CMAKE_INSTALL_PREFIX MATCHES "^/usr.*|^/app.*") - install(FILES - "misc/build/linux/xpano.desktop" - DESTINATION "${CMAKE_INSTALL_PREFIX}/share/applications" -@@ -184,7 +183,6 @@ if(CMAKE_INSTALL_PREFIX MATCHES "^/usr.*|^/app.*") - "misc/build/linux/cz.krupkat.Xpano.metainfo.xml" - DESTINATION "${CMAKE_INSTALL_PREFIX}/share/metainfo" - ) --endif() - - install(DIRECTORY - "${CMAKE_SOURCE_DIR}/misc/assets" diff --git a/pkgs/applications/networking/cluster/kubectl-klock/default.nix b/pkgs/applications/networking/cluster/kubectl-klock/default.nix index dc9f8c25b5c8e..db40df70f9348 100644 --- a/pkgs/applications/networking/cluster/kubectl-klock/default.nix +++ b/pkgs/applications/networking/cluster/kubectl-klock/default.nix @@ -2,21 +2,21 @@ buildGo121Module rec { pname = "kubectl-klock"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { - owner = "jillejr"; + owner = "applejag"; repo = pname; rev = "v${version}"; - sha256 = "sha256-HO9/hr/CBmJkrbNdX8tp2pNRfZDaWNW8shyCR46G77A="; + sha256 = "sha256-fR97rTMFwtqVH9wqKy1+EzKKg753c18v8VDCQ2Y69+s="; }; - vendorHash = "sha256-QvD5yVaisq5Zz/M81HAMKpgQJRB5qPCYveLgldHHGf0="; + vendorHash = "sha256-AkYKKM4PR/msG44MwdSq6XAf6EvdtJHoXyw7Xj7MXso="; meta = with lib; { description = "A kubectl plugin to render watch output in a more readable fashion"; - homepage = "https://github.com/jillejr/kubectl-klock"; - changelog = "https://github.com/jillejr/kubectl-klock/releases/tag/v${version}"; + homepage = "https://github.com/applejag/kubectl-klock"; + changelog = "https://github.com/applejag/kubectl-klock/releases/tag/v${version}"; license = licenses.gpl3Plus; maintainers = [ maintainers.scm2342 ]; }; diff --git a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix index 92fc2a96623ea..2ff8a8d81a89c 100644 --- a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix +++ b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix @@ -19,18 +19,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "teams-for-linux"; - version = "1.3.14"; + version = "1.3.18"; src = fetchFromGitHub { owner = "IsmaelMartinez"; repo = "teams-for-linux"; rev = "v${finalAttrs.version}"; - hash = "sha256-2H7j8e2wPMd4cHXDKxSmyC2Ng/B3jb3/tGVTpUOU3XM="; + hash = "sha256-evOwjHUmeGw8AUpXSig8zVW2cpJbWkNTH/RUuNipFsQ="; }; offlineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/yarn.lock"; - hash = "sha256-zB6H14VAf13pAHQmsWC51d/qqyfRmAEbltyLD5ucG4Y="; + hash = "sha256-tMC8/qHYli7+OTdxVWRDEyCNzrkYA+zKlHJXlTsl+W0="; }; nativeBuildInputs = [ yarn fixup_yarn_lock nodejs copyDesktopItems makeWrapper ]; diff --git a/pkgs/applications/science/chemistry/nwchem/default.nix b/pkgs/applications/science/chemistry/nwchem/default.nix index 062c61fa5c9e0..a7d9462a7fbdb 100644 --- a/pkgs/applications/science/chemistry/nwchem/default.nix +++ b/pkgs/applications/science/chemistry/nwchem/default.nix @@ -54,13 +54,13 @@ let in stdenv.mkDerivation rec { pname = "nwchem"; - version = "7.2.1"; + version = "7.2.2"; src = fetchFromGitHub { owner = "nwchemgit"; repo = "nwchem"; rev = "v${version}-release"; - hash = "sha256-nnNTZ+c7VVGAqwOBMkBlW3rImNjs08Ne35XRkI3ssGo="; + hash = "sha256-BcYRqPaPR24OTRY0MJgBxi46HvUG4uFaY0unZmu5b9k="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/kodi/addons/pvr-hts/default.nix b/pkgs/applications/video/kodi/addons/pvr-hts/default.nix index 5817b49e5edee..a3b2e81fa686a 100644 --- a/pkgs/applications/video/kodi/addons/pvr-hts/default.nix +++ b/pkgs/applications/video/kodi/addons/pvr-hts/default.nix @@ -2,13 +2,13 @@ buildKodiBinaryAddon rec { pname = "pvr-hts"; namespace = "pvr.hts"; - version = "20.6.3"; + version = "20.6.4"; src = fetchFromGitHub { owner = "kodi-pvr"; repo = "pvr.hts"; rev = "${version}-${rel}"; - sha256 = "sha256-lfFCcmLvdvlY3NvHmF+JDcnA6zGsIKvX8BUg9GwYPs4="; + sha256 = "sha256-IrVz4rHAmaj/ACBNEF0x3kJa3fFPTTT7Pv9GnWJm8Vg="; }; meta = with lib; { |