Commit bd641be4 authored by zowoq's avatar zowoq
Browse files

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

parent a8815cdd

pkgs/applications/editors/nano/default.nix

+0 −5
Original line number Diff line number Diff line
@@ -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

pkgs/by-name/je/jenkins/package.nix

+0 −5
Original line number Diff line number Diff line
@@ -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

pkgs/by-name/oh/oh-my-zsh/package.nix

+0 −5
Original line number Diff line number Diff line
@@ -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

pkgs/by-name/sb/sbt-extras/package.nix

+0 −5
Original line number Diff line number Diff line
@@ -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

pkgs/development/compilers/scala/2.x.nix

+0 −5
Original line number Diff line number Diff line
@@ -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