commit f3719756b550113c1acbbab00c89a56fb77256f2 · pyrox.dev/nixpkgs

+1 -1

nixos/modules/services/backup/borgbackup.nix

···

       33
       33
        
           }

     

       34
       34
        
           trap on_exit EXIT

     

       35
       35
        
       

     

       36
       36
       -
           archiveName="${if cfg.archiveBaseName == null then "" else cfg.archiveBaseName + "-"}$(date ${cfg.dateFormat})"

     

       36
       36
       +
           archiveName="${optionalString (cfg.archiveBaseName != null) (cfg.archiveBaseName + "-")}$(date ${cfg.dateFormat})"

     

       37
       37
        
           archiveSuffix="${optionalString cfg.appendFailedSuffix ".failed"}"

     

       38
       38
        
           ${cfg.preHook}

     

       39
       39
        
         '' + optionalString cfg.doInit ''

+2 -4

nixos/modules/services/continuous-integration/jenkins/default.nix

···

       210
       210
        
       

     

       211
       211
        
             preStart =

     

       212
       212
        
               let replacePlugins =

     

       213
       213
       -
                     if cfg.plugins == null

     

       214
       214
       -
                     then ""

     

       215
       215
       -
                     else

     

       213
       213
       +
                     optionalString (cfg.plugins != null) (

     

       216
       214
        
                       let pluginCmds = lib.attrsets.mapAttrsToList

     

       217
       215
        
                             (n: v: "cp ${v} ${cfg.home}/plugins/${n}.jpi")

     

       218
       216
        
                             cfg.plugins;

     
···

       220
       218
        
                         rm -r ${cfg.home}/plugins || true

     

       221
       219
        
                         mkdir -p ${cfg.home}/plugins

     

       222
       220
        
                         ${lib.strings.concatStringsSep "\n" pluginCmds}

     

       223
       223
       -
                       '';

     

       221
       221
       +
                       '');

     

       224
       222
        
               in ''

     

       225
       223
        
                 rm -rf ${cfg.home}/war

     

       226
       224
        
                 ${replacePlugins}

+1 -1

nixos/modules/services/misc/cgminer.nix

···

       11
       11
        
           mapAttrsToList (n: v: ''"${n}": "${(concatStringsSep "," (map convType v))}"'')

     

       12
       12
        
             (foldAttrs (n: a: [n] ++ a) [] cfg.hardware);

     

       13
       13
        
         mergedConfig = with builtins;

     

       14
       14
       -
           mapAttrsToList (n: v: ''"${n}":  ${if isBool v then "" else ''"''}${convType v}${if isBool v then "" else ''"''}'')

     

       14
       14
       +
           mapAttrsToList (n: v: ''"${n}":  ${if isBool v then (convType v) else ''"${convType v}"''}'')

     

       15
       15
        
             cfg.config;

     

       16
       16
        
       

     

       17
       17
        
         cgminerConfig = pkgs.writeText "cgminer.conf" ''

+3 -3

nixos/modules/services/misc/sourcehut/default.nix

···

       8
       8
        
         settingsFormat = pkgs.formats.ini {

     

       9
       9
        
           listToValue = concatMapStringsSep "," (generators.mkValueStringDefault {});

     

       10
       10
        
           mkKeyValue = k: v:

     

       11
       11
       -
             if v == null then ""

     

       12
       12
       -
             else generators.mkKeyValueDefault {

     

       11
       11
       +
             optionalString (v != null)

     

       12
       12
       +
             (generators.mkKeyValueDefault {

     

       13
       13
        
               mkValueString = v:

     

       14
       14
        
                 if v == true then "yes"

     

       15
       15
        
                 else if v == false then "no"

     

       16
       16
        
                 else generators.mkValueStringDefault {} v;

     

       17
       17
       -
             } "=" k v;

     

       17
       17
       +
             } "=" k v);

     

       18
       18
        
         };

     

       19
       19
        
         configIniOfService = srv: settingsFormat.generate "sourcehut-${srv}-config.ini"

     

       20
       20
        
           # Each service needs access to only a subset of sections (and secrets).

+6 -6

nixos/modules/services/monitoring/prometheus/exporters/pve.nix

···

       104
       104
        
             LoadCredential = "configFile:${computedConfigFile}";

     

       105
       105
        
             ExecStart = ''

     

       106
       106
        
               ${cfg.package}/bin/pve_exporter \

     

       107
       107
       -
                 --${if cfg.collectors.status == true then "" else "no-"}collector.status \

     

       108
       108
       -
                 --${if cfg.collectors.version == true then "" else "no-"}collector.version \

     

       109
       109
       -
                 --${if cfg.collectors.node == true then "" else "no-"}collector.node \

     

       110
       110
       -
                 --${if cfg.collectors.cluster == true then "" else "no-"}collector.cluster \

     

       111
       111
       -
                 --${if cfg.collectors.resources == true then "" else "no-"}collector.resources \

     

       112
       112
       -
                 --${if cfg.collectors.config == true then "" else "no-"}collector.config \

     

       107
       107
       +
                 --${optionalString (!cfg.collectors.status) "no-"}collector.status \

     

       108
       108
       +
                 --${optionalString (!cfg.collectors.version) "no-"}collector.version \

     

       109
       109
       +
                 --${optionalString (!cfg.collectors.node) "no-"}collector.node \

     

       110
       110
       +
                 --${optionalString (!cfg.collectors.cluster) "no-"}collector.cluster \

     

       111
       111
       +
                 --${optionalString (!cfg.collectors.resources) "no-"}collector.resources \

     

       112
       112
       +
                 --${optionalString (!cfg.collectors.config) "no-"}collector.config \

     

       113
       113
        
                 %d/configFile \

     

       114
       114
        
                 ${toString cfg.port} ${cfg.listenAddress}

     

       115
       115
        
             '';

+1 -2

nixos/modules/services/networking/biboumi.nix

···

       8
       8
        
         settingsFile = pkgs.writeText "biboumi.cfg" (

     

       9
       9
        
           generators.toKeyValue {

     

       10
       10
        
             mkKeyValue = k: v:

     

       11
       11
       -
               if v == null then ""

     

       12
       12
       -
               else generators.mkKeyValueDefault {} "=" k v;

     

       11
       11
       +
               lib.optionalString (v != null) (generators.mkKeyValueDefault {} "=" k v);

     

       13
       12
        
           } cfg.settings);

     

       14
       13
        
         need_CAP_NET_BIND_SERVICE = cfg.settings.identd_port != 0 && cfg.settings.identd_port < 1024;

     

       15
       14
        
       in

+1 -1

nixos/modules/services/networking/cjdns.nix

···

       239
       239
        
             after = [ "network-online.target" ];

     

       240
       240
        
             bindsTo = [ "network-online.target" ];

     

       241
       241
        
       

     

       242
       242
       -
             preStart = if cfg.confFile != null then "" else ''

     

       242
       242
       +
             preStart = optionalString (cfg.confFile == null) ''

     

       243
       243
        
               [ -e /etc/cjdns.keys ] && source /etc/cjdns.keys

     

       244
       244
        
       

     

       245
       245
        
               if [ -z "$CJDNS_PRIVATE_KEY" ]; then

+2 -2

nixos/modules/services/networking/libreswan.nix

···

       14
       14
        
           nonchars = filter (x : !(elem x.value chars))

     

       15
       15
        
                      (imap0 (i: v: {ind = i; value = v;}) (stringToCharacters str));

     

       16
       16
        
         in

     

       17
       17
       -
           if length nonchars == 0 then ""

     

       18
       18
       -
           else substring (head nonchars).ind (add 1 (sub (last nonchars).ind (head nonchars).ind)) str;

     

       17
       17
       +
           lib.optionalString (length nonchars != 0)

     

       18
       18
       +
             (substring (head nonchars).ind (add 1 (sub (last nonchars).ind (head nonchars).ind)) str);

     

       19
       19
        
         indent = str: concatStrings (concatMap (s: ["  " (trim [" " "\t"] s) "\n"]) (splitString "\n" str));

     

       20
       20
        
         configText = indent (toString cfg.configSetup);

     

       21
       21
        
         connectionText = concatStrings (mapAttrsToList (n: v:

+10 -10

nixos/modules/services/networking/murmur.nix

···

       19
       19
        
           welcometext="${cfg.welcometext}"

     

       20
       20
        
           port=${toString cfg.port}

     

       21
       21
        
       

     

       22
       22
       -
           ${if cfg.hostName == "" then "" else "host="+cfg.hostName}

     

       23
       23
       -
           ${if cfg.password == "" then "" else "serverpassword="+cfg.password}

     

       22
       22
       +
           ${optionalString (cfg.hostName != "") "host=${cfg.hostName}"}

     

       23
       23
       +
           ${optionalString (cfg.password != "") "serverpassword=${cfg.password}"}

     

       24
       24
        
       

     

       25
       25
        
           bandwidth=${toString cfg.bandwidth}

     

       26
       26
        
           users=${toString cfg.users}

     
···

       32
       32
        
           bonjour=${boolToString cfg.bonjour}

     

       33
       33
        
           sendversion=${boolToString cfg.sendVersion}

     

       34
       34
        
       

     

       35
       35
       -
           ${if cfg.registerName     == "" then "" else "registerName="+cfg.registerName}

     

       36
       36
       -
           ${if cfg.registerPassword == "" then "" else "registerPassword="+cfg.registerPassword}

     

       37
       37
       -
           ${if cfg.registerUrl      == "" then "" else "registerUrl="+cfg.registerUrl}

     

       38
       38
       -
           ${if cfg.registerHostname == "" then "" else "registerHostname="+cfg.registerHostname}

     

       35
       35
       +
           ${optionalString (cfg.registerName != "") "registerName=${cfg.registerName}"}

     

       36
       36
       +
           ${optionalString (cfg.registerPassword == "") "registerPassword=${cfg.registerPassword}"}

     

       37
       37
       +
           ${optionalString (cfg.registerUrl != "") "registerUrl=${cfg.registerUrl}"}

     

       38
       38
       +
           ${optionalString (cfg.registerHostname != "") "registerHostname=${cfg.registerHostname}"}

     

       39
       39
        
       

     

       40
       40
        
           certrequired=${boolToString cfg.clientCertRequired}

     

       41
       41
       -
           ${if cfg.sslCert == "" then "" else "sslCert="+cfg.sslCert}

     

       42
       42
       -
           ${if cfg.sslKey  == "" then "" else "sslKey="+cfg.sslKey}

     

       43
       43
       -
           ${if cfg.sslCa   == "" then "" else "sslCA="+cfg.sslCa}

     

       41
       41
       +
           ${optionalString (cfg.sslCert != "") "sslCert=${cfg.sslCert}"}

     

       42
       42
       +
           ${optionalString (cfg.sslKey != "") "sslKey=${cfg.sslKey}"}

     

       43
       43
       +
           ${optionalString (cfg.sslCa != "") "sslCA=${cfg.sslCa}"}

     

       44
       44
        
       

     

       45
       45
       -
           ${lib.optionalString (cfg.dbus != null) "dbus=${cfg.dbus}"}

     

       45
       45
       +
           ${optionalString (cfg.dbus != null) "dbus=${cfg.dbus}"}

     

       46
       46
        
       

     

       47
       47
        
           ${cfg.extraConfig}

     

       48
       48
        
         '';

+2 -2

nixos/modules/services/networking/nsd.nix

···

       137
       137
        
         '';

     

       138
       138
        
       

     

       139
       139
        
         yesOrNo = b: if b then "yes" else "no";

     

       140
       140
       -
         maybeString = prefix: x: if x == null then "" else ''${prefix} "${x}"'';

     

       141
       141
       -
         maybeToString = prefix: x: if x == null then "" else ''${prefix} ${toString x}'';

     

       140
       140
       +
         maybeString = prefix: x: optionalString (x != null) ''${prefix} "${x}"'';

     

       141
       141
       +
         maybeToString = prefix: x: optionalString (x != null) ''${prefix} ${toString x}'';

     

       142
       142
        
         forEach = pre: l: concatMapStrings (x: pre + x + "\n") l;

     

       143
       143
        
       

     

       144
       144

+1 -3

nixos/modules/services/networking/ssh/lshd.nix

···

       165
       165
        
               ${lsh}/sbin/lshd --daemonic \

     

       166
       166
        
                 --password-helper="${lsh}/sbin/lsh-pam-checkpw" \

     

       167
       167
        
                 -p ${toString portNumber} \

     

       168
       168
       -
                 ${if interfaces == [] then ""

     

       169
       169
       -
                   else (concatStrings (map (i: "--interface=\"${i}\"")

     

       170
       170
       -
                                            interfaces))} \

     

       168
       168
       +
                 ${optionalString (interfaces != []) (concatStrings (map (i: "--interface=\"${i}\"") interfaces))} \

     

       171
       169
        
                 -h "${hostKey}" \

     

       172
       170
        
                 ${optionalString (!syslog) "--no-syslog" } \

     

       173
       171
        
                 ${if passwordAuthentication then "--password" else "--no-password" } \

+1 -1

nixos/modules/services/scheduling/fcron.nix

···

       6
       6
        
       

     

       7
       7
        
         cfg = config.services.fcron;

     

       8
       8
        
       

     

       9
       9
       -
         queuelen = if cfg.queuelen == null then "" else "-q ${toString cfg.queuelen}";

     

       9
       9
       +
         queuelen = optionalString (cfg.queuelen != null) "-q ${toString cfg.queuelen}";

     

       10
       10
        
       

     

       11
       11
        
         # Duplicate code, also found in cron.nix. Needs deduplication.

     

       12
       12
        
         systemCronJobs =

+1 -1

nixos/modules/services/web-apps/invidious.nix

···

       62
       62
        
               port = cfg.database.port;

     

       63
       63
        
               # Blank for unix sockets, see

     

       64
       64
        
               # https://github.com/will/crystal-pg/blob/1548bb255210/src/pq/conninfo.cr#L100-L108

     

       65
       65
       -
               host = if cfg.database.host == null then "" else cfg.database.host;

     

       65
       65
       +
               host = lib.optionalString (cfg.database.host != null) cfg.database.host;

     

       66
       66
        
               # Not needed because peer authentication is enabled

     

       67
       67
        
               password = lib.mkIf (cfg.database.host == null) "";

     

       68
       68
        
             };

+1 -1

nixos/modules/services/web-apps/invoiceplane.nix

···

       16
       16
        
           DB_HOSTNAME=${cfg.database.host}

     

       17
       17
        
           DB_USERNAME=${cfg.database.user}

     

       18
       18
        
           # NOTE: file_get_contents adds newline at the end of returned string

     

       19
       19
       -
           DB_PASSWORD=${if cfg.database.passwordFile == null then "" else "trim(file_get_contents('${cfg.database.passwordFile}'), \"\\r\\n\")"}

     

       19
       19
       +
           DB_PASSWORD=${optionalString (cfg.database.passwordFile != null) "trim(file_get_contents('${cfg.database.passwordFile}'), \"\\r\\n\")"}

     

       20
       20
        
           DB_DATABASE=${cfg.database.name}

     

       21
       21
        
           DB_PORT=${toString cfg.database.port}

     

       22
       22
        
           SESS_EXPIRATION=864000

+1 -1

nixos/modules/services/web-apps/peertube.nix

···

       350
       350
        
               };

     

       351
       351
        
               redis = {

     

       352
       352
        
                 hostname = "${toString cfg.redis.host}";

     

       353
       353
       -
                 port = (if cfg.redis.port == null then "" else cfg.redis.port);

     

       353
       353
       +
                 port = (lib.optionalString (cfg.redis.port != null) cfg.redis.port);

     

       354
       354
        
               };

     

       355
       355
        
               storage = {

     

       356
       356
        
                 tmp = lib.mkDefault "/var/lib/peertube/storage/tmp/";

+1 -1

nixos/modules/services/web-servers/lighttpd/cgit.nix

···

       4
       4
        
       

     

       5
       5
        
       let

     

       6
       6
        
         cfg = config.services.lighttpd.cgit;

     

       7
       7
       -
         pathPrefix = if stringLength cfg.subdir == 0 then "" else "/" + cfg.subdir;

     

       7
       7
       +
         pathPrefix = optionalString (stringLength cfg.subdir != 0) ("/" + cfg.subdir);

     

       8
       8
        
         configFile = pkgs.writeText "cgitrc"

     

       9
       9
        
           ''

     

       10
       10
        
             # default paths to static assets

+1 -1

nixos/modules/services/x11/desktop-managers/phosh.nix

···

       100
       100
        
           };

     

       101
       101
        
         };

     

       102
       102
        
       

     

       103
       103
       -
         optionalKV = k: v: if v == null then "" else "${k} = ${builtins.toString v}";

     

       103
       103
       +
         optionalKV = k: v: optionalString (v != null) "${k} = ${builtins.toString v}";

     

       104
       104
        
       

     

       105
       105
        
         renderPhocOutput = name: output: let

     

       106
       106
        
           modelines = if builtins.isList output.modeline

+3 -4

nixos/modules/system/boot/kernel_config.nix

···

       70
       70
        
             let

     

       71
       71
        
               val = if item.freeform != null then item.freeform else item.tristate;

     

       72
       72
        
             in

     

       73
       73
       -
               if val == null

     

       74
       74
       -
                 then ""

     

       75
       75
       -
                 else if (item.optional)

     

       73
       73
       +
               optionalString (val != null)

     

       74
       74
       +
                   (if (item.optional)

     

       76
       75
        
                   then "${key}? ${mkValue val}\n"

     

       77
       77
       -
                   else "${key} ${mkValue val}\n";

     

       76
       76
       +
                   else "${key} ${mkValue val}\n");

     

       78
       77
        
       

     

       79
       78
        
           mkConf = cfg: concatStrings (mapAttrsToList mkConfigLine cfg);

     

       80
       79
        
         in mkConf exprs;

+2 -2

nixos/modules/system/boot/loader/grub/grub.nix

···

       65
       65
        
               [ coreutils gnused gnugrep findutils diffutils btrfs-progs util-linux mdadm ]

     

       66
       66
        
               ++ optional cfg.efiSupport efibootmgr

     

       67
       67
        
               ++ optionals cfg.useOSProber [ busybox os-prober ]);

     

       68
       68
       -
             font = if cfg.font == null then ""

     

       69
       69
       -
               else (if lib.last (lib.splitString "." cfg.font) == "pf2"

     

       68
       68
       +
             font = lib.optionalString (cfg.font != null) (

     

       69
       69
       +
                    if lib.last (lib.splitString "." cfg.font) == "pf2"

     

       70
       70
        
                    then cfg.font

     

       71
       71
        
                    else "${convertedFont}");

     

       72
       72
        
           });

+1 -1

nixos/modules/system/boot/systemd/user.nix

···

       42
       42
        
       

     

       43
       43
        
         writeTmpfiles = { rules, user ? null }:

     

       44
       44
        
           let

     

       45
       45
       -
             suffix = if user == null then "" else "-${user}";

     

       45
       45
       +
             suffix = optionalString (user != null) "-${user}";

     

       46
       46
        
           in

     

       47
       47
        
           pkgs.writeTextFile {

     

       48
       48
        
             name = "nixos-user-tmpfiles.d${suffix}";

+4 -4

pkgs/applications/editors/texmacs/darwin.nix

···

       47
       47
        
       

     

       48
       48
        
         postInstall = "wrapProgram $out/Applications/TeXmacs-${version}/Contents/MacOS/TeXmacs --suffix PATH : " +

     

       49
       49
        
           "${ghostscript}/bin:" +

     

       50
       50
       -
           (if aspell == null then "" else "${aspell}/bin:") +

     

       51
       51
       -
           (if tex == null then "" else "${tex}/bin:") +

     

       52
       52
       -
           (if netpbm == null then "" else "${lib.getBin netpbm}/bin:") +

     

       53
       53
       -
           (if imagemagick == null then "" else "${imagemagick}/bin:");

     

       50
       50
       +
           (lib.optionalString (aspell != null) "${aspell}/bin:") +

     

       51
       51
       +
           (lib.optionalString (tex != null) "${tex}/bin:") +

     

       52
       52
       +
           (lib.optionalString (netpbm != null) "${lib.getBin netpbm}/bin:") +

     

       53
       53
       +
           (lib.optionalString (imagemagick != null) "${imagemagick}/bin:");

     

       54
       54
        
       

     

       55
       55
        
         enableParallelBuilding = true;

     

       56
       56

+1 -1

pkgs/applications/editors/vscode/vscodium.nix

···

       22
       22
        
           armv7l-linux = "0m1v24gg2dy79hgrz37gysgrazg8vkr1gkp52j6m6y76vi0l8249";

     

       23
       23
        
         }.${system} or throwSystem;

     

       24
       24
        
       

     

       25
       25
       -
         sourceRoot = if stdenv.isDarwin then "" else ".";

     

       25
       25
       +
         sourceRoot = lib.optionalString (!stdenv.isDarwin) ".";

     

       26
       26
        
       in

     

       27
       27
        
         callPackage ./generic.nix rec {

     

       28
       28
        
           inherit sourceRoot commandLineArgs useVSCodeRipgrep;

+1 -3

pkgs/applications/networking/browsers/chromium/default.nix

···

       134
       134
        
           };

     

       135
       135
        
         };

     

       136
       136
        
       

     

       137
       137
       -
         suffix = if (channel == "stable" || channel == "ungoogled-chromium")

     

       138
       138
       -
           then ""

     

       139
       139
       -
           else "-" + channel;

     

       137
       137
       +
         suffix = lib.optionalString (channel != "stable" && channel != "ungoogled-chromium") ("-" + channel);

     

       140
       138
        
       

     

       141
       139
        
         sandboxExecutableName = chromium.browser.passthru.sandboxExecutableName;

     

       142
       140

+2 -6

pkgs/applications/networking/browsers/microsoft-edge/browser.nix

···

       46
       46
        
                    then baseName

     

       47
       47
        
                    else baseName + "-" + channel;

     

       48
       48
        
       

     

       49
       49
       -
         iconSuffix = if channel == "stable"

     

       50
       50
       -
                      then ""

     

       51
       51
       -
                      else "_${channel}";

     

       49
       49
       +
         iconSuffix = lib.optionalString (channel != "stable") "_${channel}";

     

       52
       50
        
       

     

       53
       53
       -
         desktopSuffix = if channel == "stable"

     

       54
       54
       -
                         then ""

     

       55
       55
       -
                         else "-${channel}";

     

       51
       51
       +
         desktopSuffix = lib.optionalString (channel != "stable") "-${channel}";

     

       56
       52
        
       in

     

       57
       53
        
       

     

       58
       54
        
       stdenv.mkDerivation rec {

+1 -1

pkgs/applications/office/libreoffice/default.nix

···

       395
       395
        
         dontWrapQtApps = true;

     

       396
       396
        
       

     

       397
       397
        
         configureFlags = [

     

       398
       398
       -
           (if withHelp then "" else "--without-help")

     

       398
       398
       +
           (lib.optionalString (!withHelp) "--without-help")

     

       399
       399
        
           "--with-boost=${getDev boost}"

     

       400
       400
        
           "--with-boost-libdir=${getLib boost}/lib"

     

       401
       401
        
           "--with-beanshell-jar=${bsh}"

+1 -2

pkgs/applications/science/logic/hol_light/default.nix

···

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
         load_num =

     

       5
       5
       -
           if num == null then "" else

     

       6
       6
       -
           ''

     

       5
       5
       +
           lib.optionalString (num != null) ''

     

       7
       6
        
             -I ${num}/lib/ocaml/${ocaml.version}/site-lib/num \

     

       8
       7
        
             -I ${num}/lib/ocaml/${ocaml.version}/site-lib/top-num \

     

       9
       8
        
             -I ${num}/lib/ocaml/${ocaml.version}/site-lib/stublibs \

+1 -1

pkgs/applications/science/math/sage/sage-tests.nix

···

       19
       19
        
         runAllTests = files == null;

     

       20
       20
        
         testArgs = if runAllTests then "--all" else testFileList;

     

       21
       21
        
         patienceSpecifier = lib.optionalString longTests "--long";

     

       22
       22
       -
         timeSpecifier = if timeLimit == null then "" else "--short ${toString timeLimit}";

     

       22
       22
       +
         timeSpecifier = lib.optionalString (timeLimit != null) "--short ${toString timeLimit}";

     

       23
       23
        
         relpathToArg = relpath: lib.escapeShellArg "${src}/${relpath}"; # paths need to be absolute

     

       24
       24
        
         testFileList = lib.concatStringsSep " " (map relpathToArg files);

     

       25
       25
        
       in

+1 -1

pkgs/applications/version-management/sapling/default.nix

···

       38
       38
        
         #

     

       39
       39
        
         # See https://github.com/NixOS/nixpkgs/pull/198311#issuecomment-1326894295

     

       40
       40
        
         myCargoSetupHook = rustPlatform.cargoSetupHook.overrideAttrs (old: {

     

       41
       41
       -
           cargoConfig = if stdenv.isDarwin then "" else old.cargoConfig;

     

       41
       41
       +
           cargoConfig = lib.optionalString (!stdenv.isDarwin) old.cargoConfig;

     

       42
       42
        
         });

     

       43
       43
        
       

     

       44
       44
        
         src = fetchFromGitHub {

+1 -1

pkgs/applications/window-managers/sway/wrapper.nix

···

       28
       28
        
              export DBUS_SESSION_BUS_ADDRESS

     

       29
       29
        
              exec ${sway}/bin/sway "$@"

     

       30
       30
        
            else

     

       31
       31
       -
              exec ${if !dbusSupport then "" else "${dbus}/bin/dbus-run-session"} ${sway}/bin/sway "$@"

     

       31
       31
       +
              exec ${lib.optionalString dbusSupport "${dbus}/bin/dbus-run-session"} ${sway}/bin/sway "$@"

     

       32
       32
        
            fi

     

       33
       33
        
          '';

     

       34
       34
        
       in symlinkJoin {

+8 -8

pkgs/build-support/bintools-wrapper/default.nix

···

       59
       59
        
         bintoolsVersion = lib.getVersion bintools;

     

       60
       60
        
         bintoolsName = lib.removePrefix targetPrefix (lib.getName bintools);

     

       61
       61
        
       

     

       62
       62
       -
         libc_bin = if libc == null then "" else getBin libc;

     

       63
       63
       -
         libc_dev = if libc == null then "" else getDev libc;

     

       64
       64
       -
         libc_lib = if libc == null then "" else getLib libc;

     

       65
       65
       -
         bintools_bin = if nativeTools then "" else getBin bintools;

     

       62
       62
       +
         libc_bin = lib.optionalString (libc != null) (getBin libc);

     

       63
       63
       +
         libc_dev = lib.optionalString (libc != null) (getDev libc);

     

       64
       64
       +
         libc_lib = lib.optionalString (libc != null) (getLib libc);

     

       65
       65
       +
         bintools_bin = lib.optionalString (!nativeTools) (getBin bintools);

     

       66
       66
        
         # The wrapper scripts use 'cat' and 'grep', so we may need coreutils.

     

       67
       67
       -
         coreutils_bin = if nativeTools then "" else getBin coreutils;

     

       67
       67
       +
         coreutils_bin = lib.optionalString (!nativeTools) (getBin coreutils);

     

       68
       68
        
       

     

       69
       69
        
         # See description in cc-wrapper.

     

       70
       70
        
         suffixSalt = replaceStrings ["-" "."] ["_" "_"] targetPlatform.config;

     
···

       103
       103
        
       stdenv.mkDerivation {

     

       104
       104
        
         pname = targetPrefix

     

       105
       105
        
           + (if name != "" then name else "${bintoolsName}-wrapper");

     

       106
       106
       -
         version = if bintools == null then "" else bintoolsVersion;

     

       106
       106
       +
         version = lib.optionalString (bintools != null) bintoolsVersion;

     

       107
       107
        
       

     

       108
       108
        
         preferLocalBuild = true;

     

       109
       109
        
       

     
···

       265
       265
        
           # install the wrapper, you get tools like objdump (same for any

     

       266
       266
        
           # binaries of libc).

     

       267
       267
        
           + optionalString (!nativeTools) ''

     

       268
       268
       -
             printWords ${bintools_bin} ${if libc == null then "" else libc_bin} > $out/nix-support/propagated-user-env-packages

     

       268
       268
       +
             printWords ${bintools_bin} ${lib.optionalString (libc != null) libc_bin} > $out/nix-support/propagated-user-env-packages

     

       269
       269
        
           ''

     

       270
       270
        
       

     

       271
       271
        
           ##

     
···

       381
       381
        
           # for substitution in utils.bash

     

       382
       382
        
           expandResponseParams = "${expand-response-params}/bin/expand-response-params";

     

       383
       383
        
           shell = getBin shell + shell.shellPath or "";

     

       384
       384
       -
           gnugrep_bin = if nativeTools then "" else gnugrep;

     

       384
       384
       +
           gnugrep_bin = lib.optionalString (!nativeTools) gnugrep;

     

       385
       385
        
           wrapperName = "BINTOOLS_WRAPPER";

     

       386
       386
        
           inherit dynamicLinker targetPrefix suffixSalt coreutils_bin;

     

       387
       387
        
           inherit bintools_bin libc_bin libc_dev libc_lib;

+7 -7

pkgs/build-support/cc-wrapper/default.nix

···

       75
       75
        
         ccVersion = lib.getVersion cc;

     

       76
       76
        
         ccName = lib.removePrefix targetPrefix (lib.getName cc);

     

       77
       77
        
       

     

       78
       78
       -
         libc_bin = if libc == null then "" else getBin libc;

     

       79
       79
       -
         libc_dev = if libc == null then "" else getDev libc;

     

       80
       80
       -
         libc_lib = if libc == null then "" else getLib libc;

     

       78
       78
       +
         libc_bin = optionalString (libc != null) (getBin libc);

     

       79
       79
       +
         libc_dev = optionalString (libc != null) (getDev libc);

     

       80
       80
       +
         libc_lib = optionalString (libc != null) (getLib libc);

     

       81
       81
        
         cc_solib = getLib cc

     

       82
       82
        
           + optionalString (targetPlatform != hostPlatform) "/${targetPlatform.config}";

     

       83
       83
        
       

     

       84
       84
        
         # The wrapper scripts use 'cat' and 'grep', so we may need coreutils.

     

       85
       85
       -
         coreutils_bin = if nativeTools then "" else getBin coreutils;

     

       85
       85
       +
         coreutils_bin = optionalString (!nativeTools) (getBin coreutils);

     

       86
       86
        
       

     

       87
       87
        
         # The "suffix salt" is a arbitrary string added in the end of env vars

     

       88
       88
        
         # defined by cc-wrapper's hooks so that multiple cc-wrappers can be used

     
···

       164
       164
        
       stdenv.mkDerivation {

     

       165
       165
        
         pname = targetPrefix

     

       166
       166
        
           + (if name != "" then name else "${ccName}-wrapper");

     

       167
       167
       -
         version = if cc == null then "" else ccVersion;

     

       167
       167
       +
         version = optionalString (cc != null) ccVersion;

     

       168
       168
        
       

     

       169
       169
        
         preferLocalBuild = true;

     

       170
       170
        
       

     
···

       600
       600
        
           # for substitution in utils.bash

     

       601
       601
        
           expandResponseParams = "${expand-response-params}/bin/expand-response-params";

     

       602
       602
        
           shell = getBin shell + shell.shellPath or "";

     

       603
       603
       -
           gnugrep_bin = if nativeTools then "" else gnugrep;

     

       603
       603
       +
           gnugrep_bin = optionalString (!nativeTools) gnugrep;

     

       604
       604
        
           # stdenv.cc.cc should not be null and we have nothing better for now.

     

       605
       605
        
           # if the native impure bootstrap is gotten rid of this can become `inherit cc;` again.

     

       606
       606
       -
           cc = if nativeTools then "" else cc;

     

       606
       606
       +
           cc = optionalString (!nativeTools) cc;

     

       607
       607
        
           wrapperName = "CC_WRAPPER";

     

       608
       608
        
           inherit suffixSalt coreutils_bin bintools;

     

       609
       609
        
           inherit libc_bin libc_dev libc_lib;

+1 -1

pkgs/build-support/docker/default.nix

···

       594
       594
        
                 nativeBuildInputs = [ jshon pigz jq moreutils ];

     

       595
       595
        
                 # Image name must be lowercase

     

       596
       596
        
                 imageName = lib.toLower name;

     

       597
       597
       -
                 imageTag = if tag == null then "" else tag;

     

       597
       597
       +
                 imageTag = lib.optionalString (tag != null) tag;

     

       598
       598
        
                 inherit fromImage baseJson;

     

       599
       599
        
                 layerClosure = writeReferencesToFile layer;

     

       600
       600
        
                 passthru.buildArgs = args;

+1 -1

pkgs/build-support/fetchgithub/default.nix

···

       24
       24
        
           position = "${position.file}:${toString position.line}";

     

       25
       25
        
         };

     

       26
       26
        
         passthruAttrs = removeAttrs args [ "owner" "repo" "rev" "fetchSubmodules" "forceFetchGit" "private" "githubBase" "varPrefix" ];

     

       27
       27
       -
         varBase = "NIX${if varPrefix == null then "" else "_${varPrefix}"}_GITHUB_PRIVATE_";

     

       27
       27
       +
         varBase = "NIX${lib.optionalString (varPrefix != null) "_${varPrefix}"}_GITHUB_PRIVATE_";

     

       28
       28
        
         useFetchGit = fetchSubmodules || (leaveDotGit == true) || deepClone || forceFetchGit || (sparseCheckout != []);

     

       29
       29
        
         # We prefer fetchzip in cases we don't need submodules as the hash

     

       30
       30
        
         # is more stable in that case.

+1 -1

pkgs/build-support/kernel/make-initrd-ng.nix

···

       72
       72
        
         ${if makeUInitrd then "uInitrdCompression" else null} = uInitrdCompression;

     

       73
       73
        
       

     

       74
       74
        
         passAsFile = ["contents"];

     

       75
       75
       -
         contents = lib.concatMapStringsSep "\n" ({ object, symlink, ... }: "${object}\n${if symlink == null then "" else symlink}") contents + "\n";

     

       75
       75
       +
         contents = lib.concatMapStringsSep "\n" ({ object, symlink, ... }: "${object}\n${lib.optionalString (symlink != null) symlink}") contents + "\n";

     

       76
       76
        
       

     

       77
       77
        
         nativeBuildInputs = [makeInitrdNGTool cpio] ++ lib.optional makeUInitrd ubootTools ++ lib.optional strip binutils;

     

       78
       78

+1 -1

pkgs/build-support/nix-gitignore/default.nix

···

       66
       66
        
             handleSlashPrefix = l:

     

       67
       67
        
               let

     

       68
       68
        
                 split = (match "^(/?)(.*)" l);

     

       69
       69
       -
                 findSlash = l: if (match ".+/.+" l) != null then "" else l;

     

       69
       69
       +
                 findSlash = l: lib.optionalString ((match ".+/.+" l) == null) l;

     

       70
       70
        
                 hasSlash = mapAroundCharclass findSlash l != l;

     

       71
       71
        
               in

     

       72
       72
        
                 (if (elemAt split 0) == "/" || hasSlash

+1 -1

pkgs/build-support/rust/build-rust-crate/configure-crate.nix

···

       21
       21
        
       , verbose

     

       22
       22
        
       , workspace_member }:

     

       23
       23
        
       let version_ = lib.splitString "-" crateVersion;

     

       24
       24
       -
           versionPre = if lib.tail version_ == [] then "" else lib.elemAt version_ 1;

     

       24
       24
       +
           versionPre = lib.optionalString (lib.tail version_ != []) (lib.elemAt version_ 1);

     

       25
       25
        
           version = lib.splitVersion (lib.head version_);

     

       26
       26
        
           rustcOpts = lib.foldl' (opts: opt: opts + " " + opt)

     

       27
       27
        
               (if release then "-C opt-level=3" else "-C debuginfo=2")

+1 -1

pkgs/build-support/vm/default.nix

···

       468
       468
        
       

     

       469
       469
        
               echo "installing RPMs..."

     

       470
       470
        
               PATH=/usr/bin:/bin:/usr/sbin:/sbin $chroot /mnt \

     

       471
       471
       -
                 rpm -iv --nosignature ${if runScripts then "" else "--noscripts"} $rpms

     

       471
       471
       +
                 rpm -iv --nosignature ${lib.optionalString (!runScripts) "--noscripts"} $rpms

     

       472
       472
        
       

     

       473
       473
        
               echo "running post-install script..."

     

       474
       474
        
               eval "$postInstall"

+1 -1

pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix

···

       3
       3
        
       let

     

       4
       4
        
       

     

       5
       5
        
         common = { pname, sha256, suffix ? "" }: let

     

       6
       6
       -
           legacySuffix = if suffix == "-nons" then "" else "-ns";

     

       6
       6
       +
           legacySuffix = lib.optionalString (suffix != "-nons") "-ns";

     

       7
       7
        
           self = stdenv.mkDerivation rec {

     

       8
       8
        
             inherit pname;

     

       9
       9
        
             version = "1.79.2";

+1 -4

pkgs/development/compilers/purescript/purescript/default.nix

···

       7
       7
        
         dynamic-linker = stdenv.cc.bintools.dynamicLinker;

     

       8
       8
        
       

     

       9
       9
        
         patchelf = libPath :

     

       10
       10
       -
           if stdenv.isDarwin

     

       11
       11
       -
             then ""

     

       12
       12
       -
             else

     

       13
       13
       -
               ''

     

       10
       10
       +
           lib.optionalString (!stdenv.isDarwin) ''

     

       14
       11
        
                 chmod u+w $PURS

     

       15
       12
        
                 patchelf --interpreter ${dynamic-linker} --set-rpath ${libPath} $PURS

     

       16
       13
        
                 chmod u-w $PURS

+1 -1

pkgs/development/interpreters/acl2/libipasirglucose4/default.nix

···

       24
       24
        
       

     

       25
       25
        
         postBuild = ''

     

       26
       26
        
           $CXX -shared -o ${libname} \

     

       27
       27
       -
               ${if stdenv.cc.isClang then "" else "-Wl,-soname,${libname}"} \

     

       27
       27
       +
               ${lib.optionalString (!stdenv.cc.isClang) "-Wl,-soname,${libname}"} \

     

       28
       28
        
               ipasirglucoseglue.o libipasirglucose4.a

     

       29
       29
        
         '';

     

       30
       30

+1 -1

pkgs/development/interpreters/python/mk-python-derivation.nix

···

       118
       118
        
       

     

       119
       119
        
           optionalLocation = let

     

       120
       120
        
               pos = builtins.unsafeGetAttrPos (if attrs ? "pname" then "pname" else "name") attrs;

     

       121
       121
       -
             in if pos == null then "" else " at ${pos.file}:${toString pos.line}:${toString pos.column}";

     

       121
       121
       +
             in lib.optionalString (pos != null) " at ${pos.file}:${toString pos.line}:${toString pos.column}";

     

       122
       122
        
       

     

       123
       123
        
           leftPadName = name: against: let

     

       124
       124
        
               len = lib.max (lib.stringLength name) (lib.stringLength against);

+1 -1

pkgs/development/interpreters/python/wrapper.nix

···

       42
       42
        
                   if [ -f "$prg" ]; then

     

       43
       43
        
                     rm -f "$out/bin/$prg"

     

       44
       44
        
                     if [ -x "$prg" ]; then

     

       45
       45
       -
                       makeWrapper "$path/bin/$prg" "$out/bin/$prg" --set NIX_PYTHONPREFIX "$out" --set NIX_PYTHONEXECUTABLE ${pythonExecutable} --set NIX_PYTHONPATH ${pythonPath} ${if permitUserSite then "" else ''--set PYTHONNOUSERSITE "true"''} ${lib.concatStringsSep " " makeWrapperArgs}

     

       45
       45
       +
                       makeWrapper "$path/bin/$prg" "$out/bin/$prg" --set NIX_PYTHONPREFIX "$out" --set NIX_PYTHONEXECUTABLE ${pythonExecutable} --set NIX_PYTHONPATH ${pythonPath} ${lib.optionalString (!permitUserSite) ''--set PYTHONNOUSERSITE "true"''} ${lib.concatStringsSep " " makeWrapperArgs}

     

       46
       46
        
                     fi

     

       47
       47
        
                   fi

     

       48
       48
        
                 done

+1 -1

pkgs/development/libraries/ffmpeg/generic.nix

···

       330
       330
        
       assert buildSwscale -> buildAvutil;

     

       331
       331
        
       

     

       332
       332
        
       stdenv.mkDerivation (finalAttrs: {

     

       333
       333
       -
         pname = "ffmpeg" + (if ffmpegVariant == "small" then "" else "-${ffmpegVariant}");

     

       333
       333
       +
         pname = "ffmpeg" + (optionalString (ffmpegVariant != "small") "-${ffmpegVariant}");

     

       334
       334
        
         inherit version;

     

       335
       335
        
       

     

       336
       336
        
         src = fetchgit {

+1 -1

pkgs/development/libraries/opencv/tests.nix

···

       39
       39
        
           "stitching"

     

       40
       40
        
           "video"

     

       41
       41
        
         ] ++ lib.optionals (!stdenv.isAarch64 && enableGStreamer) [ "gapi" ];

     

       42
       42
       -
         testRunner = if stdenv.isDarwin then "" else "${lib.getExe xvfb-run} -a ";

     

       42
       42
       +
         testRunner = lib.optionalString (!stdenv.isDarwin) "${lib.getExe xvfb-run} -a ";

     

       43
       43
        
         testsPreparation = ''

     

       44
       44
        
           touch $out

     

       45
       45
        
           # several tests want a write access, so we have to copy files

+3 -3

pkgs/development/libraries/qt-4.x/4.8/default.nix

···

       173
       173
        
           "-make" "libs" "-make" "tools" "-make" "translations"

     

       174
       174
        
           "-no-phonon" "-no-webkit" "-no-multimedia" "-audio-backend"

     

       175
       175
        
         ]) ++ [

     

       176
       176
       -
           "-${if demos then "" else "no"}make" "demos"

     

       177
       177
       -
           "-${if examples then "" else "no"}make" "examples"

     

       178
       178
       -
           "-${if docs then "" else "no"}make" "docs"

     

       176
       176
       +
           "-${lib.optionalString (!demos) "no"}make" "demos"

     

       177
       177
       +
           "-${lib.optionalString (!examples) "no"}make" "examples"

     

       178
       178
       +
           "-${lib.optionalString (!docs) "no"}make" "docs"

     

       179
       179
        
         ] ++ lib.optional developerBuild "-developer-build"

     

       180
       180
        
           ++ lib.optionals stdenv.hostPlatform.isDarwin [ platformFlag "unsupported/macx-clang-libc++" ]

     

       181
       181
        
           ++ lib.optionals stdenv.hostPlatform.isWindows [ platformFlag "win32-g++-4.6" ];

+1 -2

pkgs/development/mobile/titaniumenv/build-app.nix

···

       158
       158
        
       

     

       159
       159
        
         installPhase = ''

     

       160
       160
        
           ${if target == "android" then ''

     

       161
       161
       -
             ${if release then ""

     

       162
       162
       -
             else ''

     

       161
       161
       +
             ${lib.optionalString (!release) ''

     

       163
       162
        
               cp "$(ls build/android/bin/*.apk | grep -v '\-unsigned.apk')" $out

     

       164
       163
        
             ''}

     

       165
       164

+1 -1

pkgs/development/python-modules/azure-common/default.nix

···

       23
       23
        
           azure-nspkg

     

       24
       24
        
         ] ++ lib.optionals (!isPy3k) [ setuptools ]; # need for namespace lookup

     

       25
       25
        
       

     

       26
       26
       -
         postInstall = if isPy3k then "" else ''

     

       26
       26
       +
         postInstall = lib.optionalString (!isPy3k) ''

     

       27
       27
        
           echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py

     

       28
       28
        
         '';

     

       29
       29

+1 -1

pkgs/development/python-modules/azure-mgmt-common/default.nix

···

       26
       26
        
           msrestazure

     

       27
       27
        
         ];

     

       28
       28
        
       

     

       29
       29
       -
         postInstall = if isPy3k then "" else ''

     

       29
       29
       +
         postInstall = pkgs.lib.optionalString (!isPy3k) ''

     

       30
       30
        
           echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py

     

       31
       31
        
           echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py

     

       32
       32
        
         '';

+1 -1

pkgs/development/python-modules/tensorflow/bin.nix

···

       53
       53
        
         disabled = pythonAtLeast "3.11";

     

       54
       54
        
       

     

       55
       55
        
         src = let

     

       56
       56
       -
           pyVerNoDot = lib.strings.stringAsChars (x: if x == "." then "" else x) python.pythonVersion;

     

       56
       56
       +
           pyVerNoDot = lib.strings.stringAsChars (x: lib.optionalString (x != ".") x) python.pythonVersion;

     

       57
       57
        
           platform = if stdenv.isDarwin then "mac" else "linux";

     

       58
       58
        
           unit = if cudaSupport then "gpu" else "cpu";

     

       59
       59
        
           key = "${platform}_py_${pyVerNoDot}_${unit}";

+6 -5

pkgs/development/ruby-modules/bundled-common/default.nix

···

       70
       70
        
             assert gemFiles.gemdir != null; "cp -a ${gemFiles.gemdir}/* $out/") #*/

     

       71
       71
        
         );

     

       72
       72
        
       

     

       73
       73
       -
         maybeCopyAll = pkgname: if pkgname == null then "" else

     

       74
       74
       -
         let

     

       75
       75
       -
           mainGem = gems.${pkgname} or (throw "bundlerEnv: gem ${pkgname} not found");

     

       76
       76
       -
         in

     

       77
       77
       -
           copyIfBundledByPath mainGem;

     

       73
       73
       +
         maybeCopyAll = pkgname: lib.optionalString (pkgname != null) (

     

       74
       74
       +
           let

     

       75
       75
       +
             mainGem = gems.${pkgname} or (throw "bundlerEnv: gem ${pkgname} not found");

     

       76
       76
       +
           in

     

       77
       77
       +
             copyIfBundledByPath mainGem

     

       78
       78
       +
         );

     

       78
       79
        
       

     

       79
       80
        
         # We have to normalize the Gemfile.lock, otherwise bundler tries to be

     

       80
       81
        
         # helpful by doing so at run time, causing executables to immediately bail

+1 -1

pkgs/development/ruby-modules/gem/default.nix

···

       224
       224
        
           pushd $out/${ruby.gemPath}

     

       225
       225
        
           find doc/ -iname created.rid -delete -print

     

       226
       226
        
           find gems/*/ext/ extensions/ \( -iname Makefile -o -iname mkmf.log -o -iname gem_make.out \) -delete -print

     

       227
       227
       -
           ${if keepGemCache then "" else "rm -fvr cache"}

     

       227
       227
       +
           ${lib.optionalString (!keepGemCache) "rm -fvr cache"}

     

       228
       228
        
           popd

     

       229
       229
        
       

     

       230
       230
        
           # write out metadata and binstubs

+1 -1

pkgs/development/tools/misc/distcc/default.nix

···

       26
       26
        
             configureFlagsArray=( CFLAGS="-O2 -fno-strict-aliasing"

     

       27
       27
        
                                   CXXFLAGS="-O2 -fno-strict-aliasing"

     

       28
       28
        
                 --mandir=$out/share/man

     

       29
       29
       -
                                   ${if sysconfDir == "" then "" else "--sysconfdir=${sysconfDir}"}

     

       29
       29
       +
                                   ${lib.optionalString (sysconfDir != "") "--sysconfdir=${sysconfDir}"}

     

       30
       30
        
                                   ${lib.optionalString static "LDFLAGS=-static"}

     

       31
       31
        
                                   ${lib.withFeature (static == true || popt == null) "included-popt"}

     

       32
       32
        
                                   ${lib.withFeature (avahi != null) "avahi"}

+3 -2

pkgs/os-specific/linux/kernel/manual-config.nix

···

       397
       397
        
         meta = {

     

       398
       398
        
           description =

     

       399
       399
        
             "The Linux kernel" +

     

       400
       400
       -
             (if kernelPatches == [] then "" else

     

       400
       400
       +
             (lib.optionalString (kernelPatches != []) (

     

       401
       401
        
               " (with patches: "

     

       402
       402
        
               + lib.concatStringsSep ", " (map (x: x.name) kernelPatches)

     

       403
       403
       -
               + ")");

     

       403
       403
       +
               + ")"

     

       404
       404
       +
             ));

     

       404
       405
        
           license = lib.licenses.gpl2Only;

     

       405
       406
        
           homepage = "https://www.kernel.org/";

     

       406
       407
        
           maintainers = lib.teams.linux-kernel.members ++ [