diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2011-05-24 15:13:54 +0000 |
---|---|---|
committer | Michael Raskin <7c6f434c@mail.ru> | 2011-05-24 15:13:54 +0000 |
commit | a2579704f17bda49ee819153ebc991ef277eab2a (patch) | |
tree | 1db253721ad5555b27a61a015105aadea586bbe7 /pkgs | |
parent | 1e868ce18b128adb5304a6f3ffa5e89dcde66f35 (diff) |
Update Libertine font
svn path=/nixpkgs/trunk/; revision=27295
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/misc/xneur/src-for-default.nix | 8 | ||||
-rw-r--r-- | pkgs/data/fonts/libertine/2.7.bin.nix | 17 | ||||
-rw-r--r-- | pkgs/data/fonts/libertine/default.nix (renamed from pkgs/data/fonts/libertine/2.7.nix) | 10 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
4 files changed, 12 insertions, 27 deletions
diff --git a/pkgs/applications/misc/xneur/src-for-default.nix b/pkgs/applications/misc/xneur/src-for-default.nix index b32ddd30655a3..a7db13bd81d14 100644 --- a/pkgs/applications/misc/xneur/src-for-default.nix +++ b/pkgs/applications/misc/xneur/src-for-default.nix @@ -1,9 +1,9 @@ rec { - version="0.12.0"; - name="xneur-0.12.0"; - hash="09rkr65ajq049x733qj918035kjrmkzqyifbpx7y938kdwq609ln"; + version="0.13.0"; + name="xneur-0.13.0"; + hash="19z8nnfj9paf877k0nrqy6dih69l81svxymqg6llh7ndgkw20hgd"; url="http://dists.xneur.ru/release-${version}/tgz/xneur-${version}.tar.bz2"; - advertisedUrl="http://dists.xneur.ru/release-0.12.0/tgz/xneur-0.12.0.tar.bz2"; + advertisedUrl="http://dists.xneur.ru/release-0.13.0/tgz/xneur-0.13.0.tar.bz2"; } diff --git a/pkgs/data/fonts/libertine/2.7.bin.nix b/pkgs/data/fonts/libertine/2.7.bin.nix deleted file mode 100644 index b4e8bb9b6d12c..0000000000000 --- a/pkgs/data/fonts/libertine/2.7.bin.nix +++ /dev/null @@ -1,17 +0,0 @@ -args: with args; -rec{ - src = fetchurl { - url = http://downloads.sourceforge.net/linuxlibertine/LinLibertineFont-2.7.tgz; - sha256 = "06xm3np2xx41fr2yc00q0z2qy9s6p860f18ns1f1f00vi54dm4c5"; - }; - - buildInputs = []; - phaseNames = ["doUnpack" "installFonts"]; - - name = "linux-libertine-2.7"; - meta = { - description = "Linux Libertine Fonts"; - homepage = http://linuxlibertine.sf.net; - }; -} - diff --git a/pkgs/data/fonts/libertine/2.7.nix b/pkgs/data/fonts/libertine/default.nix index a5c212aff864b..a0ed5f757974b 100644 --- a/pkgs/data/fonts/libertine/2.7.nix +++ b/pkgs/data/fonts/libertine/default.nix @@ -1,8 +1,8 @@ args : with args; rec { src = fetchurl { - url = http://downloads.sourceforge.net/linuxlibertine/LinLibertineSRC-2.7.tgz; - sha256 = "1czc3pil4zrii6qh6zk0g6hj6axj20gfnpbbdfrzm703wm9w70ic"; + url = http://downloads.sourceforge.net/linuxlibertine/5.0.0/LinLibertineSRC_2011_05_22.tgz; + sha256 = "1cr0kvvlqrcmaxfl6szfp3m93mcnhmypx33dxmdm3xdxxkab74vg"; }; buildInputs = [fontforge]; @@ -15,7 +15,11 @@ rec { ScaleToEm(1000); ''; - name = "linux-libertine-2.7"; + doUnpack = fullDepEntry '' + tar xf ${src} + '' ["minInit"]; + + name = "linux-libertine-5.0.0"; meta = { description = "Linux Libertine Fonts"; homepage = http://linuxlibertine.sf.net; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0d6f7e482440d..f41473a6138ec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5736,11 +5736,9 @@ let liberation_ttf = callPackage ../data/fonts/redhat-liberation-fonts { }; - libertine = builderDefsPackage (import ../data/fonts/libertine/2.7.nix) { + libertine = builderDefsPackage (import ../data/fonts/libertine) { inherit fontforge; }; - libertineBin = builderDefsPackage (import ../data/fonts/libertine/2.7.bin.nix) { - }; lmodern = callPackage ../data/fonts/lmodern { }; |