diff options
author | Vladimír Čunát <v@cunat.cz> | 2023-09-12 19:06:44 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2023-09-12 19:06:44 +0200 |
commit | 300eaad172fef6365ffd06d3816c2e6377c46311 (patch) | |
tree | b877cef4af6268503496fe59cc0f72a36da32b9f /pkgs/applications/misc | |
parent | bc6f47f644cc42eed1fab8d0e16bb4ce32833f52 (diff) | |
parent | b874fb56d0f07a0ff88fcdc17e0001760ca89556 (diff) | |
download | nixlib-300eaad172fef6365ffd06d3816c2e6377c46311.tar nixlib-300eaad172fef6365ffd06d3816c2e6377c46311.tar.gz nixlib-300eaad172fef6365ffd06d3816c2e6377c46311.tar.bz2 nixlib-300eaad172fef6365ffd06d3816c2e6377c46311.tar.lz nixlib-300eaad172fef6365ffd06d3816c2e6377c46311.tar.xz nixlib-300eaad172fef6365ffd06d3816c2e6377c46311.tar.zst nixlib-300eaad172fef6365ffd06d3816c2e6377c46311.zip |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/applications/misc')
-rw-r--r-- | pkgs/applications/misc/1password-gui/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/misc/camunda-modeler/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/misc/markmind/default.nix | 48 | ||||
-rw-r--r-- | pkgs/applications/misc/obsidian/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/misc/pomotroid/default.nix | 60 |
5 files changed, 6 insertions, 114 deletions
diff --git a/pkgs/applications/misc/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix index cf2ac98bc090..1539c1693e64 100644 --- a/pkgs/applications/misc/1password-gui/default.nix +++ b/pkgs/applications/misc/1password-gui/default.nix @@ -59,7 +59,7 @@ let homepage = "https://1password.com/"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - maintainers = with maintainers; [ timstott savannidgerinel maxeaubrey sebtm ]; + maintainers = with maintainers; [ timstott savannidgerinel amaxine sebtm ]; platforms = builtins.attrNames sources.${channel}; mainProgram = "1password"; }; diff --git a/pkgs/applications/misc/camunda-modeler/default.nix b/pkgs/applications/misc/camunda-modeler/default.nix index e42f022df7f2..aa588dee6cbd 100644 --- a/pkgs/applications/misc/camunda-modeler/default.nix +++ b/pkgs/applications/misc/camunda-modeler/default.nix @@ -9,11 +9,11 @@ stdenvNoCC.mkDerivation rec { pname = "camunda-modeler"; - version = "5.13.0"; + version = "5.14.0"; src = fetchurl { url = "https://github.com/camunda/camunda-modeler/releases/download/v${version}/camunda-modeler-${version}-linux-x64.tar.gz"; - hash = "sha256-/9Af/1ZP2Hkc0PP9yXObNDNmxe6riBNWSv+JaM7O5Vs="; + hash = "sha256-zGxuvS4T1olMH+QOqrPcsFjfO3PDERmFQOa+ISN9u0c="; }; sourceRoot = "camunda-modeler-${version}-linux-x64"; diff --git a/pkgs/applications/misc/markmind/default.nix b/pkgs/applications/misc/markmind/default.nix deleted file mode 100644 index e44b7fe54ad5..000000000000 --- a/pkgs/applications/misc/markmind/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron }: - -stdenv.mkDerivation rec { - pname = "markmind"; - version = "1.3.1"; - - src = fetchurl { - url = "https://github.com/MarkMindCkm/Mark-Mind/releases/download/v${version}/Mark.Mind-${version}.AppImage"; - sha256 = "sha256-iOJ0IOIzleA69rv94Qd35rMbHc+XSi8OPatf2V6sYrI="; - }; - - appimageContents = appimageTools.extractType2 { - name = "markmind-${version}"; - inherit src; - }; - - dontUnpack = true; - dontConfigure = true; - dontBuild = true; - - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin $out/share/markmind $out/share/applications - cp -a ${appimageContents}/{locales,resources} $out/share/markmind - cp -a ${appimageContents}/mind.desktop $out/share/applications/markmind.desktop - cp -a ${appimageContents}/usr/share/icons $out/share - substituteInPlace $out/share/applications/markmind.desktop \ - --replace 'Exec=AppRun' 'Exec=markmind' - - runHook postInstall - ''; - - postFixup = '' - makeWrapper ${electron}/bin/electron $out/bin/markmind \ - --add-flags $out/share/markmind/resources/app.asar - ''; - - meta = with lib; { - description = "Mind map and outliner editor"; - homepage = "https://github.com/MarkMindCkm/Mark-Mind"; - license = licenses.mit; - maintainers = with maintainers; [ wolfangaukang ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index 38736866b242..cb9b1a7f6aa8 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -12,20 +12,20 @@ let inherit (stdenv.hostPlatform) system; pname = "obsidian"; - version = "1.4.5"; + version = "1.4.11"; appname = "Obsidian"; meta = with lib; { description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files"; homepage = "https://obsidian.md"; downloadPage = "https://github.com/obsidianmd/obsidian-releases/releases"; license = licenses.obsidian; - maintainers = with maintainers; [ atila conradmearns zaninime qbit ]; + maintainers = with maintainers; [ atila conradmearns zaninime qbit kashw2 ]; }; filename = if stdenv.isDarwin then "Obsidian-${version}-universal.dmg" else "obsidian-${version}.tar.gz"; src = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}"; - sha256 = if stdenv.isDarwin then "sha256-1xGlXjQrJ8gNtKYlCBiIfNnTZU591JZdU6NJqMA5gug=" else "sha256-Y/RlT+3xBbF9tjCbRQnQ+j8ogzLMfsQPnOdiCVj+NK0="; + sha256 = if stdenv.isDarwin then "sha256-bJLWXdeVzbVrb8jmIRpyQG6a5H1jMydhO9ioHOGk3Ms=" else "sha256-Z4DojO90PAlGGsItcZugPsi+48UPnOjvCn2BIzrDQpc="; }; icon = fetchurl { diff --git a/pkgs/applications/misc/pomotroid/default.nix b/pkgs/applications/misc/pomotroid/default.nix deleted file mode 100644 index dfe76aa92f4c..000000000000 --- a/pkgs/applications/misc/pomotroid/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ stdenv, lib, fetchurl, makeWrapper, makeDesktopItem, copyDesktopItems, electron }: - -let - version = "0.13.0"; - appIcon = fetchurl { - url = "https://raw.githubusercontent.com/Splode/pomotroid/v${version}/static/icon.png"; - sha256 = "sha256-BEPoOBErw5ZCeK4rtdxdwZZLimbpglu1Cu++4xzuVUs="; - }; - -in stdenv.mkDerivation rec { - pname = "pomotroid"; - inherit version; - - src = fetchurl { - url = "https://github.com/Splode/pomotroid/releases/download/v${version}/${pname}-${version}-linux.tar.gz"; - sha256 = "sha256-AwpVnvwWQd/cgmZvtr5NprnLyeXz6ym4Fywc808tcSc="; - }; - - nativeBuildInputs = [ - makeWrapper - copyDesktopItems - ]; - - desktopItems = [ - (makeDesktopItem { - name = pname; - exec = "pomotroid"; - icon = "pomotroid"; - comment = meta.description; - desktopName = "Pomotroid"; - genericName = "Pomodoro Application"; - }) - ]; - - dontConfigure = true; - dontBuild = true; - - installPhase = '' - runHook preInstall - - mkdir -p $out/opt/pomotroid $out/share/pomotroid $out/share/pixmaps - - cp -r ./ $out/opt/pomotroid - mv $out/opt/pomotroid/{locales,resources} $out/share/pomotroid - cp ${appIcon} $out/share/pixmaps/pomotroid.png - - makeWrapper ${electron}/bin/electron $out/bin/pomotroid \ - --add-flags $out/share/pomotroid/resources/app.asar - - runHook postInstall - ''; - - meta = with lib; { - description = "Simple and visually-pleasing Pomodoro timer"; - homepage = "https://splode.github.io/pomotroid"; - license = licenses.mit; - maintainers = with maintainers; [ wolfangaukang ]; - platforms = [ "x86_64-linux" ]; - }; -} |