From daeea4012e8621560fe62870269a77162a07495d Mon Sep 17 00:00:00 2001
From: Jonas Nick <jonasd.nick@gmail.com>
Date: Sun, 28 Nov 2021 18:47:11 +0000
Subject: [PATCH] tests: remove pkgsUnstable

The latest nixpkgs-unstable update would require node-based packages to
distinguish between stable and unstable when building. Instead of dealing with
that complexity, we will only guarantee compatability of our packages with
stable.
---
 .cirrus.yml            | 31 +++++++++++++------------------
 test/pkgs-unstable.nix | 12 ------------
 test/run-tests.sh      |  5 -----
 3 files changed, 13 insertions(+), 35 deletions(-)
 delete mode 100644 test/pkgs-unstable.nix

diff --git a/.cirrus.yml b/.cirrus.yml
index 5f82269..56f8a49 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -15,25 +15,20 @@ task:
   # Use the maximum timeout. Needed when rebuilding packages on a channel update.
   timeout_in: 120m
 
+  name: modules_test
+  environment:
+    nixpkgs: nixpkgs
+  container:
+    # A maximum of 16 CPUs is shared among all concurrent tasks.
+    # https://cirrus-ci.org/faq/#are-there-any-limits
+    cpu: 4
   matrix:
-    - name: modules_test
-      environment:
-        nixpkgs: nixpkgs
-      container:
-        # A maximum of 16 CPUs is shared among all concurrent tasks.
-        # https://cirrus-ci.org/faq/#are-there-any-limits
-        cpu: 4
-      matrix:
-        - environment:
-            scenario: default
-        - environment:
-            scenario: netns
-        - environment:
-            scenario: netnsRegtest
-
-    - name: pkgs_unstable
-      environment:
-        nixpkgs: nixpkgs-unstable
+    - environment:
+        scenario: default
+    - environment:
+        scenario: netns
+    - environment:
+        scenario: netnsRegtest
 
   # This script is run as root
   build_script:
diff --git a/test/pkgs-unstable.nix b/test/pkgs-unstable.nix
deleted file mode 100644
index 442bec0..0000000
--- a/test/pkgs-unstable.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-let
-  pinned = import ../pkgs/nixpkgs-pinned.nix;
-  pkgs = import pinned.nixpkgs-unstable {};
-  nbPkgs = import ../pkgs { inherit pkgs; };
-  pkgsUnstable = with nbPkgs; [
-    # Disabled because joinmarket dependencies currently don't build on on unstable.
-    # joinmarket
-    rtl
-    cl-rest
-  ];
-in
-pkgs.writeText "pkgs-unstable" (pkgs.lib.concatMapStringsSep "\n" toString pkgsUnstable)
diff --git a/test/run-tests.sh b/test/run-tests.sh
index ddf3eb0..a4cddfe 100755
--- a/test/run-tests.sh
+++ b/test/run-tests.sh
@@ -246,10 +246,6 @@ vmTestNixExpr() {
 EOF
 }
 
-pkgsUnstable() {
-    doBuild pkgs-unstable "$scriptDir/pkgs-unstable.nix"
-}
-
 # A basic subset of tests to keep the total runtime within
 # manageable bounds (<4 min on desktop systems).
 # These are also run on the CI server.
@@ -257,7 +253,6 @@ basic() {
     scenario=default buildTest "$@"
     scenario=netns buildTest "$@"
     scenario=netnsRegtest buildTest "$@"
-    pkgsUnstable
 }
 
 # All tests that only consist of building a nix derivation.