commit 8fb410c0adb7716f95cb6f6ccfaa6c76fa112b6c · pyrox.dev/nixpkgs

+1 -1

nixos/modules/hardware/bladeRF.nix

···

       25
       25
        
           services.udev.packages = [ pkgs.libbladeRF ];

     

       26
       26
        
           users.groups.bladerf = {};

     

       27
       27
        
         };

     

       28
       28
       -
       }
     

       28
       28
       +
       }

+1 -1

nixos/modules/installer/cd-dvd/system-tarball-pc-readme.txt

···

       63
       63
        
       Having found it, activate that nixos system *twice*:

     

       64
       64
        
         chroot . /nix/store/SOMETHING-nixos-SOMETHING/activate

     

       65
       65
        
         chroot . /nix/store/SOMETHING-nixos-SOMETHING/activate

     

       66
       66
       -
         

     

       66
       66
       +
       

     

       67
       67
        
       This runs a 'hostname' command. Restore your old hostname with:

     

       68
       68
        
         hostname OLDHOSTNAME

     

       69
       69

+1 -1

nixos/modules/programs/ccache.nix

+1 -1

nixos/modules/services/mail/pfix-srsd.nix

+6 -6

nixos/modules/services/web-servers/jboss/builder.sh

···

       28
       28
        
       if test "\$1" = start

     

       29
       29
        
       then

     

       30
       30
        
         trap stop 15

     

       31
       31
       -
         

     

       31
       31
       +
       

     

       32
       32
        
         start

     

       33
       33
        
       elif test "\$1" = stop

     

       34
       34
        
       then

     

       35
       35
       -
         stop  

     

       35
       35
       +
         stop

     

       36
       36
        
       elif test "\$1" = init

     

       37
       37
        
       then

     

       38
       38
        
         echo "Are you sure you want to create a new server instance (old server instance will be lost!)?"

     
···

       42
       42
        
         then

     

       43
       43
        
           exit 1

     

       44
       44
        
         fi

     

       45
       45
       -
         

     

       45
       45
       +
       

     

       46
       46
        
         rm -rf $serverDir

     

       47
       47
        
         mkdir -p $serverDir

     

       48
       48
        
         cd $serverDir

     

       49
       49
        
         cp -av $jboss/server/default .

     

       50
       50
        
         sed -i -e "s|deploy/|$deployDir|" default/conf/jboss-service.xml

     

       51
       51
       -
         

     

       51
       51
       +
       

     

       52
       52
        
         if ! test "$useJK" = ""

     

       53
       53
        
         then

     

       54
       54
        
           sed -i -e 's|<attribute name="UseJK">false</attribute>|<attribute name="UseJK">true</attribute>|' default/deploy/jboss-web.deployer/META-INF/jboss-service.xml

     

       55
       55
        
           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

     

       56
       56
        
         fi

     

       57
       57
       -
         

     

       57
       57
       +
       

     

       58
       58
        
         # Make files accessible for the server user

     

       59
       59
       -
         

     

       59
       59
       +
       

     

       60
       60
        
         chown -R $user $serverDir

     

       61
       61
        
         for i in \`find $serverDir -type d\`

     

       62
       62
        
         do

+1 -1

nixos/modules/system/boot/emergency-mode.nix

+1 -1

nixos/modules/system/boot/loader/generations-dir/generations-dir-builder.sh

···

       63
       63
        
               copyToKernelsDir $kernel; kernel=$result

     

       64
       64
        
               copyToKernelsDir $initrd; initrd=$result

     

       65
       65
        
           fi

     

       66
       66
       -
           

     

       66
       66
       +
       

     

       67
       67
        
           mkdir -p $outdir

     

       68
       68
        
           ln -sf $(readlink -f $path) $outdir/system

     

       69
       69
        
           ln -sf $(readlink -f $path/init) $outdir/init

+1 -1

nixos/modules/system/boot/loader/init-script/init-script-builder.sh

···

       53
       53
        
             echo "exec $stage2"

     

       54
       54
        
           )"

     

       55
       55
        
       

     

       56
       56
       -
           [ "$path" != "$defaultConfig" ] || { 

     

       56
       56
       +
           [ "$path" != "$defaultConfig" ] || {

     

       57
       57
        
             echo "$content" > $tmp

     

       58
       58
        
             echo "# older configurations: $targetOther" >> $tmp

     

       59
       59
        
             chmod +x $tmp

+1 -1

nixos/modules/system/boot/tmp.nix

+3 -4

nixos/modules/system/etc/make-etc.sh

···

       23
       23
        
               done

     

       24
       24
        
       

     

       25
       25
        
           else

     

       26
       26
       -
               

     

       26
       26
       +
       

     

       27
       27
        
               mkdir -p $out/etc/$(dirname $target)

     

       28
       28
        
               if ! [ -e $out/etc/$target ]; then

     

       29
       29
        
                   ln -s $source $out/etc/$target

     
···

       34
       34
        
                       exit 1

     

       35
       35
        
                   fi

     

       36
       36
        
               fi

     

       37
       37
       -
               

     

       37
       37
       +
       

     

       38
       38
        
               if test "${modes_[$i]}" != symlink; then

     

       39
       39
        
                   echo "${modes_[$i]}"  > $out/etc/$target.mode

     

       40
       40
        
                   echo "${users_[$i]}"  > $out/etc/$target.uid

     

       41
       41
        
                   echo "${groups_[$i]}" > $out/etc/$target.gid

     

       42
       42
        
               fi

     

       43
       43
       -
               

     

       43
       43
       +
       

     

       44
       44
        
           fi

     

       45
       45
        
       done

     

       46
       46
       -