commit 1a1ad1a17dfbe1b4da3a0bb174c6830ac318a3a7 · pyrox.dev/nixpkgs

+27 -137

lib/customisation.nix

···

       50
        
              }

     

       51
        
              else { }));

     

       52
        
       

     

       53
       -
         # A more powerful version of `makeOverridable` with features similar

     

       54
       -
         # to `makeExtensibleWithInterface`.

     

       55
       -
         makeOverridableWithInterface = interface: f: origArgs: let

     

       56
       -
       

     

       57
       -
           addOverrideFuncs = {val, args, ...}: overridePackage:

     

       58
       -
             (lib.optionalAttrs (builtins.isAttrs val) (val // {

     

       59
       -
               extend = f: overridePackage (_: self: super: {

     

       60
       -
                 val = super.val // f self.val super.val;

     

       61
       -
               });

     

       62
       -
       

     

       63
       -
               overrideDerivation = newArgs: overridePackage (_: self: super: {

     

       64
       -
                 val = lib.overrideDerivation super.val newArgs;

     

       65
       -
               });

     

       66
       -
       

     

       67
       -
               ${if val ? overrideAttrs then "overrideAttrs" else null} = fdrv:

     

       68
       -
                 overridePackage (_: self: super: {

     

       69
       -
                   val = super.val.overrideAttrs fdrv;

     

       70
       -
                 });

     

       71
       -
             })) // (lib.optionalAttrs (builtins.isFunction val) {

     

       72
       -
               __functor = _: val;

     

       73
       -
               extend = throw "extend not yet supported for functors";

     

       74
       -
               overrideDerivation = throw "overrideDerivation not yet supported for functors";

     

       75
       -
             }) // {

     

       76
       -
               inherit overridePackage;

     

       77
       -
       

     

       78
       -
               override = newArgs: overridePackage (_: self: super: {

     

       79
       -
                 args = super.args //

     

       80
       -
                   (if builtins.isFunction newArgs then newArgs super.args else newArgs);

     

       81
       -
               });

     

       82
       -
             };

     

       83
       -
       

     

       84
       -
         in lib.makeExtensibleWithInterface (x: o: interface (addOverrideFuncs x o) o) (output: self: {

     

       85
       -
           args = origArgs;

     

       86
       -
           val = f output self.args self.val;

     

       87
       -
         });

     

       88
       -
       

     

       89
       -
       

     

       90
       -
         /* `makeOverridable` takes a function from attribute set to

     

       91
       -
            attribute set and injects 4 attributes which can be used to

     

       92
       -
            override arguments and return values of the function.

     

       93
       -
       

     

       94
        
       

     

       95
       -
            1. `override` allows you to change what arguments were passed to

     

       96
       -
            the function and acquire the new result.

     

       0
        
       
     

       97
        
       

     

       98
        
              nix-repl> x = {a, b}: { result = a + b; }

     

       99
        
       

     
···

       105
        
              nix-repl> y.override { a = 10; }

     

       106
        
              { override = «lambda»; overrideDerivation = «lambda»; result = 12; }

     

       107
        
       

     

       108
       -
       

     

       109
       -
            2. `extend` changes the results of the function, giving you a

     

       110
       -
            view of the original result and a view of the eventual final

     

       111
       -
            result. It is meant to do the same thing as

     

       112
       -
            `makeExtensible`. That is, it lets you add to or change the

     

       113
       -
            return value, such that previous extensions are consistent with

     

       114
       -
            the final view, rather than being based on outdated

     

       115
       -
            values. "Outdated" values come from the `super` argument, which

     

       116
       -
            must be used when you are attempting to modify and old value. And

     

       117
       -
            the final values come from the `self` argument, which recursively

     

       118
       -
            refers to what all extensions combined return.

     

       119
       -
       

     

       120
       -
              nix-repl> obj = makeOverridable (args: { }) { }

     

       121
       -
       

     

       122
       -
              nix-repl> obj = obj.extend (self: super: { foo = "foo"; })

     

       123
       -
       

     

       124
       -
              nix-repl> obj.foo

     

       125
       -
              "foo"

     

       126
       -
       

     

       127
       -
              nix-repl> obj = obj.extend (self: super: { foo = super.foo + " + "; bar = "bar"; foobar = self.foo + self.bar; })

     

       128
       -
       

     

       129
       -
              nix-repl> obj

     

       130
       -
              { bar = "bar"; foo = "foo + "; foobar = "foo + bar"; ... } # Excess omitted

     

       131
       -
       

     

       132
       -
       

     

       133
       -
            3. `overrideDerivation`: Please refer to "Nixpkgs Contributors

     

       134
       -
            Guide" section "<pkg>.overrideDerivation" to learn about

     

       135
       -
            `overrideDerivation` and caveats related to its use.

     

       136
       -
       

     

       137
       -
       

     

       138
       -
            4. `overridePackage` is by far the most powerful of the four, as

     

       139
       -
            it exposes a deeper structure. It provides `self` and `super`

     

       140
       -
            views of both the arguments and return value of the function,

     

       141
       -
            allowing you to change both in one override; you can even have

     

       142
       -
            overrides for one based on overrides for the other. It also

     

       143
       -
            provides the `output` view, which is the view of `self` after

     

       144
       -
            passing it through the `makeOverridable` interface and adding all

     

       145
       -
            the `overrideX` functions. `output` is necessary when your

     

       146
       -
            overrides depend on the overridable structure of `output`.

     

       147
       -
       

     

       148
       -
              nix-repl> obj = makeOverridable ({a, b}: {inherit a b;}) {a = 1; b = 3;}

     

       149
       -
       

     

       150
       -
              nix-repl> obj = obj.overridePackage (output: self: super: { args = super.args // {b = self.val.a;}; })

     

       151
       -
       

     

       152
       -
              nix-repl> obj.b

     

       153
       -
              1

     

       154
       -
       

     

       155
       -
              nix-repl> obj = obj.overridePackage (output: self: super: { val = super.val // {a = self.args.a + 10;}; })

     

       156
       -
       

     

       157
       -
              nix-repl> obj.b

     

       158
       -
              11

     

       159
       -
       

     

       160
        
         */

     

       161
       -
         makeOverridable = fn: makeOverridableWithInterface (x: _: x) (_: args: _: fn args);

     

       162
       -
       

     

       163
       -
         callPackageCommon = functionArgs: scope: f: args:

     

       164
        
           let

     

       165
       -
             intersect = builtins.intersectAttrs functionArgs;

     

       166
       -
             interface = val: overridePackage: val // {

     

       167
       -
               overrideScope = newScope: overridePackage (_: self: super: {

     

       168
       -
                 scope = super.scope.extend newScope;

     

       169
       -
               });

     

       170
       -
             };

     

       171
       -
           in (makeOverridableWithInterface interface f (intersect scope // args))

     

       172
       -
             .overridePackage (output: self: super: {

     

       173
       -
               inherit scope;

     

       174
       -
               # Don't use super.args because that contains the original scope.

     

       175
       -
               args = intersect self.scope  // args;

     

       176
       -
             });

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       177
        
       

     

       178
        
       

     

       179
        
         /* Call the package function in the file `fn' with the required

     
···

       196
        
               libfoo = null;

     

       197
        
               enableX11 = true;

     

       198
        
             };

     

       199
       -
       

     

       200
       -
           On top of the additions from `makeOverridable`, an `overrideScope`

     

       201
       -
           function is also added to the result. It is similar to `override`,

     

       202
       -
           except that it provides `self` and `super` views to the

     

       203
       -
           scope. This can't be done in `makeOverridable` because the scope

     

       204
       -
           is filtered to just the arguments needed by the function before

     

       205
       -
           entering `makeOverridable`. It is useful to have a view of the

     

       206
       -
           scope before restriction; for example, to change versions for a

     

       207
       -
           particular dependency.

     

       208
       -
       

     

       209
       -
             foo.overrideScope (self: super: {

     

       210
       -
               llvm = self.llvm_37;

     

       211
       -
             })

     

       212
       -
       

     

       213
       -
           `llvm_37` would not exist in the scope after restriction.

     

       214
       -
       

     

       215
        
         */

     

       216
        
         callPackageWith = autoArgs: fn: args:

     

       217
       -
           let f = if builtins.isFunction fn then fn else import fn;

     

       218
       -
           in callPackageCommon (builtins.functionArgs f) autoArgs (output: x: _: f x) args;

     

       219
       -
       

     

       220
       -
       

     

       221
       -
         # Like `callPackageWith`, but provides the function with a `self`

     

       222
       -
         # view of the output, which has the override functions

     

       223
       -
         # injected. `fn` is called with the new output whenever an override

     

       224
       -
         # or extension is added.

     

       225
       -
         callPackageWithOutputWith = autoArgs: fn: args:

     

       226
       -
           let f = if builtins.isFunction fn then fn else import fn;

     

       227
       -
           in callPackageCommon (builtins.functionArgs f) autoArgs (output: args: _: f args output ) args;

     

       228
        
       

     

       229
        
       

     

       230
        
         /* Like callPackage, but for a function that returns an attribute

···

       50
        
              }

     

       51
        
              else { }));

     

       52
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       53
        
       

     

       54
       +
         /* `makeOverridable` takes a function from attribute set to attribute set and

     

       55
       +
            injects `override` attibute which can be used to override arguments of

     

       56
       +
            the function.

     

       57
        
       

     

       58
        
              nix-repl> x = {a, b}: { result = a + b; }

     

       59
        
       

     
···

       65
        
              nix-repl> y.override { a = 10; }

     

       66
        
              { override = «lambda»; overrideDerivation = «lambda»; result = 12; }

     

       67
        
       

     

       68
       +
            Please refer to "Nixpkgs Contributors Guide" section

     

       69
       +
            "<pkg>.overrideDerivation" to learn about `overrideDerivation` and caveats

     

       70
       +
            related to its use.

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       71
        
         */

     

       72
       +
         makeOverridable = f: origArgs:

     

       0
        
       
     

       0
        
       
     

       73
        
           let

     

       74
       +
             ff = f origArgs;

     

       75
       +
             overrideWith = newArgs: origArgs // (if builtins.isFunction newArgs then newArgs origArgs else newArgs);

     

       76
       +
           in

     

       77
       +
             if builtins.isAttrs ff then (ff // {

     

       78
       +
               override = newArgs: makeOverridable f (overrideWith newArgs);

     

       79
       +
               overrideDerivation = fdrv:

     

       80
       +
                 makeOverridable (args: overrideDerivation (f args) fdrv) origArgs;

     

       81
       +
               ${if ff ? overrideAttrs then "overrideAttrs" else null} = fdrv:

     

       82
       +
                 makeOverridable (args: (f args).overrideAttrs fdrv) origArgs;

     

       83
       +
             })

     

       84
       +
             else if builtins.isFunction ff then {

     

       85
       +
               override = newArgs: makeOverridable f (overrideWith newArgs);

     

       86
       +
               __functor = self: ff;

     

       87
       +
               overrideDerivation = throw "overrideDerivation not yet supported for functors";

     

       88
       +
             }

     

       89
       +
             else ff;

     

       90
        
       

     

       91
        
       

     

       92
        
         /* Call the package function in the file `fn' with the required

     
···

       109
        
               libfoo = null;

     

       110
        
               enableX11 = true;

     

       111
        
             };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       112
        
         */

     

       113
        
         callPackageWith = autoArgs: fn: args:

     

       114
       +
           let

     

       115
       +
             f = if builtins.isFunction fn then fn else import fn;

     

       116
       +
             auto = builtins.intersectAttrs (builtins.functionArgs f) autoArgs;

     

       117
       +
           in makeOverridable f (auto // args);

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       118
        
       

     

       119
        
       

     

       120
        
         /* Like callPackage, but for a function that returns an attribute

+4 -30

lib/fixed-points.nix

···

       72
        
       

     

       73
        
         # Same as `makeExtensible` but the name of the extending attribute is

     

       74
        
         # customized.

     

       75
       -
         makeExtensibleWithCustomName = extenderName: f: makeExtensibleWithInterface

     

       76
       -
           (fixedPoint: extend: fixedPoint // { ${extenderName} = ext: extend (_: ext); })

     

       77
       -
           (_: f);

     

       78
       -
       

     

       79
       -
         # A version of `makeExtensible` that allows the function being fixed

     

       80
       -
         # to return a different interface than the interface returned to the

     

       81
       -
         # user. Along with `self` and `super` views of the internal

     

       82
       -
         # interface, a `self` view of the output interface is also

     

       83
       -
         # provided. `extend` is not added to the output by default. This is

     

       84
       -
         # the job of the interface.

     

       85
       -
         #

     

       86
       -
         #     nix-repl> foo = {a, b}: {c = a + b;}

     

       87
       -
         #

     

       88
       -
         #     nix-repl> interface = {args, val, ...}: extend: val // {inherit extend;}

     

       89
       -
         #

     

       90
       -
         #     nix-repl> obj = makeExtensibleWithInterface interface (output: self: { args = {a = 1; b = 2;}; val = foo self.args; })

     

       91
       -
         #

     

       92
       -
         #     nix-repl> obj.c

     

       93
       -
         #     3

     

       94
       -
         #

     

       95
       -
         #     nix-repl> obj = obj.extend (output: self: super: { args = super.args // { b = output.d; }; })

     

       96
       -
         #

     

       97
       -
         #     nix-repl> obj = obj.extend (output: self: super: { val = super.val // { d = 10; }; })

     

       98
       -
         #

     

       99
       -
         #     nix-repl> { inherit (obj) c d; }

     

       100
       -
         #     { c = 11; d = 10; }

     

       101
       -
         makeExtensibleWithInterface = interface: f: let i = interface

     

       102
       -
           (fix' (f i))

     

       103
       -
           (fext: makeExtensibleWithInterface interface (i': (extends (fext i') (f i'))));

     

       104
       -
         in i;

     

       105
        
       }

···

       72
        
       

     

       73
        
         # Same as `makeExtensible` but the name of the extending attribute is

     

       74
        
         # customized.

     

       75
       +
         makeExtensibleWithCustomName = extenderName: rattrs:

     

       76
       +
           fix' rattrs // {

     

       77
       +
             ${extenderName} = f: makeExtensibleWithCustomName extenderName (extends f rattrs);

     

       78
       +
          };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       79
        
       }

+6 -1

pkgs/development/beam-modules/default.nix

···

       5
        
       

     

       6
        
         lib = pkgs.callPackage ./lib.nix {};

     

       7
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       8
        
         packages = self:

     

       9
        
           let

     

       10
       -
             callPackage = stdenv.lib.callPackageWith (pkgs // self);

     

       0
        
       
     

       11
        
           in

     

       12
        
             import ./hex-packages.nix {

     

       13
        
               inherit pkgs stdenv callPackage;

···

       5
        
       

     

       6
        
         lib = pkgs.callPackage ./lib.nix {};

     

       7
        
       

     

       8
       +
         # FIXME: add support for overrideScope

     

       9
       +
         callPackageWithScope = scope: drv: args: stdenv.lib.callPackageWith scope drv args;

     

       10
       +
         mkScope = scope: pkgs // scope;

     

       11
       +
       

     

       12
        
         packages = self:

     

       13
        
           let

     

       14
       +
             defaultScope = mkScope self;

     

       15
       +
             callPackage = drv: args: callPackageWithScope defaultScope drv args;

     

       16
        
           in

     

       17
        
             import ./hex-packages.nix {

     

       18
        
               inherit pkgs stdenv callPackage;

+11 -9

pkgs/development/haskell-modules/default.nix

···

       7
        
       , configurationNix ? import ./configuration-nix.nix

     

       8
        
       }:

     

       9
        
       

     

       10
       -
       self: # Provided by `callPackageWithOutput`

     

       11
       -
       

     

       12
        
       let

     

       13
        
       

     

       14
        
         inherit (lib) extends makeExtensible;

     
···

       16
        
       

     

       17
        
         haskellPackages = pkgs.callPackage makePackageSet {

     

       18
        
           package-set = initialPackages;

     

       19
       -
           extensible-self = self;

     

       20
       -
           inherit stdenv haskellLib ghc;

     

       21
        
         };

     

       22
        
       

     

       23
        
         commonConfiguration = configurationCommon { inherit pkgs haskellLib; };

     

       24
        
         nixConfiguration = configurationNix { inherit pkgs haskellLib; };

     

       25
        
       

     

       26
       -
       in (extends overrides

     

       27
       -
            (extends packageSetConfig

     

       28
       -
              (extends compilerConfig

     

       29
       -
                (extends commonConfiguration

     

       30
       -
                  (extends nixConfiguration haskellPackages))))) self

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0

···

       7
        
       , configurationNix ? import ./configuration-nix.nix

     

       8
        
       }:

     

       9
        
       

     

       0
        
       
     

       0
        
       
     

       10
        
       let

     

       11
        
       

     

       12
        
         inherit (lib) extends makeExtensible;

     
···

       14
        
       

     

       15
        
         haskellPackages = pkgs.callPackage makePackageSet {

     

       16
        
           package-set = initialPackages;

     

       17
       +
           inherit stdenv haskellLib ghc extensible-self;

     

       0
        
       
     

       18
        
         };

     

       19
        
       

     

       20
        
         commonConfiguration = configurationCommon { inherit pkgs haskellLib; };

     

       21
        
         nixConfiguration = configurationNix { inherit pkgs haskellLib; };

     

       22
        
       

     

       23
       +
         extensible-self = makeExtensible

     

       24
       +
           (extends overrides

     

       25
       +
             (extends packageSetConfig

     

       26
       +
               (extends compilerConfig

     

       27
       +
                 (extends commonConfiguration

     

       28
       +
                   (extends nixConfiguration haskellPackages)))));

     

       29
       +
       

     

       30
       +
       in

     

       31
       +
       

     

       32
       +
         extensible-self

+32 -2

pkgs/development/haskell-modules/make-package-set.nix

···

       29
        
       

     

       30
        
       let

     

       31
        
       

     

       32
       -
         inherit (stdenv.lib) fix' extends makeOverridable callPackageWith;

     

       33
        
         inherit (haskellLib) overrideCabal;

     

       34
        
       

     

       35
        
         mkDerivationImpl = pkgs.callPackage ./generic-builder.nix {

     
···

       61
        
       

     

       62
        
         mkDerivation = makeOverridable mkDerivationImpl;

     

       63
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       64
        
         mkScope = scope: pkgs // pkgs.xorg // pkgs.gnome2 // { inherit stdenv; } // scope;

     

       65
        
         defaultScope = mkScope self;

     

       66
       -
         callPackage = drv: args: callPackageWith defaultScope drv args;

     

       67
        
       

     

       68
        
         withPackages = packages: callPackage ./with-packages-wrapper.nix {

     

       69
        
           inherit (self) llvmPackages;

···

       29
        
       

     

       30
        
       let

     

       31
        
       

     

       32
       +
         inherit (stdenv.lib) fix' extends makeOverridable;

     

       33
        
         inherit (haskellLib) overrideCabal;

     

       34
        
       

     

       35
        
         mkDerivationImpl = pkgs.callPackage ./generic-builder.nix {

     
···

       61
        
       

     

       62
        
         mkDerivation = makeOverridable mkDerivationImpl;

     

       63
        
       

     

       64
       +
         # manualArgs are the arguments that were explictly passed to `callPackage`, like:

     

       65
       +
         #

     

       66
       +
         # callPackage foo { bar = null; };

     

       67
       +
         #

     

       68
       +
         # here `bar` is a manual argument.

     

       69
       +
         callPackageWithScope = scope: fn: manualArgs:

     

       70
       +
           let

     

       71
       +
             # this code is copied from callPackage in lib/customisation.nix

     

       72
       +
             #

     

       73
       +
             # we cannot use `callPackage` here because we want to call `makeOverridable`

     

       74
       +
             # on `drvScope` (we cannot add `overrideScope` after calling `callPackage` because then it is

     

       75
       +
             # lost on `.override`) but determine the auto-args based on `drv` (the problem here

     

       76
       +
             # is that nix has no way to "passthrough" args while preserving the reflection

     

       77
       +
             # info that callPackage uses to determine the arguments).

     

       78
       +
             drv = if builtins.isFunction fn then fn else import fn;

     

       79
       +
             auto = builtins.intersectAttrs (builtins.functionArgs drv) scope;

     

       80
       +
       

     

       81
       +
             # this wraps the `drv` function to add a `overrideScope` function to the result.

     

       82
       +
             drvScope = allArgs: drv allArgs // {

     

       83
       +
               overrideScope = f:

     

       84
       +
                 let newScope = mkScope (fix' (extends f scope.__unfix__));

     

       85
       +
                 # note that we have to be careful here: `allArgs` includes the auto-arguments that

     

       86
       +
                 # weren't manually specified. If we would just pass `allArgs` to the recursive call here,

     

       87
       +
                 # then we wouldn't look up any packages in the scope in the next interation, because it

     

       88
       +
                 # appears as if all arguments were already manually passed, so the scope change would do

     

       89
       +
                 # nothing.

     

       90
       +
                 in callPackageWithScope newScope drv manualArgs;

     

       91
       +
             };

     

       92
       +
           in stdenv.lib.makeOverridable drvScope (auto // manualArgs);

     

       93
       +
       

     

       94
        
         mkScope = scope: pkgs // pkgs.xorg // pkgs.gnome2 // { inherit stdenv; } // scope;

     

       95
        
         defaultScope = mkScope self;

     

       96
       +
         callPackage = drv: args: callPackageWithScope defaultScope drv args;

     

       97
        
       

     

       98
        
         withPackages = packages: callPackage ./with-packages-wrapper.nix {

     

       99
        
           inherit (self) llvmPackages;

+10 -1

pkgs/development/idris-modules/default.nix

···

       1
        
       { pkgs, idris, overrides ? (self: super: {}) }: let

     

       2
        
         inherit (pkgs.lib) callPackageWith fix' extends;

     

       3
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       4
        
         idrisPackages = self: let

     

       5
       -
           callPackage = callPackageWith (pkgs // pkgs.xorg // pkgs.gnome2 // self);

     

       0
        
       
     

       0
        
       
     

       6
        
       

     

       7
        
           builtins_ = pkgs.lib.mapAttrs self.build-builtin-package {

     

       8
        
             prelude = [];

···

       1
        
       { pkgs, idris, overrides ? (self: super: {}) }: let

     

       2
        
         inherit (pkgs.lib) callPackageWith fix' extends;

     

       3
        
       

     

       4
       +
         /* Taken from haskell-modules/default.nix, should probably abstract this away */

     

       5
       +
         callPackageWithScope = scope: drv: args: (callPackageWith scope drv args) // {

     

       6
       +
           overrideScope = f: callPackageWithScope (mkScope (fix' (extends f scope.__unfix__))) drv args;

     

       7
       +
         };

     

       8
       +
       

     

       9
       +
         mkScope = scope : pkgs // pkgs.xorg // pkgs.gnome2 // scope;

     

       10
       +
       

     

       11
        
         idrisPackages = self: let

     

       12
       +
           defaultScope = mkScope self;

     

       13
       +
       

     

       14
       +
           callPackage = callPackageWithScope defaultScope;

     

       15
        
       

     

       16
        
           builtins_ = pkgs.lib.mapAttrs self.build-builtin-package {

     

       17
        
             prelude = [];

+3 -1

pkgs/top-level/all-packages.nix

···

       5710
        
       

     

       5711
        
         haskell = callPackage ./haskell-packages.nix { };

     

       5712
        
       

     

       5713
       -
         haskellPackages = haskell.packages.ghc802.extend (config.haskellPackageOverrides or (self: super: {}));

     

       0
        
       
     

       0
        
       
     

       5714
        
       

     

       5715
        
         inherit (haskellPackages) ghc;

     

       5716

···

       5710
        
       

     

       5711
        
         haskell = callPackage ./haskell-packages.nix { };

     

       5712
        
       

     

       5713
       +
         haskellPackages = haskell.packages.ghc802.override {

     

       5714
       +
           overrides = config.haskellPackageOverrides or (self: super: {});

     

       5715
       +
         };

     

       5716
        
       

     

       5717
        
         inherit (haskellPackages) ghc;

     

       5718

+20 -21

pkgs/top-level/haskell-packages.nix

···

       1
       -
       { pkgs, lib, stdenv, buildPlatform, targetPlatform }:

     

       2
        
       

     

       3
        
       let

     

       4
        
         # These are attributes in compiler and packages that don't support integer-simple.

     
···

       23
        
           inherit pkgs;

     

       24
        
         };

     

       25
        
       

     

       26
       -
         callPackage = lib.callPackageWith (pkgs // { inherit haskellLib; });

     

       27
       -
         callPackageWithOutput = lib.callPackageWithOutputWith (pkgs // { inherit haskellLib; });

     

       28
        
       

     

       29
        
       in rec {

     

       30
        
         lib = haskellLib;

     
···

       122
        
         packages = {

     

       123
        
       

     

       124
        
           # Support for this compiler is broken, because it can't deal with directory-based package databases.

     

       125
       -
           # ghc6104 = callPackageWithOutput ../development/haskell-modules { ghc = compiler.ghc6104; };

     

       126
       -
           ghc6123 = callPackageWithOutput ../development/haskell-modules {

     

       127
        
             ghc = compiler.ghc6123;

     

       128
        
             compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-6.12.x.nix { };

     

       129
        
           };

     

       130
       -
           ghc704 = callPackageWithOutput ../development/haskell-modules {

     

       131
        
             ghc = compiler.ghc704;

     

       132
        
             compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.0.x.nix { };

     

       133
        
           };

     

       134
       -
           ghc722 = callPackageWithOutput ../development/haskell-modules {

     

       135
        
             ghc = compiler.ghc722;

     

       136
        
             compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.2.x.nix { };

     

       137
        
           };

     

       138
       -
           ghc742 = callPackageWithOutput ../development/haskell-modules {

     

       139
        
             ghc = compiler.ghc742;

     

       140
        
             compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.4.x.nix { };

     

       141
        
           };

     

       142
       -
           ghc763 = callPackageWithOutput ../development/haskell-modules {

     

       143
        
             ghc = compiler.ghc763;

     

       144
        
             compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.6.x.nix { };

     

       145
        
           };

     

       146
       -
           ghc783 = callPackageWithOutput ../development/haskell-modules {

     

       147
        
             ghc = compiler.ghc783;

     

       148
        
             compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.8.x.nix { };

     

       149
        
           };

     

       150
       -
           ghc784 = callPackageWithOutput ../development/haskell-modules {

     

       151
        
             ghc = compiler.ghc784;

     

       152
        
             compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.8.x.nix { };

     

       153
        
           };

     

       154
       -
           ghc7102 = callPackageWithOutput ../development/haskell-modules {

     

       155
        
             ghc = compiler.ghc7102;

     

       156
        
             compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { };

     

       157
        
           };

     

       158
       -
           ghc7103 = callPackageWithOutput ../development/haskell-modules {

     

       159
        
             ghc = compiler.ghc7103;

     

       160
        
             compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { };

     

       161
        
           };

     

       162
       -
           ghc802 = callPackageWithOutput ../development/haskell-modules {

     

       163
        
             ghc = compiler.ghc802;

     

       164
        
             compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.0.x.nix { };

     

       165
        
           };

     

       166
       -
           ghc821 = callPackageWithOutput ../development/haskell-modules {

     

       167
        
             ghc = compiler.ghc821;

     

       168
        
             compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.2.x.nix { };

     

       169
        
           };

     

       170
       -
           ghcHEAD = callPackageWithOutput ../development/haskell-modules {

     

       171
        
             ghc = compiler.ghcHEAD;

     

       172
        
             compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { };

     

       173
        
           };

     

       174
        
           # TODO Support for multiple variants here

     

       175
       -
           ghcCross = callPackageWithOutput ../development/haskell-modules {

     

       176
        
             ghc = compiler.ghcHEAD.crossCompiler;

     

       177
        
             compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { };

     

       178
        
           };

     

       179
       -
           ghcCross821 = callPackageWithOutput ../development/haskell-modules {

     

       180
        
             ghc = compiler.ghc821.crossCompiler;

     

       181
        
             compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.2.x.nix { };

     

       182
        
           };

     

       183
       -
           ghcjs = callPackageWithOutput ../development/haskell-modules {

     

       184
        
             ghc = compiler.ghcjs;

     

       185
        
             compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { };

     

       186
        
             packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { };

     

       187
        
           };

     

       188
       -
           ghcjsHEAD = callPackageWithOutput ../development/haskell-modules {

     

       189
        
             ghc = compiler.ghcjsHEAD;

     

       190
        
             compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.0.x.nix { };

     

       191
        
             packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { };

     

       192
        
           };

     

       193
       -
           ghcHaLVM240 = callPackageWithOutput ../development/haskell-modules {

     

       194
        
             ghc = compiler.ghcHaLVM240;

     

       195
        
             compilerConfig = callPackage ../development/haskell-modules/configuration-halvm-2.4.0.nix { };

     

       196
        
           };

···

       1
       +
       { pkgs, lib, newScope, stdenv, buildPlatform, targetPlatform }:

     

       2
        
       

     

       3
        
       let

     

       4
        
         # These are attributes in compiler and packages that don't support integer-simple.

     
···

       23
        
           inherit pkgs;

     

       24
        
         };

     

       25
        
       

     

       26
       +
         callPackage = newScope { inherit haskellLib; };

     

       0
        
       
     

       27
        
       

     

       28
        
       in rec {

     

       29
        
         lib = haskellLib;

     
···

       121
        
         packages = {

     

       122
        
       

     

       123
        
           # Support for this compiler is broken, because it can't deal with directory-based package databases.

     

       124
       +
           # ghc6104 = callPackage ../development/haskell-modules { ghc = compiler.ghc6104; };

     

       125
       +
           ghc6123 = callPackage ../development/haskell-modules {

     

       126
        
             ghc = compiler.ghc6123;

     

       127
        
             compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-6.12.x.nix { };

     

       128
        
           };

     

       129
       +
           ghc704 = callPackage ../development/haskell-modules {

     

       130
        
             ghc = compiler.ghc704;

     

       131
        
             compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.0.x.nix { };

     

       132
        
           };

     

       133
       +
           ghc722 = callPackage ../development/haskell-modules {

     

       134
        
             ghc = compiler.ghc722;

     

       135
        
             compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.2.x.nix { };

     

       136
        
           };

     

       137
       +
           ghc742 = callPackage ../development/haskell-modules {

     

       138
        
             ghc = compiler.ghc742;

     

       139
        
             compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.4.x.nix { };

     

       140
        
           };

     

       141
       +
           ghc763 = callPackage ../development/haskell-modules {

     

       142
        
             ghc = compiler.ghc763;

     

       143
        
             compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.6.x.nix { };

     

       144
        
           };

     

       145
       +
           ghc783 = callPackage ../development/haskell-modules {

     

       146
        
             ghc = compiler.ghc783;

     

       147
        
             compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.8.x.nix { };

     

       148
        
           };

     

       149
       +
           ghc784 = callPackage ../development/haskell-modules {

     

       150
        
             ghc = compiler.ghc784;

     

       151
        
             compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.8.x.nix { };

     

       152
        
           };

     

       153
       +
           ghc7102 = callPackage ../development/haskell-modules {

     

       154
        
             ghc = compiler.ghc7102;

     

       155
        
             compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { };

     

       156
        
           };

     

       157
       +
           ghc7103 = callPackage ../development/haskell-modules {

     

       158
        
             ghc = compiler.ghc7103;

     

       159
        
             compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { };

     

       160
        
           };

     

       161
       +
           ghc802 = callPackage ../development/haskell-modules {

     

       162
        
             ghc = compiler.ghc802;

     

       163
        
             compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.0.x.nix { };

     

       164
        
           };

     

       165
       +
           ghc821 = callPackage ../development/haskell-modules {

     

       166
        
             ghc = compiler.ghc821;

     

       167
        
             compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.2.x.nix { };

     

       168
        
           };

     

       169
       +
           ghcHEAD = callPackage ../development/haskell-modules {

     

       170
        
             ghc = compiler.ghcHEAD;

     

       171
        
             compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { };

     

       172
        
           };

     

       173
        
           # TODO Support for multiple variants here

     

       174
       +
           ghcCross = callPackage ../development/haskell-modules {

     

       175
        
             ghc = compiler.ghcHEAD.crossCompiler;

     

       176
        
             compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { };

     

       177
        
           };

     

       178
       +
           ghcCross821 = callPackage ../development/haskell-modules {

     

       179
        
             ghc = compiler.ghc821.crossCompiler;

     

       180
        
             compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.2.x.nix { };

     

       181
        
           };

     

       182
       +
           ghcjs = callPackage ../development/haskell-modules {

     

       183
        
             ghc = compiler.ghcjs;

     

       184
        
             compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { };

     

       185
        
             packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { };

     

       186
        
           };

     

       187
       +
           ghcjsHEAD = callPackage ../development/haskell-modules {

     

       188
        
             ghc = compiler.ghcjsHEAD;

     

       189
        
             compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.0.x.nix { };

     

       190
        
             packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { };

     

       191
        
           };

     

       192
       +
           ghcHaLVM240 = callPackage ../development/haskell-modules {

     

       193
        
             ghc = compiler.ghcHaLVM240;

     

       194
        
             compilerConfig = callPackage ../development/haskell-modules/configuration-halvm-2.4.0.nix { };

     

       195
        
           };

-4

pkgs/top-level/splice.nix

···

       80
        
         # `newScope' for sets of packages in `pkgs' (see e.g. `gnome' below).

     

       81
        
         callPackage = pkgs.newScope {};

     

       82
        
       

     

       83
       -
         callPackageWithOutput = pkgs.newScopeWithOutput {};

     

       84
       -
       

     

       85
        
         callPackages = lib.callPackagesWith splicedPackages;

     

       86
        
       

     

       87
        
         newScope = extra: lib.callPackageWith (splicedPackages // extra);

     

       88
       -
       

     

       89
       -
         newScopeWithOutput = extra: lib.callPackageWithOutputWith (splicedPackages // extra);

     

       90
        
       }

···

       80
        
         # `newScope' for sets of packages in `pkgs' (see e.g. `gnome' below).

     

       81
        
         callPackage = pkgs.newScope {};

     

       82
        
       

     

       0
        
       
     

       0
        
       
     

       83
        
         callPackages = lib.callPackagesWith splicedPackages;

     

       84
        
       

     

       85
        
         newScope = extra: lib.callPackageWith (splicedPackages // extra);

     

       0
        
       
     

       0
        
       
     

       86
        
       }