commit dc895fb2815032adbcc49f090812fa355074d9be · pyrox.dev/nixpkgs

+1 -1

lib/attrsets.nix

···

       487
       487
        
              => "/nix/store/9rz8gxhzf8sw4kf2j2f1grr49w8zx5vj-openssl-1.0.1r-dev"

     

       488
       488
        
         */

     

       489
       489
        
         getOutput = output: pkg:

     

       490
       490
       -
           if pkg.outputUnspecified or false

     

       490
       490
       +
           if ! pkg ? outputSpecified || ! pkg.outputSpecified

     

       491
       491
        
             then pkg.${output} or pkg.out or pkg

     

       492
       492
        
             else pkg;

     

       493
       493

+2 -3

lib/customisation.nix

···

       145
       145
        
           let

     

       146
       146
        
             outputs = drv.outputs or [ "out" ];

     

       147
       147
        
       

     

       148
       148
       -
             commonAttrs = (removeAttrs drv [ "outputUnspecified" ]) //

     

       149
       149
       -
               (builtins.listToAttrs outputsList) //

     

       148
       148
       +
             commonAttrs = drv // (builtins.listToAttrs outputsList) //

     

       150
       149
        
               ({ all = map (x: x.value) outputsList; }) // passthru;

     

       151
       150
        
       

     

       152
       151
        
             outputToAttrListElement = outputName:

     

       153
       152
        
               { name = outputName;

     

       154
       153
        
                 value = commonAttrs // {

     

       155
       154
        
                   inherit (drv.${outputName}) type outputName;

     

       155
       155
       +
                   outputSpecified = true;

     

       156
       156
        
                   drvPath = assert condition; drv.${outputName}.drvPath;

     

       157
       157
        
                   outPath = assert condition; drv.${outputName}.outPath;

     

       158
       158
        
                 };

     
···

       160
       160
        
       

     

       161
       161
        
             outputsList = map outputToAttrListElement outputs;

     

       162
       162
        
           in commonAttrs // {

     

       163
       163
       -
             outputUnspecified = true;

     

       164
       163
        
             drvPath = assert condition; drv.drvPath;

     

       165
       164
        
             outPath = assert condition; drv.outPath;

     

       166
       165
        
           };

+1 -1

pkgs/build-support/buildenv/default.nix

···

       62
       62
        
               # and otherwise use `meta.outputsToInstall`. The attribute is guaranteed

     

       63
       63
        
               # to exist in mkDerivation-created cases. The other cases (e.g. runCommand)

     

       64
       64
        
               # aren't expected to have multiple outputs.

     

       65
       65
       -
               (if drv.outputUnspecified or false

     

       65
       65
       +
               (if (! drv ? outputSpecified || ! drv.outputSpecified)

     

       66
       66
        
                   && drv.meta.outputsToInstall or null != null

     

       67
       67
        
                 then map (outName: drv.${outName}) drv.meta.outputsToInstall

     

       68
       68
        
                 else [ drv ])

+3 -3

pkgs/development/compilers/llvm/10/default.nix

···

       63
       63
        
           };

     

       64
       64
        
       

     

       65
       65
        
           # `llvm` historically had the binaries.  When choosing an output explicitly,

     

       66
       66
       -
           # we need to reintroduce `outputUnspecified` to get the expected behavior e.g. of lib.get*

     

       67
       67
       -
           llvm = tools.libllvm.out // { outputUnspecified = true; };

     

       66
       66
       +
           # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get*

     

       67
       67
       +
           llvm = tools.libllvm.out // { outputSpecified = false; };

     

       68
       68
        
       

     

       69
       69
        
           libclang = callPackage ./clang {

     

       70
       70
        
             inherit clang-tools-extra_src llvm_meta;

     

       71
       71
        
           };

     

       72
       72
        
       

     

       73
       73
       -
           clang-unwrapped = tools.libclang.out // { outputUnspecified = true; };

     

       73
       73
       +
           clang-unwrapped = tools.libclang.out // { outputSpecified = false; };

     

       74
       74
        
       

     

       75
       75
        
           # disabled until recommonmark supports sphinx 3

     

       76
       76
        
           #Llvm-manpages = lowPrio (tools.libllvm.override {

+4 -4

pkgs/development/compilers/llvm/11/default.nix

···

       65
       65
        
           };

     

       66
       66
        
       

     

       67
       67
        
           # `llvm` historically had the binaries.  When choosing an output explicitly,

     

       68
       68
       -
           # we need to reintroduce `outputUnspecified` to get the expected behavior e.g. of lib.get*

     

       69
       69
       -
           llvm = tools.libllvm.out // { outputUnspecified = true; };

     

       68
       68
       +
           # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get*

     

       69
       69
       +
           llvm = tools.libllvm.out // { outputSpecified = false; };

     

       70
       70
        
       

     

       71
       71
        
           libllvm-polly = callPackage ./llvm {

     

       72
       72
        
             inherit llvm_meta;

     

       73
       73
        
             enablePolly = true;

     

       74
       74
        
           };

     

       75
       75
        
       

     

       76
       76
       -
           llvm-polly = tools.libllvm-polly.lib // { outputUnspecified = true; };

     

       76
       76
       +
           llvm-polly = tools.libllvm-polly.lib // { outputSpecified = false; };

     

       77
       77
        
       

     

       78
       78
        
           libclang = callPackage ./clang {

     

       79
       79
        
             inherit clang-tools-extra_src llvm_meta;

     

       80
       80
        
           };

     

       81
       81
        
       

     

       82
       82
       -
           clang-unwrapped = tools.libclang.out // { outputUnspecified = true; };

     

       82
       82
       +
           clang-unwrapped = tools.libclang.out // { outputSpecified = false; };

     

       83
       83
        
       

     

       84
       84
        
           clang-polly-unwrapped = callPackage ./clang {

     

       85
       85
        
             inherit llvm_meta;

+3 -3

pkgs/development/compilers/llvm/12/default.nix

···

       66
       66
        
           };

     

       67
       67
        
       

     

       68
       68
        
           # `llvm` historically had the binaries.  When choosing an output explicitly,

     

       69
       69
       -
           # we need to reintroduce `outputUnspecified` to get the expected behavior e.g. of lib.get*

     

       70
       70
       -
           llvm = tools.libllvm.out // { outputUnspecified = true; };

     

       69
       69
       +
           # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get*

     

       70
       70
       +
           llvm = tools.libllvm.out // { outputSpecified = false; };

     

       71
       71
        
       

     

       72
       72
        
           libclang = callPackage ./clang {

     

       73
       73
        
             inherit clang-tools-extra_src llvm_meta;

     

       74
       74
        
           };

     

       75
       75
        
       

     

       76
       76
       -
           clang-unwrapped = tools.libclang.out // { outputUnspecified = true; };

     

       76
       76
       +
           clang-unwrapped = tools.libclang.out // { outputSpecified = false; };

     

       77
       77
        
       

     

       78
       78
        
           # disabled until recommonmark supports sphinx 3

     

       79
       79
        
           #Llvm-manpages = lowPrio (tools.libllvm.override {

+3 -3

pkgs/development/compilers/llvm/13/default.nix

···

       68
       68
        
           };

     

       69
       69
        
       

     

       70
       70
        
           # `llvm` historically had the binaries.  When choosing an output explicitly,

     

       71
       71
       -
           # we need to reintroduce `outputUnspecified` to get the expected behavior e.g. of lib.get*

     

       72
       72
       -
           llvm = tools.libllvm.out // { outputUnspecified = true; };

     

       71
       71
       +
           # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get*

     

       72
       72
       +
           llvm = tools.libllvm.out // { outputSpecified = false; };

     

       73
       73
        
       

     

       74
       74
        
           libclang = callPackage ./clang {

     

       75
       75
        
             inherit llvm_meta;

     

       76
       76
        
           };

     

       77
       77
        
       

     

       78
       78
       -
           clang-unwrapped = tools.libclang.out // { outputUnspecified = true; };

     

       78
       78
       +
           clang-unwrapped = tools.libclang.out // { outputSpecified = false; };

     

       79
       79
        
       

     

       80
       80
        
           llvm-manpages = lowPrio (tools.libllvm.override {

     

       81
       81
        
             enableManpages = true;

+4 -4

pkgs/development/compilers/llvm/5/default.nix

···

       39
       39
        
           };

     

       40
       40
        
       

     

       41
       41
        
           # `llvm` historically had the binaries.  When choosing an output explicitly,

     

       42
       42
       -
           # we need to reintroduce `outputUnspecified` to get the expected behavior e.g. of lib.get*

     

       43
       43
       -
           llvm = tools.libllvm.out // { outputUnspecified = true; };

     

       42
       42
       +
           # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get*

     

       43
       43
       +
           llvm = tools.libllvm.out // { outputSpecified = false; };

     

       44
       44
        
       

     

       45
       45
        
           libllvm-polly = callPackage ./llvm {

     

       46
       46
        
             inherit llvm_meta;

     

       47
       47
        
             enablePolly = true;

     

       48
       48
        
           };

     

       49
       49
        
       

     

       50
       50
       -
           llvm-polly = tools.libllvm-polly.lib // { outputUnspecified = true; };

     

       50
       50
       +
           llvm-polly = tools.libllvm-polly.lib // { outputSpecified = false; };

     

       51
       51
        
       

     

       52
       52
        
           libclang = callPackage ./clang {

     

       53
       53
        
             inherit clang-tools-extra_src llvm_meta;

     

       54
       54
        
           };

     

       55
       55
        
       

     

       56
       56
       -
           clang-unwrapped = tools.libclang.out // { outputUnspecified = true; };

     

       56
       56
       +
           clang-unwrapped = tools.libclang.out // { outputSpecified = false; };

     

       57
       57
        
       

     

       58
       58
        
           llvm-manpages = lowPrio (tools.libllvm.override {

     

       59
       59
        
             enableManpages = true;

+4 -4

pkgs/development/compilers/llvm/6/default.nix

···

       39
       39
        
           };

     

       40
       40
        
       

     

       41
       41
        
           # `llvm` historically had the binaries.  When choosing an output explicitly,

     

       42
       42
       -
           # we need to reintroduce `outputUnspecified` to get the expected behavior e.g. of lib.get*

     

       43
       43
       -
           llvm = tools.libllvm.out // { outputUnspecified = true; };

     

       42
       42
       +
           # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get*

     

       43
       43
       +
           llvm = tools.libllvm.out // { outputSpecified = false; };

     

       44
       44
        
       

     

       45
       45
        
           libllvm-polly = callPackage ./llvm {

     

       46
       46
        
             inherit llvm_meta;

     

       47
       47
        
             enablePolly = true;

     

       48
       48
        
           };

     

       49
       49
        
       

     

       50
       50
       -
           llvm-polly = tools.libllvm-polly.lib // { outputUnspecified = true; };

     

       50
       50
       +
           llvm-polly = tools.libllvm-polly.lib // { outputSpecified = false; };

     

       51
       51
        
       

     

       52
       52
        
           libclang = callPackage ./clang {

     

       53
       53
        
             inherit clang-tools-extra_src llvm_meta;

     

       54
       54
        
           };

     

       55
       55
        
       

     

       56
       56
       -
           clang-unwrapped = tools.libclang.out // { outputUnspecified = true; };

     

       56
       56
       +
           clang-unwrapped = tools.libclang.out // { outputSpecified = false; };

     

       57
       57
        
       

     

       58
       58
        
           llvm-manpages = lowPrio (tools.libllvm.override {

     

       59
       59
        
             enableManpages = true;

+4 -4

pkgs/development/compilers/llvm/7/default.nix

···

       63
       63
        
           };

     

       64
       64
        
       

     

       65
       65
        
           # `llvm` historically had the binaries.  When choosing an output explicitly,

     

       66
       66
       -
           # we need to reintroduce `outputUnspecified` to get the expected behavior e.g. of lib.get*

     

       67
       67
       -
           llvm = tools.libllvm.out // { outputUnspecified = true; };

     

       66
       66
       +
           # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get*

     

       67
       67
       +
           llvm = tools.libllvm.out // { outputSpecified = false; };

     

       68
       68
        
       

     

       69
       69
        
           libllvm-polly = callPackage ./llvm {

     

       70
       70
        
             inherit llvm_meta;

     

       71
       71
        
             enablePolly = true;

     

       72
       72
        
           };

     

       73
       73
        
       

     

       74
       74
       -
           llvm-polly = tools.libllvm-polly.lib // { outputUnspecified = true; };

     

       74
       74
       +
           llvm-polly = tools.libllvm-polly.lib // { outputSpecified = false; };

     

       75
       75
        
       

     

       76
       76
        
           libclang = callPackage ./clang {

     

       77
       77
        
             inherit clang-tools-extra_src llvm_meta;

     

       78
       78
        
           };

     

       79
       79
        
       

     

       80
       80
       -
           clang-unwrapped = tools.libclang.out // { outputUnspecified = true; };

     

       80
       80
       +
           clang-unwrapped = tools.libclang.out // { outputSpecified = false; };

     

       81
       81
        
       

     

       82
       82
        
           clang-polly-unwrapped = callPackage ./clang {

     

       83
       83
        
             inherit llvm_meta;

+4 -4

pkgs/development/compilers/llvm/8/default.nix

···

       63
       63
        
           };

     

       64
       64
        
       

     

       65
       65
        
           # `llvm` historically had the binaries.  When choosing an output explicitly,

     

       66
       66
       -
           # we need to reintroduce `outputUnspecified` to get the expected behavior e.g. of lib.get*

     

       67
       67
       -
           llvm = tools.libllvm.out // { outputUnspecified = true; };

     

       66
       66
       +
           # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get*

     

       67
       67
       +
           llvm = tools.libllvm.out // { outputSpecified = false; };

     

       68
       68
        
       

     

       69
       69
        
           libllvm-polly = callPackage ./llvm {

     

       70
       70
        
             inherit llvm_meta;

     

       71
       71
        
             enablePolly = true;

     

       72
       72
        
           };

     

       73
       73
        
       

     

       74
       74
       -
           llvm-polly = tools.libllvm-polly.lib // { outputUnspecified = true; };

     

       74
       74
       +
           llvm-polly = tools.libllvm-polly.lib // { outputSpecified = false; };

     

       75
       75
        
       

     

       76
       76
        
           libclang = callPackage ./clang {

     

       77
       77
        
             inherit clang-tools-extra_src llvm_meta;

     

       78
       78
        
           };

     

       79
       79
        
       

     

       80
       80
       -
           clang-unwrapped = tools.libclang.out // { outputUnspecified = true; };

     

       80
       80
       +
           clang-unwrapped = tools.libclang.out // { outputSpecified = false; };

     

       81
       81
        
       

     

       82
       82
        
           clang-polly-unwrapped = callPackage ./clang {

     

       83
       83
        
             inherit llvm_meta;

+4 -4

pkgs/development/compilers/llvm/9/default.nix

···

       63
       63
        
           };

     

       64
       64
        
       

     

       65
       65
        
           # `llvm` historically had the binaries.  When choosing an output explicitly,

     

       66
       66
       -
           # we need to reintroduce `outputUnspecified` to get the expected behavior e.g. of lib.get*

     

       67
       67
       -
           llvm = tools.libllvm.out // { outputUnspecified = true; };

     

       66
       66
       +
           # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get*

     

       67
       67
       +
           llvm = tools.libllvm.out // { outputSpecified = false; };

     

       68
       68
        
       

     

       69
       69
        
           libllvm-polly = callPackage ./llvm {

     

       70
       70
        
             inherit llvm_meta;

     

       71
       71
        
             enablePolly = true;

     

       72
       72
        
           };

     

       73
       73
        
       

     

       74
       74
       -
           llvm-polly = tools.libllvm-polly.lib // { outputUnspecified = true; };

     

       74
       74
       +
           llvm-polly = tools.libllvm-polly.lib // { outputSpecified = false; };

     

       75
       75
        
       

     

       76
       76
        
           libclang = callPackage ./clang {

     

       77
       77
        
             inherit clang-tools-extra_src llvm_meta;

     

       78
       78
        
           };

     

       79
       79
        
       

     

       80
       80
       -
           clang-unwrapped = tools.libclang.out // { outputUnspecified = true; };

     

       80
       80
       +
           clang-unwrapped = tools.libclang.out // { outputSpecified = false; };

     

       81
       81
        
       

     

       82
       82
        
           clang-polly-unwrapped = callPackage ./clang {

     

       83
       83
        
             inherit llvm_meta;

+3 -3

pkgs/development/compilers/llvm/git/default.nix

···

       68
       68
        
           };

     

       69
       69
        
       

     

       70
       70
        
           # `llvm` historically had the binaries.  When choosing an output explicitly,

     

       71
       71
       -
           # we need to reintroduce `outputUnspecified` to get the expected behavior e.g. of lib.get*

     

       72
       72
       -
           llvm = tools.libllvm.out // { outputUnspecified = true; };

     

       71
       71
       +
           # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get*

     

       72
       72
       +
           llvm = tools.libllvm.out // { outputSpecified = false; };

     

       73
       73
        
       

     

       74
       74
        
           libclang = callPackage ./clang {

     

       75
       75
        
             inherit llvm_meta;

     

       76
       76
        
           };

     

       77
       77
        
       

     

       78
       78
       -
           clang-unwrapped = tools.libclang.out // { outputUnspecified = true; };

     

       78
       78
       +
           clang-unwrapped = tools.libclang.out // { outputSpecified = false; };

     

       79
       79
        
       

     

       80
       80
        
           llvm-manpages = lowPrio (tools.libllvm.override {

     

       81
       81
        
             enableManpages = true;