mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-11 15:26:03 +03:00
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>
This commit is contained in:
parent
0d484f3922
commit
af69be669f
@ -1,5 +1,5 @@
|
||||
{ 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
|
||||
|
@ -1,5 +1,5 @@
|
||||
#! /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."""
|
||||
|
@ -1,6 +1,6 @@
|
||||
{ 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";
|
||||
|
@ -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}.*'
|
||||
|
@ -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 '"')"
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
]
|
||||
}
|
||||
|
||||
|
@ -2,7 +2,7 @@
|
||||
#
|
||||
# https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=oh-my-zsh-git
|
||||
{ lib, stdenv, fetchFromGitHub, nixosTests, writeScript, common-updater-scripts
|
||||
, git, nix, nixfmt, jq, coreutils, gnused, curl, cacert, bash }:
|
||||
, git, nix, nixfmt-classic, jq, coreutils, gnused, curl, cacert, bash }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2023-11-29";
|
||||
@ -84,7 +84,7 @@ stdenv.mkDerivation rec {
|
||||
curl
|
||||
cacert
|
||||
git
|
||||
nixfmt
|
||||
nixfmt-classic
|
||||
nix
|
||||
jq
|
||||
coreutils
|
||||
|
@ -848,6 +848,7 @@ mapAliases ({
|
||||
nix_2_4 = nixVersions.nix_2_4;
|
||||
nix_2_5 = nixVersions.nix_2_5;
|
||||
nix_2_6 = nixVersions.nix_2_6;
|
||||
nixfmt = lib.warn "nixfmt was renamed to nixfmt-classic. The nixfmt attribute may be used for the new RFC 166-style formatter in the future, which is currently available as nixfmt-rfc-style" nixfmt-classic; # Added 2024-03-31
|
||||
nixops = throw "'nixops' has been removed. Please use 'nixops_unstable_minimal' for the time being. E.g. nixops_unstable_minimal.withPlugins (ps: [ ps.nixops-gce ])"; # Added 2023-10-26
|
||||
nixopsUnstable = nixops_unstable; # Added 2022-03-03
|
||||
|
||||
|
@ -40091,7 +40091,7 @@ with pkgs;
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
||||
nixfmt = haskellPackages.nixfmt.bin;
|
||||
nixfmt-classic = haskellPackages.nixfmt.bin;
|
||||
|
||||
nixpkgs-fmt = callPackage ../tools/nix/nixpkgs-fmt { };
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user