diff options
| author | Janne Heß <dasJ@users.noreply.github.com> | 2024-04-02 20:47:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-02 20:47:13 +0200 |
| commit | af69be669f0257e734c3fb97828910f69fcb45a1 (patch) | |
| tree | 9ecde09a6fba289f845e55eaab094205f5094361 /pkgs/development | |
| parent | 0d484f39225b0697af84bcf8f6c4f9c6056d792a (diff) | |
treewide: Rename nixfmt to nixfmt-classic (#300468)
* treewide: Rename nixfmt to nixfmt-classic * Update pkgs/top-level/aliases.nix Co-authored-by: Silvan Mosberger <github@infinisil.com> --------- Co-authored-by: Silvan Mosberger <github@infinisil.com>
Diffstat (limited to 'pkgs/development')
4 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/development/compilers/scala/2.x.nix b/pkgs/development/compilers/scala/2.x.nix index 6268fea658dda..cf3f42ec08587 100644 --- a/pkgs/development/compilers/scala/2.x.nix +++ b/pkgs/development/compilers/scala/2.x.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, makeWrapper, jre, gnugrep, coreutils, writeScript -, common-updater-scripts, git, gnused, nix, nixfmt, majorVersion }: +, common-updater-scripts, git, gnused, nix, nixfmt-classic, majorVersion }: let repo = "git@github.com:scala/scala.git"; @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { git gnused nix - nixfmt + nixfmt-classic ] } versionSelect='v${lib.versions.major version}.${lib.versions.minor version}.*' diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix index aa38d17cda6b8..4a33b713d7d7f 100644 --- a/pkgs/development/tools/ammonite/default.nix +++ b/pkgs/development/tools/ammonite/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, jre, writeScript, common-updater-scripts, git, nixfmt +{ lib, stdenv, fetchurl, jre, writeScript, common-updater-scripts, git, nixfmt-classic , nix, coreutils, gnused, disableRemoteLogging ? true }: let @@ -37,7 +37,7 @@ let git gnused nix - nixfmt + nixfmt-classic ] } oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion ${pname}" | tr -d '"')" diff --git a/pkgs/development/tools/build-managers/sbt-extras/default.nix b/pkgs/development/tools/build-managers/sbt-extras/default.nix index 7d9295e9c6db3..e510b0fd29adf 100644 --- a/pkgs/development/tools/build-managers/sbt-extras/default.nix +++ b/pkgs/development/tools/build-managers/sbt-extras/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, which, curl, makeWrapper, jdk, writeScript -, common-updater-scripts, cacert, git, nixfmt, nix, jq, coreutils, gnused }: +, common-updater-scripts, cacert, git, nixfmt-classic, nix, jq, coreutils, gnused }: stdenv.mkDerivation rec { pname = "sbt-extras"; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { curl cacert git - nixfmt + nixfmt-classic nix jq coreutils diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index baa412d3702cf..169332f46647e 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, common-updater-scripts, coreutils, git, gnused -, makeWrapper, nix, nixfmt, openjdk, writeScript, nixosTests, jq, cacert, curl +, makeWrapper, nix, nixfmt-classic, openjdk, writeScript, nixosTests, jq, cacert, curl }: stdenv.mkDerivation rec { @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { gnused jq nix - nixfmt + nixfmt-classic ] } |