git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #119455 from Stunkymonkey/numix-master
c4aedcbSandro
pkgs/data/icons/numix-icon-theme-circle/default.nix+3−3
compare with master
unifiedsplit
@@ -2,13 +2,13 @@
2
2
3stdenv.mkDerivation rec {
3stdenv.mkDerivation rec {
4 pname = "numix-icon-theme-circle";
4 pname = "numix-icon-theme-circle";
5− version = "20.09.19";
5+ version = "21.04.14";
6
6
7 src = fetchFromGitHub {
7 src = fetchFromGitHub {
8 owner = "numixproject";
8 owner = "numixproject";
9 repo = pname;
9 repo = pname;
10 rev = version;
10 rev = version;
11− sha256 = "1rqlq5ssxqj0nc0i8av7zprj94km5645xzqi5j5i0sxd3jbmyfjx";
11+ sha256 = "1z8c0179r8g0y9zh4383brsfhkcyfy79dc8hw94p9zjn5a66547w";
12 };
12 };
13
13
14 nativeBuildInputs = [ gtk3 ];
14 nativeBuildInputs = [ gtk3 ];
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
37 meta = with lib; {
37 meta = with lib; {
38 description = "Numix icon theme (circle version)";
38 description = "Numix icon theme (circle version)";
39 homepage = "https://numixproject.github.io";
39 homepage = "https://numixproject.github.io";
40− license = licenses.gpl3;
40+ license = licenses.gpl3Only;
41 # darwin cannot deal with file names differing only in case
41 # darwin cannot deal with file names differing only in case
42 platforms = platforms.linux;
42 platforms = platforms.linux;
43 maintainers = with maintainers; [ romildo ];
43 maintainers = with maintainers; [ romildo ];
pkgs/data/icons/numix-icon-theme-square/default.nix+3−3
@@ -2,13 +2,13 @@
2
2
3stdenv.mkDerivation rec {
3stdenv.mkDerivation rec {
4 pname = "numix-icon-theme-square";
4 pname = "numix-icon-theme-square";
5− version = "20.09.19";
5+ version = "21.04.14";
6
6
7 src = fetchFromGitHub {
7 src = fetchFromGitHub {
8 owner = "numixproject";
8 owner = "numixproject";
9 repo = pname;
9 repo = pname;
10 rev = version;
10 rev = version;
11− sha256 = "0afraarfcd66mpidmn0l90wif8kmwzdj3s09g704kwszyijxs80z";
11+ sha256 = "0ndxjp173dwz78m41mn818mh4bdsxa2ypv4wrwicx0v4d8z90ddj";
12 };
12 };
13
13
14 nativeBuildInputs = [ gtk3 ];
14 nativeBuildInputs = [ gtk3 ];
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
37 meta = with lib; {
37 meta = with lib; {
38 description = "Numix icon theme (square version)";
38 description = "Numix icon theme (square version)";
39 homepage = "https://numixproject.github.io";
39 homepage = "https://numixproject.github.io";
40− license = licenses.gpl3;
40+ license = licenses.gpl3Only;
41 # darwin cannot deal with file names differing only in case
41 # darwin cannot deal with file names differing only in case
42 platforms = platforms.linux;
42 platforms = platforms.linux;
43 maintainers = with maintainers; [ romildo ];
43 maintainers = with maintainers; [ romildo ];
pkgs/data/icons/numix-icon-theme/default.nix+7−3
@@ -2,13 +2,13 @@
2
2
3stdenv.mkDerivation rec {
3stdenv.mkDerivation rec {
4 pname = "numix-icon-theme";
4 pname = "numix-icon-theme";
5− version = "20.06.07";
5+ version = "21.04.14";
6
6
7 src = fetchFromGitHub {
7 src = fetchFromGitHub {
8 owner = "numixproject";
8 owner = "numixproject";
9 repo = pname;
9 repo = pname;
10 rev = version;
10 rev = version;
11− sha256 = "1yp9parc8ihmai8pswf4qzrqd88qpls87ipq8ylx38yqns7wsn4h";
11+ sha256 = "1ilzqh9f7skdfg5sl97zfgwrzvwa1zna22dpq0954gyyzvy7k7lg";
12 };
12 };
13
13
14 nativeBuildInputs = [ gtk3 ];
14 nativeBuildInputs = [ gtk3 ];
@@ -18,18 +18,22 @@ stdenv.mkDerivation rec {
18 dontDropIconThemeCache = true;
18 dontDropIconThemeCache = true;
19
19
20 installPhase = ''
20 installPhase = ''
21+ runHook preInstall
22+
21 mkdir -p $out/share/icons
23 mkdir -p $out/share/icons
22 cp -a Numix{,-Light} $out/share/icons/
24 cp -a Numix{,-Light} $out/share/icons/
23
25
24 for theme in $out/share/icons/*; do
26 for theme in $out/share/icons/*; do
25 gtk-update-icon-cache $theme
27 gtk-update-icon-cache $theme
26 done
28 done
29+
30+ runHook postInstall
27 '';
31 '';
28
32
29 meta = with lib; {
33 meta = with lib; {
30 description = "Numix icon theme";
34 description = "Numix icon theme";
31 homepage = "https://numixproject.github.io";
35 homepage = "https://numixproject.github.io";
32− license = licenses.gpl3;
36+ license = licenses.gpl3Only;
33 # darwin cannot deal with file names differing only in case
37 # darwin cannot deal with file names differing only in case
34 platforms = platforms.linux;
38 platforms = platforms.linux;
35 maintainers = with maintainers; [ romildo ];
39 maintainers = with maintainers; [ romildo ];