diff options
Diffstat (limited to 'pkgs/applications')
24 files changed, 117 insertions, 166 deletions
diff --git a/pkgs/applications/audio/easyeffects/default.nix b/pkgs/applications/audio/easyeffects/default.nix index 648bcd67660ef..cd845c87b590b 100644 --- a/pkgs/applications/audio/easyeffects/default.nix +++ b/pkgs/applications/audio/easyeffects/default.nix @@ -1,5 +1,6 @@ { lib , stdenv +, appstream-glib , desktop-file-utils , fetchFromGitHub , calf @@ -10,9 +11,11 @@ , gsl , gtk4 , itstool +, ladspaH , libadwaita , libbs2b , libebur128 +, libportal-gtk4 , libsamplerate , libsigcxx30 , libsndfile @@ -37,13 +40,13 @@ stdenv.mkDerivation rec { pname = "easyeffects"; - version = "7.1.0"; + version = "7.1.3"; src = fetchFromGitHub { owner = "wwmm"; repo = "easyeffects"; rev = "v${version}"; - hash = "sha256-TuVW2KBJciuFVdduzfFepGOa+UY9+sXRN1gWhfDvXgw="; + hash = "sha256-OJy8HhojfpUwWo3zg+FgdFI4pMzWA61VMsdPE03MfeE="; }; nativeBuildInputs = [ @@ -56,15 +59,18 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + appstream-glib fftw fftwFloat fmt_9 glib gsl gtk4 + ladspaH libadwaita libbs2b libebur128 + libportal-gtk4 libsamplerate libsigcxx30 libsndfile @@ -102,6 +108,7 @@ stdenv.mkDerivation rec { separateDebugInfo = true; meta = with lib; { + changelog = "https://github.com/wwmm/easyeffects/blob/v${version}/CHANGELOG.md"; description = "Audio effects for PipeWire applications."; homepage = "https://github.com/wwmm/easyeffects"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/audio/go-musicfox/default.nix b/pkgs/applications/audio/go-musicfox/default.nix index e4a10d82c1396..0432224fa3c32 100644 --- a/pkgs/applications/audio/go-musicfox/default.nix +++ b/pkgs/applications/audio/go-musicfox/default.nix @@ -9,13 +9,13 @@ buildGo121Module rec { pname = "go-musicfox"; - version = "4.2.1"; + version = "4.3.0"; src = fetchFromGitHub { owner = "go-musicfox"; repo = pname; rev = "v${version}"; - hash = "sha256-yl7PirSt4zEy8ZoDGq3dn5TjJtbJeAgXgbynw/D0d38="; + hash = "sha256-JDR3D3tILT0q9jqcZmbfQC3yn7cmaSL/GEpCguqCFXI="; }; deleteVendor = true; diff --git a/pkgs/applications/audio/pocket-casts/default.nix b/pkgs/applications/audio/pocket-casts/default.nix index 10bd25e11676c..e07904b32485c 100644 --- a/pkgs/applications/audio/pocket-casts/default.nix +++ b/pkgs/applications/audio/pocket-casts/default.nix @@ -1,13 +1,13 @@ { lib -, stdenv +, buildNpmPackage , fetchFromGitHub -, electron -, copyDesktopItems , makeDesktopItem +, copyDesktopItems , makeWrapper +, electron }: -stdenv.mkDerivation rec { +buildNpmPackage rec { pname = "pocket-casts"; version = "0.7.0"; @@ -15,9 +15,15 @@ stdenv.mkDerivation rec { owner = "felicianotech"; repo = "pocket-casts-desktop-app"; rev = "v${version}"; - sha256 = "sha256-d4uVeHy4/91Ki6Wk6GlOt2lcK6U+M7fOryiOYA7q/x4="; + hash = "sha256-d4uVeHy4/91Ki6Wk6GlOt2lcK6U+M7fOryiOYA7q/x4="; }; + npmDepsHash = "sha256-rMLUQGcbBJBbxXP67lXp0ww8U2HYM/m1CP2dOw1cCHc="; + + env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + + dontNpmBuild = true; + desktopItems = [ (makeDesktopItem { name = pname; @@ -34,19 +40,12 @@ stdenv.mkDerivation rec { makeWrapper ]; - installPhase = '' - runHook preInstall - - mkdir -p $out/bin $out/opt/pocket-casts $out/share/pixmaps - - cp -r main.js tray-icon.png LICENSE $out/opt/pocket-casts - install -Dm644 icon.png $out/share/pixmaps/pocket-casts.png - install -Dm644 icon-x360.png $out/share/pixmaps/pocket-casts-x360.png + postInstall = '' + install -Dm644 $out/lib/node_modules/pocket-casts/icon.png $out/share/pixmaps/pocket-casts.png + install -Dm644 $out/lib/node_modules/pocket-casts/icon-x360.png $out/share/pixmaps/pocket-casts-x360.png makeWrapper ${electron}/bin/electron $out/bin/pocket-casts \ - --add-flags $out/opt/pocket-casts/main.js - - runHook postInstall + --add-flags $out/lib/node_modules/pocket-casts/main.js ''; meta = with lib; { @@ -54,6 +53,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/felicianotech/pocket-casts-desktop-app"; license = licenses.mit; maintainers = with maintainers; [ wolfangaukang ]; + mainProgram = "pocket-casts"; platforms = platforms.linux; }; } diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 365b26642b3ec..b583e8135609c 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -20,6 +20,7 @@ , millet , shfmt , typst-lsp +, typst-preview , autoPatchelfHook , zlib , stdenv @@ -2297,37 +2298,26 @@ let }; }; + # Keep pkgs/tools/typesetting/typst-preview/default.nix in sync with this + # extension mgt19937.typst-preview = buildVscodeMarketplaceExtension { - mktplcRef = - let - sources = { - "x86_64-linux" = { - arch = "linux-x64"; - sha256 = "sha256-O8sFv23tlhJS6N8LRKkHcTJTupZejCLDRdVVCdDlWbA="; - }; - "x86_64-darwin" = { - arch = "darwin-x64"; - sha256 = "1npzjch67agswh3nm14dbbsx777daq2rdw1yny10jf3858z2qynr"; - }; - "aarch64-linux" = { - arch = "linux-arm64"; - sha256 = "1vv1jfgnyjbmshh4w6rf496d9dpdsk3f0049ii4d9vi23igk4xpk"; - }; - "aarch64-darwin" = { - arch = "darwin-arm64"; - sha256 = "0dfchzqm61kddq20zvp1pcpk1625b9wgj32ymc08piq06pbadk29"; - }; - }; - in - { + mktplcRef = { name = "typst-preview"; publisher = "mgt19937"; - version = "0.6.1"; - } // sources.${stdenv.system}; + version = "0.9.1"; + sha256 = "sha256-GHD/i+QOnItGEYG0bl/pVl+a4Dvn7SHhICJ14VfqMjE="; + }; - nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + buildInputs = [ + typst-preview + ]; - buildInputs = lib.optionals stdenv.isLinux [ stdenv.cc.cc.lib ]; + nativeBuildInputs = [ jq moreutils ]; + + postInstall = '' + cd "$out/$installPrefix" + jq '.contributes.configuration.properties."typst-preview.executable".default = "${lib.getExe typst-preview}"' package.json | sponge package.json + ''; meta = { description = "Typst Preview is an extension for previewing your Typst files in vscode instantly"; @@ -2745,7 +2735,6 @@ let }; }; - nvarner.typst-lsp = buildVscodeMarketplaceExtension { mktplcRef = { name = "typst-lsp"; @@ -2758,9 +2747,13 @@ let nativeBuildInputs = [ jq moreutils ]; + buildInputs = [ + typst-lsp + ]; + postInstall = '' cd "$out/$installPrefix" - jq '.contributes.configuration.properties."typst-lsp.serverPath".default = "${typst-lsp}/bin/typst-lsp"' package.json | sponge package.json + jq '.contributes.configuration.properties."typst-lsp.serverPath".default = "${lib.getExe typst-lsp}"' package.json | sponge package.json ''; meta = { diff --git a/pkgs/applications/emulators/kega-fusion/default.nix b/pkgs/applications/emulators/kega-fusion/default.nix index 1b95dec89face..f69a9c3206cd5 100644 --- a/pkgs/applications/emulators/kega-fusion/default.nix +++ b/pkgs/applications/emulators/kega-fusion/default.nix @@ -1,7 +1,7 @@ -{ stdenv, lib, writeText, fetchurl, upx, libGLU, glib, gtk2, alsa-lib, libSM, libX11, gdk-pixbuf, pango, libXinerama, mpg123, runtimeShell }: +{ stdenv, lib, writeText, fetchurl, upx, libGL, libGLU, glib, gtk2, alsa-lib, libSM, libX11, gdk-pixbuf, pango, libXinerama, mpg123, runtimeShell }: let - libPath = lib.makeLibraryPath [ stdenv.cc.cc libGLU glib gtk2 alsa-lib libSM libX11 gdk-pixbuf pango libXinerama ]; + libPath = lib.makeLibraryPath [ stdenv.cc.cc libGL libGLU glib gtk2 alsa-lib libSM libX11 gdk-pixbuf pango libXinerama ]; in stdenv.mkDerivation { pname = "kega-fusion"; diff --git a/pkgs/applications/graphics/displaycal/default.nix b/pkgs/applications/graphics/displaycal/default.nix index b525d16b390ff..f54a1c1023015 100644 --- a/pkgs/applications/graphics/displaycal/default.nix +++ b/pkgs/applications/graphics/displaycal/default.nix @@ -10,13 +10,13 @@ python3.pkgs.buildPythonApplication rec { pname = "displaycal"; - version = "3.9.10"; + version = "3.9.11"; format = "setuptools"; src = fetchPypi { pname = "DisplayCAL"; inherit version; - hash = "sha256-oDHDVb0zuAC49yPfmNe7xuFKaA1BRZGr75XwsLqugHs="; + hash = "sha256-zAZW2eMjwRYevlz8KEzTxzGO8vx5AydfY3vGTapNo1c="; }; nativeBuildInputs = [ @@ -30,8 +30,11 @@ python3.pkgs.buildPythonApplication rec { wxPython_4_2 dbus-python distro + numpy + pillow pychromecast send2trash + zeroconf ]; buildInputs = [ @@ -45,6 +48,9 @@ python3.pkgs.buildPythonApplication rec { libXrandr ]); + # Workaround for eoyilmaz/displaycal-py3#261 + setupPyGlobalFlags = [ "appdata" ]; + doCheck = false; # Tests try to access an X11 session and dbus in weird locations. pythonImportsCheck = [ "DisplayCAL" ]; diff --git a/pkgs/applications/graphics/figma-linux/default.nix b/pkgs/applications/graphics/figma-linux/default.nix index 0ee58e009c262..0aa5d6b553500 100644 --- a/pkgs/applications/graphics/figma-linux/default.nix +++ b/pkgs/applications/graphics/figma-linux/default.nix @@ -10,11 +10,11 @@ with lib; stdenv.mkDerivation (finalAttrs: { pname = "figma-linux"; - version = "0.10.0"; + version = "0.11.2"; src = fetchurl { url = "https://github.com/Figma-Linux/figma-linux/releases/download/v${finalAttrs.version}/figma-linux_${finalAttrs.version}_linux_amd64.deb"; - sha256 = "sha256-+xiXEwSSxpt1/Eu9g57/L+Il/Av+a/mgGBQl/4LKR74="; + hash = "sha256-T5SFcdz5yrInE6+ydJqtstEYF0MvHquRZ7nvlCOVNzE="; }; nativeBuildInputs = [ autoPatchelfHook dpkg wrapGAppsHook ]; @@ -69,11 +69,11 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = { - description = "unofficial Electron-based Figma desktop app for Linux"; + description = "Unofficial Electron-based Figma desktop app for Linux"; homepage = "https://github.com/Figma-Linux/figma-linux"; platforms = [ "x86_64-linux" ]; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ ercao kashw2 ]; - knownVulnerabilities = [ "CVE-2023-5217" ]; + mainProgram = "figma-linux"; }; }) diff --git a/pkgs/applications/graphics/tesseract/tesseract5.nix b/pkgs/applications/graphics/tesseract/tesseract5.nix index 46e83d77ca9a8..791ce9ad9a63b 100644 --- a/pkgs/applications/graphics/tesseract/tesseract5.nix +++ b/pkgs/applications/graphics/tesseract/tesseract5.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, autoconf-archive, pkg-config -, leptonica, libpng, libtiff, icu, pango, opencl-headers, fetchpatch +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config +, curl, leptonica, libarchive, libpng, libtiff, icu, pango, opencl-headers, fetchpatch , Accelerate, CoreGraphics, CoreVideo }: @@ -19,11 +19,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook - autoconf-archive ]; buildInputs = [ + curl leptonica + libarchive libpng libtiff icu diff --git a/pkgs/applications/graphics/vipsdisp/default.nix b/pkgs/applications/graphics/vipsdisp/default.nix index c40de85767a30..4c516e3ac82c0 100644 --- a/pkgs/applications/graphics/vipsdisp/default.nix +++ b/pkgs/applications/graphics/vipsdisp/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "vipsdisp"; - version = "2.6.0"; + version = "2.6.1"; src = fetchFromGitHub { owner = "jcupitt"; repo = "vipsdisp"; rev = "v${version}"; - hash = "sha256-iLjS3vBhdPPQNtIaM++xKekYTsr1X9f6ED2A7DYV7Lc="; + hash = "sha256-vY3BTbCLf3JOB+eILMvaFUIgG3UBkSdckFAdC4W0OnU="; }; postPatch = '' diff --git a/pkgs/applications/misc/anytype/default.nix b/pkgs/applications/misc/anytype/default.nix index f17a939b53cfc..71af8bc4c432f 100644 --- a/pkgs/applications/misc/anytype/default.nix +++ b/pkgs/applications/misc/anytype/default.nix @@ -2,13 +2,13 @@ let pname = "anytype"; - version = "0.35.4"; + version = "0.35.25-beta"; name = "Anytype-${version}"; nameExecutable = pname; src = fetchurl { url = "https://github.com/anyproto/anytype-ts/releases/download/v${version}/${name}.AppImage"; name = "Anytype-${version}.AppImage"; - sha256 = "sha256-heS+3ucxv4WTiqegdmjpv8aWuC+3knxC00SDDg4R8iU="; + sha256 = "sha256-55VT4t/SNl13Gdh7LG4SqLN9uo0cYDu0LnPFIuZ7Sm0="; }; appimageContents = appimageTools.extractType2 { inherit name src; }; in diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index 72acbe02bbaef..d4b89db84ef55 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -18,13 +18,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gpxsee"; - version = "13.10"; + version = "13.11"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = finalAttrs.version; - hash = "sha256-84F4B2yQREPosH1bK74nOby3o/C0isKq4t2CJprsblU="; + hash = "sha256-EJpyWuOyUVb34F5Pg8KPF9R3f3VpvZVeg8WBZ1oGbbE="; }; buildInputs = [ diff --git a/pkgs/applications/misc/nwg-drawer/default.nix b/pkgs/applications/misc/nwg-drawer/default.nix deleted file mode 100644 index 6e7af27f3b13b..0000000000000 --- a/pkgs/applications/misc/nwg-drawer/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, cairo -, gobject-introspection -, gtk3 -, gtk-layer-shell -, pkg-config -, wrapGAppsHook -, xdg-utils }: - -buildGoModule rec { - pname = "nwg-drawer"; - version = "0.3.9"; - - src = fetchFromGitHub { - owner = "nwg-piotr"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-RCryDei8Tw1f+7y8iIDC3mASv5nwq4qrWRc4CudS/Cg="; - }; - - vendorHash = "sha256-YwXX3srQdCicJlstodqOsL+dwBNVyJx/SwC2dMOUBh4="; - - buildInputs = [ cairo gtk3 gtk-layer-shell ]; - nativeBuildInputs = [ pkg-config wrapGAppsHook gobject-introspection ]; - - doCheck = false; - - preInstall = '' - mkdir -p $out/share/nwg-drawer - cp -r desktop-directories drawer.css $out/share/nwg-drawer - ''; - - preFixup = '' - # make xdg-open overrideable at runtime - gappsWrapperArgs+=( - --suffix PATH : ${xdg-utils}/bin - --prefix XDG_DATA_DIRS : $out/share - ) - ''; - - meta = with lib; { - description = "Application drawer for sway Wayland compositor"; - homepage = "https://github.com/nwg-piotr/nwg-drawer"; - license = licenses.mit; - platforms = platforms.linux; - mainProgram = "nwg-drawer"; - maintainers = with maintainers; [ plabadens ]; - }; -} diff --git a/pkgs/applications/misc/typioca/default.nix b/pkgs/applications/misc/typioca/default.nix index 888913dd1e2de..71475cdf224bf 100644 --- a/pkgs/applications/misc/typioca/default.nix +++ b/pkgs/applications/misc/typioca/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "typioca"; - version = "2.6.0"; + version = "2.7.0"; src = fetchFromGitHub { owner = "bloznelis"; repo = "typioca"; rev = version; - hash = "sha256-m6vt4wpLpKJJNP8qCCeLMgNfAAZengDGjBVmFI5ZeSQ="; + hash = "sha256-PVyEvPktb2ortmPf1afk6vXmcp91Zei8BLwGkRazFGA="; }; - vendorHash = "sha256-q22t4/eum/RSWyzVQfJ0VZkEHgBu12nyRgmkJffi7PM="; + vendorHash = "sha256-XiKn18WCbhVvsrIvTN/Yquj4mhq4n1X1jqdGUaMacV4="; ldflags = [ "-s" diff --git a/pkgs/applications/networking/cluster/glooctl/default.nix b/pkgs/applications/networking/cluster/glooctl/default.nix index 407b0c0dd9c11..ce52fdb6a3557 100644 --- a/pkgs/applications/networking/cluster/glooctl/default.nix +++ b/pkgs/applications/networking/cluster/glooctl/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "glooctl"; - version = "1.15.14"; + version = "1.15.16"; src = fetchFromGitHub { owner = "solo-io"; repo = "gloo"; rev = "v${version}"; - hash = "sha256-rQZOGM97mXKFFMQRw6+iiaDLugu0CM7OW2V7w0fgpDM="; + hash = "sha256-GsT9ffQdLDxckKyf9U0sWZBf388o6ee9clrUuLJT/bA="; }; - vendorHash = "sha256-51s+C4P8xKp52qjr6LK3zWKWzwnuEQyKxi/Wzpha9Fs="; + vendorHash = "sha256-/JliAQtUd8fbKThqkwC4u4XNawXhoZaV1XdJRciJxmw="; subPackages = [ "projects/gloo/cli/cmd" ]; diff --git a/pkgs/applications/networking/instant-messengers/abaddon/default.nix b/pkgs/applications/networking/instant-messengers/abaddon/default.nix index 4fd9a36b0f516..3d49f47f81635 100644 --- a/pkgs/applications/networking/instant-messengers/abaddon/default.nix +++ b/pkgs/applications/networking/instant-messengers/abaddon/default.nix @@ -80,6 +80,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/uowuo/abaddon"; license = licenses.gpl3Plus; maintainers = with maintainers; [ genericnerdyusername ]; - platforms = lib.intersectLists lib.platforms.x86_64 lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix index 38719920d8a22..aec46a8c0f6bb 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix @@ -15,6 +15,7 @@ , at-spi2-atk , cairo , pango +, pipewire , gdk-pixbuf , glib , freetype @@ -150,7 +151,7 @@ stdenv.mkDerivation rec { preFixup = '' gappsWrapperArgs+=( - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ] }" + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc pipewire ] }" # Currently crashes see https://github.com/NixOS/nixpkgs/issues/222043 #--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} diff --git a/pkgs/applications/office/onlyoffice-bin/7_4.nix b/pkgs/applications/office/onlyoffice-bin/7_5.nix index bf587a4c9bc28..33744bb3831ef 100644 --- a/pkgs/applications/office/onlyoffice-bin/7_4.nix +++ b/pkgs/applications/office/onlyoffice-bin/7_5.nix @@ -26,6 +26,7 @@ , libdrm , makeWrapper , mesa +, noto-fonts-cjk-sans , nspr , nss , pulseaudio @@ -54,18 +55,6 @@ let # TODO: Find out which of these fonts we'd be allowed to distribute along # with this package, or how to make this easier for users otherwise. - # Not using the `noto-fonts-cjk` package from nixpkgs, because it was - # reported that its `.ttc` file is not picked up by OnlyOffice, see: - # https://github.com/NixOS/nixpkgs/pull/116343#discussion_r593979816 - noto-fonts-cjk = fetchurl { - url = - let - version = "v20201206-cjk"; - in - "https://github.com/googlefonts/noto-cjk/raw/${version}/NotoSansCJKsc-Regular.otf"; - sha256 = "sha256-aJXSVNJ+p6wMAislXUn4JQilLhimNSedbc9nAuPVxo4="; - }; - runtimeLibs = lib.makeLibraryPath [ curl glibc @@ -76,11 +65,11 @@ let derivation = stdenv.mkDerivation rec { pname = "onlyoffice-desktopeditors"; - version = "7.4.1"; + version = "7.5.1"; minor = null; src = fetchurl { url = "https://github.com/ONLYOFFICE/DesktopEditors/releases/download/v${version}/onlyoffice-desktopeditors_amd64.deb"; - sha256 = "sha256-vaBF3GJyLBldWdEruOeVpRvwGNwaRl7IKPguDLRoe8M="; + sha256 = "sha256-Hf5CNbUUMuHZHDY3fgD4qpF4UASevscK8DTZlauyHhY="; }; nativeBuildInputs = [ @@ -134,10 +123,6 @@ let dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner ''; - preConfigure = '' - cp --no-preserve=mode,ownership ${noto-fonts-cjk} opt/onlyoffice/desktopeditors/fonts/ - ''; - installPhase = '' runHook preInstall @@ -179,12 +164,14 @@ in # In order to download plugins, OnlyOffice uses /usr/bin/curl so we have to wrap it. # Curl still needs to be in runtimeLibs because the library is used directly in other parts of the code. +# Fonts are also discovered by looking in /usr/share/fonts, so adding fonts to targetPkgs will include them buildFHSEnv { name = derivation.name; targetPkgs = pkgs': [ curl derivation + noto-fonts-cjk-sans ]; runScript = "/bin/onlyoffice-desktopeditors"; diff --git a/pkgs/applications/terminal-emulators/rio/default.nix b/pkgs/applications/terminal-emulators/rio/default.nix index 950d2f8f401e7..6ebd8f6f521d1 100644 --- a/pkgs/applications/terminal-emulators/rio/default.nix +++ b/pkgs/applications/terminal-emulators/rio/default.nix @@ -7,6 +7,7 @@ , nix-update-script , autoPatchelfHook +, cmake , ncurses , pkg-config @@ -29,7 +30,7 @@ let rlinkLibs = if stdenv.isDarwin then [ darwin.libobjc - darwin.apple_sdk.frameworks.AppKit + darwin.apple_sdk_11_0.frameworks.AppKit ] else [ (lib.getLib gcc-unwrapped) fontconfig @@ -48,20 +49,21 @@ let in rustPlatform.buildRustPackage rec { pname = "rio"; - version = "0.0.19"; + version = "0.0.27"; src = fetchFromGitHub { owner = "raphamorim"; repo = "rio"; rev = "v${version}"; - hash = "sha256-N7eHIyp2imkMUVwiOCameOROoaDJ7g+zNKdIB2aGZy0="; + hash = "sha256-q3Wq7jIYE4g1uPAlpzNWvwUvMy9eN6NQNmPNC4cFmYg="; }; - cargoHash = "sha256-XD+/DaaJEJ9jHZITTUma/wfsbduPUTc/SralPOx46Yo="; + cargoHash = "sha256-SP85se+H4jL/cXyvfbFS2lxpNSjuptAIPs3/htcrMcw="; nativeBuildInputs = [ ncurses ] ++ lib.optionals stdenv.isLinux [ + cmake pkg-config autoPatchelfHook ]; @@ -84,8 +86,8 @@ rustPlatform.buildRustPackage rec { postInstall = '' install -D -m 644 misc/rio.desktop -t $out/share/applications - install -D -m 644 rio/src/screen/window/resources/images/logo.png \ - $out/share/icons/hicolor/scalable/apps/rio.png + install -D -m 644 misc/logo.svg \ + $out/share/icons/hicolor/scalable/apps/rio.svg install -dm 755 "$terminfo/share/terminfo/r/" tic -xe rio,rio-direct -o "$terminfo/share/terminfo" misc/rio.terminfo diff --git a/pkgs/applications/version-management/git-mit/default.nix b/pkgs/applications/version-management/git-mit/default.nix index 36cda3dfc722d..bcaf37cdcb342 100644 --- a/pkgs/applications/version-management/git-mit/default.nix +++ b/pkgs/applications/version-management/git-mit/default.nix @@ -10,7 +10,7 @@ }: let - version = "5.12.174"; + version = "5.12.175"; in rustPlatform.buildRustPackage { pname = "git-mit"; @@ -20,10 +20,10 @@ rustPlatform.buildRustPackage { owner = "PurpleBooth"; repo = "git-mit"; rev = "v${version}"; - hash = "sha256-juCiPulDVDDg9+DXUf9Gp/1lMoQ0NKLUTrzOqlv+32w="; + hash = "sha256-c026r3F/oNk/DyEwHb/1kSL99bqmYp7mqOdsWbB7Njo="; }; - cargoHash = "sha256-Wtw7GBPUci4fbplQDtz1Yxrf+7+3ABIe7GPN/gUER6I="; + cargoHash = "sha256-QpmgGonDy3Pkx2i5X3ZxmBXqupOoESoFMIBorFeqam4="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/version-management/git-workspace/default.nix b/pkgs/applications/version-management/git-workspace/default.nix index e56e57201e57b..7ceb970737c3d 100644 --- a/pkgs/applications/version-management/git-workspace/default.nix +++ b/pkgs/applications/version-management/git-workspace/default.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "git-workspace"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "orf"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dtOYMZGBnFwas/k3yHSNnKlVwwLUOx7QseshJWY1X4o="; + sha256 = "sha256-9/t2MDZ5bYTuzCYTodeATqk+xqST2aQMr7Z1x5fPIuw="; }; - cargoSha256 = "sha256-4zqbNhR8A0yPD/qIJgP6049bUunAKRyGmlNmC3yPc5Q="; + cargoSha256 = "sha256-/drXVkYgdkFqZJsz2fNx3Ms21xYKQmwLXRJEmKSaikQ="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/version-management/glab/default.nix b/pkgs/applications/version-management/glab/default.nix index 723f4c59e3fc9..f4e1815e278e2 100644 --- a/pkgs/applications/version-management/glab/default.nix +++ b/pkgs/applications/version-management/glab/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "glab"; - version = "1.34.0"; + version = "1.35.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "cli"; rev = "v${version}"; - hash = "sha256-YMiT1eJyBwKKFxonQCAu7st+JoU/YLpxKCcMfs/sZ1U="; + hash = "sha256-4kd3+IdVZbWVGbY3B8V1F07k67BvKOCfom4ZukNxrRo="; }; - vendorHash = "sha256-o/B5enbrmv/+zJYBQkxbdUaiieaFyOJDc8Fm6tV//uM="; + vendorHash = "sha256-x96ChhozvTrX0eBWt3peX8dpd4gyukJ28RkqcD2W/OM="; ldflags = [ "-s" diff --git a/pkgs/applications/version-management/gql/default.nix b/pkgs/applications/version-management/gql/default.nix index 40b8a9b207c79..60a093e1c80bb 100644 --- a/pkgs/applications/version-management/gql/default.nix +++ b/pkgs/applications/version-management/gql/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "gql"; - version = "0.7.2"; + version = "0.8.0"; src = fetchFromGitHub { owner = "AmrDeveloper"; repo = "GQL"; rev = version; - hash = "sha256-XqS2oG3/dPHBC/sWN9B7BliSv4IJ1iskrQRTh8vQNd4="; + hash = "sha256-+f/OMU8fwwnlm8zTyE5XyIzfFwIB917tH9jaqSW8Skg="; }; - cargoHash = "sha256-0mUkXez+5Z8UGKMrUUjt+aF4zv3EJKgnFoQ068gTlX0="; + cargoHash = "sha256-A3o9OE8VO7z04WmbZL2rvlZRN/ZHOIGklKZQgiFSfxE="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/video/glaxnimate/default.nix b/pkgs/applications/video/glaxnimate/default.nix index 0878c2f1ed597..4ab5222c54ba5 100644 --- a/pkgs/applications/video/glaxnimate/default.nix +++ b/pkgs/applications/video/glaxnimate/default.nix @@ -37,19 +37,20 @@ let in stdenv.mkDerivation rec { pname = "glaxnimate"; - version = "0.5.1"; + version = "0.5.4"; src = fetchFromGitLab { owner = "mattbas"; repo = "${pname}"; rev = version; - sha256 = "G4ykcOvXXnVIQZUYpRIrALtDSsGqxMvDtcmobjjtlKw="; + sha256 = "sha256-8oHJCQdP2xxSSDM0MDkSrG89WgCtMKm1AKlddnq3gig="; fetchSubmodules = true; }; nativeBuildInputs = [ cmake wrapQtAppsHook + qttools ]; buildInputs = [ @@ -65,6 +66,10 @@ stdenv.mkDerivation rec { python3WithLibs ]; + # Translation needs to be separately compiled + # https://gitlab.com/mattbas/glaxnimate/-/issues/648 + buildFlags = [ "translations" ]; + qtWrapperArgs = [ ''--prefix PATH : ${python3WithLibs}/bin'' ]; passthru.tests.version = lib.optionalAttrs stdenv.isLinux (testers.testVersion { diff --git a/pkgs/applications/virtualization/docker/compose.nix b/pkgs/applications/virtualization/docker/compose.nix index 1864d167978a0..bd8dbab4cfcaa 100644 --- a/pkgs/applications/virtualization/docker/compose.nix +++ b/pkgs/applications/virtualization/docker/compose.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-compose"; - version = "2.23.0"; + version = "2.23.1"; src = fetchFromGitHub { owner = "docker"; repo = "compose"; rev = "v${version}"; - hash = "sha256-17TlUQNv/L+LZYF8vub2nI5TVF66OqTA8PrjEYjkz5o="; + hash = "sha256-g8XaMvKt3tR7a7kq+n4ueDXx9iWuAu02ONb73W23ZGY="; }; postPatch = '' @@ -16,7 +16,7 @@ buildGoModule rec { rm -rf e2e/ ''; - vendorHash = "sha256-zBogjMaVkLum1rQVEd+Rw8lRCNC/Dhi7cuz4YH3eCcg="; + vendorHash = "sha256-BeW39XN1CvPCCq4otX+Il2dGGcjGrTMzc4iSXmQZFmw="; ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ]; |