treewide: run nixfmt 1.0.0

5 files changed, 108 insertions, 103 deletions

diff --git a/pkgs/development/ruby-modules/bundled-common/default.nix b/pkgs/development/ruby-modules/bundled-common/default.nix
index 479bc6eec29d..0fb92ea07928 100644
--- a/pkgs/development/ruby-modules/bundled-common/default.nix
+++ b/pkgs/development/ruby-modules/bundled-common/default.nix
@@ -164,7 +164,8 @@ let
 
     meta = {
       platforms = ruby.meta.platforms;
-    } // meta;
+    }
+    // meta;
 
     passthru = (
       lib.optionalAttrs (pname != null) {
diff --git a/pkgs/development/ruby-modules/bundler-app/default.nix b/pkgs/development/ruby-modules/bundler-app/default.nix
index 0a0b5818f375..2d6714b55688 100644
--- a/pkgs/development/ruby-modules/bundler-app/default.nix
+++ b/pkgs/development/ruby-modules/bundler-app/default.nix
@@ -64,7 +64,8 @@ let
       meta = {
         mainProgram = pname;
         inherit (ruby.meta) platforms;
-      } // meta;
+      }
+      // meta;
       passthru =
         basicEnv.passthru
         // {
diff --git a/pkgs/development/ruby-modules/bundler-env/default.nix b/pkgs/development/ruby-modules/bundler-env/default.nix
index df43ce4c6a36..9510ebf659bd 100644
--- a/pkgs/development/ruby-modules/bundler-env/default.nix
+++ b/pkgs/development/ruby-modules/bundler-env/default.nix
@@ -90,7 +90,8 @@ else
 
       meta = {
         platforms = ruby.meta.platforms;
-      } // meta;
+      }
+      // meta;
       passthru =
         basicEnv.passthru
         // {
diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix
index cbac40eaac8b..e746c32fe896 100644
--- a/pkgs/development/ruby-modules/gem-config/default.nix
+++ b/pkgs/development/ruby-modules/gem-config/default.nix
@@ -142,7 +142,8 @@ in
       rake
       bundler
       pkg-config
-    ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools ];
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools ];
     propagatedBuildInputs = [
       gobject-introspection
       wrapGAppsHook3
@@ -372,7 +373,8 @@ in
       pkg-config
       bundler
       rake
-    ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools ];
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools ];
     propagatedBuildInputs = [
       gobject-introspection
       wrapGAppsHook3
@@ -385,7 +387,8 @@ in
       pkg-config
       bundler
       rake
-    ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools ];
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools ];
     propagatedBuildInputs = [
       gobject-introspection
       wrapGAppsHook3
@@ -404,18 +407,18 @@ in
     nativeBuildInputs = [
       pkg-config
       gobject-introspection
-    ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools ];
-    buildInputs =
-      [
-        glib
-        libsysprof-capture
-        pcre2
-      ]
-      ++ lib.optionals stdenv.hostPlatform.isLinux [
-        util-linux
-        libselinux
-        libsepol
-      ];
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools ];
+    buildInputs = [
+      glib
+      libsysprof-capture
+      pcre2
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      util-linux
+      libselinux
+      libsepol
+    ];
   };
 
   gitlab-markup = attrs: { meta.priority = 1; };
@@ -529,17 +532,16 @@ in
   };
 
   gtk3 = attrs: {
-    nativeBuildInputs =
-      [
-        binutils
-        pkg-config
-      ]
-      ++ lib.optionals stdenv.hostPlatform.isLinux [
-        util-linux
-        libselinux
-        libsepol
-      ]
-      ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools ];
+    nativeBuildInputs = [
+      binutils
+      pkg-config
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      util-linux
+      libselinux
+      libsepol
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools ];
     propagatedBuildInputs = [
       atk
       gdk-pixbuf
@@ -590,14 +592,15 @@ in
     };
 
   grpc = attrs: {
-    nativeBuildInputs =
-      [ pkg-config ]
-      ++ lib.optional stdenv.hostPlatform.isDarwin cctools
-      ++ lib.optional (
-        lib.versionAtLeast attrs.version "1.53.0"
-        && stdenv.hostPlatform.isDarwin
-        && stdenv.hostPlatform.isAarch64
-      ) autoSignDarwinBinariesHook;
+    nativeBuildInputs = [
+      pkg-config
+    ]
+    ++ lib.optional stdenv.hostPlatform.isDarwin cctools
+    ++ lib.optional (
+      lib.versionAtLeast attrs.version "1.53.0"
+      && stdenv.hostPlatform.isDarwin
+      && stdenv.hostPlatform.isAarch64
+    ) autoSignDarwinBinariesHook;
     buildInputs = [ openssl ];
     hardeningDisable = [ "format" ];
     env = lib.optionalAttrs (lib.versionOlder attrs.version "1.68.1") {
@@ -614,19 +617,18 @@ in
       })
     ];
     dontBuild = false;
-    postPatch =
-      ''
-        substituteInPlace Makefile \
-          --replace '-Wno-invalid-source-encoding' ""
-      ''
-      + lib.optionalString (lib.versionOlder attrs.version "1.53.0" && stdenv.hostPlatform.isDarwin) ''
-        # For < v1.48.0
-        substituteInPlace src/ruby/ext/grpc/extconf.rb \
-          --replace "ENV['AR'] = 'libtool -o' if RUBY_PLATFORM =~ /darwin/" ""
-        # For >= v1.48.0
-        substituteInPlace src/ruby/ext/grpc/extconf.rb \
-          --replace 'apple_toolchain = ' 'apple_toolchain = false && '
-      '';
+    postPatch = ''
+      substituteInPlace Makefile \
+        --replace '-Wno-invalid-source-encoding' ""
+    ''
+    + lib.optionalString (lib.versionOlder attrs.version "1.53.0" && stdenv.hostPlatform.isDarwin) ''
+      # For < v1.48.0
+      substituteInPlace src/ruby/ext/grpc/extconf.rb \
+        --replace "ENV['AR'] = 'libtool -o' if RUBY_PLATFORM =~ /darwin/" ""
+      # For >= v1.48.0
+      substituteInPlace src/ruby/ext/grpc/extconf.rb \
+        --replace 'apple_toolchain = ' 'apple_toolchain = false && '
+    '';
   };
 
   hiredis-client = attrs: {
@@ -671,15 +673,14 @@ in
   };
 
   libxml-ruby = attrs: {
-    buildFlags =
-      [
-        "--with-xml2-lib=${libxml2.out}/lib"
-        "--with-xml2-include=${libxml2.dev}/include/libxml2"
-      ]
-      ++ lib.optionals stdenv.hostPlatform.isDarwin [
-        "--with-iconv-dir=${lib.getLib libiconv}"
-        "--with-opt-include=${lib.getDev libiconv}/include"
-      ];
+    buildFlags = [
+      "--with-xml2-lib=${libxml2.out}/lib"
+      "--with-xml2-include=${libxml2.dev}/include/libxml2"
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      "--with-iconv-dir=${lib.getLib libiconv}"
+      "--with-opt-include=${lib.getDev libiconv}/include"
+    ];
   };
 
   mathematical = attrs: {
@@ -792,22 +793,21 @@ in
     attrs:
     (
       {
-        buildFlags =
-          [
-            "--use-system-libraries"
-            "--with-zlib-lib=${zlib.out}/lib"
-            "--with-zlib-include=${zlib.dev}/include"
-            "--with-xml2-lib=${libxml2.out}/lib"
-            "--with-xml2-include=${libxml2.dev}/include/libxml2"
-            "--with-xslt-lib=${libxslt.out}/lib"
-            "--with-xslt-include=${libxslt.dev}/include"
-            "--with-exslt-lib=${libxslt.out}/lib"
-            "--with-exslt-include=${libxslt.dev}/include"
-          ]
-          ++ lib.optionals stdenv.hostPlatform.isDarwin [
-            "--with-iconv-dir=${libiconv}"
-            "--with-opt-include=${libiconv}/include"
-          ];
+        buildFlags = [
+          "--use-system-libraries"
+          "--with-zlib-lib=${zlib.out}/lib"
+          "--with-zlib-include=${zlib.dev}/include"
+          "--with-xml2-lib=${libxml2.out}/lib"
+          "--with-xml2-include=${libxml2.dev}/include/libxml2"
+          "--with-xslt-lib=${libxslt.out}/lib"
+          "--with-xslt-include=${libxslt.dev}/include"
+          "--with-exslt-lib=${libxslt.out}/lib"
+          "--with-exslt-include=${libxslt.dev}/include"
+        ]
+        ++ lib.optionals stdenv.hostPlatform.isDarwin [
+          "--with-iconv-dir=${libiconv}"
+          "--with-opt-include=${libiconv}/include"
+        ];
       }
       // lib.optionalAttrs stdenv.hostPlatform.isDarwin {
         buildInputs = [ libxml2 ];
@@ -852,23 +852,23 @@ in
   pango = attrs: {
     nativeBuildInputs = [
       pkg-config
-    ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools ];
-    buildInputs =
-      [
-        libdatrie
-        libthai
-        fribidi
-        harfbuzz
-        libsysprof-capture
-        pcre2
-        xorg.libpthreadstubs
-        xorg.libXdmcp
-      ]
-      ++ lib.optionals stdenv.hostPlatform.isLinux [
-        libselinux
-        libsepol
-        util-linux
-      ];
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools ];
+    buildInputs = [
+      libdatrie
+      libthai
+      fribidi
+      harfbuzz
+      libsysprof-capture
+      pcre2
+      xorg.libpthreadstubs
+      xorg.libXdmcp
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      libselinux
+      libsepol
+      util-linux
+    ];
     propagatedBuildInputs = [
       gobject-introspection
       wrapGAppsHook3
@@ -1031,7 +1031,8 @@ in
       cmake
       pkg-config
       which
-    ] ++ lib.optional stdenv.hostPlatform.isDarwin libiconv;
+    ]
+    ++ lib.optional stdenv.hostPlatform.isDarwin libiconv;
     buildInputs = [
       openssl
       libssh2
diff --git a/pkgs/development/ruby-modules/gem/default.nix b/pkgs/development/ruby-modules/gem/default.nix
index 2f677f860f87..0e3c1c4187f2 100644
--- a/pkgs/development/ruby-modules/gem/default.nix
+++ b/pkgs/development/ruby-modules/gem/default.nix
@@ -115,18 +115,18 @@ lib.makeOverridable (
       inherit suffix;
       gemType = type;
 
-      nativeBuildInputs =
-        [
-          ruby
-          makeWrapper
-        ]
-        ++ lib.optionals (type == "git") [ gitMinimal ]
-        ++ lib.optionals (type != "gem") [ bundler ]
-        ++ nativeBuildInputs;
+      nativeBuildInputs = [
+        ruby
+        makeWrapper
+      ]
+      ++ lib.optionals (type == "git") [ gitMinimal ]
+      ++ lib.optionals (type != "gem") [ bundler ]
+      ++ nativeBuildInputs;
 
       buildInputs = [
         ruby
-      ] ++ buildInputs;
+      ]
+      ++ buildInputs;
 
       #name = builtins.trace (attrs.name or "no attr.name" ) "${namePrefix}${gemName}-${version}";
       name = attrs.name or "${namePrefix}${gemName}-${suffix}";
@@ -299,7 +299,8 @@ lib.makeOverridable (
         # default to Ruby's platforms
         platforms = ruby.meta.platforms;
         mainProgram = gemName;
-      } // meta;
+      }
+      // meta;
     }
   )