3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

8949 commits

Author SHA1 Message Date
Michael Raskin 19530856ed Merge remote-tracking branch 'upstream/master' into x-updates
Conflicts:
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/gdk-pixbuf/default.nix
	pkgs/development/libraries/gtk+/2.x.nix
	pkgs/misc/ghostscript/default.nix
	pkgs/top-level/all-packages.nix
2013-06-13 17:12:43 +04:00
Michael Raskin ed51d54610 Merge pull request #606 from fignuts/master
Add keepass password manager and update mono DLLMap.
2013-06-13 05:42:53 -07:00
Michael Raskin 27bbff463f Merge pull request #601 from craff/ocaml/upgrade_and_new
Ocaml/upgrade and new
2013-06-13 05:41:59 -07:00
Michael Raskin c7536d2fa6 Merge pull request #617 from lovek323/vim_configurable
Get vim_configurable compiling on darwin
2013-06-13 05:41:12 -07:00
Jason "Don" O'Conal 6baad4d4d6 vim_configurable: fix compilation on darwin
* compile with gccApple
* enable darwinSupport by default
* do not use patchelf
2013-06-13 22:20:54 +10:00
Vladimír Čunát ca67fccbfe pyGtkGlade: fix eval
I didn't expect the file to be imported on two places.
2013-06-13 13:12:39 +02:00
Vladimír Čunát 84262c18e3 pygtk: propagate gtk (fixes solfege build) 2013-06-13 13:02:24 +02:00
Peter Simons 7b3ebfe8c5 haskell-haddock: add version 2.13.2.1 2013-06-13 10:43:35 +02:00
Jason "Don" O'Conal dc0c630e54 gtk2: fix compilation on darwin
* add libintlOrEmpty to build inputs
* allow cups to be disabled by setting config.gtk2.cups to false
2013-06-13 18:10:53 +10:00
Peter Simons 71439b3e96 Merge pull request #610 from lovek323/sup
Add sup expression
2013-06-12 23:33:19 -07:00
Peter Simons 128166a1f0 Merge pull request #613 from errge/hflags
Add hflags
2013-06-12 23:30:04 -07:00
Jason "Don" O'Conal a5e65e66b1 sup: separate dependencies
create separate expressions for gems requiring native extensions to be
built:

* gpgme
* ncursesw_sup
* xapian_full_alaveteli
2013-06-13 10:45:51 +10:00
Jason "Don" O'Conal 593228f18d Compile libusb with gccApple on darwin 2013-06-13 10:42:38 +10:00
Jason "Don" O'Conal 4fe22e28cb Add sup expression 2013-06-13 10:42:30 +10:00
Lluís Batlle i Rossell 4970ec637e Adding psmouse-alps, a touchpad kernel driver.
Some laptops use these new touchpads, and this driver is
supposed to provide proper support for them.
2013-06-12 22:55:58 +02:00
Gergely Risko c51077b222 Add hflags 2013-06-12 21:25:53 +02:00
Song Wenwu 92ba0a0913 gtk+: enable NLS support (merge #611)
@vcunat: add minor refactorings like file-naming style unification.
ToDo: we get 2*20MB of locale, perhaps it's worth splitting one day.
2013-06-12 10:18:38 +02:00
Sander van der Burg 6fff888ae8 nijs: bump to 0.0.8 2013-06-11 15:09:10 +02:00
Michael Raskin 1a45886454 Merge branch 'master' into x-updates 2013-06-11 15:46:10 +04:00
Michael Raskin 55249de924 Update Julia to today's revision 2013-06-11 15:44:56 +04:00
Eelco Dolstra eaf98cf26e nixUnstable: Update to 1.5.3pre3134_5c06e52 2013-06-11 12:08:37 +02:00
Peter Simons c662109f8a Merge pull request #607 from ocharles/perl-packages
Add lots more Perl packages
2013-06-11 02:22:47 -07:00
Peter Simons a5a74c9c44 release.nix: remove emacs-ecb from nixos-tarball
ecb mode is a part of Emacs and no longer exists as a separate package in Nixpkgs.
2013-06-11 11:05:42 +02:00
Mathijs Kwik fcfbce4b80 Revert "firefox: Revert to 20.0"
This reverts commit 9875413c48.
2013-06-11 09:32:39 +02:00
Michael Raskin 46cd2d0d68 Merge pull request #568 from MarcWeber/submit/vim-multiple-version-and-plugins
vim: supporting multiple sources & complicated plugins
2013-06-10 23:06:56 -07:00
Evgeny Egorochkin 2e939a0fba Merge pull request #608 from ocharles/fabric
fabric: new expression
2013-06-10 23:01:59 -07:00
Oliver Charles d67c4690d3 fabric: new expression 2013-06-10 23:33:39 +01:00
Oliver Charles c078f67a7a perlPackages.TestMagpie: new expression 2013-06-10 23:06:08 +01:00
Oliver Charles 6a7882ed8d perlPackages.LWPUserAgentMockable: new expression 2013-06-10 23:05:08 +01:00
Oliver Charles 15700d49c1 perlPackages.TemplatePluginClass: new expression 2013-06-10 23:04:08 +01:00
Oliver Charles 1c94ac90b4 perlPackages.MethodSignaturesSimple: new expression 2013-06-10 23:03:19 +01:00
Oliver Charles 18b9044ec8 perlPackages.HTMLSelectorXPath: new expression 2013-06-10 23:01:14 +01:00
Oliver Charles ad136350c1 perlPackages.TestXPath: new expression 2013-06-10 22:58:22 +01:00
Oliver Charles 652425af07 perlPackages.MooseXRunnable: new expression 2013-06-10 22:57:32 +01:00
Oliver Charles 6d5b82416e perlPackages.TemplatePluginJavaScript: new expression 2013-06-10 22:56:40 +01:00
Oliver Charles 8a11acd8ac perlPackages.EnvPath: new expression 2013-06-10 22:56:01 +01:00
Oliver Charles 7e3f666673 perlPackages.TestJSON: new expression 2013-06-10 22:55:13 +01:00
Oliver Charles 912710ee9e perlPackages.XMLSemanticDiff: new expression 2013-06-10 22:54:29 +01:00
Oliver Charles 3a72c70ff4 perlPackages.TestMockClass: new expression 2013-06-10 22:53:59 +01:00
Oliver Charles cba31c7778 perlPackages.TestRoutine: new expression 2013-06-10 22:47:53 +01:00
Oliver Charles ac45df073d perlPackages.StringShellQuote: new expression 2013-06-10 22:47:21 +01:00
Oliver Charles 9130659599 perlPackages.DBIxConnector: new expression 2013-06-10 22:46:38 +01:00
Oliver Charles 51e8ad1c2b perlPackages.HTMLTreeBuilderXPath: new expression 2013-06-10 22:45:25 +01:00
Oliver Charles 32829201a4 perlPackages.IOAll: new expression 2013-06-10 22:44:14 +01:00
Oliver Charles 746b9fdaca perlPackages.DigestMD5File: new expression 2013-06-10 22:43:09 +01:00
Oliver Charles c20fa8b209 perlPackages.StringTT: new expression 2013-06-10 22:41:35 +01:00
Oliver Charles db0e68a37b perlPackages.EmailMIME: new expression 2013-06-10 22:39:50 +01:00
Oliver Charles 2aa2fff2d9 perlPackages.NetCoverArtArchive: new expression 2013-06-10 22:38:32 +01:00
Oliver Charles 3cbfa75086 perlPackages.NetAmazonS3Policy: new expression 2013-06-10 22:37:58 +01:00
Oliver Charles c332132cb1 perlPackages.NetAmazonAWSSign: new expression 2013-06-10 22:37:22 +01:00