From df15b41c2465eac96cc0ae74656ec0ab6674948a Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Mon, 2 Nov 2015 18:50:24 +0100
Subject: [PATCH] Remove one .nix file and have everything in default.nix

---
 default.nix | 6 ++----
 shell.nix   | 7 -------
 2 files changed, 2 insertions(+), 11 deletions(-)
 delete mode 100644 shell.nix

diff --git a/default.nix b/default.nix
index 03e7c694..6de25500 100644
--- a/default.nix
+++ b/default.nix
@@ -1,6 +1,4 @@
-{ stdenv
-, pkgs ? (import <nixpkgs> {})
-}:
+{ pkgs ? (import <nixpkgs> {}) }:
 
 let
   env = with pkgs.rustPlatform; [
@@ -9,7 +7,7 @@ let
   ];
 in
 
-stdenv.mkDerivation rec {
+pkgs.stdenv.mkDerivation rec {
     name = "unfug.org";
     src = ./.;
     version = "0.0.0";
diff --git a/shell.nix b/shell.nix
deleted file mode 100644
index 4d666486..00000000
--- a/shell.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ pkgs ? (import <nixpkgs> {})
-}:
-
-(import ./default.nix) {
-  stdenv = pkgs.stdenv;
-  pkgs = pkgs;
-}