commit 12354b8eb55fd76db73df6efab82aa083c7cfae4 · pyrox.dev/nixpkgs

+21

pkgs/build-support/setup-hooks/die.sh

···

       1
       1
       +
       # Exit with backtrace and error message

     

       2
       2
       +
       #

     

       3
       3
       +
       # Usage: die "Error message"

     

       4
       4
       +
       die() {

     

       5
       5
       +
           # Let us be a little sloppy with errors, because otherwise the final

     

       6
       6
       +
           # invocation of `caller` below will cause the script to exit.

     

       7
       7
       +
           set +e

     

       8
       8
       +
       

     

       9
       9
       +
           # Print our error message

     

       10
       10
       +
           printf "\nBuilder called die: %b\n" "$*"

     

       11
       11
       +
           printf "Backtrace:\n"

     

       12
       12
       +
       

     

       13
       13
       +
           # Print a backtrace.

     

       14
       14
       +
           local frame=0

     

       15
       15
       +
           while caller $frame; do

     

       16
       16
       +
               ((frame++));

     

       17
       17
       +
           done

     

       18
       18
       +
           printf "\n"

     

       19
       19
       +
       

     

       20
       20
       +
           exit 1

     

       21
       21
       +
       }

+4 -1

pkgs/top-level/all-packages.nix

···

       100
       100
        
       

     

       101
       101
        
         diffPlugins = (callPackage ../build-support/plugins.nix {}).diffPlugins;

     

       102
       102
        
       

     

       103
       103
       +
         dieHook = makeSetupHook {} ../build-support/setup-hooks/die.sh;

     

       104
       104
       +
       

     

       103
       105
        
         dockerTools = callPackage ../build-support/docker { };

     

       104
       106
        
       

     

       105
       107
        
         docker_compose = pythonPackages.docker_compose;

     
···

       287
       289
        
             inherit contents compressor prepend;

     

       288
       290
        
           };

     

       289
       291
        
       

     

       290
       290
       -
         makeWrapper = makeSetupHook { } ../build-support/setup-hooks/make-wrapper.sh;

     

       292
       292
       +
         makeWrapper = makeSetupHook { deps = [ dieHook ]; }

     

       293
       293
       +
                                     ../build-support/setup-hooks/make-wrapper.sh;

     

       291
       294
        
       

     

       292
       295
        
         makeModulesClosure = { kernel, rootModules, allowMissing ? false }:

     

       293
       296
        
           callPackage ../build-support/kernel/modules-closure.nix {