diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-06-08 15:41:39 +0000 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-06-08 15:41:39 +0000 |
| commit | 7db886fdb96067a43d72bca30a2802ceb534fc69 (patch) | |
| tree | 376006f8f4920103aac394501d7f2682250d3da8 /pkgs/data | |
| parent | ba6c764a519a2dbe61b0a99a95df0d8bcd8a81fa (diff) | |
| parent | 8c4a613f3a478c1cb2994fb9df3b0eb92d4c7885 (diff) | |
| download | nixlib-7db886fdb96067a43d72bca30a2802ceb534fc69.tar nixlib-7db886fdb96067a43d72bca30a2802ceb534fc69.tar.gz nixlib-7db886fdb96067a43d72bca30a2802ceb534fc69.tar.bz2 nixlib-7db886fdb96067a43d72bca30a2802ceb534fc69.tar.lz nixlib-7db886fdb96067a43d72bca30a2802ceb534fc69.tar.xz nixlib-7db886fdb96067a43d72bca30a2802ceb534fc69.tar.zst nixlib-7db886fdb96067a43d72bca30a2802ceb534fc69.zip | |
Merge remote-tracking branch 'hydra/master' into x-updates
Conflicts (taken from @7c6f434c): pkgs/development/libraries/libgphoto2/default.nix
Diffstat (limited to 'pkgs/data')
| -rw-r--r-- | pkgs/data/fonts/andagii/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/data/fonts/anonymous-pro/default.nix | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/data/fonts/andagii/default.nix b/pkgs/data/fonts/andagii/default.nix index 742f0bd0b4aa..6e59e97171e2 100644 --- a/pkgs/data/fonts/andagii/default.nix +++ b/pkgs/data/fonts/andagii/default.nix @@ -12,6 +12,7 @@ let sourceInfo = rec { url="http://www.i18nguy.com/unicode/andagii.zip"; name="andagii"; + version="1.0.2"; hash="0cknb8vin15akz4ahpyayrpqyaygp9dgrx6qw7zs7d6iv9v59ds1"; }; in @@ -21,7 +22,7 @@ rec { sha256 = sourceInfo.hash; }; - inherit (sourceInfo) name version; + name = "${sourceInfo.name}-${sourceInfo.version}"; inherit buildInputs; /* doConfigure should be removed if not needed */ diff --git a/pkgs/data/fonts/anonymous-pro/default.nix b/pkgs/data/fonts/anonymous-pro/default.nix index 42f32f0ba716..df98d8197f5d 100644 --- a/pkgs/data/fonts/anonymous-pro/default.nix +++ b/pkgs/data/fonts/anonymous-pro/default.nix @@ -22,7 +22,7 @@ rec { sha256 = sourceInfo.hash; }; - inherit (sourceInfo) name version; + name = "${sourceInfo.name}-${sourceInfo.version}"; inherit buildInputs; phaseNames = ["doUnpack" "installFonts"]; |