Merge master into staging

This commit is contained in:
Frederik Rietdijk
2018-04-08 10:54:17 +02:00
150 changed files with 2923 additions and 772 deletions

View File

@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
homepage = https://github.com/pipeseroni/pipes.sh;
description = "Animated pipes terminal screensaver";
license = licenses.mit;
maintainers = [ maintainers.matthiasbeyer ];
maintainers = [ ];
platforms = platforms.unix;
};
}

View File

@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "adapta-gtk-theme-${version}";
version = "3.93.0.174";
version = "3.93.0.225";
src = fetchFromGitHub {
owner = "adapta-project";
repo = "adapta-gtk-theme";
rev = version;
sha256 = "0fkvcpx2vhyr3z74r5mcpjh293w3cfm07axj8dj84nl2hi6im8b6";
sha256 = "1mjdvfvx45pdypl34yghgi47bj86rwvryx9mwhwwb09psn9smp49";
};
preferLocalBuild = true;