diff options
author | Sandro Jäckel <sandro.jaeckel@sap.com> | 2023-03-13 17:16:07 +0100 |
---|---|---|
committer | Sandro Jäckel <sandro.jaeckel@sap.com> | 2023-03-23 14:09:36 +0100 |
commit | b1fe611fa9c69a54717de94b41e1a563b264aecb (patch) | |
tree | 1d4b23eba8c12f0d41f5f18f80ce1d6d2af9d5e3 /pkgs/development/tools/coursier | |
parent | 6176066e29ee936eed44d7e6d041cc916116a01b (diff) |
coursier: remove zsh completion which was removed upstream, remove nixfmt formatting in update script
Diffstat (limited to 'pkgs/development/tools/coursier')
-rw-r--r-- | pkgs/development/tools/coursier/default.nix | 35 |
1 files changed, 6 insertions, 29 deletions
diff --git a/pkgs/development/tools/coursier/default.nix b/pkgs/development/tools/coursier/default.nix index 3374d4ee7fa01..af5edab074bf1 100644 --- a/pkgs/development/tools/coursier/default.nix +++ b/pkgs/development/tools/coursier/default.nix @@ -1,24 +1,12 @@ { lib, stdenv, fetchurl, makeWrapper, jre, writeScript, common-updater-scripts , coreutils, git, gnused, nix, nixfmt }: -let - version = "2.1.0-RC6"; - - zshCompletion = fetchurl { - url = - "https://raw.githubusercontent.com/coursier/coursier/v${version}/modules/cli/src/main/resources/completions/zsh"; - sha256 = "0afxzrk9w1qinfsz55jjrxydw0fcv6p722g1q955dl7f6xbab1jh"; - }; - - repo = "git@github.com:coursier/coursier.git"; -in stdenv.mkDerivation rec { - inherit version; - +stdenv.mkDerivation rec { pname = "coursier"; + version = "2.1.0-RC6"; src = fetchurl { - url = - "https://github.com/coursier/coursier/releases/download/v${version}/coursier"; + url = "https://github.com/coursier/coursier/releases/download/v${version}/coursier"; sha256 = "0b52qp0jb2bhb649r6cca0yd1cj8wsyp0f1j3pnmir6rizjwkm5q"; }; @@ -28,28 +16,18 @@ in stdenv.mkDerivation rec { install -Dm555 $src $out/bin/cs patchShebangs $out/bin/cs wrapProgram $out/bin/cs --prefix PATH ":" ${jre}/bin - - # copy zsh completion - install -Dm755 ${zshCompletion} $out/share/zsh/site-functions/_cs ''; passthru.updateScript = writeScript "update.sh" '' #!${stdenv.shell} set -o errexit - PATH=${ - lib.makeBinPath [ common-updater-scripts coreutils git gnused nix nixfmt ] - } + PATH=${lib.makeBinPath [ common-updater-scripts coreutils git gnused nix ]} oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion ${pname}" | tr -d '"')" - latestTag="$(git -c 'versionsort.suffix=-' ls-remote --exit-code --refs --sort='version:refname' --tags ${repo} 'v*.*.*' | tail --lines=1 | cut --delimiter='/' --fields=3 | sed 's|^v||g')" + latestTag="$(git -c 'versionsort.suffix=-' ls-remote --exit-code --refs --sort='version:refname' --tags https://github.com/coursier/coursier.git 'v*.*.*' | tail --lines=1 | cut --delimiter='/' --fields=3 | sed 's|^v||g')" if [ "$oldVersion" != "$latestTag" ]; then nixpkgs="$(git rev-parse --show-toplevel)" default_nix="$nixpkgs/pkgs/development/tools/coursier/default.nix" update-source-version ${pname} "$latestTag" --version-key=version --print-changes - url="${builtins.head zshCompletion.urls}" - completion_url=$(echo $url | sed "s|$oldVersion|$latestTag|g") - completion_sha256="$(nix-prefetch-url --type sha256 $completion_url)" - sed -i "s|${zshCompletion.outputHash}|$completion_sha256|g" "$default_nix" - nixfmt "$default_nix" else echo "${pname} is already up-to-date" fi @@ -57,8 +35,7 @@ in stdenv.mkDerivation rec { meta = with lib; { homepage = "https://get-coursier.io/"; - description = - "A Scala library to fetch dependencies from Maven / Ivy repositories"; + description = "Scala library to fetch dependencies from Maven / Ivy repositories"; license = licenses.asl20; maintainers = with maintainers; [ adelbertc nequissimus ]; }; |