diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/data/themes')
15 files changed, 59 insertions, 51 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/data/themes/canta/default.nix b/infra/libkookie/nixpkgs/pkgs/data/themes/canta/default.nix index 8534fe7a5064..c6a6678b98c7 100644 --- a/infra/libkookie/nixpkgs/pkgs/data/themes/canta/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/data/themes/canta/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { description = "Flat Design theme for GTK based desktop environments"; homepage = "https://github.com/vinceliuice/Canta-theme"; license = licenses.gpl2; - platforms = platforms.unix; + platforms = platforms.linux; # numix-icon-theme-circle unavailable in darwin maintainers = [ maintainers.romildo ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/data/themes/greybird/default.nix b/infra/libkookie/nixpkgs/pkgs/data/themes/greybird/default.nix index 794034af7e7c..2f14988e1b25 100644 --- a/infra/libkookie/nixpkgs/pkgs/data/themes/greybird/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/data/themes/greybird/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "greybird"; - version = "3.22.12"; + version = "3.22.13"; src = fetchFromGitHub { owner = "shimmerproject"; repo = pname; rev = "v${version}"; - sha256 = "1j66ddvl3pmwh2v8ajm8r5g5nbsr7r262ff1qn2nf3i0gy8b3lq8"; + sha256 = "154qawiga792iimkpk3a6q8f4gm4r158wmsagkbqqbhj33kxgxhg"; }; nativeBuildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/data/themes/jade1/default.nix b/infra/libkookie/nixpkgs/pkgs/data/themes/jade1/default.nix index c9a549462c15..03dd7a49cda8 100644 --- a/infra/libkookie/nixpkgs/pkgs/data/themes/jade1/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/data/themes/jade1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "theme-jade1"; - version = "1.9"; + version = "1.10"; src = fetchurl { url = "https://github.com/madmaxms/theme-jade-1/releases/download/v${version}/jade-1-theme.tar.xz"; - sha256 = "11fzd44ysy76iwyiwkshpf0vf6m3i3hcxyyihl0lg68nb3cv0g9y"; + sha256 = "17s4r8yjhnz9wrnrma6m8qjp02r47xkjk062sdb8s91dxhh7l8q2"; }; sourceRoot = "."; diff --git a/infra/libkookie/nixpkgs/pkgs/data/themes/kde2/default.nix b/infra/libkookie/nixpkgs/pkgs/data/themes/kde2/default.nix index 547e4f30aa6c..7e33d371ebeb 100644 --- a/infra/libkookie/nixpkgs/pkgs/data/themes/kde2/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/data/themes/kde2/default.nix @@ -5,15 +5,16 @@ mkDerivation rec { pname = "kde2-decoration"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { owner = "repos-holder"; repo = "kdecoration2-kde2"; rev = version; - sha256 = "1766z9wscybcqvr828xih93b3rab3hb0ghsf818iflhp1xy0js08"; + sha256 = "y2q1j36EURJc7k1huqhEH1Z82PnVSKlfx20bpQWY28c="; }; + outputs = [ "out" "dev" ]; enableParallelBuilding = true; nativeBuildInputs = [ cmake extra-cmake-modules ]; diff --git a/infra/libkookie/nixpkgs/pkgs/data/themes/lounge/default.nix b/infra/libkookie/nixpkgs/pkgs/data/themes/lounge/default.nix index cda1a4e7d0b1..a62ff72db6f6 100644 --- a/infra/libkookie/nixpkgs/pkgs/data/themes/lounge/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/data/themes/lounge/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lounge-gtk-theme"; - version = "1.22"; + version = "1.24"; src = fetchFromGitHub { owner = "monday15"; repo = pname; rev = version; - sha256 = "1y1wkfsv2zrxqcqr53lmr9743mvzcy4swi5j6sxmk1aykx6ccs1p"; + sha256 = "0ima0aa5j296xn4y0d1zj6vcdrdpnihqdidj7bncxzgbnli1vazs"; }; nativeBuildInputs = [ meson ninja sassc gtk3 ]; diff --git a/infra/libkookie/nixpkgs/pkgs/data/themes/marwaita-peppermint/default.nix b/infra/libkookie/nixpkgs/pkgs/data/themes/marwaita-peppermint/default.nix index 3b92b143c7fd..c7c4efa777bb 100644 --- a/infra/libkookie/nixpkgs/pkgs/data/themes/marwaita-peppermint/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/data/themes/marwaita-peppermint/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "marwaita-peppermint"; - version = "0.4"; + version = "0.5"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "16jrkdkkg8vrzzdv23zbpwk4gi740gn6gj92m0yqv7d6whrbkcvp"; + sha256 = "04j210nw9w4m8n49cd8y3l0qp60rn00i8wdr6kvc7lhkvqwhpnlg"; }; buildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/data/themes/matcha/default.nix b/infra/libkookie/nixpkgs/pkgs/data/themes/matcha/default.nix index bc0776695501..df548052b83e 100644 --- a/infra/libkookie/nixpkgs/pkgs/data/themes/matcha/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/data/themes/matcha/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "matcha-gtk-theme"; - version = "2020-10-05"; + version = "2020-11-23"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "0pkgpipffwxphn16p6r911mbhqhjyk60svirxzm2phlhxl0ddwpj"; + sha256 = "115nmzwpsaq8aa0p7ghfcw79n7h9ifvh0drv3dd4lj2dk33vkpv1"; }; buildInputs = [ gdk-pixbuf librsvg ]; diff --git a/infra/libkookie/nixpkgs/pkgs/data/themes/mojave/default.nix b/infra/libkookie/nixpkgs/pkgs/data/themes/mojave/default.nix index 751dd690d114..3d14f782c694 100644 --- a/infra/libkookie/nixpkgs/pkgs/data/themes/mojave/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/data/themes/mojave/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "mojave-gtk-theme"; - version = "2020-03-19"; + version = "2020-11-29"; srcs = [ (fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "1f120sx092i56q4dx2b8d3nnn9pdw67656446nw702rix7zc5jpx"; + sha256 = "07lcg28y0scpii29j85343kmcga4wyaayjpx9a118z838mnvb757"; }) (fetchurl { url = "https://github.com/vinceliuice/Mojave-gtk-theme/raw/11741a99d96953daf9c27e44c94ae50a7247c0ed/macOS_Mojave_Wallpapers.tar.xz"; diff --git a/infra/libkookie/nixpkgs/pkgs/data/themes/numix-solarized/default.nix b/infra/libkookie/nixpkgs/pkgs/data/themes/numix-solarized/default.nix index ae8a1d7145e7..356f7d33b260 100644 --- a/infra/libkookie/nixpkgs/pkgs/data/themes/numix-solarized/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/data/themes/numix-solarized/default.nix @@ -1,33 +1,29 @@ -{ stdenv, fetchFromGitHub, python3, sass, glib, gdk-pixbuf, libxml2, - inkscape, optipng, gtk-engine-murrine -}: +{ stdenv, fetchFromGitHub, python3, sassc, glib, gdk-pixbuf, inkscape, gtk-engine-murrine }: stdenv.mkDerivation rec { - version = "20180913"; + version = "20200910"; pname = "numix-solarized-gtk-theme"; src = fetchFromGitHub { owner = "Ferdi265"; repo = "numix-solarized-gtk-theme"; rev = version; - sha256 = "1kda0lyqi3cxh163fbj8yyi6jj6pf0y980k4s0cmyi3hkh4cqyd5"; + sha256 = "05h1563sy6sfz76jadxsf730mav6bbjsk9xnadv49r16b8n8p9a9"; }; - nativeBuildInputs = [ python3 sass glib gdk-pixbuf libxml2 inkscape optipng ]; + nativeBuildInputs = [ python3 sassc glib gdk-pixbuf inkscape ]; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; postPatch = '' patchShebangs . substituteInPlace Makefile --replace '$(DESTDIR)'/usr $out - substituteInPlace scripts/render-assets.sh \ - --replace /usr/bin/inkscape ${inkscape}/bin/inkscape \ - --replace /usr/bin/optipng ${optipng}/bin/optipng ''; buildPhase = "true"; installPhase = '' + HOME="$NIX_BUILD_ROOT" # shut up inkscape's warnings for theme in *.colors; do make THEME="''${theme/.colors/}" install done diff --git a/infra/libkookie/nixpkgs/pkgs/data/themes/obsidian2/default.nix b/infra/libkookie/nixpkgs/pkgs/data/themes/obsidian2/default.nix index cb2660ed058c..79c8e221894b 100644 --- a/infra/libkookie/nixpkgs/pkgs/data/themes/obsidian2/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/data/themes/obsidian2/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "theme-obsidian2"; - version = "2.15"; + version = "2.17"; src = fetchurl { url = "https://github.com/madmaxms/theme-obsidian-2/releases/download/v${version}/obsidian-2-theme.tar.xz"; - sha256 = "1d6h8jsg8r1jbv2izshhpvlwsrwpi2f2dm461kr1zpwcw5glf9jx"; + sha256 = "1gff34xqypqjhh15lv4cc4ifsg07jx2znlsj9is4wmqf39a8h8n4"; }; sourceRoot = "."; diff --git a/infra/libkookie/nixpkgs/pkgs/data/themes/orion/default.nix b/infra/libkookie/nixpkgs/pkgs/data/themes/orion/default.nix index b44cc857c629..740b34889227 100644 --- a/infra/libkookie/nixpkgs/pkgs/data/themes/orion/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/data/themes/orion/default.nix @@ -1,11 +1,13 @@ -{ stdenv, fetchgit, gtk-engine-murrine }: +{ stdenv, fetchFromGitHub, gtk-engine-murrine }: -stdenv.mkDerivation { - name = "orion-1.5"; +stdenv.mkDerivation rec { + pname = "orion"; + version = "1.5"; - src = fetchgit { - url = "https://github.com/shimmerproject/Orion.git"; - rev = "refs/tags/v1.5"; + src = fetchFromGitHub { + owner = "shimmerproject"; + repo = "Orion"; + rev = "refs/tags/v${version}"; sha256 = "1116yawv3fspkiq1ykk2wj0gza3l04b5nhldy0bayzjaj0y6fd89"; }; diff --git a/infra/libkookie/nixpkgs/pkgs/data/themes/qogir/default.nix b/infra/libkookie/nixpkgs/pkgs/data/themes/qogir/default.nix index 23afcf5ece22..44bb220d404d 100644 --- a/infra/libkookie/nixpkgs/pkgs/data/themes/qogir/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/data/themes/qogir/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qogir-theme"; - version = "2020-02-26"; + version = "2020-11-16"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "1s14knj0ral5a62ymwbg5k5g94v8cq0acq0kyam8ay0rfi7wycdm"; + sha256 = "0qp65py1p93f5bxbf0jgc1d2lwrjhb7d0vzkivm73haji197l9p5"; }; buildInputs = [ gdk-pixbuf librsvg ]; diff --git a/infra/libkookie/nixpkgs/pkgs/data/themes/qtcurve/default.nix b/infra/libkookie/nixpkgs/pkgs/data/themes/qtcurve/default.nix index 719b1ce1a487..cd5cb4170b8c 100644 --- a/infra/libkookie/nixpkgs/pkgs/data/themes/qtcurve/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/data/themes/qtcurve/default.nix @@ -1,43 +1,47 @@ -{ stdenv, fetchFromGitHub, cmake, extra-cmake-modules, pkgconfig, mkDerivation -, gtk2, qtbase, qtsvg, qtx11extras # Toolkit dependencies +{ lib, fetchFromGitHub, cmake, extra-cmake-modules, pkgconfig, mkDerivation +, gtk2Support ? true, gtk2 +, qtbase, qtsvg, qtx11extras # Toolkit dependencies , karchive, kconfig, kconfigwidgets, kio, frameworkintegration , kguiaddons, ki18n, kwindowsystem, kdelibs4support, kiconthemes , libpthreadstubs, pcre, libXdmcp, libX11, libXau # X11 dependencies , fetchpatch }: -let - version = "1.9.1"; -in mkDerivation { +mkDerivation rec { pname = "qtcurve"; - inherit version; + version = "1.9.1"; src = fetchFromGitHub { owner = "KDE"; repo = "qtcurve"; rev = version; - sha256 = "0sm1fza68mwl9cvid4h2lsyxq5svia86l5v9wqk268lmx16mbzsw"; + sha256 = "XP9VTeiVIiMm5mkXapCKWxfcvaYCkhY3S5RXZNR3oWo="; }; + enableParallelBuilding = true; + patches = [ + # Remove unnecessary constexpr, this is not allowed in C++14 (fetchpatch { url = "https://github.com/KDE/qtcurve/commit/ee2228ea2f18ac5da9b434ee6089381df815aa94.patch"; sha256 = "1vz5frsrsps93awn84gk8d7injrqfcyhc1rji6s0gsgsp5z9sl34"; }) + # Fix build with Qt5.15 + (fetchpatch { + url = "https://github.com/KDE/qtcurve/commit/44e2a35ebb164dcab0bad1a9158b1219a3ff6504.patch"; + sha256 = "5I2fTxKRJX0cJcyUvYHWZx369FKk6ti9Se7AfYmB9ek="; + }) ]; - enableParallelBuilding = true; - nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig ]; buildInputs = [ - gtk2 qtbase qtsvg qtx11extras karchive kconfig kconfigwidgets kio kiconthemes kguiaddons ki18n kwindowsystem kdelibs4support frameworkintegration libpthreadstubs pcre libXdmcp libX11 libXau - ]; + ] ++ lib.optional gtk2Support gtk2; preConfigure = '' for i in qt5/CMakeLists.txt qt5/config/CMakeLists.txt @@ -52,7 +56,12 @@ in mkDerivation { patchShebangs tools/gen-version.sh ''; - meta = with stdenv.lib; { + configureFlags = [ + "-DENABLE_GTK2=${if gtk2Support then "ON" else "OFF"}" + "-DENABLE_QT4=OFF" + ]; + + meta = with lib; { homepage = "https://github.com/QtCurve/qtcurve"; description = "Widget styles for Qt5/Plasma 5 and gtk2"; platforms = platforms.linux; diff --git a/infra/libkookie/nixpkgs/pkgs/data/themes/stilo/default.nix b/infra/libkookie/nixpkgs/pkgs/data/themes/stilo/default.nix index ecef868f2875..066d122d4414 100644 --- a/infra/libkookie/nixpkgs/pkgs/data/themes/stilo/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/data/themes/stilo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "stilo-themes"; - version = "3.36-2"; + version = "3.36-3"; src = fetchFromGitHub { owner = "lassekongo83"; repo = pname; rev = "v${version}"; - sha256 = "0w4il6rk1f8yjmdxpnzq6zll2jjqbyp9dckxhzxgs4zh8fy9pzvh"; + sha256 = "0haxzqxyfx3rc305w7f744fp2xb6j7yn28ldynnvmm47h7ga3as3"; }; nativeBuildInputs = [ meson ninja sassc ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Minimalistic GTK, gnome shell and Xfce themes"; homepage = "https://github.com/lassekongo83/stilo-themes"; - license = licenses.gpl3; + license = licenses.gpl3Only; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; }; diff --git a/infra/libkookie/nixpkgs/pkgs/data/themes/vimix/default.nix b/infra/libkookie/nixpkgs/pkgs/data/themes/vimix/default.nix index 1b3d2005f08a..43636b584d3c 100644 --- a/infra/libkookie/nixpkgs/pkgs/data/themes/vimix/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/data/themes/vimix/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "vimix-gtk-themes"; - version = "2020-02-24"; + version = "2020-11-28"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "18v7yhwzachjgy276rdhj5cg353f0qysa2kxk9gyc6s71q2gjzcv"; + sha256 = "1m84p4cs9dfwc27zfjnwgkfdnfmlzbimq3g5z4mhz23cijm178rf"; }; buildInputs = [ gtk_engines ]; |