From 226ad319e64f3635b1b1a1396c063a46abcdafb3 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Thu, 5 May 2022 01:40:44 +1200
Subject: [PATCH] tests: Set `allowAliases = false`

We don't want to accidentally end up with aliases in the code base
that then breaks nixpkgs when it's eventually incorporated.
---
 tests/default.nix      | 9 ++++++---
 tests/eggs/default.nix | 4 ++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/tests/default.nix b/tests/default.nix
index 179985b..5b60471 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -2,6 +2,9 @@ let
   sources = import ../nix/sources.nix;
 in
 { pkgs ? import sources.nixpkgs {
+    config = {
+      allowAliases = false;
+    };
     overlays = [
       (import ../overlay.nix)
     ];
@@ -11,9 +14,9 @@ let
   poetry = pkgs.callPackage ../pkgs/poetry { python = pkgs.python3; inherit poetry2nix; };
   poetry2nix = import ./.. { inherit pkgs; inherit poetry; };
   poetryLib = import ../lib.nix { inherit pkgs; lib = pkgs.lib; stdenv = pkgs.stdenv; };
-  pep425 = pkgs.callPackage ../pep425.nix { inherit poetryLib; };
+  pep425 = pkgs.callPackage ../pep425.nix { inherit poetryLib; python = pkgs.python3; };
   pep425Python37 = pkgs.callPackage ../pep425.nix { inherit poetryLib; python = pkgs.python37; };
-  pep425OSX = pkgs.callPackage ../pep425.nix { inherit poetryLib; isLinux = false; };
+  pep425OSX = pkgs.callPackage ../pep425.nix { inherit poetryLib; isLinux = false; python = pkgs.python3; };
   skipTests = builtins.filter (t: builtins.typeOf t != "list") (builtins.split "," (builtins.getEnv "SKIP_TESTS"));
   callTest = test: attrs: pkgs.callPackage test ({ inherit poetry2nix; } // attrs);
 
@@ -84,7 +87,7 @@ builtins.removeAttrs
   trivial-cross = skipOSX (callTest ./trivial-cross { });
 
   # Inherit test cases from nixpkgs
-  inherit (pkgs) nixops nixopsUnstable;
+  inherit (pkgs) nixops nixops_unstable;
 
   # Rmfuse fails on darwin because osxfuse only implements fuse api v2
   rmfuse = skipOSX pkgs.rmfuse;
diff --git a/tests/eggs/default.nix b/tests/eggs/default.nix
index 935f06a..15d6e9e 100644
--- a/tests/eggs/default.nix
+++ b/tests/eggs/default.nix
@@ -1,4 +1,4 @@
-{ lib, poetry2nix, python37, runCommandNoCC }:
+{ lib, poetry2nix, python37, runCommand }:
 let
   drv = poetry2nix.mkPoetryApplication {
     python = python37;
@@ -6,4 +6,4 @@ let
   };
 in
 assert lib.strings.hasSuffix ".egg" (lib.elemAt drv.passthru.python.pkgs.pyasn1.src.urls 0);
-runCommandNoCC "egg-test" { } "touch $out"
+runCommand "egg-test" { } "touch $out"