From c9373da859ffc673079ec02eded595addf10480c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Thu, 27 May 2021 09:05:33 -0300
Subject: [PATCH 1/2] nordic: add the Nordic-Polar themes

Nordic-Polar is the light version of the Nordic themes. Although the
author keeps it in a separate git repository, they are organized in
the very same way. They are also distributed together in
https://www.pling.com/p/1267246/, the primary site used by the author
for distribution.

Adding Nordic-Polar to the nordic package makes maintainance easier.
---
 pkgs/data/themes/nordic/default.nix | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/pkgs/data/themes/nordic/default.nix b/pkgs/data/themes/nordic/default.nix
index dcda14977a7..c12f9e2ba78 100644
--- a/pkgs/data/themes/nordic/default.nix
+++ b/pkgs/data/themes/nordic/default.nix
@@ -52,6 +52,22 @@ stdenv.mkDerivation rec {
       sha256 = "09s9y7waygrx3p6c0c4py0ywg2ihpdmx73xhw5f92rr5nhsvish7";
       name = "Nordic-bluish-accent-standard-buttons";
     })
+
+    (fetchFromGitHub {
+      owner = "EliverLara";
+      repo = "${pname}-polar";
+      rev = "69652db56e1721ac183cd57d21a801a09655a811";
+      sha256 = "0zjd4np11mjwmc1kh2n1ig77g4wq88s2yrmnga0gvw1lf44n3qn2";
+      name = "Nordic-Polar";
+    })
+
+    (fetchFromGitHub {
+      owner = "EliverLara";
+      repo = "${pname}-polar";
+      rev = "3a67c1a2308ba3e9ec5d82f4a3416f85b6085b08";
+      sha256 = "0gpg2izh4ay78j79vjp4svmi3qy9qaw0n6ai8zwm7p25dwm56fjy";
+      name = "Nordic-Polar-standard-buttons";
+    })
   ];
 
   sourceRoot = ".";
@@ -78,7 +94,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "Dark Gtk theme using the Nord color pallete";
+    description = "Gtk themes using the Nord color pallete";
     homepage = "https://github.com/EliverLara/Nordic";
     license = licenses.gpl3Only;
     platforms = platforms.all;

From cd4de6f15fad8ee04a4fdeaf3310696cae64fca0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Thu, 27 May 2021 09:20:48 -0300
Subject: [PATCH 2/2] nordic-polar: remove

The Nordic-Polar themes are now part of the nordic package.
---
 pkgs/data/themes/nordic-polar/default.nix | 35 -----------------------
 pkgs/top-level/aliases.nix                |  1 +
 pkgs/top-level/all-packages.nix           |  2 --
 3 files changed, 1 insertion(+), 37 deletions(-)
 delete mode 100644 pkgs/data/themes/nordic-polar/default.nix

diff --git a/pkgs/data/themes/nordic-polar/default.nix b/pkgs/data/themes/nordic-polar/default.nix
deleted file mode 100644
index 8af17dd98af..00000000000
--- a/pkgs/data/themes/nordic-polar/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ lib, stdenv, fetchurl, gtk-engine-murrine }:
-
-stdenv.mkDerivation rec {
-  pname = "nordic-polar";
-  version = "1.9.0";
-
-  srcs = [
-    (fetchurl {
-      url = "https://github.com/EliverLara/Nordic-Polar/releases/download/v${version}/Nordic-Polar.tar.xz";
-      sha256 = "1583mx8frkl5w26myczbyrggrp07lmpsfj00h1bzicw6lz8jbxf1";
-    })
-    (fetchurl {
-      url = "https://github.com/EliverLara/Nordic-Polar/releases/download/v${version}/Nordic-Polar-standard-buttons.tar.xz";
-      sha256 = "1n2qys0xcg1k28bwfrrr44cqz7q2rnfj6ry6qgd67ivgh63kmcq6";
-    })
-  ];
-
-  sourceRoot = ".";
-
-  propagatedUserEnvPkgs = [ gtk-engine-murrine ];
-
-  installPhase = ''
-    mkdir -p $out/share/themes
-    cp -a Nordic-Polar* $out/share/themes
-    rm $out/share/themes/*/{LICENSE,README.md}
-  '';
-
-  meta = with lib; {
-    description = "Gtk theme created using the awesome Nord color pallete";
-    homepage = "https://github.com/EliverLara/Nordic-Polar";
-    license = licenses.gpl3;
-    platforms = platforms.all;
-    maintainers = [ maintainers.romildo ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 8c5a5b01c3f..ba631bb45ec 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -498,6 +498,7 @@ mapAliases ({
   nixFlakes = nixUnstable; # added 2021-05-21
   nmap_graphical = nmap-graphical;  # added 2017-01-19
   nologin = shadow; # added 2018-04-25
+  nordic-polar = throw "nordic-polar was removed on 2021-05-27, now integrated in nordic"; # added 2021-05-27
   nxproxy = nx-libs; # added 2019-02-15
   nylas-mail-bin = throw "nylas-mail-bin was deprecated on 2019-09-11: abandoned by upstream";
   oauth2_proxy = oauth2-proxy; # added 2021-04-18
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e11b6b25933..4ed8f5e6bfa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21994,8 +21994,6 @@ in
 
   nordic = callPackage ../data/themes/nordic { };
 
-  nordic-polar = callPackage ../data/themes/nordic-polar { };
-
   inherit (callPackages ../data/fonts/noto-fonts {})
     noto-fonts noto-fonts-cjk noto-fonts-emoji noto-fonts-emoji-blob-bin noto-fonts-extra;