diff options
author | adisbladis <adisbladis@gmail.com> | 2019-09-05 22:06:02 +0100 |
---|---|---|
committer | adisbladis <adisbladis@gmail.com> | 2019-09-05 22:33:39 +0100 |
commit | aeef53e5dd01bd70ff380fc522e13f9a9c68432d (patch) | |
tree | 2ea1601499a4c1a9a459d440fc89ca9faee18aa8 /pkgs | |
parent | 7814d35bff440e8b7e9b9c1cf4c7de1fa932276d (diff) | |
download | nixlib-aeef53e5dd01bd70ff380fc522e13f9a9c68432d.tar nixlib-aeef53e5dd01bd70ff380fc522e13f9a9c68432d.tar.gz nixlib-aeef53e5dd01bd70ff380fc522e13f9a9c68432d.tar.bz2 nixlib-aeef53e5dd01bd70ff380fc522e13f9a9c68432d.tar.lz nixlib-aeef53e5dd01bd70ff380fc522e13f9a9c68432d.tar.xz nixlib-aeef53e5dd01bd70ff380fc522e13f9a9c68432d.tar.zst nixlib-aeef53e5dd01bd70ff380fc522e13f9a9c68432d.zip |
fscrypt: 0.2.4 -> unstable-2019-08-29
Fix build with go 1.12
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/os-specific/linux/fscrypt/default.nix | 8 | ||||
-rw-r--r-- | pkgs/os-specific/linux/fscrypt/deps.nix | 66 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
3 files changed, 72 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/fscrypt/default.nix b/pkgs/os-specific/linux/fscrypt/default.nix index 35e1972b574b..cdd42e98f06b 100644 --- a/pkgs/os-specific/linux/fscrypt/default.nix +++ b/pkgs/os-specific/linux/fscrypt/default.nix @@ -4,15 +4,17 @@ buildGoPackage rec { pname = "fscrypt"; - version = "0.2.4"; + version = "unstable-2019-08-29"; goPackagePath = "github.com/google/fscrypt"; + goDeps = ./deps.nix; + src = fetchFromGitHub { owner = "google"; repo = "fscrypt"; - rev = "v${version}"; - sha256 = "10gbyqzgi30as1crvqbb4rc5p8zzbzk1q5j080h1gnz56qzwivr8"; + rev = "8a3acda2011e9a080ee792c1e11646e6118a4930"; + sha256 = "17h6r5lqiz0cw9vsixv48a1p78nd7bs1kncg6p4lfagl7kr5hpls"; }; buildInputs = [ pam ]; diff --git a/pkgs/os-specific/linux/fscrypt/deps.nix b/pkgs/os-specific/linux/fscrypt/deps.nix new file mode 100644 index 000000000000..5d3e8a89a91f --- /dev/null +++ b/pkgs/os-specific/linux/fscrypt/deps.nix @@ -0,0 +1,66 @@ +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) +[ + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "v1.2.0"; + sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "v0.8.0"; + sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; + }; + } + { + goPackagePath = "github.com/urfave/cli"; + fetch = { + type = "git"; + url = "https://github.com/urfave/cli"; + rev = "v1.20.0"; + sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "614d502a4dac"; + sha256 = "1rcyvsl8b8pk7h8lwl0fpiflrx8zs121wi5490ln0qnvkk8d4bwy"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "8a410e7b638d"; + sha256 = "0hp0l8f6fir5gmgrjq0mhh5ikc0rlrm72774228800kfwqjrxxny"; + }; + } + { + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sync"; + rev = "1d60e4601c6f"; + sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "d99a578cf41b"; + sha256 = "10q9xx4pmnq92qn6ff4xp7n1hx766wvw2rf7pqcd6rx5plgwz8cm"; + }; + } +] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b96a33563e81..efb90f2cb794 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15533,9 +15533,7 @@ in dstat = callPackage ../os-specific/linux/dstat { }; # unstable until the first 1.x release - fscrypt-experimental = callPackage ../os-specific/linux/fscrypt { - buildGoPackage = buildGo110Package; - }; + fscrypt-experimental = callPackage ../os-specific/linux/fscrypt { }; fscryptctl-experimental = callPackage ../os-specific/linux/fscryptctl { }; fwupd = callPackage ../os-specific/linux/firmware/fwupd { }; |