diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-01-01 00:56:14 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-01 00:56:14 +0000 |
| commit | 999c670119eee8017d2de703e766e6c9ed8527d7 (patch) | |
| tree | 00571b8849dd2bfc4cf1b722f8daac4f909028cf /pkgs/development/tools | |
| parent | 5dffe03f3016195253b3fe610bdbf07a97ee6d43 (diff) | |
| parent | 9f33d6589afc83fc32098fa788cbf082258243af (diff) | |
| download | nixpkgs-999c670119eee8017d2de703e766e6c9ed8527d7.tar nixpkgs-999c670119eee8017d2de703e766e6c9ed8527d7.tar.gz nixpkgs-999c670119eee8017d2de703e766e6c9ed8527d7.tar.bz2 nixpkgs-999c670119eee8017d2de703e766e6c9ed8527d7.tar.lz nixpkgs-999c670119eee8017d2de703e766e6c9ed8527d7.tar.xz nixpkgs-999c670119eee8017d2de703e766e6c9ed8527d7.tar.zst nixpkgs-999c670119eee8017d2de703e766e6c9ed8527d7.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/tools')
| -rw-r--r-- | pkgs/development/tools/metals/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/tools/wire/default.nix | 24 | ||||
| -rw-r--r-- | pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/urlToName.js | 10 |
3 files changed, 35 insertions, 3 deletions
diff --git a/pkgs/development/tools/metals/default.nix b/pkgs/development/tools/metals/default.nix index 0d8911e5b21..951e9a0ac2e 100644 --- a/pkgs/development/tools/metals/default.nix +++ b/pkgs/development/tools/metals/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "metals"; - version = "0.9.7"; + version = "0.9.8"; deps = stdenv.mkDerivation { name = "${pname}-deps-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "0aky4vbbm5hi6jnd2n1aimqznbbaya05c7vdgaqhy3630ks3w4k9"; + outputHash = "1gn7v1478sqhz4hv53pgvaw2nqziyiavvhn5q152lkzyvghq08wk"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/wire/default.nix b/pkgs/development/tools/wire/default.nix new file mode 100644 index 00000000000..ff6d1e7ac5d --- /dev/null +++ b/pkgs/development/tools/wire/default.nix @@ -0,0 +1,24 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "wire"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "google"; + repo = "wire"; + rev = "v${version}"; + sha256 = "0fYXo/LnxKV/qoaP59XCyEtLLAysZm/WhRdm3RnLdvw="; + }; + + vendorSha256 = "ZFUX4LgPte6oAf94D82Man/P9VMpx+CDNCTMBwiy9Fc="; + + subPackages = [ "cmd/wire" ]; + + meta = with lib; { + homepage = "https://github.com/google/wire"; + description = "A code generation tool that automates connecting components using dependency injection"; + license = licenses.asl20; + maintainers = with maintainers; [ svrana ]; + }; +} diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/urlToName.js b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/urlToName.js index 81feaaf3a65..bd48b84f22d 100644 --- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/urlToName.js +++ b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/urlToName.js @@ -7,9 +7,17 @@ const path = require('path') // - https://registry.npmjs.org/acorn-es7-plugin/-/acorn-es7-plugin-1.1.7.tgz // - git+https://github.com/srghma/node-shell-quote.git // - git+https://1234user:1234pass@git.graphile.com/git/users/1234user/postgraphile-supporter.git +// - https://codeload.github.com/Gargron/emoji-mart/tar.gz/934f314fd8322276765066e8a2a6be5bac61b1cf function urlToName(url) { - if (url.startsWith('git+')) { + + // Yarn generates `codeload.github.com` tarball URLs, where the final + // path component (file name) is the git hash. See #111. + // See also https://github.com/yarnpkg/yarn/blob/989a7406/src/resolvers/exotics/github-resolver.js#L24-L26 + let isCodeloadGitTarballUrl = + url.startsWith('https://codeload.github.com/') && url.includes('/tar.gz/') + + if (url.startsWith('git+') || isCodeloadGitTarballUrl) { return path.basename(url) } |