about summary refs log tree commit diff
diff options
context:
space:
mode:
authorworldofpeace <worldofpeace@users.noreply.github.com>2019-01-20 11:04:03 +0000
committerGitHub <noreply@github.com>2019-01-20 11:04:03 +0000
commite611684e2ce87f72c1c0f9df7d0f2682c8b4fe3d (patch)
treef12b92813b7b38a6550d3605b641b92f105ec7c9
parent5e6ae9b6a51a1ab4a182b23f5bc883e4ae7f6692 (diff)
parentc58807f764e44c470b5ca11707f299593c364350 (diff)
downloadnixlib-e611684e2ce87f72c1c0f9df7d0f2682c8b4fe3d.tar
nixlib-e611684e2ce87f72c1c0f9df7d0f2682c8b4fe3d.tar.gz
nixlib-e611684e2ce87f72c1c0f9df7d0f2682c8b4fe3d.tar.bz2
nixlib-e611684e2ce87f72c1c0f9df7d0f2682c8b4fe3d.tar.lz
nixlib-e611684e2ce87f72c1c0f9df7d0f2682c8b4fe3d.tar.xz
nixlib-e611684e2ce87f72c1c0f9df7d0f2682c8b4fe3d.tar.zst
nixlib-e611684e2ce87f72c1c0f9df7d0f2682c8b4fe3d.zip
Merge pull request #54336 from romildo/upd.nordic
nordic: 1.3.0 -> 1.5.4
-rw-r--r--pkgs/data/themes/nordic/default.nix (renamed from pkgs/misc/themes/nordic/default.nix)14
-rw-r--r--pkgs/top-level/all-packages.nix4
2 files changed, 13 insertions, 5 deletions
diff --git a/pkgs/misc/themes/nordic/default.nix b/pkgs/data/themes/nordic/default.nix
index ac24e35c66f7..93df3c723dd5 100644
--- a/pkgs/misc/themes/nordic/default.nix
+++ b/pkgs/data/themes/nordic/default.nix
@@ -2,16 +2,24 @@
 
 stdenv.mkDerivation rec {
   name = "nordic-${version}";
-  version = "1.3.0";
+  version = "1.5.4";
 
   srcs = [
     (fetchurl {
       url = "https://github.com/EliverLara/Nordic/releases/download/v${version}/Nordic.tar.xz";
-      sha256 = "04axs2yldppcx159nwj70g4cyw0hbbzk5250677i9ny8b0w3gr9x";
+      sha256 = "0m00hwr6ms9fzlpl97d972wvgq5l0m11mpn213248a8sqbh2zz9g";
+    })
+    (fetchurl {
+      url = "https://github.com/EliverLara/Nordic/releases/download/v${version}/Nordic-blue.tar.xz";
+      sha256 = "05k1m9f0q4mfaqp2as3ymjsqmyz0bs5cd576srd5v952dzxmmbm2";
     })
     (fetchurl {
       url = "https://github.com/EliverLara/Nordic/releases/download/v${version}/Nordic-standard-buttons.tar.xz";
-      sha256 = "1h0690cijaipidb5if2bxhvvkrx5src3akyxvfywxg4bf8x7jxs5";
+      sha256 = "1qps13fpp8y83c25c51w7kyds266gmks8c7kjp23iybij2lkny1m";
+    })
+    (fetchurl {
+      url = "https://github.com/EliverLara/Nordic/releases/download/v${version}/Nordic-blue-standard-buttons.tar.xz";
+      sha256 = "1c0j6qsxa6zahrl9ad0q6pczgbmm8qn9qsd7k41yk2ndh9iqzr5y";
     })
   ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a01f8e675f88..e7edea7740d7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15715,6 +15715,8 @@ in
 
   nafees = callPackage ../data/fonts/nafees { };
 
+  nordic = callPackage ../data/themes/nordic { };
+
   nordic-polar = callPackage ../data/themes/nordic-polar { };
 
   inherit (callPackages ../data/fonts/noto-fonts {})
@@ -21333,8 +21335,6 @@ in
 
   gnome-themes-extra = gnome3.gnome-themes-extra;
 
-  nordic = callPackage ../misc/themes/nordic { };
-
   numix-gtk-theme = callPackage ../misc/themes/numix { };
 
   numix-solarized-gtk-theme = callPackage ../misc/themes/numix-solarized { };