Merge pull request #460 from cole-h/nix1-removal

Nix1 removal

.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
+      script: nix-shell --run checkPhase -A mozilla-rust-overlay
-    - name: checkPhase - Nix 2
+    - name: checkPhase
-      script: nix-shell --run checkPhase --arg useNix1 false
+      script: nix-shell --run checkPhase
-    - name: checkPhase - Nix 1
-      script: nix-shell --run checkPhase --arg useNix1 true
     - name: nix-build
       script: nix-build ./default.nix -A ofborg.rs -A ofborg.php

ofborg/src/nix.rs

@@ -752,7 +752,7 @@ mod tests {
         assert_run(
             ret,
             Expect::Fail,
-            vec!["You just can't", "assertion failed"],
+            vec!["You just can't", "assertion", "failed"],
         );
     }
 

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 = ''