treewide: remove nixfmt-classic from updateScript
This commit is contained in:
@@ -9,7 +9,6 @@
|
||||
common-updater-scripts,
|
||||
git,
|
||||
nix,
|
||||
nixfmt-classic,
|
||||
coreutils,
|
||||
gnused,
|
||||
callPackage,
|
||||
@@ -75,7 +74,6 @@ stdenv.mkDerivation rec {
|
||||
lib.makeBinPath [
|
||||
common-updater-scripts
|
||||
git
|
||||
nixfmt-classic
|
||||
nix
|
||||
coreutils
|
||||
gnused
|
||||
@@ -87,9 +85,6 @@ stdenv.mkDerivation rec {
|
||||
|
||||
if [ ! "$oldVersion" = "$latestTag" ]; then
|
||||
update-source-version ${pname} "$latestTag" --version-key=version --print-changes
|
||||
nixpkgs="$(git rev-parse --show-toplevel)"
|
||||
default_nix="$nixpkgs/pkgs/applications/editors/nano/default.nix"
|
||||
nixfmt "$default_nix"
|
||||
else
|
||||
echo "${pname} is already up-to-date"
|
||||
fi
|
||||
|
||||
@@ -8,7 +8,6 @@
|
||||
gnused,
|
||||
makeWrapper,
|
||||
nix,
|
||||
nixfmt-classic,
|
||||
openjdk,
|
||||
writeScript,
|
||||
nixosTests,
|
||||
@@ -57,7 +56,6 @@ stdenv.mkDerivation rec {
|
||||
gnused
|
||||
jq
|
||||
nix
|
||||
nixfmt-classic
|
||||
]
|
||||
}
|
||||
|
||||
@@ -70,9 +68,6 @@ stdenv.mkDerivation rec {
|
||||
|
||||
if [ ! "$oldVersion" = "$version" ]; then
|
||||
update-source-version jenkins "$version" "$hash"
|
||||
nixpkgs="$(git rev-parse --show-toplevel)"
|
||||
default_nix="$nixpkgs/pkgs/by-name/je/jenkins/package.nix"
|
||||
nixfmt "$default_nix"
|
||||
else
|
||||
echo "jenkins is already up-to-date"
|
||||
fi
|
||||
|
||||
@@ -10,7 +10,6 @@
|
||||
common-updater-scripts,
|
||||
git,
|
||||
nix,
|
||||
nixfmt-classic,
|
||||
jq,
|
||||
coreutils,
|
||||
gnused,
|
||||
@@ -99,7 +98,6 @@ stdenv.mkDerivation rec {
|
||||
curl
|
||||
cacert
|
||||
git
|
||||
nixfmt-classic
|
||||
nix
|
||||
jq
|
||||
coreutils
|
||||
@@ -111,11 +109,8 @@ stdenv.mkDerivation rec {
|
||||
latestSha="$(curl -L -s https://api.github.com/repos/ohmyzsh/ohmyzsh/commits\?sha\=master\&since\=$oldVersion | jq -r '.[0].sha')"
|
||||
|
||||
if [ ! "null" = "$latestSha" ]; then
|
||||
nixpkgs="$(git rev-parse --show-toplevel)"
|
||||
default_nix="$nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix"
|
||||
latestDate="$(curl -L -s https://api.github.com/repos/ohmyzsh/ohmyzsh/commits/$latestSha | jq '.commit.committer.date' | sed 's|"\(.*\)T.*|\1|g')"
|
||||
update-source-version oh-my-zsh "$latestDate" --rev="$latestSha"
|
||||
nixfmt "$default_nix"
|
||||
else
|
||||
echo "${pname} is already up-to-date"
|
||||
fi
|
||||
|
||||
@@ -10,7 +10,6 @@
|
||||
common-updater-scripts,
|
||||
cacert,
|
||||
git,
|
||||
nixfmt-classic,
|
||||
nix,
|
||||
jq,
|
||||
coreutils,
|
||||
@@ -66,7 +65,6 @@ stdenv.mkDerivation rec {
|
||||
curl
|
||||
cacert
|
||||
git
|
||||
nixfmt-classic
|
||||
nix
|
||||
jq
|
||||
coreutils
|
||||
@@ -76,12 +74,9 @@ stdenv.mkDerivation rec {
|
||||
oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion ${pname}" | tr -d '"')"
|
||||
latestSha="$(curl -L -s https://api.github.com/repos/paulp/sbt-extras/commits\?sha\=master\&since\=$oldVersion | jq -r '.[0].sha')"
|
||||
if [ ! "null" = "$latestSha" ]; then
|
||||
nixpkgs="$(git rev-parse --show-toplevel)"
|
||||
default_nix="$nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix"
|
||||
latestDate="$(curl -L -s https://api.github.com/repos/paulp/sbt-extras/commits/$latestSha | jq '.commit.committer.date' | sed 's|"\(.*\)T.*|\1|g')"
|
||||
update-source-version ${pname} "$latestSha" --version-key=rev
|
||||
update-source-version ${pname} "$latestDate" --ignore-same-hash
|
||||
nixfmt "$default_nix"
|
||||
else
|
||||
echo "${pname} is already up-to-date"
|
||||
fi
|
||||
|
||||
@@ -11,7 +11,6 @@
|
||||
git,
|
||||
gnused,
|
||||
nix,
|
||||
nixfmt-classic,
|
||||
majorVersion,
|
||||
}:
|
||||
|
||||
@@ -98,17 +97,13 @@ stdenv.mkDerivation rec {
|
||||
git
|
||||
gnused
|
||||
nix
|
||||
nixfmt-classic
|
||||
]
|
||||
}
|
||||
versionSelect='v${lib.versions.major version}.${lib.versions.minor version}.*'
|
||||
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} "$versionSelect" | 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/compilers/scala/2.x.nix"
|
||||
update-source-version ${pname} "$latestTag" --version-key=version --print-changes
|
||||
nixfmt "$default_nix"
|
||||
else
|
||||
echo "${pname} is already up-to-date"
|
||||
fi
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p nix-update nixfmt-classic curl jq
|
||||
#!nix-shell -i bash -p nix-update curl jq
|
||||
|
||||
set -eu -o pipefail
|
||||
|
||||
@@ -392,5 +392,3 @@ for package in "${packages[@]}"; do
|
||||
}' ${source_file}
|
||||
|
||||
done
|
||||
|
||||
nixfmt ${source_file}
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
writeScript,
|
||||
common-updater-scripts,
|
||||
git,
|
||||
nixfmt-classic,
|
||||
nix,
|
||||
coreutils,
|
||||
gnused,
|
||||
@@ -51,18 +50,14 @@ let
|
||||
git
|
||||
gnused
|
||||
nix
|
||||
nixfmt-classic
|
||||
]
|
||||
}
|
||||
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} '*.*.*' | tail --lines=1 | cut --delimiter='/' --fields=3)"
|
||||
if [ "$oldVersion" != "$latestTag" ]; then
|
||||
nixpkgs="$(git rev-parse --show-toplevel)"
|
||||
default_nix="$nixpkgs/pkgs/development/tools/ammonite/default.nix"
|
||||
update-source-version ${pname}_2_12 "$latestTag" --version-key=version --print-changes
|
||||
sed -i "s|$latestTag|$oldVersion|g" "$default_nix"
|
||||
sed -i "s|$latestTag|$oldVersion|g" "$(git rev-parse --show-toplevel)/pkgs/development/tools/ammonite/default.nix"
|
||||
update-source-version ${pname}_2_13 "$latestTag" --version-key=version --print-changes
|
||||
nixfmt "$default_nix"
|
||||
else
|
||||
echo "${pname} is already up-to-date"
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user