commit d1a4769b38bad1538d8b7aab3d337809f5bb5bd3 · pyrox.dev/nixpkgs

+1 -1

ci/default.nix

···

       49
       49
        
       

     

       50
       50
        
               programs.keep-sorted.enable = true;

     

       51
       51
        
       

     

       52
       52
       -
               # This uses nixfmt-rfc-style underneath,

     

       52
       52
       +
               # This uses nixfmt underneath,

     

       53
       53
        
               # the default formatter for Nix code.

     

       54
       54
        
               # See https://github.com/NixOS/nixfmt

     

       55
       55
        
               programs.nixfmt.enable = true;

+2 -2

maintainers/scripts/auto-rebase/test/default.nix

···

       9
       9
        
           stdenvNoCC

     

       10
       10
        
           gitMinimal

     

       11
       11
        
           treefmt

     

       12
       12
       -
           nixfmt-rfc-style

     

       12
       12
       +
           nixfmt

     

       13
       13
        
           ;

     

       14
       14
        
       in

     

       15
       15
        
       

     
···

       27
       27
        
         nativeBuildInputs = [

     

       28
       28
        
           gitMinimal

     

       29
       29
        
           treefmt

     

       30
       30
       -
           nixfmt-rfc-style

     

       30
       30
       +
           nixfmt

     

       31
       31
        
         ];

     

       32
       32
        
         patchPhase = ''

     

       33
       33
        
           patchShebangs .

+1 -1

pkgs/applications/editors/emacs/elisp-packages/emacs2nix.nix

···

       13
       13
        
       

     

       14
       14
        
         packages = [

     

       15
       15
        
           pkgs.bash

     

       16
       16
       -
           pkgs.nixfmt-rfc-style

     

       16
       16
       +
           pkgs.nixfmt

     

       17
       17
        
         ];

     

       18
       18
        
       

     

       19
       19
        
         EMACS2NIX = src;

+2 -2

pkgs/build-support/dotnet/add-nuget-deps/default.nix

···

       5
       5
        
         lib,

     

       6
       6
        
         replaceVarsWith,

     

       7
       7
        
         nuget-to-nix,

     

       8
       8
       -
         nixfmt-rfc-style,

     

       8
       8
       +
         nixfmt,

     

       9
       9
        
         nuget-to-json,

     

       10
       10
        
         cacert,

     

       11
       11
        
         fetchNupkg,

     
···

       90
       90
        
                   replacements = {

     

       91
       91
        
                     binPath = lib.makeBinPath [

     

       92
       92
        
                       nuget-to-nix

     

       93
       93
       -
                       nixfmt-rfc-style

     

       93
       93
       +
                       nixfmt

     

       94
       94
        
                       nuget-to-json

     

       95
       95
        
                     ];

     

       96
       96
        
                   };

+1 -1

pkgs/build-support/vm/default.nix

···

       909
       909
        
               nativeBuildInputs = [

     

       910
       910
        
                 buildPackages.perl

     

       911
       911
        
                 buildPackages.dpkg

     

       912
       912
       -
                 buildPackages.nixfmt-rfc-style

     

       912
       912
       +
                 buildPackages.nixfmt

     

       913
       913
        
               ];

     

       914
       914
        
             }

     

       915
       915
        
             ''

+2 -2

pkgs/by-name/el/elm-land/package.nix

···

       7
       7
        
         writeShellScript,

     

       8
       8
        
         nix-update,

     

       9
       9
        
         elm2nix,

     

       10
       10
       -
         nixfmt-rfc-style,

     

       10
       10
       +
         nixfmt,

     

       11
       11
        
       }:

     

       12
       12
        
       

     

       13
       13
        
       buildNpmPackage rec {

     
···

       53
       53
        
           cp "$(nix-build -A "$UPDATE_NIX_ATTR_PATH".src)/projects/cli/src/codegen/elm.json" elm.json

     

       54
       54
        
           trap 'rm -rf elm.json registry.dat &> /dev/null' EXIT

     

       55
       55
        
           ${lib.getExe elm2nix} convert > pkgs/by-name/el/elm-land/elm-srcs.nix

     

       56
       56
       -
           ${lib.getExe nixfmt-rfc-style} pkgs/by-name/el/elm-land/elm-srcs.nix

     

       56
       56
       +
           ${lib.getExe nixfmt} pkgs/by-name/el/elm-land/elm-srcs.nix

     

       57
       57
        
           ${lib.getExe elm2nix} snapshot

     

       58
       58
        
           cp registry.dat pkgs/by-name/el/elm-land/registry.dat

     

       59
       59
        
         '';

+2 -2

pkgs/by-name/li/livekit-libwebrtc/gclient2nix.nix

···

       8
       8
        
         nix-prefetch-git,

     

       9
       9
        
         nix,

     

       10
       10
        
         coreutils,

     

       11
       11
       -
         nixfmt-rfc-style,

     

       11
       11
       +
         nixfmt,

     

       12
       12
        
         makeWrapper,

     

       13
       13
        
       }:

     

       14
       14
        
       # Based on https://github.com/milahu/gclient2nix

     
···

       19
       19
        
           nix-prefetch-git

     

       20
       20
        
           nix

     

       21
       21
        
           coreutils

     

       22
       22
       -
           nixfmt-rfc-style

     

       22
       22
       +
           nixfmt

     

       23
       23
        
         ];

     

       24
       24
        
       in

     

       25
       25
        
       buildPythonPackage {

+2 -2

pkgs/by-name/ni/nil/package.nix

···

       3
       3
        
         rustPlatform,

     

       4
       4
        
         fetchFromGitHub,

     

       5
       5
        
         nix,

     

       6
       6
       -
         nixfmt-rfc-style,

     

       6
       6
       +
         nixfmt,

     

       7
       7
        
         nix-update-script,

     

       8
       8
        
       }:

     

       9
       9
        
       

     
···

       25
       25
        
       

     

       26
       26
        
         env = {

     

       27
       27
        
           CFG_RELEASE = version;

     

       28
       28
       -
           CFG_DEFAULT_FORMATTER = lib.getExe nixfmt-rfc-style;

     

       28
       28
       +
           CFG_DEFAULT_FORMATTER = lib.getExe nixfmt;

     

       29
       29
        
         };

     

       30
       30
        
       

     

       31
       31
        
         # might be related to https://github.com/NixOS/nix/issues/5884

+2 -2

pkgs/by-name/ni/nixfmt-tree/package.nix

···

       2
       2
        
         lib,

     

       3
       3
        
         runCommand,

     

       4
       4
        
         treefmt,

     

       5
       5
       -
         nixfmt-rfc-style,

     

       5
       5
       +
         nixfmt,

     

       6
       6
        
         nixfmt-tree,

     

       7
       7
        
         git,

     

       8
       8
        
         writableTmpDirAsHomeHook,

     

       9
       9
        
       

     

       10
       10
        
         settings ? { },

     

       11
       11
        
         runtimeInputs ? [ ],

     

       12
       12
       -
         nixfmtPackage ? nixfmt-rfc-style,

     

       12
       12
       +
         nixfmtPackage ? nixfmt,

     

       13
       13
        
       

     

       14
       14
        
         # NOTE: `runtimePackages` is deprecated. Use `nixfmtPackage` and/or `runtimeInputs`.

     

       15
       15
        
         runtimePackages ? [ nixfmtPackage ],

+2 -2

pkgs/by-name/tr/treefmt/tests.nix

···

       3
       3
        
         runCommand,

     

       4
       4
        
         testers,

     

       5
       5
        
         treefmt,

     

       6
       6
       -
         nixfmt-rfc-style,

     

       6
       6
       +
         nixfmt,

     

       7
       7
        
       }:

     

       8
       8
        
       let

     

       9
       9
        
         inherit (treefmt) buildConfig withConfig;

     
···

       29
       29
        
       

     

       30
       30
        
         nixfmtExamplePackage = withConfig {

     

       31
       31
        
           settings = nixfmtExampleConfig;

     

       32
       32
       -
           runtimeInputs = [ nixfmt-rfc-style ];

     

       32
       32
       +
           runtimeInputs = [ nixfmt ];

     

       33
       33
        
         };

     

       34
       34
        
       in

     

       35
       35
        
       {

+2 -2

pkgs/development/ruby-modules/bundler-update-script/default.nix

···

       7
       7
        
         coreutils,

     

       8
       8
        
         git,

     

       9
       9
        
         nix,

     

       10
       10
       -
         nixfmt-rfc-style,

     

       10
       10
       +
         nixfmt,

     

       11
       11
        
       }:

     

       12
       12
        
       

     

       13
       13
        
       attrPath:

     
···

       22
       22
        
               coreutils

     

       23
       23
        
               git

     

       24
       24
        
               nix

     

       25
       25
       -
               nixfmt-rfc-style

     

       25
       25
       +
               nixfmt

     

       26
       26
        
             ]

     

       27
       27
        
           }

     

       28
       28
        
           set -o errexit

+2 -2

pkgs/development/tools/build-managers/rebar3/default.nix

···

       12
       12
        
         git,

     

       13
       13
        
         gnused,

     

       14
       14
        
         nix,

     

       15
       15
       -
         nixfmt-rfc-style,

     

       15
       15
       +
         nixfmt,

     

       16
       16
        
         rebar3-nix,

     

       17
       17
        
       }:

     

       18
       18
        
       

     
···

       95
       95
        
                 git

     

       96
       96
        
                 gnused

     

       97
       97
        
                 nix

     

       98
       98
       -
                 nixfmt-rfc-style

     

       98
       98
       +
                 nixfmt

     

       99
       99
        
                 (rebar3WithPlugins { globalPlugins = [ rebar3-nix ]; })

     

       100
       100
        
               ]

     

       101
       101
        
             }

+2 -2

pkgs/servers/mobilizon/default.nix

···

       8
       8
        
         git,

     

       9
       9
        
         cmake,

     

       10
       10
        
         nixosTests,

     

       11
       11
       -
         nixfmt-rfc-style,

     

       11
       11
       +
         nixfmt,

     

       12
       12
        
         mobilizon-frontend,

     

       13
       13
        
         ...

     

       14
       14
        
       }:

     
···

       145
       145
        
             set -eou pipefail

     

       146
       146
        
       

     

       147
       147
        
             ${lib.getExe mix2nix} '${src}/mix.lock' > pkgs/servers/mobilizon/mix.nix

     

       148
       148
       -
             ${lib.getExe nixfmt-rfc-style} pkgs/servers/mobilizon/mix.nix

     

       148
       148
       +
             ${lib.getExe nixfmt} pkgs/servers/mobilizon/mix.nix

     

       149
       149
        
           '';

     

       150
       150
        
           elixirPackage = beamPackages.elixir;

     

       151
       151
        
         };

+2 -2

pkgs/tools/typesetting/tex/texlive/default.nix

···

       43
       43
        
         makeFontsConf,

     

       44
       44
        
         useFixedHashes ? true,

     

       45
       45
        
         recurseIntoAttrs,

     

       46
       46
       -
         nixfmt-rfc-style,

     

       46
       46
       +
         nixfmt,

     

       47
       47
        
       }:

     

       48
       48
        
       let

     

       49
       49
        
         stdenv = gcc12Stdenv;

     
···

       151
       151
        
               tl2nix = ./tl2nix.sed;

     

       152
       152
        
             }

     

       153
       153
        
             ''

     

       154
       154
       -
               xzcat "$tlpdbxz" | sed -rn -f "$tl2nix" | uniq | ${lib.getExe nixfmt-rfc-style} > "$out"

     

       154
       154
       +
               xzcat "$tlpdbxz" | sed -rn -f "$tl2nix" | uniq | ${lib.getExe nixfmt} > "$out"

     

       155
       155
        
             '';

     

       156
       156
        
       

     

       157
       157
        
         # map: name -> fixed-output hash

+1 -1

pkgs/top-level/release-haskell.nix

···

       346
       346
        
               nix-script

     

       347
       347
        
               nix-tree

     

       348
       348
        
               nixfmt-classic

     

       349
       349
       -
               nixfmt-rfc-style

     

       349
       349
       +
               nixfmt

     

       350
       350
        
               nota

     

       351
       351
        
               nvfetcher

     

       352
       352
        
               oama