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

Merge master into staging-next

This commit is contained in:
github-actions[bot] 2020-12-22 06:22:13 +00:00 committed by GitHub
parent f1ccef3fd4 af5b6f9ffd
commit 789fc8e77c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/networking/cluster/nerdctl/default.nix
View File

@ -14,16 +14,16 @@ let
in in
buildGoModule rec { buildGoModule rec {
pname = "nerdctl"; pname = "nerdctl";
version = "0.3.0"; version = "0.4.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "AkihiroSuda"; owner = "AkihiroSuda";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "1bxxdsx8aqbrbjm0bn6makw77z96mng5by7k3licbk0vdgakaix6"; sha256 = "0vjcbvd5yrasw97hd5mrn6cdjvfv2r03z7g1wczlszlcs8gr6nxw";
}; };
vendorSha256 = "1d2bqv7bc7q82z6sd8kkqj4xdccs660mj34ggwb09a59law139li"; vendorSha256 = "181lp9l4i0qpiqm8wbxa4ldi1j5bm3ygmanz1xh3mkjanl0pwqjr";
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];

18
pkgs/tools/misc/mutagen/default.nix
View File

@ -1,4 +1,4 @@
{ lib, buildGoModule, fetchFromGitHub }: { lib, buildGoModule, fetchFromGitHub, fetchzip }:
buildGoModule rec { buildGoModule rec {
pname = "mutagen"; pname = "mutagen";
@ -13,10 +13,26 @@ buildGoModule rec {
vendorSha256 = "0szs9yc49fyh55ra1wf8zj76kdah0x49d45cgivk3gqh2hl17j6l"; vendorSha256 = "0szs9yc49fyh55ra1wf8zj76kdah0x49d45cgivk3gqh2hl17j6l";
agents = fetchzip {
name = "mutagen-agents-${version}";
# The package architecture does not matter since all packages contain identical mutagen-agents.tar.gz.
url = "https://github.com/mutagen-io/mutagen/releases/download/v${version}/mutagen_linux_amd64_v${version}.tar.gz";
stripRoot = false;
extraPostFetch = ''
rm $out/mutagen # Keep only mutagen-agents.tar.gz.
'';
sha256 = "0k8iif09kvxfxx6qm5qmkf3lr7ar6i98ivkndimj680ah9v1hkj8";
};
doCheck = false; doCheck = false;
subPackages = [ "cmd/mutagen" "cmd/mutagen-agent" ]; subPackages = [ "cmd/mutagen" "cmd/mutagen-agent" ];
postInstall = ''
install -d $out/libexec
ln -s ${agents}/mutagen-agents.tar.gz $out/libexec/
'';
meta = with lib; { meta = with lib; {
description = "Make remote development work with your local tools"; description = "Make remote development work with your local tools";
homepage = "https://mutagen.io/"; homepage = "https://mutagen.io/";