From 910d752579772182051b8bcb4c32a0bc120d5b1c Mon Sep 17 00:00:00 2001 From: c0bw3b Date: Sun, 24 Nov 2019 17:15:06 +0100 Subject: [PATCH 1/5] kde2-decoration: 2017-03-15 -> 1.0 + move under data/themes --- pkgs/{misc => data}/themes/kde2/default.nix | 19 +++++++++---------- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 11 insertions(+), 12 deletions(-) rename pkgs/{misc => data}/themes/kde2/default.nix (58%) diff --git a/pkgs/misc/themes/kde2/default.nix b/pkgs/data/themes/kde2/default.nix similarity index 58% rename from pkgs/misc/themes/kde2/default.nix rename to pkgs/data/themes/kde2/default.nix index fac8c38eeca..547e4f30aa6 100644 --- a/pkgs/misc/themes/kde2/default.nix +++ b/pkgs/data/themes/kde2/default.nix @@ -1,18 +1,17 @@ -{ stdenv, fetchFromGitHub, mkDerivation +{ lib, fetchFromGitHub, mkDerivation , cmake, extra-cmake-modules -, qtbase, kcoreaddons, kdecoration }: +, qtbase, kcoreaddons, kdecoration +}: -let - version = "2017-03-15"; -in mkDerivation rec { +mkDerivation rec { pname = "kde2-decoration"; - inherit version; + version = "1.0"; src = fetchFromGitHub { owner = "repos-holder"; repo = "kdecoration2-kde2"; - rev = "2a9cf18ac0646b3532d4db2dd28bd73c4c229783"; - sha256 = "0kilw6sd3blvm6gx9w4w5ivkjfxlv6wnyivw46pwwvhgxqymkbxk"; + rev = version; + sha256 = "1766z9wscybcqvr828xih93b3rab3hb0ghsf818iflhp1xy0js08"; }; enableParallelBuilding = true; @@ -21,9 +20,9 @@ in mkDerivation rec { buildInputs = [ qtbase kcoreaddons kdecoration ]; - meta = with stdenv.lib; { + meta = with lib; { description = "KDE 2 window decoration ported to Plasma 5"; - homepage = src.meta.homepage; + homepage = "https://github.com/repos-holder/kdecoration2-kde2"; license = licenses.bsd2; platforms = platforms.linux; maintainers = with maintainers; [ gnidorah ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a738cd4bf41..8294d228202 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4288,8 +4288,6 @@ in kdbplus = pkgsi686Linux.callPackage ../applications/misc/kdbplus { }; - kde2-decoration = libsForQt5.callPackage ../misc/themes/kde2 { }; - keepalived = callPackage ../tools/networking/keepalived { }; kexectools = callPackage ../os-specific/linux/kexectools { }; @@ -17315,6 +17313,8 @@ in kawkab-mono-font = callPackage ../data/fonts/kawkab-mono {}; + kde2-decoration = libsForQt5.callPackage ../data/themes/kde2 { }; + kochi-substitute = callPackage ../data/fonts/kochi-substitute {}; kochi-substitute-naga10 = callPackage ../data/fonts/kochi-substitute-naga10 {}; From 438a39f80b28b39e1722f36c04ce37e016f9536f Mon Sep 17 00:00:00 2001 From: c0bw3b Date: Sun, 24 Nov 2019 17:25:37 +0100 Subject: [PATCH 2/5] arc-kde-theme: 2017-11-09 -> 20180614 + move under data/themes --- pkgs/{misc => data}/themes/arc-kde/default.nix | 10 +++++----- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) rename pkgs/{misc => data}/themes/arc-kde/default.nix (73%) diff --git a/pkgs/misc/themes/arc-kde/default.nix b/pkgs/data/themes/arc-kde/default.nix similarity index 73% rename from pkgs/misc/themes/arc-kde/default.nix rename to pkgs/data/themes/arc-kde/default.nix index decdbdfac2d..4937a99daec 100644 --- a/pkgs/misc/themes/arc-kde/default.nix +++ b/pkgs/data/themes/arc-kde/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "arc-kde-theme"; - version = "2017-11-09"; + version = "20180614"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = "arc-kde"; - rev = "a0abe6fc5ebf74f9ae88b8a2035957cc16f706f5"; - sha256 = "1p6f4ny97096nb054lrgyjwikmvg0qlbcnsjag7m5dfbclfnvzkg"; + rev = version; + sha256 = "0wli16k9my7m8a9561545vjwfifmxm4w606z1h0j08msvlky40xw"; }; - makeFlags = ["PREFIX=$(out)" ]; + makeFlags = [ "PREFIX=$(out)" ]; # Make this a fixed-output derivation outputHashMode = "recursive"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8294d228202..dba5847c5e4 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 { }; }; - arc-kde-theme = callPackage ../misc/themes/arc-kde { }; - adapta-gtk-theme = callPackage ../misc/themes/adapta { }; adapta-kde-theme = callPackage ../misc/themes/adapta-kde { }; @@ -17074,6 +17072,8 @@ in arc-icon-theme = callPackage ../data/icons/arc-icon-theme { }; + arc-kde-theme = callPackage ../data/themes/arc-kde { }; + arc-theme = callPackage ../data/themes/arc { }; arkpandora_ttf = callPackage ../data/fonts/arkpandora { }; From d8c37ed93fb3d570ac80ff9681c731fb69ac7736 Mon Sep 17 00:00:00 2001 From: c0bw3b Date: Sun, 24 Nov 2019 17:33:00 +0100 Subject: [PATCH 3/5] adapta-kde-theme: 20180512 -> 20180828 + move under data/themes --- pkgs/{misc => data}/themes/adapta-kde/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) rename pkgs/{misc => data}/themes/adapta-kde/default.nix (83%) diff --git a/pkgs/misc/themes/adapta-kde/default.nix b/pkgs/data/themes/adapta-kde/default.nix similarity index 83% rename from pkgs/misc/themes/adapta-kde/default.nix rename to pkgs/data/themes/adapta-kde/default.nix index a7624d2889b..47740aa6762 100644 --- a/pkgs/misc/themes/adapta-kde/default.nix +++ b/pkgs/data/themes/adapta-kde/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { pname = "adapta-kde-theme"; - version = "20180512"; + version = "20180828"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = "adapta-kde"; rev = version; - sha256 = "1lgpkylhzbayk892inql16sjyy9d3v126f9i1v7qgha1203rwcji"; + sha256 = "1q85678sff8is2kwvgd703ckcns42gdga2c1rqlp61gb6bqf09j8"; }; - makeFlags = ["PREFIX=$(out)" ]; + makeFlags = [ "PREFIX=$(out)" ]; # Make this a fixed-output derivation outputHashMode = "recursive"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dba5847c5e4..758f68253a1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1013,8 +1013,6 @@ in adapta-gtk-theme = callPackage ../misc/themes/adapta { }; - adapta-kde-theme = callPackage ../misc/themes/adapta-kde { }; - aria2 = callPackage ../tools/networking/aria2 { inherit (darwin.apple_sdk.frameworks) Security; inherit (pythonPackages) sphinx; @@ -17047,6 +17045,8 @@ in adapta-backgrounds = callPackage ../data/misc/adapta-backgrounds { }; + adapta-kde-theme = callPackage ../data/themes/adapta-kde { }; + adementary-theme = callPackage ../data/themes/adementary { }; agave = callPackage ../data/fonts/agave { }; From 1e93a70f046c3f63021d7005386e389f7ff64696 Mon Sep 17 00:00:00 2001 From: c0bw3b Date: Sun, 24 Nov 2019 18:46:09 +0100 Subject: [PATCH 4/5] Treewide: regroup all themes under data/themes --- pkgs/{misc => data}/themes/adapta/default.nix | 0 .../themes/adwaita-qt/default.nix | 0 .../themes/albatross/default.nix | 0 .../themes/blackbird/default.nix | 0 .../themes/clearlooks-phenix/default.nix | 6 +- pkgs/{misc => data}/themes/e17gtk/default.nix | 0 .../themes/equilux-theme/default.nix | 0 .../themes/gnome-breeze/default.nix | 0 .../themes/numix-solarized/default.nix | 0 .../themes/numix-sx/default.nix | 0 pkgs/{misc => data}/themes/numix/default.nix | 0 .../themes/onestepback/default.nix | 0 pkgs/{misc => data}/themes/orion/default.nix | 0 .../themes/paper-gtk}/default.nix | 0 .../{misc => data}/themes/qtcurve/default.nix | 2 +- pkgs/{misc => data}/themes/solarc/default.nix | 0 pkgs/{misc => data}/themes/vertex/default.nix | 0 pkgs/top-level/all-packages.nix | 68 +++++++++---------- 18 files changed, 38 insertions(+), 38 deletions(-) rename pkgs/{misc => data}/themes/adapta/default.nix (100%) rename pkgs/{misc => data}/themes/adwaita-qt/default.nix (100%) rename pkgs/{misc => data}/themes/albatross/default.nix (100%) rename pkgs/{misc => data}/themes/blackbird/default.nix (100%) rename pkgs/{misc => data}/themes/clearlooks-phenix/default.nix (89%) rename pkgs/{misc => data}/themes/e17gtk/default.nix (100%) rename pkgs/{misc => data}/themes/equilux-theme/default.nix (100%) rename pkgs/{misc => data}/themes/gnome-breeze/default.nix (100%) rename pkgs/{misc => data}/themes/numix-solarized/default.nix (100%) rename pkgs/{misc => data}/themes/numix-sx/default.nix (100%) rename pkgs/{misc => data}/themes/numix/default.nix (100%) rename pkgs/{misc => data}/themes/onestepback/default.nix (100%) rename pkgs/{misc => data}/themes/orion/default.nix (100%) rename pkgs/{misc/themes/paper => data/themes/paper-gtk}/default.nix (100%) rename pkgs/{misc => data}/themes/qtcurve/default.nix (95%) rename pkgs/{misc => data}/themes/solarc/default.nix (100%) rename pkgs/{misc => data}/themes/vertex/default.nix (100%) diff --git a/pkgs/misc/themes/adapta/default.nix b/pkgs/data/themes/adapta/default.nix similarity index 100% rename from pkgs/misc/themes/adapta/default.nix rename to pkgs/data/themes/adapta/default.nix diff --git a/pkgs/misc/themes/adwaita-qt/default.nix b/pkgs/data/themes/adwaita-qt/default.nix similarity index 100% rename from pkgs/misc/themes/adwaita-qt/default.nix rename to pkgs/data/themes/adwaita-qt/default.nix diff --git a/pkgs/misc/themes/albatross/default.nix b/pkgs/data/themes/albatross/default.nix similarity index 100% rename from pkgs/misc/themes/albatross/default.nix rename to pkgs/data/themes/albatross/default.nix diff --git a/pkgs/misc/themes/blackbird/default.nix b/pkgs/data/themes/blackbird/default.nix similarity index 100% rename from pkgs/misc/themes/blackbird/default.nix rename to pkgs/data/themes/blackbird/default.nix diff --git a/pkgs/misc/themes/clearlooks-phenix/default.nix b/pkgs/data/themes/clearlooks-phenix/default.nix similarity index 89% rename from pkgs/misc/themes/clearlooks-phenix/default.nix rename to pkgs/data/themes/clearlooks-phenix/default.nix index 7c1eb54f92f..2f701b9b765 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 similarity index 100% rename from pkgs/misc/themes/e17gtk/default.nix rename to pkgs/data/themes/e17gtk/default.nix diff --git a/pkgs/misc/themes/equilux-theme/default.nix b/pkgs/data/themes/equilux-theme/default.nix similarity index 100% rename from pkgs/misc/themes/equilux-theme/default.nix rename to 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 similarity index 100% rename from pkgs/misc/themes/gnome-breeze/default.nix rename to 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 similarity index 100% rename from pkgs/misc/themes/numix-solarized/default.nix rename to 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 similarity index 100% rename from pkgs/misc/themes/numix-sx/default.nix rename to pkgs/data/themes/numix-sx/default.nix diff --git a/pkgs/misc/themes/numix/default.nix b/pkgs/data/themes/numix/default.nix similarity index 100% rename from pkgs/misc/themes/numix/default.nix rename to pkgs/data/themes/numix/default.nix diff --git a/pkgs/misc/themes/onestepback/default.nix b/pkgs/data/themes/onestepback/default.nix similarity index 100% rename from pkgs/misc/themes/onestepback/default.nix rename to pkgs/data/themes/onestepback/default.nix diff --git a/pkgs/misc/themes/orion/default.nix b/pkgs/data/themes/orion/default.nix similarity index 100% rename from pkgs/misc/themes/orion/default.nix rename to pkgs/data/themes/orion/default.nix diff --git a/pkgs/misc/themes/paper/default.nix b/pkgs/data/themes/paper-gtk/default.nix similarity index 100% rename from pkgs/misc/themes/paper/default.nix rename to pkgs/data/themes/paper-gtk/default.nix diff --git a/pkgs/misc/themes/qtcurve/default.nix b/pkgs/data/themes/qtcurve/default.nix similarity index 95% rename from pkgs/misc/themes/qtcurve/default.nix rename to pkgs/data/themes/qtcurve/default.nix index 0071e386e88..673b97cc137 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 similarity index 100% rename from pkgs/misc/themes/solarc/default.nix rename to pkgs/data/themes/solarc/default.nix diff --git a/pkgs/misc/themes/vertex/default.nix b/pkgs/data/themes/vertex/default.nix similarity index 100% rename from pkgs/misc/themes/vertex/default.nix rename to pkgs/data/themes/vertex/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 758f68253a1..eb494c41e89 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; From 8e1bef4eddbc94279313ecf83316074d5726d42a Mon Sep 17 00:00:00 2001 From: c0bw3b Date: Sun, 24 Nov 2019 18:56:04 +0100 Subject: [PATCH 5/5] gtk-engine*: relocate under development/libraries --- .../libraries}/gtk-engine-bluecurve/default.nix | 0 .../libraries}/gtk-engine-murrine/default.nix | 0 .../libraries}/gtk-engines/default.nix | 0 pkgs/top-level/all-packages.nix | 12 ++++++------ 4 files changed, 6 insertions(+), 6 deletions(-) rename pkgs/{misc/themes/gtk2 => development/libraries}/gtk-engine-bluecurve/default.nix (100%) rename pkgs/{misc/themes/gtk2 => development/libraries}/gtk-engine-murrine/default.nix (100%) rename pkgs/{misc/themes/gtk2 => development/libraries}/gtk-engines/default.nix (100%) diff --git a/pkgs/misc/themes/gtk2/gtk-engine-bluecurve/default.nix b/pkgs/development/libraries/gtk-engine-bluecurve/default.nix similarity index 100% rename from pkgs/misc/themes/gtk2/gtk-engine-bluecurve/default.nix rename to pkgs/development/libraries/gtk-engine-bluecurve/default.nix diff --git a/pkgs/misc/themes/gtk2/gtk-engine-murrine/default.nix b/pkgs/development/libraries/gtk-engine-murrine/default.nix similarity index 100% rename from pkgs/misc/themes/gtk2/gtk-engine-murrine/default.nix rename to pkgs/development/libraries/gtk-engine-murrine/default.nix diff --git a/pkgs/misc/themes/gtk2/gtk-engines/default.nix b/pkgs/development/libraries/gtk-engines/default.nix similarity index 100% rename from pkgs/misc/themes/gtk2/gtk-engines/default.nix rename to pkgs/development/libraries/gtk-engines/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eb494c41e89..a3ff2a29d5b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11585,6 +11585,12 @@ in gtkmm2 = callPackage ../development/libraries/gtkmm/2.x.nix { }; gtkmm3 = callPackage ../development/libraries/gtkmm/3.x.nix { }; + gtk_engines = callPackage ../development/libraries/gtk-engines { }; + + gtk-engine-bluecurve = callPackage ../development/libraries/gtk-engine-bluecurve { }; + + gtk-engine-murrine = callPackage ../development/libraries/gtk-engine-murrine { }; + gtk-sharp-2_0 = callPackage ../development/libraries/gtk-sharp/2.0.nix { inherit (gnome2) libglade libgtkhtml gtkhtml libgnomecanvas libgnomeui libgnomeprint @@ -23400,12 +23406,6 @@ in latte-dock = libsForQt5.callPackage ../applications/misc/latte-dock { }; - gtk_engines = callPackage ../misc/themes/gtk2/gtk-engines { }; - - gtk-engine-bluecurve = callPackage ../misc/themes/gtk2/gtk-engine-bluecurve { }; - - gtk-engine-murrine = callPackage ../misc/themes/gtk2/gtk-engine-murrine { }; - gnome-themes-extra = gnome3.gnome-themes-extra; rox-filer = callPackage ../desktops/rox/rox-filer {