diff options
author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-03-03 22:40:32 +0200 |
---|---|---|
committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-03-03 22:40:32 +0200 |
commit | 1e107443ad0867ca0c923556e13a2c9a92e9e98a (patch) | |
tree | 4320b541e23ffcf683556ef49cdf10e9dd1eed05 /pkgs/data | |
parent | a5913ce2722b067fdc346a3c06e51ff5aaa1aef9 (diff) | |
parent | 618ac29687a650d854c8bea7efd4490387589ce2 (diff) |
Merge commit '618ac29687a650d854c8bea7efd4490387589ce2' into staging
Diffstat (limited to 'pkgs/data')
-rw-r--r-- | pkgs/data/fonts/cantarell-fonts/default.nix | 25 | ||||
-rw-r--r-- | pkgs/data/icons/deepin-icon-theme/default.nix | 39 | ||||
-rw-r--r-- | pkgs/data/icons/papirus-icon-theme/default.nix | 4 | ||||
-rw-r--r-- | pkgs/data/misc/hackage/default.nix | 4 |
4 files changed, 60 insertions, 12 deletions
diff --git a/pkgs/data/fonts/cantarell-fonts/default.nix b/pkgs/data/fonts/cantarell-fonts/default.nix index de2edad451b97..9d002ef02ade2 100644 --- a/pkgs/data/fonts/cantarell-fonts/default.nix +++ b/pkgs/data/fonts/cantarell-fonts/default.nix @@ -1,18 +1,27 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, meson, ninja, gettext, appstream-glib, gnome3 }: -stdenv.mkDerivation rec { - major = "0.0"; - minor = "25"; - name = "cantarell-fonts-${major}.${minor}"; +let + pname = "cantarell-fonts"; + version = "0.100"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/cantarell-fonts/${major}/${name}.tar.xz"; - sha256 = "0zvkd8cm1cg2919v1js9qmzwa02sjl7qajj3gcvgqvai1fm2i8hl"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "1286rx1z7mrmi6snx957fprpcmd5p00l6drdfpbgf6mqapl6kb81"; }; + nativeBuildInputs = [ meson ninja gettext appstream-glib ]; + outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "13w5qj1lx4vk875yna35v9lnc80cwmphcafnmp0d5grg4d98cry2"; + outputHash = "12ia41pr0rzjfay6y84asw3nxhyp1scq9zl0w4f6wkqj7vf1qfn1"; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; meta = { description = "Default typeface used in the user interface of GNOME since version 3.0"; diff --git a/pkgs/data/icons/deepin-icon-theme/default.nix b/pkgs/data/icons/deepin-icon-theme/default.nix new file mode 100644 index 0000000000000..7a422beb9924d --- /dev/null +++ b/pkgs/data/icons/deepin-icon-theme/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchFromGitHub, gtk3, papirus-icon-theme }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "deepin-icon-theme"; + version = "15.12.52"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "141in9jlflmckd8rg4605dfks84p1p6b1zdbhbiwrg11xbl66f3l"; + + # Get rid of case collision in file names, which is an issue in + # darwin where file names are case insensitive. + extraPostFetch = '' + rm "$out"/Sea/apps/scalable/TeXmacs.svg + rm "$out"/deepin/apps/48/TeXmacs.svg + ''; + }; + + nativeBuildInputs = [ gtk3 papirus-icon-theme ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + postFixup = '' + for theme in $out/share/icons/*; do + gtk-update-icon-cache $theme + done + ''; + + meta = with stdenv.lib; { + description = "Deepin icon theme"; + homepage = https://github.com/linuxdeepin/deepin-icon-theme; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix index ec3c671e2fd9f..df974d8a0359c 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 = "20171102"; + version = "20180214"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = "papirus-icon-theme"; rev = version; - sha256 = "10q7ppizzqi8c564jydqivia43gp4j1z984igfyym2mdwdw71mzq"; + sha256 = "0lsp5cmq5wdqw6vyh6hqqrshgpzxfj8dx87l7qdlgrk73dajjmki"; }; nativeBuildInputs = [ gtk3 ]; diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index 55d975e70d27d..8a29600f250dd 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/acac7d958b43c270c8411fc65895a531e496423f.tar.gz"; - sha256 = "15crmzdnj7lpbkhb44vhh7g0ghw0xj4cqkyqyg638dslijc5mjzd"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/9f6344416728bff8b5279e0c45941fd8da361eb9.tar.gz"; + sha256 = "0zm53wxvm7z72605qvgv0dzsfq91lyffpr850cks23r979pjvkv8"; } |