commit 2d9a6864833e3cca4b05aa6bd4ef88c8813989ca · pyrox.dev/nixpkgs

+1 -21

nixos/modules/config/nix-channel.nix

···

       100
       100
        
           ];

     

       101
       101
        
       

     

       102
       102
        
           system.activationScripts.no-nix-channel = mkIf (!cfg.channel.enable)

     

       103
       103
       -
             (stringAfter [ "etc" "users" ] ''

     

       104
       104
       -
               explainChannelWarning=0

     

       105
       105
       -
               if [ -e "/root/.nix-defexpr/channels" ]; then

     

       106
       106
       -
                   warn '/root/.nix-defexpr/channels exists, but channels have been disabled.'

     

       107
       107
       -
                   explainChannelWarning=1

     

       108
       108
       -
               fi

     

       109
       109
       -
               if [ -e "/nix/var/nix/profiles/per-user/root/channels" ]; then

     

       110
       110
       -
                   warn "/nix/var/nix/profiles/per-user/root/channels exists, but channels have been disabled."

     

       111
       111
       -
                   explainChannelWarning=1

     

       112
       112
       -
               fi

     

       113
       113
       -
               getent passwd | while IFS=: read -r _ _ _ _ _ home _ ; do

     

       114
       114
       -
                   if [ -n  "$home" -a -e "$home/.nix-defexpr/channels" ]; then

     

       115
       115
       -
                       warn "$home/.nix-defexpr/channels exists, but channels have been disabled." 1>&2

     

       116
       116
       -
                       explainChannelWarning=1

     

       117
       117
       -
                   fi

     

       118
       118
       -
               done

     

       119
       119
       -
               if [ $explainChannelWarning -eq 1 ]; then

     

       120
       120
       -
                   echo "Due to https://github.com/NixOS/nix/issues/9574, Nix may still use these channels when NIX_PATH is unset." 1>&2

     

       121
       121
       -
                   echo "Delete the above directory or directories to prevent this." 1>&2

     

       122
       122
       -
               fi

     

       123
       123
       -
             '');

     

       103
       103
       +
             (stringAfter [ "etc" "users" ] (builtins.readFile ./nix-channel/activation-check.sh));

     

       124
       104
        
         };

     

       125
       105
        
       }

+21

nixos/modules/config/nix-channel/activation-check.sh

···

       1
       1
       +
       # shellcheck shell=bash

     

       2
       2
       +
       

     

       3
       3
       +
       explainChannelWarning=0

     

       4
       4
       +
       if [[ -e "/root/.nix-defexpr/channels" ]]; then

     

       5
       5
       +
           warn '/root/.nix-defexpr/channels exists, but channels have been disabled.'

     

       6
       6
       +
           explainChannelWarning=1

     

       7
       7
       +
       fi

     

       8
       8
       +
       if [[ -e "/nix/var/nix/profiles/per-user/root/channels" ]]; then

     

       9
       9
       +
           warn "/nix/var/nix/profiles/per-user/root/channels exists, but channels have been disabled."

     

       10
       10
       +
           explainChannelWarning=1

     

       11
       11
       +
       fi

     

       12
       12
       +
       while IFS=: read -r _ _ _ _ _ home _ ; do

     

       13
       13
       +
           if [[ -n  "$home" && -e "$home/.nix-defexpr/channels" ]]; then

     

       14
       14
       +
               warn "$home/.nix-defexpr/channels exists, but channels have been disabled." 1>&2

     

       15
       15
       +
               explainChannelWarning=1

     

       16
       16
       +
           fi

     

       17
       17
       +
       done < <(getent passwd)

     

       18
       18
       +
       if [[ $explainChannelWarning -eq 1 ]]; then

     

       19
       19
       +
           echo "Due to https://github.com/NixOS/nix/issues/9574, Nix may still use these channels when NIX_PATH is unset." 1>&2

     

       20
       20
       +
           echo "Delete the above directory or directories to prevent this." 1>&2

     

       21
       21
       +
       fi

+19

nixos/modules/config/nix-channel/test.nix

···

       1
       1
       +
       # Run:

     

       2
       2
       +
       #   nix-build -A nixosTests.nix-channel

     

       3
       3
       +
       { lib, testers }:

     

       4
       4
       +
       let

     

       5
       5
       +
         inherit (lib) fileset;

     

       6
       6
       +
       

     

       7
       7
       +
         runShellcheck = testers.shellcheck {

     

       8
       8
       +
           src = fileset.toSource {

     

       9
       9
       +
             root = ./.;

     

       10
       10
       +
             fileset = fileset.unions [

     

       11
       11
       +
               ./activation-check.sh

     

       12
       12
       +
             ];

     

       13
       13
       +
           };

     

       14
       14
       +
         };

     

       15
       15
       +
       

     

       16
       16
       +
       in

     

       17
       17
       +
       lib.recurseIntoAttrs {

     

       18
       18
       +
         inherit runShellcheck;

     

       19
       19
       +
       }

+1

nixos/tests/all-tests.nix

···

       610
       610
        
         nbd = handleTest ./nbd.nix {};

     

       611
       611
        
         ncdns = handleTest ./ncdns.nix {};

     

       612
       612
        
         ndppd = handleTest ./ndppd.nix {};

     

       613
       613
       +
         nix-channel = pkgs.callPackage ../modules/config/nix-channel/test.nix { };

     

       613
       614
        
         nebula = handleTest ./nebula.nix {};

     

       614
       615
        
         netbird = handleTest ./netbird.nix {};

     

       615
       616
        
         nimdow = handleTest ./nimdow.nix {};