lol

treewide: remove `nixfmt-classic` from `updateScript`

zowoq bd641be4 a8815cdd

+2 -34
-5
pkgs/applications/editors/nano/default.nix
··· 9 9 common-updater-scripts, 10 10 git, 11 11 nix, 12 - nixfmt-classic, 13 12 coreutils, 14 13 gnused, 15 14 callPackage, ··· 75 74 lib.makeBinPath [ 76 75 common-updater-scripts 77 76 git 78 - nixfmt-classic 79 77 nix 80 78 coreutils 81 79 gnused ··· 87 85 88 86 if [ ! "$oldVersion" = "$latestTag" ]; then 89 87 update-source-version ${pname} "$latestTag" --version-key=version --print-changes 90 - nixpkgs="$(git rev-parse --show-toplevel)" 91 - default_nix="$nixpkgs/pkgs/applications/editors/nano/default.nix" 92 - nixfmt "$default_nix" 93 88 else 94 89 echo "${pname} is already up-to-date" 95 90 fi
-5
pkgs/by-name/je/jenkins/package.nix
··· 8 8 gnused, 9 9 makeWrapper, 10 10 nix, 11 - nixfmt-classic, 12 11 openjdk, 13 12 writeScript, 14 13 nixosTests, ··· 57 56 gnused 58 57 jq 59 58 nix 60 - nixfmt-classic 61 59 ] 62 60 } 63 61 ··· 70 68 71 69 if [ ! "$oldVersion" = "$version" ]; then 72 70 update-source-version jenkins "$version" "$hash" 73 - nixpkgs="$(git rev-parse --show-toplevel)" 74 - default_nix="$nixpkgs/pkgs/by-name/je/jenkins/package.nix" 75 - nixfmt "$default_nix" 76 71 else 77 72 echo "jenkins is already up-to-date" 78 73 fi
-5
pkgs/by-name/oh/oh-my-zsh/package.nix
··· 10 10 common-updater-scripts, 11 11 git, 12 12 nix, 13 - nixfmt-classic, 14 13 jq, 15 14 coreutils, 16 15 gnused, ··· 99 98 curl 100 99 cacert 101 100 git 102 - nixfmt-classic 103 101 nix 104 102 jq 105 103 coreutils ··· 111 109 latestSha="$(curl -L -s https://api.github.com/repos/ohmyzsh/ohmyzsh/commits\?sha\=master\&since\=$oldVersion | jq -r '.[0].sha')" 112 110 113 111 if [ ! "null" = "$latestSha" ]; then 114 - nixpkgs="$(git rev-parse --show-toplevel)" 115 - default_nix="$nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix" 116 112 latestDate="$(curl -L -s https://api.github.com/repos/ohmyzsh/ohmyzsh/commits/$latestSha | jq '.commit.committer.date' | sed 's|"\(.*\)T.*|\1|g')" 117 113 update-source-version oh-my-zsh "$latestDate" --rev="$latestSha" 118 - nixfmt "$default_nix" 119 114 else 120 115 echo "${pname} is already up-to-date" 121 116 fi
-5
pkgs/by-name/sb/sbt-extras/package.nix
··· 10 10 common-updater-scripts, 11 11 cacert, 12 12 git, 13 - nixfmt-classic, 14 13 nix, 15 14 jq, 16 15 coreutils, ··· 66 65 curl 67 66 cacert 68 67 git 69 - nixfmt-classic 70 68 nix 71 69 jq 72 70 coreutils ··· 76 74 oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion ${pname}" | tr -d '"')" 77 75 latestSha="$(curl -L -s https://api.github.com/repos/paulp/sbt-extras/commits\?sha\=master\&since\=$oldVersion | jq -r '.[0].sha')" 78 76 if [ ! "null" = "$latestSha" ]; then 79 - nixpkgs="$(git rev-parse --show-toplevel)" 80 - default_nix="$nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix" 81 77 latestDate="$(curl -L -s https://api.github.com/repos/paulp/sbt-extras/commits/$latestSha | jq '.commit.committer.date' | sed 's|"\(.*\)T.*|\1|g')" 82 78 update-source-version ${pname} "$latestSha" --version-key=rev 83 79 update-source-version ${pname} "$latestDate" --ignore-same-hash 84 - nixfmt "$default_nix" 85 80 else 86 81 echo "${pname} is already up-to-date" 87 82 fi
-5
pkgs/development/compilers/scala/2.x.nix
··· 11 11 git, 12 12 gnused, 13 13 nix, 14 - nixfmt-classic, 15 14 majorVersion, 16 15 }: 17 16 ··· 98 97 git 99 98 gnused 100 99 nix 101 - nixfmt-classic 102 100 ] 103 101 } 104 102 versionSelect='v${lib.versions.major version}.${lib.versions.minor version}.*' 105 103 oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion ${pname}" | tr -d '"')" 106 104 latestTag="$(git -c 'versionsort.suffix=-' ls-remote --exit-code --refs --sort='version:refname' --tags ${repo} "$versionSelect" | tail --lines=1 | cut --delimiter='/' --fields=3 | sed 's|^v||g')" 107 105 if [ "$oldVersion" != "$latestTag" ]; then 108 - nixpkgs="$(git rev-parse --show-toplevel)" 109 - default_nix="$nixpkgs/pkgs/development/compilers/scala/2.x.nix" 110 106 update-source-version ${pname} "$latestTag" --version-key=version --print-changes 111 - nixfmt "$default_nix" 112 107 else 113 108 echo "${pname} is already up-to-date" 114 109 fi
+1 -3
pkgs/development/python-modules/types-aiobotocore/update.sh
··· 1 1 #!/usr/bin/env nix-shell 2 - #!nix-shell -i bash -p nix-update nixfmt-classic curl jq 2 + #!nix-shell -i bash -p nix-update curl jq 3 3 4 4 set -eu -o pipefail 5 5 ··· 392 392 }' ${source_file} 393 393 394 394 done 395 - 396 - nixfmt ${source_file}
+1 -6
pkgs/development/tools/ammonite/default.nix
··· 6 6 writeScript, 7 7 common-updater-scripts, 8 8 git, 9 - nixfmt-classic, 10 9 nix, 11 10 coreutils, 12 11 gnused, ··· 51 50 git 52 51 gnused 53 52 nix 54 - nixfmt-classic 55 53 ] 56 54 } 57 55 oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion ${pname}" | tr -d '"')" 58 56 latestTag="$(git -c 'versionsort.suffix=-' ls-remote --exit-code --refs --sort='version:refname' --tags ${repo} '*.*.*' | tail --lines=1 | cut --delimiter='/' --fields=3)" 59 57 if [ "$oldVersion" != "$latestTag" ]; then 60 - nixpkgs="$(git rev-parse --show-toplevel)" 61 - default_nix="$nixpkgs/pkgs/development/tools/ammonite/default.nix" 62 58 update-source-version ${pname}_2_12 "$latestTag" --version-key=version --print-changes 63 - sed -i "s|$latestTag|$oldVersion|g" "$default_nix" 59 + sed -i "s|$latestTag|$oldVersion|g" "$(git rev-parse --show-toplevel)/pkgs/development/tools/ammonite/default.nix" 64 60 update-source-version ${pname}_2_13 "$latestTag" --version-key=version --print-changes 65 - nixfmt "$default_nix" 66 61 else 67 62 echo "${pname} is already up-to-date" 68 63 fi