commit cebf9198f3fe80fa38a8c57eb3b02ac4c1df3e8a · pyrox.dev/nixpkgs

+1 -1

lib/types.nix

···

       499
       499
        
               show = v:

     

       500
       500
        
                      if builtins.isString v then ''"${v}"''

     

       501
       501
        
                 else if builtins.isInt v then builtins.toString v

     

       502
       502
       -
                 else if builtins.isBool v then if v then "true" else "false"

     

       502
       502
       +
                 else if builtins.isBool v then boolToString v

     

       503
       503
        
                 else ''<${builtins.typeOf v}>'';

     

       504
       504
        
             in

     

       505
       505
        
             mkOptionType rec {

+1 -1

nixos/modules/services/mail/rspamd.nix

···

       153
       153
        
       

     

       154
       154
        
             ${concatStringsSep "\n" (mapAttrsToList (name: value: let

     

       155
       155
        
                 includeName = if name == "rspamd_proxy" then "proxy" else name;

     

       156
       156
       -
                 tryOverride = if value.extraConfig == "" then "true" else "false";

     

       156
       156
       +
                 tryOverride = boolToString (value.extraConfig == "");

     

       157
       157
        
               in ''

     

       158
       158
        
               worker "${value.type}" {

     

       159
       159
        
                 type = "${value.type}";

+1 -1

nixos/modules/services/misc/nix-daemon.nix

···

       45
       45
        
               trusted-substituters = ${toString cfg.trustedBinaryCaches}

     

       46
       46
        
               trusted-public-keys = ${toString cfg.binaryCachePublicKeys}

     

       47
       47
        
               auto-optimise-store = ${boolToString cfg.autoOptimiseStore}

     

       48
       48
       -
               require-sigs = ${if cfg.requireSignedBinaryCaches then "true" else "false"}

     

       48
       48
       +
               require-sigs = ${boolToString cfg.requireSignedBinaryCaches}

     

       49
       49
        
               trusted-users = ${toString cfg.trustedUsers}

     

       50
       50
        
               allowed-users = ${toString cfg.allowedUsers}

     

       51
       51
        
               ${optionalString (!cfg.distributedBuilds) ''

+1 -1

nixos/modules/services/networking/prosody.nix

···

       261
       261
        
       

     

       262
       262
        
         toLua = x:

     

       263
       263
        
           if builtins.isString x then ''"${x}"''

     

       264
       264
       -
           else if builtins.isBool x then (if x == true then "true" else "false")

     

       264
       264
       +
           else if builtins.isBool x then boolToString x

     

       265
       265
        
           else if builtins.isInt x then toString x

     

       266
       266
        
           else if builtins.isList x then ''{ ${lib.concatStringsSep ", " (map (n: toLua n) x) } }''

     

       267
       267
        
           else throw "Invalid Lua value";

+2 -2

nixos/modules/services/security/fail2ban.nix

···

       282
       282
        
           services.fail2ban.jails.DEFAULT = ''

     

       283
       283
        
             ${optionalString cfg.bantime-increment.enable ''

     

       284
       284
        
               # Bantime incremental

     

       285
       285
       -
               bantime.increment    = ${if cfg.bantime-increment.enable then "true" else "false"}

     

       285
       285
       +
               bantime.increment    = ${boolToString cfg.bantime-increment.enable}

     

       286
       286
        
               bantime.maxtime      = ${cfg.bantime-increment.maxtime}

     

       287
       287
        
               bantime.factor       = ${cfg.bantime-increment.factor}

     

       288
       288
        
               bantime.formula      = ${cfg.bantime-increment.formula}

     

       289
       289
        
               bantime.multipliers  = ${cfg.bantime-increment.multipliers}

     

       290
       290
       -
               bantime.overalljails = ${if cfg.bantime-increment.overalljails then "true" else "false"}

     

       290
       290
       +
               bantime.overalljails = ${boolToString cfg.bantime-increment.overalljails}

     

       291
       291
        
             ''}

     

       292
       292
        
             # Miscellaneous options

     

       293
       293
        
             ignoreip    = 127.0.0.1/8 ${optionalString config.networking.enableIPv6 "::1"} ${concatStringsSep " " cfg.ignoreIP}

+2 -2

nixos/modules/services/security/usbguard.nix

···

       19
       19
        
           PresentDevicePolicy=${cfg.presentDevicePolicy}

     

       20
       20
        
           PresentControllerPolicy=${cfg.presentControllerPolicy}

     

       21
       21
        
           InsertedDevicePolicy=${cfg.insertedDevicePolicy}

     

       22
       22
       -
           RestoreControllerDeviceState=${if cfg.restoreControllerDeviceState then "true" else "false"}

     

       22
       22
       +
           RestoreControllerDeviceState=${boolToString cfg.restoreControllerDeviceState}

     

       23
       23
        
           # this does not seem useful for endusers to change

     

       24
       24
        
           DeviceManagerBackend=uevent

     

       25
       25
        
           IPCAllowedUsers=${concatStringsSep " " cfg.IPCAllowedUsers}

     

       26
       26
        
           IPCAllowedGroups=${concatStringsSep " " cfg.IPCAllowedGroups}

     

       27
       27
        
           IPCAccessControlFiles=/var/lib/usbguard/IPCAccessControl.d/

     

       28
       28
       -
           DeviceRulesWithPort=${if cfg.deviceRulesWithPort then "true" else "false"}

     

       28
       28
       +
           DeviceRulesWithPort=${boolToString cfg.deviceRulesWithPort}

     

       29
       29
        
           # HACK: that way audit logs still land in the journal

     

       30
       30
        
           AuditFilePath=/dev/null

     

       31
       31
        
         '';

+1 -1

nixos/modules/services/x11/display-managers/gdm.nix

···

       264
       264
        
           # presented and there's a little delay.

     

       265
       265
        
           environment.etc."gdm/custom.conf".text = ''

     

       266
       266
        
             [daemon]

     

       267
       267
       -
             WaylandEnable=${if cfg.gdm.wayland then "true" else "false"}

     

       267
       267
       +
             WaylandEnable=${boolToString cfg.gdm.wayland}

     

       268
       268
        
             ${optionalString cfg.autoLogin.enable (

     

       269
       269
        
               if cfg.gdm.autoLogin.delay > 0 then ''

     

       270
       270
        
                 TimedLoginEnable=true

+2 -2

nixos/modules/services/x11/display-managers/sddm.nix

···

       55
       55
        
           XauthPath=${pkgs.xorg.xauth}/bin/xauth

     

       56
       56
        
           DisplayCommand=${Xsetup}

     

       57
       57
        
           DisplayStopCommand=${Xstop}

     

       58
       58
       -
           EnableHidpi=${if cfg.enableHidpi then "true" else "false"}

     

       58
       58
       +
           EnableHidpi=${boolToString cfg.enableHidpi}

     

       59
       59
        
       

     

       60
       60
        
           [Wayland]

     

       61
       61
       -
           EnableHidpi=${if cfg.enableHidpi then "true" else "false"}

     

       61
       61
       +
           EnableHidpi=${boolToString cfg.enableHidpi}

     

       62
       62
        
           SessionDir=${dmcfg.sessionData.desktops}/share/wayland-sessions

     

       63
       63
        
       

     

       64
       64
        
           ${optionalString dmcfg.autoLogin.enable ''

+2 -2

pkgs/applications/misc/razergenie/default.nix

···

       27
       27
        
         ];

     

       28
       28
        
       

     

       29
       29
        
         mesonFlags = [

     

       30
       30
       -
           "-Denable_experimental=${if enableExperimental then "true" else "false"}"

     

       31
       31
       -
           "-Dinclude_matrix_discovery=${if includeMatrixDiscovery then "true" else "false"}"

     

       30
       30
       +
           "-Denable_experimental=${lib.boolToString enableExperimental}"

     

       31
       31
       +
           "-Dinclude_matrix_discovery=${lib.boolToString includeMatrixDiscovery}"

     

       32
       32
        
         ];

     

       33
       33
        
       

     

       34
       34
        
         meta = with lib; {

+2 -2

pkgs/applications/video/obs-studio/wlrobs.nix

···

       7
       7
        
       # ln -s ~/.nix-profile/share/obs/obs-plugins/wlrobs/bin/64bit/libwlrobs.so ~/.config/obs-studio/plugins/wlrobs/bin/64bit

     

       8
       8
        
       { stdenv, fetchhg, wayland, obs-studio

     

       9
       9
        
       , meson, ninja, pkgconfig, libX11

     

       10
       10
       -
       , dmabufSupport ? false, libdrm ? null, libGL ? null}:

     

       10
       10
       +
       , dmabufSupport ? false, libdrm ? null, libGL ? null, lib}:

     

       11
       11
        
       

     

       12
       12
        
       assert dmabufSupport -> libdrm != null && libGL != null;

     

       13
       13
        
       

     
···

       29
       29
        
         '';

     

       30
       30
        
       

     

       31
       31
        
         mesonFlags = [

     

       32
       32
       -
           "-Duse_dmabuf=${if dmabufSupport then "true" else "false"}"

     

       32
       32
       +
           "-Duse_dmabuf=${lib.boolToString dmabufSupport}"

     

       33
       33
        
         ];

     

       34
       34
        
       

     

       35
       35
        
         meta = with stdenv.lib; {

+1 -1

pkgs/development/go-modules/generic/default.nix

···

       47
       47
        
       

     

       48
       48
        
         removeExpr = refs: ''remove-references-to ${lib.concatMapStrings (ref: " -t ${ref}") refs}'';

     

       49
       49
        
       

     

       50
       50
       -
         deleteFlag = if deleteVendor then "true" else "false";

     

       50
       50
       +
         deleteFlag = lib.boolToString deleteVendor;

     

       51
       51
        
       

     

       52
       52
        
         vendCommand = if runVend then "${vend}/bin/vend" else "false";

     

       53
       53

+2 -1

pkgs/development/libraries/gdk-pixbuf/default.nix

···

       21
       21
        
       , doCheck ? false

     

       22
       22
        
       , makeWrapper

     

       23
       23
        
       , fetchpatch

     

       24
       24
       +
       , lib

     

       24
       25
        
       }:

     

       25
       26
        
       

     

       26
       27
        
       stdenv.mkDerivation rec {

     
···

       74
       75
        
         mesonFlags = [

     

       75
       76
        
           "-Ddocs=true"

     

       76
       77
        
           "-Dx11=false" # use gdk-pixbuf-xlib

     

       77
       77
       -
           "-Dgir=${if gobject-introspection != null then "true" else "false"}"

     

       78
       78
       +
           "-Dgir=${lib.boolToString (gobject-introspection != null)}"

     

       78
       79
        
           "-Dgio_sniffing=false"

     

       79
       80
        
         ];

     

       80
       81

+1 -1

pkgs/development/libraries/geoclue/default.nix

···

       39
       39
        
       

     

       40
       40
        
         mesonFlags = [

     

       41
       41
        
           "-Dsystemd-system-unit-dir=${placeholder "out"}/etc/systemd/system"

     

       42
       42
       -
           "-Ddemo-agent=${if withDemoAgent then "true" else "false"}"

     

       42
       42
       +
           "-Ddemo-agent=${boolToString withDemoAgent}"

     

       43
       43
        
           "--sysconfdir=/etc"

     

       44
       44
        
           "-Dsysconfdir_install=${placeholder "out"}/etc"

     

       45
       45
        
           "-Ddbus-srv-user=geoclue"

+1 -1

pkgs/development/libraries/glib/default.nix

···

       108
       108
        
         mesonFlags = [

     

       109
       109
        
           # Avoid the need for gobject introspection binaries in PATH in cross-compiling case.

     

       110
       110
        
           # Instead we just copy them over from the native output.

     

       111
       111
       -
           "-Dgtk_doc=${if stdenv.hostPlatform == stdenv.buildPlatform then "true" else "false"}"

     

       111
       111
       +
           "-Dgtk_doc=${boolToString (stdenv.hostPlatform == stdenv.buildPlatform)}"

     

       112
       112
        
           "-Dnls=enabled"

     

       113
       113
        
           "-Ddevbindir=${placeholder ''dev''}/bin"

     

       114
       114
        
         ];

+2 -2

pkgs/development/libraries/libsoup/default.nix

···

       1
       1
        
       { stdenv, fetchurl, glib, libxml2, meson, ninja, pkgconfig, gnome3

     

       2
       2
        
       , gnomeSupport ? true, sqlite, glib-networking, gobject-introspection, vala

     

       3
       3
       -
       , libpsl, python3, brotli }:

     

       3
       3
       +
       , libpsl, python3, brotli, lib }:

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
        
         pname = "libsoup";

     
···

       25
       25
        
           "-Dtls_check=false" # glib-networking is a runtime dependency, not a compile-time dependency

     

       26
       26
        
           "-Dgssapi=disabled"

     

       27
       27
        
           "-Dvapi=enabled"

     

       28
       28
       -
           "-Dgnome=${if gnomeSupport then "true" else "false"}"

     

       28
       28
       +
           "-Dgnome=${lib.boolToString gnomeSupport}"

     

       29
       29
        
           "-Dntlm=disabled"

     

       30
       30
        
         ];

     

       31
       31

+2 -2

pkgs/development/libraries/mesa/default.nix

···

       129
       129
        
           "-Domx-libs-path=${placeholder "drivers"}/lib/bellagio"

     

       130
       130
        
           "-Dva-libs-path=${placeholder "drivers"}/lib/dri"

     

       131
       131
        
           "-Dd3d-drivers-path=${placeholder "drivers"}/lib/d3d"

     

       132
       132
       -
           "-Dgallium-nine=${if enableGalliumNine then "true" else "false"}" # Direct3D in Wine

     

       132
       132
       +
           "-Dgallium-nine=${boolToString enableGalliumNine}" # Direct3D in Wine

     

       133
       133
        
           "-Dosmesa=${if enableOSMesa then "gallium" else "none"}" # used by wine

     

       134
       134
        
         ] ++ optionals stdenv.isLinux [

     

       135
       135
        
           "-Dglvnd=true"

     
···

       229
       229
        
           inherit (libglvnd) driverLink;

     

       230
       230
        
         };

     

       231
       231
        
       

     

       232
       232
       -
         meta = with stdenv.lib; {

     

       232
       232
       +
         meta = {

     

       233
       233
        
           description = "An open source 3D graphics library";

     

       234
       234
        
           longDescription = ''

     

       235
       235
        
             The Mesa project began as an open-source implementation of the OpenGL

+1 -1

pkgs/development/libraries/v8/default.nix

···

       80
       80
        
       

     

       81
       81
        
         gnFlags = [

     

       82
       82
        
           "use_custom_libcxx=false"

     

       83
       83
       -
           "is_clang=${if stdenv.cc.isClang then "true" else "false"}"

     

       83
       83
       +
           "is_clang=${lib.boolToString stdenv.cc.isClang}"

     

       84
       84
        
           "use_sysroot=false"

     

       85
       85
        
           # "use_system_icu=true"

     

       86
       86
        
           "is_component_build=false"

+2 -2

pkgs/development/ocaml-modules/uchar/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, ocaml, findlib, ocamlbuild, opaline, withShared ? true }:

     

       1
       1
       +
       { stdenv, fetchurl, ocaml, findlib, ocamlbuild, opaline, withShared ? true, lib }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation {

     

       4
       4
        
         name = "ocaml${ocaml.version}-uchar-0.0.2";

     
···

       10
       10
        
       

     

       11
       11
        
         nativeBuildInputs = [ ocaml ocamlbuild findlib ];

     

       12
       12
        
         buildInputs = [ findlib ocaml ocamlbuild ];

     

       13
       13
       -
         buildPhase = "ocaml pkg/build.ml native=true native-dynlink=${if withShared then "true" else "false"}";

     

       13
       13
       +
         buildPhase = "ocaml pkg/build.ml native=true native-dynlink=${lib.boolToString withShared}";

     

       14
       14
        
         installPhase = "${opaline}/bin/opaline -libdir $OCAMLFIND_DESTDIR";

     

       15
       15
        
         configurePlatforms = [];

     

       16
       16

+1 -1

pkgs/os-specific/linux/dpdk/default.nix

···

       43
       43
        
       

     

       44
       44
        
         mesonFlags = [

     

       45
       45
        
           "-Denable_docs=true"

     

       46
       46
       -
           "-Denable_kmods=${if mod then "true" else "false"}"

     

       46
       46
       +
           "-Denable_kmods=${lib.boolToString mod}"

     

       47
       47
        
         ]

     

       48
       48
        
         ++ lib.optional (!shared) "-Ddefault_library=static"

     

       49
       49
        
         ++ lib.optional stdenv.isx86_64 "-Dmachine=nehalem"

+2 -1

pkgs/tools/networking/network-manager/libnma/default.nix

···

       19
       19
        
       , gcr

     

       20
       20
        
       , glib

     

       21
       21
        
       , substituteAll

     

       22
       22
       +
       , lib

     

       22
       23
        
       }:

     

       23
       24
        
       

     

       24
       25
        
       stdenv.mkDerivation rec {

     
···

       61
       62
        
         ];

     

       62
       63
        
       

     

       63
       64
        
         mesonFlags = [

     

       64
       64
       -
           "-Dgcr=${if withGnome then "true" else "false"}"

     

       65
       65
       +
           "-Dgcr=${lib.boolToString withGnome}"

     

       65
       66
        
         ];

     

       66
       67
        
       

     

       67
       68
        
         postPatch = ''