diff options
author | Alyssa Ross <hi@alyssa.is> | 2020-05-12 14:45:39 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2020-05-12 14:56:01 +0000 |
commit | eb7dadee9c0f903f1152f8dd4165453bfa48ccf4 (patch) | |
tree | a6bd66dcbec895aae167465672af08a1ca70f089 /nixpkgs/pkgs/development/libraries/packr | |
parent | 3879b925f5dae3a0eb5c98b10c1ac5a0e4d729a3 (diff) | |
parent | 683c68232e91f76386db979c461d8fbe2a018782 (diff) | |
download | nixlib-eb7dadee9c0f903f1152f8dd4165453bfa48ccf4.tar nixlib-eb7dadee9c0f903f1152f8dd4165453bfa48ccf4.tar.gz nixlib-eb7dadee9c0f903f1152f8dd4165453bfa48ccf4.tar.bz2 nixlib-eb7dadee9c0f903f1152f8dd4165453bfa48ccf4.tar.lz nixlib-eb7dadee9c0f903f1152f8dd4165453bfa48ccf4.tar.xz nixlib-eb7dadee9c0f903f1152f8dd4165453bfa48ccf4.tar.zst nixlib-eb7dadee9c0f903f1152f8dd4165453bfa48ccf4.zip |
Merge commit '683c68232e91f76386db979c461d8fbe2a018782'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/packr')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/packr/default.nix | 43 |
1 files changed, 36 insertions, 7 deletions
diff --git a/nixpkgs/pkgs/development/libraries/packr/default.nix b/nixpkgs/pkgs/development/libraries/packr/default.nix index 4482a9cd312d..6a53743a10ea 100644 --- a/nixpkgs/pkgs/development/libraries/packr/default.nix +++ b/nixpkgs/pkgs/development/libraries/packr/default.nix @@ -1,22 +1,46 @@ { buildGoModule , fetchFromGitHub , lib +, stdenv +, symlinkJoin }: -buildGoModule rec { - pname = "packr"; - version = "2.7.1"; +let p2 = buildGoModule rec { + pname = "packr2"; + version = "2.8.0"; src = fetchFromGitHub { owner = "gobuffalo"; - repo = pname; + repo = "packr"; rev = "v${version}"; - sha256 = "0m5kl2fq8gf1v4vllgag2xl8fd382sdgqrcdb8f5alsnrdn08kb9"; + sha256 = "1x78yq2yg0r82h7a67078llni85gk9nbd2ismlbqgppap7fcpyai"; + }+"/v2"; + + subPackages = [ "packr2" ]; + + modSha256 = "1xxqyn78074jna0iri7sks6b2l4sdnn5sg57n09vrrf6kh39h2y9"; + + meta = with stdenv.lib; { + description = "The simple and easy way to embed static files into Go binaries"; + homepage = "https://github.com/gobuffalo/packr"; + license = licenses.mit; + maintainers = with maintainers; [ mmahut ]; + }; +}; +p1 = buildGoModule rec { + pname = "packr1"; + version = "2.8.0"; + + src = fetchFromGitHub { + owner = "gobuffalo"; + repo = "packr"; + rev = "v${version}"; + sha256 = "1x78yq2yg0r82h7a67078llni85gk9nbd2ismlbqgppap7fcpyai"; }; - subPackages = [ "packr" "v2/packr2" ]; + subPackages = [ "packr" ]; - modSha256 = "0afhkvivma16bi8rz3kwcsz9mhmcn4zm6rrymxkvazx6b844hcdv"; + modSha256 = "045qfdi82yhpghjd0cimxhas4nkj7g30n9qyvkrl9ck01sahx76f"; meta = with lib; { description = "The simple and easy way to embed static files into Go binaries"; @@ -24,4 +48,9 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ mmahut ]; }; +}; +in +symlinkJoin{ + name = "packr"; + paths = [p1 p2]; } |