From 3876279b1068cd07d82ca8024e77519b0921a428 Mon Sep 17 00:00:00 2001 From: Remy Goldschmidt Date: Tue, 3 Mar 2015 20:15:30 -0600 Subject: [PATCH 1/3] Added Numix/Numix-Circle icon theme --- .../icons/numix-icon-theme-circle/default.nix | 30 +++++++++++++++++++ pkgs/data/icons/numix-icon-theme/default.nix | 30 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 3 files changed, 64 insertions(+) create mode 100644 pkgs/data/icons/numix-icon-theme-circle/default.nix create mode 100644 pkgs/data/icons/numix-icon-theme/default.nix diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix new file mode 100644 index 00000000000..807c1e12832 --- /dev/null +++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, unzip }: + +stdenv.mkDerivation rec { + version = "d7e8c4cdcf"; + + package-name = "numix-icon-theme-circle"; + + name = "${package-name}-${version}"; + + buildInputs = [ unzip ]; + + src = fetchurl { + url = "https://github.com/numixproject/${package-name}/archive/${version}.zip"; + sha256 = "672d6f4d000c4c75a64e0297f9609afab1035d082d7ab4f7abe3e2173cba9324"; + }; + + dontBuild = true; + + installPhase = '' + ls -lah + install -dm 755 $out/usr/share/icons + cp -dr --no-preserve='ownership' Numix-Circle{,-Light} $out/usr/share/icons/ + ''; + + meta = { + description = "Numix icon theme (circle version)"; + homepage = https://numixproject.org; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/data/icons/numix-icon-theme/default.nix b/pkgs/data/icons/numix-icon-theme/default.nix new file mode 100644 index 00000000000..a28a6dd2de8 --- /dev/null +++ b/pkgs/data/icons/numix-icon-theme/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, unzip }: + +stdenv.mkDerivation rec { + version = "2c11fbfcee"; + + package-name = "numix-icon-theme"; + + name = "${package-name}-${version}"; + + buildInputs = [ unzip ]; + + src = fetchurl { + url = "https://github.com/numixproject/${package-name}/archive/${version}.zip"; + sha256 = "61dc170b8a70b20a9075f06e1668d6bd8907a6db0ef9e3568c473296d0f351e1"; + }; + + dontBuild = true; + + installPhase = '' + ls -lah + install -dm 755 $out/usr/share/icons + cp -dr --no-preserve='ownership' Numix{,-Light} $out/usr/share/icons/ + ''; + + meta = { + description = "Numix icon theme"; + homepage = https://numixproject.org; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9fcacf55c04..eb00c59f9cf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9527,6 +9527,10 @@ let nafees = callPackage ../data/fonts/nafees { }; + numix_icon_theme = callPackage ../data/icons/numix-icon-theme { }; + + numix_icon_theme_circle = callPackage ../data/icons/numix-icon-theme-circle { }; + oldstandard = callPackage ../data/fonts/oldstandard { }; open-dyslexic = callPackage ../data/fonts/open-dyslexic { }; From 7648cb24563c91b1685c8248e6538126bdd48c45 Mon Sep 17 00:00:00 2001 From: Remy Goldschmidt Date: Wed, 4 Mar 2015 18:00:25 -0600 Subject: [PATCH 2/3] Added Numix GTK theme, removed unnecessary ls -lah in Numix/Numix-Circle icon themes --- .../icons/numix-icon-theme-circle/default.nix | 1 - pkgs/data/icons/numix-icon-theme/default.nix | 1 - pkgs/misc/themes/gtk3/numix/default.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 4 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 pkgs/misc/themes/gtk3/numix/default.nix diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix index 807c1e12832..927812e4388 100644 --- a/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -17,7 +17,6 @@ stdenv.mkDerivation rec { dontBuild = true; installPhase = '' - ls -lah install -dm 755 $out/usr/share/icons cp -dr --no-preserve='ownership' Numix-Circle{,-Light} $out/usr/share/icons/ ''; diff --git a/pkgs/data/icons/numix-icon-theme/default.nix b/pkgs/data/icons/numix-icon-theme/default.nix index a28a6dd2de8..fa4139492ca 100644 --- a/pkgs/data/icons/numix-icon-theme/default.nix +++ b/pkgs/data/icons/numix-icon-theme/default.nix @@ -17,7 +17,6 @@ stdenv.mkDerivation rec { dontBuild = true; installPhase = '' - ls -lah install -dm 755 $out/usr/share/icons cp -dr --no-preserve='ownership' Numix{,-Light} $out/usr/share/icons/ ''; diff --git a/pkgs/misc/themes/gtk3/numix/default.nix b/pkgs/misc/themes/gtk3/numix/default.nix new file mode 100644 index 00000000000..1a9077d36ca --- /dev/null +++ b/pkgs/misc/themes/gtk3/numix/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + version = "2.2.3"; + name = "numix-${version}"; + + src = fetchurl { + url = "https://github.com/shimmerproject/Numix/archive/v${version}.tar.gz"; + sha256 = "b0acc2d81300b898403766456d3406304553cc7016677381f3179dbeb1192a2d"; + }; + + dontBuild = true; + + installPhase = '' + install -dm 755 $out/usr/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/usr/share/themes/Numix/ + ''; + + meta = { + description = "Numix GTK theme"; + homepage = https://numixproject.org; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eb00c59f9cf..9e4cfbdf7bb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12841,6 +12841,8 @@ let mate-themes = callPackage ../misc/themes/mate-themes { }; + numix = callPackage ../misc/themes/gtk3/numix { }; + plasma52 = recurseIntoAttrs (callPackage ../desktops/plasma-5.2 { qt5 = qt54; kf5 = kf57; From 8a732aecb82917185c98f60a5fefd0157d976549 Mon Sep 17 00:00:00 2001 From: Remy Goldschmidt Date: Thu, 5 Mar 2015 00:23:18 -0600 Subject: [PATCH 3/3] Fixed licenses, fixed platform, renamed packages --- pkgs/data/icons/numix-icon-theme-circle/default.nix | 3 ++- pkgs/data/icons/numix-icon-theme/default.nix | 3 ++- .../misc/themes/gtk3/{numix => numix-gtk-theme}/default.nix | 5 +++-- pkgs/top-level/all-packages.nix | 6 +++--- 4 files changed, 10 insertions(+), 7 deletions(-) rename pkgs/misc/themes/gtk3/{numix => numix-gtk-theme}/default.nix (83%) diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix index 927812e4388..ef7c5476fc6 100644 --- a/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "Numix icon theme (circle version)"; homepage = https://numixproject.org; - platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/data/icons/numix-icon-theme/default.nix b/pkgs/data/icons/numix-icon-theme/default.nix index fa4139492ca..cd515f11f5d 100644 --- a/pkgs/data/icons/numix-icon-theme/default.nix +++ b/pkgs/data/icons/numix-icon-theme/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "Numix icon theme"; homepage = https://numixproject.org; - platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/misc/themes/gtk3/numix/default.nix b/pkgs/misc/themes/gtk3/numix-gtk-theme/default.nix similarity index 83% rename from pkgs/misc/themes/gtk3/numix/default.nix rename to pkgs/misc/themes/gtk3/numix-gtk-theme/default.nix index 1a9077d36ca..ed6254a3e22 100644 --- a/pkgs/misc/themes/gtk3/numix/default.nix +++ b/pkgs/misc/themes/gtk3/numix-gtk-theme/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2.2.3"; - name = "numix-${version}"; + name = "numix-gtk-theme-${version}"; src = fetchurl { url = "https://github.com/shimmerproject/Numix/archive/v${version}.tar.gz"; @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Numix GTK theme"; homepage = https://numixproject.org; - platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9e4cfbdf7bb..3998b4ab87c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9527,9 +9527,9 @@ let nafees = callPackage ../data/fonts/nafees { }; - numix_icon_theme = callPackage ../data/icons/numix-icon-theme { }; + numix-icon-theme = callPackage ../data/icons/numix-icon-theme { }; - numix_icon_theme_circle = callPackage ../data/icons/numix-icon-theme-circle { }; + numix-icon-theme-circle = callPackage ../data/icons/numix-icon-theme-circle { }; oldstandard = callPackage ../data/fonts/oldstandard { }; @@ -12841,7 +12841,7 @@ let mate-themes = callPackage ../misc/themes/mate-themes { }; - numix = callPackage ../misc/themes/gtk3/numix { }; + numix-gtk-theme = callPackage ../misc/themes/gtk3/numix-gtk-theme { }; plasma52 = recurseIntoAttrs (callPackage ../desktops/plasma-5.2 { qt5 = qt54;