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

Merge pull request #113930 from tu-maurice/unstable/fishnet-2.2.5

Browse Source 
fishnet: 2.2.4 -> 2.2.5
This commit is contained in:
Sandro 2021-03-07 02:11:31 +01:00 committed by GitHub
commit c2bede9f74
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/servers/fishnet/assets.nix
View File

@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "niklasf"; owner = "niklasf";
repo = pname; repo = pname;
rev = "b4fa30e57ec8976fb1c10bd36737bc784351b93e"; rev = "acd36ab6ccee67a652b6d84aedc4c2828abac5c6";
sha256 = "0gfs9lm4ih3h3fmgqylw05ii1h0d6mpjfxadnw3wymnjsspfb0m4"; sha256 = "0mh4gh6qij70clp64m4jw6q7dafr7gwjqpvpaf9vc6h10g1rhzrx";
}; };
relAssetsPath = "share/${pname}"; relAssetsPath = "share/${pname}";
@ -53,5 +53,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/niklasf/fishnet-assets"; homepage = "https://github.com/niklasf/fishnet-assets";
license = licenses.gpl3Only; license = licenses.gpl3Only;
maintainers = with maintainers; [ tu-maurice ]; maintainers = with maintainers; [ tu-maurice ];
platforms = [ "x86_64-linux" ];
}; };
} }

7
pkgs/servers/fishnet/default.nix
View File

@ -12,16 +12,16 @@ let
in in
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "fishnet"; pname = "fishnet";
version = "2.2.4"; version = "2.2.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "niklasf"; owner = "niklasf";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "19dh69b6mqx16195w9d20fah4jl8hhbxm84xq4zwsgl4khmw7zqz"; sha256 = "0gif9wagm9bzq7j3biasqvzp9lfvmxqr5wagqqybmhbn8ipj20a8";
}; };
cargoSha256 = "0zl2fnmqncyjd52wkn6dddx9lm9ywpw7swy895yq299z2bbbkv3h"; cargoSha256 = "0hqyh0nzfrm7m34kqixrlbc7w8d0k7v6psw8jg6zpwpfcmhqq15j";
preBuild = '' preBuild = ''
rmdir ./assets rmdir ./assets
@ -33,5 +33,6 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/niklasf/fishnet"; homepage = "https://github.com/niklasf/fishnet";
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
maintainers = with maintainers; [ tu-maurice ]; maintainers = with maintainers; [ tu-maurice ];
platforms = [ "x86_64-linux" ];
}; };
} }