diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-03-19 00:02:09 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-19 00:02:09 +0000 |
| commit | 7c0bd382c72689b24a726b03b3436963e911c787 (patch) | |
| tree | 6c530f5c42aca41f0aabc364dcf3ccfee9854312 /pkgs/desktops | |
| parent | eb9fc148bc1c438150ca8272fbce5d323a1c7cb7 (diff) | |
| parent | e0d7b921c6f66dd77b8f7c479677ee661742fede (diff) | |
| download | nixlib-7c0bd382c72689b24a726b03b3436963e911c787.tar nixlib-7c0bd382c72689b24a726b03b3436963e911c787.tar.gz nixlib-7c0bd382c72689b24a726b03b3436963e911c787.tar.bz2 nixlib-7c0bd382c72689b24a726b03b3436963e911c787.tar.lz nixlib-7c0bd382c72689b24a726b03b3436963e911c787.tar.xz nixlib-7c0bd382c72689b24a726b03b3436963e911c787.tar.zst nixlib-7c0bd382c72689b24a726b03b3436963e911c787.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/deepin/apps/deepin-editor/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/desktops/plasma-5/3rdparty/addons/polonium.nix | 8 |
2 files changed, 9 insertions, 6 deletions
diff --git a/pkgs/desktops/deepin/apps/deepin-editor/default.nix b/pkgs/desktops/deepin/apps/deepin-editor/default.nix index 6c02844c0ad5..c0cfc4465e1a 100644 --- a/pkgs/desktops/deepin/apps/deepin-editor/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-editor/default.nix @@ -16,17 +16,18 @@ , libchardet , libuchardet , libiconv +, gitUpdater }: stdenv.mkDerivation rec { pname = "deepin-editor"; - version = "6.0.15"; + version = "6.0.16"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-17loD7FNy5PwSxIyXk313yiMxO10rOeP94q08tm76gw="; + hash = "sha256-55hRXHP02MJWt+JUDCDKv4Boq0IwNW1itGw9rtCZrao="; }; nativeBuildInputs = [ @@ -54,6 +55,8 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DVERSION=${version}" ]; + passthru.updateScript = gitUpdater { }; + meta = with lib; { description = "A desktop text editor that supports common text editing features"; homepage = "https://github.com/linuxdeepin/deepin-editor"; diff --git a/pkgs/desktops/plasma-5/3rdparty/addons/polonium.nix b/pkgs/desktops/plasma-5/3rdparty/addons/polonium.nix index 7bfe963e0e8b..10d4c7c1d98a 100644 --- a/pkgs/desktops/plasma-5/3rdparty/addons/polonium.nix +++ b/pkgs/desktops/plasma-5/3rdparty/addons/polonium.nix @@ -11,16 +11,16 @@ buildNpmPackage rec { pname = "polonium"; - version = "0.6.0"; + version = "1.0b1"; src = fetchFromGitHub { owner = "zeroxoneafour"; repo = pname; rev = "v" + version; - hash = "sha256-fZgNOcOq+owmqtplwnxeOIQpWmrga/WitCNCj89O5XA="; + hash = "sha256-2uthjNhQm+hkRCPXGQm2LZunTj+J0SUuUfZL0PeRd4s="; }; - npmDepsHash = "sha256-25AtM1FweWIbFot+HUMSPYTu47/0eKNpRWSlBEL0yKk="; + npmDepsHash = "sha256-kaT3Uyq+/JkmebakG9xQuR4Kjo7vk6BzI1/LffOj/eo="; dontConfigure = true; @@ -43,7 +43,7 @@ buildNpmPackage rec { ''; meta = with lib; { - description = "Auto-tiler that uses KWin 5.27+ tiling functionality"; + description = "Auto-tiler that uses KWin 6.0+ tiling functionality"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; inherit (plasma-framework.meta) platforms; |