windows.*: format with nixfmt

seth 613a1daf b5bf8e3f

+146 -71
+37 -11
pkgs/os-specific/windows/cygwin-setup/default.nix
··· 1 - { lib, stdenv, fetchcvs, autoconf, automake, libtool, flex, bison, pkg-config 2 - , zlib, bzip2, xz, libgcrypt 1 + { 2 + lib, 3 + stdenv, 4 + fetchcvs, 5 + autoconf, 6 + automake, 7 + libtool, 8 + flex, 9 + bison, 10 + pkg-config, 11 + zlib, 12 + bzip2, 13 + xz, 14 + libgcrypt, 3 15 }: 4 16 5 17 stdenv.mkDerivation rec { ··· 13 25 sha256 = "024wxaaxkf7p1i78bh5xrsqmfz7ss2amigbfl2r5w9h87zqn9aq3"; 14 26 }; 15 27 16 - nativeBuildInputs = [ autoconf automake libtool flex bison pkg-config ]; 28 + nativeBuildInputs = [ 29 + autoconf 30 + automake 31 + libtool 32 + flex 33 + bison 34 + pkg-config 35 + ]; 17 36 18 - buildInputs = let 19 - mkStatic = lib.flip lib.overrideDerivation (o: { 20 - dontDisableStatic = true; 21 - configureFlags = lib.toList (o.configureFlags or []) ++ [ "--enable-static" ]; 22 - buildInputs = map mkStatic (o.buildInputs or []); 23 - propagatedBuildInputs = map mkStatic (o.propagatedBuildInputs or []); 24 - }); 25 - in map mkStatic [ zlib bzip2 xz libgcrypt ]; 37 + buildInputs = 38 + let 39 + mkStatic = lib.flip lib.overrideDerivation (o: { 40 + dontDisableStatic = true; 41 + configureFlags = lib.toList (o.configureFlags or [ ]) ++ [ "--enable-static" ]; 42 + buildInputs = map mkStatic (o.buildInputs or [ ]); 43 + propagatedBuildInputs = map mkStatic (o.propagatedBuildInputs or [ ]); 44 + }); 45 + in 46 + map mkStatic [ 47 + zlib 48 + bzip2 49 + xz 50 + libgcrypt 51 + ]; 26 52 27 53 configureFlags = [ "--disable-shared" ]; 28 54
+38 -32
pkgs/os-specific/windows/default.nix
··· 1 - { lib, stdenv, buildPackages 2 - , newScope, overrideCC, stdenvNoLibc, libcCross 1 + { 2 + lib, 3 + stdenv, 4 + buildPackages, 5 + newScope, 6 + overrideCC, 7 + stdenvNoLibc, 8 + libcCross, 3 9 }: 4 10 5 - lib.makeScope newScope (self: with self; { 11 + lib.makeScope newScope ( 12 + self: with self; { 6 13 7 - cygwinSetup = callPackage ./cygwin-setup { }; 14 + cygwinSetup = callPackage ./cygwin-setup { }; 8 15 9 - dlfcn = callPackage ./dlfcn { }; 16 + dlfcn = callPackage ./dlfcn { }; 10 17 11 - w32api = callPackage ./w32api { }; 18 + w32api = callPackage ./w32api { }; 12 19 13 - mingwrt = callPackage ./mingwrt { }; 14 - mingw_runtime = mingwrt; 20 + mingwrt = callPackage ./mingwrt { }; 21 + mingw_runtime = mingwrt; 15 22 16 - mingw_w64 = callPackage ./mingw-w64 { 17 - stdenv = stdenvNoLibc; 18 - }; 23 + mingw_w64 = callPackage ./mingw-w64 { 24 + stdenv = stdenvNoLibc; 25 + }; 19 26 20 - # FIXME untested with llvmPackages_16 was using llvmPackages_8 21 - crossThreadsStdenv = overrideCC stdenvNoLibc 22 - (if stdenv.hostPlatform.useLLVM or false 23 - then buildPackages.llvmPackages.clangNoLibcxx 24 - else buildPackages.gccWithoutTargetLibc.override (old: { 25 - bintools = old.bintools.override { 26 - libc = libcCross; 27 - }; 28 - libc = libcCross; 29 - })); 27 + # FIXME untested with llvmPackages_16 was using llvmPackages_8 28 + crossThreadsStdenv = overrideCC stdenvNoLibc ( 29 + if stdenv.hostPlatform.useLLVM or false then 30 + buildPackages.llvmPackages.clangNoLibcxx 31 + else 32 + buildPackages.gccWithoutTargetLibc.override (old: { 33 + bintools = old.bintools.override { 34 + libc = libcCross; 35 + }; 36 + libc = libcCross; 37 + }) 38 + ); 30 39 31 - mingw_w64_headers = callPackage ./mingw-w64/headers.nix { }; 40 + mingw_w64_headers = callPackage ./mingw-w64/headers.nix { }; 32 41 33 - mingw_w64_pthreads = callPackage ./mingw-w64/pthreads.nix { 34 - stdenv = crossThreadsStdenv; 35 - }; 42 + mingw_w64_pthreads = callPackage ./mingw-w64/pthreads.nix { stdenv = crossThreadsStdenv; }; 36 43 37 - mcfgthreads = callPackage ./mcfgthreads { 38 - stdenv = crossThreadsStdenv; 39 - }; 44 + mcfgthreads = callPackage ./mcfgthreads { stdenv = crossThreadsStdenv; }; 40 45 41 - npiperelay = callPackage ./npiperelay { }; 46 + npiperelay = callPackage ./npiperelay { }; 42 47 43 - pthreads = callPackage ./pthread-w32 { }; 48 + pthreads = callPackage ./pthread-w32 { }; 44 49 45 - libgnurx = callPackage ./libgnurx { }; 46 - }) 50 + libgnurx = callPackage ./libgnurx { }; 51 + } 52 + )
+6 -1
pkgs/os-specific/windows/dlfcn/default.nix
··· 1 - { stdenv, lib, fetchFromGitHub, cmake }: 1 + { 2 + stdenv, 3 + lib, 4 + fetchFromGitHub, 5 + cmake, 6 + }: 2 7 3 8 stdenv.mkDerivation rec { 4 9 pname = "dlfcn";
+7 -2
pkgs/os-specific/windows/libgnurx/default.nix
··· 1 - { lib, stdenv, fetchurl }: 1 + { 2 + lib, 3 + stdenv, 4 + fetchurl, 5 + }: 2 6 3 7 let 4 8 version = "2.5.1"; 5 - in stdenv.mkDerivation rec { 9 + in 10 + stdenv.mkDerivation rec { 6 11 pname = "libgnurx"; 7 12 inherit version; 8 13 src = fetchurl {
+10 -8
pkgs/os-specific/windows/mcfgthreads/default.nix
··· 1 - { lib 2 - , stdenv 3 - , fetchFromGitHub 4 - , autoreconfHook 1 + { 2 + lib, 3 + stdenv, 4 + fetchFromGitHub, 5 + autoreconfHook, 5 6 }: 6 7 7 8 stdenv.mkDerivation rec { ··· 15 16 hash = "sha256-FrmeaQhwLrNewS0HDlbWgCvVQ5U1l0jrw0YVuQdt9Ck="; 16 17 }; 17 18 18 - outputs = [ "out" "dev" ]; 19 + outputs = [ 20 + "out" 21 + "dev" 22 + ]; 19 23 20 - nativeBuildInputs = [ 21 - autoreconfHook 22 - ]; 24 + nativeBuildInputs = [ autoreconfHook ]; 23 25 24 26 meta = { 25 27 description = "Threading support library for Windows 7 and above";
+15 -10
pkgs/os-specific/windows/mingw-w64/default.nix
··· 1 - { lib 2 - , stdenv 3 - , windows 4 - , autoreconfHook 5 - , mingw_w64_headers 1 + { 2 + lib, 3 + stdenv, 4 + windows, 5 + autoreconfHook, 6 + mingw_w64_headers, 6 7 }: 7 8 8 9 stdenv.mkDerivation { 9 10 pname = "mingw-w64"; 10 11 inherit (mingw_w64_headers) version src meta; 11 12 12 - outputs = [ "out" "dev" ]; 13 + outputs = [ 14 + "out" 15 + "dev" 16 + ]; 13 17 14 18 configureFlags = [ 15 19 "--enable-idl" 16 20 "--enable-secure-api" 17 - ] ++ lib.optionals (stdenv.targetPlatform.libc == "ucrt") [ 18 - "--with-default-msvcrt=ucrt" 19 - ]; 21 + ] ++ lib.optionals (stdenv.targetPlatform.libc == "ucrt") [ "--with-default-msvcrt=ucrt" ]; 20 22 21 23 enableParallelBuilding = true; 22 24 23 25 nativeBuildInputs = [ autoreconfHook ]; 24 26 buildInputs = [ windows.mingw_w64_headers ]; 25 - hardeningDisable = [ "stackprotector" "fortify" ]; 27 + hardeningDisable = [ 28 + "stackprotector" 29 + "fortify" 30 + ]; 26 31 }
+5 -1
pkgs/os-specific/windows/mingw-w64/headers.nix
··· 1 - { lib, stdenvNoCC, fetchurl }: 1 + { 2 + lib, 3 + stdenvNoCC, 4 + fetchurl, 5 + }: 2 6 3 7 stdenvNoCC.mkDerivation (finalAttrs: { 4 8 pname = "mingw_w64-headers";
+9 -2
pkgs/os-specific/windows/mingwrt/default.nix
··· 1 - { stdenv, lib, fetchurl }: 1 + { 2 + stdenv, 3 + lib, 4 + fetchurl, 5 + }: 2 6 3 7 stdenv.mkDerivation rec { 4 8 pname = "mingwrt"; ··· 14 18 }; 15 19 16 20 dontStrip = true; 17 - hardeningDisable = [ "stackprotector" "fortify" ]; 21 + hardeningDisable = [ 22 + "stackprotector" 23 + "fortify" 24 + ]; 18 25 }
+5 -1
pkgs/os-specific/windows/npiperelay/default.nix
··· 1 - { lib, buildGoModule, fetchFromGitHub }: 1 + { 2 + lib, 3 + buildGoModule, 4 + fetchFromGitHub, 5 + }: 2 6 3 7 buildGoModule rec { 4 8 pname = "npiperelay";
+9 -2
pkgs/os-specific/windows/pthread-w32/default.nix
··· 1 - { lib, stdenv, fetchzip }: 1 + { 2 + lib, 3 + stdenv, 4 + fetchzip, 5 + }: 2 6 3 7 stdenv.mkDerivation { 4 8 pname = "pthreads-w32"; ··· 9 13 sha256 = "1s8iny7g06z289ahdj0kzaxj0cd3wvjbd8j3bh9xlg7g444lhy9w"; 10 14 }; 11 15 12 - makeFlags = [ "CROSS=${stdenv.cc.targetPrefix}" "GC-static" ]; 16 + makeFlags = [ 17 + "CROSS=${stdenv.cc.targetPrefix}" 18 + "GC-static" 19 + ]; 13 20 14 21 installPhase = '' 15 22 runHook preInstall
+5 -1
pkgs/os-specific/windows/w32api/default.nix
··· 1 - { stdenv, fetchurl, lib }: 1 + { 2 + stdenv, 3 + fetchurl, 4 + lib, 5 + }: 2 6 3 7 stdenv.mkDerivation rec { 4 8 pname = "w32api";