Merge pull request #13520 from scolobb/new-pkgs

Add Oh My Zsh, Romanian aspell dictionary, Montserrat font.

lib/maintainers.nix

@@ -299,6 +299,7 @@
   sander = "Sander van der Burg <s.vanderburg@tudelft.nl>";
   schmitthenner = "Fabian Schmitthenner <development@schmitthenner.eu>";
   schristo = "Scott Christopher <schristopher@konputa.com>";
+  scolobb = "Sergiu Ivanov <sivanov@colimite.fr>";
   sepi = "Raffael Mancini <raffael@mancini.lu>";
   sheganinans = "Aistis Raulinaitis <sheganinans@gmail.com>";
   shell = "Shell Turner <cam.turn@gmail.com>";

pkgs/data/fonts/montserrat/default.nix

@@ -0,0 +1,28 @@
+# Originally packaged for ArchLinux.
+#
+# https://aur.archlinux.org/packages/ttf-montserrat/
+
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "montserrat-${version}";
+  version = "1.0";
+
+  src = fetchurl {
+    url = "http://marvid.fr/~eeva/mirror/Montserrat.tar.gz";
+    sha256 = "12yn651kxi5fcbpdxhapg5fpri291mgcfc1kx7ymg53nrl11nj3x";
+  };
+
+  installPhase = ''
+    mkdir -p $out/share/fonts/montserrat
+    cp *.ttf $out/share/fonts/montserrat
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A geometric sans serif font with extended latin support (Regular, Alternates, Subrayada)";
+    homepage    = "http://www.fontspace.com/julieta-ulanovsky/montserrat";
+    license     = licenses.ofl;
+    platforms   = platforms.all;
+    maintainers = with maintainers; [ scolobb ];
+  };
+}

pkgs/development/libraries/aspell/dictionaries.nix

@@ -167,6 +167,15 @@ in {
     };
   };
 
+  ro = buildDict {
+    shortName = "ro-3.3-2";
+    fullName = "Romanian";
+    src = fetchurl {
+      url = mirror://gnu/aspell/dict/ro/aspell5-ro-3.3-2.tar.bz2;
+      sha256 = "0gb8j9iy1acdl11jq76idgc2lbc1rq3w04favn8cyh55d1v8phsk";
+    };
+  };
+
   ru = buildDict {
     shortName = "ru-0.99f7-1";
     fullName = "Russian";

pkgs/shells/oh-my-zsh/default.nix

@@ -0,0 +1,74 @@
+# This script was inspired by the ArchLinux User Repository package:
+#
+#   https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=oh-my-zsh-git
+
+
+{ stdenv, fetchgit }:
+
+stdenv.mkDerivation rec {
+  name = "oh-my-zsh-git-${version}";
+  version = "2016-02-27";
+
+  src = fetchgit {
+    url = "https://github.com/robbyrussell/oh-my-zsh";
+    rev = "bd6dbd1d9b1fc8a523aaf588492eb3ed4113b49d";
+    sha256 = "0bn3jijxjhrd00mc3biqs7jj6in3ivhr6d02mp4566i2rdp9x2d5";
+  };
+
+  phases = "installPhase";
+
+  installPhase = ''
+  outdir=$out/share/oh-my-zsh
+  template=templates/zshrc.zsh-template
+
+  mkdir -p $outdir
+  cp -r $src/* $outdir
+  cd $outdir
+
+  rm MIT-LICENSE.txt
+  rm -rf .git*
+
+  chmod -R +w templates
+
+  # Change the path to oh-my-zsh dir and disable auto-updating.
+  sed -i -e "2c\\ZSH=$outdir/" \
+         -e 's/\# \(DISABLE_AUTO_UPDATE="true"\)/\1/' \
+   $template
+
+  # Look for .zsh_variables, .zsh_aliases, and .zsh_funcs, and source
+  # them, if found.
+  cat >> $template <<- EOF
+
+  # Load the variables.
+  if [ -f ~/.zsh_variables ]; then
+      . ~/.zsh_variables
+  fi
+
+  # Load the functions.
+  if [ -f ~/.zsh_funcs ]; then
+    . ~/.zsh_funcs
+  fi
+
+  # Load the aliases.
+  if [ -f ~/.zsh_aliases ]; then
+      . ~/.zsh_aliases
+  fi
+  EOF
+  '';
+
+  meta = with stdenv.lib; {
+  description     = "A framework for managing your zsh configuration";
+  longDescription = ''
+  Oh My Zsh is a framework for managing your zsh configuration.
+
+  To copy the Oh My Zsh configuration file to your home directory, run
+  the following command:
+
+    $ cp -v $(nix-env -q --out-path oh-my-zsh-git | cut -d' ' -f3)/share/oh-my-zsh/templates/zshrc.zsh-template ~/.zshrc
+  '';
+  homepage        = "http://ohmyz.sh/";
+  license         = licenses.mit;
+  platforms       = platforms.all;
+  maintainers     = with maintainers; [ scolobb nequissimus ];
+  };
+}

pkgs/top-level/all-packages.nix

@@ -2675,6 +2675,8 @@ let
     inherit (pythonPackages) sqlite3;
   };
 
+  oh-my-zsh = callPackage ../shells/oh-my-zsh { };
+
   opencryptoki = callPackage ../tools/security/opencryptoki { };
 
   opendbx = callPackage ../development/libraries/opendbx { };
@@ -11215,6 +11217,8 @@ let
 
   mobile_broadband_provider_info = callPackage ../data/misc/mobile-broadband-provider-info { };
 
+  montserrat = callPackage ../data/fonts/montserrat { };
+
   mph_2b_damase = callPackage ../data/fonts/mph-2b-damase { };
 
   mplus-outline-fonts = callPackage ../data/fonts/mplus-outline-fonts { };