From de0e9e7a86c2603d0f978b0a6e51040a3adf01ea Mon Sep 17 00:00:00 2001 From: Gleb Peregud Date: Sat, 24 Jun 2017 12:30:04 +0200 Subject: [PATCH] erlang: refactor: switch to lib.makeExtensible Use standardized implementation of attribute set extensibility mechanism instead of manually re-implementing it. Suggested by @cstrahan at https://github.com/NixOS/nixpkgs/pull/26668. --- pkgs/development/beam-modules/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index 0db695befe6d..d1a2a785a9c9 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -1,7 +1,7 @@ -{ stdenv, pkgs, erlang, overrides ? (self: super: {}) }: +{ stdenv, pkgs, erlang }: let - inherit (stdenv.lib) fix' extends getVersion versionAtLeast; + inherit (stdenv.lib) getVersion versionAtLeast makeExtensible; lib = pkgs.callPackage ./lib.nix {}; @@ -50,4 +50,4 @@ let cuter = callPackage ../tools/erlang/cuter {}; relxExe = callPackage ../tools/erlang/relx-exe {}; }; -in fix' (extends overrides packages) +in makeExtensible packages