JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
60,790 Commits 2 Branches 0 Tags 13 GiB
319d42941e
Commit Graph

428 Commits

Author SHA1 Message Date
Eelco Dolstra
b9c457ba12 cacert: Update to 20140704 2014-07-30 10:14:40 +02:00
Mateusz Kowalczyk
7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Eelco Dolstra
f64d84698e Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/applications/audio/espeak/edit.nix
	pkgs/applications/audio/lmms/default.nix
	pkgs/desktops/e18/enlightenment.nix
	pkgs/games/exult/default.nix
	pkgs/os-specific/linux/alsa-plugins/default.nix
 2014-07-28 11:30:49 +02:00
Russell O'Connor
2faad96991 Consistently use the package name opensans-ttf everywhere. 2014-07-16 16:22:47 -04:00
Russell O'Connor
c4affbb17c Package for Open Sans fonts. 2014-07-15 13:35:22 -04:00
Eelco Dolstra
ff97b7dbe6 Merge remote-tracking branch 'origin/master' into staging 2014-07-14 17:04:55 +02:00
Thomas Tuegel
a8168daabb Rename SourceCodePro to source-code-pro 2014-07-08 15:59:48 -05:00
Thomas Tuegel
e2da5d38f3 Add source-serif-pro-1.014 2014-07-08 15:59:41 -05:00
Thomas Tuegel
88f60ee57d Add source-sans-pro-1.050 2014-07-08 15:59:34 -05:00
Eelco Dolstra
0a11e40596 tzdata: Update to 2014e 2014-07-08 18:35:40 +02:00
Eelco Dolstra
95b828de42 Merge remote-tracking branch 'origin/master' into staging 2014-07-07 13:16:26 +02:00
Eelco Dolstra
06fc1ec34d Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/servers/serfdom/default.nix
 2014-07-01 11:25:41 +02:00
Michael Raskin
8f03d888c3 Allow auto-updating of the AnonymousPro font 2014-07-01 12:20:04 +04:00
Michael Raskin
60ccbebc4e Create some meta for the AnonymousPro font 2014-07-01 11:54:08 +04:00
Eelco Dolstra
40f7b0f9df Another attempt to eradicate ensureDir 
See c556a6ea46.
 2014-06-30 14:56:10 +02:00
Michael Raskin
d001de0100 Merge pull request #3102 from auntieNeo/ipafont 
Added package for Japanese IPAFonts.
 2014-06-30 10:19:48 +04:00
Michael Raskin
d41a7bd9e2 Merge pull request #2871 from auntieNeo/kochi-substitute 
Added Kochi substitute Japanese font package
 2014-06-30 10:14:14 +04:00
Kosyrev Serge
4bbabdc8b9 aurulent-sans: new expression 2014-06-18 04:12:10 +04:00
Jonathan Glines
339b347987 Added package for Japanese IPAFonts. 2014-06-15 10:02:41 -06:00
Jonathan Glines
fad3494f07 Changed kochi-substitute-naga10 to unfreeRedistributable. 2014-06-12 21:39:17 -06:00
Jonathan Glines
1a30cf5e09 Re-added the non-free kochi-substitute with naga10 glyphs. 2014-06-12 21:33:23 -06:00
Jonathan Glines
f5b5df830c Moved kochi-mincho and kochi-gothic back into one package. 2014-06-11 22:18:05 -06:00
Jonathan Glines
b913409e0b Removed non-free kochi-substitute and added kochi from Debian package. 2014-06-11 22:08:14 -06:00
Jonathan Glines
0672cfcc5f Added mirrors for sourceforge.jp. 2014-06-08 11:47:37 -06:00
Jonathan Glines
cf21858bdf Added package for kochi-substitute font. 2014-06-04 00:54:01 -06:00
Rob Vermaas
e110d2eafe Merge pull request #2741 from bergey/nafees 
Nafees font family (5 fonts)
 2014-05-28 08:37:29 +02:00
Thomas Tuegel
dfd96f77a7 add lohit-fonts-20140220 2014-05-25 14:17:23 -05:00
Daniel Bergey
2bfd36fa14 Nafees font family (5 fonts) 2014-05-25 01:30:57 +00:00
Ricky Elrod
b56e41aebe Add eb-garamond font (close #2553) 
@vcunat added license, changed attribute name according to the [rules],
and trivial refactoring.
[rules]: http://nixos.org/nixpkgs/manual/#idm140333184443184 ("package naming")
 2014-05-13 12:07:50 +02:00
cillianderoiste
366e220c25 Merge pull request #2551 from CodeBlock/source-code-pro 
Add Source Code Pro font
 2014-05-07 09:48:49 +02:00
Ricky Elrod
df9427c535 Source Code Pro font 2014-05-06 19:49:15 -04:00
Ricky Elrod
139c6fb180 Add OFL as an actual license 2014-05-06 04:04:43 -04:00
Ricky Elrod
df0014488a First attempt at data/fonts/poly 2014-05-06 03:48:04 -04:00
Mihaly Barasz
1f2228cdc1 tzdata: use symlinks instead of hardlinks 
Hard links are not handled by nar, so installing from binary cache
unnecessarily duplicates data. Also, it's more common to use symlinks for the
tzdata package in other distributions.
 2014-04-29 16:25:10 +02:00
Eelco Dolstra
dc224baba1 tzdata: Update to 2014b 2014-04-29 16:13:15 +02:00
Mihaly Barasz
c2c90bf2bb tzdata: fix 'posix' symlink 2014-04-29 16:08:19 +02:00
aszlig
625d7b9043
Merge pull request #1928 from 'cross-win-osx'. 
This includes a lot of fixes for cross-building to Windows and Mac OS X
and could possibly fix things even for non-cross-builds, like for
example OpenSSL on Windows.

The main reason for merging this in 14.04 already is that we already
have runInWindowsVM in master and it doesn't work until we actually
cross-build Cygwin's setup binary as the upstream version is a fast
moving target which gets _overwritten_ on every new release.

Conflicts:
	pkgs/top-level/all-packages.nix
 2014-04-21 10:00:35 +02:00
Eelco Dolstra
cce948e165 man-pages: Update to 3.64 2014-04-16 18:43:38 +02:00
Peter Simons
715a61ad7a docbook5_xsl: update from 1.75.2 to 1.78.1 2014-04-09 12:41:10 +02:00
Evgeny Egorochkin
901a2fc581 manpages: update from 3.62 to 3.63 2014-04-03 07:59:39 +03:00
Vladimír Čunát
d4da7e5e4f man-pages-posix: update 2003a -> 2013-a 2014-03-16 17:39:50 +01:00
Shea Levy
dddb4f45e9 Merge branch 'pr-wqy' of git://github.com/PkmX/nixpkgs 
Bump wqy-zenhei font to the latest version and add wqy-microhei
 2014-03-15 13:22:31 -04:00
Evgeny Egorochkin
1b2902f8eb manpages: update from 3.61 to 3.62 2014-03-13 08:53:09 +02:00
aszlig
c7bac81c66
Merge 'mingw-w64' and 'darwin' into cross-win-osx. 
Both branches have quite a lot in common, so it's time for a merge and
do the cleanups with respect to both implementations and also generalize
both implementations as much as possible.

This also closes #1876.

Conflicts:
	pkgs/development/interpreters/lua-5/5.2.nix
	pkgs/development/libraries/SDL/default.nix
	pkgs/development/libraries/glew/default.nix
	pkgs/top-level/all-packages.nix
 2014-03-12 10:16:51 +01:00
aszlig
46e90f76c6
tzdata: Provide lib as an additional output. 
We're already using tzcode inside tzdata, so let's make it available as
an output here. The reason we need it is in order to compile OpenCFLite.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-03-12 10:00:44 +01:00
Domen Kožar
676f10f037 Merge pull request #1855 from kirelagin/master 
Add Symbola font
 2014-03-07 13:15:17 +01:00
Evgeny Egorochkin
e38341fee2 manpages: update from 3.60 to 3.61 2014-03-01 05:13:49 +02:00
Kirill Elagin
72783a8c5b Add Symbola font 2014-02-28 21:55:07 +04:00
Vladimír Čunát
ae5d8f6768 Merge master into x-updates 2014-02-20 20:55:31 +01:00
Ricardo M. Correia
2539acf351 manpages: Update from 3.54 -> 3.60. 2014-02-18 20:23:59 +00:00
Vladimír Čunát
96f07fa74e Merge master into x-updates 2014-02-16 11:45:02 +01:00
PkmX
eb295a62f2 Fix licenses and add platforms metadata for wqy-*. 2014-02-13 04:05:29 +08:00
PkmX
0ce54a4768 wqy-microhei: squash installPhase into one line. 2014-02-12 11:32:09 +08:00
PkmX
5181713002 Add myself to maintainers and metadata to wqy-*. 2014-02-12 11:32:00 +08:00
Vladimír Čunát
161d029d7d preferLocalBuild: set to true for wrappers and fetchers 2014-02-10 21:04:17 +01:00
Vladimír Čunát
dfdf164f87 Merge master into x-updates 
Conflicts (trivial):
	pkgs/games/spring/default.nix
 2014-02-10 19:15:58 +01:00
PkmX
ce28f1bb72 Minor fix to wqy-microhei.ttc path. 2014-02-09 06:11:59 +08:00
PkmX
023f30f07d Add wqy-microhei font 2014-02-09 05:23:23 +08:00
PkmX
c7b781ca12 Bump wqy-zenhei to 0.9.45. 2014-02-09 05:23:23 +08:00
Pascal Wittmann
0fa30be7a8 andagii: fix fetch by providing a different user-agent 
Close #1706.
 2014-02-08 11:16:22 +01:00
Vladimír Čunát
6e2d3b9847 Merge master into x-updates 2014-02-02 10:05:25 +01:00
Vladimír Čunát
546bd7738d xorg xkeyboard-config: update, unify with the other expression 2014-01-30 13:46:02 +01:00
Petr Rockai
4124bb9ff5 Adopt more packages. 2014-01-28 18:11:00 +01:00
Jaka Hudoklin
9a68fd380f pkgs/docbook-xsl: update to 1.78.1 (close #1069) 2014-01-26 11:20:11 +01:00
Bjørn Forsman
4d6605e882 Whitespace fixes in package expressions I maintain 2014-01-02 17:58:08 +01:00
Vladimír Čunát
9bcacfb142 hicolor_icon_theme: minor update 0.12 -> 0.13 2013-12-28 15:08:47 +01:00
Eelco Dolstra
3f799e7233 cacert: Update to 20131205 2013-12-20 18:29:06 +01:00
Nixpkgs Monitor
947f0a2282 lmodern: update from 2.004.1 to 2.004.4 2013-12-18 18:18:37 +02:00
Nixpkgs Monitor
8298e450a7 shared_mime_info: update from 1.1 to 1.2 2013-12-04 06:53:44 +02:00
Nixpkgs Monitor
8a875f54a4 cantarell_fonts: update from 0.0.7 to 0.0.15 2013-12-04 06:27:36 +02:00
Michael Raskin
e17df71e2b Merge pull request #1289 from iyzsong/terminus-font 
terminus-font: update to 4.38
 2013-11-28 02:52:12 -08:00
Song Wenwu
0d18b8169e terminus-font: update to 4.38 2013-11-28 10:37:45 +08:00
Vladimír Čunát
aaaeaf6f3a dejavu_fonts: minor update 2.33 -> .34 2013-11-27 21:34:14 +01:00
Eelco Dolstra
c88055e1a2 Set meta.hydraPlatforms instead of meta.platforms for some packages 2013-11-05 00:06:10 +01:00
Eelco Dolstra
f007850b6e man-pages: Update to 3.54 2013-10-23 10:36:21 +02:00
Michael Raskin
be5b32e798 Apparently fix texinfo5 with fresh TeXLive 2013-10-20 19:15:11 +04:00
Eelco Dolstra
0c0bc0857e tzdata: Update to 2013g 2013-10-15 17:24:33 +02:00
Michael Raskin
776adb5704 Updating TeXLive to 2013 using updated Debian snapshots. 
Kept the old hacks where they don't break the build in case they things
they fix are still relevant.

I checked that the upgrade doesn't break:
1) Asymptote and EProver builds.
2) My XeLaTeX demo from configurations/ repository.
3) Some of my own files.

The upgrade fixes problems with simultaneous use of 3D and LaTeX labels
in Asymptote.

Please provide a test that worked previously and is broken now if you
need to revert this update or its parts.
 2013-10-14 10:58:54 +04:00
Bjørn Forsman
083d0890f5 More description fixes 
* Remove package name
* Start with upper case letter
* Remove trailing period

Also reword some descriptions and move some long descriptions to
longDescription.

I'm not touching generated packages.
 2013-10-06 12:01:38 +02:00
Bjørn Forsman
28ac782583 Some description fixes 
There are many more packages to fix, this is just a start.

Rules:
 * Don't repeat the package name (not always that easy...)
 * Start with capital letter
 * Don't end with full stop
 * Don't start with "The ..." or "A ..."

I've also added descriptions to some packages and rewritten others.
 2013-10-05 19:36:23 +02:00
Ludovic Courtès
2e937c437a unmaintain several packages 2013-08-16 23:45:01 +02:00
Eelco Dolstra
3a008f7a1d tango-icon-theme: Add 2013-08-15 18:01:16 +02:00
Eelco Dolstra
50b2e52988 hicolor-icon-theme: Move to data/icons 2013-08-15 16:53:40 +02:00
Eelco Dolstra
774634a248 man-pages: Update to 3.53 2013-08-07 17:12:32 +02:00
Evgeny Egorochkin
da4be371e9 make package use mirror:// for gnu, savannah and gnome repositories where possible 2013-07-14 05:23:06 +03:00
Evgeny Egorochkin
b084b29d26 Even more mirror:// fixes 2013-07-14 04:17:07 +03:00
Evgeny Egorochkin
cea107c07f More mirror:// URL fixes 2013-07-14 03:31:12 +03:00
Evgeny Egorochkin
c7fbb70af0 shared-desktop-ontologies: version bump to 0.11.0 2013-07-12 16:36:12 +03:00
Eelco Dolstra
acba9240cd nixos.org/tarballs -> tarballs.nixos.org 
It's currently the same machine, but tarballs.nixos.org should become
an S3/CloudFront site eventually.
 2013-06-25 14:12:16 +02:00
Vladimír Čunát
7db886fdb9 Merge remote-tracking branch 'hydra/master' into x-updates 
Conflicts (taken from @7c6f434c):
	pkgs/development/libraries/libgphoto2/default.nix
 2013-06-08 15:41:39 +00:00
Evgeny Egorochkin
9c6f7cc9c1 Add package versions to some of the packages or fix existing ones to conform to nixpkgs conventions. 2013-06-07 03:15:45 +03:00
Vladimír Čunát
b770365574 ReRevert Merge x-updates into master 
This reverts commit ec3965d8d0.

Conflicts (taken x-updates):
	pkgs/development/libraries/libgcrypt/default.nix
	pkgs/development/libraries/libgpg-error/default.nix
	pkgs/development/libraries/poppler/default.nix
 2013-05-29 23:25:02 +02:00
Evgeny Egorochkin
fb906e44ac shared-mime-info: update to 1.1 2013-05-25 12:01:26 +03:00
Rob Vermaas
d5f7976aef Fix maintainers attribute 2013-05-21 09:20:00 +02:00
Bjørn Forsman
05bb66ce20 Add myself as maintainer for several packages 
And set missing meta.platforms for the packages I've added earlier.
 2013-05-20 20:28:15 +02:00
Bjørn Forsman
ab7d500f36 freepats: new package 
freepats is a project to create a free and open set of instrument
patches, in any format, that can be used with softsynths.

I'm adding it because it is needed for WildMIDI, which is needed for
MIDI support in Qmmp (audio player). I'll add WildMIDI and Qmmp in the
next commit(s).
 2013-05-19 14:09:36 +02:00
Eelco Dolstra
d5c8f4cb60 cacert: Update to 20121229 2013-05-15 13:15:53 +02:00
Vladimír Čunát
ec3965d8d0 Revert Merge x-updates into master due to mesa bloat 
See #490 discussion.

This reverts commit 1278859d31, reversing
changes made to 0c020c98f9.

Conflicts:
	pkgs/desktops/xfce/core/xfce4-session.nix (take master)
	pkgs/lib/misc.nix (auto)
 2013-05-09 14:03:35 +02:00
Vladimír Čunát
eb2e46aab2 Merge branch 'master' into x-updates 
Conflicts:
	pkgs/applications/graphics/rawtherapee/default.nix
	pkgs/applications/misc/blender/default.nix
	pkgs/applications/networking/browsers/chromium/sources.nix
	pkgs/os-specific/linux/kernel/linux-3.9.nix
	pkgs/top-level/all-packages.nix
 2013-04-04 21:43:40 +02:00
Eelco Dolstra
419413ac52 man-pages: Update to 3.50 2013-03-27 23:00:02 +01:00
Lluís Batlle i Rossell
4ae71ad19d Adding the sgml dtd for docbook 3.1 
Required by iputils manpages.
 2013-03-18 15:07:20 +01:00
Vladimír Čunát
86639d9bb9 Merge branch 'master' into x-updates 
Conflicts (taken master versions):
	pkgs/desktops/xfce-4.8/core/libxfcegui4.nix
	pkgs/desktops/xfce/applications/gigolo.nix
	pkgs/desktops/xfce/applications/mousepad.nix
	pkgs/desktops/xfce/applications/ristretto.nix
	pkgs/desktops/xfce/applications/terminal.nix
	pkgs/desktops/xfce/applications/xfce4-mixer.nix
	pkgs/desktops/xfce/applications/xfce4-notifyd.nix
	pkgs/desktops/xfce/applications/xfce4-taskmanager.nix
	pkgs/desktops/xfce/art/xfce4-icon-theme.nix
	pkgs/desktops/xfce/core/exo.nix
	pkgs/desktops/xfce/core/garcon.nix
	pkgs/desktops/xfce/core/gtk-xfce-engine.nix
	pkgs/desktops/xfce/core/libxfce4ui.nix
	pkgs/desktops/xfce/core/libxfce4util.nix
	pkgs/desktops/xfce/core/libxfcegui4.nix
	pkgs/desktops/xfce/core/thunar-volman.nix
	pkgs/desktops/xfce/core/thunar.nix
	pkgs/desktops/xfce/core/tumbler.nix
	pkgs/desktops/xfce/core/xfce4-appfinder.nix
	pkgs/desktops/xfce/core/xfce4-panel.nix
	pkgs/desktops/xfce/core/xfce4-power-manager.nix
	pkgs/desktops/xfce/core/xfce4-session.nix
	pkgs/desktops/xfce/core/xfce4-settings.nix
	pkgs/desktops/xfce/core/xfconf.nix
	pkgs/desktops/xfce/core/xfdesktop.nix
	pkgs/desktops/xfce/core/xfwm4.nix
	pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix
	pkgs/development/libraries/webkit/default.nix
	pkgs/top-level/all-packages.nix
 2013-03-09 17:55:37 +01:00
Shea Levy
23cbda5b3c man-pages: Update to 3.48 2013-03-08 19:49:53 -05:00
Vladimír Čunát
bf4313cd88 update gsettings-desktop-schemas and make system-wide 
Conflicts:
	pkgs/data/misc/gsettings-desktop-schemas/default.nix
	pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix
 2013-02-21 20:42:39 +01:00
Vladimír Čunát
0d72174dbd Merge branch stdenv-updates into x-updates 
x-updates is supposed to merge after stdenv-updates, so let's test it

Conflicts:
	pkgs/development/libraries/gtk+/2.x.nix (both updated, taking newer)
	pkgs/development/libraries/mesa/default.nix (taking nativeBuildInputs)
 2013-02-21 12:43:00 +01:00
Vladimír Čunát
319b6f77ca minor poppler-data update 2013-01-29 14:07:30 +01:00
Eelco Dolstra
5bb548d2e4 Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-01-17 14:19:14 +01:00
Eelco Dolstra
7fd42a8380 Get rid of the "sf" alias for "sourceforge" 2013-01-14 12:00:32 +01:00
Peter Simons
b33ad366a1 Merge branch 'master' into stdenv-updates. 2013-01-11 15:46:10 +01:00
Vladimír Čunát
6f1aad769f Libertine fonts: update and cleanup. 2013-01-10 22:36:42 +01:00
Peter Simons
9e9cd7b529 Merge branch 'master' into stdenv-updates. 2013-01-04 21:00:53 +01:00
Lluís Batlle i Rossell
d002376fbf linux man-pages: updating to 3.45 2013-01-04 10:28:34 +01:00
Eelco Dolstra
ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs 
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
 2012-12-28 19:20:09 +01:00
Eelco Dolstra
5553546c21 Remove a bunch of unreferenced files 
Plus a small number of obsolete packages (like old versions of qemu).
 2012-11-29 13:43:37 +01:00
Peter Simons
234b4affa3 man-pages: update to version 3.43 2012-11-05 11:42:05 +01:00
Eelco Dolstra
9f9a561107 xkeyboard-config; Update to 2.7 2012-09-26 15:51:57 -04:00
Eelco Dolstra
d5758c99a3 Merge remote-tracking branch 'origin/master' into x-updates 
Conflicts:
	pkgs/misc/maven/maven-1.0.nix
	pkgs/os-specific/linux/xf86-input-wacom/default.nix
 2012-09-26 14:51:51 -04:00
Eelco Dolstra
167df7ad32 Add tzdata 
Glibc 2.16 no longer contains timezone data (yay!) so provide tzdata
instead.
 2012-09-18 14:00:18 -04:00
Yury G. Kudryashov
497c364f7c SDO-0.10.0 2012-08-26 22:23:17 +04:00
Eelco Dolstra
1dadeaeb18 man-pages: Update to 3.42 2012-08-21 08:42:44 -04:00
Eelco Dolstra
acdd81fb9c Add some packages to the channel 2012-08-17 09:53:55 -04:00
Rickard Nilsson
2faada9f30 mobile-broadband-provider-info: Update to 20120614 2012-07-31 15:16:11 +02:00
Michael Raskin
7bb60c640d LMMath: add Latin Modern Math font 2012-07-19 09:07:57 +04:00
Shea Levy
4497344e49 Merge branch 'master' into x-updates 2012-07-18 23:24:10 -04:00
Shea Levy
c514ee974a Merge remote-tracking branch 'upstream/master' into x-updates 
mountall conflict was trivial

Conflicts:
	pkgs/os-specific/linux/mountall/default.nix
 2012-07-14 14:24:27 -04:00
Michael Raskin
f2a77f5d9d TeXLive: update to 2012 snapshot from Debian 2012-07-13 18:18:52 +04:00
Eelco Dolstra
ebc1c7d6c7 cacert: Update to 20120628 2012-07-05 17:31:23 -04:00
Antono Vasiljev
dd3354f002 ubuntu-font-family: rec back 2012-06-23 02:42:37 +03:00
Antono Vasiljev
6db0c4c51d ubuntu-font-family: free is a string, not var 2012-06-23 02:40:04 +03:00
Antono Vasiljev
d4092f153e Cleaning up ubuntu-font-family 2012-06-23 02:38:27 +03:00
Antono Vasiljev
b5b9b0371c sha256 in base32 format 2012-06-23 02:36:46 +03:00
Antono Vasiljev
48eeb312c5 Improved meta section for ubuntu-font-family 2012-06-23 02:23:02 +03:00
Antono Vasiljev
1b2d1f8399 Added ubuntu-font-family 2012-06-23 01:55:47 +03:00
aszlig
c1c74e45c5 Add fonts from the DOSEmu project. 
These are mainly fonts like the DOS standard VGA fonts.
 2012-06-20 23:25:16 -04:00
Eelco Dolstra
45a98ed3fc * Linux man-pages updated to 3.41. 
svn path=/nixpkgs/trunk/; revision=34156
 2012-05-17 16:07:03 +00:00
Eelco Dolstra
1a4d1facda * xkeyboard-config updated to 2.5.1. 
svn path=/nixpkgs/branches/x-updates/; revision=34127
 2012-05-15 21:30:03 +00:00
Yury G. Kudryashov
9b6f100fa0 shared-mime-info-1.0 
svn path=/nixpkgs/trunk/; revision=33505
 2012-03-31 21:29:12 +00:00
Yury G. Kudryashov
5299c1f6fb svn merge ^/nixpkgs/trunk 
- 1 conflict (gnome-doc-utils)
- final merge before --reintegrate

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33500
 2012-03-31 20:01:40 +00:00
Shea Levy
938ba8c526 man-pages-3.38 
svn path=/nixpkgs/trunk/; revision=33493
 2012-03-30 19:31:57 +00:00
Yury G. Kudryashov
defd86049c Merge ^/nixpkgs/trunk. 
This merge leads to a big rebuild, but this wouldn't hurt as I'm going to
reintegrate this branch soon.

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33455
 2012-03-28 15:42:42 +00:00
Michael Raskin
318c747520 Update and fix DejaVu fonts 
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33370
 2012-03-23 09:47:23 +00:00
Mathijs Kwik
9365291276 dejavu-fonts broke during the merge of stdenv-upgrade. 
problem/fix described here:
http://comments.gmane.org/gmane.comp.fonts.dejavu/3608

svn path=/nixpkgs/trunk/; revision=33227
 2012-03-18 08:11:14 +00:00
Yury G. Kudryashov
a466941945 Move last piece o gnome3 to top-level 
Since there is no common release schedule, I'd prefer to avoid gnome3 set at
all.

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33203
 2012-03-17 16:46:12 +00:00
Yury G. Kudryashov
793d0c983c Move gsettings-desktop-schemas to data/misc 
svn path=/nixpkgs/trunk/; revision=32929
 2012-03-08 22:45:58 +00:00
Yury G. Kudryashov
313a029f16 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32396
 2012-02-19 11:16:24 +00:00
Eelco Dolstra
8096ed3b12 * man-pages updated to 3.35. 
svn path=/nixpkgs/trunk/; revision=32375
 2012-02-17 22:25:47 +00:00
Eelco Dolstra
d4d7931a62 * Cleanup: remove obsolete references to ‘xz’, which is in stdenv now. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31678
 2012-01-18 20:53:01 +00:00
Eelco Dolstra
c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
 2012-01-18 20:16:00 +00:00
Yury G. Kudryashov
5fe8b64cea SDO: add meta.homepage 
svn path=/nixpkgs/trunk/; revision=31566
 2012-01-14 18:04:34 +00:00
Yury G. Kudryashov
6df3e4e928 Add cantarell-fonts, part of GNOME-3 
svn path=/nixpkgs/trunk/; revision=31375
 2012-01-06 20:10:23 +00:00