Unverified Commit af69be66 authored by Janne Heß's avatar Janne Heß Committed by GitHub
Browse files

treewide: Rename nixfmt to nixfmt-classic (#300468) 



* treewide: Rename nixfmt to nixfmt-classic

* Update pkgs/top-level/aliases.nix

Co-authored-by: default avatarSilvan Mosberger <github@infinisil.com>

---------

Co-authored-by: default avatarSilvan Mosberger <github@infinisil.com>
parent 0d484f39

pkgs/applications/editors/nano/default.nix

+2 −2
Original line number Diff line number Diff line 
{ lib, stdenv, fetchurl, fetchFromGitHub, ncurses, texinfo, writeScript

, common-updater-scripts, git, nix, nixfmt, coreutils, gnused, callPackage

, common-updater-scripts, git, nix, nixfmt-classic, coreutils, gnused, callPackage

, file ? null, gettext ? null, enableNls ? true, enableTiny ? false }:



assert enableNls -> (gettext != null);
@@ -48,7 +48,7 @@ in stdenv.mkDerivation rec { 
        lib.makeBinPath [

          common-updater-scripts

          git

          nixfmt

          nixfmt-classic

          nix

          coreutils

          gnused

pkgs/applications/networking/browsers/chromium/update.py

+1 −1
Original line number Diff line number Diff line 
#! /usr/bin/env nix-shell

#! nix-shell -i python -p python3 nix nixfmt nix-prefetch-git

#! nix-shell -i python -p python3 nix nixfmt-classic nix-prefetch-git



"""This script automatically updates chromium, google-chrome, chromedriver, and ungoogled-chromium

via upstream-info.nix."""

pkgs/applications/terminal-emulators/xterm/default.nix

+1 −1
Original line number Diff line number Diff line 
{ lib, stdenv, fetchurl, fetchpatch, xorg, ncurses, freetype, fontconfig

, pkg-config, makeWrapper, nixosTests, gitUpdater

, nixfmt, nix, gnused, coreutils, enableDecLocator ? true }:

, nix, gnused, coreutils, enableDecLocator ? true }:



stdenv.mkDerivation rec {

  pname = "xterm";

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

+2 −2
Original line number Diff line number Diff line 
{ 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}.*'

pkgs/development/tools/ammonite/default.nix

+2 −2
Original line number Diff line number Diff line 
{ 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 '"')"