Merge branch 'master' into staging-next

https://github.com/NixOS/nixpkgs/commit/b04fc593e7b55fe1f74421b11589f12a339c92e2 seems to have accidentally changed mkDerivation function for dfilemanager and solarus-quest-editor so I have reverted that here.
This commit is contained in:
Jan Tojnar
2021-01-07 13:04:31 +01:00
457 changed files with 8204 additions and 3941 deletions
+3 -3
View File
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "mdbook";
version = "0.4.4";
version = "0.4.5";
src = fetchFromGitHub {
owner = "rust-lang-nursery";
repo = "mdBook";
rev = "v${version}";
sha256 = "0nqr5a27i91m71fhpycf60q54qplc920y1fmk9hav3pbb9wcc5dl";
sha256 = "11v2x0q8pn7hbmznqy872ksr7szyiki9cfhapymjhkf5nwfvcdbb";
};
cargoSha256 = "1p72iwl9ca7a92nf6wyjjbn0qns0xxb4xrbz2r2nmd83cxs0fplg";
cargoSha256 = "1psgqj04hzv7p18h4phsahxg4rj9yz38b8mh111k6l8m4r83kd75";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ];
+2 -4
View File
@@ -2,7 +2,7 @@
buildGoModule rec {
pname = "vale";
version = "2.6.5";
version = "2.6.8";
subPackages = [ "." ];
outputs = [ "out" "data" ];
@@ -11,13 +11,11 @@ buildGoModule rec {
owner = "errata-ai";
repo = "vale";
rev = "v${version}";
sha256 = "0rvcxlw8xd7sjcsvr6di04l8ml990im2c8yl3hn8054wkp51yb4l";
sha256 = "sha256-evvnIM8sd/eHpI2FYOlgjvGn8awTVc1f5QDIYAvhqmk=";
};
vendorSha256 = null;
doCheck = false;
postInstall = ''
mkdir -p $data/share/vale
cp -r styles $data/share/vale