Merge pull request #64 from Mic92/carnix-0.6.5

rebuild with carnix 0.6.5

default.nix

@@ -11,20 +11,18 @@ let
   '';
 in {
   ofborg.rs = let
-      build = (pkgs.callPackage ./nix/ofborg-carnix.nix {})
-        .ofborg_0_1_1.override {
-          crateOverrides = pkgs.defaultCrateOverrides //
-          {
-            ofborg = attrs: {
-              buildInputs =
-                  pkgs.lib.optionals
-                    pkgs.stdenv.isDarwin
-                    [ pkgs.darwin.apple_sdk.frameworks.Security ];
-            };
-          };
+    drv = (pkgs.callPackage ./nix/ofborg-carnix.nix {}).ofborg {};
+    build = drv.override {
+      crateOverrides = pkgs.defaultCrateOverrides // {
+        ofborg = attrs: {
+          buildInputs = pkgs.lib.optionals pkgs.stdenv.isDarwin
+                     [ pkgs.darwin.apple_sdk.frameworks.Security ];
         };
-    in stripDeps build;
-  ircbot = stripDeps (pkgs.callPackage ./nix/ircbot-carnix.nix {}).ircbot_0_1_0;
+      };
+    };
+  in stripDeps build;
+
+  ircbot = stripDeps ((pkgs.callPackage ./nix/ircbot-carnix.nix {}).ircbot {});
 
   ofborg.php = pkgs.runCommand
     "ofborg"

nix/nixpkgs.json

@@ -1,7 +1,7 @@
 {
   "url": "https://github.com/nixos/nixpkgs-channels.git",
-  "rev": "f1c236a987bc5d0a0de0bafc2d8e0e7556f45450",
-  "date": "2017-12-26T09:11:04+01:00",
-  "sha256": "1x7b5sx66f99xdjqxksrdxnbk8k24qzjm9b3b5h2wxbdqkav0mck",
+  "rev": "42b9b8f7c8687cb26e69c3559e0e1346fb0e680f",
+  "date": "2018-02-01T13:38:16+01:00",
+  "sha256": "01zcd0dh9x3qf5yflclbrcvff9yh8k9pmccc7vjlq3phc440qsyb",
   "fetchSubmodules": true
 }