summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLluís Batlle i Rossell <viric@viric.name>2016-06-04 15:38:49 +0300
committerLluís Batlle i Rossell <viric@viric.name>2016-06-04 15:38:49 +0300
commit268fedbda33a0afa056eac97c6e04ccd0d21027f (patch)
treefba5e31ea1a31b32f9f16b32ae8311a93b872e59
parentc3b791f15b5fa88d92084d072e32cdf976b034ca (diff)
Updating goPackages go-fuse/mtpfs + libmtp to latest
libmtp to 1.1.11, and the go packages to latest master.
-rw-r--r--pkgs/development/libraries/libmtp/default.nix4
-rw-r--r--pkgs/top-level/go-packages.nix13
2 files changed, 8 insertions, 9 deletions
diff --git a/pkgs/development/libraries/libmtp/default.nix b/pkgs/development/libraries/libmtp/default.nix
index 671169b9ab3a..bdf1da498493 100644
--- a/pkgs/development/libraries/libmtp/default.nix
+++ b/pkgs/development/libraries/libmtp/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, libusb1 }:
stdenv.mkDerivation rec {
- name = "libmtp-1.1.9";
+ name = "libmtp-1.1.11";
src = fetchurl {
url = "mirror://sourceforge/libmtp/${name}.tar.gz";
- sha256 = "12dinqic0ljnhrwx3rc61jc7q24ybr0mckc2ya5kh1s1np0d7w93";
+ sha256 = "1sc768q2cixwanlwrz95mp389iaadl4s95486caavxx4g7znvn8m";
};
outputs = [ "dev" "bin" "out" ];
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index b3ecb2f9009d..ddaae38edbc7 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1631,11 +1631,11 @@ let
};
go-fuse = buildFromGitHub rec {
- rev = "324ea173d0a4d90e0e97c464a6ad33f80c9587a8";
- version = "2015-07-27";
+ rev = "bd746dd8bcc8c059a9d953a786a6156eb83f398e";
+ version = "2016-05-29";
owner = "hanwen";
repo = "go-fuse";
- sha256 = "0r5amgnpb4g7b6kpz42vnj01w515by4yhy64s5lqf3snzjygaycf";
+ sha256 = "1dvvclp418j3d02v9717sfqhl6fw6yyddr9r3j8gsiv8nb62ib56";
};
go-github = buildFromGitHub {
@@ -2671,12 +2671,11 @@ let
};
mtpfs = buildFromGitHub {
- rev = "3ef47f91c38cf1da3e965e37debfc81738e9cd94";
- version = "2015-08-01";
+ rev = "bc7c0f716e3b4ed5610069a55fc00828ebba890b";
+ date = "2015-09-17";
owner = "hanwen";
repo = "go-mtpfs";
- sha256 = "1f7lcialkpkwk01f7yxw77qln291sqjkspb09mh0yacmrhl231g8";
-
+ sha256 = "1jcqp9n8fd9psfsnhfj6w97yp0zmyxplsig8pyp2gqzh4lnb5fqm";
buildInputs = [ go-fuse usb ];
};