diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-07-01 00:16:16 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-01 00:16:16 +0000 |
| commit | e37016f618f13c9397ce2d6e7e58b9b602f82fe9 (patch) | |
| tree | 764196fa81476f91a8c6fb0f139a28b29a11d81f /pkgs/applications/office | |
| parent | 01da4c59cc4879540b7a5d73230475b4616a0dc8 (diff) | |
| parent | c00f20377be57a37df5cf7986198aab6051c0057 (diff) | |
Merge master into haskell-updates
Diffstat (limited to 'pkgs/applications/office')
| -rw-r--r-- | pkgs/applications/office/beancount/beancount_share.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/office/libreoffice/darwin/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/office/morgen/default.nix | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/applications/office/beancount/beancount_share.nix b/pkgs/applications/office/beancount/beancount_share.nix index 19b49a2697ccf..2d702ad8d7ce7 100644 --- a/pkgs/applications/office/beancount/beancount_share.nix +++ b/pkgs/applications/office/beancount/beancount_share.nix @@ -25,5 +25,7 @@ python3.pkgs.buildPythonApplication rec { description = "Beancount plugin to share expenses with external partners within one ledger"; license = licenses.agpl3Plus; maintainers = with maintainers; [ matthiasbeyer ]; + broken = true; # At 2024-06-29, missing unpacked dependency + # https://hydra.nixos.org/build/262800507/nixlog/1 }; } diff --git a/pkgs/applications/office/libreoffice/darwin/default.nix b/pkgs/applications/office/libreoffice/darwin/default.nix index c81d08d31d98f..9043d575fa060 100644 --- a/pkgs/applications/office/libreoffice/darwin/default.nix +++ b/pkgs/applications/office/libreoffice/darwin/default.nix @@ -44,7 +44,7 @@ stdenvNoCC.mkDerivation { cp -R . $out/Applications/${appName} cat > $out/bin/${scriptName} << EOF #!${stdenvNoCC.shell} - open -na $out/Applications/${appName} --args "$@" + open -na $out/Applications/${appName} --args "\$@" EOF chmod +x $out/bin/${scriptName} runHook postInstall diff --git a/pkgs/applications/office/morgen/default.nix b/pkgs/applications/office/morgen/default.nix index 433b8855a9a21..9ad86d99c4b7d 100644 --- a/pkgs/applications/office/morgen/default.nix +++ b/pkgs/applications/office/morgen/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "morgen"; - version = "3.4.5"; + version = "3.5.1"; src = fetchurl { url = "https://dl.todesktop.com/210203cqcj00tw1/versions/${version}/linux/deb"; - hash = "sha256-5oBIw9PVbEGF1e47GeYNF6gJFm5z3M9KeJ1711cAg2s="; + hash = "sha256-YvgVCviqAuGlT61ANktztzqRYBtROsVrScGMxY6IeEs="; }; nativeBuildInputs = [ |