diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-09-18 16:55:42 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-09-18 16:55:42 -0400 |
commit | 7319013ea14f94cb360c7bef9e403de7f1db83b0 (patch) | |
tree | cb6d4763cee2cc982648762c019b3b77b9ba18b2 /pkgs/data | |
parent | ce6e72a11cc2f52d6e92224791fe5db7f9e2ecdd (diff) | |
parent | 35378f014161c1d794dc89b6969275396cb601de (diff) | |
download | nixlib-7319013ea14f94cb360c7bef9e403de7f1db83b0.tar nixlib-7319013ea14f94cb360c7bef9e403de7f1db83b0.tar.gz nixlib-7319013ea14f94cb360c7bef9e403de7f1db83b0.tar.bz2 nixlib-7319013ea14f94cb360c7bef9e403de7f1db83b0.tar.lz nixlib-7319013ea14f94cb360c7bef9e403de7f1db83b0.tar.xz nixlib-7319013ea14f94cb360c7bef9e403de7f1db83b0.tar.zst nixlib-7319013ea14f94cb360c7bef9e403de7f1db83b0.zip |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/data')
-rw-r--r-- | pkgs/data/fonts/et-book/default.nix | 22 | ||||
-rw-r--r-- | pkgs/data/fonts/ibm-plex/default.nix | 4 | ||||
-rw-r--r-- | pkgs/data/fonts/libertinus/default.nix | 6 | ||||
-rw-r--r-- | pkgs/data/fonts/medio/default.nix | 2 | ||||
-rw-r--r-- | pkgs/data/fonts/penna/default.nix | 2 | ||||
-rw-r--r-- | pkgs/data/fonts/route159/default.nix | 2 | ||||
-rw-r--r-- | pkgs/data/fonts/seshat/default.nix | 2 | ||||
-rw-r--r-- | pkgs/data/icons/elementary-xfce-icon-theme/default.nix | 24 | ||||
-rw-r--r-- | pkgs/data/icons/papirus-icon-theme/default.nix | 4 | ||||
-rw-r--r-- | pkgs/data/misc/hackage/default.nix | 4 | ||||
-rw-r--r-- | pkgs/data/misc/osinfo-db/default.nix | 4 |
11 files changed, 48 insertions, 28 deletions
diff --git a/pkgs/data/fonts/et-book/default.nix b/pkgs/data/fonts/et-book/default.nix new file mode 100644 index 000000000000..58586ba7db65 --- /dev/null +++ b/pkgs/data/fonts/et-book/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchFromGitHub }: + +fetchFromGitHub rec { + rev = "7e8f02dadcc23ba42b491b39e5bdf16e7b383031"; + name = "et-book-${builtins.substring 0 6 rev}"; + owner = "edwardtufte"; + repo = "et-book"; + sha256 = "1bfb1l8k7fzgk2l8cikiyfn5x9m0fiwrnsbc1483p8w3qp58s5n2"; + + postFetch = '' + tar -xzf $downloadedFile + mkdir -p $out/share/fonts/truetype + cp -t $out/share/fonts/truetype et-book-${rev}/source/4-ttf/*.ttf + ''; + + meta = with stdenv.lib; { + description = "The typeface used in Edward Tufte’s books."; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ jethro ]; + }; +} diff --git a/pkgs/data/fonts/ibm-plex/default.nix b/pkgs/data/fonts/ibm-plex/default.nix index fec45bf7bf26..ba214dd35fd0 100644 --- a/pkgs/data/fonts/ibm-plex/default.nix +++ b/pkgs/data/fonts/ibm-plex/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "1.0.2"; + version = "1.1.6"; in fetchzip rec { name = "ibm-plex-${version}"; url = "https://github.com/IBM/plex/releases/download/v${version}/OpenType.zip"; @@ -9,7 +9,7 @@ in fetchzip rec { mkdir -p $out/share/fonts unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype ''; - sha256 = "1ixxm47lwsrc136z6cxkk5dm3svmvcvq0ya8q8ayvn68q5ijbh5m"; + sha256 = "0n9qmh6v7gvrl1mfb0knygxlbkb78hvkdrppssx64m3pk4pxw85a"; meta = with lib; { description = "IBM Plex Typeface"; diff --git a/pkgs/data/fonts/libertinus/default.nix b/pkgs/data/fonts/libertinus/default.nix index b4ce653da637..2ee1e83691cc 100644 --- a/pkgs/data/fonts/libertinus/default.nix +++ b/pkgs/data/fonts/libertinus/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libertinus-${version}"; - version = "6.4"; + version = "6.6"; src = fetchFromGitHub { rev = "v${version}"; owner = "khaledhosny"; repo = "libertinus"; - sha256 = "0acnq4vpplp2s7kdnhncz61diji3wmhca04g27yqpk03ahb40x9g"; + sha256 = "0syagjmwy6q1ysncchl9bgyfrm7f6fghj1aipbr6md7l6gafz7ji"; }; installPhase = '' @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "0yn526kwb4xjyf6gvf0wflqi45z5dlzicycz2q003a6if5fgqcz3"; + outputHash = "11pxb2zwvjlk06zbqrfv2pgwsl4awf68fak1ks4881i8xbl1910m"; meta = with stdenv.lib; { description = "A fork of the Linux Libertine and Linux Biolinum fonts"; diff --git a/pkgs/data/fonts/medio/default.nix b/pkgs/data/fonts/medio/default.nix index 8b484b3b5efd..aa805b6f0825 100644 --- a/pkgs/data/fonts/medio/default.nix +++ b/pkgs/data/fonts/medio/default.nix @@ -18,7 +18,7 @@ fetchzip rec { ''; meta = with stdenv.lib; { - homepage = "http://dotcolon.net/font/{pname}/"; + homepage = "http://dotcolon.net/font/${pname}/"; description = "Serif font designed by Sora Sagano"; longDescription = '' Medio is a serif font designed by Sora Sagano, based roughly diff --git a/pkgs/data/fonts/penna/default.nix b/pkgs/data/fonts/penna/default.nix index 893553a62ce2..b1244c47bf1b 100644 --- a/pkgs/data/fonts/penna/default.nix +++ b/pkgs/data/fonts/penna/default.nix @@ -18,7 +18,7 @@ fetchzip rec { ''; meta = with stdenv.lib; { - homepage = "http://dotcolon.net/font/{pname}/"; + homepage = "http://dotcolon.net/font/${pname}/"; description = "Geometric sans serif designed by Sora Sagano"; longDescription = '' Penna is a geometric sans serif designed by Sora Sagano, diff --git a/pkgs/data/fonts/route159/default.nix b/pkgs/data/fonts/route159/default.nix index 7e2480a77dc5..892078a1151b 100644 --- a/pkgs/data/fonts/route159/default.nix +++ b/pkgs/data/fonts/route159/default.nix @@ -18,7 +18,7 @@ fetchzip rec { ''; meta = with stdenv.lib; { - homepage = "http://dotcolon.net/font/{pname}/"; + homepage = "http://dotcolon.net/font/${pname}/"; description = "A weighted sans serif font"; platforms = platforms.all; maintainers = with maintainers; [ leenaars ]; diff --git a/pkgs/data/fonts/seshat/default.nix b/pkgs/data/fonts/seshat/default.nix index 36e4f2fa10ff..6b22716f1ebb 100644 --- a/pkgs/data/fonts/seshat/default.nix +++ b/pkgs/data/fonts/seshat/default.nix @@ -18,7 +18,7 @@ fetchzip rec { ''; meta = with stdenv.lib; { - homepage = "http://dotcolon.net/font/{pname}/"; + homepage = "http://dotcolon.net/font/${pname}/"; description = "Roman body font designed for main text by Sora Sagano"; longDescription = '' Seshat is a Roman body font designed for the main text. By diff --git a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix index 4b3f7f54ad1a..c457a8c69ec8 100644 --- a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix +++ b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix @@ -1,34 +1,32 @@ -{ stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme }: +{ stdenv, fetchFromGitHub, pkgconfig, gdk_pixbuf, optipng, librsvg, gtk3, hicolor-icon-theme }: stdenv.mkDerivation rec { name = "elementary-xfce-icon-theme-${version}"; - version = "0.12"; + version = "0.13"; src = fetchFromGitHub { owner = "shimmerproject"; repo = "elementary-xfce"; - rev = "elementary-xfce-${version}"; - sha256 = "036676443sj4lxm7z211b0br87zdnbrb9z41czfq65r1wwwdf3rq"; + rev = "v${version}"; + sha256 = "01hlpw4vh4kgyghki01jp0snbn0g79mys28fb1m993mivnlzmn75"; }; - nativeBuildInputs = [ gtk3 hicolor-icon-theme ]; + nativeBuildInputs = [ pkgconfig gdk_pixbuf librsvg optipng gtk3 hicolor-icon-theme ]; - installPhase = '' - mkdir -p $out/share/icons - mv elementary-xfce* $out/share/icons + postPatch = '' + substituteInPlace svgtopng/Makefile --replace "-O0" "-O" ''; - postFixup = '' - for theme in $out/share/icons/*; do - gtk-update-icon-cache $theme - done + postInstall = '' + make icon-caches ''; meta = with stdenv.lib; { description = "Elementary icons for Xfce and other GTK+ desktops like GNOME"; homepage = https://github.com/shimmerproject/elementary-xfce; license = licenses.gpl2; - platforms = platforms.unix; + # darwin cannot deal with file names differing only in case + platforms = platforms.linux; maintainers = with maintainers; [ davidak ]; }; } diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix index c0f4727f48fb..1efd4145ce03 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 = "20180401"; + version = "20180816"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = "papirus-icon-theme"; rev = version; - sha256 = "1cbzv3igc6j05h0mq2850fwfd8sxxwixzgmhh85mc1k326rvncil"; + sha256 = "0rmf5hvp6711pyqdq5sdxkrjr21nbk6113r4a7d8735ynvm8znkk"; }; nativeBuildInputs = [ gtk3 ]; diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index a2d04640d591..a72c94759fa8 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,6 @@ { fetchurl }: fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/22cb611adaf63739fc7e3956d83d450154ec766b.tar.gz"; - sha256 = "0wxggabwz8qs2hmnr3k3iwy9rmvicx4a1n22l7f6krk1hym5bkpl"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/e44c7d34b0e57883da9cc0e09b0b5de3b065fe98.tar.gz"; + sha256 = "1manarsja8lsvs75zd3jnjhy5yb1576yv8ba0jqa4a1rszrkil1d"; } diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix index 9919fb57f7cc..93ee6d38c7c3 100644 --- a/pkgs/data/misc/osinfo-db/default.nix +++ b/pkgs/data/misc/osinfo-db/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, osinfo-db-tools, intltool, libxml2 }: stdenv.mkDerivation rec { - name = "osinfo-db-20180531"; + name = "osinfo-db-20180903"; src = fetchurl { url = "https://releases.pagure.org/libosinfo/${name}.tar.xz"; - sha256 = "0vw6hn7xdfj0q7wc3k9b0nvbghdp1b9dl63xz2v7frr55qv59m5x"; + sha256 = "0xkxqyn2b03d4rd91f5rw3xar5vnv2n8l5pp8sm3hqm1wm5z5my9"; }; nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ]; |