From f83cbcb51e8fffd5075057df45c5e4a0254374e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 26 May 2016 22:01:45 -0300 Subject: [PATCH 1/7] numix-gtk-theme: fix installation directory --- pkgs/misc/themes/numix-gtk-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/themes/numix-gtk-theme/default.nix b/pkgs/misc/themes/numix-gtk-theme/default.nix index f57c1fba1fc..aef1860961c 100644 --- a/pkgs/misc/themes/numix-gtk-theme/default.nix +++ b/pkgs/misc/themes/numix-gtk-theme/default.nix @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { buildInputs = [ gtk-engine-murrine ]; - installPhase = '' - make install DESTDIR="$out" + postPatch = '' + substituteInPlace Makefile --replace '$(DESTDIR)'/usr $out ''; meta = { From 267f6f4e97a3a0705db7dac1e02d6c8900b1bbe1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 26 May 2016 22:53:43 -0300 Subject: [PATCH 2/7] numix-icon-theme-circle: 2016-05-18 -> 2016-05-25 --- pkgs/data/icons/numix-icon-theme-circle/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix index 61da6a23769..ace58a4d703 100644 --- a/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "2016-05-18"; + version = "2016-05-25"; package-name = "numix-icon-theme-circle"; @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "numixproject"; repo = package-name; - rev = "11a343dcd9b95e2574706157ff7bfe9aa30441d2"; - sha256 = "0d00fj0hmqchm12j89s1r11ayg7gh8p6cn4fd7zva5n52z35az1w"; + rev = "e2d2fe68e34e1650584f798c3cdb7e91ef62e6d3"; + sha256 = "0fah812ymc6kczjhjsz0ai57ih6d8r6pknhvc54i7r3xqxshryc8"; }; dontBuild = true; From 9a18cef082b5be1d14d304cb14fe0434561ed234 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 26 May 2016 23:40:06 -0300 Subject: [PATCH 3/7] paper-icon-theme: 2016-05-21 -> 2016-05-25 --- pkgs/data/icons/paper-icon-theme/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/icons/paper-icon-theme/default.nix b/pkgs/data/icons/paper-icon-theme/default.nix index 731d6158304..93ce97d2e5b 100644 --- a/pkgs/data/icons/paper-icon-theme/default.nix +++ b/pkgs/data/icons/paper-icon-theme/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${package-name}-${version}"; package-name = "paper-icon-theme"; - version = "2016-05-21"; + version = "2016-05-25"; src = fetchFromGitHub { owner = "snwh"; repo = package-name; - rev = "f2a34cab78df0fa7db5a10e93e633953cb7c1eb7"; - sha256 = "0pk848jbskkwz7im73119hcrcyr5nim37jcdrhqf4cwrshmbcacq"; + rev = "f221537532181a71938faaa1f695c762defe2626"; + sha256 = "0knsdhgssh1wyhcrbk6lddqy7zn24528lnajqij467mpgiliabfy"; }; nativeBuildInputs = [ autoreconfHook ]; From ecce3999b2bbe025c8151ab92e0f67d58dfcf3cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 26 May 2016 23:41:39 -0300 Subject: [PATCH 4/7] paper-gtk-theme: fix installation directory --- pkgs/misc/themes/paper-gtk-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/themes/paper-gtk-theme/default.nix b/pkgs/misc/themes/paper-gtk-theme/default.nix index ccff20dd929..e39547f1c26 100644 --- a/pkgs/misc/themes/paper-gtk-theme/default.nix +++ b/pkgs/misc/themes/paper-gtk-theme/default.nix @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { buildInputs = [ gtk_engines ]; - installPhase = '' - make install DESTDIR="$out" + postPatch = '' + substituteInPlace Makefile.am --replace '$(DESTDIR)'/usr $out ''; preferLocalBuild = true; From 923a63ad5d675869cf560864b6348a180c188f4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 26 May 2016 23:50:02 -0300 Subject: [PATCH 5/7] paper-gtk-theme: 2016-05-18 -> 2016-05-25 --- pkgs/misc/themes/paper-gtk-theme/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/themes/paper-gtk-theme/default.nix b/pkgs/misc/themes/paper-gtk-theme/default.nix index e39547f1c26..ff778b86f9c 100644 --- a/pkgs/misc/themes/paper-gtk-theme/default.nix +++ b/pkgs/misc/themes/paper-gtk-theme/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, autoreconfHook, gtk_engines }: stdenv.mkDerivation rec { - version = "2016-05-18"; + version = "2016-05-25"; name = "paper-gtk-theme-${version}"; src = fetchFromGitHub { owner = "snwh"; repo = "paper-gtk-theme"; - rev = "5113d58dc64de70fcc75ad2d6d05c8c8dae2de7f"; - sha256 = "1j9l50iyvadpqsq5v14zgml24jgraajr5kl9ji0ar62nlak2bi8s"; + rev = "dea5f97b12e4f41dddbd01a1529760761aa3784e"; + sha256 = "0fln555827hrn554qcil3rwl9x4x3vdfbh2vplkc8r46a3bn8yng"; }; nativeBuildInputs = [ autoreconfHook ]; From 864e3ff38e8323a9ac48ad67c41bae85f77baf4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 26 May 2016 23:58:52 -0300 Subject: [PATCH 6/7] paper-icon-theme: fix installation directory --- pkgs/data/icons/paper-icon-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/paper-icon-theme/default.nix b/pkgs/data/icons/paper-icon-theme/default.nix index 93ce97d2e5b..93c39b9eddd 100644 --- a/pkgs/data/icons/paper-icon-theme/default.nix +++ b/pkgs/data/icons/paper-icon-theme/default.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - installPhase = '' - make install DESTDIR="$out" + postPatch = '' + substituteInPlace Makefile.am --replace '$(DESTDIR)'/usr $out ''; meta = with stdenv.lib; { From ad6496f768545dcf64296a31af7b3e0666858bb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 27 May 2016 00:03:15 -0300 Subject: [PATCH 7/7] numix-gtk-theme: 2016-05-19 -> 2016-05-25 --- pkgs/misc/themes/numix-gtk-theme/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/themes/numix-gtk-theme/default.nix b/pkgs/misc/themes/numix-gtk-theme/default.nix index aef1860961c..4a37a16d550 100644 --- a/pkgs/misc/themes/numix-gtk-theme/default.nix +++ b/pkgs/misc/themes/numix-gtk-theme/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - version = "2016-05-19"; + version = "2016-05-25"; name = "numix-gtk-theme-${version}"; src = fetchFromGitHub { repo = "numix-gtk-theme"; owner = "numixproject"; - rev = "266945047ad8c148d36d0d1f00b39730b84482a9"; - sha256 = "108qjqwn9shqjkbadyw79y1wbq5ndv30x7xw5wjmbcss5jikr3v1"; + rev = "e99d167adf1310e110e17f8e7c2baf217c2402aa"; + sha256 = "1418hf034b2bp32wqagbnn5y3i21h8v2ihjqakq2gaqd5fwg0f9g"; }; nativeBuildInputs = [ sass glib libxml2 gdk_pixbuf ];