BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #54366 from thefloweringash/gocryptfs-update

Browse source 
gocryptfs: 1.5 -> 1.6.1
This commit is contained in:
worldofpeace 2019-01-23 18:31:46 -05:00 committed by GitHub
commit 3bb9b102e5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 87 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/tools/filesystems/gocryptfs/default.nix
View file

@ -2,7 +2,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub, openssl, pandoc, pkgconfig }: { stdenv, buildGoPackage, fetchFromGitHub, openssl, pandoc, pkgconfig }:
let let
version = "v1.5"; version = "v1.6.1";
goFuseVersion = with stdenv.lib; substring 0 7 (head (filter ( goFuseVersion = with stdenv.lib; substring 0 7 (head (filter (
d: d.goPackagePath == "github.com/hanwen/go-fuse" d: d.goPackagePath == "github.com/hanwen/go-fuse"
) (import ./deps.nix))).fetch.rev; ) (import ./deps.nix))).fetch.rev;
@ -19,7 +19,7 @@ buildGoPackage rec {
owner = "rfjakob"; owner = "rfjakob";
repo = "gocryptfs"; repo = "gocryptfs";
rev = version; rev = version;
sha256 = "0s5smjc7n9088n8a2mv7cy3cx31ci13i1i8fhg1vslc17a15qs2d"; sha256 = "0aqbl25g48b4jp6l09k6kic6w3p0q7d9ip2wvrcvh8lhnrbdkhzd";
}; };
postPatch = "rm -r tests"; postPatch = "rm -r tests";

81
pkgs/tools/filesystems/gocryptfs/deps.nix generated
View file

@ -1,12 +1,39 @@
# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 # file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
[ [
{
goPackagePath = "github.com/conejoninja/hid";
fetch = {
type = "git";
url = "https://github.com/conejoninja/hid";
rev = "3a959b87ebefc18767a31fa567eea402eb37239e";
sha256 = "1i1x7fhs3g9a48h2wxjczshx7gzmj9p6pd71l22ky998zgjadlim";
};
}
{
goPackagePath = "github.com/conejoninja/tesoro";
fetch = {
type = "git";
url = "https://github.com/conejoninja/tesoro";
rev = "e0e839b6a6f14bce56d1bfac9a86311a1646a6a3";
sha256 = "19q1ibj6l6pk2a3iwcyrj60sscvkqw450psd9zdflvb293cjsx8v";
};
}
{
goPackagePath = "github.com/golang/protobuf";
fetch = {
type = "git";
url = "https://github.com/golang/protobuf";
rev = "b4deda0973fb4c70b50d226b1af49f3da59f5265";
sha256 = "0ya4ha7m20bw048m1159ppqzlvda4x0vdprlbk5sdgmy74h3xcdq";
};
}
{ {
goPackagePath = "github.com/hanwen/go-fuse"; goPackagePath = "github.com/hanwen/go-fuse";
fetch = { fetch = {
type = "git"; type = "git";
url = "https://github.com/hanwen/go-fuse"; url = "https://github.com/hanwen/go-fuse";
rev = "291273cb8ce0f139636a6fd7414be3c7e2de6288"; rev = "95c6370914ac7822973d1893680e878e156f8d70";
sha256 = "1djfl6mni8k4wllhwcr6qwyg1nh6wykdalvdl6gpc1rwrjj9c6xi"; sha256 = "1h701c1hxrw7ljh7kc0rjx18bfw2mzdbpmqqilb5wb0ngpdjpqxp";
}; };
} }
{ {
@ -23,8 +50,8 @@
fetch = { fetch = {
type = "git"; type = "git";
url = "https://github.com/pkg/xattr"; url = "https://github.com/pkg/xattr";
rev = "d15dbc2bb0b5da267362b5e066e2c44c1fcff6c7"; rev = "f5b647e257e19d63831e7c7adb95dfb79d9ff4d9";
sha256 = "1vab8mpk2x4vbhx0kd0i0kn6sf7z5ivilcmdklyizzcfcwghh17g"; sha256 = "0cqxibbfllhs6ffxq65gn08088g7g7aw752p9g3vbnj35jk2p8i9";
}; };
} }
{ {
@ -36,13 +63,40 @@
sha256 = "0c227ly3z8pqaqg22lpd8nzgqrfsbjx5gi9rp9ks1cmd11dv2gl9"; sha256 = "0c227ly3z8pqaqg22lpd8nzgqrfsbjx5gi9rp9ks1cmd11dv2gl9";
}; };
} }
{
goPackagePath = "github.com/trezor/trezord-go";
fetch = {
type = "git";
url = "https://github.com/trezor/trezord-go";
rev = "bae9c40e5d71c459bde056d42d4b19ab318c90c2";
sha256 = "12j7b4vjs8n68214zrh5ivpqm3fcifk27bj6rszd9x2839nk3hy8";
};
}
{
goPackagePath = "github.com/xaionaro-go/cryptoWallet";
fetch = {
type = "git";
url = "https://github.com/xaionaro-go/cryptoWallet";
rev = "47f9f6877e4324a8bc47fc5661c32d2fe6d29586";
sha256 = "14h2vnl2jm2wj10znizdf2f0mxsk27rsjskjw5qffy8nf5a0i3i6";
};
}
{
goPackagePath = "github.com/zserge/hid";
fetch = {
type = "git";
url = "https://github.com/zserge/hid";
rev = "c86e7adeabafd6fcb3371ad64d6ed366b04d55db";
sha256 = "1y2zqndq6mafgsdai5gnkw4g8dzl9vmjcxq0i8xspaj4dmck19c4";
};
}
{ {
goPackagePath = "golang.org/x/crypto"; goPackagePath = "golang.org/x/crypto";
fetch = { fetch = {
type = "git"; type = "git";
url = "https://go.googlesource.com/crypto"; url = "https://go.googlesource.com/crypto";
rev = "a49355c7e3f8fe157a85be2f77e6e269a0f89602"; rev = "de0752318171da717af4ce24d0a2e8626afaeb11";
sha256 = "020q1laxjx5kcmnqy4wmdb63zhb0lyq6wpy40axhswzg2nd21s44"; sha256 = "1ps1dl2a5lwr3vbwcy8n4i1v73m567y024sk961fk281phrzp13i";
}; };
} }
{ {
@ -59,8 +113,17 @@
fetch = { fetch = {
type = "git"; type = "git";
url = "https://go.googlesource.com/sys"; url = "https://go.googlesource.com/sys";
rev = "151529c776cdc58ddbe7963ba9af779f3577b419"; rev = "14742f9018cd6651ec7364dc6ee08af0baaa1031";
sha256 = "149yfzs4k8vxhjr8f832drndir2k5ha0ggs2dw2fd6xvxf698bcx"; sha256 = "17k06vwhnlb18n9rb1cdcdqyjcn353znfrr4c90xb3carz1sqfq5";
};
}
{
goPackagePath = "golang.org/x/text";
fetch = {
type = "git";
url = "https://go.googlesource.com/text";
rev = "f21a4dfb5e38f5895301dc265a8def02365cc3d0";
sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
}; };
} }
] ]