From c1e96ff74f8abf0453f76bdffc827f15c887190d Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <contact@infinisil.com>
Date: Fri, 11 Sep 2020 18:20:35 +0200
Subject: [PATCH] release*: Support nixpkgsArgs for all release-*.nix files

This is a bit dirty because there's no easy way to propagate these
function arguments while still allowing --arg from the command line
---
 pkgs/top-level/release-cross.nix  | 4 +++-
 pkgs/top-level/release-python.nix | 4 +++-
 pkgs/top-level/release-small.nix  | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix
index af4dab5d263c..df476db0a7a0 100644
--- a/pkgs/top-level/release-cross.nix
+++ b/pkgs/top-level/release-cross.nix
@@ -5,9 +5,11 @@
   supportedSystems ? [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ]
 , # Strip most of attributes when evaluating to spare memory usage
   scrubJobs ? true
+, # Attributes passed to nixpkgs. Don't build packages marked as unfree.
+  nixpkgsArgs ? { config = { allowUnfree = false; inHydra = true; }; }
 }:
 
-with import ./release-lib.nix { inherit supportedSystems scrubJobs; };
+with import ./release-lib.nix { inherit supportedSystems scrubJobs nixpkgsArgs; };
 
 let
   nativePlatforms = all;
diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix
index 8b7240e21a33..485410356048 100644
--- a/pkgs/top-level/release-python.nix
+++ b/pkgs/top-level/release-python.nix
@@ -5,9 +5,11 @@
 
 { # The platforms for which we build Nixpkgs.
   supportedSystems ? [ "x86_64-linux" ]
+, # Attributes passed to nixpkgs. Don't build packages marked as unfree.
+  nixpkgsArgs ? { config = { allowUnfree = false; inHydra = true; }; }
 }:
 
-with import ./release-lib.nix {inherit supportedSystems; };
+with import ./release-lib.nix {inherit supportedSystems nixpkgsArgs; };
 with lib;
 
 let
diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix
index 7f84f02f006a..41aa86a8c463 100644
--- a/pkgs/top-level/release-small.nix
+++ b/pkgs/top-level/release-small.nix
@@ -3,9 +3,11 @@
 
 { nixpkgs ? { outPath = (import ../../lib).cleanSource ../..; revCount = 1234; shortRev = "abcdef"; }
 , supportedSystems ? [ "x86_64-linux" "x86_64-darwin" ]
+, # Attributes passed to nixpkgs. Don't build packages marked as unfree.
+  nixpkgsArgs ? { config = { allowUnfree = false; inHydra = true; }; }
 }:
 
-with import ./release-lib.nix { inherit supportedSystems; };
+with import ./release-lib.nix { inherit supportedSystems nixpkgsArgs; };
 
 {