summary refs log tree commit diff
path: root/pkgs/data
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2017-07-23 11:23:43 +0200
committerFrederik Rietdijk <fridh@fridh.nl>2017-07-23 11:23:43 +0200
commit29f91c107f5f605dac63552909cbe3c8f0c2e303 (patch)
treedae9c9d722e9bfd3ddf13b3b3b997a6cfcc178c8 /pkgs/data
parent9af77826a97feb9798f700d64cd467864945875c (diff)
parent239b694579ca8a9a64e86609d4e9f49d0b01be2b (diff)
downloadnixlib-29f91c107f5f605dac63552909cbe3c8f0c2e303.tar
nixlib-29f91c107f5f605dac63552909cbe3c8f0c2e303.tar.gz
nixlib-29f91c107f5f605dac63552909cbe3c8f0c2e303.tar.bz2
nixlib-29f91c107f5f605dac63552909cbe3c8f0c2e303.tar.lz
nixlib-29f91c107f5f605dac63552909cbe3c8f0c2e303.tar.xz
nixlib-29f91c107f5f605dac63552909cbe3c8f0c2e303.tar.zst
nixlib-29f91c107f5f605dac63552909cbe3c8f0c2e303.zip
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'pkgs/data')
-rw-r--r--pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix4
-rw-r--r--pkgs/data/icons/papirus-icon-theme/default.nix4
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix b/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix
index eea190d0a88c..4082d5949a3f 100644
--- a/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix
+++ b/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "emacs-all-the-icons-fonts-${version}";
-  version = "2.6.4";
+  version = "3.1.1";
 
   src = fetchFromGitHub {
     owner = "domtronn";
     repo = "all-the-icons.el";
     rev = version;
-    sha256 = "0xwj8wyj0ywpy4rcqxz15hkr8jnffn7nrp5fnq56j360v8858q8x";
+    sha256 = "0h8a2jvn2wfi3bqd35scmhm8wh20mlk09sy68m1whi9binzkm8rf";
   };
 
   installPhase = ''
diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix
index 70bf0186f1cc..082fa29fa9db 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 = "20170616";
+  version = "20170715";
 
   src = fetchFromGitHub {
     owner = "PapirusDevelopmentTeam";
     repo = "papirus-icon-theme";
     rev = "${version}";
-    sha256 = "008nkmxp3f9qqljif3v9ns3a8mflzffv2mm5zgjng9pmdl5x70j4";
+    sha256 = "0mpmgpjwc7azhypvrlnxaa0c4jc6g7vgy242apxrn8jcv9ndmwyk";
   };
 
   dontBuild = true;