From 35bb3a8975d0850c38b7558a43bdaf4b321fb158 Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Sun, 12 Apr 2020 10:51:39 -0700
Subject: [PATCH] Remove nix1

As of NixOS/nixpkgs@7121160, nix1 has been removed from Nixpkgs. Thus, we
remove it here.
---
 .travis.yml | 8 +++-----
 shell.nix   | 6 ++----
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d8d4f9f..92d04fb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,10 +4,8 @@ sudo: true
 matrix:
   include:
     - name: cargo pedantry
-      script: nix-shell --run checkPhase --arg useNix1 false -A mozilla-rust-overlay
-    - name: checkPhase - Nix 2
-      script: nix-shell --run checkPhase --arg useNix1 false
-    - name: checkPhase - Nix 1
-      script: nix-shell --run checkPhase --arg useNix1 true
+      script: nix-shell --run checkPhase -A mozilla-rust-overlay
+    - name: checkPhase
+      script: nix-shell --run checkPhase
     - name: nix-build
       script: nix-build ./default.nix -A ofborg.rs -A ofborg.php
diff --git a/shell.nix b/shell.nix
index 8018c50..659ee11 100644
--- a/shell.nix
+++ b/shell.nix
@@ -2,7 +2,7 @@
   overlays = [
     (import (builtins.fetchTarball https://github.com/mozilla/nixpkgs-mozilla/archive/master.tar.gz))
   ];
-}, useNix1 ? false }:
+} }:
 
 let
   # A random Nixpkgs revision *before* the default glibc
@@ -29,8 +29,7 @@ let
       php
       curl
       bash
-    ]
-      ++ stdenv.lib.optional useNix1 oldpkgs.nix1;
+    ];
 
     # HISTFILE = "${src}/.bash_hist";
   };
@@ -84,7 +83,6 @@ let
       pkgconfig
       git
     ]
-      ++ stdenv.lib.optional useNix1 oldpkgs.nix1
       ++ stdenv.lib.optional stdenv.isDarwin pkgs.darwin.Security;
 
     postHook = ''