Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

zoom-us: 5.1 -> 5.2 #96867

Merged
merged 3 commits into from Sep 10, 2020
Merged

zoom-us: 5.1 -> 5.2 #96867

merged 3 commits into from Sep 10, 2020

Conversation

alevy
Copy link
Contributor

@alevy alevy commented Aug 31, 2020

Motivation for this change

New release of Zoom for Linux (August 17th) , just on time for the fall semester.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@doronbehar
Copy link
Contributor

The commit message should be just like the PR title, only with accurate versions near the ->. Other then that LGTM, but I haven't tested it.

@doronbehar
Copy link
Contributor

doronbehar commented Sep 1, 2020

Additionally, I noticed that the updateScript doesn't work anymore, as they probably changed something in their infrastructure. This works:

diff --git i/pkgs/applications/networking/instant-messengers/zoom-us/update.sh w/pkgs/applications/networking/instant-messengers/zoom-us/update.sh
index 6214d4e2625..bda9c5ae0a0 100755
--- i/pkgs/applications/networking/instant-messengers/zoom-us/update.sh
+++ w/pkgs/applications/networking/instant-messengers/zoom-us/update.sh
@@ -1,17 +1,8 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -i bash -p curl pcre common-updater-scripts
+#!nix-shell -i bash -p curl pup common-updater-scripts
 
 set -eu -o pipefail
 
-oldVersion=$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion zoom-us" | tr -d '"')
-version="$(curl -sI https://zoom.us/client/latest/zoom_x86_64.tar.xz | grep -Fi 'Location:' | pcregrep -o1 '/(([0-9]\.?)+)/')"
+version="$(curl -Ls https://zoom.us/download\?os\=linux | pup '.linux-ver-text text{}' | cut -d' ' -f2)"
 
-if [ ! "${oldVersion}" = "${version}" ]; then
-  update-source-version zoom-us "$version"
-  nixpkgs="$(git rev-parse --show-toplevel)"
-  default_nix="$nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix"
-  git add "${default_nix}"
-  git commit -m "zoom-us: ${oldVersion} -> ${version}"
-else
-  echo "zoom-us is already up-to-date"
-fi
+update-source-version zoom-us "$version"

2 things this does:

@alevy
Copy link
Contributor Author

alevy commented Sep 1, 2020

Wow, that update script would have saved me a bunch of trouble yesterday, thanks @doronbehar!

I updated the commit message as suggested, included your changes to the update script, then updated again (there seems to be yet another minor version update). The new new version builds and runs for me still on NixOS.

Copy link
Contributor

@doronbehar doronbehar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Works.

@mkg20001
Copy link
Member

mkg20001 commented Sep 9, 2020

@doronbehar Your other PR is ahead a few versions of this PR #97543 but it doesn't include the update script

@doronbehar
Copy link
Contributor

Right.. I forgot. @alevy could you give one more update here? I have commit permissions now 👼.

@alevy
Copy link
Contributor Author

alevy commented Sep 9, 2020

Done. Thanks @mkg20001 & @doronbehar for triaging and congrats @doronbehar on commit permissions :) Zoom on NixOS is in good hands.

@ofborg ofborg bot requested a review from doronbehar September 10, 2020 02:23
@doronbehar doronbehar merged commit d4173cc into NixOS:master Sep 10, 2020
@alevy alevy deleted the zoom branch September 10, 2020 18:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants