From 7a9b98b5f5b3af40b7aa19829447ba2540fdeffa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 20 May 2016 10:41:06 -0300 Subject: [PATCH 1/3] sass: init at 3.4.22 --- pkgs/development/tools/sass/Gemfile | 2 ++ pkgs/development/tools/sass/Gemfile.lock | 13 +++++++++++++ pkgs/development/tools/sass/default.nix | 18 ++++++++++++++++++ pkgs/development/tools/sass/gemset.nix | 10 ++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 5 files changed, 45 insertions(+) create mode 100644 pkgs/development/tools/sass/Gemfile create mode 100644 pkgs/development/tools/sass/Gemfile.lock create mode 100644 pkgs/development/tools/sass/default.nix create mode 100644 pkgs/development/tools/sass/gemset.nix diff --git a/pkgs/development/tools/sass/Gemfile b/pkgs/development/tools/sass/Gemfile new file mode 100644 index 00000000000..e46ea120f72 --- /dev/null +++ b/pkgs/development/tools/sass/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'sass' diff --git a/pkgs/development/tools/sass/Gemfile.lock b/pkgs/development/tools/sass/Gemfile.lock new file mode 100644 index 00000000000..82dcddb9ece --- /dev/null +++ b/pkgs/development/tools/sass/Gemfile.lock @@ -0,0 +1,13 @@ +GEM + remote: https://rubygems.org/ + specs: + sass (3.4.22) + +PLATFORMS + ruby + +DEPENDENCIES + sass + +BUNDLED WITH + 1.11.2 diff --git a/pkgs/development/tools/sass/default.nix b/pkgs/development/tools/sass/default.nix new file mode 100644 index 00000000000..a291ca2de5d --- /dev/null +++ b/pkgs/development/tools/sass/default.nix @@ -0,0 +1,18 @@ +{ lib, bundlerEnv, ruby }: + +bundlerEnv { + name = "sass-3.4.22"; + + inherit ruby; + gemfile = ./Gemfile; + lockfile = ./Gemfile.lock; + gemset = ./gemset.nix; + + meta = with lib; { + description = "Tools and Ruby libraries for the CSS3 extension languages: Sass and SCSS"; + homepage = http://sass-lang.com/; + license = licenses.mit; + maintainers = [ maintainers.romildo ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/tools/sass/gemset.nix b/pkgs/development/tools/sass/gemset.nix new file mode 100644 index 00000000000..31e4e6ab6d3 --- /dev/null +++ b/pkgs/development/tools/sass/gemset.nix @@ -0,0 +1,10 @@ +{ + sass = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dkj6v26fkg1g0majqswwmhxva7cd6p3psrhdlx93qal72dssywy"; + type = "gem"; + }; + version = "3.4.22"; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fecad0b7af9..7ca243a5220 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11158,6 +11158,8 @@ in s3ql = callPackage ../tools/backup/s3ql { }; + sass = callPackage ../development/tools/sass { }; + sassc = callPackage ../development/tools/sassc { }; scanmem = callPackage ../tools/misc/scanmem { }; From 2d4b6129f9960d00c05a3f9657efe24949647216 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 20 May 2016 11:21:42 -0300 Subject: [PATCH 2/3] numix-gtk-theme: moved from "pkgs/misc/themes/gtk3/" to "pkgs/misc/themes/" --- pkgs/misc/themes/{gtk3 => }/numix-gtk-theme/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/misc/themes/{gtk3 => }/numix-gtk-theme/default.nix (100%) diff --git a/pkgs/misc/themes/gtk3/numix-gtk-theme/default.nix b/pkgs/misc/themes/numix-gtk-theme/default.nix similarity index 100% rename from pkgs/misc/themes/gtk3/numix-gtk-theme/default.nix rename to pkgs/misc/themes/numix-gtk-theme/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7ca243a5220..87b04d6e678 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15708,7 +15708,7 @@ in mate-themes = callPackage ../misc/themes/mate-themes { }; - numix-gtk-theme = callPackage ../misc/themes/gtk3/numix-gtk-theme { }; + numix-gtk-theme = callPackage ../misc/themes/numix-gtk-theme { }; kde5PackagesFun = self: with self; { From 603db7fa6ff7515bc92a40c02725e918f3665040 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 20 May 2016 11:52:31 -0300 Subject: [PATCH 3/3] numix-gtk-theme: 2.5.1 -> 2016-05-19 --- pkgs/misc/themes/numix-gtk-theme/default.nix | 30 ++++++++++++-------- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/pkgs/misc/themes/numix-gtk-theme/default.nix b/pkgs/misc/themes/numix-gtk-theme/default.nix index 555e1ef508c..f57c1fba1fc 100644 --- a/pkgs/misc/themes/numix-gtk-theme/default.nix +++ b/pkgs/misc/themes/numix-gtk-theme/default.nix @@ -1,25 +1,31 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub, sass, glib, libxml2, gdk_pixbuf +, gtk-engine-murrine +}: stdenv.mkDerivation rec { - version = "2.5.1"; + version = "2016-05-19"; name = "numix-gtk-theme-${version}"; - - src = fetchurl { - url = "https://github.com/numixproject/Numix/archive/v${version}.tar.gz"; - sha256 = "0y6c4xr2n9sygxhgviwd97l02n17n53bkpfp62srkm05cq0jy87k"; + + src = fetchFromGitHub { + repo = "numix-gtk-theme"; + owner = "numixproject"; + rev = "266945047ad8c148d36d0d1f00b39730b84482a9"; + sha256 = "108qjqwn9shqjkbadyw79y1wbq5ndv30x7xw5wjmbcss5jikr3v1"; }; - dontBuild = true; + nativeBuildInputs = [ sass glib libxml2 gdk_pixbuf ]; + + buildInputs = [ gtk-engine-murrine ]; installPhase = '' - install -dm 755 $out/share/themes/Numix - cp -dr --no-preserve='ownership' {LICENSE,CREDITS,index.theme,gtk-2.0,gtk-3.0,metacity-1,openbox-3,unity,xfce-notify-4.0,xfwm4} $out/share/themes/Numix/ + make install DESTDIR="$out" ''; - + meta = { - description = "Numix GTK theme"; + description = "Modern flat theme with a combination of light and dark elements (GNOME, Unity, Xfce and Openbox)"; homepage = https://numixproject.org; - license = stdenv.lib.licenses.gpl3; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.romildo ]; }; }