public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #112164 from 06kellyjac/go-bindata

Browse Source
This commit is contained in:
Sandro 2021-02-07 15:50:19 +01:00 committed by GitHub
commit 19ec821760
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/development/tools/go-bindata/default.nix
View File

@ -1,22 +1,23 @@
{ lib, buildGoPackage, fetchFromGitHub }: { lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage { buildGoPackage rec {
pname = "go-bindata"; pname = "go-bindata";
version = "unstable-2015-10-23"; version = "3.22.0";
goPackagePath = "github.com/jteeuwen/go-bindata"; goPackagePath = "github.com/kevinburke/go-bindata";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jteeuwen"; owner = "kevinburke";
repo = "go-bindata"; repo = pname;
rev = "a0ff2567cfb70903282db057e799fd826784d41d"; rev = "v${version}";
sha256 = "0d6zxv0hgh938rf59p1k5lj0ymrb8kcps2vfrb9kaarxsvg7y69v"; sha256 = "10dq77dml5jvvq2jkdq81a9yjg7rncq8iw8r84cc3dz6l9hxzj0x";
}; };
excludedPackages = "testdata"; subPackages = [ "go-bindata" ];
meta = with lib; { meta = with lib; {
homepage = "https://github.com/jteeuwen/go-bindata"; homepage = "https://github.com/kevinburke/go-bindata";
changelog = "https://github.com/kevinburke/go-bindata/blob/v${version}/CHANGELOG.md";
description = "A small utility which generates Go code from any file, useful for embedding binary data in a Go program"; description = "A small utility which generates Go code from any file, useful for embedding binary data in a Go program";
maintainers = with maintainers; [ cstrahan ]; maintainers = with maintainers; [ cstrahan ];
license = licenses.cc0; license = licenses.cc0;

18
pkgs/servers/nosql/influxdb2/default.nix
View File

@ -73,28 +73,12 @@ let
--replace /out $out --replace /out $out
''; '';
}; };
# Can't use the nixpkgs version of go-bindata, it's an ancient
# ancestor of this more modern one.
bindata = buildGoPackage {
pname = "go-bindata";
version = "v3.22.0";
src = fetchFromGitHub {
owner = "kevinburke";
repo = "go-bindata";
rev = "v3.22.0";
sha256 = "10dq77dml5jvvq2jkdq81a9yjg7rncq8iw8r84cc3dz6l9hxzj0x";
};
goPackagePath = "github.com/kevinburke/go-bindata";
subPackages = [ "go-bindata" ];
};
in buildGoModule { in buildGoModule {
pname = "influxdb"; pname = "influxdb";
version = version; version = version;
src = src; src = src;
nativeBuildInputs = [ bindata pkg-config ]; nativeBuildInputs = [ go-bindata pkg-config ];
vendorSha256 = "0lviz7l5zbghyfkp0lvlv8ykpak5hhkfal8d7xwvpsm8q3sghc8a"; vendorSha256 = "0lviz7l5zbghyfkp0lvlv8ykpak5hhkfal8d7xwvpsm8q3sghc8a";
subPackages = [ "cmd/influxd" "cmd/influx" ]; subPackages = [ "cmd/influxd" "cmd/influx" ];