diff options
Diffstat (limited to 'pkgs/data')
20 files changed, 125 insertions, 72 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/fira-code/default.nix b/pkgs/data/fonts/fira-code/default.nix index 191e52c427a7..b0b58b0ebfcc 100644 --- a/pkgs/data/fonts/fira-code/default.nix +++ b/pkgs/data/fonts/fira-code/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip }: let - version = "1.205"; + version = "1.206"; in fetchzip { name = "fira-code-${version}"; @@ -12,7 +12,7 @@ in fetchzip { unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype ''; - sha256 = "0h8b89d1n3y56k7x9zrwm9fic09ccg1mc7g1258g152m5g6z6zms"; + sha256 = "0074d8q4m802f5yms8yxdx4rdz5xnpgv1w5hs330zg2p9ksicgzy"; meta = with stdenv.lib; { homepage = https://github.com/tonsky/FiraCode; 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/pecita/default.nix b/pkgs/data/fonts/pecita/default.nix index b57cf22569d2..a90ff42a8e2a 100644 --- a/pkgs/data/fonts/pecita/default.nix +++ b/pkgs/data/fonts/pecita/default.nix @@ -1,18 +1,24 @@ -{stdenv, fetchzip}: +{ stdenv, fetchurl }: let + version = "5.4"; -in fetchzip rec { + +in + +fetchurl rec { name = "pecita-${version}"; - url = "http://archive.rycee.net/pecita/${name}.tar.xz"; + url = "http://pecita.eu/b/Pecita.otf"; + + downloadToTemp = true; postFetch = '' - tar xJvf $downloadedFile --strip-components=1 mkdir -p $out/share/fonts/opentype - cp -v Pecita.otf $out/share/fonts/opentype/Pecita.otf + cp -v $downloadedFile $out/share/fonts/opentype/Pecita.otf ''; + recursiveHash = true; sha256 = "0pwm20f38lcbfkdqkpa2ydpc9kvmdg0ifc4h2dmipsnwbcb5rfwm"; meta = with stdenv.lib; { 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/fonts/ultimate-oldschool-pc-font-pack/default.nix b/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix new file mode 100644 index 000000000000..f8df39c95652 --- /dev/null +++ b/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchzip }: + +let + version = "1.0"; +in +fetchzip rec { + name = "ultimate-oldschool-pc-font-pack-${version}"; + url = "http://int10h.org/oldschool-pc-fonts/download/ultimate_oldschool_pc_font_pack_v${version}.zip"; + sha256 = "0hid4dgqfy2w26734vcw2rxmpacd9vd1r2qpdr9ww1n3kgc92k9y"; + + postFetch= '' + mkdir -p $out/share/fonts/truetype + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + ''; + + meta = with stdenv.lib; { + description = "The Ultimate Oldschool PC Font Pack (TTF Fonts)"; + homepage = "http://int10h.org/oldschool-pc-fonts/"; + platforms = platforms.unix; + license = licenses.cc-by-sa-40; + maintainers = [ maintainers.endgame ]; + }; +} diff --git a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix index 4b3f7f54ad1a..d4a15a105cd3 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.1"; src = fetchFromGitHub { owner = "shimmerproject"; repo = "elementary-xfce"; - rev = "elementary-xfce-${version}"; - sha256 = "036676443sj4lxm7z211b0br87zdnbrb9z41czfq65r1wwwdf3rq"; + rev = "v${version}"; + sha256 = "16msdrazhbv80cvh5ffvgj13xmkpf87r7mq6xz071fza6nv7g0jn"; }; - 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/iconpack-obsidian/default.nix b/pkgs/data/icons/iconpack-obsidian/default.nix index b033f510f0b9..ee45a186f290 100644 --- a/pkgs/data/icons/iconpack-obsidian/default.nix +++ b/pkgs/data/icons/iconpack-obsidian/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "iconpack-obsidian-${version}"; - version = "4.0.1"; + version = "4.3"; src = fetchFromGitHub { owner = "madmaxms"; repo = "iconpack-obsidian"; rev = "v${version}"; - sha256 = "1mlaldqjc3am2d2m577fhsidlnfqlhmnf1l8hh50iqr94mc14fab"; + sha256 = "0np2s4mbaykwwv516959r5d9gfdmqb5hadsx18x2if4751a9qz49"; }; nativeBuildInputs = [ gtk3 ]; diff --git a/pkgs/data/icons/numix-cursor-theme/default.nix b/pkgs/data/icons/numix-cursor-theme/default.nix index edeb61c6d3e1..8e5a317082ea 100644 --- a/pkgs/data/icons/numix-cursor-theme/default.nix +++ b/pkgs/data/icons/numix-cursor-theme/default.nix @@ -1,24 +1,27 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, inkscape, xcursorgen }: stdenv.mkDerivation rec { - version = "20160110"; - + version = "1.1"; package-name = "numix-cursor-theme"; - name = "${package-name}-${version}"; src = fetchFromGitHub { owner = "numixproject"; repo = package-name; - rev = "e92186d9df47c04d4e0a778eb6941ef58590b179"; - sha256 = "1sr4pisgrn3632phsiny2fyr2ib6l51fnjdsanmh9ampagl4ly7g"; + rev = "v${version}"; + sha256 = "0p8h48wsy3z5dz9vdnp01fpn6q8ky0h74l5qgixlip557bsa1spi"; }; - dontBuild = true; + nativeBuildInputs = [ inkscape xcursorgen ]; + + buildPhase = '' + patchShebangs . + HOME=$TMP ./build.sh + ''; installPhase = '' install -dm 755 $out/share/icons - cp -dr --no-preserve='ownership' Numix{,-Light} $out/share/icons/ + cp -dr --no-preserve='ownership' Numix-Cursor{,-Light} $out/share/icons/ ''; meta = with stdenv.lib; { diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix index 5ac0998fb291..ebda6d4428c1 100644 --- a/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, gtk3, numix-icon-theme }: stdenv.mkDerivation rec { - version = "18.08.17"; + version = "18.09.19"; package-name = "numix-icon-theme-circle"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "numixproject"; repo = package-name; rev = version; - sha256 = "1nxgm5vf2rzbg8qh48iy0vdj12ffahlp9qhj8h0k1li03s3nf15h"; + sha256 = "1a1ack4kpngnb3c281pssmp3snn2idcn2c5cv3l38a0dl5g5w8nq"; }; nativeBuildInputs = [ gtk3 numix-icon-theme ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Numix icon theme (circle version)"; - homepage = https://numixproject.org; + homepage = https://numixproject.github.io; license = licenses.gpl3; # darwin cannot deal with file names differing only in case platforms = platforms.linux; diff --git a/pkgs/data/icons/numix-icon-theme-square/default.nix b/pkgs/data/icons/numix-icon-theme-square/default.nix index 875e10259276..03c1ba0f827a 100644 --- a/pkgs/data/icons/numix-icon-theme-square/default.nix +++ b/pkgs/data/icons/numix-icon-theme-square/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${package-name}-${version}"; package-name = "numix-icon-theme-square"; - version = "18.08.17"; + version = "18.09.19"; src = fetchFromGitHub { owner = "numixproject"; repo = package-name; rev = version; - sha256 = "0pn5m73zd240bk2kilcgv57xn7grhbcj5ay4w1jzzn1f4ifaa0w8"; + sha256 = "0q5p901qj3gyzgpy5kk9q5sqb13ka5cfg6wvazlfch1k3kaqksz1"; }; nativeBuildInputs = [ gtk3 numix-icon-theme ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Numix icon theme (square version)"; - homepage = https://numixproject.org; + homepage = https://numixproject.github.io; license = licenses.gpl3; # darwin cannot deal with file names differing only in case platforms = platforms.linux; diff --git a/pkgs/data/icons/numix-icon-theme/default.nix b/pkgs/data/icons/numix-icon-theme/default.nix index 35f624a00f5b..9aaed97dc273 100644 --- a/pkgs/data/icons/numix-icon-theme/default.nix +++ b/pkgs/data/icons/numix-icon-theme/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Numix icon theme"; - homepage = https://numixproject.org; + homepage = https://numixproject.github.io; license = licenses.gpl3; # darwin cannot deal with file names differing only in case platforms = platforms.linux; 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/ddccontrol-db/default.nix b/pkgs/data/misc/ddccontrol-db/default.nix index 1cbf5e2adafa..2dbd062d4fb2 100644 --- a/pkgs/data/misc/ddccontrol-db/default.nix +++ b/pkgs/data/misc/ddccontrol-db/default.nix @@ -1,34 +1,35 @@ { stdenv -, fetchurl -, perl -, perlPackages -, libxml2 -, pciutils -, pkgconfig -, gtk2 +, autoconf +, automake +, libtool +, intltool +, fetchFromGitHub }: -let version = "20061014"; in -let verName = "${version}"; in stdenv.mkDerivation { - name = "ddccontrol-db-${verName}"; - src = fetchurl { - url = "mirror://sourceforge/ddccontrol/ddccontrol-db/${verName}/ddccontrol-db-${verName}.tar.bz2"; - sha1 = "9d06570fdbb4d25e397202a518265cc1173a5de3"; + name = "ddccontrol-db-20180908"; + src = fetchFromGitHub { + owner = "ddccontrol"; + repo = "ddccontrol-db"; + rev = "5f211be363f77dc43e39f911b30f4fb19a2d7a84"; + sha256 = "0vi3bzxpjdkn791vri68k7dah4v2liscniz7hxrarhl4fxlicc0w"; }; + + preConfigure = '' + ./autogen.sh + ''; + buildInputs = [ - perl - perlPackages.libxml_perl - libxml2 - pciutils - pkgconfig - gtk2 + autoconf + automake + libtool + intltool ]; meta = with stdenv.lib; { description = "Monitor database for DDCcontrol"; - homepage = http://ddccontrol.sourceforge.net/; + homepage = http://github.com/ddccontrol/ddccontrol-db; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ stdenv.lib.maintainers.pakhfn ]; diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index fce8f44bd3ff..3126269a6e7a 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/d5c89ad106556f7890c89c50a2b4d3fbdcea7616.tar.gz"; - sha256 = "0j8r88wwf0qvqxcnwmcs6xcn4vi0189c9f5chfl80941ggxfbpxk"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/3715ae81be1a8e0c6a1cb5902c054b6cedfb7f41.tar.gz"; + sha256 = "05bsk99d4k2nq8dfiagpby0cllx19crzn2rh29v26p0irzagrqfb"; } diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix index 9919fb57f7cc..0a5f7b313065 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-20180920"; src = fetchurl { url = "https://releases.pagure.org/libosinfo/${name}.tar.xz"; - sha256 = "0vw6hn7xdfj0q7wc3k9b0nvbghdp1b9dl63xz2v7frr55qv59m5x"; + sha256 = "19jbzf1g523bkckli043q21hgbfv0043b5ib4zjiz8x98h7ngiac"; }; nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ]; |