mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-21 13:10:33 +00:00
Code Issues Wiki Activity
60429 commits 312 branches 124 tags 6.5 GiB
Commit graph

52005 commits

Author SHA1 Message Date
William A. Kennington III 4a76e860bb libunwind: Add meta information 2015-04-01 19:33:39 -07:00
William A. Kennington III 475e43ee22 mariadb: Fix on i686 2015-04-01 19:10:24 -07:00
Eric Seidel 06f3a686e0 emacs-packages: update magit and git-modes 2015-04-01 18:11:20 -07:00
William A. Kennington III 758319f67f One more mysql fix 2015-04-01 16:52:38 -07:00
William A. Kennington III b524480695 More mysql migrations 2015-04-01 16:50:47 -07:00
William A. Kennington III a604b42480 mysql: Use libs in place of the binary mysql 2015-04-01 16:46:53 -07:00
William A. Kennington III bc7b39784a DBD-mysql: 4.023 -> 4.031 2015-04-01 16:41:19 -07:00
William A. Kennington III 71a2a59f46 opendbx: 1.4.4 -> 1.4.6 2015-04-01 16:31:51 -07:00
Spencer Whitt 2b79ac6339 gimp: build on Darwin 2015-04-01 19:25:06 -04:00
Spencer Whitt 1155bb97f8 poppler: 0.28.1 -> 0.32.0 and cmake -> configure 
Use autotools build script rather than cmake as the cmake build script
is buggy (doesn't seem to work with openjpeg2)

Fixes build on Darwin and openjpeg2 support on Linux
 2015-04-01 19:24:20 -04:00
Spencer Whitt d27ba2824a gegl: fix Darwin build 2015-04-01 19:24:20 -04:00
Spencer Whitt 8430216fb5 aalib: patch for Darwin 2015-04-01 19:24:19 -04:00
Spencer Whitt fe527e7d33 babl: 0.1.10 -> 0.1.12 
New version fixes build on Darwin
 2015-04-01 19:24:03 -04:00
William A. Kennington III e97b63a727 mariadb: Fix mysql_config generation 2015-04-01 16:12:22 -07:00
Arseniy Seroka ee65a934b2 Merge pull request #7128 from lancelotsix/add_pytest_quickcheck 
Add pytest-quickcheck testing framework
 2015-04-02 02:09:34 +03:00
Nikolay Amiantov 4da3e360e8 rxvt_unicode-with-plugins: rename (keep the old name for a while) 2015-04-02 01:49:53 +03:00
Nikolay Amiantov 98a32ad124 xmonad-with-packages: use 'inherit' 2015-04-02 01:49:53 +03:00
Nikolay Amiantov 7a3780a675 crawl: fix build 2015-04-02 01:48:21 +03:00
Nikolay Amiantov 30a3175a31 Merge pull request #7120 from shak-mar/master 
rxvt_unicode_with-plugins: add wrapper for urxvtd
 2015-04-02 01:39:18 +03:00
William A. Kennington III be9aa93ddc mariadb: Fix input propagation 2015-04-01 15:10:04 -07:00
William A. Kennington III 7c30e7aa04 Merge pull request #7126 from spwhitt/imagemagick 
Fixes for ImageMagick's dependencies on Darwin
 2015-04-01 14:31:14 -07:00
William A. Kennington III e05b68ed05 More cleanups of sw/sbin 2015-04-01 14:26:22 -07:00
Eric Seidel 422e91d0f9 Merge pull request #7112 from spwhitt/gtk3 
gtk3: fix Darwin build
 2015-04-01 14:03:38 -07:00
Spencer Whitt 2f63e26d04 fontforge: fix Darwin build 2015-04-01 17:00:04 -04:00
Spencer Whitt 0253cf06c0 libfpx: fix Darwin build 2015-04-01 16:59:33 -04:00
Spencer Whitt d68a0554b6 librsvg: Fix libintl undefined symbols on Darwin 2015-04-01 16:57:40 -04:00
William A. Kennington III ff21171921 Fix references to current-system/sw/sbin 2015-04-01 13:57:36 -07:00
Peter Simons 75b527c1e1 haskell-modules: disable broken builds on Hydra 2015-04-01 22:54:45 +02:00
Peter Simons 36a2361976 haskell-ng-lib: add combinators for enabling/disabling source hyper-linking 2015-04-01 22:54:45 +02:00
Peter Simons 945269a48f haskell-generic-builder: gratuitous cosmetic change to trigger a complete re-build 
hydra.nixos.org serves broken binaries because of our favorite non-deterministic
package IDs in GHC bug. :-( Re-building everything from scratch seems like the
easiest way to recover.
 2015-04-01 22:54:45 +02:00
Peter Simons 7eda2f9ebb haskell-generic-builder: allow use of 'env' attributes in nix-shell 
We disabled this to prevent users from accidentally running nix-build on
an 'env' attribute, but in fact the ability to use those in combination
with "nix-shell -p" is quite useful, so the restriction is lifted.
 2015-04-01 22:54:45 +02:00
Peter Simons 59a1969f88 haskell-generic-builder: enable parallel building of libraries with GHC version >= 7.10.1 
We'll blame @Fuuzetsu if this change produces broken binaries left and right.
 2015-04-01 22:54:45 +02:00
Peter Simons 943bc26762 haskell-generic-builder: when replacing an edited Cabal file, show the download URL rather than the store path 2015-04-01 22:54:45 +02:00
Peter Simons 1afa8d28ea hackage-packages.nix: re-generate from Hackage 2015-04-01T12:39:25+0200 2015-04-01 22:54:45 +02:00
Spencer Whitt 759d55dc94 gtk3: fix Darwin build 2015-04-01 16:45:37 -04:00
Lancelot SIX 237029ab74 Add pytest-quickcheck testing framework 
Add Pytest-quickcheck and necessary dependencies into pythonPackages
set.
 2015-04-01 22:43:58 +02:00
William A. Kennington III 53f1d8147d mariadb: Make derivation smaller and split out libs 2015-04-01 13:24:29 -07:00
William A. Kennington III 050e6fa431 mysql51: Remove from the small release 2015-04-01 13:24:29 -07:00
Tobias Geerinckx-Rice f97f3d7a1b lz4 127 -> 128 
Tests now fail when run in parallel. Don't.
 2015-04-01 20:23:47 +02:00
Tobias Geerinckx-Rice eecb59a805 samsungUnifiedLinuxDriver 0.92 -> 4.00.39 
This not the latest, but the greatest version (by number of models still
supported).

A big bump. Everything seems to work fine. Tested with a Samsung CLP-325.
Also fixed some strange things. Did this ever even work? On x86_64?
 2015-04-01 19:54:40 +02:00
William A. Kennington III a993778fd7 Merge pull request #7101 from spwhitt/openexr_impurity 
Fix impurity in OpenEXR + IlmBase
 2015-04-01 10:31:06 -07:00
Spencer Whitt 1924e48253 jbigkit: patch makefiles to use Clang when needed 2015-04-01 12:36:39 -04:00
Edward Tjörnhammar cce00353d0 Merge pull request #7122 from joelmo/i2p-official 
i2p: added package
 2015-04-01 18:24:22 +02:00
Joel Moberg 81465e8e56 graph-tool: add joelmo to maintainers 2015-04-01 18:16:15 +02:00
Joel Moberg 243ec61c4f i2p: initial 2015-04-01 18:15:54 +02:00
aszlig 8664aea63d
Revert "mdadm: 3.3 -> 3.3.2". 
This reverts commit 7719f7f23b, again!

It prevents systems from booting, for two reasons:

  * The initrd size is going to explode, but I think this is not the
    REAL issue. We had that in 666cf99 already, which reverted this
    update already.
  * Another reason I don't yet know, which is the REAL issue. We need to
    investigate and fix that before attempting another update.

Because of that I've also added a small comment before the src attribute
to prevent further updates like this.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2015-04-01 17:59:09 +02:00
Edward Tjörnhammar b3e1021b41 i2pd: 0.8.0 -> 0.9.0 2015-04-01 16:35:47 +02:00
Eelco Dolstra 33dfdbd0df php: Update to 5.4.39 
CVE-2015-2787, CVE-2015-2348, CVE-2015-2305, CVE-2015-2331.
 2015-04-01 16:22:12 +02:00
lethalman e2bc785fe1 Merge pull request #7119 from joachifm/gnu-smalltalk-emacs-support 
gnu-smalltalk: optional emacs support
 2015-04-01 14:58:23 +02:00
Shea Levy f1e2b02cd3 Add Net::SMTP::TLS::ButMaintained perl package 2015-04-01 08:53:00 -04:00
Joachim Fasting c958486eea gnu-smalltalk: optional emacs support 2015-04-01 14:44:42 +02:00
shak-mar 46103aa853 rxvt_unicode_with-plugins: add wrapper for urxvtd 2015-04-01 14:32:47 +02:00
Peter Simons fbfec3fc35 llvmPackages_34.dragonegg is broken because the required "ABIHack.inc" patch has disappeared upstream 2015-04-01 14:31:48 +02:00
Eelco Dolstra 4c8f0e8d1c firefox: Update to 37.0 2015-04-01 14:04:19 +02:00
Eelco Dolstra b8ccb390b3 blender: Update to 2.74 2015-04-01 13:31:05 +02:00
Eelco Dolstra 3779aa07f5 ffmpeg: Reduce dependency bloat 
It was depending on Qt, MariaDB and PostgreSQL (via v4l-utils),
causing the closure size to explode from 475 MB to 1.3 GB.

http://hydra.nixos.org/job/nixpkgs/trunk/ffmpeg.x86_64-linux#tabs-charts

Also disabled a bunch of other mostly obscure dependencies.
 2015-04-01 13:31:05 +02:00
lethalman c1c64f70c6 Merge pull request #7046 from svenkeidel/gnu-smalltalk 
gnu-smalltalk: new package
 2015-04-01 12:03:48 +02:00
Vincent Laporte 71b04c5b3a ocaml-fileutils: also install the API documentation 2015-04-01 09:58:26 +02:00
Vladimír Čunát edee502f81 ngrep: fix build by using make-3 
/cc maintainer @bjornfor.
 2015-04-01 08:41:45 +02:00
Domen Kožar 06a810659c Merge pull request #7102 from oxij/fix-fixed-notmuch 
pythonPackages: notmuch: revert 6258728, move sourceRoot setting to top-level
 2015-04-01 07:14:25 +02:00
Eric Seidel bb363dd2f2 fetchgitlocal: use output of git show and git diff to tell nix whether the source has changed. 
this is way more hacky than i was hoping...
 2015-03-31 20:00:00 -07:00
John Wiegley 80c6c5e9ec global: wrap "global" in the same fashion 2015-03-31 20:56:05 -05:00
John Wiegley c7ce8c7768 global: make pygments visible to "gtags" binary 2015-03-31 20:53:22 -05:00
William A. Kennington III b74833bc20 mysql55: 5.4.40 -> 5.4.42 2015-03-31 16:17:55 -07:00
William A. Kennington III 5f231e7f08 mysql51: Refactor 2015-03-31 16:17:54 -07:00
Eric Seidel b8d75c66ee haskell-ng: need to use haddock-api-2.15 on ghc-7.8 2015-03-31 16:07:43 -07:00
Arseniy Seroka d32e1215b6 Merge pull request #7111 from spwhitt/libcroco 
libcroco: Enable building on Darwin
 2015-04-01 00:34:07 +03:00
William A. Kennington III 5bf407ada4 linux-testing: 4.0-rc4 -> 4.0-rc6 2015-03-31 14:28:42 -07:00
John Wiegley b29fc6bfaf global: add missing spaces to configureFlags 2015-03-31 16:09:40 -05:00
John Wiegley 3b83bf60ae Merge pull request #7107 from jwiegley/t/global-ctags 
Enable two modern features of GNU global
 2015-03-31 15:51:43 -05:00
Spencer Whitt 8988110572 at-spi2-atk + at-spi2-core: build on Darwin 2015-03-31 16:41:50 -04:00
Spencer Whitt f55393de94 pango: compile with gobjectIntrospection on Darwin 
Required to make .gir files needed by gtk3
 2015-03-31 16:41:50 -04:00
Nikolay Amiantov dda963caf1 gtksourceview: propagate gtk3 2015-03-31 22:04:43 +02:00
Nikolay Amiantov f2f826e97a haskellng: fix some gtk- and webkit-related packages 
Fixes https://github.com/NixOS/nixpkgs/issues/7108.
 2015-03-31 22:04:43 +02:00
Peter Simons f35b08ac39 haskell-csound-expression-dynamic: disable Haddock phase to fix the build 
https://github.com/anton-k/csound-expression-dynamic/issues/1
 2015-03-31 22:04:43 +02:00
Peter Simons d0ac04fbaa hackage-packages.nix: re-generate from Hackage 2015-03-31T16:39:41+0200 2015-03-31 22:04:43 +02:00
Spencer Whitt 7a0fae2162 libcroco: Enable building on Darwin 2015-03-31 12:37:26 -04:00
John Wiegley 227ebdc7cb Remove unnecessary entries in propagatedBuildInputs 2015-03-31 10:34:22 -05:00
John Wiegley 65b4013194 Add propagatedBuildInputs 2015-03-31 10:31:58 -05:00
John Wiegley b6932f56f8 Enable two modern features of GNU global 2015-03-31 10:30:19 -05:00
Domen Kožar 146eb665d0 Revert "cups: 1.7.5 -> 2.0.2" 
This reverts commit 032859faba.

Conflicts:
	pkgs/misc/cups/default.nix

Breaks nixos printing tests, see
032859faba (commitcomment-10495609)
 2015-03-31 16:51:07 +02:00
Tobias Geerinckx-Rice 0d9ebe7535 ipv6calc: use new geolite-legacy package 
GeoIP look-ups now actually work.
 2015-03-31 16:36:15 +02:00
Tobias Geerinckx-Rice b011d10cee netsniff-ng: use new geolite-legacy package 2015-03-31 16:36:15 +02:00
Tobias Geerinckx-Rice 1a77b59a85 Add geolite-legacy 2015-03-26 
The geoip package only installs a GeoIP _library_ which is useless
without a GeoIP _database_.

The only package to currently install such a database is ntopng, which
manually downloads Maxmind's GeoLite Legacy files to a private location.

Provide these as a separate package so other packages can use them as
well.
 2015-03-31 16:36:15 +02:00
lethalman 1670a75285 Merge pull request #6982 from obadz/monodevelop 
Monodevelop + Mono upgrade
 2015-03-31 16:30:42 +02:00
Peter Simons 9ce8d10dae haskell-cartel supports GHC 7.10.1 now. 2015-03-31 14:21:09 +02:00
Peter Simons bb38374158 haskell-xmonad-contrib: fix build 2015-03-31 14:21:08 +02:00
Arseniy Seroka f8c1aa96b8 apulse: fix sha 2015-03-31 15:11:47 +03:00
Peter Simons 6644bca846 idris: fix build by providing appropriate versions of the build inputs 
Resolves https://github.com/NixOS/nixpkgs/issues/7014.
 2015-03-31 13:56:16 +02:00
Tobias Geerinckx-Rice 2032740ea6 gparted 0.21.0 -> 0.22.0 2015-03-31 13:54:42 +02:00
Tobias Geerinckx-Rice ff1bccdbd5 python-packages: gdrivefs 0.14.2 -> 0.14.3 2015-03-31 13:54:41 +02:00
Peter Simons 3bf3e8076c Merge pull request #7087 from phile314/master 
haskell-uhc: New version, disable broken platforms.
 2015-03-31 13:25:38 +02:00
Karn Kallio 39a3fd1454 pure: advance to version 0.64; use llvm 3.5 as 3.6 breaks the build 2015-03-31 13:21:47 +02:00
Karn Kallio 2758e7c246 gdal: add libpng (for mysql workbench support) 2015-03-31 13:21:02 +02:00
lethalman b4824ffc5d Merge pull request #7103 from gebner/verit 
Add veriT, an SMT solver.
 2015-03-31 12:31:26 +02:00
lethalman 9151983435 Merge pull request #7100 from bcdarwin/fix-twelf 
twelf: fix by actually including the Twelf SML heap image in the package...
 2015-03-31 12:24:12 +02:00
Kevin Marsh 7f573ee2c6 Add nameparser python package 2015-03-31 10:52:32 +01:00
Karn Kallio 3fe7f80ef2 symbola: advance to version 7.21, correcting hash error 2015-03-31 11:09:06 +02:00
lethalman b6c7eba554 Merge pull request #7097 from prikhi/update-pencil 
pencil: v2.0.5 -> v2.0.8
 2015-03-31 10:10:23 +02:00
Gabriel Ebner 20428cd90f Add veriT. 2015-03-31 09:14:38 +02:00
Jan Malakhovski d711528c8b pythonPackages: notmuch: revert 6258728, move sourceRoot setting to top-level notmuch 
Looks like this is the only way to do what 6258728318
was expected to do that doesn't break things and doesn't look like a complete hack.

The problem is that different `fetch`ers generate very different results (from
archive files to plain source trees) and allowing overriding `src` in top-level
derivation when there is a derived python package is no trivial matter.
 2015-03-31 05:36:28 +00:00
Spencer Whitt 4012535571 Fix impurity in OpenEXR + IlmBase 2015-03-31 01:27:36 -04:00
Ben Darwin 54dab782be twelf: fix by actually including the Twelf SML heap image in the package and referencing the SML interpreter so the smlnj package won't be gc'd 2015-03-31 01:11:57 -04:00
Eric Seidel 9fc4c55620 Merge pull request #6815 from giogadi/add-darwin-swt 
Add Darwin case for java.swt
 2015-03-30 21:45:05 -07:00
Eric Seidel 454b8b25aa Merge pull request #7002 from spwhitt/libmad 
libmad: build on Darwin
 2015-03-30 20:35:44 -07:00
Spencer Whitt a6303c724f libmad: build on Darwin 2015-03-30 23:29:19 -04:00
Pavan Rikhi f67ce9160d
pencil: v2.0.5 -> v2.0.8 
Switch to actively developed fork.
 2015-03-30 22:59:04 -04:00
Arseniy Seroka 7facba28be Merge pull request #7075 from oxij/x11support-gcc 
gcc 4.8: add x11Support option so that it would stop evaluating gtk by default
 2015-03-31 03:20:40 +03:00
Arseniy Seroka cde096f440 xkblayout-state: fix name 2015-03-31 03:18:42 +03:00
Arseniy Seroka 62ad004862 apulse: update 2015-03-31 03:17:43 +03:00
aszlig 6a4370f1ba
qca2: Update to new upstream version 2.1.0. 
This also removes qca2_ossl, because it's now bundled with the main QCA
package and we can now drop all those patches and build system fixes,
because they have switched from autotools to cmake.

Tested against a few builds like PSI and Tomahawk.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2015-03-31 02:13:06 +02:00
Tobias Geerinckx-Rice ee7c9bd86a Add simple-scan 3.16.0.1 2015-03-31 00:51:47 +02:00
Tobias Geerinckx-Rice c7362b6b03 netsniff-ng: 0.5.9-rc4-{49-g6f54288 -> 53-gdd5d906} 
Fixes a bug that prevented mz from working at all.
 2015-03-31 00:51:47 +02:00
obadz 1129f6b0db mono 3.8.0 -> 3.12.1 
monodevelop 5.1.4.0 -> 5.7.0.660
 2015-03-30 23:48:25 +01:00
Sven Keidel fc3a714053 gnu-smalltalk: new package 2015-03-31 00:30:49 +02:00
Christian Theune b15078b579 Provide a basic package for sensu. 
The server currently starts without error messages (on OS X) if you also
install redis and rabbitmq-server and start their processes without any
further configuration:

$ redis-server
$ rabbitmq-server
$ sensu-server

Haven't tried much more yet, but will in a bit.

(Amended: fix whitespace and string literal formatting issues, and
superfluous dependencies created by the generator script.
Thanks the-kenny!)
 2015-03-30 23:56:15 +02:00
Arseniy Seroka cb9f2f8503 merging ssd-guru: fix conflicts 2015-03-30 23:35:14 +03:00
Shea Levy df50903da8 Merge branch 'submit/enable-syncthing-osx' of git://github.com/ctheune/nixpkgs 
Enable syncthing for Mac OS X.
 2015-03-30 16:17:53 -04:00
Christian Theune 6daa2462c6 Enable syncthing for Mac OS X. 
Also requires enabling iana-etc. I'm shooting for "unix" platforms which
seems reasonable. Not sure why this was restricted to linux originally --
the history doesn't tell.
 2015-03-30 22:07:02 +02:00
Nikolay Amiantov 7c03829024 Merge pull request #7060 from abbradar/nm-l2tp 
Support L2TP in NetworkManager
 2015-03-30 23:05:42 +03:00
Shea Levy b77aec818a Merge branch 'master' of git://github.com/ctheune/nixpkgs 
bump syncthing version to 0.10.30
 2015-03-30 16:03:04 -04:00
Christian Theune 703e43949d bump syncthing version to 0.10.30 2015-03-30 21:55:51 +02:00
Edward Tjörnhammar 1092b9da48 Merge pull request #7066 from edwtjo/xbmc-pruning 
Remove XBMC expressions in favor of the Kodi ones
 2015-03-30 21:46:29 +02:00
Edward Tjörnhammar 1345a65765 Remove XBMC expressions in favor of the Kodi ones 2015-03-30 21:43:32 +02:00
Philipp Hausmann a2b584ba5f
haskell-uhc: New version, disable broken platforms. 2015-03-30 18:47:38 +02:00
John Wiegley f2df60e2fb Merge pull request #7047 from codyopel/ffmpeg-darwin 
ffmpeg: improve cross platform support & fix licensing issues, resolves #7013
 2015-03-30 11:47:03 -05:00
lethalman 9c6e5527b2 Merge pull request #7028 from kevinmarsh/enum34 
Update python package enum34 1.0 -> 1.0.4
 2015-03-30 18:09:34 +02:00
lethalman fed2cf85ec Merge pull request #7065 from pmahoney/skarnet-2015-03-28 
update s6, execline, other skarnet.org
 2015-03-30 17:57:41 +02:00
lethalman 33fb8e2d52 Merge pull request #7084 from risicle/celery 
add packages for python-celery and its dependencies
 2015-03-30 17:39:33 +02:00
Luca Bruno dee2a5dda3 obs-studio: fix derivation name 2015-03-30 17:37:24 +02:00
lethalman ed46e81417 Merge pull request #7079 from jb55/obs-studio 
add obs-studio
 2015-03-30 17:37:02 +02:00
lethalman f2bb0bf964 Merge pull request #6913 from bdimcheff/add-packages-brasero-soundjuicer 
Add packages brasero and soundjuicer
 2015-03-30 17:31:09 +02:00
lethalman 9bbeb44517 Merge pull request #6950 from joelmo/master 
searx: update 0.3.0 -> 0.7.0 + fetchgit -> fetchurl
 2015-03-30 17:24:00 +02:00
lethalman 9f3153b162 Merge pull request #6958 from lancelotsix/add_basemap_python_module 
Add python basemap package
 2015-03-30 17:22:24 +02:00
Peter Simons aba61babe3 haskell-pandoc: disable test suite to fix the build 
The errors look harmless. Reported upstream at https://github.com/jgm/pandoc/issues/2036.
 2015-03-30 16:43:56 +02:00
Peter Simons 179f1b788f hackage-packages.nix: downgrade blaze-html and haddock-library to fix Pandoc build 2015-03-30 16:43:56 +02:00
Peter Simons e568408367 Nomyx has been fixed upstream. 2015-03-30 16:43:55 +02:00
Peter Simons 6306f9a761 hackage-packages.nix: re-generate with recent hackage2nix 2015-03-30 16:43:55 +02:00
Peter Simons d75bcc16f7 haskell-stringsearch no longer needs patching for GHC 7.10.x. 2015-03-30 16:43:55 +02:00
Peter Simons b9dd22f1cb haskell-haddock-library fails its test suite. 2015-03-30 16:43:55 +02:00
Peter Simons d619392bdc hackage-packages.nix: don't update default version of 'primitive' yet 2015-03-30 16:43:55 +02:00
Peter Simons e42e1ea6de hackage-packages.nix: re-generate from Hackage 2015-03-29T03:47:46+0200 2015-03-30 16:43:55 +02:00
Peter Simons 83db889148 haskell-base: don't try to build this package 2015-03-30 16:43:54 +02:00
Peter Simons 834f2dc27b haskell-integer-gmp: don't try to build this package 2015-03-30 16:43:54 +02:00
Peter Simons 67950f036e haskell-marquise fails its test suite. 2015-03-30 16:43:54 +02:00
Peter Simons 3061ce63aa haskell-llvm-base: deprecated package (that doesn't compile) 2015-03-30 16:43:54 +02:00
Arseniy Seroka 8852d8b1af Merge pull request #7074 from oxij/x11support-python 
python 2.7: add x11Support option
 2015-03-30 17:38:06 +03:00
Arseniy Seroka c1d5eee053 Merge pull request #7071 from oxij/conky-options 
conky: add lua-imlib2 and lua-cairo support, add more options, change defaults
 2015-03-30 17:36:38 +03:00
Arseniy Seroka 63f442a590 Merge pull request #7070 from oxij/more-cleanups 
More cleanups
 2015-03-30 17:35:38 +03:00
lethalman b379026d7e Merge pull request #6993 from kevinmarsh/pyscss 
Add pyScss python package
 2015-03-30 16:11:03 +02:00