diff --git a/doc/hooks/udevCheckHook.section.md b/doc/hooks/udevCheckHook.section.md index 42ea097b530b..eb9e975c563f 100644 --- a/doc/hooks/udevCheckHook.section.md +++ b/doc/hooks/udevCheckHook.section.md @@ -10,7 +10,7 @@ The hook runs in `installCheckPhase`, requiring `doInstallCheck` is enabled for lib, stdenv, udevCheckHook, -# ... + # ... }: stdenv.mkDerivation (finalAttrs: { diff --git a/doc/hooks/versionCheckHook.section.md b/doc/hooks/versionCheckHook.section.md index f2fa14bb07a5..202492484dec 100644 --- a/doc/hooks/versionCheckHook.section.md +++ b/doc/hooks/versionCheckHook.section.md @@ -9,7 +9,7 @@ You use it like this: lib, stdenv, versionCheckHook, -# ... + # ... }: stdenv.mkDerivation (finalAttrs: { diff --git a/doc/languages-frameworks/nim.section.md b/doc/languages-frameworks/nim.section.md index 9e3c6716285b..ca35be4dee2e 100644 --- a/doc/languages-frameworks/nim.section.md +++ b/doc/languages-frameworks/nim.section.md @@ -112,7 +112,7 @@ For example, to propagate a dependency on SDL2 for lockfiles that select the Nim lib, # … SDL2, -# … + # … }: { diff --git a/lib/fileset/default.nix b/lib/fileset/default.nix index 32bc00a227b3..8cbc886fb4f6 100644 --- a/lib/fileset/default.nix +++ b/lib/fileset/default.nix @@ -191,7 +191,7 @@ in if isStringLike path then throw ''lib.fileset.maybeMissing: Argument ("${toString path}") is a string-like value, but it should be a path instead.'' else - throw ''lib.fileset.maybeMissing: Argument is of type ${typeOf path}, but it should be a path instead.'' + throw "lib.fileset.maybeMissing: Argument is of type ${typeOf path}, but it should be a path instead." else if !pathExists path then _emptyWithoutBase else @@ -443,7 +443,7 @@ in lib.fileset.toSource: `root` (${toString root}) is a string-like value, but it should be a path instead. Paths in strings are not supported by `lib.fileset`, use `lib.sources` or derivations instead.'' else - throw ''lib.fileset.toSource: `root` is of type ${typeOf root}, but it should be a path instead.'' + throw "lib.fileset.toSource: `root` is of type ${typeOf root}, but it should be a path instead." # Currently all Nix paths have the same filesystem root, but this could change in the future. # See also ../path/README.md else if !fileset._internalIsEmptyWithoutBase && rootFilesystemRoot != filesetFilesystemRoot then @@ -453,7 +453,7 @@ in `fileset`: Filesystem root is "${toString filesetFilesystemRoot}" Different filesystem roots are not supported.'' else if !pathExists root then - throw ''lib.fileset.toSource: `root` (${toString root}) is a path that does not exist.'' + throw "lib.fileset.toSource: `root` (${toString root}) is a path that does not exist." else if pathType root != "directory" then throw '' lib.fileset.toSource: `root` (${toString root}) is a file, but it should be a directory instead. Potential solutions: @@ -619,7 +619,7 @@ in unions = filesets: if !isList filesets then - throw ''lib.fileset.unions: Argument is of type ${typeOf filesets}, but it should be a list instead.'' + throw "lib.fileset.unions: Argument is of type ${typeOf filesets}, but it should be a list instead." else pipe filesets [ # Annotate the elements with context, used by _coerceMany for better errors @@ -808,16 +808,16 @@ in fileFilter = predicate: path: if !isFunction predicate then - throw ''lib.fileset.fileFilter: First argument is of type ${typeOf predicate}, but it should be a function instead.'' + throw "lib.fileset.fileFilter: First argument is of type ${typeOf predicate}, but it should be a function instead." else if !isPath path then if path._type or "" == "fileset" then throw '' lib.fileset.fileFilter: Second argument is a file set, but it should be a path instead. If you need to filter files in a file set, use `intersection fileset (fileFilter pred ./.)` instead.'' else - throw ''lib.fileset.fileFilter: Second argument is of type ${typeOf path}, but it should be a path instead.'' + throw "lib.fileset.fileFilter: Second argument is of type ${typeOf path}, but it should be a path instead." else if !pathExists path then - throw ''lib.fileset.fileFilter: Second argument (${toString path}) is a path that does not exist.'' + throw "lib.fileset.fileFilter: Second argument (${toString path}) is a path that does not exist." else _fileFilter predicate path; @@ -896,9 +896,9 @@ in lib.fileset.fromSource: The source origin of the argument is a string-like value ("${toString path}"), but it should be a path instead. Sources created from paths in strings cannot be turned into file sets, use `lib.sources` or derivations instead.'' else - throw ''lib.fileset.fromSource: The source origin of the argument is of type ${typeOf path}, but it should be a path instead.'' + throw "lib.fileset.fromSource: The source origin of the argument is of type ${typeOf path}, but it should be a path instead." else if !pathExists path then - throw ''lib.fileset.fromSource: The source origin (${toString path}) of the argument is a path that does not exist.'' + throw "lib.fileset.fromSource: The source origin (${toString path}) of the argument is a path that does not exist." else if isFiltered then _fromSourceFilter path source.filter else diff --git a/lib/fileset/internal.nix b/lib/fileset/internal.nix index 342b284e1f71..4579831c2e05 100644 --- a/lib/fileset/internal.nix +++ b/lib/fileset/internal.nix @@ -211,7 +211,7 @@ rec { ${context} ("${toString value}") is a string-like value, but it should be a file set or a path instead. Paths represented as strings are not supported by `lib.fileset`, use `lib.sources` or derivations instead.'' else - error ''${context} is of type ${typeOf value}, but it should be a file set or a path instead.'' + error "${context} is of type ${typeOf value}, but it should be a file set or a path instead." else if !pathExists value then error '' ${context} (${toString value}) is a path that does not exist. diff --git a/lib/path/default.nix b/lib/path/default.nix index 6736e7ab5beb..512d65d1978d 100644 --- a/lib/path/default.nix +++ b/lib/path/default.nix @@ -239,7 +239,7 @@ in # The subpath string to append subpath: assert assertMsg (isPath path) - ''lib.path.append: The first argument is of type ${builtins.typeOf path}, but a path was expected''; + "lib.path.append: The first argument is of type ${builtins.typeOf path}, but a path was expected"; assert assertMsg (isValid subpath) '' lib.path.append: Second argument is not a valid subpath string: ${subpathInvalidReason subpath}''; diff --git a/lib/tests/checkAndMergeCompat.nix b/lib/tests/checkAndMergeCompat.nix index f21c9789e8b6..422853dfe34e 100644 --- a/lib/tests/checkAndMergeCompat.nix +++ b/lib/tests/checkAndMergeCompat.nix @@ -331,7 +331,7 @@ in testAttrs = { expectedError = { type = "ThrownError"; - msg = ''A definition for option `foo' is not of type `string or signed integer convertible to it.*''; + msg = "A definition for option `foo' is not of type `string or signed integer convertible to it.*"; }; }; }; diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index 0a5c2ace0832..d4bdc344deb9 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -867,7 +867,7 @@ runTests { testEscapeNixIdentifierNoQuote = { expr = strings.escapeNixIdentifier "foo"; - expected = ''foo''; + expected = "foo"; }; testEscapeNixIdentifierNumber = { @@ -2634,7 +2634,7 @@ runTests { sections = { }; }; - expected = ''''; + expected = ""; }; testToINIWithGlobalSectionGlobalEmptyIsTheSameAsToINI = @@ -3002,12 +3002,12 @@ runTests { testToLuaEmptyAttrSet = { expr = generators.toLua { } { }; - expected = ''{}''; + expected = "{}"; }; testToLuaEmptyList = { expr = generators.toLua { } [ ]; - expected = ''{}''; + expected = "{}"; }; testToLuaListOfVariousTypes = { @@ -3052,7 +3052,7 @@ runTests { 41 43 ]; - expected = ''{ 41, 43 }''; + expected = "{ 41, 43 }"; }; testToLuaEmptyBindings = { diff --git a/lib/types.nix b/lib/types.nix index 1a98b12bd5ca..4a859694a6e8 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -1412,7 +1412,7 @@ rec { else if builtins.isBool v then boolToString v else - ''<${builtins.typeOf v}>''; + "<${builtins.typeOf v}>"; in mkOptionType rec { name = "enum"; diff --git a/modules/generic/meta-maintainers.nix b/modules/generic/meta-maintainers.nix index fb66174cf621..f9e8a19aea82 100644 --- a/modules/generic/meta-maintainers.nix +++ b/modules/generic/meta-maintainers.nix @@ -46,7 +46,7 @@ in maintainers = mkOption { type = listOfMaintainers; default = [ ]; - example = lib.literalExpression ''[ lib.maintainers.alice lib.maintainers.bob ]''; + example = lib.literalExpression "[ lib.maintainers.alice lib.maintainers.bob ]"; description = '' List of maintainers of each module. This option should be defined at most once per module. diff --git a/nixos/README-modular-services.md b/nixos/README-modular-services.md index f6e933173b2c..588ccaf6d1f7 100644 --- a/nixos/README-modular-services.md +++ b/nixos/README-modular-services.md @@ -82,7 +82,7 @@ Example: { stdenv, nixosTests, -# ... + # ... }: stdenv.mkDerivation (finalAttrs: { pname = "example"; diff --git a/nixos/doc/manual/shell.nix b/nixos/doc/manual/shell.nix index d8bf715b5e51..eb186b0f3e24 100644 --- a/nixos/doc/manual/shell.nix +++ b/nixos/doc/manual/shell.nix @@ -7,7 +7,7 @@ let common = import ./common.nix; inherit (common) outputPath indexPath; devmode = pkgs.devmode.override { - buildArgs = ''${toString ../../release.nix} -A manualHTML.${builtins.currentSystem}''; + buildArgs = "${toString ../../release.nix} -A manualHTML.${builtins.currentSystem}"; open = "/${outputPath}/${indexPath}"; }; nixos-render-docs-redirects = pkgs.writeShellScriptBin "redirects" ''${pkgs.lib.getExe pkgs.nixos-render-docs-redirects} --file '${toString ./redirects.json}' "$@"''; diff --git a/nixos/lib/make-multi-disk-zfs-image.nix b/nixos/lib/make-multi-disk-zfs-image.nix index 55e54b3b2f0d..69d05ab004f6 100644 --- a/nixos/lib/make-multi-disk-zfs-image.nix +++ b/nixos/lib/make-multi-disk-zfs-image.nix @@ -347,7 +347,7 @@ let --no-root-passwd \ --system ${config.system.build.toplevel} \ --substituters "" \ - ${lib.optionalString includeChannel ''--channel ${channelSources}''} + ${lib.optionalString includeChannel "--channel ${channelSources}"} df -h diff --git a/nixos/lib/make-single-disk-zfs-image.nix b/nixos/lib/make-single-disk-zfs-image.nix index dbd68a768847..7e47be6d00d9 100644 --- a/nixos/lib/make-single-disk-zfs-image.nix +++ b/nixos/lib/make-single-disk-zfs-image.nix @@ -330,7 +330,7 @@ let --no-root-passwd \ --system ${config.system.build.toplevel} \ --substituters "" \ - ${lib.optionalString includeChannel ''--channel ${channelSources}''} + ${lib.optionalString includeChannel "--channel ${channelSources}"} df -h diff --git a/nixos/lib/testing/nodes.nix b/nixos/lib/testing/nodes.nix index 1f562a5f4f26..721a3c88b369 100644 --- a/nixos/lib/testing/nodes.nix +++ b/nixos/lib/testing/nodes.nix @@ -164,7 +164,7 @@ in ''; type = types.bool; default = config.node.pkgs != null; - defaultText = literalExpression ''node.pkgs != null''; + defaultText = literalExpression "node.pkgs != null"; }; node.specialArgs = mkOption { diff --git a/nixos/lib/utils.nix b/nixos/lib/utils.nix index 5a3e09261059..0a1c2fe50cdd 100644 --- a/nixos/lib/utils.nix +++ b/nixos/lib/utils.nix @@ -410,7 +410,7 @@ let stringOrDefault (concatStringsSep " | " ( imap1 ( index: name: - ''${name} = ($ENV.secret${toString index}${optionalString (!secrets.${name}.quote) " | fromjson"})'' + "${name} = ($ENV.secret${toString index}${optionalString (!secrets.${name}.quote) " | fromjson"})" ) (attrNames secrets) )) "." ) diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index defde2707ae7..5efc19004afc 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -62,9 +62,9 @@ let "*" # password unset ]); - overrideOrderMutable = ''{option}`initialHashedPassword` -> {option}`initialPassword` -> {option}`hashedPassword` -> {option}`password` -> {option}`hashedPasswordFile`''; + overrideOrderMutable = "{option}`initialHashedPassword` -> {option}`initialPassword` -> {option}`hashedPassword` -> {option}`password` -> {option}`hashedPasswordFile`"; - overrideOrderImmutable = ''{option}`initialHashedPassword` -> {option}`hashedPassword` -> {option}`initialPassword` -> {option}`password` -> {option}`hashedPasswordFile`''; + overrideOrderImmutable = "{option}`initialHashedPassword` -> {option}`hashedPassword` -> {option}`initialPassword` -> {option}`password` -> {option}`hashedPasswordFile`"; overrideOrderText = isMutable: '' If the option {option}`users.mutableUsers` is diff --git a/nixos/modules/config/xdg/portal.nix b/nixos/modules/config/xdg/portal.nix index 617a342c1a70..eb4fbaebb8dd 100644 --- a/nixos/modules/config/xdg/portal.nix +++ b/nixos/modules/config/xdg/portal.nix @@ -37,7 +37,7 @@ in options.xdg.portal = { enable = - mkEnableOption ''[xdg desktop integration](https://github.com/flatpak/xdg-desktop-portal)'' + mkEnableOption "[xdg desktop integration](https://github.com/flatpak/xdg-desktop-portal)" // { default = false; }; diff --git a/nixos/modules/hardware/inputmodule.nix b/nixos/modules/hardware/inputmodule.nix index a563de4006dd..edef0d15e715 100644 --- a/nixos/modules/hardware/inputmodule.nix +++ b/nixos/modules/hardware/inputmodule.nix @@ -6,7 +6,7 @@ }: { - options.hardware.inputmodule.enable = lib.mkEnableOption ''Support for Framework input modules''; + options.hardware.inputmodule.enable = lib.mkEnableOption "Support for Framework input modules"; config = lib.mkIf config.hardware.inputmodule.enable { environment.systemPackages = [ pkgs.inputmodule-control ]; diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index 0e7f0f783b7b..4e107833f6f9 100644 --- a/nixos/modules/misc/nixpkgs.nix +++ b/nixos/modules/misc/nixpkgs.nix @@ -228,7 +228,7 @@ in cfg.hostPlatform # make identical, so that `==` equality works; see https://github.com/NixOS/nixpkgs/issues/278001 else elaborated; - defaultText = lib.literalExpression ''config.nixpkgs.hostPlatform''; + defaultText = lib.literalExpression "config.nixpkgs.hostPlatform"; description = '' Specifies the platform on which NixOS should be built. By default, NixOS is built on the system where it runs, but you can @@ -252,7 +252,7 @@ in # Make sure that the final value has all fields for sake of other modules # referring to this. TODO make `lib.systems` itself use the module system. apply = lib.systems.elaborate; - defaultText = lib.literalExpression ''config.nixpkgs.system''; + defaultText = lib.literalExpression "config.nixpkgs.system"; description = '' Systems with a recently generated `hardware-configuration.nix` do not need to specify this option, unless cross-compiling, in which case diff --git a/nixos/modules/misc/nixpkgs/read-only.nix b/nixos/modules/misc/nixpkgs/read-only.nix index fa372d13e545..88669bf78ef4 100644 --- a/nixos/modules/misc/nixpkgs/read-only.nix +++ b/nixos/modules/misc/nixpkgs/read-only.nix @@ -24,7 +24,7 @@ in nixpkgs = { pkgs = mkOption { type = lib.types.pkgs; - description = ''The pkgs module argument.''; + description = "The pkgs module argument."; }; config = mkOption { internal = true; diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix index 2a7c028a2b38..c563ce901dca 100644 --- a/nixos/modules/misc/version.nix +++ b/nixos/modules/misc/version.nix @@ -28,7 +28,7 @@ let escapeIfNecessary = s: if needsEscaping s then s else ''"${lib.escape [ "$" "\"" "\\" "`" ] s}"''; attrsToText = attrs: - concatStringsSep "\n" (mapAttrsToList (n: v: ''${n}=${escapeIfNecessary (toString v)}'') attrs) + concatStringsSep "\n" (mapAttrsToList (n: v: "${n}=${escapeIfNecessary (toString v)}") attrs) + "\n"; osReleaseContents = diff --git a/nixos/modules/programs/captive-browser.nix b/nixos/modules/programs/captive-browser.nix index 84eff22a4d34..15c4d6237c01 100644 --- a/nixos/modules/programs/captive-browser.nix +++ b/nixos/modules/programs/captive-browser.nix @@ -27,15 +27,15 @@ let chromium: concatStringsSep " " [ ''env XDG_CONFIG_HOME="$PREV_CONFIG_HOME"'' - ''${chromium}/bin/chromium'' - ''--user-data-dir=''${XDG_DATA_HOME:-$HOME/.local/share}/chromium-captive'' + "${chromium}/bin/chromium" + "--user-data-dir=\${XDG_DATA_HOME:-$HOME/.local/share}/chromium-captive" ''--proxy-server="socks5://$PROXY"'' ''--host-resolver-rules="MAP * ~NOTFOUND , EXCLUDE localhost"'' - ''--no-first-run'' - ''--new-window'' - ''--incognito'' - ''-no-default-browser-check'' - ''http://cache.nixos.org/'' + "--no-first-run" + "--new-window" + "--incognito" + "-no-default-browser-check" + "http://cache.nixos.org/" ]; desktopItem = pkgs.makeDesktopItem { diff --git a/nixos/modules/programs/nix-ld.nix b/nixos/modules/programs/nix-ld.nix index e41742ac7e0d..3277d5fd5b16 100644 --- a/nixos/modules/programs/nix-ld.nix +++ b/nixos/modules/programs/nix-ld.nix @@ -22,7 +22,7 @@ in { meta.maintainers = [ lib.maintainers.mic92 ]; options.programs.nix-ld = { - enable = lib.mkEnableOption ''nix-ld, Documentation: ''; + enable = lib.mkEnableOption "nix-ld, Documentation: "; package = lib.mkPackageOption pkgs "nix-ld" { }; libraries = lib.mkOption { type = lib.types.listOf lib.types.package; diff --git a/nixos/modules/security/apparmor.nix b/nixos/modules/security/apparmor.nix index d7e9ab7ab162..6b059c2bd522 100644 --- a/nixos/modules/security/apparmor.nix +++ b/nixos/modules/security/apparmor.nix @@ -154,7 +154,7 @@ in '' + lib.concatMapStrings (p: "Include ${p}/etc/apparmor.d\n") cfg.packages; # For aa-logprof - environment.etc."apparmor/apparmor.conf".text = ''''; + environment.etc."apparmor/apparmor.conf".text = ""; # For aa-logprof environment.etc."apparmor/severity.db".source = pkgs.apparmor-utils + "/etc/apparmor/severity.db"; environment.etc."apparmor/logprof.conf".source = diff --git a/nixos/modules/security/tpm2.nix b/nixos/modules/security/tpm2.nix index bc05c75669a3..44abf5a06410 100644 --- a/nixos/modules/security/tpm2.nix +++ b/nixos/modules/security/tpm2.nix @@ -290,12 +290,12 @@ in ] ( _: - ''${cfg.tctiEnvironment.interface}:${ + "${cfg.tctiEnvironment.interface}:${ if cfg.tctiEnvironment.interface == "tabrmd" then cfg.tctiEnvironment.tabrmdConf else cfg.tctiEnvironment.deviceConf - }'' + }" ) ); } diff --git a/nixos/modules/services/audio/mpd.nix b/nixos/modules/services/audio/mpd.nix index 1bf0723126ef..b6cbe78d414b 100644 --- a/nixos/modules/services/audio/mpd.nix +++ b/nixos/modules/services/audio/mpd.nix @@ -411,7 +411,7 @@ in lib.concatStringsSep "\n" ( lib.imap0 ( i: c: - ''${pkgs.replace-secret}/bin/replace-secret '{{password-${toString i}}}' '${c.passwordFile}' /run/mpd/mpd.conf'' + "${pkgs.replace-secret}/bin/replace-secret '{{password-${toString i}}}' '${c.passwordFile}' /run/mpd/mpd.conf" ) cfg.credentials ) ); diff --git a/nixos/modules/services/audio/mpdscribble.nix b/nixos/modules/services/audio/mpdscribble.nix index cd874f000b3a..0be358f93fbd 100644 --- a/nixos/modules/services/audio/mpdscribble.nix +++ b/nixos/modules/services/audio/mpdscribble.nix @@ -64,7 +64,7 @@ let secretFile: placeholder: targetFile: lib.optionalString ( secretFile != null - ) ''${pkgs.replace-secret}/bin/replace-secret '${placeholder}' '${secretFile}' '${targetFile}' ''; + ) "${pkgs.replace-secret}/bin/replace-secret '${placeholder}' '${secretFile}' '${targetFile}' "; preStart = pkgs.writeShellScript "mpdscribble-pre-start" '' cp -f "${cfgTemplate}" "${cfgFile}" diff --git a/nixos/modules/services/audio/pulseaudio.nix b/nixos/modules/services/audio/pulseaudio.nix index d6afa095fc3e..214fb0e56139 100644 --- a/nixos/modules/services/audio/pulseaudio.nix +++ b/nixos/modules/services/audio/pulseaudio.nix @@ -35,7 +35,7 @@ let let a = cfg.tcp.anonymousClients.allowedIpRanges; in - lib.optional (a != [ ]) ''auth-ip-acl=${lib.concatStringsSep ";" a}''; + lib.optional (a != [ ]) "auth-ip-acl=${lib.concatStringsSep ";" a}"; port = lib.optional (!(isNull cfg.tcp.port)) "port=${toString cfg.tcp.port}"; in pkgs.writeTextFile { diff --git a/nixos/modules/services/backup/restic.nix b/nixos/modules/services/backup/restic.nix index 63d35d7583de..c95f7cb16713 100644 --- a/nixos/modules/services/backup/restic.nix +++ b/nixos/modules/services/backup/restic.nix @@ -255,7 +255,7 @@ in runCheck = lib.mkOption { type = lib.types.bool; default = builtins.length config.services.restic.backups.${name}.checkOpts > 0; - defaultText = lib.literalExpression ''builtins.length config.services.backups.${name}.checkOpts > 0''; + defaultText = lib.literalExpression "builtins.length config.services.backups.${name}.checkOpts > 0"; description = "Whether to run the `check` command with the provided `checkOpts` options."; example = true; }; diff --git a/nixos/modules/services/backup/syncoid.nix b/nixos/modules/services/backup/syncoid.nix index beaa18c29680..4fda57e8214c 100644 --- a/nixos/modules/services/backup/syncoid.nix +++ b/nixos/modules/services/backup/syncoid.nix @@ -240,7 +240,7 @@ in ''; }; - recursive = lib.mkEnableOption ''the transfer of child datasets''; + recursive = lib.mkEnableOption "the transfer of child datasets"; sshKey = lib.mkOption { type = with lib.types; nullOr (coercedTo path toString str); diff --git a/nixos/modules/services/blockchain/ethereum/lighthouse.nix b/nixos/modules/services/blockchain/ethereum/lighthouse.nix index 247174028adc..8c683f212161 100644 --- a/nixos/modules/services/blockchain/ethereum/lighthouse.nix +++ b/nixos/modules/services/blockchain/ethereum/lighthouse.nix @@ -246,8 +246,8 @@ in --datadir ${cfg.beacon.dataDir}/${cfg.network} \ --execution-endpoint http://${cfg.beacon.execution.address}:${toString cfg.beacon.execution.port} \ --execution-jwt ''${CREDENTIALS_DIRECTORY}/LIGHTHOUSE_JWT \ - ${lib.optionalString cfg.beacon.http.enable ''--http --http-address ${cfg.beacon.http.address} --http-port ${toString cfg.beacon.http.port}''} \ - ${lib.optionalString cfg.beacon.metrics.enable ''--metrics --metrics-address ${cfg.beacon.metrics.address} --metrics-port ${toString cfg.beacon.metrics.port}''} \ + ${lib.optionalString cfg.beacon.http.enable "--http --http-address ${cfg.beacon.http.address} --http-port ${toString cfg.beacon.http.port}"} \ + ${lib.optionalString cfg.beacon.metrics.enable "--metrics --metrics-address ${cfg.beacon.metrics.address} --metrics-port ${toString cfg.beacon.metrics.port}"} \ ${cfg.extraArgs} ${cfg.beacon.extraArgs} ''; serviceConfig = { @@ -292,7 +292,7 @@ in --network ${cfg.network} \ --beacon-nodes ${lib.concatStringsSep "," cfg.validator.beaconNodes} \ --datadir ${cfg.validator.dataDir}/${cfg.network} \ - ${lib.optionalString cfg.validator.metrics.enable ''--metrics --metrics-address ${cfg.validator.metrics.address} --metrics-port ${toString cfg.validator.metrics.port}''} \ + ${lib.optionalString cfg.validator.metrics.enable "--metrics --metrics-address ${cfg.validator.metrics.address} --metrics-port ${toString cfg.validator.metrics.port}"} \ ${cfg.extraArgs} ${cfg.validator.extraArgs} ''; diff --git a/nixos/modules/services/cluster/kubernetes/flannel.nix b/nixos/modules/services/cluster/kubernetes/flannel.nix index cc1cc0b9574a..0a7a7496f26a 100644 --- a/nixos/modules/services/cluster/kubernetes/flannel.nix +++ b/nixos/modules/services/cluster/kubernetes/flannel.nix @@ -17,7 +17,7 @@ in enable = lib.mkEnableOption "flannel networking"; openFirewallPorts = lib.mkOption { - description = ''Whether to open the Flannel UDP ports in the firewall on all interfaces.''; + description = "Whether to open the Flannel UDP ports in the firewall on all interfaces."; type = lib.types.bool; default = true; }; diff --git a/nixos/modules/services/continuous-integration/buildbot/master.nix b/nixos/modules/services/continuous-integration/buildbot/master.nix index 569709373376..42e88e9ddbe3 100644 --- a/nixos/modules/services/continuous-integration/buildbot/master.nix +++ b/nixos/modules/services/continuous-integration/buildbot/master.nix @@ -116,7 +116,7 @@ in type = lib.types.path; description = "Optionally pass master.cfg path. Other options in this configuration will be ignored."; default = defaultMasterCfg; - defaultText = lib.literalMD ''generated configuration file''; + defaultText = lib.literalMD "generated configuration file"; example = "/etc/nixos/buildbot/master.cfg"; }; diff --git a/nixos/modules/services/continuous-integration/gitlab-runner/runner.nix b/nixos/modules/services/continuous-integration/gitlab-runner/runner.nix index 8361ce7f71d4..b95d30ceea4a 100644 --- a/nixos/modules/services/continuous-integration/gitlab-runner/runner.nix +++ b/nixos/modules/services/continuous-integration/gitlab-runner/runner.nix @@ -728,7 +728,7 @@ in mapAttrsToList ( name: serviceConfig: - ''`services.gitlab-runner.services.${name}.protected` with runner authentication tokens has no effect and will be ignored. Please remove it from your configuration.'' + "`services.gitlab-runner.services.${name}.protected` with runner authentication tokens has no effect and will be ignored. Please remove it from your configuration." ) ( filterAttrs ( @@ -740,7 +740,7 @@ in mapAttrsToList ( name: serviceConfig: - ''`services.gitlab-runner.services.${name}.runUntagged` with runner authentication tokens has no effect and will be ignored. Please remove it from your configuration.'' + "`services.gitlab-runner.services.${name}.runUntagged` with runner authentication tokens has no effect and will be ignored. Please remove it from your configuration." ) ( filterAttrs ( @@ -752,7 +752,7 @@ in mapAttrsToList ( name: v: - ''`services.gitlab-runner.services.${name}.maximumTimeout` with runner authentication tokens has no effect and will be ignored. Please remove it from your configuration.'' + "`services.gitlab-runner.services.${name}.maximumTimeout` with runner authentication tokens has no effect and will be ignored. Please remove it from your configuration." ) ( filterAttrs ( @@ -764,7 +764,7 @@ in mapAttrsToList ( name: v: - ''`services.gitlab-runner.services.${name}.tagList` with runner authentication tokens has no effect and will be ignored. Please remove it from your configuration.'' + "`services.gitlab-runner.services.${name}.tagList` with runner authentication tokens has no effect and will be ignored. Please remove it from your configuration." ) ( filterAttrs ( diff --git a/nixos/modules/services/continuous-integration/gocd-agent/default.nix b/nixos/modules/services/continuous-integration/gocd-agent/default.nix index 7e4fd63b19f5..ed2826951910 100644 --- a/nixos/modules/services/continuous-integration/gocd-agent/default.nix +++ b/nixos/modules/services/continuous-integration/gocd-agent/default.nix @@ -191,7 +191,7 @@ in // { NIX_REMOTE = "daemon"; AGENT_WORK_DIR = cfg.workDir; - AGENT_STARTUP_ARGS = ''${lib.concatStringsSep " " cfg.startupOptions}''; + AGENT_STARTUP_ARGS = "${lib.concatStringsSep " " cfg.startupOptions}"; LOG_DIR = cfg.workDir; LOG_FILE = "${cfg.workDir}/go-agent-start.log"; } diff --git a/nixos/modules/services/databases/couchdb.nix b/nixos/modules/services/databases/couchdb.nix index 46de0df0ee61..1c261fcf4aa0 100644 --- a/nixos/modules/services/databases/couchdb.nix +++ b/nixos/modules/services/databases/couchdb.nix @@ -205,10 +205,10 @@ in ''; environment = { - ERL_FLAGS = ''-couch_ini ${lib.concatStringsSep " " configFiles}''; + ERL_FLAGS = "-couch_ini ${lib.concatStringsSep " " configFiles}"; # 5. the vm.args file - COUCHDB_ARGS_FILE = ''${cfg.argsFile}''; - HOME = ''${cfg.databaseDir}''; + COUCHDB_ARGS_FILE = "${cfg.argsFile}"; + HOME = "${cfg.databaseDir}"; }; serviceConfig = { diff --git a/nixos/modules/services/databases/influxdb2.nix b/nixos/modules/services/databases/influxdb2.nix index 18b183d65c01..2797a55a0023 100644 --- a/nixos/modules/services/databases/influxdb2.nix +++ b/nixos/modules/services/databases/influxdb2.nix @@ -312,7 +312,7 @@ in settings = mkOption { default = { }; - description = ''configuration options for influxdb2, see for details.''; + description = "configuration options for influxdb2, see for details."; type = format.type; }; diff --git a/nixos/modules/services/development/athens.nix b/nixos/modules/services/development/athens.nix index 984b4a9ecc52..4ef38dee65a2 100644 --- a/nixos/modules/services/development/athens.nix +++ b/nixos/modules/services/development/athens.nix @@ -272,7 +272,7 @@ in filterFile = lib.mkOption { type = lib.types.nullOr lib.types.path; - description = ''Filename for the include exclude filter.''; + description = "Filename for the include exclude filter."; default = null; example = lib.literalExpression '' pkgs.writeText "filterFile" ''' @@ -285,7 +285,7 @@ in robotsFile = lib.mkOption { type = lib.types.nullOr lib.types.path; - description = ''Provides /robots.txt for net crawlers.''; + description = "Provides /robots.txt for net crawlers."; default = null; example = lib.literalExpression ''pkgs.writeText "robots.txt" "# my custom robots.txt ..."''; }; @@ -956,7 +956,7 @@ in serviceConfig = { Restart = "on-abnormal"; Nice = 5; - ExecStart = ''${cfg.package}/bin/athens -config_file=${configFile}''; + ExecStart = "${cfg.package}/bin/athens -config_file=${configFile}"; KillMode = "mixed"; KillSignal = "SIGINT"; diff --git a/nixos/modules/services/games/freeciv.nix b/nixos/modules/services/games/freeciv.nix index ad9b9d2101d1..08eea105aa32 100644 --- a/nixos/modules/services/games/freeciv.nix +++ b/nixos/modules/services/games/freeciv.nix @@ -47,7 +47,7 @@ in { options = { services.freeciv = { - enable = lib.mkEnableOption ''freeciv''; + enable = lib.mkEnableOption "freeciv"; settings = lib.mkOption { description = '' Parameters of freeciv-server. diff --git a/nixos/modules/services/hardware/actkbd.nix b/nixos/modules/services/hardware/actkbd.nix index 73bc586451e6..2f2c77c19981 100644 --- a/nixos/modules/services/hardware/actkbd.nix +++ b/nixos/modules/services/hardware/actkbd.nix @@ -17,9 +17,9 @@ let command, ... }: - ''${ + "${ lib.concatMapStringsSep "+" toString keys - }:${lib.concatStringsSep "," events}:${lib.concatStringsSep "," attributes}:${command}'' + }:${lib.concatStringsSep "," events}:${lib.concatStringsSep "," attributes}:${command}" ) cfg.bindings} ${cfg.extraConfig} ''; diff --git a/nixos/modules/services/hardware/amdgpu.nix b/nixos/modules/services/hardware/amdgpu.nix index 0958ef58b4b0..5c98a0db50ad 100644 --- a/nixos/modules/services/hardware/amdgpu.nix +++ b/nixos/modules/services/hardware/amdgpu.nix @@ -23,7 +23,7 @@ in ''; overdrive = { - enable = lib.mkEnableOption ''`amdgpu` overdrive mode for overclocking''; + enable = lib.mkEnableOption "`amdgpu` overdrive mode for overclocking"; ppfeaturemask = lib.mkOption { type = lib.types.str; @@ -39,7 +39,7 @@ in }; }; - opencl.enable = lib.mkEnableOption ''OpenCL support using ROCM runtime library''; + opencl.enable = lib.mkEnableOption "OpenCL support using ROCM runtime library"; }; config = { diff --git a/nixos/modules/services/hardware/keyd.nix b/nixos/modules/services/hardware/keyd.nix index db48e19dde4f..53fa97484ec6 100644 --- a/nixos/modules/services/hardware/keyd.nix +++ b/nixos/modules/services/hardware/keyd.nix @@ -65,10 +65,10 @@ in { imports = [ (lib.mkRemovedOptionModule [ "services" "keyd" "ids" ] - ''Use keyboards..ids instead. If you don't need a multi-file configuration, just add keyboards.default before the ids. See https://github.com/NixOS/nixpkgs/pull/243271.'' + "Use keyboards..ids instead. If you don't need a multi-file configuration, just add keyboards.default before the ids. See https://github.com/NixOS/nixpkgs/pull/243271." ) (lib.mkRemovedOptionModule [ "services" "keyd" "settings" ] - ''Use keyboards..settings instead. If you don't need a multi-file configuration, just add keyboards.default before the settings. See https://github.com/NixOS/nixpkgs/pull/243271.'' + "Use keyboards..settings instead. If you don't need a multi-file configuration, just add keyboards.default before the settings. See https://github.com/NixOS/nixpkgs/pull/243271." ) ]; diff --git a/nixos/modules/services/hardware/nvidia-container-toolkit/default.nix b/nixos/modules/services/hardware/nvidia-container-toolkit/default.nix index abcacf917cca..965ba4e4be3b 100644 --- a/nixos/modules/services/hardware/nvidia-container-toolkit/default.nix +++ b/nixos/modules/services/hardware/nvidia-container-toolkit/default.nix @@ -198,7 +198,7 @@ assertion = ((builtins.length config.hardware.nvidia-container-toolkit.csv-files) > 0) -> config.hardware.nvidia-container-toolkit.discovery-mode == "csv"; - message = ''When CSV files are provided, `config.hardware.nvidia-container-toolkit.discovery-mode` has to be set to `csv`.''; + message = "When CSV files are provided, `config.hardware.nvidia-container-toolkit.discovery-mode` has to be set to `csv`."; } ]; diff --git a/nixos/modules/services/hardware/triggerhappy.nix b/nixos/modules/services/hardware/triggerhappy.nix index 5e66afea9ea6..bb7d4f0febeb 100644 --- a/nixos/modules/services/hardware/triggerhappy.nix +++ b/nixos/modules/services/hardware/triggerhappy.nix @@ -18,7 +18,7 @@ let cmd, ... }: - ''${lib.concatMapStringsSep "+" (x: "KEY_" + x) keys} ${ + "${lib.concatMapStringsSep "+" (x: "KEY_" + x) keys} ${ toString { press = 1; @@ -26,7 +26,7 @@ let release = 0; } .${event} - } ${cmd}'' + } ${cmd}" ) cfg.bindings} ${cfg.extraConfig} ''; diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix index 94e92d233786..af91440c6a3f 100644 --- a/nixos/modules/services/mail/dovecot.nix +++ b/nixos/modules/services/mail/dovecot.nix @@ -134,7 +134,7 @@ let ssl_cert = <${cfg.sslServerCert} ssl_key = <${cfg.sslServerKey} ${optionalString (cfg.sslCACert != null) ("ssl_ca = <" + cfg.sslCACert)} - ${optionalString cfg.enableDHE ''ssl_dh = <${config.security.dhparams.params.dovecot2.path}''} + ${optionalString cfg.enableDHE "ssl_dh = <${config.security.dhparams.params.dovecot2.path}"} disable_plaintext_auth = yes '' ) diff --git a/nixos/modules/services/mail/maddy.nix b/nixos/modules/services/mail/maddy.nix index b086f319c136..0bd3a0c2bd99 100644 --- a/nixos/modules/services/mail/maddy.nix +++ b/nixos/modules/services/mail/maddy.nix @@ -176,7 +176,7 @@ in hostname = lib.mkOption { default = "localhost"; type = with lib.types; uniq str; - example = ''example.com''; + example = "example.com"; description = '' Hostname to use. It should be FQDN. ''; @@ -185,7 +185,7 @@ in primaryDomain = lib.mkOption { default = "localhost"; type = with lib.types; uniq str; - example = ''mail.example.com''; + example = "mail.example.com"; description = '' Primary MX domain to use. It should be FQDN. ''; diff --git a/nixos/modules/services/mail/postgrey.nix b/nixos/modules/services/mail/postgrey.nix index 67a97f6a244f..62ba64fcaaa1 100644 --- a/nixos/modules/services/mail/postgrey.nix +++ b/nixos/modules/services/mail/postgrey.nix @@ -202,9 +202,9 @@ in if cfg.socket ? path then "--unix=${cfg.socket.path} --socketmode=${cfg.socket.mode}" else - ''--inet=${ + "--inet=${ optionalString (cfg.socket.addr != null) (cfg.socket.addr + ":") - }${toString cfg.socket.port}''; + }${toString cfg.socket.port}"; in { description = "Postfix Greylisting Service"; diff --git a/nixos/modules/services/matrix/mjolnir.nix b/nixos/modules/services/matrix/mjolnir.nix index ab6b580b5ef9..27a7b1c3ea82 100644 --- a/nixos/modules/services/matrix/mjolnir.nix +++ b/nixos/modules/services/matrix/mjolnir.nix @@ -223,7 +223,7 @@ in wantedBy = [ "multi-user.target" ]; serviceConfig = { - ExecStart = ''${pkgs.mjolnir}/bin/mjolnir --mjolnir-config ./config/default.yaml''; + ExecStart = "${pkgs.mjolnir}/bin/mjolnir --mjolnir-config ./config/default.yaml"; ExecStartPre = [ generateConfig ]; WorkingDirectory = cfg.dataPath; StateDirectory = "mjolnir"; diff --git a/nixos/modules/services/matrix/pantalaimon.nix b/nixos/modules/services/matrix/pantalaimon.nix index 120baab41fb0..edab3dbf39e4 100644 --- a/nixos/modules/services/matrix/pantalaimon.nix +++ b/nixos/modules/services/matrix/pantalaimon.nix @@ -40,7 +40,7 @@ let wantedBy = [ "multi-user.target" ]; serviceConfig = { - ExecStart = ''${pkgs.pantalaimon-headless}/bin/pantalaimon --config ${mkConfigFile name instanceConfig} --data-path ${instanceConfig.dataPath}''; + ExecStart = "${pkgs.pantalaimon-headless}/bin/pantalaimon --config ${mkConfigFile name instanceConfig} --data-path ${instanceConfig.dataPath}"; Restart = "on-failure"; DynamicUser = true; NoNewPrivileges = true; diff --git a/nixos/modules/services/matrix/synapse-auto-compressor.nix b/nixos/modules/services/matrix/synapse-auto-compressor.nix index 6dcb3af8d600..7c531490ca6f 100644 --- a/nixos/modules/services/matrix/synapse-auto-compressor.nix +++ b/nixos/modules/services/matrix/synapse-auto-compressor.nix @@ -37,9 +37,9 @@ in args = synapseConfig.settings.database.args; in if synapseConfig.enable then - ''postgresql://${args.user}${lib.optionalString (args ? password) (":" + args.password)}@${ + "postgresql://${args.user}${lib.optionalString (args ? password) (":" + args.password)}@${ lib.escapeURL (if (args ? host) then args.host else "/run/postgresql") - }${lib.optionalString (args ? port) (":" + args.port)}/${args.database}'' + }${lib.optionalString (args ? port) (":" + args.port)}/${args.database}" else null; defaultText = lib.literalExpression '' diff --git a/nixos/modules/services/misc/anki-sync-server.nix b/nixos/modules/services/misc/anki-sync-server.nix index 908adbf74e76..f5e7d10bd7c9 100644 --- a/nixos/modules/services/misc/anki-sync-server.nix +++ b/nixos/modules/services/misc/anki-sync-server.nix @@ -31,7 +31,7 @@ let # export passwords in environment variables in plaintext. ${concatMapStringsSep "\n" ( x: - ''export SYNC_USER${toString x.i}=${escapeShellArg x.user.username}:${escapeShellArg x.user.password}'' + "export SYNC_USER${toString x.i}=${escapeShellArg x.user.username}:${escapeShellArg x.user.password}" ) usersWithIndexesNoFile} exec ${lib.getExe cfg.package} ''; diff --git a/nixos/modules/services/misc/apache-kafka.nix b/nixos/modules/services/misc/apache-kafka.nix index 1937be8a26b6..5b52ee478560 100644 --- a/nixos/modules/services/misc/apache-kafka.nix +++ b/nixos/modules/services/misc/apache-kafka.nix @@ -166,15 +166,15 @@ in imports = [ (lib.mkRenamedOptionModule [ "services" "apache-kafka" "brokerId" ] - [ "services" "apache-kafka" "settings" ''broker.id'' ] + [ "services" "apache-kafka" "settings" "broker.id" ] ) (lib.mkRenamedOptionModule [ "services" "apache-kafka" "logDirs" ] - [ "services" "apache-kafka" "settings" ''log.dirs'' ] + [ "services" "apache-kafka" "settings" "log.dirs" ] ) (lib.mkRenamedOptionModule [ "services" "apache-kafka" "zookeeper" ] - [ "services" "apache-kafka" "settings" ''zookeeper.connect'' ] + [ "services" "apache-kafka" "settings" "zookeeper.connect" ] ) (lib.mkRemovedOptionModule [ diff --git a/nixos/modules/services/misc/autosuspend.nix b/nixos/modules/services/misc/autosuspend.nix index 53f872d3e040..fed0e2c9a06a 100644 --- a/nixos/modules/services/misc/autosuspend.nix +++ b/nixos/modules/services/misc/autosuspend.nix @@ -136,7 +136,7 @@ in ''; }; wakeup_cmd = mkOption { - default = ''sh -c 'echo 0 > /sys/class/rtc/rtc0/wakealarm && echo {timestamp:.0f} > /sys/class/rtc/rtc0/wakealarm' ''; + default = "sh -c 'echo 0 > /sys/class/rtc/rtc0/wakealarm && echo {timestamp:.0f} > /sys/class/rtc/rtc0/wakealarm' "; type = with types; str; description = '' The command to execute for scheduling a wake up of the system. The given string is @@ -232,7 +232,7 @@ in after = [ "network.target" ]; path = flatten (attrValues (filterAttrs (n: _: hasCheck n) dependenciesForChecks)); serviceConfig = { - ExecStart = ''${autosuspend}/bin/autosuspend -l ${autosuspend}/etc/autosuspend-logging.conf -c ${autosuspend-conf} daemon''; + ExecStart = "${autosuspend}/bin/autosuspend -l ${autosuspend}/etc/autosuspend-logging.conf -c ${autosuspend-conf} daemon"; }; }; @@ -242,7 +242,7 @@ in wantedBy = [ "sleep.target" ]; after = [ "sleep.target" ]; serviceConfig = { - ExecStart = ''${autosuspend}/bin/autosuspend -l ${autosuspend}/etc/autosuspend-logging.conf -c ${autosuspend-conf} presuspend''; + ExecStart = "${autosuspend}/bin/autosuspend -l ${autosuspend}/etc/autosuspend-logging.conf -c ${autosuspend-conf} presuspend"; }; }; }; diff --git a/nixos/modules/services/misc/evdevremapkeys.nix b/nixos/modules/services/misc/evdevremapkeys.nix index 122afda2f86c..c2bf8e10a5dd 100644 --- a/nixos/modules/services/misc/evdevremapkeys.nix +++ b/nixos/modules/services/misc/evdevremapkeys.nix @@ -11,7 +11,7 @@ let in { options.services.evdevremapkeys = { - enable = lib.mkEnableOption ''evdevremapkeys, a daemon to remap events on linux input devices''; + enable = lib.mkEnableOption "evdevremapkeys, a daemon to remap events on linux input devices"; settings = lib.mkOption { type = format.type; diff --git a/nixos/modules/services/misc/jellyseerr.nix b/nixos/modules/services/misc/jellyseerr.nix index 230e61b57f2b..e1276c1937bf 100644 --- a/nixos/modules/services/misc/jellyseerr.nix +++ b/nixos/modules/services/misc/jellyseerr.nix @@ -11,19 +11,19 @@ in meta.maintainers = [ lib.maintainers.camillemndn ]; options.services.jellyseerr = { - enable = lib.mkEnableOption ''Jellyseerr, a requests manager for Jellyfin''; + enable = lib.mkEnableOption "Jellyseerr, a requests manager for Jellyfin"; package = lib.mkPackageOption pkgs "jellyseerr" { }; openFirewall = lib.mkOption { type = lib.types.bool; default = false; - description = ''Open port in the firewall for the Jellyseerr web interface.''; + description = "Open port in the firewall for the Jellyseerr web interface."; }; port = lib.mkOption { type = lib.types.port; default = 5055; - description = ''The port which the Jellyseerr web UI should listen to.''; + description = "The port which the Jellyseerr web UI should listen to."; }; configDir = lib.mkOption { diff --git a/nixos/modules/services/misc/nix-gc.nix b/nixos/modules/services/misc/nix-gc.nix index d2a7f0bf433e..a2aad33b310d 100644 --- a/nixos/modules/services/misc/nix-gc.nix +++ b/nixos/modules/services/misc/nix-gc.nix @@ -79,7 +79,7 @@ in assertions = [ { assertion = cfg.automatic -> config.nix.enable; - message = ''nix.gc.automatic requires nix.enable''; + message = "nix.gc.automatic requires nix.enable"; } ]; diff --git a/nixos/modules/services/misc/nix-optimise.nix b/nixos/modules/services/misc/nix-optimise.nix index 2af1727b75e3..29e246026cc8 100644 --- a/nixos/modules/services/misc/nix-optimise.nix +++ b/nixos/modules/services/misc/nix-optimise.nix @@ -58,7 +58,7 @@ in assertions = [ { assertion = cfg.automatic -> config.nix.enable; - message = ''nix.optimise.automatic requires nix.enable''; + message = "nix.optimise.automatic requires nix.enable"; } ]; diff --git a/nixos/modules/services/misc/synergy.nix b/nixos/modules/services/misc/synergy.nix index e396ccad5494..0affcbf4588a 100644 --- a/nixos/modules/services/misc/synergy.nix +++ b/nixos/modules/services/misc/synergy.nix @@ -109,9 +109,9 @@ in description = "Synergy client"; wantedBy = lib.optional cfgC.autoStart "graphical-session.target"; path = [ pkgs.synergy ]; - serviceConfig.ExecStart = ''${pkgs.synergy}/bin/synergyc -f ${ + serviceConfig.ExecStart = "${pkgs.synergy}/bin/synergyc -f ${ lib.optionalString (cfgC.screenName != "") "-n ${cfgC.screenName}" - } ${cfgC.serverAddress}''; + } ${cfgC.serverAddress}"; serviceConfig.Restart = "on-failure"; }; }) @@ -124,13 +124,13 @@ in description = "Synergy server"; wantedBy = lib.optional cfgS.autoStart "graphical-session.target"; path = [ pkgs.synergy ]; - serviceConfig.ExecStart = ''${pkgs.synergy}/bin/synergys -c ${cfgS.configFile} -f${ + serviceConfig.ExecStart = "${pkgs.synergy}/bin/synergys -c ${cfgS.configFile} -f${ lib.optionalString (cfgS.address != "") " -a ${cfgS.address}" }${ lib.optionalString (cfgS.screenName != "") " -n ${cfgS.screenName}" }${lib.optionalString cfgS.tls.enable " --enable-crypto"}${ lib.optionalString (cfgS.tls.cert != null) " --tls-cert ${cfgS.tls.cert}" - }''; + }"; serviceConfig.Restart = "on-failure"; }; }) diff --git a/nixos/modules/services/monitoring/nagios.nix b/nixos/modules/services/monitoring/nagios.nix index 07134b58b90e..f9aa855909c2 100644 --- a/nixos/modules/services/monitoring/nagios.nix +++ b/nixos/modules/services/monitoring/nagios.nix @@ -93,7 +93,7 @@ in options = { services.nagios = { - enable = lib.mkEnableOption ''[Nagios](https://www.nagios.org/) to monitor your system or network''; + enable = lib.mkEnableOption "[Nagios](https://www.nagios.org/) to monitor your system or network"; objectDefs = lib.mkOption { description = '' diff --git a/nixos/modules/services/monitoring/prometheus/exporters/mysqld.nix b/nixos/modules/services/monitoring/prometheus/exporters/mysqld.nix index 5a2b2ab47ccd..e1015b3ce764 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/mysqld.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/mysqld.nix @@ -63,7 +63,7 @@ in "${pkgs.prometheus-mysqld-exporter}/bin/mysqld_exporter" "--web.listen-address=${cfg.listenAddress}:${toString cfg.port}" "--web.telemetry-path=${cfg.telemetryPath}" - (optionalString (cfg.configFile != null) ''--config.my-cnf=''${CREDENTIALS_DIRECTORY}/config'') + (optionalString (cfg.configFile != null) "--config.my-cnf=\${CREDENTIALS_DIRECTORY}/config") (escapeShellArgs cfg.extraFlags) ]; RestrictAddressFamilies = [ diff --git a/nixos/modules/services/network-filesystems/openafs/client.nix b/nixos/modules/services/network-filesystems/openafs/client.nix index 9b61d44a0f11..5eed8d2a2740 100644 --- a/nixos/modules/services/network-filesystems/openafs/client.nix +++ b/nixos/modules/services/network-filesystems/openafs/client.nix @@ -30,12 +30,12 @@ let sedExpr = '':x /^>\(${localCellsRegex}\) / { n; :y /^>/! { n; by }; bx }; p''; globalCommand = if cfg.cellServDB != { } then - ''sed -n -e ${lib.escapeShellArg sedExpr} ${cfg.globalCellServDBFile}'' + "sed -n -e ${lib.escapeShellArg sedExpr} ${cfg.globalCellServDBFile}" else - ''cat ${cfg.globalCellServDBFile}''; + "cat ${cfg.globalCellServDBFile}"; in pkgs.runCommand "CellServDB" { preferLocalBuild = true; } '' - ${lib.optionalString (cfg.globalCellServDBFile != null) ''${globalCommand} > $out''} + ${lib.optionalString (cfg.globalCellServDBFile != null) "${globalCommand} > $out"} cat ${clientServDB} >> $out ''; diff --git a/nixos/modules/services/networking/cloudflared.nix b/nixos/modules/services/networking/cloudflared.nix index bfa624986d35..37889c7308da 100644 --- a/nixos/modules/services/networking/cloudflared.nix +++ b/nixos/modules/services/networking/cloudflared.nix @@ -395,7 +395,7 @@ in }; environment = { - TUNNEL_ORIGIN_CERT = lib.mkIf (certFile != null) ''%d/cert.pem''; + TUNNEL_ORIGIN_CERT = lib.mkIf (certFile != null) "%d/cert.pem"; TUNNEL_EDGE_IP_VERSION = tunnel.edgeIPVersion; }; } diff --git a/nixos/modules/services/networking/firezone/server.nix b/nixos/modules/services/networking/firezone/server.nix index 49ffbb02c232..7ca9be490632 100644 --- a/nixos/modules/services/networking/firezone/server.nix +++ b/nixos/modules/services/networking/firezone/server.nix @@ -110,12 +110,12 @@ let concatLines ( forEach relevantSecrets ( secret: - ''export ${secret}=$(< ${ + "export ${secret}=$(< ${ if cfg.settingsSecret.${secret} == null then "secrets/${secret}" else "\"$CREDENTIALS_DIRECTORY/${secret}\"" - })'' + })" ) ); diff --git a/nixos/modules/services/networking/gns3-server.nix b/nixos/modules/services/networking/gns3-server.nix index 6d69090744be..b71190d6f464 100644 --- a/nixos/modules/services/networking/gns3-server.nix +++ b/nixos/modules/services/networking/gns3-server.nix @@ -31,7 +31,7 @@ in type = lib.types.nullOr lib.types.str; default = null; example = "gns3"; - description = ''Username used to access the GNS3 Server.''; + description = "Username used to access the GNS3 Server."; }; passwordFile = lib.mkOption { @@ -68,7 +68,7 @@ in file = lib.mkOption { type = lib.types.nullOr lib.types.path; default = "/var/log/gns3/server.log"; - description = ''Path of the file GNS3 Server should log to.''; + description = "Path of the file GNS3 Server should log to."; }; debug = lib.mkEnableOption "debug logging"; @@ -96,17 +96,17 @@ in }; dynamips = { - enable = lib.mkEnableOption ''Dynamips support''; + enable = lib.mkEnableOption "Dynamips support"; package = lib.mkPackageOption pkgs "dynamips" { }; }; ubridge = { - enable = lib.mkEnableOption ''uBridge support''; + enable = lib.mkEnableOption "uBridge support"; package = lib.mkPackageOption pkgs "ubridge" { }; }; vpcs = { - enable = lib.mkEnableOption ''VPCS support''; + enable = lib.mkEnableOption "VPCS support"; package = lib.mkPackageOption pkgs "vpcs" { }; }; }; diff --git a/nixos/modules/services/networking/go-autoconfig.nix b/nixos/modules/services/networking/go-autoconfig.nix index b7ed11405003..f709bc135187 100644 --- a/nixos/modules/services/networking/go-autoconfig.nix +++ b/nixos/modules/services/networking/go-autoconfig.nix @@ -56,7 +56,7 @@ in serviceConfig = { ExecStart = "${pkgs.go-autoconfig}/bin/go-autoconfig -config ${configFile}"; Restart = "on-failure"; - WorkingDirectory = ''${pkgs.go-autoconfig}/''; + WorkingDirectory = "${pkgs.go-autoconfig}/"; DynamicUser = true; }; }; diff --git a/nixos/modules/services/networking/hostapd.nix b/nixos/modules/services/networking/hostapd.nix index ef0094cf1aa7..c9deeb7753b2 100644 --- a/nixos/modules/services/networking/hostapd.nix +++ b/nixos/modules/services/networking/hostapd.nix @@ -1363,13 +1363,13 @@ in # see https://github.com/openwrt/openwrt/blob/539cb5389d9514c99ec1f87bd4465f77c7ed9b93/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh#L158 { assertion = length (filter (bss: bss == radio) (attrNames radioCfg.networks)) == 1; - message = ''hostapd radio ${radio}: Exactly one network must be named like the radio, for reasons internal to hostapd.''; + message = "hostapd radio ${radio}: Exactly one network must be named like the radio, for reasons internal to hostapd."; } { assertion = (radioCfg.wifi4.enable && builtins.elem "HT40-" radioCfg.wifi4.capabilities) -> radioCfg.channel != 0; - message = ''hostapd radio ${radio}: using ACS (channel = 0) together with HT40- (wifi4.capabilities) is unsupported by hostapd''; + message = "hostapd radio ${radio}: using ACS (channel = 0) together with HT40- (wifi4.capabilities) is unsupported by hostapd"; } ] # BSS warnings @@ -1391,42 +1391,42 @@ in } { assertion = (length (attrNames radioCfg.networks) > 1) -> (bssCfg.bssid != null); - message = ''hostapd radio ${radio} bss ${bss}: bssid must be specified manually (for now) since this radio uses multiple BSS.''; + message = "hostapd radio ${radio} bss ${bss}: bssid must be specified manually (for now) since this radio uses multiple BSS."; } { assertion = countWpaPasswordDefinitions <= 1; - message = ''hostapd radio ${radio} bss ${bss}: must use at most one WPA password option (wpaPassword, wpaPasswordFile, wpaPskFile)''; + message = "hostapd radio ${radio} bss ${bss}: must use at most one WPA password option (wpaPassword, wpaPasswordFile, wpaPskFile)"; } { assertion = auth.wpaPassword != null -> (stringLength auth.wpaPassword >= 8 && stringLength auth.wpaPassword <= 63); - message = ''hostapd radio ${radio} bss ${bss}: uses a wpaPassword of invalid length (must be in [8,63]).''; + message = "hostapd radio ${radio} bss ${bss}: uses a wpaPassword of invalid length (must be in [8,63])."; } { assertion = auth.saePasswords == [ ] || auth.saePasswordsFile == null; - message = ''hostapd radio ${radio} bss ${bss}: must use only one SAE password option (saePasswords or saePasswordsFile)''; + message = "hostapd radio ${radio} bss ${bss}: must use only one SAE password option (saePasswords or saePasswordsFile)"; } { assertion = auth.mode == "wpa3-sae" -> (auth.saePasswords != [ ] || auth.saePasswordsFile != null); - message = ''hostapd radio ${radio} bss ${bss}: uses WPA3-SAE which requires defining a sae password option''; + message = "hostapd radio ${radio} bss ${bss}: uses WPA3-SAE which requires defining a sae password option"; } { assertion = auth.mode == "wpa3-sae-transition" -> (auth.saePasswords != [ ] || auth.saePasswordsFile != null) && countWpaPasswordDefinitions == 1; - message = ''hostapd radio ${radio} bss ${bss}: uses WPA3-SAE in transition mode requires defining both a wpa password option and a sae password option''; + message = "hostapd radio ${radio} bss ${bss}: uses WPA3-SAE in transition mode requires defining both a wpa password option and a sae password option"; } { assertion = (auth.mode == "wpa2-sha1" || auth.mode == "wpa2-sha256") -> countWpaPasswordDefinitions == 1; - message = ''hostapd radio ${radio} bss ${bss}: uses WPA2-PSK which requires defining a wpa password option''; + message = "hostapd radio ${radio} bss ${bss}: uses WPA2-PSK which requires defining a wpa password option"; } ] ++ optionals (auth.saePasswords != [ ]) ( imap1 (i: entry: { assertion = (entry.password == null) != (entry.passwordFile == null); - message = ''hostapd radio ${radio} bss ${bss} saePassword entry ${i}: must set exactly one of `password` or `passwordFile`''; + message = "hostapd radio ${radio} bss ${bss} saePassword entry ${i}: must set exactly one of `password` or `passwordFile`"; }) auth.saePasswords ) ) radioCfg.networks diff --git a/nixos/modules/services/networking/inadyn.nix b/nixos/modules/services/networking/inadyn.nix index 384c6932aefa..fd6f14da9512 100644 --- a/nixos/modules/services/networking/inadyn.nix +++ b/nixos/modules/services/networking/inadyn.nix @@ -221,7 +221,7 @@ in startAt = cfg.interval; serviceConfig = { Type = "oneshot"; - ExecStart = ''${lib.getExe pkgs.inadyn} -f ${configFile} --cache-dir ''${CACHE_DIRECTORY} -1 --foreground -l ${cfg.logLevel}''; + ExecStart = "${lib.getExe pkgs.inadyn} -f ${configFile} --cache-dir \${CACHE_DIRECTORY} -1 --foreground -l ${cfg.logLevel}"; LoadCredential = "config:${configFile}"; CacheDirectory = "inadyn"; diff --git a/nixos/modules/services/networking/netbird.nix b/nixos/modules/services/networking/netbird.nix index 7c7641b4c4ed..5c1dd50a30b4 100644 --- a/nixos/modules/services/networking/netbird.nix +++ b/nixos/modules/services/networking/netbird.nix @@ -301,7 +301,7 @@ in ui.enable = mkOption { type = bool; default = nixosConfig.services.netbird.ui.enable; - defaultText = literalExpression ''client.ui.enable''; + defaultText = literalExpression "client.ui.enable"; description = '' Controls presence of `netbird-ui` wrapper for this NetBird client. ''; diff --git a/nixos/modules/services/networking/nsd.nix b/nixos/modules/services/networking/nsd.nix index 6100f71563f4..c45039458b26 100644 --- a/nixos/modules/services/networking/nsd.nix +++ b/nixos/modules/services/networking/nsd.nix @@ -148,7 +148,7 @@ let ''; maybeString = prefix: x: optionalString (x != null) ''${prefix} "${x}"''; - maybeToString = prefix: x: optionalString (x != null) ''${prefix} ${toString x}''; + maybeToString = prefix: x: optionalString (x != null) "${prefix} ${toString x}"; forEach = pre: l: concatMapStrings (x: pre + x + "\n") l; keyConfigFile = concatStrings ( diff --git a/nixos/modules/services/networking/robustirc-bridge.nix b/nixos/modules/services/networking/robustirc-bridge.nix index 66690d699537..89695ce46d8f 100644 --- a/nixos/modules/services/networking/robustirc-bridge.nix +++ b/nixos/modules/services/networking/robustirc-bridge.nix @@ -18,7 +18,7 @@ in extraFlags = mkOption { type = types.listOf types.str; default = [ ]; - description = ''Extra flags passed to the {command}`robustirc-bridge` command. See [RobustIRC Documentation](https://robustirc.net/docs/adminguide.html#_bridge) or {manpage}`robustirc-bridge(1)` for details.''; + description = "Extra flags passed to the {command}`robustirc-bridge` command. See [RobustIRC Documentation](https://robustirc.net/docs/adminguide.html#_bridge) or {manpage}`robustirc-bridge(1)` for details."; example = [ "-network robustirc.net" ]; diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index f34b8ca2a190..2624827d72c8 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -826,13 +826,13 @@ in "Banner ${if cfg.banner == null then "none" else pkgs.writeText "ssh_banner" cfg.banner}" "AddressFamily ${if config.networking.enableIPv6 then "any" else "inet"}" ] - ++ lib.map (port: ''Port ${toString port}'') cfg.ports + ++ lib.map (port: "Port ${toString port}") cfg.ports ++ lib.map ( { port, addr, ... }: - ''ListenAddress ${addr}${lib.optionalString (port != null) (":" + toString port)}'' + "ListenAddress ${addr}${lib.optionalString (port != null) (":" + toString port)}" ) cfg.listenAddresses ++ lib.optional cfgc.setXAuthLocation "XAuthLocation ${lib.getExe pkgs.xorg.xauth}" - ++ lib.optional cfg.allowSFTP ''Subsystem sftp ${cfg.sftpServerExecutable} ${lib.concatStringsSep " " cfg.sftpFlags}'' + ++ lib.optional cfg.allowSFTP "Subsystem sftp ${cfg.sftpServerExecutable} ${lib.concatStringsSep " " cfg.sftpFlags}" ++ [ "AuthorizedKeysFile ${toString cfg.authorizedKeysFiles}" ] @@ -901,7 +901,7 @@ in in { assertion = lib.length duplicates == 0; - message = ''Duplicate sshd config key; does your capitalization match the option's? Duplicate keys: ${formattedDuplicates}''; + message = "Duplicate sshd config key; does your capitalization match the option's? Duplicate keys: ${formattedDuplicates}"; } ) ] diff --git a/nixos/modules/services/printing/cups-pdf.nix b/nixos/modules/services/printing/cups-pdf.nix index a5fd0c3c1f6d..1fd0e2cfb1c0 100644 --- a/nixos/modules/services/printing/cups-pdf.nix +++ b/nixos/modules/services/printing/cups-pdf.nix @@ -90,7 +90,7 @@ let type = with lib.types; nullOr path; default = lib.getExe pkgs.ghostscript; defaultText = lib.literalExpression "lib.getExe pkgs.ghostscript"; - example = lib.literalExpression ''''${pkgs.ghostscript}/bin/ps2pdf''; + example = lib.literalExpression "\${pkgs.ghostscript}/bin/ps2pdf"; description = "location of GhostScript binary"; }; }; diff --git a/nixos/modules/services/search/manticore.nix b/nixos/modules/services/search/manticore.nix index cbedb5630d0e..58814cc91b45 100644 --- a/nixos/modules/services/search/manticore.nix +++ b/nixos/modules/services/search/manticore.nix @@ -26,7 +26,7 @@ let ${sectName} { '' + lib.generators.toKeyValue { inherit mkKeyValue listsAsDuplicateKeys; } sectValues - + ''}''; + + "}"; in # map input to ini sections mapAttrsToStringsSep "\n" mkSection attrsOfAttrs; diff --git a/nixos/modules/services/security/crowdsec-firewall-bouncer.nix b/nixos/modules/services/security/crowdsec-firewall-bouncer.nix index aae9c9683e6e..856efd81b483 100644 --- a/nixos/modules/services/security/crowdsec-firewall-bouncer.nix +++ b/nixos/modules/services/security/crowdsec-firewall-bouncer.nix @@ -45,7 +45,7 @@ in instead. ''; default = config.services.crowdsec.enable; - defaultText = lib.literalExpression ''config.services.crowdsec.enable''; + defaultText = lib.literalExpression "config.services.crowdsec.enable"; }; bouncerName = mkOption { type = types.nonEmptyStr; diff --git a/nixos/modules/services/security/fail2ban.nix b/nixos/modules/services/security/fail2ban.nix index c0a992376f51..87f991a4c7e9 100644 --- a/nixos/modules/services/security/fail2ban.nix +++ b/nixos/modules/services/security/fail2ban.nix @@ -442,7 +442,7 @@ in // { # Miscellaneous options inherit (cfg) banaction maxretry bantime; - ignoreip = ''127.0.0.1/8 ${lib.optionalString config.networking.enableIPv6 "::1"} ${lib.concatStringsSep " " cfg.ignoreIP}''; + ignoreip = "127.0.0.1/8 ${lib.optionalString config.networking.enableIPv6 "::1"} ${lib.concatStringsSep " " cfg.ignoreIP}"; backend = "systemd"; # Actions banaction_allports = cfg.banaction-allports; diff --git a/nixos/modules/services/torrent/cross-seed.nix b/nixos/modules/services/torrent/cross-seed.nix index 3db8b84071c3..ed25edbb2f8c 100644 --- a/nixos/modules/services/torrent/cross-seed.nix +++ b/nixos/modules/services/torrent/cross-seed.nix @@ -107,7 +107,7 @@ in outputDir = mkOption { type = types.path; default = "${cfg.configDir}/output"; - defaultText = ''''${cfg.configDir}/output''; + defaultText = "\${cfg.configDir}/output"; description = "Directory where cross-seed will place torrent files it finds."; }; diff --git a/nixos/modules/services/web-apps/bookstack.nix b/nixos/modules/services/web-apps/bookstack.nix index a3ed9a96b970..7a59859c5e4c 100644 --- a/nixos/modules/services/web-apps/bookstack.nix +++ b/nixos/modules/services/web-apps/bookstack.nix @@ -300,7 +300,7 @@ in type = lib.types.str; default = if cfg.hostname == "localhost" then "http://${cfg.hostname}" else "https://${cfg.hostname}"; - defaultText = ''http(s)://''${config.services.bookstack.hostname}''; + defaultText = "http(s)://\${config.services.bookstack.hostname}"; description = '' The root URL that you want to host BookStack on. All URLs in BookStack will be generated using this value. It is used to validate specific diff --git a/nixos/modules/services/web-apps/davis.nix b/nixos/modules/services/web-apps/davis.nix index e7cdf6a8277b..feb13b8bf87c 100644 --- a/nixos/modules/services/web-apps/davis.nix +++ b/nixos/modules/services/web-apps/davis.nix @@ -134,8 +134,8 @@ in ); default = { }; - example = ''''; - description = ''''; + example = ""; + description = ""; }; adminLogin = lib.mkOption { diff --git a/nixos/modules/services/web-apps/dokuwiki.nix b/nixos/modules/services/web-apps/dokuwiki.nix index d1c0d2103522..caf819c30910 100644 --- a/nixos/modules/services/web-apps/dokuwiki.nix +++ b/nixos/modules/services/web-apps/dokuwiki.nix @@ -556,7 +556,7 @@ in "/" = { priority = 1; index = "doku.php"; - extraConfig = ''try_files $uri $uri/ @dokuwiki;''; + extraConfig = "try_files $uri $uri/ @dokuwiki;"; }; "@dokuwiki" = { diff --git a/nixos/modules/services/web-apps/freshrss.nix b/nixos/modules/services/web-apps/freshrss.nix index 2544bd846424..93306104c630 100644 --- a/nixos/modules/services/web-apps/freshrss.nix +++ b/nixos/modules/services/web-apps/freshrss.nix @@ -359,10 +359,10 @@ in let isUserAuth = cfg.authType == "form" || cfg.authType == "none"; - userScriptArgs = ''--user ${cfg.defaultUser} ${ + userScriptArgs = "--user ${cfg.defaultUser} ${ optionalString (cfg.authType == "form") ''--password "$(cat ${cfg.passwordFile})"'' - }''; - mkUserScript = name: optionalString isUserAuth ''./cli/${name}.php ${userScriptArgs}''; + }"; + mkUserScript = name: optionalString isUserAuth "./cli/${name}.php ${userScriptArgs}"; updateUserScript = mkUserScript "update-user"; createUserScript = mkUserScript "create-user"; diff --git a/nixos/modules/services/web-apps/jitsi-meet.nix b/nixos/modules/services/web-apps/jitsi-meet.nix index cc6e6af64051..2a63b06a8fab 100644 --- a/nixos/modules/services/web-apps/jitsi-meet.nix +++ b/nixos/modules/services/web-apps/jitsi-meet.nix @@ -217,7 +217,7 @@ in excalidraw.port = mkOption { type = types.port; default = 3002; - description = ''The port which the Excalidraw backend for Jitsi should listen to.''; + description = "The port which the Excalidraw backend for Jitsi should listen to."; }; secureDomain = { @@ -225,7 +225,7 @@ in authentication = mkOption { type = types.str; default = "internal_hashed"; - description = ''The authentication type to be used by jitsi''; + description = "The authentication type to be used by jitsi"; }; }; }; diff --git a/nixos/modules/services/web-apps/lanraragi.nix b/nixos/modules/services/web-apps/lanraragi.nix index 35e7e28e0308..e7b701099255 100644 --- a/nixos/modules/services/web-apps/lanraragi.nix +++ b/nixos/modules/services/web-apps/lanraragi.nix @@ -88,7 +88,7 @@ in { redis_address => "127.0.0.1:${toString cfg.redis.port}", redis_password => "${ - lib.optionalString (cfg.redis.passwordFile != null) ''$(head -n1 ${cfg.redis.passwordFile})'' + lib.optionalString (cfg.redis.passwordFile != null) "$(head -n1 ${cfg.redis.passwordFile})" }", redis_database => "0", redis_database_minion => "1", diff --git a/nixos/modules/services/web-apps/mattermost.nix b/nixos/modules/services/web-apps/mattermost.nix index 412a36c29c90..cbec4ca230bf 100644 --- a/nixos/modules/services/web-apps/mattermost.nix +++ b/nixos/modules/services/web-apps/mattermost.nix @@ -411,7 +411,7 @@ in path = mkOption { type = types.path; default = "${cfg.dataDir}/mattermost.sock"; - defaultText = ''''${config.mattermost.dataDir}/mattermost.sock''; + defaultText = "\${config.mattermost.dataDir}/mattermost.sock"; description = '' Default location for the Mattermost control socket used by `mmctl`. ''; diff --git a/nixos/modules/services/web-apps/mediawiki.nix b/nixos/modules/services/web-apps/mediawiki.nix index 085108df28c3..cb0c60315ef6 100644 --- a/nixos/modules/services/web-apps/mediawiki.nix +++ b/nixos/modules/services/web-apps/mediawiki.nix @@ -473,7 +473,7 @@ in nginx.hostName = mkOption { type = types.str; - example = literalExpression ''wiki.example.com''; + example = literalExpression "wiki.example.com"; default = "localhost"; description = '' The hostname to use for the nginx virtual host. diff --git a/nixos/modules/services/web-apps/peertube-runner.nix b/nixos/modules/services/web-apps/peertube-runner.nix index 0aae8e558825..9b126b7fa97c 100644 --- a/nixos/modules/services/web-apps/peertube-runner.nix +++ b/nixos/modules/services/web-apps/peertube-runner.nix @@ -188,7 +188,7 @@ in --runner-name ${lib.escapeShellArg instance.runnerName} \ ${lib.optionalString ( instance.runnerDescription != null - ) ''--runner-description ${lib.escapeShellArg instance.runnerDescription}''} + ) "--runner-description ${lib.escapeShellArg instance.runnerDescription}"} # Kill the server kill $! diff --git a/nixos/modules/services/web-apps/privatebin.nix b/nixos/modules/services/web-apps/privatebin.nix index d498ffe3af71..5fff838b26dd 100644 --- a/nixos/modules/services/web-apps/privatebin.nix +++ b/nixos/modules/services/web-apps/privatebin.nix @@ -13,11 +13,11 @@ let mkValueString = v: if v == true then - ''true'' + "true" else if v == false then - ''false'' + "false" else if builtins.isInt v then - ''${toString v}'' + "${toString v}" else if builtins.isPath v then ''"${toString v}"'' else if builtins.isString v then diff --git a/nixos/modules/services/web-apps/rutorrent.nix b/nixos/modules/services/web-apps/rutorrent.nix index d1c3c2eafe38..82684f884980 100644 --- a/nixos/modules/services/web-apps/rutorrent.nix +++ b/nixos/modules/services/web-apps/rutorrent.nix @@ -248,9 +248,9 @@ in cp -r ${pkgs.rutorrent}/php ${cfg.dataDir}/ ${optionalString (cfg.plugins != [ ]) - ''cp -r ${ + "cp -r ${ concatMapStringsSep " " (p: "${pkgs.rutorrent}/plugins/${p}") cfg.plugins - } ${cfg.dataDir}/plugins/'' + } ${cfg.dataDir}/plugins/" } chown -R ${cfg.user}:${cfg.group} ${cfg.dataDir}/{conf,share,logs,plugins} diff --git a/nixos/modules/services/web-apps/snipe-it.nix b/nixos/modules/services/web-apps/snipe-it.nix index 7b8f55b55c9d..818aea70a039 100644 --- a/nixos/modules/services/web-apps/snipe-it.nix +++ b/nixos/modules/services/web-apps/snipe-it.nix @@ -403,7 +403,7 @@ in locations = { "/" = { index = "index.php"; - extraConfig = ''try_files $uri $uri/ /index.php?$query_string;''; + extraConfig = "try_files $uri $uri/ /index.php?$query_string;"; }; "~ \\.php$" = { extraConfig = '' diff --git a/nixos/modules/services/web-apps/stash.nix b/nixos/modules/services/web-apps/stash.nix index 72d4d67cd6cf..e4e1c65d0932 100644 --- a/nixos/modules/services/web-apps/stash.nix +++ b/nixos/modules/services/web-apps/stash.nix @@ -126,7 +126,7 @@ let stash_boxes = mkOption { type = types.listOf stashBoxType; default = [ ]; - description = ''Stash-box facilitates automated tagging of scenes and performers based on fingerprints and filenames''; + description = "Stash-box facilitates automated tagging of scenes and performers based on fingerprints and filenames"; example = literalExpression '' { stash_boxes = [ diff --git a/nixos/modules/services/web-apps/szurubooru.nix b/nixos/modules/services/web-apps/szurubooru.nix index e1bfbfe27e8b..d7c8926536c2 100644 --- a/nixos/modules/services/web-apps/szurubooru.nix +++ b/nixos/modules/services/web-apps/szurubooru.nix @@ -83,7 +83,7 @@ in type = types.int; default = 4; example = 6; - description = ''Number of waitress threads to start.''; + description = "Number of waitress threads to start."; }; settings = mkOption { @@ -94,13 +94,13 @@ in type = types.str; default = "szurubooru"; example = "Szuru"; - description = ''Name shown in the website title and on the front page.''; + description = "Name shown in the website title and on the front page."; }; domain = mkOption { type = types.str; example = "http://example.com"; - description = ''Full URL to the homepage of this szurubooru site (with no trailing slash).''; + description = "Full URL to the homepage of this szurubooru site (with no trailing slash)."; }; # NOTE: this is not a real upstream option @@ -119,7 +119,7 @@ in ]; default = "no"; example = "yes"; - description = ''Whether to delete thumbnails and source files on post delete.''; + description = "Whether to delete thumbnails and source files on post delete."; }; smtp = { @@ -127,21 +127,21 @@ in type = types.nullOr types.str; default = null; example = "localhost"; - description = ''Host of the SMTP server used to send reset password.''; + description = "Host of the SMTP server used to send reset password."; }; port = mkOption { type = types.nullOr types.port; default = null; example = 25; - description = ''Port of the SMTP server.''; + description = "Port of the SMTP server."; }; user = mkOption { type = types.nullOr types.str; default = null; example = "bot"; - description = ''User to connect to the SMTP server.''; + description = "User to connect to the SMTP server."; }; # NOTE: this is not a real upstream option @@ -149,7 +149,7 @@ in type = types.nullOr types.path; default = null; example = "/run/secrets/szurubooru-smtp-pass"; - description = ''File containing the password associated to the given user for the SMTP server.''; + description = "File containing the password associated to the given user for the SMTP server."; }; }; @@ -158,7 +158,7 @@ in default = "${cfg.server.settings.domain}/data/"; defaultText = lib.literalExpression ''"''${services.szurubooru.server.settings.domain}/data/"''; example = "http://example.com/content/"; - description = ''Full URL to the data endpoint.''; + description = "Full URL to the data endpoint."; }; data_dir = mkOption { @@ -166,21 +166,21 @@ in default = "${cfg.dataDir}/data"; defaultText = lib.literalExpression ''"''${services.szurubooru.dataDir}/data"''; example = "/srv/szurubooru/data"; - description = ''Path to the static files.''; + description = "Path to the static files."; }; debug = mkOption { type = types.int; default = 0; example = 1; - description = ''Whether to generate server logs.''; + description = "Whether to generate server logs."; }; show_sql = mkOption { type = types.int; default = 0; example = 1; - description = ''Whether to show SQL in server logs.''; + description = "Whether to show SQL in server logs."; }; }; }; @@ -203,13 +203,13 @@ in type = types.str; default = "localhost"; example = "192.168.1.2"; - description = ''Host on which the PostgreSQL database runs.''; + description = "Host on which the PostgreSQL database runs."; }; port = mkOption { type = types.port; default = 5432; - description = ''The port under which PostgreSQL listens to.''; + description = "The port under which PostgreSQL listens to."; }; name = mkOption { @@ -217,20 +217,20 @@ in default = cfg.database.user; defaultText = lib.literalExpression "szurubooru.database.name"; example = "szuru"; - description = ''Name of the PostgreSQL database.''; + description = "Name of the PostgreSQL database."; }; user = mkOption { type = types.str; default = "szurubooru"; example = "szuru"; - description = ''PostgreSQL user.''; + description = "PostgreSQL user."; }; passwordFile = mkOption { type = types.path; example = "/run/secrets/szurubooru-db-password"; - description = ''A file containing the password for the PostgreSQL user.''; + description = "A file containing the password for the PostgreSQL user."; }; }; }; diff --git a/nixos/modules/services/web-apps/your_spotify.nix b/nixos/modules/services/web-apps/your_spotify.nix index 393726b22b01..9c177be2f001 100644 --- a/nixos/modules/services/web-apps/your_spotify.nix +++ b/nixos/modules/services/web-apps/your_spotify.nix @@ -114,7 +114,7 @@ in }; MONGO_ENDPOINT = mkOption { type = str; - description = ''The endpoint of the Mongo database.''; + description = "The endpoint of the Mongo database."; default = "mongodb://localhost:27017/your_spotify"; }; PORT = mkOption { diff --git a/nixos/modules/services/web-servers/caddy/default.nix b/nixos/modules/services/web-servers/caddy/default.nix index 83491c1f789e..1fcf5ef6de5f 100644 --- a/nixos/modules/services/web-servers/caddy/default.nix +++ b/nixos/modules/services/web-servers/caddy/default.nix @@ -421,9 +421,9 @@ in serviceConfig = let - runOptions = ''--config ${configPath} ${ + runOptions = "--config ${configPath} ${ optionalString (cfg.adapter != null) "--adapter ${cfg.adapter}" - }''; + }"; in { # Override the `ExecStart` line from upstream's systemd unit file by our own: @@ -431,7 +431,7 @@ in # If the empty string is assigned to this option, the list of commands to start is reset, prior assignments of this option will have no effect. ExecStart = [ "" - ''${lib.getExe cfg.package} run ${runOptions} ${optionalString cfg.resume "--resume"}'' + "${lib.getExe cfg.package} run ${runOptions} ${optionalString cfg.resume "--resume"}" ]; # Validating the configuration before applying it ensures we’ll get a proper error that will be reported when switching to the configuration ExecReload = [ diff --git a/nixos/modules/services/web-servers/h2o/default.nix b/nixos/modules/services/web-servers/h2o/default.nix index 72306ebd003d..108c9190cc53 100644 --- a/nixos/modules/services/web-servers/h2o/default.nix +++ b/nixos/modules/services/web-servers/h2o/default.nix @@ -262,12 +262,12 @@ let ); # Executing H2O with our generated configuration; `mode` added as needed - h2oExe = ''${lib.getExe cfg.package} ${ + h2oExe = "${lib.getExe cfg.package} ${ lib.strings.escapeShellArgs [ "--conf" "${h2oConfig}" ] - }''; + }"; in { options = { diff --git a/nixos/modules/services/web-servers/static-web-server.nix b/nixos/modules/services/web-servers/static-web-server.nix index c999bb161f82..9069d602cb01 100644 --- a/nixos/modules/services/web-servers/static-web-server.nix +++ b/nixos/modules/services/web-servers/static-web-server.nix @@ -13,7 +13,7 @@ in { options = { services.static-web-server = { - enable = lib.mkEnableOption ''Static Web Server''; + enable = lib.mkEnableOption "Static Web Server"; listen = lib.mkOption { default = "[::]:8787"; type = lib.types.str; diff --git a/nixos/modules/system/boot/clevis.nix b/nixos/modules/system/boot/clevis.nix index 6a90f0f4a54f..5867a02b9576 100644 --- a/nixos/modules/system/boot/clevis.nix +++ b/nixos/modules/system/boot/clevis.nix @@ -59,7 +59,7 @@ in || (fs.fsType == "zfs" && lib.hasPrefix "${device}/" fs.device) ) config.system.build.fileSystems) || (lib.hasAttr device config.boot.initrd.luks.devices); - message = ''No filesystem or LUKS device with the name ${device} is declared in your configuration.''; + message = "No filesystem or LUKS device with the name ${device} is declared in your configuration."; }) cfg.devices ) ); diff --git a/nixos/modules/system/boot/kexec.nix b/nixos/modules/system/boot/kexec.nix index 9a4818d874dd..d5272ff4da95 100644 --- a/nixos/modules/system/boot/kexec.nix +++ b/nixos/modules/system/boot/kexec.nix @@ -12,7 +12,7 @@ in options.boot.kexec = { enable = lib.mkEnableOption "kexec" // { default = lib.meta.availableOn pkgs.stdenv.hostPlatform pkgs.kexec-tools; - defaultText = lib.literalExpression ''lib.meta.availableOn pkgs.stdenv.hostPlatform pkgs.kexec-tools''; + defaultText = lib.literalExpression "lib.meta.availableOn pkgs.stdenv.hostPlatform pkgs.kexec-tools"; }; }; diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix index c4275d0410c3..2b2fc7194e45 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix @@ -244,7 +244,7 @@ in installDeviceTree = mkOption { default = with config.hardware.deviceTree; enable && name != null; - defaultText = ''with config.hardware.deviceTree; enable && name != null''; + defaultText = "with config.hardware.deviceTree; enable && name != null"; description = '' Install the devicetree blob specified by `config.hardware.deviceTree.name` to the ESP and instruct systemd-boot to pass this DTB to linux. diff --git a/nixos/modules/system/boot/systemd/sysusers.nix b/nixos/modules/system/boot/systemd/sysusers.nix index e3b0f2656b6a..daac975e1c96 100644 --- a/nixos/modules/system/boot/systemd/sysusers.nix +++ b/nixos/modules/system/boot/systemd/sysusers.nix @@ -31,9 +31,9 @@ let ${lib.concatLines ( lib.mapAttrsToList ( groupname: opts: - ''g ${groupname} ${ + "g ${groupname} ${ if opts.gid == null then "/var/lib/nixos/gid/${groupname}" else toString opts.gid - }'' + }" ) userCfg.groups )} diff --git a/nixos/modules/system/boot/unl0kr.nix b/nixos/modules/system/boot/unl0kr.nix index c51b40325cfd..9caa1156b9fd 100644 --- a/nixos/modules/system/boot/unl0kr.nix +++ b/nixos/modules/system/boot/unl0kr.nix @@ -12,13 +12,13 @@ in { options.boot.initrd.unl0kr = { enable = lib.mkEnableOption "unl0kr in initrd" // { - description = ''Whether to enable the unl0kr on-screen keyboard in initrd to unlock LUKS.''; + description = "Whether to enable the unl0kr on-screen keyboard in initrd to unlock LUKS."; }; package = lib.mkPackageOption pkgs "buffybox" { }; allowVendorDrivers = lib.mkEnableOption "load optional drivers" // { - description = ''Whether to load additional drivers for certain vendors (I.E: Wacom, Intel, etc.)''; + description = "Whether to load additional drivers for certain vendors (I.E: Wacom, Intel, etc.)"; }; settings = lib.mkOption { @@ -56,10 +56,10 @@ in warnings = lib.mkMerge [ (lib.mkIf (config.hardware.amdgpu.initrd.enable) [ - ''Use early video loading at your risk. It's not guaranteed to work with unl0kr.'' + "Use early video loading at your risk. It's not guaranteed to work with unl0kr." ]) (lib.mkIf (config.boot.plymouth.enable) [ - ''Upstream clearly intends unl0kr to not run with Plymouth. Good luck'' + "Upstream clearly intends unl0kr to not run with Plymouth. Good luck" ]) ]; diff --git a/nixos/modules/system/service/README.md b/nixos/modules/system/service/README.md index fa4d0204611e..70c08e706577 100644 --- a/nixos/modules/system/service/README.md +++ b/nixos/modules/system/service/README.md @@ -104,7 +104,7 @@ The modular service infrastructure avoids exposing `pkgs` as a module argument t lib, writeScript, runtimeShell, - # ... other dependencies + # ... other dependencies }: stdenv.mkDerivation (finalAttrs: { # ... package definition diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index 92c151142215..8e087017d7e7 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -205,7 +205,7 @@ let tempAddress = mkOption { type = types.enum (lib.attrNames tempaddrValues); default = cfg.tempAddresses; - defaultText = literalExpression ''config.networking.tempAddresses''; + defaultText = literalExpression "config.networking.tempAddresses"; description = '' When IPv6 is enabled with SLAAC, this option controls the use of temporary address (aka privacy extensions) on this diff --git a/nixos/modules/virtualisation/containerd.nix b/nixos/modules/virtualisation/containerd.nix index c43db34dbf99..1ba7117aa245 100644 --- a/nixos/modules/virtualisation/containerd.nix +++ b/nixos/modules/virtualisation/containerd.nix @@ -89,9 +89,9 @@ in ] ++ lib.optional config.boot.zfs.enabled config.boot.zfs.package; serviceConfig = { - ExecStart = ''${pkgs.containerd}/bin/containerd ${ + ExecStart = "${pkgs.containerd}/bin/containerd ${ lib.concatStringsSep " " (lib.cli.toCommandLineGNU { } cfg.args) - }''; + }"; Delegate = "yes"; KillMode = "process"; Type = "notify"; diff --git a/nixos/modules/virtualisation/guest-networking-options.nix b/nixos/modules/virtualisation/guest-networking-options.nix index fb450cfa09ba..817ccc4e6370 100644 --- a/nixos/modules/virtualisation/guest-networking-options.nix +++ b/nixos/modules/virtualisation/guest-networking-options.nix @@ -71,7 +71,7 @@ in virtualisation.vlans = lib.mkOption { type = types.listOf types.ints.unsigned; default = if cfg.interfaces == { } then [ 1 ] else [ ]; - defaultText = lib.literalExpression ''if cfg.interfaces == {} then [ 1 ] else [ ]''; + defaultText = lib.literalExpression "if cfg.interfaces == {} then [ 1 ] else [ ]"; example = [ 1 2 diff --git a/nixos/modules/virtualisation/nixos-containers.nix b/nixos/modules/virtualisation/nixos-containers.nix index 8a46d022633a..9f67f937c2f1 100644 --- a/nixos/modules/virtualisation/nixos-containers.nix +++ b/nixos/modules/virtualisation/nixos-containers.nix @@ -216,7 +216,7 @@ let ${ optionalString ( cfg.tmpfs != null && cfg.tmpfs != [ ] - ) ''--tmpfs=${concatStringsSep " --tmpfs=" cfg.tmpfs}'' + ) "--tmpfs=${concatStringsSep " --tmpfs=" cfg.tmpfs}" } \ ''${EXTRA_NSPAWN_FLAGS-} \ ${containerInit cfg} "''${SYSTEM_PATH:-/nix/var/nix/profiles/system}/init" diff --git a/nixos/modules/virtualisation/podman/default.nix b/nixos/modules/virtualisation/podman/default.nix index 21a0e083d871..63cc4c5e3f63 100644 --- a/nixos/modules/virtualisation/podman/default.nix +++ b/nixos/modules/virtualisation/podman/default.nix @@ -123,7 +123,7 @@ in type = with types; listOf package; # keep the default in sync with the podman package default = lib.optionals pkgs.stdenv.hostPlatform.isLinux [ pkgs.runc ]; - defaultText = lib.literalExpression ''lib.optionals pkgs.stdenv.hostPlatform.isLinux [ pkgs.runc ]''; + defaultText = lib.literalExpression "lib.optionals pkgs.stdenv.hostPlatform.isLinux [ pkgs.runc ]"; example = lib.literalExpression '' [ pkgs.gvisor diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 762349a39753..5f001e05aa47 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -438,7 +438,7 @@ in virtualisation.bootLoaderDevice = mkOption { type = types.path; default = "/dev/disk/by-id/virtio-${rootDriveSerialAttr}"; - defaultText = literalExpression ''/dev/disk/by-id/virtio-${rootDriveSerialAttr}''; + defaultText = literalExpression "/dev/disk/by-id/virtio-${rootDriveSerialAttr}"; example = "/dev/disk/by-id/virtio-boot-loader-device"; description = '' The path (inside th VM) to the device to boot from when legacy booting. @@ -470,7 +470,7 @@ in virtualisation.rootDevice = mkOption { type = types.nullOr types.path; default = "/dev/disk/by-label/${rootFilesystemLabel}"; - defaultText = literalExpression ''/dev/disk/by-label/${rootFilesystemLabel}''; + defaultText = literalExpression "/dev/disk/by-label/${rootFilesystemLabel}"; example = "/dev/disk/by-label/nixos"; description = '' The path (inside the VM) to the device containing the root filesystem. diff --git a/nixos/modules/virtualisation/waydroid.nix b/nixos/modules/virtualisation/waydroid.nix index 27c1e27083c8..39a8139c085c 100644 --- a/nixos/modules/virtualisation/waydroid.nix +++ b/nixos/modules/virtualisation/waydroid.nix @@ -27,7 +27,7 @@ in enable = lib.mkEnableOption "Waydroid"; package = lib.mkPackageOption pkgs "waydroid" { } // { default = if config.networking.nftables.enable then pkgs.waydroid-nftables else pkgs.waydroid; - defaultText = lib.literalExpression ''if config.networking.nftables.enable then pkgs.waydroid-nftables else pkgs.waydroid''; + defaultText = lib.literalExpression "if config.networking.nftables.enable then pkgs.waydroid-nftables else pkgs.waydroid"; }; }; diff --git a/nixos/tests/beszel.nix b/nixos/tests/beszel.nix index 77a4a32a3747..d97108ac2c00 100644 --- a/nixos/tests/beszel.nix +++ b/nixos/tests/beszel.nix @@ -106,7 +106,7 @@ "pkey" = "{sshkey}"; "port" = "45876"; "tkn" = "{utoken}"; - "users" = ''{user['record']['id']}''; + "users" = "{user['record']['id']}"; } }}\' "${agentCfg.environment.HUB_URL}/api/collections/systems/records"') diff --git a/nixos/tests/dependency-track.nix b/nixos/tests/dependency-track.nix index 053b9d244a72..82580009faa9 100644 --- a/nixos/tests/dependency-track.nix +++ b/nixos/tests/dependency-track.nix @@ -47,7 +47,7 @@ in port = dependencyTrackPort; nginx.domain = "localhost"; - database.passwordFile = "${pkgs.writeText "dbPassword" ''hunter2'THE'''H''''E''}"; + database.passwordFile = "${pkgs.writeText "dbPassword" "hunter2'THE''H'''E"}"; }; }; }; diff --git a/nixos/tests/lomiri-system-settings.nix b/nixos/tests/lomiri-system-settings.nix index 8018419f8863..4b7975e26d56 100644 --- a/nixos/tests/lomiri-system-settings.nix +++ b/nixos/tests/lomiri-system-settings.nix @@ -167,5 +167,5 @@ machine.screenshot("lss_localised_page_${page.name}") '' ) settingsPages) - + ''''; + + ""; } diff --git a/nixos/tests/matrix/mautrix-meta-postgres.nix b/nixos/tests/matrix/mautrix-meta-postgres.nix index 72f12aa8db6a..b1ecf5da3cdd 100644 --- a/nixos/tests/matrix/mautrix-meta-postgres.nix +++ b/nixos/tests/matrix/mautrix-meta-postgres.nix @@ -73,7 +73,7 @@ in services.mautrix-meta.instances.instagram = { enable = true; - environmentFile = pkgs.writeText ''my-secrets'' '' + environmentFile = pkgs.writeText "my-secrets" '' AS_TOKEN=${asToken} HS_TOKEN=${hsToken} ''; diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index c3405324a4a2..49feef8bd9e6 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -1632,7 +1632,7 @@ let { exporterConfig = { enable = true; - metrics-file = "${pkgs.writeText "test.json" ''{}''}"; + metrics-file = "${pkgs.writeText "test.json" "{}"}"; }; exporterTest = '' wait_for_unit("prometheus-shelly-exporter.service") diff --git a/nixos/tests/restart-by-activation-script.nix b/nixos/tests/restart-by-activation-script.nix index 2fad1f21584e..b156aa21b8a5 100644 --- a/nixos/tests/restart-by-activation-script.nix +++ b/nixos/tests/restart-by-activation-script.nix @@ -51,7 +51,7 @@ specialisation.longscript.configuration = { system.activationScripts.long = { supportsDryActivation = true; - text = lib.concatStringsSep "\n" (lib.genList (i: ''# line number ${toString i}'') 1000000); + text = lib.concatStringsSep "\n" (lib.genList (i: "# line number ${toString i}") 1000000); }; }; }; diff --git a/nixos/tests/syncthing/guiPasswordFile.nix b/nixos/tests/syncthing/guiPasswordFile.nix index fa25fe946c6a..b275e2c70fea 100644 --- a/nixos/tests/syncthing/guiPasswordFile.nix +++ b/nixos/tests/syncthing/guiPasswordFile.nix @@ -26,7 +26,7 @@ insecureAdminAccess = false; user = "alice"; }; - guiPasswordFile = (pkgs.writeText "syncthing-password-file" ''alice_password'').outPath; + guiPasswordFile = (pkgs.writeText "syncthing-password-file" "alice_password").outPath; }; }; diff --git a/pkgs/applications/editors/neovim/tests/default.nix b/pkgs/applications/editors/neovim/tests/default.nix index 1a124b78075b..8e1b79cb3036 100644 --- a/pkgs/applications/editors/neovim/tests/default.nix +++ b/pkgs/applications/editors/neovim/tests/default.nix @@ -35,7 +35,7 @@ let packagesWithSingleLineConfigs = with vimPlugins; [ { plugin = vim-obsession; - config = ''map $ Obsession''; + config = "map $ Obsession"; } { plugin = trouble-nvim; diff --git a/pkgs/applications/editors/vscode/extensions/updateSettings.nix b/pkgs/applications/editors/vscode/extensions/updateSettings.nix index bff445c31537..d88b60547f56 100644 --- a/pkgs/applications/editors/vscode/extensions/updateSettings.nix +++ b/pkgs/applications/editors/vscode/extensions/updateSettings.nix @@ -28,7 +28,7 @@ let symlinkFromUserSettingCmd = lib.optionalString symlinkFromUserSetting ''&& mkdir -p "${userSettingsFolder}" && ln -sfv "$(pwd)/${vscodeSettingsFile}" "${userSettingsFolder}/" ''; in -writeShellScriptBin ''vscodeNixUpdate-${lib.removeSuffix ".json" fileName}'' ( +writeShellScriptBin "vscodeNixUpdate-${lib.removeSuffix ".json" fileName}" ( lib.optionalString (settings != { }) ( if createIfDoesNotExists then '' diff --git a/pkgs/applications/editors/vscode/extensions/vscodeWithConfiguration.nix b/pkgs/applications/editors/vscode/extensions/vscodeWithConfiguration.nix index 6e2fd767a792..8ed6f4c80fbc 100644 --- a/pkgs/applications/editors/vscode/extensions/vscodeWithConfiguration.nix +++ b/pkgs/applications/editors/vscode/extensions/vscodeWithConfiguration.nix @@ -20,11 +20,11 @@ let mutExtsDrvs = extensionsFromVscodeMarketplace mutableExtensions; mutableExtsPaths = lib.forEach mutExtsDrvs (e: { origin = "${e}/share/vscode/extensions/${e.vscodeExtUniqueId}"; - target = ''${vscodeExtsFolderName}/${e.vscodeExtUniqueId}-${ + target = "${vscodeExtsFolderName}/${e.vscodeExtUniqueId}-${ (lib.findSingle ( ext: "${ext.publisher}.${ext.name}" == e.vscodeExtUniqueId ) "" "m" mutableExtensions).version - }''; + }"; }); #removed not defined extensions diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 59652d36bad0..013382e7f1f4 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -357,13 +357,13 @@ let ] ++ lib.optionals (!hasMozSystemDirPatch && allNativeMessagingHosts != [ ]) [ "--run" - ''mkdir -p ''${MOZ_HOME:-~/.mozilla}/native-messaging-hosts'' + "mkdir -p \${MOZ_HOME:-~/.mozilla}/native-messaging-hosts" ] ++ lib.optionals (!hasMozSystemDirPatch) ( lib.concatMap (ext: [ "--run" - ''ln -sfLt ''${MOZ_HOME:-~/.mozilla}/native-messaging-hosts ${ext}/lib/mozilla/native-messaging-hosts/*'' + "ln -sfLt \${MOZ_HOME:-~/.mozilla}/native-messaging-hosts ${ext}/lib/mozilla/native-messaging-hosts/*" ]) allNativeMessagingHosts ); diff --git a/pkgs/applications/networking/linssid/default.nix b/pkgs/applications/networking/linssid/default.nix index b120ed78b549..ef9c30c5a770 100644 --- a/pkgs/applications/networking/linssid/default.nix +++ b/pkgs/applications/networking/linssid/default.nix @@ -49,12 +49,12 @@ stdenv.mkDerivation rec { ''; qtWrapperArgs = [ - ''--prefix PATH : ${ + "--prefix PATH : ${ lib.makeBinPath [ wirelesstools iw ] - }'' + }" ]; meta = { diff --git a/pkgs/applications/science/misc/tulip/default.nix b/pkgs/applications/science/misc/tulip/default.nix index 39a7b666e042..e1e58f93e02f 100644 --- a/pkgs/applications/science/misc/tulip/default.nix +++ b/pkgs/applications/science/misc/tulip/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { libGL ]; - qtWrapperArgs = [ ''--prefix PATH : ${lib.makeBinPath [ python3 ]}'' ]; + qtWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ python3 ]}" ]; env.NIX_CFLAGS_COMPILE = # error: invalid conversion from 'unsigned char*' to 'char*' diff --git a/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix b/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix index 2eae324b17e3..480f2b942416 100644 --- a/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix @@ -20,11 +20,11 @@ libXScrnSaver, libusb1, pkg-config, -# #FIXME: Could not get cmake to pick up on these dependencies -# Ommiting them prevents cmake from building the OCR video capabilities -# Everything else should work it's just missing this one plugin -# tesseract, -# leptonica, + # #FIXME: Could not get cmake to pick up on these dependencies + # Ommiting them prevents cmake from building the OCR video capabilities + # Everything else should work it's just missing this one plugin + # tesseract, + # leptonica, }: let httplib-src = fetchFromGitHub { diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 645491049862..b4dd4cf5d530 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -221,7 +221,7 @@ let --prefix PATH : "$out/libexec/docker:$extraPath" ln -s ${docker-containerd}/bin/containerd $out/libexec/docker/containerd - ln -s ${docker-containerd}/bin/containerd-shim${lib.optionalString (lib.versionAtLeast version "29.0.0") ''-runc-v2''} $out/libexec/docker/containerd-shim${lib.optionalString (lib.versionAtLeast version "29.0.0") ''-runc-v2''} + ln -s ${docker-containerd}/bin/containerd-shim${lib.optionalString (lib.versionAtLeast version "29.0.0") "-runc-v2"} $out/libexec/docker/containerd-shim${lib.optionalString (lib.versionAtLeast version "29.0.0") "-runc-v2"} ln -s ${docker-runc}/bin/runc $out/libexec/docker/runc ln -s ${docker-tini}/bin/tini-static $out/libexec/docker/docker-init diff --git a/pkgs/applications/virtualization/singularity/generic.nix b/pkgs/applications/virtualization/singularity/generic.nix index 2f32733c46d8..a4d4e5f2271d 100644 --- a/pkgs/applications/virtualization/singularity/generic.nix +++ b/pkgs/applications/virtualization/singularity/generic.nix @@ -199,7 +199,7 @@ in lib.concatStringsSep " " [ "--replace-fail" (addShellDoubleQuotes (lib.escapeShellArg originalDefaultPath)) - (addShellDoubleQuotes ''$systemDefaultPath''${systemDefaultPath:+:}${lib.escapeShellArg originalDefaultPath}''${inputsDefaultPath:+:}$inputsDefaultPath'') + (addShellDoubleQuotes "$systemDefaultPath\${systemDefaultPath:+:}${lib.escapeShellArg originalDefaultPath}\${inputsDefaultPath:+:}$inputsDefaultPath") ] ) originalDefaultPaths} '') sourceFilesWithDefaultPaths} diff --git a/pkgs/build-support/fetchpijul/default.nix b/pkgs/build-support/fetchpijul/default.nix index f204c654bf8f..a5388d141375 100644 --- a/pkgs/build-support/fetchpijul/default.nix +++ b/pkgs/build-support/fetchpijul/default.nix @@ -17,10 +17,10 @@ lib.makeOverridable ( state ? null, channel ? "main", name ? "fetchpijul", - # TODO: Changes in pijul are unordered so there's many ways to end up with the same repository state. - # This makes leaveDotPijul unfeasible to implement until pijul CLI implements - # a way of reordering changes to sort them in a consistent and deterministic manner. - # leaveDotPijul ? false + # TODO: Changes in pijul are unordered so there's many ways to end up with the same repository state. + # This makes leaveDotPijul unfeasible to implement until pijul CLI implements + # a way of reordering changes to sort them in a consistent and deterministic manner. + # leaveDotPijul ? false }: if change != null && state != null then throw "Only one of 'change' or 'state' can be set" diff --git a/pkgs/build-support/fetchtorrent/default.nix b/pkgs/build-support/fetchtorrent/default.nix index d3828602594e..5eb6aa5f7241 100644 --- a/pkgs/build-support/fetchtorrent/default.nix +++ b/pkgs/build-support/fetchtorrent/default.nix @@ -9,7 +9,7 @@ rsync, }: let - urlRegexp = ''.*xt=urn:bt[im]h:([^&]{64}|[^&]{40}).*''; + urlRegexp = ".*xt=urn:bt[im]h:([^&]{64}|[^&]{40}).*"; in { url, diff --git a/pkgs/build-support/setup-systemd-units.nix b/pkgs/build-support/setup-systemd-units.nix index 3dd970833668..e9b89df87f07 100644 --- a/pkgs/build-support/setup-systemd-units.nix +++ b/pkgs/build-support/setup-systemd-units.nix @@ -22,10 +22,10 @@ # The names should include the unit suffix # (e.g. ".service") namespace, -# : String -# The namespace for the unit files, to allow for -# multiple independent unit sets managed by -# `setupSystemdUnits`. + # : String + # The namespace for the unit files, to allow for + # multiple independent unit sets managed by + # `setupSystemdUnits`. }: let static = runCommand "systemd-static" { } '' diff --git a/pkgs/build-support/trivial-builders/default.nix b/pkgs/build-support/trivial-builders/default.nix index f2957b7bfe7b..b350d51455cd 100644 --- a/pkgs/build-support/trivial-builders/default.nix +++ b/pkgs/build-support/trivial-builders/default.nix @@ -71,7 +71,7 @@ rec { derivationArgs ? { }, # name of the resulting derivation name, - # TODO(@Artturin): enable strictDeps always + # TODO(@Artturin): enable strictDeps always }: buildCommand: stdenv.mkDerivation ( @@ -170,9 +170,9 @@ rec { name: text: # TODO: To fully deprecate, replace the assertion with `lib.isString` and remove the warning assert lib.assertMsg (lib.strings.isConvertibleWithToString text) - ''pkgs.writeText ${lib.strings.escapeNixString name}: The second argument should be a string, but it's a ${builtins.typeOf text} instead.''; + "pkgs.writeText ${lib.strings.escapeNixString name}: The second argument should be a string, but it's a ${builtins.typeOf text} instead."; lib.warnIf (!lib.isString text) - ''pkgs.writeText ${lib.strings.escapeNixString name}: The second argument should be a string, but it's a ${builtins.typeOf text} instead, which is deprecated. Use `toString` to convert the value to a string first.'' + "pkgs.writeText ${lib.strings.escapeNixString name}: The second argument should be a string, but it's a ${builtins.typeOf text} instead, which is deprecated. Use `toString` to convert the value to a string first." writeTextFile { inherit name text; }; diff --git a/pkgs/build-support/trivial-builders/test/write-text-file.nix b/pkgs/build-support/trivial-builders/test/write-text-file.nix index f9d508de748b..ff57564e3aa9 100644 --- a/pkgs/build-support/trivial-builders/test/write-text-file.nix +++ b/pkgs/build-support/trivial-builders/test/write-text-file.nix @@ -45,7 +45,7 @@ lib.recurseIntoAttrs { weird-name = writeTextFile { name = "weird-names"; destination = "/etc/${veryWeirdName}"; - text = ''passed!''; + text = "passed!"; checkPhase = '' # intentionally hardcode everything here, to make sure # Nix does not mess with file paths diff --git a/pkgs/build-support/writers/test.nix b/pkgs/build-support/writers/test.nix index d0359bbc38dc..971b38ff46b0 100644 --- a/pkgs/build-support/writers/test.nix +++ b/pkgs/build-support/writers/test.nix @@ -596,7 +596,7 @@ recurseIntoAttrs { no-empty-wrapper = let - bin = writeBashBin "bin" { makeWrapperArgs = [ ]; } ''true''; + bin = writeBashBin "bin" { makeWrapperArgs = [ ]; } "true"; in runCommand "run-test-writers-wrapping-no-empty-wrapper" { } '' ls -A ${bin}/bin diff --git a/pkgs/by-name/ai/aiac/package.nix b/pkgs/by-name/ai/aiac/package.nix index cbfc5cc0851e..077100af5378 100644 --- a/pkgs/by-name/ai/aiac/package.nix +++ b/pkgs/by-name/ai/aiac/package.nix @@ -24,7 +24,7 @@ buildGoModule rec { ]; meta = { - description = ''Artificial Intelligence Infrastructure-as-Code Generator''; + description = "Artificial Intelligence Infrastructure-as-Code Generator"; mainProgram = "aiac"; homepage = "https://github.com/gofireflyio/aiac/"; license = lib.licenses.asl20; diff --git a/pkgs/by-name/ai/airwin2rack/package.nix b/pkgs/by-name/ai/airwin2rack/package.nix index 4c378cbd5f45..2a20f5ee8c2d 100644 --- a/pkgs/by-name/ai/airwin2rack/package.nix +++ b/pkgs/by-name/ai/airwin2rack/package.nix @@ -163,7 +163,7 @@ stdenv.mkDerivation { ln -s ${clapJuceExtensions} src-juce/clap-juce-extensions ''; - preConfigure = lib.optionalString enableVCVRack ''export RACK_DIR=${vcvRackSdk}''; + preConfigure = lib.optionalString enableVCVRack "export RACK_DIR=${vcvRackSdk}"; buildPhase = '' runHook preBuild diff --git a/pkgs/by-name/ar/argc/package.nix b/pkgs/by-name/ar/argc/package.nix index fc9b1d53ef58..84092414015a 100644 --- a/pkgs/by-name/ar/argc/package.nix +++ b/pkgs/by-name/ar/argc/package.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeBuildInputs = [ installShellFiles ] ++ lib.optional (!canExecuteHost) buildPackages.argc; postInstall = '' - ARGC=${if canExecuteHost then ''''${!outputBin}/bin/argc'' else "argc"} + ARGC=${if canExecuteHost then "\${!outputBin}/bin/argc" else "argc"} installShellCompletion --cmd argc \ --bash <("$ARGC" --argc-completions bash) \ diff --git a/pkgs/by-name/as/asunder/package.nix b/pkgs/by-name/as/asunder/package.nix index c567e342913b..40c6d1009dd7 100644 --- a/pkgs/by-name/as/asunder/package.nix +++ b/pkgs/by-name/as/asunder/package.nix @@ -21,7 +21,7 @@ #, musepackSupport ? false, TODO: mpcenc monkeysAudioSupport ? false, monkeysAudio, -#, aacSupport ? false, TODO: neroAacEnc + #, aacSupport ? false, TODO: neroAacEnc }: let diff --git a/pkgs/by-name/ba/bazel_8/build-support/patching.nix b/pkgs/by-name/ba/bazel_8/build-support/patching.nix index a2396f57e8ad..10542822230d 100644 --- a/pkgs/by-name/ba/bazel_8/build-support/patching.nix +++ b/pkgs/by-name/ba/bazel_8/build-support/patching.nix @@ -19,6 +19,6 @@ cp ${file} "${path}" diff -u /dev/null "${path}" >result.patch || true # diff exit code is non-zero if there's a diff ''; - installPhase = ''cp result.patch $out''; + installPhase = "cp result.patch $out"; }; } diff --git a/pkgs/by-name/bl/blast/package.nix b/pkgs/by-name/bl/blast/package.nix index 13073175d1ff..287b6a67637c 100644 --- a/pkgs/by-name/bl/blast/package.nix +++ b/pkgs/by-name/bl/blast/package.nix @@ -118,7 +118,7 @@ stdenv.mkDerivation rec { doCheck = false; meta = { - description = ''Basic Local Alignment Search Tool (BLAST) finds regions of similarity between biological sequences''; + description = "Basic Local Alignment Search Tool (BLAST) finds regions of similarity between biological sequences"; homepage = "https://blast.ncbi.nlm.nih.gov/Blast.cgi"; license = lib.licenses.publicDomain; diff --git a/pkgs/by-name/ce/ceph/package.nix b/pkgs/by-name/ce/ceph/package.nix index 52bb3d857699..0309d5af5d95 100644 --- a/pkgs/by-name/ce/ceph/package.nix +++ b/pkgs/by-name/ce/ceph/package.nix @@ -594,7 +594,7 @@ stdenv.mkDerivation { # TODO breaks with sandbox, tries to download stuff with npm "-DWITH_MGR_DASHBOARD_FRONTEND:BOOL=OFF" # WITH_XFS has been set default ON from Ceph 16, keeping it optional in nixpkgs for now - ''-DWITH_XFS=${if optLibxfs != null then "ON" else "OFF"}'' + "-DWITH_XFS=${if optLibxfs != null then "ON" else "OFF"}" ] ++ lib.optional stdenv.hostPlatform.isLinux "-DWITH_SYSTEM_LIBURING=ON"; diff --git a/pkgs/by-name/cm/cmus/package.nix b/pkgs/by-name/cm/cmus/package.nix index 7242a70f9c5c..7e73d01a2cd5 100644 --- a/pkgs/by-name/cm/cmus/package.nix +++ b/pkgs/by-name/cm/cmus/package.nix @@ -66,8 +66,8 @@ mp4Support ? false, mp4v2 ? null, # ffmpeg does support mp4 better -# not in nixpkgs -#, vtxSupport ? true, libayemu ? null + # not in nixpkgs + #, vtxSupport ? true, libayemu ? null }: assert samplerateSupport -> jackSupport; diff --git a/pkgs/by-name/dm/dmd/generic.nix b/pkgs/by-name/dm/dmd/generic.nix index af6449f6f01e..971addbeaf51 100644 --- a/pkgs/by-name/dm/dmd/generic.nix +++ b/pkgs/by-name/dm/dmd/generic.nix @@ -32,9 +32,9 @@ let text = ( lib.generators.toINI { } { Environment = { - DFLAGS = ''-I@out@/include/dmd -L-L@out@/lib -fPIC ${ + DFLAGS = "-I@out@/include/dmd -L-L@out@/lib -fPIC ${ lib.optionalString (!targetPackages.stdenv.cc.isClang) "-L--export-dynamic" - }''; + }"; }; } ); diff --git a/pkgs/by-name/el/elinks/package.nix b/pkgs/by-name/el/elinks/package.nix index 540f183f444b..2ce8ba592931 100644 --- a/pkgs/by-name/el/elinks/package.nix +++ b/pkgs/by-name/el/elinks/package.nix @@ -25,7 +25,7 @@ python ? null, enablePerl ? (!stdenv.hostPlatform.isDarwin) && (stdenv.hostPlatform == stdenv.buildPlatform), perl ? null, -# re-add javascript support when upstream supports modern spidermonkey + # re-add javascript support when upstream supports modern spidermonkey }: assert enableGuile -> guile != null; diff --git a/pkgs/by-name/fo/foxglove-studio/package.nix b/pkgs/by-name/fo/foxglove-studio/package.nix index ef9e3197e1ff..1d1c677c72b6 100644 --- a/pkgs/by-name/fo/foxglove-studio/package.nix +++ b/pkgs/by-name/fo/foxglove-studio/package.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - preFixup = ''patchelf --add-needed libGL.so.1 --add-needed libEGL.so.1 $out/opt/Foxglove/foxglove-studio''; + preFixup = "patchelf --add-needed libGL.so.1 --add-needed libEGL.so.1 $out/opt/Foxglove/foxglove-studio"; passthru.updateScript = ./update.sh; diff --git a/pkgs/by-name/gh/ghost-cli/package.nix b/pkgs/by-name/gh/ghost-cli/package.nix index 836e150aa256..8c9e47045484 100644 --- a/pkgs/by-name/gh/ghost-cli/package.nix +++ b/pkgs/by-name/gh/ghost-cli/package.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { ]; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; - versionCheckProgram = ''${placeholder "out"}/bin/ghost''; + versionCheckProgram = "${placeholder "out"}/bin/ghost"; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/go/gopsuinfo/package.nix b/pkgs/by-name/go/gopsuinfo/package.nix index 6e8ed38b8e00..665bedf8bd0a 100644 --- a/pkgs/by-name/go/gopsuinfo/package.nix +++ b/pkgs/by-name/go/gopsuinfo/package.nix @@ -30,7 +30,7 @@ buildGoModule rec { ''; # Install icons - postInstall = ''make install DESTDIR=$out''; + postInstall = "make install DESTDIR=$out"; meta = { description = "Gopsutil-based command to display system usage info"; diff --git a/pkgs/by-name/gp/gpu-burn/package.nix b/pkgs/by-name/gp/gpu-burn/package.nix index ac4b748d7b49..38ee3cd4b975 100644 --- a/pkgs/by-name/gp/gpu-burn/package.nix +++ b/pkgs/by-name/gp/gpu-burn/package.nix @@ -38,7 +38,7 @@ backendStdenv.mkDerivation { '#define COMPARE_KERNEL "${placeholder "out"}/share/compare.ptx"' substituteInPlace Makefile \ --replace-fail \ - '${''''${CUDAPATH}/bin/nvcc''}' \ + '${"\${CUDAPATH}/bin/nvcc"}' \ '${lib.getExe cuda_nvcc}' ''; diff --git a/pkgs/by-name/hy/hylafaxplus/package.nix b/pkgs/by-name/hy/hylafaxplus/package.nix index 044198f267c9..c0fc6541bc83 100644 --- a/pkgs/by-name/hy/hylafaxplus/package.nix +++ b/pkgs/by-name/hy/hylafaxplus/package.nix @@ -33,7 +33,7 @@ let configSite = replaceVars ./config.site { - config_maxgid = lib.optionalString (maxgid != null) ''CONFIG_MAXGID=${toString maxgid}''; + config_maxgid = lib.optionalString (maxgid != null) "CONFIG_MAXGID=${toString maxgid}"; ghostscript_version = ghostscript.version; out = null; # "out" will be resolved in post-install.sh inherit coreutils ghostscript libtiff; diff --git a/pkgs/by-name/hy/hyperscan/package.nix b/pkgs/by-name/hy/hyperscan/package.nix index 730cd4c4c459..9ff29a06b000 100644 --- a/pkgs/by-name/hy/hyperscan/package.nix +++ b/pkgs/by-name/hy/hyperscan/package.nix @@ -105,7 +105,7 @@ stdenv.mkDerivation (finalAttrs: { runHook preCheck bin/unit-hyperscan - ${lib.optionalString withStatic ''bin/unit-chimera''} + ${lib.optionalString withStatic "bin/unit-chimera"} runHook postCheck ''; diff --git a/pkgs/by-name/ii/iio-oscilloscope/package.nix b/pkgs/by-name/ii/iio-oscilloscope/package.nix index f144b89da8e6..85ffb4703a76 100644 --- a/pkgs/by-name/ii/iio-oscilloscope/package.nix +++ b/pkgs/by-name/ii/iio-oscilloscope/package.nix @@ -17,8 +17,8 @@ jansson, enable9361 ? true, libad9361, -# enable9166 ? true, -# libad9166, + # enable9166 ? true, + # libad9166, }: stdenv.mkDerivation (finalAttrs: { diff --git a/pkgs/by-name/kc/kcc/package.nix b/pkgs/by-name/kc/kcc/package.nix index fab5c48308d5..79268f40b27f 100644 --- a/pkgs/by-name/kc/kcc/package.nix +++ b/pkgs/by-name/kc/kcc/package.nix @@ -59,7 +59,7 @@ python3.pkgs.buildPythonApplication rec { "\${qtWrapperArgs[@]}" ] ++ lib.optionals archiveSupport [ - ''--prefix PATH : ${lib.makeBinPath [ p7zip ]}'' + "--prefix PATH : ${lib.makeBinPath [ p7zip ]}" ]; nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/kr/krb5/package.nix b/pkgs/by-name/kr/krb5/package.nix index c4f6ac9b8ac9..62b21154e65d 100644 --- a/pkgs/by-name/kr/krb5/package.nix +++ b/pkgs/by-name/kr/krb5/package.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { "--enable-static" "--disable-shared" ] - ++ lib.optional stdenv.hostPlatform.isFreeBSD ''WARN_CFLAGS='' + ++ lib.optional stdenv.hostPlatform.isFreeBSD "WARN_CFLAGS=" ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "krb5_cv_attr_constructor_destructor=yes,yes" "ac_cv_func_regcomp=yes" diff --git a/pkgs/by-name/li/libcap/package.nix b/pkgs/by-name/li/libcap/package.nix index b7f5900d30c3..b56fe54f295c 100644 --- a/pkgs/by-name/li/libcap/package.nix +++ b/pkgs/by-name/li/libcap/package.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals withGo [ "GOLANG=yes" - ''GOCACHE=''${TMPDIR}/go-cache'' + "GOCACHE=\${TMPDIR}/go-cache" "GOFLAGS=-trimpath" "GOARCH=${pkgsBuildHost.go.GOARCH}" "GOOS=${pkgsBuildHost.go.GOOS}" diff --git a/pkgs/by-name/li/lightgbm/package.nix b/pkgs/by-name/li/lightgbm/package.nix index 37a6eb92ab6d..57c3522845da 100644 --- a/pkgs/by-name/li/lightgbm/package.nix +++ b/pkgs/by-name/li/lightgbm/package.nix @@ -158,7 +158,7 @@ stdenv.mkDerivation (finalAttrs: { # set the R package buildPhase to null because lightgbm has a # custom builder script that builds and installs in one step - buildPhase = lib.optionals rLibrary ''''; + buildPhase = lib.optionals rLibrary ""; inherit doCheck; @@ -180,7 +180,7 @@ stdenv.mkDerivation (finalAttrs: { cp -r com $out cp -r lightgbmlib.jar $out '' - + '''' + + "" + lib.optionalString rLibrary '' mkdir $out mkdir $out/tmp diff --git a/pkgs/by-name/ma/mariokart64recomp/package.nix b/pkgs/by-name/ma/mariokart64recomp/package.nix index cbfd0a7e7772..e5e1cb3704e1 100644 --- a/pkgs/by-name/ma/mariokart64recomp/package.nix +++ b/pkgs/by-name/ma/mariokart64recomp/package.nix @@ -145,7 +145,7 @@ llvmPackages_19.stdenv.mkDerivation (finalAttrs: { # application level if desired. postFixup = '' wrapProgram $out/bin/MarioKart64Recompiled --chdir "$out/bin/" \ - ${lib.optionalString forceX11 ''--set SDL_VIDEODRIVER x11''} + ${lib.optionalString forceX11 "--set SDL_VIDEODRIVER x11"} ''; meta = { diff --git a/pkgs/by-name/me/meson/package.nix b/pkgs/by-name/me/meson/package.nix index 98ee0b167f6a..322bf863e0f9 100644 --- a/pkgs/by-name/me/meson/package.nix +++ b/pkgs/by-name/me/meson/package.nix @@ -121,26 +121,26 @@ python3.pkgs.buildPythonApplication rec { ++ (map (f: ''rm -vr "${f}";'') ( [ # requires git, creating cyclic dependency - ''test cases/common/66 vcstag'' + "test cases/common/66 vcstag" # requires glib, creating cyclic dependency - ''test cases/linuxlike/6 subdir include order'' - ''test cases/linuxlike/9 compiler checks with dependencies'' + "test cases/linuxlike/6 subdir include order" + "test cases/linuxlike/9 compiler checks with dependencies" # requires static zlib, see #66461 - ''test cases/linuxlike/14 static dynamic linkage'' + "test cases/linuxlike/14 static dynamic linkage" # Nixpkgs cctools does not have bitcode support. - ''test cases/osx/7 bitcode'' + "test cases/osx/7 bitcode" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # requires llvmPackages.openmp, creating cyclic dependency - ''test cases/common/184 openmp'' + "test cases/common/184 openmp" ] ++ lib.optionals stdenv.hostPlatform.isFreeBSD [ # pch doesn't work quite right on FreeBSD, I think - ''test cases/common/13 pch'' + "test cases/common/13 pch" ] ++ lib.optionals python3.isPyPy [ # fails for unknown reason - ''test cases/python/4 custom target depends extmodule'' + "test cases/python/4 custom target depends extmodule" ] )) ++ [ diff --git a/pkgs/by-name/na/national-park-typeface/package.nix b/pkgs/by-name/na/national-park-typeface/package.nix index 5b1f86bbed1d..a742f3fb5b18 100644 --- a/pkgs/by-name/na/national-park-typeface/package.nix +++ b/pkgs/by-name/na/national-park-typeface/package.nix @@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation rec { ''; meta = { - description = ''Typeface designed to mimic the national park service signs that are carved using a router bit''; + description = "Typeface designed to mimic the national park service signs that are carved using a router bit"; homepage = "https://nationalparktypeface.com/"; license = lib.licenses.ofl; maintainers = [ ]; diff --git a/pkgs/by-name/ni/nix-required-mounts/closure.nix b/pkgs/by-name/ni/nix-required-mounts/closure.nix index 3e361114bc4c..777db01599a9 100644 --- a/pkgs/by-name/ni/nix-required-mounts/closure.nix +++ b/pkgs/by-name/ni/nix-required-mounts/closure.nix @@ -19,7 +19,7 @@ runCommand "allowed-patterns.json" let prefix = "${builtins.storeDir}/"; # Has to start with a letter: https://github.com/NixOS/nix/blob/516e7ddc41f39ff939b5d5b5dc71e590f24890d4/src/libstore/build/local-derivation-goal.cc#L568 - exportName = ''references-${lib.strings.removePrefix prefix "${path}"}''; + exportName = "references-${lib.strings.removePrefix prefix "${path}"}"; isStorePath = lib.isStorePath path && (lib.hasPrefix prefix "${path}"); in lib.optionals isStorePath [ diff --git a/pkgs/by-name/no/notify-osd/package.nix b/pkgs/by-name/no/notify-osd/package.nix index c6d0758fcfe2..b419cf461a42 100644 --- a/pkgs/by-name/no/notify-osd/package.nix +++ b/pkgs/by-name/no/notify-osd/package.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { ''; configureFlags = [ - ''--libexecdir=$(out)/bin'' + "--libexecdir=$(out)/bin" ]; preFixup = '' diff --git a/pkgs/by-name/nr/nrfutil/package.nix b/pkgs/by-name/nr/nrfutil/package.nix index 407bff8b1a94..19a0c847eaa7 100644 --- a/pkgs/by-name/nr/nrfutil/package.nix +++ b/pkgs/by-name/nr/nrfutil/package.nix @@ -114,8 +114,8 @@ symlinkJoin { ''--prefix PATH : "$out/bin"'' ''--prefix PATH : "$out"/lib/nrfutil-npm'' ''--prefix PATH : "$out"/lib/nrfutil-nrf5sdk-tools'' - ''--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libusb1 ]}'' - ''--set NRF_JLINK_DLL_PATH '${segger-jlink-headless}'/lib/libjlinkarm.so'' + "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libusb1 ]}" + "--set NRF_JLINK_DLL_PATH '${segger-jlink-headless}'/lib/libjlinkarm.so" ''--set NRFUTIL_BLE_SNIFFER_SHIM_BIN_ENV "$out"/lib/nrfutil-ble-sniffer/wireshark-shim'' ''--set NRFUTIL_BLE_SNIFFER_HCI_SHIM_BIN_ENV "$out"/lib/nrfutil-ble-sniffer/wireshark-hci-shim'' ] diff --git a/pkgs/by-name/op/openapv/package.nix b/pkgs/by-name/op/openapv/package.nix index f2ce7d4eb7dc..0b6cde0ea30a 100644 --- a/pkgs/by-name/op/openapv/package.nix +++ b/pkgs/by-name/op/openapv/package.nix @@ -8,7 +8,7 @@ }: let # Requires an /etc/os-release file, so we override it with this. - osRelease = writeText "os-release" ''ID=NixOS''; + osRelease = writeText "os-release" "ID=NixOS"; in stdenv.mkDerivation (finalAttrs: { pname = "openapv"; diff --git a/pkgs/by-name/pi/picolisp/package.nix b/pkgs/by-name/pi/picolisp/package.nix index 0b9977d24f21..188dfeea5eb7 100644 --- a/pkgs/by-name/pi/picolisp/package.nix +++ b/pkgs/by-name/pi/picolisp/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { openssl readline ]; - sourceRoot = ''pil21''; + sourceRoot = "pil21"; preBuild = '' cd src '' diff --git a/pkgs/by-name/pp/ppsspp/package.nix b/pkgs/by-name/pp/ppsspp/package.nix index 193071f18f3b..deb57e13697c 100644 --- a/pkgs/by-name/pp/ppsspp/package.nix +++ b/pkgs/by-name/pp/ppsspp/package.nix @@ -119,29 +119,29 @@ stdenv.mkDerivation (finalAttrs: { installPhase = lib.concatStringsSep "\n" ( [ - ''runHook preInstall'' + "runHook preInstall" ] ++ [ - ''mkdir -p $out/share/{applications,ppsspp/bin,icons}'' + "mkdir -p $out/share/{applications,ppsspp/bin,icons}" ] ++ ( if enableQt then [ - ''install -Dm555 PPSSPPQt $out/share/ppsspp/bin/'' + "install -Dm555 PPSSPPQt $out/share/ppsspp/bin/" ] else [ - ''install -Dm555 PPSSPPHeadless $out/share/ppsspp/bin/'' - ''makeWrapper $out/share/ppsspp/bin/PPSSPPHeadless $out/bin/ppsspp-headless'' - ''install -Dm555 PPSSPPSDL $out/share/ppsspp/bin/'' + "install -Dm555 PPSSPPHeadless $out/share/ppsspp/bin/" + "makeWrapper $out/share/ppsspp/bin/PPSSPPHeadless $out/bin/ppsspp-headless" + "install -Dm555 PPSSPPSDL $out/share/ppsspp/bin/" ] ) ++ [ - ''mv assets $out/share/ppsspp'' - ''mv ../icons/hicolor $out/share/icons'' + "mv assets $out/share/ppsspp" + "mv ../icons/hicolor $out/share/icons" ] ++ [ - ''runHook postInstall'' + "runHook postInstall" ] ); @@ -164,7 +164,7 @@ stdenv.mkDerivation (finalAttrs: { ); binToBeWrapped = if enableQt then "PPSSPPQt" else "PPSSPPSDL"; in - ''makeWrapper $out/share/ppsspp/bin/${binToBeWrapped} $out/bin/ppsspp ${wrapperArgs}''; + "makeWrapper $out/share/ppsspp/bin/${binToBeWrapped} $out/bin/ppsspp ${wrapperArgs}"; meta = { homepage = "https://www.ppsspp.org/"; diff --git a/pkgs/by-name/pr/pragha/package.nix b/pkgs/by-name/pr/pragha/package.nix index 056693f89115..7ea647aeec8a 100644 --- a/pkgs/by-name/pr/pragha/package.nix +++ b/pkgs/by-name/pr/pragha/package.nix @@ -39,8 +39,8 @@ withXfce4ui ? false, totem-pl-parser, withTotemPlParser ? false, -# , grilo, withGrilo ? false -# , rygel, withRygel ? true + # , grilo, withGrilo ? false + # , rygel, withRygel ? true }: assert withGlyr -> withLastfm; diff --git a/pkgs/by-name/pr/prettier/package.nix b/pkgs/by-name/pr/prettier/package.nix index 71f43ec18168..0a6cd4404971 100644 --- a/pkgs/by-name/pr/prettier/package.nix +++ b/pkgs/by-name/pr/prettier/package.nix @@ -121,7 +121,7 @@ let ${plugin.pname}: error context, tried finding entry point under; pathAbsoluteNaive -> ${pathAbsoluteNaive} pathAbsoluteFallback -> ${pathAbsoluteFallback} - '' throw ''${plugin.pname}: does not provide parse-able entry point''; + '' throw "${plugin.pname}: does not provide parse-able entry point"; in stdenv.mkDerivation (finalAttrs: { pname = "prettier"; diff --git a/pkgs/by-name/pu/puredata/package.nix b/pkgs/by-name/pu/puredata/package.nix index 54e04bba7ebb..2aca99971134 100644 --- a/pkgs/by-name/pu/puredata/package.nix +++ b/pkgs/by-name/pu/puredata/package.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = ''Real-time graphical programming environment for audio, video, and graphical processing''; + description = "Real-time graphical programming environment for audio, video, and graphical processing"; homepage = "http://puredata.info"; license = lib.licenses.bsd3; platforms = lib.platforms.linux ++ lib.platforms.darwin; diff --git a/pkgs/by-name/qu/qutebrowser/package.nix b/pkgs/by-name/qu/qutebrowser/package.nix index e3fb61f4a77a..bfa0fbb44de5 100644 --- a/pkgs/by-name/qu/qutebrowser/package.nix +++ b/pkgs/by-name/qu/qutebrowser/package.nix @@ -150,7 +150,7 @@ python3.pkgs.buildPythonApplication { "''${qtWrapperArgs[@]}" # avoid persistant warning on starup --set QT_STYLE_OVERRIDE Fusion - ${lib.optionalString pipewireSupport ''--prefix LD_LIBRARY_PATH : ${libPath}''} + ${lib.optionalString pipewireSupport "--prefix LD_LIBRARY_PATH : ${libPath}"} ${lib.optionalString enableVulkan '' --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]} --set-default QSG_RHI_BACKEND vulkan diff --git a/pkgs/by-name/ra/razergenie/package.nix b/pkgs/by-name/ra/razergenie/package.nix index 9e72a1dde834..0e5f5ad38ca8 100644 --- a/pkgs/by-name/ra/razergenie/package.nix +++ b/pkgs/by-name/ra/razergenie/package.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-TxW6IUHmEaNdJPeEGwo57a3EGH6MMyitVTmzStVmZjc="; }; - postUnpack = ''ln -s ${libopenrazer} libopenrazer''; + postUnpack = "ln -s ${libopenrazer} libopenrazer"; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ro/rofi/package.nix b/pkgs/by-name/ro/rofi/package.nix index 472886bb7912..d0653ce6eaf7 100644 --- a/pkgs/by-name/ro/rofi/package.nix +++ b/pkgs/by-name/ro/rofi/package.nix @@ -43,7 +43,7 @@ symlinkJoin { --prefix XDG_DATA_DIRS : ${hicolor-icon-theme}/share \ ${ lib.optionalString (plugins != [ ]) - ''--prefix XDG_DATA_DIRS : ${lib.concatStringsSep ":" (lib.forEach plugins (p: "${p.out}/share"))}'' + "--prefix XDG_DATA_DIRS : ${lib.concatStringsSep ":" (lib.forEach plugins (p: "${p.out}/share"))}" } \ ${lib.optionalString (theme != null) ''--add-flags "-theme ${theme}"''} \ ${lib.optionalString (plugins != [ ]) ''--add-flags "-plugin-path $out/lib/rofi"''} diff --git a/pkgs/by-name/si/sirikali/package.nix b/pkgs/by-name/si/sirikali/package.nix index 4e082f346d9d..c2ee2e8cb11c 100644 --- a/pkgs/by-name/si/sirikali/package.nix +++ b/pkgs/by-name/si/sirikali/package.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { ]; qtWrapperArgs = [ - ''--prefix PATH : ${ + "--prefix PATH : ${ lib.makeBinPath [ cryfs encfs @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { securefs sshfs ] - }'' + }" ]; doCheck = true; diff --git a/pkgs/by-name/sp/space-station-14-launcher/package.nix b/pkgs/by-name/sp/space-station-14-launcher/package.nix index 85bfbbaa2afa..d2b30d91ea90 100644 --- a/pkgs/by-name/sp/space-station-14-launcher/package.nix +++ b/pkgs/by-name/sp/space-station-14-launcher/package.nix @@ -107,7 +107,7 @@ buildDotnetModule rec { # ${soundfont-path} is escaped here: # https://github.com/NixOS/nixpkgs/blob/d29975d32b1dc7fe91d5cb275d20f8f8aba399ad/pkgs/build-support/setup-hooks/make-wrapper.sh#L126C35-L126C45 # via https://www.gnu.org/software/bash/manual/html_node/Shell-Parameter-Expansion.html under ${parameter@operator} - makeWrapperArgs = [ ''--set ROBUST_SOUNDFONT_OVERRIDE ${soundfont-path}'' ]; + makeWrapperArgs = [ "--set ROBUST_SOUNDFONT_OVERRIDE ${soundfont-path}" ]; executables = [ "SS14.Launcher" ]; diff --git a/pkgs/by-name/st/sticky/package.nix b/pkgs/by-name/st/sticky/package.nix index ba70b3e3b905..56c03f2882e0 100644 --- a/pkgs/by-name/st/sticky/package.nix +++ b/pkgs/by-name/st/sticky/package.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gitUpdater { - ignoredVersions = ''master.*''; + ignoredVersions = "master.*"; }; }; diff --git a/pkgs/by-name/sy/syncterm/package.nix b/pkgs/by-name/sy/syncterm/package.nix index 5699d00bd206..8fcad3d6b7e2 100644 --- a/pkgs/by-name/sy/syncterm/package.nix +++ b/pkgs/by-name/sy/syncterm/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { }; # We can't use sourceRoot, as the cherry-picked patches apply to files outside of it. - postPatch = ''cd src/syncterm''; + postPatch = "cd src/syncterm"; CFLAGS = [ "-DHAS_INTTYPES_H" diff --git a/pkgs/by-name/td/tdb/package.nix b/pkgs/by-name/td/tdb/package.nix index 81b296c62786..e1de49bc5b8f 100644 --- a/pkgs/by-name/td/tdb/package.nix +++ b/pkgs/by-name/td/tdb/package.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { postFixup = if stdenv.hostPlatform.isDarwin then - ''install_name_tool -id $out/lib/libtdb.dylib $out/lib/libtdb.dylib'' + "install_name_tool -id $out/lib/libtdb.dylib $out/lib/libtdb.dylib" else null; diff --git a/pkgs/by-name/tt/ttfautohint/package.nix b/pkgs/by-name/tt/ttfautohint/package.nix index 4b9c579ba8fc..ec996dbbab78 100644 --- a/pkgs/by-name/tt/ttfautohint/package.nix +++ b/pkgs/by-name/tt/ttfautohint/package.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals enableGUI [ libsForQt5.qt5.qtbase ]; configureFlags = [ - ''--with-qt=${if enableGUI then "${libsForQt5.qt5.qtbase}/lib" else "no"}'' + "--with-qt=${if enableGUI then "${libsForQt5.qt5.qtbase}/lib" else "no"}" ] ++ lib.optionals (!enableGUI) [ "--without-doc" ]; diff --git a/pkgs/by-name/uu/uutils-coreutils/package.nix b/pkgs/by-name/uu/uutils-coreutils/package.nix index e5142e2ce05d..a47b6d3e966c 100644 --- a/pkgs/by-name/uu/uutils-coreutils/package.nix +++ b/pkgs/by-name/uu/uutils-coreutils/package.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals buildMulticallBinary [ "MULTICALL=y" ]; env = lib.optionalAttrs selinuxSupport { - SELINUX_INCLUDE_DIR = ''${libselinux.dev}/include''; + SELINUX_INCLUDE_DIR = "${libselinux.dev}/include"; SELINUX_LIB_DIR = lib.makeLibraryPath [ libselinux ]; diff --git a/pkgs/by-name/wa/wakapi/package.nix b/pkgs/by-name/wa/wakapi/package.nix index 17ad2046d65a..c6fe08a53e84 100644 --- a/pkgs/by-name/wa/wakapi/package.nix +++ b/pkgs/by-name/wa/wakapi/package.nix @@ -25,7 +25,7 @@ buildGoLatestModule { excludedPackages = [ "scripts" ]; # Fix up reported version - postPatch = ''echo ${version} > version.txt''; + postPatch = "echo ${version} > version.txt"; ldflags = [ "-s" diff --git a/pkgs/by-name/wa/waytrogen/package.nix b/pkgs/by-name/wa/waytrogen/package.nix index 93ea549ba19f..d765581fd205 100644 --- a/pkgs/by-name/wa/waytrogen/package.nix +++ b/pkgs/by-name/wa/waytrogen/package.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { openssl ]; - preBuild = ''export OUT_PATH=$out''; + preBuild = "export OUT_PATH=$out"; env = { OPENSSL_NO_VENDOR = 1; diff --git a/pkgs/by-name/xe/xeus/package.nix b/pkgs/by-name/xe/xeus/package.nix index 6d42b94f8589..4cd4e3edbed1 100644 --- a/pkgs/by-name/xe/xeus/package.nix +++ b/pkgs/by-name/xe/xeus/package.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { ]; doCheck = true; - preCheck = ''export LD_LIBRARY_PATH=$PWD''; + preCheck = "export LD_LIBRARY_PATH=$PWD"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ze/zelda64recomp/package.nix b/pkgs/by-name/ze/zelda64recomp/package.nix index f04215319157..53000e040a01 100644 --- a/pkgs/by-name/ze/zelda64recomp/package.nix +++ b/pkgs/by-name/ze/zelda64recomp/package.nix @@ -142,7 +142,7 @@ llvmPackages_19.stdenv.mkDerivation (finalAttrs: { # application level if desired. postFixup = '' wrapProgram $out/bin/Zelda64Recompiled --chdir "$out/bin/" \ - ${lib.optionalString forceX11 ''--set SDL_VIDEODRIVER x11''} + ${lib.optionalString forceX11 "--set SDL_VIDEODRIVER x11"} ''; meta = { diff --git a/pkgs/by-name/zx/zxtune/package.nix b/pkgs/by-name/zx/zxtune/package.nix index 0054a1e57286..8a6d5714c248 100644 --- a/pkgs/by-name/zx/zxtune/package.nix +++ b/pkgs/by-name/zx/zxtune/package.nix @@ -91,10 +91,10 @@ stdenv.mkDerivation rec { let setOptionalSupport = name: var: "support_${name}=" + (if var then "1" else ""); makeOptsCommon = [ - ''-j$NIX_BUILD_CORES'' - ''root.version=${src.rev}'' - ''system.zlib=1'' - ''platform=${platformName}'' + "-j$NIX_BUILD_CORES" + "root.version=${src.rev}" + "system.zlib=1" + "platform=${platformName}" ''includes.dirs.${platformName}="${lib.makeSearchPathOutput "dev" "include" buildInputs}"'' ''libraries.dirs.${platformName}="${lib.makeLibraryPath staticBuildInputs}"'' ''ld_flags="-Wl,-rpath=\"${lib.makeLibraryPath dlopenBuildInputs}\""'' @@ -108,9 +108,9 @@ stdenv.mkDerivation rec { (setOptionalSupport "pulseaudio" withPulse) ]; makeOptsQt = [ - ''tools.uic=${qt5.qtbase.dev}/bin/uic'' - ''tools.moc=${qt5.qtbase.dev}/bin/moc'' - ''tools.rcc=${qt5.qtbase.dev}/bin/rcc'' + "tools.uic=${qt5.qtbase.dev}/bin/uic" + "tools.moc=${qt5.qtbase.dev}/bin/moc" + "tools.rcc=${qt5.qtbase.dev}/bin/rcc" ]; in '' diff --git a/pkgs/development/coq-modules/ElmExtraction/default.nix b/pkgs/development/coq-modules/ElmExtraction/default.nix index ddb5b5dbb85d..c7c336305e3d 100644 --- a/pkgs/development/coq-modules/ElmExtraction/default.nix +++ b/pkgs/development/coq-modules/ElmExtraction/default.nix @@ -44,7 +44,7 @@ mkCoqDerivation { metacoq ]; - postPatch = ''patchShebangs ./tests/process-extraction-examples.sh''; + postPatch = "patchShebangs ./tests/process-extraction-examples.sh"; meta = { description = "Framework for extracting Coq programs to Elm"; diff --git a/pkgs/development/cuda-modules/packages/cuda_nvcc.nix b/pkgs/development/cuda-modules/packages/cuda_nvcc.nix index 75c81476d109..dd2b85934b29 100644 --- a/pkgs/development/cuda-modules/packages/cuda_nvcc.nix +++ b/pkgs/development/cuda-modules/packages/cuda_nvcc.nix @@ -87,7 +87,7 @@ buildRedist (finalAttrs: { ++ lib.optionals (cudaOlder "12.5") [ "$(_NVVM_BRANCH_)" ] ++ lib.optionals (cudaAtLeast "12.5") [ "nvvm" ] ); - newNvvmDir = ''''${!outputBin:?}/nvvm''; + newNvvmDir = "\${!outputBin:?}/nvvm"; in lib.optionalString finalAttrs.finalPackage.meta.available ( # From CUDA 13.0, NVVM is available as a separate library and not bundled in the NVCC redist. diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 1e2df1082117..9fb971bfd2ce 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -259523,7 +259523,7 @@ self: { sed -i "s|\"-s\"|\"\"|" ./Setup.hs sed -i "s|numJobs (bf bi)++||" ./Setup.hs ''; - preBuild = ''export LD_LIBRARY_PATH=`pwd`/dist/build''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH''; + preBuild = "export LD_LIBRARY_PATH=`pwd`/dist/build\${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"; description = "Grammatical Framework"; license = "unknown"; hydraPlatforms = lib.platforms.none; diff --git a/pkgs/development/interpreters/php/service.nix b/pkgs/development/interpreters/php/service.nix index 06b1247c5e20..e41aa6ae3f30 100644 --- a/pkgs/development/interpreters/php/service.nix +++ b/pkgs/development/interpreters/php/service.nix @@ -84,7 +84,7 @@ in package = lib.mkOption { type = lib.types.package; description = "PHP package to use for php-fpm"; - defaultText = lib.literalMD ''The PHP package that provided this module.''; + defaultText = lib.literalMD "The PHP package that provided this module."; example = lib.literalExpression '' php.buildEnv { extensions = diff --git a/pkgs/development/julia-modules/util.nix b/pkgs/development/julia-modules/util.nix index c9e3fb54e092..a10d3f5d35cd 100644 --- a/pkgs/development/julia-modules/util.nix +++ b/pkgs/development/julia-modules/util.nix @@ -24,7 +24,7 @@ # Convert an ordinary source checkout into a repo with a single commit repoifySimple = name: path: - runCommand ''${name}-repoified'' { buildInputs = [ gitMinimal ]; } '' + runCommand "${name}-repoified" { buildInputs = [ gitMinimal ]; } '' mkdir -p $out cp -r ${path}/. $out cd $out @@ -40,7 +40,7 @@ # Convert an dependency source info into a repo with a single commit repoifyInfo = uuid: info: - runCommand ''julia-${info.name}-${info.version}'' { buildInputs = [ gitMinimal ]; } '' + runCommand "julia-${info.name}-${info.version}" { buildInputs = [ gitMinimal ]; } '' mkdir -p $out cp -r ${info.src}/. $out cd $out diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 020e9e9580e5..0720a23b8936 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -435,14 +435,14 @@ stdenv.mkDerivation ( "-I" "${openssl.dev}/include" "-system-sqlite" - ''-${if mysqlSupport then "plugin" else "no"}-sql-mysql'' - ''-${if libpq != null then "plugin" else "no"}-sql-psql'' + "-${if mysqlSupport then "plugin" else "no"}-sql-mysql" + "-${if libpq != null then "plugin" else "no"}-sql-psql" "-system-libpng" "-make libs" "-make tools" - ''-${lib.optionalString (!buildExamples) "no"}make examples'' - ''-${lib.optionalString (!buildTests) "no"}make tests'' + "-${lib.optionalString (!buildExamples) "no"}make examples" + "-${lib.optionalString (!buildTests) "no"}make tests" ] ++ ( if stdenv.hostPlatform.isDarwin then @@ -471,7 +471,7 @@ stdenv.mkDerivation ( "-I" "${libXrender.out}/include" - ''-${lib.optionalString (cups == null) "no-"}cups'' + "-${lib.optionalString (cups == null) "no-"}cups" "-dbus-linked" "-glib" ] diff --git a/pkgs/development/python-modules/argilla/default.nix b/pkgs/development/python-modules/argilla/default.nix index da8366b840d6..d5b7b6560858 100644 --- a/pkgs/development/python-modules/argilla/default.nix +++ b/pkgs/development/python-modules/argilla/default.nix @@ -58,11 +58,11 @@ typer, uvicorn, wrapt, -# , flair -# , setfit -# , spacy-huggingface-hub -# , span_marker -# , trl + # , flair + # , setfit + # , spacy-huggingface-hub + # , span_marker + # , trl }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/dogtail/default.nix b/pkgs/development/python-modules/dogtail/default.nix index 04067083b56a..5cc46af5fd31 100644 --- a/pkgs/development/python-modules/dogtail/default.nix +++ b/pkgs/development/python-modules/dogtail/default.nix @@ -13,7 +13,7 @@ dbus, xvfb-run, wrapGAppsHook3, -# , fetchPypi + # , fetchPypi }: buildPythonPackage { diff --git a/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix b/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix index bb1b2331e6c0..d40e7f97ebc8 100644 --- a/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix +++ b/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix @@ -258,9 +258,9 @@ stdenv.mkDerivation rec { gnFlags = [ ''chip_project_config_include_dirs=["//.."]'' ''chip_crypto="openssl"'' - ''enable_rtti=true'' - ''chip_config_memory_debug_checks=false'' - ''chip_config_memory_debug_dmalloc=false'' + "enable_rtti=true" + "chip_config_memory_debug_checks=false" + "chip_config_memory_debug_dmalloc=false" ''chip_mdns="minimal"'' ''chip_minmdns_default_policy="libnl"'' ''chip_python_version="${lib.versions.majorMinor python.version}"'' diff --git a/pkgs/development/python-modules/openslide/default.nix b/pkgs/development/python-modules/openslide/default.nix index 1cce35847bd2..663c1d30df26 100644 --- a/pkgs/development/python-modules/openslide/default.nix +++ b/pkgs/development/python-modules/openslide/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - preCheck = ''rm -rf openslide/''; + preCheck = "rm -rf openslide/"; meta = { description = "Python bindings to the OpenSlide library for reading whole-slide microscopy images"; diff --git a/pkgs/development/python-modules/pillow-jpls/default.nix b/pkgs/development/python-modules/pillow-jpls/default.nix index 01a973784202..a4275b3450b3 100644 --- a/pkgs/development/python-modules/pillow-jpls/default.nix +++ b/pkgs/development/python-modules/pillow-jpls/default.nix @@ -69,7 +69,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; # Prevent importing from build during test collection: - preCheck = ''rm -rf pillow_jpls''; + preCheck = "rm -rf pillow_jpls"; pythonImportsCheck = [ "pillow_jpls" ]; diff --git a/pkgs/development/python-modules/prodict/default.nix b/pkgs/development/python-modules/prodict/default.nix index e204161f1647..9a29d904841e 100644 --- a/pkgs/development/python-modules/prodict/default.nix +++ b/pkgs/development/python-modules/prodict/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { }; # make setuptools happy on case-sensitive filesystems - postPatch = ''if [[ ! -f README.md ]]; then mv README.MD README.md; fi''; + postPatch = "if [[ ! -f README.md ]]; then mv README.MD README.md; fi"; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/scapy/default.nix b/pkgs/development/python-modules/scapy/default.nix index 29b2c3b940a5..18bcd842b60e 100644 --- a/pkgs/development/python-modules/scapy/default.nix +++ b/pkgs/development/python-modules/scapy/default.nix @@ -16,8 +16,8 @@ withManufDb ? false, wireshark, libpcap, -# 2D/3D graphics and graphs TODO: VPython -# TODO: nmap, numpy + # 2D/3D graphics and graphs TODO: VPython + # TODO: nmap, numpy }: buildPythonPackage rec { diff --git a/pkgs/development/tools/tora/default.nix b/pkgs/development/tools/tora/default.nix index e003d73a97e4..0ae2c7deb581 100644 --- a/pkgs/development/tools/tora/default.nix +++ b/pkgs/development/tools/tora/default.nix @@ -71,7 +71,7 @@ mkDerivation { NIX_LDFLAGS = "-lgvc -lmysqlclient -lecpg -lssl -L${libmysqlclient}/lib/mariadb"; qtWrapperArgs = [ - ''--prefix PATH : ${lib.getBin graphviz}/bin'' + "--prefix PATH : ${lib.getBin graphviz}/bin" ]; postPatch = '' diff --git a/pkgs/games/dwarf-fortress/wrapper/default.nix b/pkgs/games/dwarf-fortress/wrapper/default.nix index 8c941c8879bd..eb3970b35867 100644 --- a/pkgs/games/dwarf-fortress/wrapper/default.nix +++ b/pkgs/games/dwarf-fortress/wrapper/default.nix @@ -33,7 +33,7 @@ # An attribute set of settings to override in data/init/*.txt. # For example, `init.FOO = true;` is translated to `[FOO:YES]` in init.txt settings ? { }, -# TODO world-gen.txt, interface.txt require special logic + # TODO world-gen.txt, interface.txt require special logic }: let diff --git a/pkgs/pkgs-lib/tests/formats.nix b/pkgs/pkgs-lib/tests/formats.nix index ccbda6b7086e..a32db61709b5 100644 --- a/pkgs/pkgs-lib/tests/formats.nix +++ b/pkgs/pkgs-lib/tests/formats.nix @@ -854,7 +854,7 @@ runBuildTests { format = formats.nixConf { package = pkgs.nix; version = pkgs.nix.version; - extraOptions = ''ignore-try = false''; + extraOptions = "ignore-try = false"; }; input = { auto-optimise-store = true; diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 0c1225237ba7..803389ee8f15 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -219,7 +219,7 @@ xwd, xwininfo, xwud, -# keep-sorted end + # keep-sorted end }: _: { diff --git a/pkgs/tools/backup/percona-xtrabackup/8_4.nix b/pkgs/tools/backup/percona-xtrabackup/8_4.nix index dbbe364f802c..28b21a7d7b8f 100644 --- a/pkgs/tools/backup/percona-xtrabackup/8_4.nix +++ b/pkgs/tools/backup/percona-xtrabackup/8_4.nix @@ -12,6 +12,6 @@ callPackage ./generic.nix ( extraPatches = [ ]; - extraPostInstall = ''''; + extraPostInstall = ""; } ) diff --git a/pkgs/tools/system/hw-probe/default.nix b/pkgs/tools/system/hw-probe/default.nix index 6ce4cc29c8f6..6cddbaf022fd 100644 --- a/pkgs/tools/system/hw-probe/default.nix +++ b/pkgs/tools/system/hw-probe/default.nix @@ -55,7 +55,7 @@ withSuggested ? false, # Install (most) suggested tools hplip, sane-backends, -# , pnputils # pnputils (lspnp) isn't currently in nixpkgs and appears to be poorly maintained + # , pnputils # pnputils (lspnp) isn't currently in nixpkgs and appears to be poorly maintained }: stdenv.mkDerivation rec { diff --git a/pkgs/top-level/emscripten-packages.nix b/pkgs/top-level/emscripten-packages.nix index aafe1e3af0b1..c54b878ecb5d 100644 --- a/pkgs/top-level/emscripten-packages.nix +++ b/pkgs/top-level/emscripten-packages.nix @@ -154,7 +154,7 @@ rec { cp *.rng $out/share cp README.md $doc/share/${pname} ''; - checkPhase = ''''; + checkPhase = ""; }; zlib =