diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/by-name/zo/zoom-us/package.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/zoom-us/default.nix rename to pkgs/by-name/zo/zoom-us/package.nix diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/update.sh b/pkgs/by-name/zo/zoom-us/update.sh similarity index 93% rename from pkgs/applications/networking/instant-messengers/zoom-us/update.sh rename to pkgs/by-name/zo/zoom-us/update.sh index 3684f057a08c..df27da6f3ba4 100755 --- a/pkgs/applications/networking/instant-messengers/zoom-us/update.sh +++ b/pkgs/by-name/zo/zoom-us/update.sh @@ -4,7 +4,7 @@ set -eu -o pipefail scriptDir=$(cd "${BASH_SOURCE[0]%/*}" && pwd) -nixpkgs=$(realpath "$scriptDir"/../../../../..) +nixpkgs=$(realpath "$scriptDir"/../../../..) echo >&2 "=== Obtaining version data from https://zoom.us/rest/download ..." linux_data=$(curl -Ls 'https://zoom.us/rest/download?os=linux' | jq .result.downloadVO) @@ -20,12 +20,12 @@ echo >&2 "=== Downloading packages and computing hashes..." # by running `nix-build --system -A zoom-us.src` which # causes cross compiling headaches; using nix-prefetch-url with # hard-coded URLs is simpler. Keep these URLs in sync with the ones -# in default.nix where `srcs` is defined. +# in package.nix where `srcs` is defined. hash_aarch64_darwin=$(nix hash to-sri --type sha256 $(nix-prefetch-url --type sha256 "https://zoom.us/client/${version_aarch64_darwin}/zoomusInstallerFull.pkg?archType=arm64")) hash_x86_64_darwin=$(nix hash to-sri --type sha256 $(nix-prefetch-url --type sha256 "https://zoom.us/client/${version_x86_64_darwin}/zoomusInstallerFull.pkg")) hash_x86_64_linux=$(nix hash to-sri --type sha256 $(nix-prefetch-url --type sha256 "https://zoom.us/client/${version_x86_64_linux}/zoom_x86_64.pkg.tar.xz")) -echo >&2 "=== Updating default.nix ..." +echo >&2 "=== Updating package.nix ..." # update-source-version expects to be at the root of nixpkgs (cd "$nixpkgs" && update-source-version zoom-us "$version_aarch64_darwin" $hash_aarch64_darwin --system=aarch64-darwin --version-key=versions.aarch64-darwin) (cd "$nixpkgs" && update-source-version zoom-us "$version_x86_64_darwin" $hash_x86_64_darwin --system=x86_64-darwin --version-key=versions.x86_64-darwin) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c484627c1202..1701b1f2a043 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34740,8 +34740,6 @@ with pkgs; zita-njbridge = callPackage ../applications/audio/zita-njbridge { }; - zoom-us = callPackage ../applications/networking/instant-messengers/zoom-us { }; - zotero = callPackage ../applications/office/zotero { }; zotero_7 = pkgs.zotero-beta;