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

Merge release-21.05 into staging-next-21.05

Browse Source
This commit is contained in:
github-actions[bot] 2021-09-28 18:02:14 +00:00 committed by GitHub
commit 046f88fee0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/tools/rnix-lsp/default.nix
View File

@ -1,22 +1,23 @@
{ callPackage, lib, fetchFromGitHub, rustPlatform }: { lib, fetchFromGitHub, rustPlatform, nixUnstable }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "rnix-lsp"; pname = "rnix-lsp";
version = "0.1.0"; version = "0.2.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nix-community"; owner = "nix-community";
repo = "rnix-lsp"; repo = "rnix-lsp";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-54dtLkGAbQ4Sln/bs/sI0GaCbXyK8+vDD8QBgxaiCXg=";
sha256 = "0fy620c34kxl27sd62x9mj0555bcdmnmbsxavmyiwb497z1m9wnn";
}; };
cargoSha256 = "1akapxrh38g44531r25dgik8y5qyy9y6zb031hg8v61px2ajs39s"; cargoSha256 = "sha256-Tw05eOIMJj+zX0fqtn6wJwolKNkYqfVuo/WO/WvYu2k=";
checkInputs = [ nixUnstable ];
meta = with lib; { meta = with lib; {
description = "A work-in-progress language server for Nix, with syntax checking and basic completion"; description = "A work-in-progress language server for Nix, with syntax checking and basic completion";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ jD91mZM2 ]; maintainers = with maintainers; [ ma27 ];
}; };
} }

4
pkgs/servers/web-apps/wiki-js/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "wiki-js"; pname = "wiki-js";
version = "2.5.214"; version = "2.5.219";
src = fetchurl { src = fetchurl {
url = "https://github.com/Requarks/wiki/releases/download/${version}/${pname}.tar.gz"; url = "https://github.com/Requarks/wiki/releases/download/${version}/${pname}.tar.gz";
sha256 = "sha256-EXysHhEJ41LMLRueEoFr+SE9SdJEXMZLhJQSvZgToTg="; sha256 = "sha256-xzxOv17B+9wegtNXGr9SD4KUWlMbrvPtZhvfmoZhBNc=";
}; };
sourceRoot = "."; sourceRoot = ".";