From 0f711738bd99d474e2be4c625023d8acfcea5884 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Wed, 20 Dec 2017 08:17:14 -0500
Subject: [PATCH] nixpkgs: update

---
 nix/default.nix  | 8 --------
 nix/nixpkgs.json | 6 +++---
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/nix/default.nix b/nix/default.nix
index 3ce45a7..ed43435 100644
--- a/nix/default.nix
+++ b/nix/default.nix
@@ -15,14 +15,6 @@ in import (hostpkgs.stdenv.mkDerivation {
   };
 
   patches = [
-    (fetchurl {
-      # As of 2017-22-29 21:30:00 EST:
-      # The URL is https://github.com/NixOS/nixpkgs/pull/31150 but
-      # with master merged in so it applies cleanly.
-      url = "https://github.com/NixOS/nixpkgs/compare/master...grahamc:P-E-Meunier-mkRustCrate-rebased.patch";
-      name = "mkRustCrate-rebased.patch";
-      sha256 = "0w3w226axr282ranbzxymqshl4irxh5xx3sv1rrwvfv616j6ysqj";
-    })
   ];
 
   moveToOut = ''
diff --git a/nix/nixpkgs.json b/nix/nixpkgs.json
index ebe7cad..8e99442 100644
--- a/nix/nixpkgs.json
+++ b/nix/nixpkgs.json
@@ -1,7 +1,7 @@
 {
   "url": "https://github.com/nixos/nixpkgs-channels.git",
-  "rev": "79081322ab97b7d9c937c07b24cd0911e2a3a0a9",
-  "date": "2017-12-07T14:37:08+01:00",
-  "sha256": "1w90bf4wp3y40fv1gbmwzv6y0d0rj8jpzdj7hf3xi5vfr9j2sbqb",
+  "rev": "a0aeb2381e5a6c5c57efdec1bf4b4ada44d29511",
+  "date": "2017-12-20T02:19:43+00:00",
+  "sha256": "04dgg0f2839c1kvlhc45hcksmjzr8a22q1bgfnrx71935ilxl33d",
   "fetchSubmodules": true
 }