Merge remote-tracking branch 'origin/master' into staging-next

Conflicts:
 pkgs/development/tools/rust/cargo-expand/default.nix
 pkgs/tools/misc/blflash/default.nix
This commit is contained in:
Jonathan Ringer
2021-05-21 19:49:05 -07:00
18 changed files with 69 additions and 68 deletions

View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "ckan";
version = "1.30.0";
version = "1.30.2";
src = fetchurl {
url = "https://github.com/KSP-CKAN/CKAN/releases/download/v${version}/ckan.exe";
sha256 = "sha256-wih5NRzeOy4WMXQ3yV9W/m2x7B2C5T0F78TbpsngigQ=";
sha256 = "sha256-ggmUsJb3xKpI3ygTmzR5f3na/oU4OEa3r3edjlN5R+Q=";
};
dontUnpack = true;