Merge branch 'master' into staging-next

Quite many rebuilds from master:
> Estimating rebuild amount by counting changed Hydra jobs.
>    3926 x86_64-darwin
>    4645 x86_64-linux
This commit is contained in:
Vladimír Čunát
2020-10-10 10:18:58 +02:00
138 changed files with 4330 additions and 3214 deletions

View File

@@ -18,13 +18,13 @@
stdenv.mkDerivation rec {
pname = "lobster";
version = "unstable-2020-07-27";
version = "unstable-2020-10-04";
src = fetchFromGitHub {
owner = "aardappel";
repo = pname;
rev = "9d68171494a79c83931426b624a0249a9c51882c";
sha256 = "0d4gn71jym662i00rdmynv53ng1lgl81s5lw1sdddgn41wzs28dd";
rev = "4c5e78f021ce9d06592fb3a66388e5e31fac1adb";
sha256 = "1wnbc8kr1dyfs53nlcxah22ghphmazzrlcj9z47cgkdsj1qfy84x";
};
nativeBuildInputs = [ cmake ];