about summary refs log tree commit diff
path: root/pkgs/data
diff options
context:
space:
mode:
authorFrederik Rietdijk <freddyrietdijk@fridh.nl>2019-01-17 09:21:29 +0100
committerFrederik Rietdijk <freddyrietdijk@fridh.nl>2019-01-17 09:21:29 +0100
commit9cfae76fc5f0a3a51e91d617887d8fe34317885d (patch)
treeb6b8e12845e55665d67ca4197fa7078d43ee3a4e /pkgs/data
parentcabe7d650613f1617988eb7750b8eca336181b81 (diff)
parent379c3899a59df74a2359b34f80604416a25bae05 (diff)
downloadnixlib-9cfae76fc5f0a3a51e91d617887d8fe34317885d.tar
nixlib-9cfae76fc5f0a3a51e91d617887d8fe34317885d.tar.gz
nixlib-9cfae76fc5f0a3a51e91d617887d8fe34317885d.tar.bz2
nixlib-9cfae76fc5f0a3a51e91d617887d8fe34317885d.tar.lz
nixlib-9cfae76fc5f0a3a51e91d617887d8fe34317885d.tar.xz
nixlib-9cfae76fc5f0a3a51e91d617887d8fe34317885d.tar.zst
nixlib-9cfae76fc5f0a3a51e91d617887d8fe34317885d.zip
Merge staging-next into staging
Diffstat (limited to 'pkgs/data')
-rw-r--r--pkgs/data/fonts/source-sans-pro/default.nix8
-rw-r--r--pkgs/data/icons/papirus-icon-theme/default.nix4
-rw-r--r--pkgs/data/themes/shades-of-gray/default.nix4
3 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/data/fonts/source-sans-pro/default.nix b/pkgs/data/fonts/source-sans-pro/default.nix
index 1561605b6ad0..c2dfac96a307 100644
--- a/pkgs/data/fonts/source-sans-pro/default.nix
+++ b/pkgs/data/fonts/source-sans-pro/default.nix
@@ -1,18 +1,18 @@
 { stdenv, fetchzip }:
 
 fetchzip {
-  name = "source-sans-pro-2.040";
+  name = "source-sans-pro-2.045";
 
-  url = "https://github.com/adobe-fonts/source-sans-pro/releases/download/2.040R-ro%2F1.090R-it/source-sans-pro-2.040R-ro-1.090R-it.zip";
+  url = https://github.com/adobe-fonts/source-sans-pro/releases/download/2.045R-ro%2F1.095R-it/source-sans-pro-2.045R-ro-1.095R-it.zip;
 
   postFetch = ''
-    mkdir -p $out/share/fonts/opentype $out/share/fonts/truetype $out/share/fonts/variable
+    mkdir -p $out/share/fonts/{opentype,truetype,variable}
     unzip -j $downloadedFile "*/OTF/*.otf" -d $out/share/fonts/opentype
     unzip -j $downloadedFile "*/TTF/*.ttf" -d $out/share/fonts/truetype
     unzip -j $downloadedFile "*/VAR/*.otf" -d $out/share/fonts/variable
   '';
 
-  sha256 = "1n7z9xpxls74xxjsa61df1ln86y063m07w1f4sbxpjaa0frim4pp";
+  sha256 = "0xjdp226ybdcfylbpfsdgnz2bf4pj4qv1wfs6fv22hjxlzqfixf3";
 
   meta = with stdenv.lib; {
     homepage = https://sourceforge.net/adobe/sourcesans;
diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix
index 83ff9834c293..89ec5ec54de1 100644
--- a/pkgs/data/icons/papirus-icon-theme/default.nix
+++ b/pkgs/data/icons/papirus-icon-theme/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "papirus-icon-theme-${version}";
-  version = "20181120";
+  version = "20190106";
 
   src = fetchFromGitHub {
     owner = "PapirusDevelopmentTeam";
     repo = "papirus-icon-theme";
     rev = version;
-    sha256 = "1v0vb7l948gxyz37vzh01jqmb8d3w3hxw85vly08ra1ldixaczc5";
+    sha256 = "0i5dmpqq65nipps800iijxd6krnvrdbnd6zrf7f145dg7r6hfk8p";
   };
 
   nativeBuildInputs = [ gtk3 ];
diff --git a/pkgs/data/themes/shades-of-gray/default.nix b/pkgs/data/themes/shades-of-gray/default.nix
index 64cc2be59987..391c99c0ab92 100644
--- a/pkgs/data/themes/shades-of-gray/default.nix
+++ b/pkgs/data/themes/shades-of-gray/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "shades-of-gray-theme-${version}";
-  version = "1.1.3";
+  version = "1.1.4";
 
   src = fetchFromGitHub {
     owner = "WernerFP";
     repo = "Shades-of-gray-theme";
     rev = version;
-    sha256 = "14p1s1pmzqnn9j9vwqfxfd4i045p356a6d9rwzzs0gx3c6ibqx3a";
+    sha256 = "1i5mra1ib3c8xqnhwjh8yzjcdnhvqdmccw5x52sfh9xq797px39l";
   };
 
   buildInputs = [ gtk_engines ];