diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2017-10-05 12:34:05 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2017-10-05 12:34:05 +0200 |
commit | 0be2928ac9f8fa7ad2245785e586381ba8002585 (patch) | |
tree | c1d9a25219eb2e614c945aeac3e9ea33f74a135b /pkgs/tools | |
parent | 81025f9ef717895b4170bf93b234311d0f8f2386 (diff) | |
parent | 623df97af5a1bf1f5dcbf9075b0ac8cbba036e25 (diff) |
Merge branch 'master' into staging
Evaluation was blocked on Hydra; this should fix it.
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/networking/goklp/default.nix | 24 | ||||
-rw-r--r-- | pkgs/tools/networking/goklp/deps.nix | 56 | ||||
-rw-r--r-- | pkgs/tools/system/proot/default.nix | 12 |
3 files changed, 90 insertions, 2 deletions
diff --git a/pkgs/tools/networking/goklp/default.nix b/pkgs/tools/networking/goklp/default.nix new file mode 100644 index 0000000000000..88a6b74686c26 --- /dev/null +++ b/pkgs/tools/networking/goklp/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "goklp-${version}"; + version = "1.6"; + + goPackagePath = "github.com/AppliedTrust/goklp"; + + src = fetchFromGitHub { + owner = "AppliedTrust"; + repo = "goklp"; + rev = "v${version}"; + sha256 = "054qmwfaih8qbvdyy4rqbb1ip3jpnm547n390hgab8yc3bdd840c"; + }; + + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + description = "Golang OpenSSH Keys Ldap Provider for AuthorizedKeysCommand"; + homepage = https://github.com/AppliedTrust/goklp; + maintainers = with maintainers; [ disassembler ]; + license = licenses.bsd2; + }; +} diff --git a/pkgs/tools/networking/goklp/deps.nix b/pkgs/tools/networking/goklp/deps.nix new file mode 100644 index 0000000000000..2f6481f237f84 --- /dev/null +++ b/pkgs/tools/networking/goklp/deps.nix @@ -0,0 +1,56 @@ +[ + { + goPackagePath = "github.com/asaskevich/govalidator"; + fetch = { + type = "git"; + url = "https://github.com/asaskevich/govalidator"; + rev = "ca5f9e638c83bac66bfac70ded5bded1503135a7"; + sha256 = "0lk4irlf4a4q8qharwjxl71y1s2cf5bjpg9cv5jlyp574331pn1w"; + }; + } + { + goPackagePath = "github.com/docopt/docopt-go"; + fetch = { + type = "git"; + url = "https://github.com/docopt/docopt-go"; + rev = "784ddc588536785e7299f7272f39101f7faccc3f"; + sha256 = "0wwz48jl9fvl1iknvn9dqr4gfy1qs03gxaikrxxp9gry6773v3sj"; + }; + } + { + goPackagePath = "github.com/kardianos/osext"; + fetch = { + type = "git"; + url = "https://github.com/kardianos/osext"; + rev = "ae77be60afb1dcacde03767a8c37337fad28ac14"; + sha256 = "056dkgxrqjj5r18bnc3knlpgdz5p3yvp12y4y978hnsfhwaqvbjz"; + }; + } + { + goPackagePath = "github.com/vaughan0/go-ini"; + fetch = { + type = "git"; + url = "https://github.com/vaughan0/go-ini"; + rev = "a98ad7ee00ec53921f08832bc06ecf7fd600e6a1"; + sha256 = "1l1isi3czis009d9k5awsj4xdxgbxn4n9yqjc1ac7f724x6jacfa"; + }; + } + { + goPackagePath = "gopkg.in/asn1-ber.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/asn1-ber.v1"; + rev = "379148ca0225df7a432012b8df0355c2a2063ac0"; + sha256 = "1y8bvzbxpw0lfnn7pbcdwzqj4l90qj6xf88dvv9pxd9yl5g6cskx"; + }; + } + { + goPackagePath = "gopkg.in/ldap.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/ldap.v2"; + rev = "8168ee085ee43257585e50c6441aadf54ecb2c9f"; + sha256 = "1w0993i8bl8sap01gwm1v6hjp0rsanj2mbpyabwcwnns2g79n895"; + }; + } +] diff --git a/pkgs/tools/system/proot/default.nix b/pkgs/tools/system/proot/default.nix index 5d65267311f4e..640750b4f2d3d 100644 --- a/pkgs/tools/system/proot/default.nix +++ b/pkgs/tools/system/proot/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, talloc, docutils +{ stdenv, fetchFromGitHub, fetchpatch +, talloc, docutils , enableStatic ? false }: stdenv.mkDerivation rec { @@ -17,6 +18,13 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + patches = [ + (fetchpatch { # debian patch for aarch64 build + sha256 = "18milpzjkbfy5ab789ia3m4pyjyr9mfzbw6kbjhkj4vx9jc39svv"; + url = "https://sources.debian.net/data/main/p/proot/5.1.0-1.2/debian/patches/arm64.patch"; + }) + ]; + preBuild = stdenv.lib.optionalString enableStatic '' export LDFLAGS="-static" ''; @@ -38,6 +46,6 @@ stdenv.mkDerivation rec { description = "User-space implementation of chroot, mount --bind and binfmt_misc"; platforms = platforms.linux; license = licenses.gpl2; - maintainers = with maintainers; [ ianwookim nckx ]; + maintainers = with maintainers; [ ianwookim nckx makefu ]; }; } |