Merge master into staging-next

This commit is contained in:
Frederik Rietdijk
2020-11-04 09:27:42 +01:00
170 changed files with 7077 additions and 4472 deletions

View File

@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "liquidprompt";
version = "1.12.0";
version = "1.12.1";
src = fetchFromGitHub {
owner = "nojhan";
repo = pname;
rev = "v${version}";
sha256 = "0ibp1bz9s4bp3y5anivg5gp31q78024w39v7hbfw05qy25ax5h60";
sha256 = "0vlwwkdbkxjsjcfmcspmq3f163kf0x4mwa8svxkzgnn2g4kl41ja";
};
installPhase = ''

View File

@@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
pname = "mksh";
version = "59b";
version = "59c";
src = fetchurl {
urls = [
"https://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-R${version}.tgz"
"http://pub.allbsd.org/MirOS/dist/mir/mksh/mksh-R${version}.tgz"
];
sha256 = "1rp0farbylypyiaald2hw5avg5w3m8x7cjnxxyyihzvfb2lx2zlh";
sha256 = "01n5ggw33bw4jv4d3148wlw9n4aj7vdn3ffnc66c9w9pldjidbkp";
};
dontConfigure = true;