mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-25 03:17:13 +00:00
Code Issues Wiki Activity
23635 commits 204 branches 125 tags 10 GiB
Commit graph

5988 commits

Author SHA1 Message Date
Mathijs Kwik 2cdc567ff5 new package: phantomjs 2012-12-13 17:51:03 +01:00
Rickard Nilsson 591c27e58d argyllcms: New package, version 1.4.0 
ArgyllCMS is an ICC compatible color management system.
 2012-12-13 16:01:35 +01:00
Mathijs Kwik caf561d41a aufs3: upgrade to 1210 release, add linux-3.7 support 2012-12-13 14:00:28 +01:00
Lluís Batlle i Rossell 465f4f4e3e freecad: updating to git master 2012-12-13 12:38:19 +01:00
Eelco Dolstra 726b1bebbc Remove udev 173 2012-12-13 11:42:00 +01:00
Eelco Dolstra 8116fd9341 consolekit: Remove 
This package is obsolete with systemd.
 2012-12-13 11:30:18 +01:00
Eelco Dolstra fd6941ad48 nut: Update to 2.6.5 and fix building against systemd 
http://hydra.nixos.org/build/3473781
 2012-12-12 16:17:47 +01:00
Eelco Dolstra 6a176c79cf Merge remote-tracking branch 'origin/master' into systemd 2012-12-12 16:09:19 +01:00
aszlig 5054e8ec29
scid: New package, version 4.3. 
Just saw Michael Raskin's GNU Chess and XBoard updates and did a short check if
Scid is already in nixpkgs. It wasn't, so I decided to add it, so thanks to
@7c6f434c :-)

The package involves a lot of patching, as usual with Tcl/Tk on NixOS. In this
case the program is written in C++ and embeds the Tcl/Wish interpreter.

Unfortunately this doesn't make it easier to inject TCLLIBPATH, as there doesn't
seem to be a direct library call (well in theory you could `lappend TCLLIBPATH`,
but that won't help with TK_LIBRARY).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2012-12-12 12:36:20 +01:00
aszlig 0c160be3d2
ascii: New package, version 3.12. 
Quite a useful tool, especially for non English native speakers to find out what
people mean with things like "hiccup", "boink", "blugle" and whatnot.

And of course it's quite useful to convert between hex/oct/dec/bin.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2012-12-12 12:36:19 +01:00
aszlig 6acc5289fc
vbindiff: New package, version 3.0_beta4. 
Visual binary differences viewer, very useful for reverse-engineering
proprieritary file formats.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2012-12-12 12:36:18 +01:00
aszlig e42dc52f42
samplicator: New package, version 1.3.7-beta6. 
A small and lightweight UDP redirector if you don't want to bend a fly on the
wheel using socat.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2012-12-12 12:36:18 +01:00
aszlig abb7c98cfe
wbox: New package, version 5. 
Yet another HTTP benchmarking tool, which is really quite minimalistic and in
ANSI C.

This package maybe isn't even worth putting it in its own file and directory but
I did it for the sake of consistency.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2012-12-12 12:36:18 +01:00
aszlig 7cd641a4e7
hping: New package, version 20051105. 
Quite a lot of patching involved here, but the upstream package is no longer
maintained anymore. Nevertheless the tool is still useful in some environments.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2012-12-12 12:36:17 +01:00
Lluís Batlle i Rossell 67019c1676 Fixing the 3.7 kernel packages. They referred to 3.6. 2012-12-12 11:20:44 +01:00
Michael Raskin 232fedb1c7 XBoard: update to 4.6.2 2012-12-12 09:29:49 +04:00
Shea Levy 9ddd1cc78b Linux 3.7 
Kernel configuration succeeds, I'll let hydra test the build
 2012-12-11 11:57:04 -05:00
Eelco Dolstra f36f5cc82c Mark socat2 as lowPrio 2012-12-11 14:53:23 +01:00
Rickard Nilsson bdfe779d2c Add xcalib 0.8, a tiny monitor calibration loader 2012-12-11 11:36:02 +01:00
Rickard Nilsson 6d8109555e Add legacy version 304.64 of the Nvidia driver 
The current 310.x version of the Nivida driver has dropped support
for some cards (for example 6200LE).
 2012-12-11 11:33:40 +01:00
Lluís Batlle i Rossell 0f7dee47a1 librecad: adding its 2.0 beta version too 2012-12-11 09:53:25 +01:00
Eelco Dolstra 179df95090 Merge remote-tracking branch 'origin/master' into systemd 2012-12-10 12:39:14 +01:00
Michael Raskin 1c3434cc16 Update E prover 2012-12-09 00:36:38 +04:00
Shea Levy 5f8647e7ae Merge branch 'redis' of https://github.com/washort/nixpkgs into upstream 
fixes for redis on OSX
 2012-12-07 12:28:58 -05:00
Allen Short c47e911177 fixes for redis on OSX 2012-12-07 09:23:53 -08:00
Eelco Dolstra 1c24391251 nix: Update to 1.2 2012-12-07 13:46:07 +01:00
Peter Simons 24d9f8b4e2 pkgs/top-level/all-packages.nix: implement 'mesaSupported' attribute on top of mesaPlatforms 
Thanks to Florian Friesdorf for pointing out the inconsistency in these attributes.
 2012-12-06 11:28:23 +01:00
cillianderoiste 5b0cd954f1 Merge pull request #206 from chaoflow/python-merge 
python pureness, cleanup, and enable pth loaders (setuptoolsSite, recursivePthLoader)
 2012-12-05 14:28:09 -08:00
Mathijs Kwik bc9efb67ef spice: upgrade to 0.12.0 2012-12-05 20:22:49 +01:00
Peter Simons 0df00b7a1b all-packages.nix: provide an alias from 'haskell-darcs-ghc7.4.2-2.8.3' to 'darcs-2.8.3' 2012-12-05 14:25:09 +01:00
aszlig 8fd4b80bc7
chromium: Don't use the config attrset anymore. 
We can still use the config attribute set from within all-packages to pass it to
the package expression, which we do in case of PulseAudio. In order to override
other stuff you can now conveniently use chromium.override without passing a
fake config attribute set.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2012-12-05 14:05:18 +01:00
aszlig 5138c46432
all-packages: Add chromiumBeta and chromiumDev. 
Now Hydra should pick up those versions as well, so users can easily switch
between different chromium channels without the need to wait up to several hours
in order to build Chromium (depending on hardware of course, nowadays it
shouldn't take more than one hour, I guess).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2012-12-05 14:05:18 +01:00
Florian Friesdorf 3cf96816b0 pycrypto for python26 and 27 2012-12-05 11:31:28 +01:00
Evgeny Egorochkin 0eecd67d14 Package Samsung unified printer driver. i686 only but apparently can be improved to support x86_64. Based on patch by James Cook <james.cook[NOSPAM]@utoronto.ca> 2012-12-05 05:43:19 +02:00
Michael Raskin 8a6b0087a9 Update GlusterFS 2012-12-04 21:54:20 +04:00
Peter Simons 50e7ddbdca Add DLX simulator. Upstream provides no version number. 2012-12-04 14:29:48 +01:00
Michael Raskin 38323efd03 Fix cfdg build 2012-12-04 14:46:59 +04:00
Michael Raskin 2ab2b27e93 Update FBTerm to current URL of tarball 2012-12-04 11:47:40 +04:00
aszlig 37fc18eb1e
mplayer: Take config.pulseaudio into account. 
Packages like libao or skype already honor config.pulseaudio, so let's assure
that mplayer does so as well.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2012-12-03 11:10:16 +01:00
Florian Friesdorf d76e4420af pil for python27 and python26 2012-12-03 07:12:05 +01:00
Florian Friesdorf e1d2ffa934 fix zabbix20 2012-12-02 17:52:01 +01:00
Rob Vermaas 70f9071adf Add zabbix 2.0.3 2012-12-02 15:28:08 +01:00
Rob Vermaas 8c5d9098fa Add hiphopvm 2012-12-02 15:24:28 +01:00
Rob Vermaas faaa1581e2 Added re2c 0.13.5 2012-12-02 00:25:01 +01:00
Rob Vermaas 502587abb0 Added libdwarf, libevent 1.4, libmcrypt, libmemcached, oniguruma. These are dependencies for HipHop Virtual Machine. 2012-12-01 21:28:32 +01:00
Michael Raskin e9c35e9381 Add Pingus 2012-12-02 00:23:28 +04:00
Mathijs Kwik d4d4528833 new package: GPAC 2012-12-01 12:23:23 +01:00
Michael Raskin 702590f6c6 Add Lincity-NG fork 2012-11-30 22:59:26 +04:00
Eelco Dolstra 012a838ea2 Remove Firefox 16 2012-11-30 11:33:44 +01:00
Eelco Dolstra 59e979177d Remove duplicate tcp-wrappers package 2012-11-29 15:26:13 +01:00
Eelco Dolstra ea1d49d0a1 Remove unused attribute qt4_for_skype 2012-11-29 15:26:13 +01:00
Eelco Dolstra 79725bb5bc Mark some packages as low priority and disambiguate some others 2012-11-29 15:26:13 +01:00
Eelco Dolstra ab1b0e6359 Minor cleanup 2012-11-29 15:26:13 +01:00
Eelco Dolstra 72684fb42f Remove support for the obsolete powerpc-darwin and i686-darwin platforms 2012-11-29 14:10:49 +01:00
Eelco Dolstra 4b48d05c58 Remove nixCustomFun 
Rationale: on the one hand, there are generic customisation facilities
like overrideDerivation; on the other hand, nixCustomFun cannot
possibly accomodate every customisation scenario, so it's easier to
just modify/copy default.nix.
 2012-11-29 13:47:40 +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 f04aa4fb59 Remove findutils 4.2.27 
We only used this version on Darwin, but the regular findutils seems
to build fine.
 2012-11-29 12:02:07 +01:00
Eelco Dolstra 2eace0dfe6 Make "nix-env -i openjdk" do the right thing 2012-11-29 11:36:51 +01:00
Peter Simons a4937f9031 Merge pull request #202 from jcumming/games.121128 
World of Goo 1.41.
 2012-11-29 02:22:58 -08:00
Jack Cummings 6540190179 World of Goo 1.41. 2012-11-28 14:38:46 -08:00
Jack Cummings 9d6f5f79e4 Add 'connect' for traversing SOCKS proxies 2012-11-28 14:29:11 -08:00
Lluís Batlle i Rossell 2671e32c20 qcad: removing it. it didn't build since long and librecad replaces it. 
I think librecad is a good replacement for the super-outdated qcad community
edition. And afaik, librecad started by taking the qcad code and putting it
more up to date.
 2012-11-28 11:45:58 +01:00
Peter Simons 06cb0fa20c Merge pull request #197 from aforemny/despotify 
Add despotify
 2012-11-28 01:17:33 -08:00
Peter Simons 614c7501bc Merge pull request #193 from badi/gromacs 
Add Gromacs
 2012-11-28 01:16:17 -08:00
Antono Vasiljev 1bf18a589c arduino-core libraries +inotool 2012-11-28 04:55:24 +03:00
Baptist BENOIST 876b1c1cac qtcreator: Build QmlDesigner Plugin 
Building of this plugin required qt's private headers.
See http://qt.gitorious.org/qt-creator/qt-creator/blobs/master/README for more.
 2012-11-27 23:13:18 +01:00
Peter Simons 89eb9435ae all-packages.nix: strip trailing whitespace 2012-11-26 16:18:05 +01:00
Peter Simons a814d0bc90 SANE: switch snapshot version of the backends to git (and general cleanup) 2012-11-26 16:18:05 +01:00
Florian Friesdorf ca429c3b61 znes needs libpng12 2012-11-26 12:58:30 +01:00
Eelco Dolstra cc4aab2025 firefox: Disable parallel building 
http://hydra.nixos.org/build/3348854
 2012-11-26 11:50:10 +01:00
Eelco Dolstra a15fad323b Make Firefox 17 the default 2012-11-26 11:26:39 +01:00
Michael Raskin 7333c01dba Update Compiz 2012-11-25 23:58:04 +04:00
Alexander Foremny d50712e376 Add despotify 2012-11-25 14:01:13 +01:00
Peter Simons 4199b9e80a all-packages.nix: strip trailing whitespace 2012-11-23 23:21:15 +01:00
Peter Simons 3667144395 xsane: build with snapshot version of the sane backends 
The last release of that code is ancient. Not sure what these SANE guys
are doing. Anyway, the current Git snapshot works just fine for me.
 2012-11-23 23:20:55 +01:00
Eelco Dolstra 7194db80e9 Merge branch 'master' into systemd 2012-11-23 18:06:49 +01:00
Eelco Dolstra d4e3064669 firefox: Add 17.0 2012-11-23 16:41:41 +01:00
Eelco Dolstra c9baa28fef Remove Firefox 15 2012-11-23 16:41:41 +01:00
Badi' Abdul-Wahid 7bdcb521b2 Update based on comments to pull request 2012-11-23 15:29:17 +01:00
Badi' Abdul-Wahid 0dab509b3c Merge branch 'master' of git://github.com/NixOS/nixpkgs into origin/gromacs 2012-11-23 15:27:37 +01:00
Eelco Dolstra 880ce8da2e nxml-mode: Remove 
This package is now part of Emacs itself.
 2012-11-23 11:10:30 +01:00
Badi' Abdul-Wahid 85a33507ea Add GROMACS v4.5.5 2012-11-23 03:38:13 +01:00
Shea Levy 7a16291828 Add rng-tools 2012-11-22 01:05:45 -05:00
Michael Raskin 1b15008952 Merge pull request #153 from jcumming/icecast 
- icecast-2.3.3, libshout-2.3.1
 2012-11-21 21:30:28 -08:00
Cillian de Róiste c238c19220 Add Bristol: a range of synthesiser, electric piano and organ emulations 2012-11-22 00:08:28 +01:00
Peter Simons b62393bbb0 Merge pull request #158 from bbenoist/qvtk 
vtk: latest version + useQt4 option
 2012-11-20 12:44:15 -08:00
Peter Simons 2f55f31f49 Merge pull request #155 from bbenoist/newpkgs 
New pkgs: qtcreator fox xfe gmrun geany
 2012-11-20 12:43:06 -08:00
Peter Simons aa7d0c4cc5 Merge pull request #178 from mpashton/abcde-new 
Updated version of abcde to 2.5.4
 2012-11-20 12:41:40 -08:00
Mathijs Kwik 125953f1bc add package: neoload-4.0.4 2012-11-18 15:33:52 +01:00
Mathijs Kwik b4e7e21134 add package: "safecopy-1.7" 2012-11-17 21:27:18 +01:00
Peter Simons f9ec7d36ce wmname: add version 0.1 
Run "wmname LG3D" to fix Java GUIs running in the ratpoison window manager.
This probably applies to other tiling window managers, too.
 2012-11-17 12:57:25 +01:00
Peter Simons 58b56c268b graphviz-dot-mode: add version 0.3.3 2012-11-16 18:59:18 +01:00
Lluis Batlle d2d761b692 gpg/pth: fixing the pth building on arm 
I could built pth with the fix commented in:
http://forums.gentoo.org/viewtopic-t-904280-start-0.html

And I remove the 'pth.supported' structure I had built.
 2012-11-15 12:38:18 +01:00
David Guibert c604ff045e add cifs_timeout to kernel 3.5 2012-11-15 07:41:11 +01:00
cillianderoiste 341eb7b133 Merge pull request #186 from cillianderoiste/python-rsvg-pull-request 
Python rsvg pull request (was #115)
 2012-11-14 11:34:18 -08:00
Peter Simons 724d416fae erlang: drop obsolete R15B01 version 2012-11-11 20:41:50 +01:00
Malcolm 4fbd441418 Adding Erlang R15B02 2012-11-11 20:38:53 +01:00
Peter Simons 0757af1693 qfsm: add version 0.53.0 2012-11-11 20:32:41 +01:00
Cillian de Róiste 27f3a41754 Add key-mon 
a utility to show live keyboard and mouse status for teaching and screencasts
 2012-11-11 18:13:04 +01:00
Rob Vermaas ee142ea983 Add Sublime Text editor 2012-11-10 20:37:42 +01:00
Shea Levy 9e5ee2b51e Resurrect firefox 13 from rev ea2fbd7864 (needed for selenium testing) 2012-11-09 10:25:03 -05:00
Lluís Batlle i Rossell 55d74fbf3b Changing the crosscompiler to gcc47. 
gcc from 4.5 to 4.7 have important bugs for mips.

https://www.linux-mips.org/cgi-bin/mesg.cgi?a=linux-mips&i=20120906140843.GA17068%40linux-mips.org
 2012-11-08 22:33:56 +01:00
Peter Simons 86fa903f6c tkgate: add versions 1.8.7 and 2.0-b10 2012-11-08 17:30:50 +01:00
Eelco Dolstra e89eab8893 Make "nix-env -i android-sdk" DTRT 2012-11-08 16:38:38 +01:00
Eelco Dolstra 8fccca30f1 Mark some cross-compiled packages as low priority 2012-11-08 16:31:08 +01:00
Eelco Dolstra 5d6860ec5b skype: Update to 4.0.0.8 
Also, use $out/libexec/skype rather than $out/opt/skype.
 2012-11-08 16:31:08 +01:00
Michael Raskin c7d2e34758 Add nspluginwrapper, a tool to execute browser plugins out-of-process 2012-11-08 11:38:34 +04:00
Michael Raskin c2bc48aef3 Update Uzbl 2012-11-08 10:34:06 +04:00
Sander van der Burg 3afa95bfba Added androidenv - the Android SDK, their additions and two functions that build and emulate Android Apps 2012-11-07 21:10:39 +01:00
Rickard Nilsson 7afafe0b6d dmenu: Add option config.dmenu.enableXft for enabling xft font support (turned off by default). 2012-11-07 16:03:37 +01:00
Peter Simons ce2e93a236 Update default Haskell environment to Haskell Platform 2012.4.0.0. 
The most significant change brought by this update is that we now use
GHC version 7.4.2 by default.
 2012-11-06 18:34:54 +01:00
Eelco Dolstra 9322bee988 Use systemd instead of udev, and don't use consolekit 2012-11-06 13:02:11 +01:00
Lluís Batlle i Rossell bb3b603ea7 mips linux: Adding a patch to fix an ext3 bug in 3.5 and 3.6 
I made it apply to all Mips, although the bug works only for n32 and o32 ABIs.
We don't support any n64 by now.
 2012-11-06 00:16:13 +01:00
Peter Simons 31ca4356fb boost: update to version 1.52.0 2012-11-05 21:45:51 +01:00
Eelco Dolstra 5896f13961 thunderbird: Update to 16.0.2 2012-10-31 17:16:01 +01:00
Michael Ashton 78db9a8cb1 Updated version of abcde to 2.5.4 
- Added support for MusicBrainz queries to abcde package
- Added new dependencies to abcde: mkcue, eject, perl, MusicBrainz, MusicBrainzDiscID
- libdiscid version in pkg-config was incorrect; patched libdiscid to fix
- Added WebServices::MusicBrainz Perl module
- Added MusicBrainz::DiscID Perl module
- Commented out XSLoader Perl module since it was broken, no packages depend on it,
  and it has been incorporated into the Perl core
 2012-10-29 17:14:39 -07:00
Joachim Schiele 49f2fef481 updated spring from 88 to 91 and downgraded the boost library which spring uses from default to 1.49 as the 
more recent boost version results in a build issue at about 30%
 2012-10-28 13:43:15 +00:00
Rob Vermaas d72ee9c961 Added sysbench 0.4.12 2012-10-26 14:45:16 +02:00
Peter Simons e810a42b84 zeromq: add version 3.x 2012-10-24 18:17:27 +02:00
Eelco Dolstra 56cee6fe5c Make Firefox 16 the default 2012-10-23 15:35:48 +02:00
Russell O'Connor 006af75c17 Merge branch 'master' of github.com:NixOS/nixpkgs 2012-10-21 03:04:22 +02:00
Russell O'Connor f5c346d556 Add tarsnap package. 2012-10-21 03:03:13 +02:00
Peter Simons 00d03f2f50 ipsec-tools: add version 0.8.0 2012-10-20 13:06:09 +02:00
Peter Simons 094cbf9b4d Move lxc from "applications/virtualization" to "os-specific/linux". 2012-10-20 12:36:44 +02:00
Peter Simons 04d13e193e lxc: fix documentation build and make version 0.8.0-rc2 the default 2012-10-20 12:11:09 +02:00
Michael Raskin 0e930058ae Update TigerVNC to SVN checkout that at least builds.. 2012-10-18 20:49:22 +04:00
Marc Weber b18be4e5e5 adding csound 2012-10-18 06:24:32 +02:00
Michael Raskin 2867563496 Adding a RC version of LinuX Containers 2012-10-17 23:16:42 +04:00
Baptist BENOIST 28c909af86 vtk: latest version + useQt4 option 
- Updated vtk to v5.10.0 (latest tagged release)
- Introduced a useQt4 option which allows to set the VTK_USE_QT option to true
- Added a package named vtkWithQt4 in the all-packages list

Signed-off-by: Baptist BENOIST <return_0@live.com>
 2012-10-16 23:19:59 +02:00
Baptist BENOIST ca264f8da0 Add gmrun-0.9.2 
Signed-off-by: Baptist BENOIST <return_0@live.com>
 2012-10-16 18:03:13 +02:00
Baptist BENOIST 440656dbd0 Add qtcreator-2.5.2 
Signed-off-by: Baptist BENOIST <return_0@live.com>
 2012-10-16 18:03:13 +02:00
Baptist BENOIST 829ad425d3 Add xfe-1.33 and fox-1.6.9 
This specific version of fox is required by xfe

Signed-off-by: Baptist BENOIST <return_0@live.com>
 2012-10-16 18:03:12 +02:00
Baptist BENOIST 946dcba80b Add fox-1.7.9 
Signed-off-by: Baptist BENOIST <return_0@live.com>
 2012-10-16 18:03:12 +02:00
Baptist BENOIST 51fe788417 Add geany-1.22 
Geany is a small and lightweight Integrated Development Environment.
It was developed to provide a small and fast IDE, which has only a few dependencies from other packages.
Another goal was to be as independent as possible from a special Desktop Environment like KDE or GNOME.
Geany only requires the GTK2 runtime libraries.

Some basic features of Geany:
 - Syntax highlighting
 - Code folding
 - Symbol name auto-completion
 - Construct completion/snippets
 - Auto-closing of XML and HTML tags
 - Call tips
 - Many supported filetypes including C, Java, PHP, HTML, Python, Perl, Pascal (full list)
 - Symbol lists
 - Code navigation
 - Build system to compile and execute your code
 - Simple project management
 - Plugin interface

Signed-off-by: Baptist BENOIST <return_0@live.com>
 2012-10-16 18:03:12 +02:00
Eelco Dolstra 5af277bbd1 Merge remote-tracking branch 'origin/master' into x-updates 2012-10-15 12:16:58 -04:00
Eelco Dolstra 873595ee6d php: Update to 5.3.17 
Also remove unsupported PHP 5.2 (which doesn't build anymore).

http://hydra.nixos.org/build/3131326
 2012-10-15 11:14:26 -04:00
Eelco Dolstra 9663c37534 Cleanup 2012-10-15 10:52:53 -04:00
Joachim Schiele 789adef3a4 fixes the build error for 4.7 and 4.8 with both don't work with boost 1.50 2012-10-15 10:52:53 -04:00
Jack Cummings 5ded1fb645 - icecast-2.3.3, libshout-2.3.1 2012-10-14 23:48:46 -07:00
Mathijs Kwik c39805d81c add libnetfilter_conntrack-1.0.2 2012-10-13 20:28:47 +02:00
Mathijs Kwik e9a1c82bac add libmnl-1.0.3 2012-10-13 20:27:33 +02:00
Mathijs Kwik d5e4b92f22 add libnfnetlink-1.0.1 2012-10-13 20:23:36 +02:00
Peter Simons f77a2f460a Merge branch 'master' into x-updates. 2012-10-12 15:24:24 +02:00
Joachim Schiele 74196058ee added gsmartcontrol 0.8.7 to nixpkgs 2012-10-12 00:45:42 +00:00
Jack Cummings 8a911c889b Merge branch 'master' into zfs 2012-10-11 13:16:41 -07:00
Michael Raskin 0bf1789b6a Use newly-added taskwarrior as an update to existing taskwarrior attribute 2012-10-11 10:50:53 +04:00
Michael Raskin 3fa383f70d Merge pull request #144 from MarcWeber/fixes/taskwarrior 
adding taskwarrior
 2012-10-10 22:14:57 -07:00
Michael Raskin 4f8becaaa3 Merge pull request #139 from aforemny/jhc 
Add jhc 0.8.0
 2012-10-10 22:12:27 -07:00
Michael Raskin 5aa665d5fe Merge pull request #136 from jcumming/master 
Games updates
 2012-10-10 21:35:16 -07:00
Marc Weber 7b40d67d61 adding taskwarrior 2012-10-11 06:12:23 +02:00