diff options
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/data/themes/adapta/default.nix (renamed from pkgs/misc/themes/adapta/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/data/themes/adwaita-qt/default.nix (renamed from pkgs/misc/themes/adwaita-qt/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/data/themes/albatross/default.nix (renamed from pkgs/misc/themes/albatross/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/data/themes/blackbird/default.nix (renamed from pkgs/misc/themes/blackbird/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/data/themes/clearlooks-phenix/default.nix (renamed from pkgs/misc/themes/clearlooks-phenix/default.nix) | 6 | ||||
-rw-r--r-- | pkgs/data/themes/e17gtk/default.nix (renamed from pkgs/misc/themes/e17gtk/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/data/themes/equilux-theme/default.nix (renamed from pkgs/misc/themes/equilux-theme/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/data/themes/gnome-breeze/default.nix (renamed from pkgs/misc/themes/gnome-breeze/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/data/themes/numix-solarized/default.nix (renamed from pkgs/misc/themes/numix-solarized/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/data/themes/numix-sx/default.nix (renamed from pkgs/misc/themes/numix-sx/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/data/themes/numix/default.nix (renamed from pkgs/misc/themes/numix/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/data/themes/onestepback/default.nix (renamed from pkgs/misc/themes/onestepback/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/data/themes/orion/default.nix (renamed from pkgs/misc/themes/orion/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/data/themes/paper-gtk/default.nix (renamed from pkgs/misc/themes/paper/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/data/themes/qtcurve/default.nix (renamed from pkgs/misc/themes/qtcurve/default.nix) | 2 | ||||
-rw-r--r-- | pkgs/data/themes/solarc/default.nix (renamed from pkgs/misc/themes/solarc/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/data/themes/vertex/default.nix (renamed from pkgs/misc/themes/vertex/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 68 |
18 files changed, 38 insertions, 38 deletions
diff --git a/pkgs/misc/themes/adapta/default.nix b/pkgs/data/themes/adapta/default.nix index 02812b1f9397..02812b1f9397 100644 --- a/pkgs/misc/themes/adapta/default.nix +++ b/pkgs/data/themes/adapta/default.nix diff --git a/pkgs/misc/themes/adwaita-qt/default.nix b/pkgs/data/themes/adwaita-qt/default.nix index 16ccee8540bf..16ccee8540bf 100644 --- a/pkgs/misc/themes/adwaita-qt/default.nix +++ b/pkgs/data/themes/adwaita-qt/default.nix diff --git a/pkgs/misc/themes/albatross/default.nix b/pkgs/data/themes/albatross/default.nix index 870b348cc320..870b348cc320 100644 --- a/pkgs/misc/themes/albatross/default.nix +++ b/pkgs/data/themes/albatross/default.nix diff --git a/pkgs/misc/themes/blackbird/default.nix b/pkgs/data/themes/blackbird/default.nix index 7ffefb1d67f6..7ffefb1d67f6 100644 --- a/pkgs/misc/themes/blackbird/default.nix +++ b/pkgs/data/themes/blackbird/default.nix diff --git a/pkgs/misc/themes/clearlooks-phenix/default.nix b/pkgs/data/themes/clearlooks-phenix/default.nix index 7c1eb54f92f5..2f701b9b765b 100644 --- a/pkgs/misc/themes/clearlooks-phenix/default.nix +++ b/pkgs/data/themes/clearlooks-phenix/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchzip }: stdenv.mkDerivation rec { version = "7.0.1"; pname = "clearlooks-phenix"; - src = fetchurl { + src = fetchzip { url = "https://github.com/jpfleury/clearlooks-phenix/archive/${version}.tar.gz"; - sha256 = "1x2psfbhxc3bk3q795bafxv6p890yfsankfw64p44q4r1x0236ra"; + sha256 = "1b6y4l3rf3c5r4v72fyj3ppvnvw13kvr2a1dyl63ni1jxnlk50kd"; }; dontBuild = true; diff --git a/pkgs/misc/themes/e17gtk/default.nix b/pkgs/data/themes/e17gtk/default.nix index 74f0a54ccef3..74f0a54ccef3 100644 --- a/pkgs/misc/themes/e17gtk/default.nix +++ b/pkgs/data/themes/e17gtk/default.nix diff --git a/pkgs/misc/themes/equilux-theme/default.nix b/pkgs/data/themes/equilux-theme/default.nix index f24524eb6b97..f24524eb6b97 100644 --- a/pkgs/misc/themes/equilux-theme/default.nix +++ b/pkgs/data/themes/equilux-theme/default.nix diff --git a/pkgs/misc/themes/gnome-breeze/default.nix b/pkgs/data/themes/gnome-breeze/default.nix index 200cc4bae051..200cc4bae051 100644 --- a/pkgs/misc/themes/gnome-breeze/default.nix +++ b/pkgs/data/themes/gnome-breeze/default.nix diff --git a/pkgs/misc/themes/numix-solarized/default.nix b/pkgs/data/themes/numix-solarized/default.nix index 0596141da80b..0596141da80b 100644 --- a/pkgs/misc/themes/numix-solarized/default.nix +++ b/pkgs/data/themes/numix-solarized/default.nix diff --git a/pkgs/misc/themes/numix-sx/default.nix b/pkgs/data/themes/numix-sx/default.nix index 72e87e2e2740..72e87e2e2740 100644 --- a/pkgs/misc/themes/numix-sx/default.nix +++ b/pkgs/data/themes/numix-sx/default.nix diff --git a/pkgs/misc/themes/numix/default.nix b/pkgs/data/themes/numix/default.nix index e01f8174e9ea..e01f8174e9ea 100644 --- a/pkgs/misc/themes/numix/default.nix +++ b/pkgs/data/themes/numix/default.nix diff --git a/pkgs/misc/themes/onestepback/default.nix b/pkgs/data/themes/onestepback/default.nix index 64ead2f75f4b..64ead2f75f4b 100644 --- a/pkgs/misc/themes/onestepback/default.nix +++ b/pkgs/data/themes/onestepback/default.nix diff --git a/pkgs/misc/themes/orion/default.nix b/pkgs/data/themes/orion/default.nix index 9ba8cd368cf7..9ba8cd368cf7 100644 --- a/pkgs/misc/themes/orion/default.nix +++ b/pkgs/data/themes/orion/default.nix diff --git a/pkgs/misc/themes/paper/default.nix b/pkgs/data/themes/paper-gtk/default.nix index e7235a900cf9..e7235a900cf9 100644 --- a/pkgs/misc/themes/paper/default.nix +++ b/pkgs/data/themes/paper-gtk/default.nix diff --git a/pkgs/misc/themes/qtcurve/default.nix b/pkgs/data/themes/qtcurve/default.nix index 0071e386e88c..673b97cc137c 100644 --- a/pkgs/misc/themes/qtcurve/default.nix +++ b/pkgs/data/themes/qtcurve/default.nix @@ -11,7 +11,7 @@ in mkDerivation { pname = "qtcurve"; inherit version; src = fetchurl { - url = "http://download.kde.org/stable/qtcurve/qtcurve-${version}.tar.xz"; + url = "https://download.kde.org/stable/qtcurve/qtcurve-${version}.tar.xz"; sha256 = "169gdny1cdld0qnx3nqvx568zjzdba4pwp3gxapc1hdh2cymw7r8"; }; diff --git a/pkgs/misc/themes/solarc/default.nix b/pkgs/data/themes/solarc/default.nix index 96843e8d78b4..96843e8d78b4 100644 --- a/pkgs/misc/themes/solarc/default.nix +++ b/pkgs/data/themes/solarc/default.nix diff --git a/pkgs/misc/themes/vertex/default.nix b/pkgs/data/themes/vertex/default.nix index 81c681f53715..81c681f53715 100644 --- a/pkgs/misc/themes/vertex/default.nix +++ b/pkgs/data/themes/vertex/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 758f68253a1a..eb494c41e89d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1011,8 +1011,6 @@ in novacomd = callPackage ../development/mobile/webos/novacomd.nix { }; }; - adapta-gtk-theme = callPackage ../misc/themes/adapta { }; - aria2 = callPackage ../tools/networking/aria2 { inherit (darwin.apple_sdk.frameworks) Security; inherit (pythonPackages) sphinx; @@ -5489,8 +5487,6 @@ in pamtester = callPackage ../tools/security/pamtester { }; - paper-gtk-theme = callPackage ../misc/themes/paper { }; - paperless = callPackage ../applications/office/paperless { }; paperwork = callPackage ../applications/office/paperwork { }; @@ -17045,14 +17041,20 @@ in adapta-backgrounds = callPackage ../data/misc/adapta-backgrounds { }; + adapta-gtk-theme = callPackage ../data/themes/adapta { }; + adapta-kde-theme = callPackage ../data/themes/adapta-kde { }; adementary-theme = callPackage ../data/themes/adementary { }; + adwaita-qt = libsForQt5.callPackage ../data/themes/adwaita-qt { }; + agave = callPackage ../data/fonts/agave { }; aileron = callPackage ../data/fonts/aileron { }; + albatross = callPackage ../data/themes/albatross { }; + amber-theme = callPackage ../data/themes/amber { }; amiri = callPackage ../data/fonts/amiri { }; @@ -17094,6 +17096,8 @@ in bibata-extra-cursors = callPackage ../data/icons/bibata-cursors/extra.nix { }; bibata-cursors-translucent = callPackage ../data/icons/bibata-cursors/translucent.nix { }; + blackbird = callPackage ../data/themes/blackbird { }; + brise = callPackage ../data/misc/brise { }; inherit (kdeFrameworks) breeze-icons; @@ -17114,6 +17118,8 @@ in cherry = callPackage ../data/fonts/cherry { inherit (xorg) fonttosfnt mkfontdir; }; + clearlooks-phenix = callPackage ../data/themes/clearlooks-phenix { }; + cnstrokeorder = callPackage ../data/fonts/cnstrokeorder {}; comfortaa = callPackage ../data/fonts/comfortaa {}; @@ -17200,10 +17206,14 @@ in dosemu_fonts = callPackage ../data/fonts/dosemu-fonts { }; + e17gtk = callPackage ../data/themes/e17gtk { }; + eb-garamond = callPackage ../data/fonts/eb-garamond { }; elliptic_curves = callPackage ../data/misc/elliptic_curves { }; + equilux-theme = callPackage ../data/themes/equilux-theme { }; + eunomia = callPackage ../data/fonts/eunomia { }; f5_6 = callPackage ../data/fonts/f5_6 { }; @@ -17259,6 +17269,8 @@ in gsettings-desktop-schemas = callPackage ../development/libraries/gsettings-desktop-schemas { }; + gnome-breeze = callPackage ../data/themes/gnome-breeze { }; + go-font = callPackage ../data/fonts/go-font { }; greybird = callPackage ../data/themes/greybird { }; @@ -17456,24 +17468,36 @@ in numix-cursor-theme = callPackage ../data/icons/numix-cursor-theme { }; + numix-gtk-theme = callPackage ../data/themes/numix { }; + + numix-solarized-gtk-theme = callPackage ../data/themes/numix-solarized { }; + + numix-sx-gtk-theme = callPackage ../data/themes/numix-sx { }; + office-code-pro = callPackage ../data/fonts/office-code-pro { }; oldstandard = callPackage ../data/fonts/oldstandard { }; oldsindhi = callPackage ../data/fonts/oldsindhi { }; + onestepback = callPackage ../data/themes/onestepback { }; + open-dyslexic = callPackage ../data/fonts/open-dyslexic { }; open-sans = callPackage ../data/fonts/open-sans { }; orbitron = callPackage ../data/fonts/orbitron { }; + orion = callPackage ../data/themes/orion {}; + overpass = callPackage ../data/fonts/overpass { }; oxygenfonts = callPackage ../data/fonts/oxygenfonts { }; inherit (kdeFrameworks) oxygen-icons5; + paper-gtk-theme = callPackage ../data/themes/paper-gtk { }; + paper-icon-theme = callPackage ../data/icons/paper-icon-theme { }; papirus-icon-theme = callPackage ../data/icons/papirus-icon-theme { }; @@ -17528,6 +17552,8 @@ in qogir-theme = callPackage ../data/themes/qogir { }; + qtcurve = libsForQt5.callPackage ../data/themes/qtcurve {}; + redhat-official-fonts = callPackage ../data/fonts/redhat-official { }; route159 = callPackage ../data/fonts/route159 { }; @@ -17556,6 +17582,8 @@ in sierra-gtk-theme = callPackage ../data/themes/sierra { }; + solarc-gtk-theme = callPackage ../data/themes/solarc { }; + soundfont-fluid = callPackage ../data/soundfonts/fluid { }; stdmanpages = callPackage ../data/documentation/std-man-pages { }; @@ -17671,6 +17699,8 @@ in tex-gyre-math = callPackages ../data/fonts/tex-gyre-math { }; + theme-vertex = callPackage ../data/themes/vertex { }; + tipa = callPackage ../data/fonts/tipa { }; ttf_bitstream_vera = callPackage ../data/fonts/ttf-bitstream-vera { }; @@ -20211,8 +20241,6 @@ in ptex = callPackage ../development/libraries/ptex {}; - qtcurve = libsForQt5.callPackage ../misc/themes/qtcurve {}; - qbec = callPackage ../applications/networking/cluster/qbec { }; rssguard = libsForQt5.callPackage ../applications/networking/feedreaders/rssguard { }; @@ -23299,8 +23327,6 @@ in ### DESKTOP ENVIRONMENTS - clearlooks-phenix = callPackage ../misc/themes/clearlooks-phenix { }; - deepin = recurseIntoAttrs (import ../desktops/deepin { inherit pkgs libsForQt5; inherit (lib) makeScope; @@ -23374,12 +23400,6 @@ in latte-dock = libsForQt5.callPackage ../applications/misc/latte-dock { }; - adwaita-qt = libsForQt5.callPackage ../misc/themes/adwaita-qt { }; - - orion = callPackage ../misc/themes/orion {}; - - albatross = callPackage ../misc/themes/albatross { }; - gtk_engines = callPackage ../misc/themes/gtk2/gtk-engines { }; gtk-engine-bluecurve = callPackage ../misc/themes/gtk2/gtk-engine-bluecurve { }; @@ -23388,22 +23408,10 @@ in gnome-themes-extra = gnome3.gnome-themes-extra; - numix-gtk-theme = callPackage ../misc/themes/numix { }; - - numix-solarized-gtk-theme = callPackage ../misc/themes/numix-solarized { }; - - numix-sx-gtk-theme = callPackage ../misc/themes/numix-sx { }; - - onestepback = callPackage ../misc/themes/onestepback { }; - - theme-vertex = callPackage ../misc/themes/vertex { }; - rox-filer = callPackage ../desktops/rox/rox-filer { gtk = gtk2; }; - solarc-gtk-theme = callPackage ../misc/themes/solarc { }; - xfce = recurseIntoAttrs (callPackage ../desktops/xfce { }); xrandr-invert-colors = callPackage ../applications/misc/xrandr-invert-colors { }; @@ -24315,8 +24323,6 @@ in bees = callPackage ../tools/filesystems/bees { }; - blackbird = callPackage ../misc/themes/blackbird { }; - bootil = callPackage ../development/libraries/bootil { }; brgenml1lpr = pkgsi686Linux.callPackage ../misc/cups/drivers/brgenml1lpr {}; @@ -24355,8 +24361,6 @@ in terminal-parrot = callPackage ../applications/misc/terminal-parrot { }; - e17gtk = callPackage ../misc/themes/e17gtk { }; - epson-alc1100 = callPackage ../misc/drivers/epson-alc1100 { }; epson-escpr = callPackage ../misc/drivers/epson-escpr { }; @@ -24425,8 +24429,6 @@ in electricsheep = callPackage ../misc/screensavers/electricsheep { }; - equilux-theme = callPackage ../misc/themes/equilux-theme { }; - flam3 = callPackage ../tools/graphics/flam3 { }; glee = callPackage ../tools/graphics/glee { }; @@ -24486,8 +24488,6 @@ in glava = callPackage ../applications/misc/glava {}; - gnome-breeze = callPackage ../misc/themes/gnome-breeze { }; - gnuk = callPackage ../misc/gnuk { gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc; binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils; |