git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #94907 from zowoq/ecc-nixos

nixos/*: editorconfig fixes

commit08ba31a6606bab9fc226c64866ea341581a1975b authorJörg Thalheim <Mic92@users.noreply.github.com> dateSat 8 Aug 2020, 20:35 (6 years ago) parent8e52c2a8fb410c
10 files changed+17−18
nixos/modules/hardware/bladeRF.nix+1−1 nixos/modules/installer/cd-dvd/system-tarball-pc-readme.txt+1−1 nixos/modules/programs/ccache.nix+1−1 nixos/modules/services/mail/pfix-srsd.nix+1−1 nixos/modules/services/web-servers/jboss/builder.sh+6−6 nixos/modules/system/boot/emergency-mode.nix+1−1 nixos/modules/system/boot/loader/generations-dir/generations-dir-builder.sh+1−1 nixos/modules/system/boot/loader/init-script/init-script-builder.sh+1−1 nixos/modules/system/boot/tmp.nix+1−1 nixos/modules/system/etc/make-etc.sh+3−4
nixos/modules/hardware/bladeRF.nix+1−1
@@ -25,4 +25,4 @@ in
2525 services.udev.packages = [ pkgs.libbladeRF ];
2626 users.groups.bladerf = {};
2727 };
28−}
28+}
nixos/modules/installer/cd-dvd/system-tarball-pc-readme.txt+1−1
@@ -63,7 +63,7 @@ Activate the system: look for a directory in nix/store similar to:
6363Having found it, activate that nixos system *twice*:
6464 chroot . /nix/store/SOMETHING-nixos-SOMETHING/activate
6565 chroot . /nix/store/SOMETHING-nixos-SOMETHING/activate
66−
66+
6767This runs a 'hostname' command. Restore your old hostname with:
6868 hostname OLDHOSTNAME
6969
nixos/modules/programs/ccache.nix+1−1
@@ -80,4 +80,4 @@ in {
8080 ];
8181 })
8282 ];
83−}
83+}
nixos/modules/services/mail/pfix-srsd.nix+1−1
@@ -53,4 +53,4 @@ with lib;
5353 };
5454 };
5555 };
56−}
56+}
nixos/modules/services/web-servers/jboss/builder.sh+6−6
@@ -28,11 +28,11 @@ stop()
2828if test "\$1" = start
2929then
3030 trap stop 15
31−
31+
3232 start
3333elif test "\$1" = stop
3434then
35− stop
35+ stop
3636elif test "\$1" = init
3737then
3838 echo "Are you sure you want to create a new server instance (old server instance will be lost!)?"
@@ -42,21 +42,21 @@ then
4242 then
4343 exit 1
4444 fi
45−
45+
4646 rm -rf $serverDir
4747 mkdir -p $serverDir
4848 cd $serverDir
4949 cp -av $jboss/server/default .
5050 sed -i -e "s|deploy/|$deployDir|" default/conf/jboss-service.xml
51−
51+
5252 if ! test "$useJK" = ""
5353 then
5454 sed -i -e 's|<attribute name="UseJK">false</attribute>|<attribute name="UseJK">true</attribute>|' default/deploy/jboss-web.deployer/META-INF/jboss-service.xml
5555 sed -i -e 's|<Engine name="jboss.web" defaultHost="localhost">|<Engine name="jboss.web" defaultHost="localhost" jvmRoute="node1">|' default/deploy/jboss-web.deployer/server.xml
5656 fi
57−
57+
5858 # Make files accessible for the server user
59−
59+
6060 chown -R $user $serverDir
6161 for i in \`find $serverDir -type d\`
6262 do
nixos/modules/system/boot/emergency-mode.nix+1−1
@@ -34,4 +34,4 @@ with lib;
3434
3535 };
3636
37−}
37+}
nixos/modules/system/boot/loader/generations-dir/generations-dir-builder.sh+1−1
@@ -63,7 +63,7 @@ addEntry() {
6363 copyToKernelsDir $kernel; kernel=$result
6464 copyToKernelsDir $initrd; initrd=$result
6565 fi
66−
66+
6767 mkdir -p $outdir
6868 ln -sf $(readlink -f $path) $outdir/system
6969 ln -sf $(readlink -f $path/init) $outdir/init
nixos/modules/system/boot/loader/init-script/init-script-builder.sh+1−1
@@ -53,7 +53,7 @@ addEntry() {
5353 echo "exec $stage2"
5454 )"
5555
56− [ "$path" != "$defaultConfig" ] || {
56+ [ "$path" != "$defaultConfig" ] || {
5757 echo "$content" > $tmp
5858 echo "# older configurations: $targetOther" >> $tmp
5959 chmod +x $tmp
nixos/modules/system/boot/tmp.nix+1−1
@@ -36,4 +36,4 @@ with lib;
3636
3737 };
3838
39−}
39+}
nixos/modules/system/etc/make-etc.sh+3−4
@@ -23,7 +23,7 @@ for ((i = 0; i < ${#targets_[@]}; i++)); do
2323 done
2424
2525 else
26−
26+
2727 mkdir -p $out/etc/$(dirname $target)
2828 if ! [ -e $out/etc/$target ]; then
2929 ln -s $source $out/etc/$target
@@ -34,13 +34,12 @@ for ((i = 0; i < ${#targets_[@]}; i++)); do
3434 exit 1
3535 fi
3636 fi
37−
37+
3838 if test "${modes_[$i]}" != symlink; then
3939 echo "${modes_[$i]}" > $out/etc/$target.mode
4040 echo "${users_[$i]}" > $out/etc/$target.uid
4141 echo "${groups_[$i]}" > $out/etc/$target.gid
4242 fi
43−
43+
4444 fi
4545done
46−