diff options
| author | John Ericson <git@JohnEricson.me> | 2019-11-24 13:31:35 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-24 13:31:35 -0500 |
| commit | 1206faa6d5c9dc9aecb811091e1d547599ecd195 (patch) | |
| tree | 4a05df171e8adff6fc6eba84b95db9d14438eaa4 /pkgs/applications/networking | |
| parent | a52d7674cc7bdf5fbccf1d273fadc58f008c839e (diff) | |
| parent | 747d5a3dbf1758ae4ef8037429337c029a9e76d0 (diff) | |
| download | nixpkgs-1206faa6d5c9dc9aecb811091e1d547599ecd195.tar nixpkgs-1206faa6d5c9dc9aecb811091e1d547599ecd195.tar.gz nixpkgs-1206faa6d5c9dc9aecb811091e1d547599ecd195.tar.bz2 nixpkgs-1206faa6d5c9dc9aecb811091e1d547599ecd195.tar.lz nixpkgs-1206faa6d5c9dc9aecb811091e1d547599ecd195.tar.xz nixpkgs-1206faa6d5c9dc9aecb811091e1d547599ecd195.tar.zst nixpkgs-1206faa6d5c9dc9aecb811091e1d547599ecd195.zip | |
Merge pull request #74057 from Ericson2314/wrapper-pname-support
treewide: Purge most parseDrvName
Diffstat (limited to 'pkgs/applications/networking')
3 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 3ed06717f6a..4901d694f49 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -18,8 +18,9 @@ browser: let wrapper = - { browserName ? browser.browserName or (builtins.parseDrvName browser.name).name - , name ? (browserName + "-" + (builtins.parseDrvName browser.name).version) + { browserName ? browser.browserName or (lib.getName browser) + , pname ? browserName + , version ? lib.getVersion browser , desktopName ? # browserName with first letter capitalized (lib.toUpper (lib.substring 0 1 browserName) + lib.substring 1 (-1) browserName) , nameSuffix ? "" @@ -83,7 +84,7 @@ let gtk_modules = [ libcanberra-gtk2 ]; in stdenv.mkDerivation { - inherit name; + inherit pname version; desktopItem = makeDesktopItem { name = browserName; diff --git a/pkgs/applications/networking/instant-messengers/slack/update.sh b/pkgs/applications/networking/instant-messengers/slack/update.sh index e5f79388353..6a15298c4e7 100755 --- a/pkgs/applications/networking/instant-messengers/slack/update.sh +++ b/pkgs/applications/networking/instant-messengers/slack/update.sh @@ -3,7 +3,7 @@ set -eu -o pipefail -oldVersion="$(nix-instantiate --eval -E "with import ./. {}; slack-theme-black.version or (builtins.parseDrvName slack-theme-black.name).version" | tr -d '"')" +oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion slack-theme-black" | tr -d '"')" latestSha="$(curl -L -s https://api.github.com/repos/laCour/slack-night-mode/commits\?sha\=master\&since\=${oldVersion} | jq -r '.[0].sha')" if [ ! "null" = "${latestSha}" ]; then diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/update.sh b/pkgs/applications/networking/instant-messengers/zoom-us/update.sh index e0632042493..6214d4e2625 100755 --- a/pkgs/applications/networking/instant-messengers/zoom-us/update.sh +++ b/pkgs/applications/networking/instant-messengers/zoom-us/update.sh @@ -3,7 +3,7 @@ set -eu -o pipefail -oldVersion=$(nix-instantiate --eval -E "with import ./. {}; zoom-us.version or (builtins.parseDrvName zoom-us.name).version" | tr -d '"') +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]\.?)+)/')" if [ ! "${oldVersion}" = "${version}" ]; then |