git.iko.soy/typeable/nixpkgs
on master help sign in
mongodb-tools: 3.7.2 -> 4.2.0

Fix build with latest Go

commita26a274a681dd32927926365f316a2d06d599ccf authoradisbladis <adisbladis@gmail.com> dateThu 5 Sep 2019, 22:27 (7 years ago) parentb032614
2 files changed+27−20
pkgs/tools/misc/mongodb-tools/default.nix+26−15 pkgs/top-level/all-packages.nix+1−5
pkgs/tools/misc/mongodb-tools/default.nix+26−15
@@ -1,27 +1,38 @@
1−{ stdenv, buildGoPackage, fetchFromGitHub, openssl_1_0_2, pkgconfig, libpcap }:
1+{ stdenv
2+, lib
3+, buildGoPackage
4+, fetchFromGitHub
5+, openssl_1_0_2
6+, pkgconfig
7+, libpcap
8+}:
29
310let
411 tools = [
5− "bsondump" "mongodump" "mongoexport" "mongofiles" "mongoimport"
6− "mongoreplay" "mongorestore" "mongostat" "mongotop"
12+ "bsondump"
13+ "mongoimport"
14+ "mongoexport"
15+ "mongodump"
16+ "mongorestore"
17+ "mongostat"
18+ "mongofiles"
19+ "mongotop"
20+ "mongoreplay"
721 ];
8−in
22+ version = "4.2.0";
923
10−with stdenv.lib;
11−
12−buildGoPackage rec {
24+in buildGoPackage {
1325 pname = "mongo-tools";
14− version = "3.7.2";
15− rev = "r${version}";
26+ inherit version;
1627
1728 goPackagePath = "github.com/mongodb/mongo-tools";
18− subPackages = map (t: t + "/main") tools;
29+ subPackages = tools;
1930
2031 src = fetchFromGitHub {
21− inherit rev;
32+ rev = "r${version}";
2233 owner = "mongodb";
2334 repo = "mongo-tools";
24− sha256 = "1y5hd4qw7422sqkj8vmy4agscvin3ck54r515bjrzn69iw73nhfl";
35+ sha256 = "0mjwvx0cxvb6zam6jyr3753xjnwcygxcjzqhhlsq0b3xnwws9yh7";
2536 };
2637
2738 nativeBuildInputs = [ pkgconfig ];
@@ -31,18 +42,18 @@ buildGoPackage rec {
3142 # Let's work around this with our own installer
3243 buildPhase = ''
3344 # move vendored codes so nixpkgs go builder could find it
34− mv go/src/github.com/mongodb/mongo-tools/vendor/src/* go/src/github.com/mongodb/mongo-tools/vendor/
35−
3645 runHook preBuild
46+
3747 ${stdenv.lib.concatMapStrings (t: ''
3848 go build -o "$bin/bin/${t}" -tags ssl -ldflags "-s -w" $goPackagePath/${t}/main
3949 '') tools}
50+
4051 runHook postBuild
4152 '';
4253
4354 meta = {
4455 homepage = https://github.com/mongodb/mongo-tools;
4556 description = "Tools for the MongoDB";
46− license = licenses.asl20;
57+ license = lib.licenses.asl20;
4758 };
4859}
pkgs/top-level/all-packages.nix+1−5
@@ -1993,11 +1993,7 @@ in
19931993
19941994 mongodb-compass = callPackage ../tools/misc/mongodb-compass { };
19951995
1996− mongodb-tools = callPackage ../tools/misc/mongodb-tools {
1997− # XXX: this is failing with Go 1.12. Error is related to cgo, an
1998− # update to this package might fix it.
1999− buildGoPackage = buildGo111Package;
2000− };
1996+ mongodb-tools = callPackage ../tools/misc/mongodb-tools { };
20011997
20021998 moosefs = callPackage ../tools/filesystems/moosefs { };
20031999