From 6d4af5f82c32084db10590036ce5c2cde3f61ce0 Mon Sep 17 00:00:00 2001
From: shimun <shimun@shimun.net>
Date: Sun, 13 Dec 2020 10:49:01 +0100
Subject: [PATCH] update crate2nix

---
 default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/default.nix b/default.nix
index 2acef1a..02a702e 100644
--- a/default.nix
+++ b/default.nix
@@ -1,11 +1,12 @@
 { pkgs ? import <nixpkgs> { }
 , callPackage ? pkgs.callPackage
 , stdenv ? pkgs.stdenv
+, fetchgit ? pkgs.fetchgit
 , name ? "brownpaper"
 , src ? (builtins.filterSource (path: type: baseNameOf path != "target") ./.)
 }:
 let
-  crate2nix_tools = import "${builtins.fetchTarball { url = "https://github.com/kolloch/crate2nix/archive/0.8.0.tar.gz"; sha256 = "17mmf5sqn0fmpqrf52icq92nf1sy5yacwx9vafk43piaq433ba56"; }}/tools.nix" { inherit pkgs; };
+  crate2nix_tools = import "${fetchgit { url = "https://github.com/kolloch/crate2nix.git"; rev = "adecff03c53b87255b3299f5a5787327342a69b2"; sha256 = "0l10yqa3gq73fc4xc977vb9zk5jlp70xiz5qd9c1vq873yqk1c7g"; }}/tools.nix" { inherit pkgs; };
   overrides = pkgs.defaultCrateOverrides // rec {
     nettle-sys = attrs: with pkgs; {
       nativeBuildInputs = [ clang nettle pkg-config ];
@@ -18,7 +19,7 @@ let
     brownpaper = sequoia-openpgp; # requires gmp as well
   };
   client = pkgs.writeShellScriptBin "brownpaper" ''
-    PATH=$PATH:${pkgs.gnupg}/bin/:${pkgs.curl}/bin/ ${./bp.sh} $@
+    PATH=${pkgs.bash}/bin/:${pkgs.gnupg}/bin/:${pkgs.curl}/bin/:$PATH ${./bp.sh} $@
   '';
 in
 { server = (crate2nix_tools.generatedCargoNix { inherit name src; });  inherit client; }