From 7a3122757386555c9339400a6f3fb03d81865d1d Mon Sep 17 00:00:00 2001 From: Sergiu Ivanov Date: Tue, 20 Oct 2015 01:57:24 +0200 Subject: [PATCH 1/3] oh-my-zsh-git: init at 2016-02-27 --- lib/maintainers.nix | 1 + pkgs/shells/oh-my-zsh/default.nix | 74 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 77 insertions(+) create mode 100644 pkgs/shells/oh-my-zsh/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index b908ec3115a..4c552946667 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -299,6 +299,7 @@ sander = "Sander van der Burg "; schmitthenner = "Fabian Schmitthenner "; schristo = "Scott Christopher "; + scolobb = "Sergiu Ivanov "; sepi = "Raffael Mancini "; sheganinans = "Aistis Raulinaitis "; shell = "Shell Turner "; diff --git a/pkgs/shells/oh-my-zsh/default.nix b/pkgs/shells/oh-my-zsh/default.nix new file mode 100644 index 00000000000..297489fd7fc --- /dev/null +++ b/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 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b6c83a3cbbf..dad5b87eaec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/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 { }; From be590f1d9dffd88e333ed4cfa336420e4eacd3c9 Mon Sep 17 00:00:00 2001 From: Sergiu Ivanov Date: Tue, 1 Dec 2015 23:52:59 +0100 Subject: [PATCH 2/3] aspell-dict-ro: init at 3.3-2 --- pkgs/development/libraries/aspell/dictionaries.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/libraries/aspell/dictionaries.nix b/pkgs/development/libraries/aspell/dictionaries.nix index 3fb49c2be24..c0c4bf97b60 100644 --- a/pkgs/development/libraries/aspell/dictionaries.nix +++ b/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"; From 81f0eaa61f17460551d24c23e0e298eda94cfb2b Mon Sep 17 00:00:00 2001 From: Sergiu Ivanov Date: Sat, 27 Feb 2016 23:22:50 +0100 Subject: [PATCH 3/3] montserrat: init at 1.0 --- pkgs/data/fonts/montserrat/default.nix | 28 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/data/fonts/montserrat/default.nix diff --git a/pkgs/data/fonts/montserrat/default.nix b/pkgs/data/fonts/montserrat/default.nix new file mode 100644 index 00000000000..70fd2060ff1 --- /dev/null +++ b/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 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dad5b87eaec..2dcf2685d30 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11220,6 +11220,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 { };