diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2024-06-13 00:41:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-13 00:41:07 +0200 |
| commit | 7987842fec1cd1f81cf481bcfdd00b8809831381 (patch) | |
| tree | 3fbb8a41108f7c939e9861d8658d0a5fc038c239 /pkgs/applications/office | |
| parent | ba70980e89479720e987e28aafc271da87106e34 (diff) | |
| parent | 0421c816badf8502a3abd6a82573b8d147690a44 (diff) | |
Merge pull request #318589 from jtojnar/u-s-v-ignore-same
common-updater-scripts/u-s-v: support --ignore-same-version
Diffstat (limited to 'pkgs/applications/office')
| -rw-r--r-- | pkgs/applications/office/libreoffice/darwin/default.nix | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/pkgs/applications/office/libreoffice/darwin/default.nix b/pkgs/applications/office/libreoffice/darwin/default.nix index a8060a183d9cd..c81d08d31d98f 100644 --- a/pkgs/applications/office/libreoffice/darwin/default.nix +++ b/pkgs/applications/office/libreoffice/darwin/default.nix @@ -63,11 +63,8 @@ stdenvNoCC.mkDerivation { #!nix-shell -i bash --argstr aarch64Url ${aarch64Url} --argstr x86_64Url ${x86_64Url} --argstr version ${version} ${updateNix} set -eou pipefail - # reset version first so that both platforms are always updated and in sync - update-source-version libreoffice-bin 0 ${lib.fakeSha256} --file=${defaultNixFile} --system=aarch64-darwin - update-source-version libreoffice-bin $newVersion $newAarch64Sha256 --file=${defaultNixFile} --system=aarch64-darwin - update-source-version libreoffice-bin 0 ${lib.fakeSha256} --file=${defaultNixFile} --system=x86_64-darwin - update-source-version libreoffice-bin $newVersion $newX86_64Sha256 --file=${defaultNixFile} --system=x86_64-darwin + update-source-version libreoffice-bin $newVersion $newAarch64Sha256 --file=${defaultNixFile} --system=aarch64-darwin --ignore-same-version + update-source-version libreoffice-bin $newVersion $newX86_64Sha256 --file=${defaultNixFile} --system=x86_64-darwin --ignore-same-version ''; meta = with lib; { |