Commit graph

82 commits

Author SHA1 Message Date
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 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 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
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 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
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
Eelco Dolstra ebc1c7d6c7 cacert: Update to 20120628 2012-07-05 17:31:23 -04: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 793d0c983c Move gsettings-desktop-schemas to data/misc
svn path=/nixpkgs/trunk/; revision=32929
2012-03-08 22:45:58 +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 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
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 28d5c8d5b5 Some improvements to intl-rich layout
svn path=/nixpkgs/trunk/; revision=25171
2010-12-17 12:19:34 +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
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 8e168422fb * xkeyboard-config updated to 1.9.
svn path=/nixpkgs/branches/x-updates/; revision=22633
2010-07-18 21:51:33 +00:00
Yury G. Kudryashov d0de407886 SDO-0.5
svn path=/nixpkgs/trunk/; revision=22621
2010-07-17 22:11:59 +00:00
Yury G. Kudryashov 98cfefe7ea Upgrade shared-mime-info
svn path=/nixpkgs/trunk/; revision=20928
2010-04-02 15:25:21 +00:00
Michael Raskin 58e5881b9b More symbols for symbol-rich layout
svn path=/nixpkgs/trunk/; revision=20324
2010-03-02 13:19:58 +00:00
Lluís Batlle i Rossell 9501307305 Updating the url for shared desktop ontologies.
svn path=/nixpkgs/trunk/; revision=19943
2010-02-11 22:22:00 +00:00
Sander van der Burg 31cbd149d2 - Completed all dependencies for kdelibs-4.4.0
- Added SIP 4.10 required for pyqt-4.7.x
- Removed kde libs experimental, which does not exists anymore in 4.4.0


svn path=/nixpkgs/trunk/; revision=19910
2010-02-10 16:01:55 +00:00
Eelco Dolstra f724089f6f * Added a bundle of CA certificates, useful for e.g. curl.
svn path=/nixpkgs/trunk/; revision=19571
2010-01-20 14:10:26 +00:00
Lluís Batlle i Rossell 0c4c01f6c9 Adding bsdgames and miscfiles (this later, for 'words')
I could not easily make some bsdgames build or install. Too much patching
against the installer trying to write beyond the nix store.

svn path=/nixpkgs/trunk/; revision=17971
2009-10-26 23:03:36 +00:00
Lluís Batlle i Rossell 1c5056a7d7 Updating the xkeyboard_config patch for esperanto with alt_gr
svn path=/nixpkgs/trunk/; revision=15848
2009-06-03 21:21:10 +00:00
Eelco Dolstra 58b4add4e6 * Updated the IANA /etc info.
svn path=/nixpkgs/trunk/; revision=15763
2009-05-28 12:42:41 +00:00