public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into staging

Browse Source 
That's to get mesa rebuild from master, as it's nontrivial.
This commit is contained in:
Vladimír Čunát
2016-05-23 09:02:10 +02:00
parent dc5bbc4700 0e54c74911
commit 0b192a0976
206 changed files with 25329 additions and 3237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/data/icons/numix-icon-theme-circle/default.nix
View File

@@ -1,19 +1,17 @@
{ stdenv, fetchFromGitHub, unzip }:
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
version = "e7008b488edfe37379ba9c4b8d5245dfd6125fc3";
version = "2016-05-18";
package-name = "numix-icon-theme-circle";
name = "${package-name}-20160121-${version}";
name = "${package-name}-${version}";
buildInputs = [ unzip ];
src = fetchFromGitHub {
owner = "numixproject";
repo = package-name;
rev = version;
sha256 = "0pfcz50b9g7zzskws94m6wvd8zm3sjvhpbzq9vjqi1q02nzflap6";
rev = "11a343dcd9b95e2574706157ff7bfe9aa30441d2";
sha256 = "0d00fj0hmqchm12j89s1r11ayg7gh8p6cn4fd7zva5n52z35az1w";
};
dontBuild = true;

8
pkgs/data/icons/numix-icon-theme/default.nix
View File

@@ -1,17 +1,17 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
version = "a704451830d343670721cbf1391df18611d61901";
version = "2016-05-18";
package-name = "numix-icon-theme";
name = "${package-name}-20160120-${version}";
name = "${package-name}-${version}";
src = fetchFromGitHub {
owner = "numixproject";
repo = package-name;
rev = version;
sha256 = "0kk0rvywbm074nskjvvy0vjf6giw54jgvrw7sz9kwnv6h75ki96m";
rev = "d571e845b9db0e5cc5a50e6d4423d25fc0d613bd";
sha256 = "0d9ajh12n1ms7wbgaa3nsdhlwsjwj4flm67cxzsb3dwhpql75z0c";
};
dontBuild = true;

28
pkgs/data/icons/paper-icon-theme/default.nix Normal file
View File

@@ -0,0 +1,28 @@
{ stdenv, fetchFromGitHub, autoreconfHook }:
stdenv.mkDerivation rec {
name = "${package-name}-${version}";
package-name = "paper-icon-theme";
version = "2016-05-21";
src = fetchFromGitHub {
owner = "snwh";
repo = package-name;
rev = "f2a34cab78df0fa7db5a10e93e633953cb7c1eb7";
sha256 = "0pk848jbskkwz7im73119hcrcyr5nim37jcdrhqf4cwrshmbcacq";
};
nativeBuildInputs = [ autoreconfHook ];
installPhase = ''
make install DESTDIR="$out"
'';
meta = with stdenv.lib; {
description = "Modern icon theme designed around bold colours and simple geometric shapes";
homepage = http://snwh.org/paper;
license = with licenses; [ cc-by-sa-40 lgpl3 ];
platforms = platforms.all;
maintainers = with maintainers; [ romildo ];
};
}