diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-10-02 10:36:47 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-10-02 10:36:47 +0300 |
| commit | 19225bf5cc546b1608eea3f1770f1ee1110c14c8 (patch) | |
| tree | e95881d505d9cf1f309f8e6b2fbee40496f550cd /pkgs/data | |
| parent | 97bfc2fac92d90c668ae1ec078356d0bd0a9ddb7 (diff) | |
| parent | a387a5d870c306220d6dfd06160bddde8532422d (diff) | |
| download | nixlib-19225bf5cc546b1608eea3f1770f1ee1110c14c8.tar nixlib-19225bf5cc546b1608eea3f1770f1ee1110c14c8.tar.gz nixlib-19225bf5cc546b1608eea3f1770f1ee1110c14c8.tar.bz2 nixlib-19225bf5cc546b1608eea3f1770f1ee1110c14c8.tar.lz nixlib-19225bf5cc546b1608eea3f1770f1ee1110c14c8.tar.xz nixlib-19225bf5cc546b1608eea3f1770f1ee1110c14c8.tar.zst nixlib-19225bf5cc546b1608eea3f1770f1ee1110c14c8.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/data')
| -rw-r--r-- | pkgs/data/fonts/mplus-outline-fonts/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/data/icons/maia-icon-theme/default.nix | 28 |
2 files changed, 31 insertions, 3 deletions
diff --git a/pkgs/data/fonts/mplus-outline-fonts/default.nix b/pkgs/data/fonts/mplus-outline-fonts/default.nix index 22a5245ec40c..e3d09adba57b 100644 --- a/pkgs/data/fonts/mplus-outline-fonts/default.nix +++ b/pkgs/data/fonts/mplus-outline-fonts/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mplus-${version}"; - version = "059"; + version = "061"; src = fetchurl { - url = "mirror://sourceforgejp/mplus-fonts/62344/mplus-TESTFLIGHT-059.tar.xz"; - sha256 = "09dzdgqqflpijd3c30m38cyidshawfp4nz162xhn91j9w09y2qkq"; + url = "mirror://sourceforgejp/mplus-fonts/62344/mplus-TESTFLIGHT-${version}.tar.xz"; + sha256 = "1yrv65l2y8f9jmpalqb5iiay7z1x3754mnqpgp2bax72g8k8728g"; }; phases = [ "unpackPhase" "installPhase" ]; diff --git a/pkgs/data/icons/maia-icon-theme/default.nix b/pkgs/data/icons/maia-icon-theme/default.nix new file mode 100644 index 000000000000..492a4627de33 --- /dev/null +++ b/pkgs/data/icons/maia-icon-theme/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation { + name = "maia-icon-theme"; + + src = fetchFromGitHub { + owner = "manjaro"; + repo = "artwork-maia"; + rev = "23235fa56e6111d30e9f92576030cc855a0facbe"; + sha256 = "1d5bv13gds1nx88pc6a9gkrz1lb8sji0wcc5h3bf4mjw0q072nfr"; + }; + + dontBuild = true; + + installPhase = '' + install -dm 755 $out/share/icons + rm icons/CMakeLists.txt + cp -dr --no-preserve='ownership' icons $out/share/icons/Maia + ''; + + meta = with stdenv.lib; { + description = "Icons based on Breeze and Super Flat Remix"; + homepage = https://github.com/manjaro/artwork-maia; + licence = licenses.free; + maintainers = [ maintainers.mounium ]; + platforms = platforms.all; + }; +} |