Merge branch 'master' into staging

This commit is contained in:
Vladimír Čunát
2016-10-13 09:53:16 +02:00
110 changed files with 4502 additions and 1735 deletions

View File

@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, numix-icon-theme }:
stdenv.mkDerivation rec {
version = "2016-06-10";
version = "2016-09-27";
package-name = "numix-icon-theme-circle";
@@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "numixproject";
repo = package-name;
rev = "577b8a2a8dd6429f7d3df37b15d9fd7fcbb58d56";
sha256 = "1zx26ng6z45j1yff2m0cng4nffk8swdq1pya1l2dm7841mx5ram4";
rev = "481bc1100f01e25e92deb7facf61436b27f9ca8a";
sha256 = "0fkr7w6z6sz5yblgshr3qr2bszia6dsjszv3gmcbi2xqvjjd8wij";
};
buildInputs = [ numix-icon-theme ];

View File

@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
version = "2016-06-10";
version = "2016-10-05";
package-name = "numix-icon-theme";
@@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "numixproject";
repo = package-name;
rev = "8196e9eaa5a60b5c02a9e37a4ca768b07966b41f";
sha256 = "0cyv0r66vil54y6w317msddq2fjs9zhrdx17m3bx85xpqz67zq5i";
rev = "e03eb71454c176a98733eafa268ff79995f8159d";
sha256 = "1f8prwq9zvzfk0ncwzbrwkpjggc8nadny81dqv1cr0014jc85bxi";
};
dontBuild = true;