···254254 => false
255255 */
256256 hasInfix = infix: content:
257257- builtins.match ".*${escapeRegex infix}.*" content != null;
257257+ builtins.match ".*${escapeRegex infix}.*" "${content}" != null;
258258259259 /* Convert a string to a list of characters (i.e. singleton strings).
260260 This allows you to, e.g., map a function over each character. However,
···13601360 </listitem>
13611361 <listitem>
13621362 <para>
13631363+ <literal>services.zookeeper</literal> has a new option
13641364+ <literal>jre</literal> for specifying the JRE to start
13651365+ zookeeper with. It defaults to the JRE that
13661366+ <literal>pkgs.zookeeper</literal> was wrapped with, instead of
13671367+ <literal>pkgs.jre</literal>. This changes the JRE to
13681368+ <literal>pkgs.jdk11_headless</literal> by default.
13691369+ </para>
13701370+ </listitem>
13711371+ <listitem>
13721372+ <para>
13631373 <literal>pkgs.pgadmin</literal> now refers to
13641374 <literal>pkgs.pgadmin4</literal>. <literal>pgadmin3</literal>
13651375 has been removed.
+4
nixos/doc/manual/release-notes/rl-2205.section.md
···541541 you should change the package you refer to. If you don't need them update your
542542 commands from `otelcontribcol` to `otelcorecol` and enjoy a 7x smaller binary.
543543544544+- `services.zookeeper` has a new option `jre` for specifying the JRE to start
545545+ zookeeper with. It defaults to the JRE that `pkgs.zookeeper` was wrapped with,
546546+ instead of `pkgs.jre`. This changes the JRE to `pkgs.jdk11_headless` by default.
547547+544548- `pkgs.pgadmin` now refers to `pkgs.pgadmin4`. `pgadmin3` has been removed.
545549546550- `pkgs.noto-fonts-cjk` is now deprecated in favor of `pkgs.noto-fonts-cjk-sans`
+8-1
nixos/modules/services/misc/zookeeper.nix
···114114 type = types.package;
115115 };
116116117117+ jre = mkOption {
118118+ description = "The JRE with which to run Zookeeper";
119119+ default = cfg.package.jre;
120120+ defaultText = literalExpression "pkgs.zookeeper.jre";
121121+ example = literalExpression "pkgs.jre";
122122+ type = types.package;
123123+ };
117124 };
118125119126···131138 after = [ "network.target" ];
132139 serviceConfig = {
133140 ExecStart = ''
134134- ${pkgs.jre}/bin/java \
141141+ ${cfg.jre}/bin/java \
135142 -cp "${cfg.package}/lib/*:${configDir}" \
136143 ${escapeShellArgs cfg.extraCmdLineOptions} \
137144 -Dzookeeper.datadir.autocreate=false \
+11-43
nixos/modules/services/networking/asterisk.nix
···14141515 # Add filecontents from files of useTheseDefaultConfFiles to confFiles, do not override
1616 defaultConfFiles = subtractLists (attrNames cfg.confFiles) cfg.useTheseDefaultConfFiles;
1717- allConfFiles =
1818- cfg.confFiles //
1919- builtins.listToAttrs (map (x: { name = x;
2020- value = builtins.readFile (cfg.package + "/etc/asterisk/" + x); })
2121- defaultConfFiles);
2222-2323- asteriskEtc = pkgs.stdenv.mkDerivation
2424- ((mapAttrs' (name: value: nameValuePair
2525- # Fudge the names to make bash happy
2626- ((replaceChars ["."] ["_"] name) + "_")
2727- (value)
2828- ) allConfFiles) //
2929- {
3030- confFilesString = concatStringsSep " " (
3131- attrNames allConfFiles
3232- );
3333-3434- name = "asterisk-etc";
3535-1717+ allConfFiles = {
3618 # Default asterisk.conf file
3737- # (Notice that astetcdir will be set to the path of this derivation)
3838- asteriskConf = ''
1919+ "asterisk.conf".text = ''
3920 [directories]
4021 astetcdir => /etc/asterisk
4122 astmoddir => ${cfg.package}/lib/asterisk/modules
···4829 astrundir => /run/asterisk
4930 astlogdir => /var/log/asterisk
5031 astsbindir => ${cfg.package}/sbin
3232+ ${cfg.extraConfig}
5133 '';
5252- extraConf = cfg.extraConfig;
53345435 # Loading all modules by default is considered sensible by the authors of
5536 # "Asterisk: The Definitive Guide". Secure sites will likely want to
5637 # specify their own "modules.conf" in the confFiles option.
5757- modulesConf = ''
3838+ "modules.conf".text = ''
5839 [modules]
5940 autoload=yes
6041 '';
61426243 # Use syslog for logging so logs can be viewed with journalctl
6363- loggerConf = ''
4444+ "logger.conf".text = ''
6445 [general]
65466647 [logfiles]
6748 syslog.local0 => notice,warning,error
6849 '';
5050+ } //
5151+ mapAttrs (name: text: { inherit text; }) cfg.confFiles //
5252+ listToAttrs (map (x: nameValuePair x { source = cfg.package + "/etc/asterisk/" + x; }) defaultConfFiles);
69537070- buildCommand = ''
7171- mkdir -p "$out"
7272-7373- # Create asterisk.conf, pointing astetcdir to the path of this derivation
7474- echo "$asteriskConf" | sed "s|@out@|$out|g" > "$out"/asterisk.conf
7575- echo "$extraConf" >> "$out"/asterisk.conf
7676-7777- echo "$modulesConf" > "$out"/modules.conf
7878-7979- echo "$loggerConf" > "$out"/logger.conf
8080-8181- # Config files specified in confFiles option override all other files
8282- for i in $confFilesString; do
8383- conf=$(echo "$i"_ | sed 's/\./_/g')
8484- echo "''${!conf}" > "$out"/"$i"
8585- done
8686- '';
8787- });
8854in
89559056{
···209175 config = mkIf cfg.enable {
210176 environment.systemPackages = [ cfg.package ];
211177212212- environment.etc.asterisk.source = asteriskEtc;
178178+ environment.etc = mapAttrs' (name: value:
179179+ nameValuePair "asterisk/${name}" value
180180+ ) allConfFiles;
213181214182 users.users.asterisk =
215183 { name = asteriskUser;
+1-1
nixos/modules/services/system/nscd.nix
···3838 default = if pkgs.stdenv.hostPlatform.libc == "glibc"
3939 then pkgs.stdenv.cc.libc.bin
4040 else pkgs.glibc.bin;
4141- defaultText = literalExample ''
4141+ defaultText = lib.literalExpression ''
4242 if pkgs.stdenv.hostPlatform.libc == "glibc"
4343 then pkgs.stdenv.cc.libc.bin
4444 else pkgs.glibc.bin;
+2
pkgs/applications/audio/guitarix/default.nix
···108108 "--install-roboto-font"
109109 ] ++ optional optimizationSupport "--optimization";
110110111111+ NIX_CFLAGS_COMPILE = [ "-fpermissive" ];
112112+111113 meta = with lib; {
112114 description = "A virtual guitar amplifier for Linux running with JACK";
113115 longDescription = ''
···11-# This file has been generated by node2nix 1.9.0. Do not edit!
11+# This file has been generated by node2nix 1.11.1. Do not edit!
2233{pkgs ? import <nixpkgs> {
44 inherit system;
+7-37
pkgs/development/node-packages/default.nix
···247247248248 node2nix = super.node2nix.override {
249249 buildInputs = [ pkgs.makeWrapper ];
250250- # We need to apply a patch to the source, but buildNodePackage doesn't allow patches.
251251- # So we pin the patched commit instead. The commit actually contains two other newer commits
252252- # since the last (1.9.0) release, but actually this is a good thing since one of them is a
253253- # Hydra-specific fix.
254254- src = applyPatches {
255255- src = fetchFromGitHub {
256256- owner = "svanderburg";
257257- repo = "node2nix";
258258- rev = "node2nix-1.9.0";
259259- sha256 = "0l4wp1131nhl9c14cn8bwawb8f77h1nfbnswgi5lp5m3kzkb27jn";
260260- };
261261-262262- patches = [
263263- # remove node_ name prefix
264264- (fetchpatch {
265265- url = "https://github.com/svanderburg/node2nix/commit/b54d45207427ff46e90f16f2f32771fdc8bff5a4.patch";
266266- sha256 = "sha256-ubUdF0q3l4xxqZ7f9EiQEUQzyqxi9Q6zsRPETHlfzh8=";
267267- })
268268- # set meta platform
269269- (fetchpatch {
270270- url = "https://github.com/svanderburg/node2nix/commit/58736093161f2d237c17e75a96529b018cd0ac64.patch";
271271- sha256 = "0sif7803c9g6gjmmdniw5qxrq5igiz9nqdmdrcf1hxfi5x43a32h";
272272- })
273273- # Extract common logic from composePackage to a shell function
274274- (fetchpatch {
275275- url = "https://github.com/svanderburg/node2nix/commit/e4c951971df6c9f9584c7252971c13b55c369916.patch";
276276- sha256 = "0w8fcyr12g2340rn06isv40jkmz2khmak81c95zpkjgipzx7hp7w";
277277- })
278278- # handle package alias in dependencies
279279- # https://github.com/svanderburg/node2nix/pull/240
280280- #
281281- # TODO: remove after node2nix 1.10.0
282282- (fetchpatch {
283283- url = "https://github.com/svanderburg/node2nix/commit/644e90c0304038a446ed53efc97e9eb1e2831e71.patch";
284284- sha256 = "sha256-sQgVf80H1ouUjzHq+2d9RO4a+o++kh+l+FOTNXfPBH0=";
285285- })
286286- ];
250250+ # We need to use master because of a fix that replaces git:// url to https://.
251251+ src = fetchFromGitHub {
252252+ owner = "svanderburg";
253253+ repo = "node2nix";
254254+ rev = "68f5735f9a56737e3fedceb182705985e3ab8799";
255255+ sha256 = "sha256-NK6gDTkGx0GG7yPTwgtFC4ttQZPfcLaLp8W8OOMO6bg=";
287256 };
257257+288258 postInstall = ''
289259 wrapProgram "$out/bin/node2nix" --prefix PATH : ${pkgs.lib.makeBinPath [ pkgs.nix ]}
290260 '';
+21-11
pkgs/development/node-packages/node-env.nix
···9898 ''
9999 + (lib.concatMapStrings (dependency:
100100 ''
101101- if [ ! -e "${dependency.name}" ]; then
101101+ if [ ! -e "${dependency.packageName}" ]; then
102102 ${composePackage dependency}
103103 fi
104104 ''
···257257 var packageLock = JSON.parse(fs.readFileSync("./package-lock.json"));
258258259259 if(![1, 2].includes(packageLock.lockfileVersion)) {
260260- process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n");
261261- process.exit(1);
260260+ process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n");
261261+ process.exit(1);
262262 }
263263264264 if(packageLock.dependencies !== undefined) {
···390390 buildNodePackage =
391391 { name
392392 , packageName
393393- , version
393393+ , version ? null
394394 , dependencies ? []
395395 , buildInputs ? []
396396 , production ? true
···409409 extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" "meta" ];
410410 in
411411 stdenv.mkDerivation ({
412412- name = "${name}-${version}";
412412+ name = "${name}${if version == null then "" else "-${version}"}";
413413 buildInputs = [ tarWrapper python nodejs ]
414414 ++ lib.optional (stdenv.isLinux) utillinux
415415 ++ lib.optional (stdenv.isDarwin) libtool
···441441 if [ -d "$out/lib/node_modules/.bin" ]
442442 then
443443 ln -s $out/lib/node_modules/.bin $out/bin
444444+445445+ # Patch the shebang lines of all the executables
446446+ ls $out/bin/* | while read i
447447+ do
448448+ file="$(readlink -f "$i")"
449449+ chmod u+rwx "$file"
450450+ patchShebangs "$file"
451451+ done
444452 fi
445453446454 # Create symlinks to the deployed manual page folders, if applicable
···471479 buildNodeDependencies =
472480 { name
473481 , packageName
474474- , version
482482+ , version ? null
475483 , src
476484 , dependencies ? []
477485 , buildInputs ? []
···489497 extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ];
490498 in
491499 stdenv.mkDerivation ({
492492- name = "node-dependencies-${name}-${version}";
500500+ name = "node-dependencies-${name}${if version == null then "" else "-${version}"}";
493501494502 buildInputs = [ tarWrapper python nodejs ]
495503 ++ lib.optional (stdenv.isLinux) utillinux
···519527 if [ -f ${src}/package-lock.json ]
520528 then
521529 cp ${src}/package-lock.json .
530530+ chmod 644 package-lock.json
522531 fi
523532 ''}
524533···541550 buildNodeShell =
542551 { name
543552 , packageName
544544- , version
553553+ , version ? null
545554 , src
546555 , dependencies ? []
547556 , buildInputs ? []
···557566558567 let
559568 nodeDependencies = buildNodeDependencies args;
569569+ extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "unpackPhase" "buildPhase" ];
560570 in
561561- stdenv.mkDerivation {
562562- name = "node-shell-${name}-${version}";
571571+ stdenv.mkDerivation ({
572572+ name = "node-shell-${name}${if version == null then "" else "-${version}"}";
563573564574 buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs;
565575 buildCommand = ''
···578588 export NODE_PATH=${nodeDependencies}/lib/node_modules
579589 export PATH="${nodeDependencies}/bin:$PATH"
580590 '';
581581- };
591591+ } // extraArgs);
582592in
583593{
584594 buildNodeSourceDist = lib.makeOverridable buildNodeSourceDist;