diff options
author | Gleb Peregud <gleber.p@gmail.com> | 2017-06-24 12:42:56 +0200 |
---|---|---|
committer | Gleb Peregud <gleber.p@gmail.com> | 2017-06-24 12:47:57 +0200 |
commit | 0123200dee6bd3f94dbf6fed376b3208dcefe309 (patch) | |
tree | 07b73a9024b5f39a145e625bab1cc63e1519b03f | |
parent | 5e2de6d846e7e7f88378b730936b07f2fb410e0a (diff) | |
download | nixlib-0123200dee6bd3f94dbf6fed376b3208dcefe309.tar nixlib-0123200dee6bd3f94dbf6fed376b3208dcefe309.tar.gz nixlib-0123200dee6bd3f94dbf6fed376b3208dcefe309.tar.bz2 nixlib-0123200dee6bd3f94dbf6fed376b3208dcefe309.tar.lz nixlib-0123200dee6bd3f94dbf6fed376b3208dcefe309.tar.xz nixlib-0123200dee6bd3f94dbf6fed376b3208dcefe309.tar.zst nixlib-0123200dee6bd3f94dbf6fed376b3208dcefe309.zip |
stdenv: add stawman docs for `makeOverridable`
Also fix a typo in docs in haskell-modules.
-rw-r--r-- | lib/customisation.nix | 18 | ||||
-rw-r--r-- | pkgs/development/haskell-modules/make-package-set.nix | 2 |
2 files changed, 19 insertions, 1 deletions
diff --git a/lib/customisation.nix b/lib/customisation.nix index 6d6c02340878..98a46ca6c616 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -51,6 +51,24 @@ rec { else { })); + /* `makeOverridable` takes a function from attribute set to attribute set and + injects `override` attibute which can be used to override arguments of + the function. + + nix-repl> x = {a, b}: { result = a + b; } + + nix-repl> y = lib.makeOverridable x { a = 1; b = 2; } + + nix-repl> y + { override = «lambda»; overrideDerivation = «lambda»; result = 3; } + + nix-repl> y.override { a = 10; } + { override = «lambda»; overrideDerivation = «lambda»; result = 12; } + + Please refer to "Nixpkgs Contributors Guide" section + "<pkg>.overrideDerivation" to learn about `overrideDerivation` and caveats + related to its use. + */ makeOverridable = f: origArgs: let ff = f origArgs; diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index cc161e3ca2df..6ed8d0864cac 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -130,7 +130,7 @@ in package-set { inherit pkgs stdenv callPackage; } self // { in generateExprs name src {}) overrides; # : { root : Path - # , source-overrides : Defaulted (Either Path VersionNumber + # , source-overrides : Defaulted (Either Path VersionNumber) # , overrides : Defaulted (HaskellPackageOverrideSet) # } -> NixShellAwareDerivation # Given a path to a haskell package directory whose cabal file is |