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

Merge remote-tracking branch 'upstream/staging' into deps-reorg

Browse Source
This commit is contained in:
John Ericson
2017-09-28 12:32:57 -04:00
parent f08d6f0e2d 4e22e88b91
commit f037625f87
789 changed files with 15725 additions and 8096 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/data/icons/numix-icon-theme-circle/default.nix
+3 -3
View File
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, numix-icon-theme }:
stdenv.mkDerivation rec {
version = "2016-11-10";
version = "17-09-13";
package-name = "numix-icon-theme-circle";
@@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "numixproject";
repo = package-name;
rev = "ba72743b0ee78cf56585bb498eb59e83d0de17a2";
sha256 = "0zyvcpa8d8jc7r08chhv0chp7z29w6ir9hkgm9aq23aa80i6pdgv";
rev = version;
sha256 = "14ck07j9v0yh8ky191sa3xxi4qh7bbg84i8jijy3kbjcx9s0zl8a";
};
buildInputs = [ numix-icon-theme ];
pkgs/data/icons/numix-icon-theme-square/default.nix
+4 -6
View File
@@ -1,17 +1,15 @@
{ stdenv, fetchFromGitHub, numix-icon-theme }:
stdenv.mkDerivation rec {
version = "2016-11-23";
package-name = "numix-icon-theme-square";
name = "${package-name}-${version}";
package-name = "numix-icon-theme-square";
version = "17-09-13";
src = fetchFromGitHub {
owner = "numixproject";
repo = package-name;
rev = "1c30eb02aea3d95c49f95c212702b56e93ac9043";
sha256 = "1d2car4dsh1dnim9jlakm035ydqd1f115cagm6zm8gwa5w9annag";
rev = version;
sha256 = "1grpm902hiid561fbp9y1rb9z21y8d1krjgxgs7j8qnpx380sd5x";
};
buildInputs = [ numix-icon-theme ];
pkgs/data/icons/numix-icon-theme/default.nix
+3 -3
View File
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
version = "2017-01-25";
version = "2017-09-17";
package-name = "numix-icon-theme";
@@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "numixproject";
repo = package-name;
rev = "271471c7944d592a1d666910de0adce82a393d31";
sha256 = "1yc9jk1233ybk6cd7q4x3q87rwgq9nkcgkn9fw9si422dkvnwd7h";
rev = "d0e7da93520e521bf7df7cffa3620c10a8400a7f";
sha256 = "1my43kv9yz9vdn51zhd13c8zavba17cqrmxkmhpx0c8xldjqfp3i";
};
dontBuild = true;