Unverified Commit f56de234 authored by Artturi's avatar Artturi Committed by GitHub
Browse files

Merge pull request #207652 from Artturin/splicenixfmt

parents 9c6be843 58fa7807

pkgs/desktops/xfce/default.nix

+4 −18
Original line number Diff line number Diff line 
{ config

, lib

, pkgs

, splicePackages

, newScope

, pkgsBuildBuild

, pkgsBuildHost

, pkgsBuildTarget

, pkgsHostHost

, pkgsTargetTarget

, generateSplicesForMkScope

, makeScopeWithSplicing

}:



let

  otherSplices = {

    selfBuildBuild = pkgsBuildBuild.xfce;

    selfBuildHost = pkgsBuildHost.xfce;

    selfBuildTarget = pkgsBuildTarget.xfce;

    selfHostHost = pkgsHostHost.xfce;

    selfTargetTarget = pkgsTargetTarget.xfce or { };

  };

  keep = _self: { };

  extra = _spliced0: { };



in

lib.makeScopeWithSplicing

  splicePackages

  newScope

  otherSplices

makeScopeWithSplicing

  (generateSplicesForMkScope "xfce")

  keep

  extra

  (self:

pkgs/development/interpreters/lua-5/default.nix

+2 −4
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ let 
        # - imports lua-packages.nix

        # - adds spliced package sets to the package set

        # - applies overrides from `packageOverrides`

        ({ lua, overrides, callPackage, splicePackages, newScope }: let

        ({ lua, overrides, callPackage, makeScopeWithSplicing }: let

          luaPackagesFun = callPackage ../../../top-level/lua-packages.nix {

            lua = self;

          };
@@ -46,9 +46,7 @@ let 
            overriddenPackages

            overrides

          ];

        in lib.makeScopeWithSplicing

          splicePackages

          newScope

        in makeScopeWithSplicing

          otherSplices

          keep

          extra

pkgs/development/interpreters/python/default.nix

+2 −5
Original line number Diff line number Diff line
@@ -5,9 +5,8 @@ 
, db

, lib

, libffiBoot

, newScope

, makeScopeWithSplicing

, pythonPackagesExtensions

, splicePackages

, stdenv

}:
@@ -71,9 +70,7 @@ 
            overrides

          ]);

          aliases = self: super: lib.optionalAttrs config.allowAliases (import ../../../top-level/python-aliases.nix lib self super);

        in lib.makeScopeWithSplicing

          splicePackages

          newScope

        in makeScopeWithSplicing

          otherSplices

          keep

          extra

pkgs/games/steam/default.nix

+3 −11
Original line number Diff line number Diff line 
{ lib, newScope, splicePackages, steamPackagesAttr ? "steamPackages"

, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget, pkgsHostHost, pkgsTargetTarget

{ makeScopeWithSplicing, generateSplicesForMkScope

, stdenv, buildFHSUserEnv, pkgsi686Linux

}:
@@ -18,19 +17,12 @@ let 
      glxinfo-i686 = pkgsi686Linux.glxinfo;

      steam-runtime-wrapped-i686 =

        if self.steamArch == "amd64"

        then pkgsi686Linux.${steamPackagesAttr}.steam-runtime-wrapped

        then pkgsi686Linux.steamPackages.steam-runtime-wrapped

        else null;

      inherit buildFHSUserEnv;

    };

    steamcmd = callPackage ./steamcmd.nix { };

  };

  otherSplices = {

    selfBuildBuild = pkgsBuildBuild.${steamPackagesAttr};

    selfBuildHost = pkgsBuildHost.${steamPackagesAttr};

    selfBuildTarget = pkgsBuildTarget.${steamPackagesAttr};

    selfHostHost = pkgsHostHost.${steamPackagesAttr};

    selfTargetTarget = pkgsTargetTarget.${steamPackagesAttr} or {}; # might be missing;

  };

  keep = self: { };

  extra = spliced0: { };

in lib.makeScopeWithSplicing splicePackages newScope otherSplices keep extra steamPackagesFun
 
in makeScopeWithSplicing (generateSplicesForMkScope "steamPackages") keep extra steamPackagesFun

pkgs/os-specific/bsd/freebsd/default.nix

+4 −14
Original line number Diff line number Diff line 
{ stdenv, lib, stdenvNoCC

, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget, pkgsHostHost, pkgsTargetTarget

, buildPackages, splicePackages, newScope

, makeScopeWithSplicing, generateSplicesForMkScope

, buildPackages

, bsdSetupHook, makeSetupHook

, fetchgit, fetchurl, coreutils, groff, mandoc, byacc, flex, which, m4, gawk, substituteAll, runtimeShell

, zlib, expat, libmd
@@ -24,14 +24,6 @@ let 
    name = "freebsd-setup-hook";

  } ./setup-hook.sh;



  otherSplices = {

    selfBuildBuild = pkgsBuildBuild.freebsd;

    selfBuildHost = pkgsBuildHost.freebsd;

    selfBuildTarget = pkgsBuildTarget.freebsd;

    selfHostHost = pkgsHostHost.freebsd;

    selfTargetTarget = pkgsTargetTarget.freebsd or {}; # might be missing

  };



  mkBsdArch = stdenv':  {

    x86_64 = "amd64";

    aarch64 = "arm64";
@@ -74,10 +66,8 @@ let 
    done

  '';



in lib.makeScopeWithSplicing

  splicePackages

  newScope

  otherSplices

in makeScopeWithSplicing

  (generateSplicesForMkScope "freebsd")

  (_: {})

  (_: {})

  (self: let