Unverified Commit 21623b7c authored by Philip Taron's avatar Philip Taron Committed by GitHub
Browse files

Reapply "splice.nix: make pkgs splicedPackages" (#456138)

parents c5cec615 f2640ee2

lib/systems/examples.nix

+0 −9
Original line number Diff line number Diff line
@@ -302,15 +302,6 @@ rec { 
    libc = "newlib";

  };



  #

  # Redox

  #



  x86_64-unknown-redox = {

    config = "x86_64-unknown-redox";

    libc = "relibc";

  };



  #

  # Darwin

  #

nixos/lib/testing/driver.nix

+1 −1
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ in 
    _module.args = {

      hostPkgs =

        # Comment is in nixos/modules/misc/nixpkgs.nix

        lib.mkOverride lib.modules.defaultOverridePriority config.hostPkgs.__splicedPackages;

        lib.mkOverride lib.modules.defaultOverridePriority config.hostPkgs;

    };



    driver = withChecks driver;

nixos/modules/misc/nixpkgs.nix

+1 −1
Original line number Diff line number Diff line
@@ -355,7 +355,7 @@ in 
        # which is somewhat costly for Nixpkgs. With an explicit priority, we only

        # evaluate the wrapper to find out that the priority is lower, and then we

        # don't need to evaluate `finalPkgs`.

        lib.mkOverride lib.modules.defaultOverridePriority finalPkgs.__splicedPackages;

        lib.mkOverride lib.modules.defaultOverridePriority finalPkgs;

    };



    assertions =

nixos/modules/misc/nixpkgs/read-only.nix

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ in 
      # find mistaken definitions

      builtins.seq cfg.config builtins.seq cfg.overlays builtins.seq cfg.hostPlatform builtins.seq

        cfg.buildPlatform

        cfg.pkgs.__splicedPackages;

        cfg.pkgs;

    nixpkgs.config = cfg.pkgs.config;

    nixpkgs.overlays = cfg.pkgs.overlays;

    nixpkgs.hostPlatform = cfg.pkgs.stdenv.hostPlatform;

pkgs/development/beam-modules/default.nix

+1 −2
Original line number Diff line number Diff line 
{

  lib,

  __splicedPackages,

  pkgs,

  erlang,

}:



let

  pkgs = __splicedPackages;

  inherit (lib) makeExtensible;



  # FIXME: add support for overrideScope