mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-11 15:15:36 +00:00
Code Issues Wiki Activity
42253 commits 191 branches 125 tags 8.1 GiB
Commit graph

289 commits

Author SHA1 Message Date
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
Yury G. Kudryashov c22e6aadc5 Add mobile-broadband-provider-info 
svn path=/nixpkgs/trunk/; revision=31328
 2012-01-05 23:25:28 +00:00
Yury G. Kudryashov 05f5c8802e shared-desktop-ontologies-0.8.1 
See
http://trueg.wordpress.com/2011/11/25/the-different-places-something-can-go-wrong/

svn path=/nixpkgs/trunk/; revision=30918
 2011-12-15 20:16:46 +00:00
Michael Raskin bfa4a2d374 Allow cross-builds 
svn path=/nixpkgs/trunk/; revision=30708
 2011-12-03 09:07:56 +00:00
Eelco Dolstra 0918b83c75 * Added the Docbook 4.1 SGML DTDs. 
* Fixed the "docbook2man --sgml" command in docbook2x.
* Fixed the module-init-tools manual pages.

svn path=/nixpkgs/trunk/; revision=30165
 2011-11-01 16:47:18 +00:00
Eelco Dolstra bcffafa65a * Whitespace. 
svn path=/nixpkgs/trunk/; revision=30044
 2011-10-26 17:58:53 +00:00
Shea Levy 5143705396 Get Theme-GNU directly from spock while kernel.org is down 
svn path=/nixpkgs/trunk/; revision=29537
 2011-09-28 22:34:46 +00:00
Yury G. Kudryashov 63959f2a5a Let poppler use ${POPPLER_DATADIR} 
Also upgrade poppler-data

svn path=/nixpkgs/trunk/; revision=29342
 2011-09-19 08:35:30 +00:00
Eelco Dolstra f887ecef57 * Latest CA certificate bundle, now without DigiNotar certificate. 
svn path=/nixpkgs/trunk/; revision=29269
 2011-09-14 11:59:18 +00:00
Yury G. Kudryashov 0a2debdee3 SDO-0.8.0 
svn path=/nixpkgs/trunk/; revision=28911
 2011-08-29 22:48:36 +00:00
Eelco Dolstra 353ec7a128 * CAcert bundle updated to the latest version (it was almost two years old). 
svn path=/nixpkgs/trunk/; revision=28856
 2011-08-28 16:02:18 +00:00
Eelco Dolstra 7582e841e2 * Update xkeyboard-config to 2.1. (The latest version, 2.3, requires 
a newer version of libX11 than we have.)

svn path=/nixpkgs/branches/kde-4.7/; revision=27870
 2011-07-21 12:14:20 +00:00
Eelco Dolstra 76ec0dd430 * Update a bunch of dependencies of kdelibs. 
svn path=/nixpkgs/branches/kde-4.7/; revision=27702
 2011-07-11 10:49:21 +00:00
Yury G. Kudryashov a288b1b216 shared-mime-info-0.90 
svn path=/nixpkgs/trunk/; revision=27370
 2011-06-07 21:48:53 +00:00
Michael Raskin 65cd495061 Adding CM-Unicode fonts 
svn path=/nixpkgs/trunk/; revision=27311
 2011-05-28 19:51:08 +00:00
Michael Raskin da94743917 Adding Gentium font 
svn path=/nixpkgs/trunk/; revision=27310
 2011-05-28 19:01:59 +00:00
Michael Raskin f709eff234 Add Tempora-LGC font 
svn path=/nixpkgs/trunk/; revision=27309
 2011-05-28 16:04:02 +00:00
Michael Raskin a37fc29f81 Adding Theano font 
svn path=/nixpkgs/trunk/; revision=27308
 2011-05-28 15:59:45 +00:00
Michael Raskin 1e8b1fce5c Adding Old Standard font 
svn path=/nixpkgs/trunk/; revision=27307
 2011-05-28 15:46:09 +00:00
Michael Raskin a2579704f1 Update Libertine font 
svn path=/nixpkgs/trunk/; revision=27295
 2011-05-24 15:13:54 +00:00
Eelco Dolstra 998175f6bd * pthread-man-pages updated to 2.5 (contributed by Vladimír Čunát). 
svn path=/nixpkgs/trunk/; revision=26487
 2011-03-24 11:45:58 +00:00
Eelco Dolstra ca084829d6 * Added man-pages-posix (contributed by Vladimír Čunát). 
svn path=/nixpkgs/trunk/; revision=26485
 2011-03-24 11:44:43 +00:00
Eelco Dolstra 3d84f8b78f * man-pages updated to 3.32. 
svn path=/nixpkgs/trunk/; revision=25841
 2011-02-09 13:32:20 +00:00
Michael Raskin 28d5c8d5b5 Some improvements to intl-rich layout 
svn path=/nixpkgs/trunk/; revision=25171
 2010-12-17 12:19:34 +00:00
Michael Raskin b2ea1f5e0d Do not inherit missing version attribute 
svn path=/nixpkgs/trunk/; revision=24841
 2010-11-24 13:53:11 +00:00
Michael Raskin 823f34a075 Adding Anonymous Pro font 
svn path=/nixpkgs/trunk/; revision=24840
 2010-11-24 11:51:50 +00:00
Michael Raskin a94fc3966d Add inconsolata font 
svn path=/nixpkgs/trunk/; revision=24839
 2010-11-24 11:19:38 +00:00
Michael Raskin 674111c1fd Do not use ttmkfdir - claimed to be obsolete, Debian patches are going offline.. 
svn path=/nixpkgs/trunk/; revision=24638
 2010-11-10 13:22:53 +00:00
Michael Raskin 384eefe26b Adding andagii font 
svn path=/nixpkgs/trunk/; revision=24610
 2010-11-06 09:45:13 +00:00
Yury G. Kudryashov d8d6ffefb6 Switch to kde-4.5 by default 
svn path=/nixpkgs/trunk/; revision=24192
 2010-10-10 07:39:01 +00:00
Yury G. Kudryashov 325a0370a7 poppler-data-0.4.3 
svn path=/nixpkgs/trunk/; revision=24025
 2010-10-02 05:24:33 +00:00
Ludovic Courtès 3fe217a525 GNU Freefont 20100919. 
svn path=/nixpkgs/trunk/; revision=23875
 2010-09-20 20:46:32 +00:00
Eelco Dolstra 2c424208f9 * man-pages 3.25. 
svn path=/nixpkgs/trunk/; revision=23617
 2010-09-03 13:21:38 +00:00
David Guibert eab216c593 fetch terminus-fonts from debian, the origin url is broken 
svn path=/nixpkgs/trunk/; revision=23133
 2010-08-12 05:59:01 +00:00
Eelco Dolstra 4ae72f5ab2 * Added pkgs/data/misc/hicolor-icon-theme, required by Xfce. 
svn path=/nixpkgs/trunk/; revision=23060
 2010-08-09 18:00:08 +00:00
Eelco Dolstra 907bb1aac6 * ltrace: updated to 0.5.3. 
* libdbi / libdbi-drivers: updated to 0.8.3, and make it compile with
  SQLite.
* qemu-image: fix the URL.
* gdmap: make it build again (requires an older GTK+).
* rlwrap: updated to 0.37.
* smbfs-fuse -> fusesmb to match the upstream name.
* x11vnc: updated to 0.9.10.
* clearlyU: fix the URL.
* Various packages: follow the coding conventions.

svn path=/nixpkgs/trunk/; revision=22814
 2010-07-29 18:55:16 +00:00
Eelco Dolstra ba498d4a43 * composedArgsAndFun -> makeOverridable for consistency. 
* Rename a few single-version packages to "default.nix".

svn path=/nixpkgs/trunk/; revision=22803
 2010-07-29 08:21:21 +00:00
Eelco Dolstra 749b8607ca * More cleanup. 
svn path=/nixpkgs/trunk/; revision=22795
 2010-07-28 15:35:01 +00:00
Eelco Dolstra 6609710409 * Get rid of many instances of "args: with args;", and other coding 
guidelines violations.
* Updated libsamplerate to 0.1.7.

svn path=/nixpkgs/trunk/; revision=22782
 2010-07-28 11:55:54 +00:00
Eelco Dolstra 8e168422fb * xkeyboard-config updated to 1.9. 
svn path=/nixpkgs/branches/x-updates/; revision=22633
 2010-07-18 21:51:33 +00:00