about summary refs log tree commit diff
path: root/pkgs/data
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/data')
-rw-r--r--pkgs/data/icons/elementary-icon-theme/default.nix38
-rw-r--r--pkgs/data/icons/faba-icon-theme/default.nix4
-rw-r--r--pkgs/data/misc/dns-root-data/default.nix2
-rw-r--r--pkgs/data/misc/dns-root-data/root.ds1
-rw-r--r--pkgs/data/misc/dns-root-data/root.key1
-rw-r--r--pkgs/data/misc/geolite-legacy/builder.sh2
6 files changed, 3 insertions, 45 deletions
diff --git a/pkgs/data/icons/elementary-icon-theme/default.nix b/pkgs/data/icons/elementary-icon-theme/default.nix
deleted file mode 100644
index 68ece44116e1..000000000000
--- a/pkgs/data/icons/elementary-icon-theme/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ stdenv, fetchFromGitHub, meson, ninja, python3, gtk3 }:
-
-stdenv.mkDerivation rec {
-  name = "elementary-icon-theme-${version}";
-  version = "5.0.2";
-
-  src = fetchFromGitHub {
-    owner = "elementary";
-    repo = "icons";
-    rev = version;
-    sha256 = "12j582f0kggv2lp935r75xg7q26zpl0f05s11xcs4qxazhj1ly2r";
-  };
-
-  nativeBuildInputs = [ meson ninja python3 gtk3 ];
-
-  # Disable installing gimp and inkscape palette files
-  mesonFlags = [
-    "-Dpalettes=false"
-  ];
-
-  postPatch = ''
-    chmod +x meson/symlink.py
-    patchShebangs .
-    sed -i volumeicon/meson.build -e "s,'/','$out',"
-  '';
-
-  postFixup = ''
-    gtk-update-icon-cache $out/share/icons/elementary
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Icons from the Elementary Project";
-    homepage = https://github.com/elementary/icons;
-    license = licenses.gpl3;
-    platforms = platforms.all;
-    maintainers = with maintainers; [ simonvandel ];
-  };
-}
diff --git a/pkgs/data/icons/faba-icon-theme/default.nix b/pkgs/data/icons/faba-icon-theme/default.nix
index 07d2b5ecf02c..c15e0f4e5510 100644
--- a/pkgs/data/icons/faba-icon-theme/default.nix
+++ b/pkgs/data/icons/faba-icon-theme/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, meson, ninja, python3, gtk3, elementary-icon-theme }:
+{ stdenv, fetchFromGitHub, meson, ninja, python3, gtk3, pantheon }:
 
 stdenv.mkDerivation rec {
   name = "${package-name}-${version}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "0xh6ppr73p76z60ym49b4d0liwdc96w41cc5p07d48hxjsa6qd6n";
   };
 
-  nativeBuildInputs = [ meson ninja python3 gtk3 elementary-icon-theme ];
+  nativeBuildInputs = [ meson ninja python3 gtk3 pantheon.elementary-icon-theme ];
 
   postPatch = ''
     patchShebangs meson/post_install.py
diff --git a/pkgs/data/misc/dns-root-data/default.nix b/pkgs/data/misc/dns-root-data/default.nix
index e94b8eb898c1..ee08c07f5a66 100644
--- a/pkgs/data/misc/dns-root-data/default.nix
+++ b/pkgs/data/misc/dns-root-data/default.nix
@@ -19,7 +19,7 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "dns-root-data-2017-10-24";
+  name = "dns-root-data-2019-01-11";
 
   buildCommand = ''
     mkdir $out
diff --git a/pkgs/data/misc/dns-root-data/root.ds b/pkgs/data/misc/dns-root-data/root.ds
index 7578e0405d9d..e292b5a7bf0c 100644
--- a/pkgs/data/misc/dns-root-data/root.ds
+++ b/pkgs/data/misc/dns-root-data/root.ds
@@ -1,2 +1 @@
-. IN DS 19036 8 2 49AAC11D7B6F6446702E54A1607371607A1A41855200FD2CE1CDDE32F24E8FB5
 . IN DS 20326 8 2 E06D44B80B8F1D39A95C0B0D7C65D08458E880409BBC683457104237C7F8EC8D
diff --git a/pkgs/data/misc/dns-root-data/root.key b/pkgs/data/misc/dns-root-data/root.key
index c0da7b3f60fa..edfc762ad602 100644
--- a/pkgs/data/misc/dns-root-data/root.key
+++ b/pkgs/data/misc/dns-root-data/root.key
@@ -1,2 +1 @@
-.	172800	IN	DNSKEY	257 3 8 AwEAAagAIKlVZrpC6Ia7gEzahOR+9W29euxhJhVVLOyQbSEW0O8gcCjFFVQUTf6v58fLjwBd0YI0EzrAcQqBGCzh/RStIoO8g0NfnfL2MTJRkxoXbfDaUeVPQuYEhg37NZWAJQ9VnMVDxP/VHL496M/QZxkjf5/Efucp2gaDX6RS6CXpoY68LsvPVjR0ZSwzz1apAzvN9dlzEheX7ICJBBtuA6G3LQpzW5hOA2hzCTMjJPJ8LbqF6dsV6DoBQzgul0sGIcGOYl7OyQdXfZ57relSQageu+ipAdTTJ25AsRTAoub8ONGcLmqrAmRLKBP1dfwhYB4N7knNnulqQxA+Uk1ihz0= ;{id = 19036 (ksk), size = 2048b}
 .	172800	IN	DNSKEY	257 3 8 AwEAAaz/tAm8yTn4Mfeh5eyI96WSVexTBAvkMgJzkKTOiW1vkIbzxeF3+/4RgWOq7HrxRixHlFlExOLAJr5emLvN7SWXgnLh4+B5xQlNVz8Og8kvArMtNROxVQuCaSnIDdD5LKyWbRd2n9WGe2R8PzgCmr3EgVLrjyBxWezF0jLHwVN8efS3rCj/EWgvIWgb9tarpVUDK/b58Da+sqqls3eNbuv7pr+eoZG+SrDK6nWeL3c6H5Apxz7LjVc1uTIdsIXxuOLYA4/ilBmSVIzuDWfdRUfhHdY6+cn8HFRm+2hM8AnXGXws9555KrUB5qihylGa8subX2Nn6UwNR1AkUTV74bU= ;{id = 20326 (ksk), size = 2048b}
diff --git a/pkgs/data/misc/geolite-legacy/builder.sh b/pkgs/data/misc/geolite-legacy/builder.sh
index c3e09e8543c5..683b2e8606b8 100644
--- a/pkgs/data/misc/geolite-legacy/builder.sh
+++ b/pkgs/data/misc/geolite-legacy/builder.sh
@@ -1,5 +1,3 @@
-#!/bin/sh -e
-
 source "$stdenv/setup"
 
 mkdir -p $out/share/GeoIP