BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
38893 commits 1 branch 0 tags 3.8 GiB
Commit graph

10771 commits

Author SHA1 Message Date
Shea Levy
3ae5e801a5 Linux 3.13 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2014-01-19 22:35:24 -05:00
Domen Kožar
745472d66a Add gnome3.gnome_settings_daemon 2014-01-19 23:15:00 +01:00
Shea Levy
4b9da6697b Merge branch 'master' of git://github.com/madjar/nixpkgs 
rust: Add

Signed-off-by: Shea Levy <shea@shealevy.com>
 2014-01-19 12:39:17 -05:00
Shea Levy
d7bf8677a3 Merge branch 'ag' of git://github.com/madjar/nixpkgs 
silver-search: Add

Signed-off-by: Shea Levy <shea@shealevy.com>
 2014-01-19 12:23:37 -05:00
Georges Dubus
9f9244f061 silver-search: Add 2014-01-19 17:42:43 +01:00
Georges Dubus
2a0f1cd6f1 rust: Add 2014-01-19 17:30:36 +01:00
Peter Simons
17d58c370b Merge pull request #1540 from ocharles/haskellPackages.exPool 
haskellPackages.exPool: Do not fix the version of hashable
 2014-01-19 05:16:36 -08:00
Peter Simons
6b503927b8 Merge pull request #1541 from ocharles/haskellPackages.threepennyGui 
haskellPackages.threepennyGui: New expression
 2014-01-19 05:16:18 -08:00
Peter Simons
6b6a3af5c3 Merge pull request #1543 from ocharles/haskellPackages.timezone 
haskellPackages.timezoneOlson/haskellPackages.timezoneSeries: New expressions
 2014-01-19 05:14:51 -08:00
Peter Simons
9ee3ff2088 Merge pull request #1545 from basvandijk/libossp-uuid 
Add new package libossp-uuid-1.6.2
 2014-01-19 05:14:31 -08:00
Vladimír Čunát
177667eea9 xxdiff, qt5: use bison2 2014-01-19 11:48:48 +01:00
Bjørn Forsman
ffd3e0f02c logstalgia: fix attribute and directory name typo 
Change "logstalgica" to "logstalgia".
 2014-01-18 21:47:39 +01:00
Bas van Dijk
a4111bd67f Add new package libossp-uuid-1.6.2 2014-01-18 20:54:52 +01:00
Mathijs Kwik
71dc9ad252 llvm: remove deprecation warning. We prefer using the default version 
unless a package really needs a newer/older one
 2014-01-18 19:30:48 +01:00
Bjørn Forsman
1b4d50dbac glm: new package 
OpenGL Mathematics (GLM) is a header only C++ mathematics library for
graphics software based on the OpenGL Shading Language (GLSL)
specification and released under the MIT license.

http://glm.g-truc.net/
 2014-01-18 19:05:32 +01:00
Vladimír Čunát
3f9388436b tarball/release: change gnat44 (removed) into gnat 2014-01-18 17:06:56 +01:00
Vladimír Čunát
0a58b512cb Merge master into stdenv-updates 
Conflicts (simple):
	pkgs/development/compilers/gcc/4.8/default.nix
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/libraries/gmp/5.1.1.nix
	pkgs/development/libraries/gmp/5.1.3.nix
	pkgs/development/libraries/gmp/5.1.x.nix
	pkgs/top-level/all-packages.nix
 2014-01-18 14:46:20 +01:00
Oliver Charles
1388fc4dc8 haskellPackages.timezoneOlson/haskellPackages.timezoneSeries: New expressions 2014-01-17 23:59:16 +00:00
Oliver Charles
5d2a8e2d2e haskellPackages.threepennyGui: New expression 2014-01-17 23:55:34 +00:00
Oliver Charles
2581da31b0 haskellPackages.exPool: Do not fix the version of hashable 
The latest version of ex-pool does not have this requirement.
 2014-01-17 23:53:44 +00:00
Moritz Ulrich
0ec365cd63 New package: Streamripper: Record MP3 radio streams. 2014-01-17 01:13:57 +01:00
Shea Levy
7f2559272b Add http-common haskell package. 
This fixes nixpkgs evaluation

Signed-off-by: Shea Levy <shea@shealevy.com>
 2014-01-16 10:08:40 -05:00
Shea Levy
32721cd3df Add todo.txt-cli, a cli todo list manager 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2014-01-15 19:44:37 -05:00
Peter Simons
716e42703c all-packages.nix: cosmetic 2014-01-15 17:29:14 +01:00
Peter Simons
b5d7acdd22 syslog-ng: add missing python build input 2014-01-15 17:29:14 +01:00
Lluís Batlle i Rossell
95660053fc Updating gnunet to 0.10.0. 2014-01-15 16:42:42 +01:00
Peter Simons
3be24ab54a haskell-terminfo: update to version 0.4.0.0 2014-01-15 16:38:18 +01:00
Peter Simons
878cae46fd haskell-haskeline: update to version 0.7.1.2 2014-01-15 16:38:18 +01:00
Eelco Dolstra
597a948885 http-parser: Fix filename 2014-01-15 13:41:09 +01:00
Eelco Dolstra
8622548160 Add a setup hook for fixing dylib install names on Darwin 
Install names need to be absolute paths, otherwise programs that link
against the dylib won't work without setting $DYLD_LIBRARY_PATH.  Most
packages do this correctly, but some (like Boost and ICU) do not.
This setup hook absolutizes all install names.
 2014-01-15 13:41:09 +01:00
Peter Simons
cf502a3166 Merge pull request #1510 from ocharles/haskellPackages.dbmigrations 
haskellPackages.dbmigrations: New expression
 2014-01-15 02:52:31 -08:00
Peter Simons
9478b8e08e Merge pull request #1523 from ocharles/haskellPackages.websocketsSnap 
haskellPackages.websocketsSnap: New exppression
 2014-01-15 02:51:22 -08:00
Peter Simons
b2b0d7f672 Merge pull request #1524 from ocharles/haskellPackages.httpStreams 
haskellPackages.httpStreams: New expression
 2014-01-15 02:51:10 -08:00
Shea Levy
446c144b1a Add kmscon, a kms-based replacement for kernel VTs 
Note that currently this depends on the default nixpkgs mesa and pango.
It may be possible to build more limited versions that don't e.g. depend
on the full X stack without limiting kmscon (which of course doesn't use
X).

Depends on libtsm, added in the same commit.

Signed-off-by: Shea Levy <shea@shealevy.com>
 2014-01-15 00:58:46 -05:00
Oliver Charles
e237d4d812 haskellPackages.httpStreams: New expression 2014-01-14 23:21:54 +00:00
Oliver Charles
5df5c10db5 haskellPackages.websocketsSnap: New exppression 2014-01-14 23:14:59 +00:00
Thomas Bereknyei
57e3feda74 Adds kippo SSH honeypot 2014-01-14 10:32:26 +00:00
Eelco Dolstra
1343ce97cb rascal: Add 2014-01-14 10:47:08 +01:00
Michael Raskin
b340508461 Add the now-required LLVM version choice 2014-01-14 09:52:16 +04:00
Michael Raskin
3c59324916 Adding interlude Haskell library 2014-01-14 09:44:48 +04:00
Vladimír Čunát
ae0c9b626f llvm: add 3.4, urge for versioned usage 
The 3.4 code was tested preliminary in x-updates,
described by 2e4eab1228.

Updates to llvm break builds of dependent packages (in all cases I've seen),
and often upstream isn't too fast in porting to the newest version.
Consequently, it seems better to keep more versions (two ATM),
both in one file to share eventual changes.
Also, using versioned llvm_* attributes is proposed because of this.
 2014-01-13 21:53:50 +01:00
Eelco Dolstra
033374d601 gcc: Fix building 4.5 and 4.6 2014-01-13 20:53:06 +01:00
Peter Simons
0341d0abcf haskell-parsers: update to version 0.10.2 2014-01-13 17:57:46 +01:00
Peter Simons
1042b4c133 all-packages.nix: strip trailing whitespace 2014-01-13 17:05:45 +01:00
Peter Simons
68eea9c19e gmp: update 5.1.x branch to version 5.1.3 2014-01-13 17:05:45 +01:00
Sander van der Burg
0583cb37e6 Make xcode version configurable + fix android emulator tests 2014-01-13 14:34:46 +01:00
Sander van der Burg
10a6618d60 Removed titanium SDK 2.1, since it's deprecated long ago and no longer works with the new Android SDK 2014-01-13 13:52:43 +01:00
Sander van der Burg
fc397175a5 Added titanium nodejs package 2014-01-13 13:24:39 +01:00
Eelco Dolstra
6fb27abf33 Merge branch 'java' 2014-01-13 13:16:17 +01:00
Peter Simons
d3d988b768 Merge pull request #1508 from offlinehacker/pkgs/cpuminer/add 
Add cpuminer, multi-threaded Litecoin and Bitcoin miner
 2014-01-13 02:46:51 -08:00
Peter Simons
09e9641f5a Merge pull request #1511 from ocharles/haskellPackages.websockets 
haskellPackages.websockets: New expression
 2014-01-13 02:42:15 -08:00
Peter Simons
14e017a7dd Merge pull request #1503 from offlinehacker/pkgs/torbrowser/add 
Add tor-browser
 2014-01-13 02:41:53 -08:00
Peter Simons
5a2ccf4c6e Merge pull request #1512 from ocharles/haskellPackages.digestiveFunctorsAeson 
haskellPackages.digestiveFunctorsAeson: New expression
 2014-01-13 02:41:08 -08:00
Peter Simons
81d18d7f59 Merge pull request #1513 from ocharles/haskellPackages.aws 
haskellPackages.aws: New expression
 2014-01-13 02:40:42 -08:00
Oliver Charles
04806d83a8 haskellPackages.hsimport: New expression 2014-01-13 09:09:27 +00:00
Oliver Charles
3d4ee38f6c haskellPackages.aws: New expression 2014-01-13 09:08:27 +00:00
Oliver Charles
0898aa7ad0 haskellPackages.digestiveFunctorsAeson: New expression 2014-01-13 09:00:32 +00:00
Oliver Charles
300d1dcca6 haskellPackages.websockets: New expression 2014-01-13 00:01:27 +00:00
Oliver Charles
67ea2f6860 haskellPackages.dbmigrations: New expression 2014-01-12 23:50:15 +00:00
Jaka Hudoklin
f45793f284 Add cpuminer, multi-threaded Litecoin and Bitcoin miner 2014-01-13 00:03:31 +01:00
Jaka Hudoklin
26357febb6 Add tor-browser 2014-01-12 23:04:48 +01:00
Michael Raskin
826e7f8a94 Add a LUA_COMPAT_ALL version of Lua 5.2 2014-01-12 22:15:54 +04:00
Vladimír Čunát
a2c316288c Merge master into stdenv-updates 
Conflicts:
	pkgs/development/lisp-modules/stumpwm/default.nix (auto-solved)
	pkgs/top-level/all-packages.nix (trivial)
 2014-01-12 12:29:24 +01:00
Domen Kožar
a0070a9157 gst_all_1: recurseIntoAttrs 2014-01-12 00:24:07 +01:00
Rob Vermaas
60a82e6e0d Add accountservice, needed for gdm. 2014-01-11 23:38:41 +01:00
Ricardo M. Correia
4ede302207 virt-manager: Add graphical support for the Spice protocol 2014-01-11 22:01:52 +01:00
Ricardo M. Correia
aed957bae7 virt-manager: Fix error: 'ImportError: No module named libvirt' 
The problem was that libvirt 1.2.0 no longer includes the python bindings; it is
a separate package now.
 2014-01-11 22:01:52 +01:00
Domen Kožar
ae02a0c411 Merge pull request #1403 from iyzsong/gstreamer 
add gstreamer 1.2.1
 2014-01-11 12:37:47 -08:00
Matej Cotman
7d4d3536f7 connman: new packages ConnMan v1.20 and connman-ui 2014-01-11 20:22:53 +01:00
Song Wenwu
501008ad6f pyqt4: update to 4.10.3 and add python3 support 
also add python3 support for dbus-python
 2014-01-11 20:07:29 +01:00
Song Wenwu
98d2f7ea45 sip: update to 4.15.4 and add python3 support 2014-01-11 20:07:28 +01:00
Peter Simons
7ec465a5cc gloss-raster: fix attribute name 2014-01-11 20:02:35 +01:00
Emil Rangden
b5bf69b447 gloss-raster: new package 2014-01-11 20:02:35 +01:00
Song Wenwu
6b7105d456 snd: update to 14.3 2014-01-11 19:40:24 +01:00
Sergey Mironov
0223847b6a yad: a nice zenity clone for creating GUI dialogs from the shell 2014-01-11 19:29:02 +01:00
Arseniy Seroka
32e08f53ce spaceFM: add package 2014-01-11 19:25:23 +01:00
Song Wenwu
531090d5de add projectM 2.1.0 2014-01-11 19:14:28 +01:00
Vladimir Still
4918c1436b rdmd: Add (D language compiler helper). 2014-01-11 19:08:40 +01:00
Vladimir Still
b78871efa6 dmd: Add (D language compiler). 2014-01-11 19:08:40 +01:00
Arseniy Seroka
5787fc071a add lastfmsubmitd 2014-01-11 14:52:13 +01:00
Arseniy Seroka
06ad5b4c62 Add haskell alsa-mixer lib 2014-01-11 14:52:12 +01:00
Peter Simons
579a05cc83 haskell-attoparsec: add version 0.11.1.0 2014-01-11 14:52:12 +01:00
Peter Simons
4b5313b8b6 haskell-parsec: update to version 3.1.5 2014-01-11 14:52:12 +01:00
Peter Simons
3ca77df1ef Merge pull request #1492 from wkennington/master.tahoe 
Upgrade tahoe-lafs
 2014-01-11 03:15:01 -08:00
Peter Simons
cb3c13b436 haskell-packages.nix: strip trailing whitespace 2014-01-11 12:03:41 +01:00
Peter Simons
154eda228c haskell-text: update to 1.1.0.0 2014-01-11 12:03:41 +01:00
William A. Kennington III
268ffe1144 tahoe-lafs: Upgrade from 1.9.2 -> 1.10.0 
Remove patches which do not apply to the newer version.
 2014-01-10 18:50:42 -06:00
William A. Kennington III
c916c9bc2a pysqlite: Upgrade from 2.5.5 -> 2.6.3 2014-01-10 18:48:47 -06:00
William A. Kennington III
f9c97afff8 zfec: Upgrade from 1.4.7 -> 1.4.24 2014-01-10 17:28:35 -06:00
William A. Kennington III
6b8aaab78a twisted: Upgrade from 10.2.0 -> 13.2.0 2014-01-10 17:28:35 -06:00
William A. Kennington III
888c0116de pycryptopp: Upgrade from 0.5.29 -> 
0.6.0.1206569328141510525648634803928199668821045408958
 2014-01-10 17:28:35 -06:00
William A. Kennington III
4fa90144af darcsver: Upgrade from 1.7.2 -> 1.7.4 2014-01-10 17:28:35 -06:00
Domen Kožar
153b4ccf71 Add gitg: Gnome GUI for git 2014-01-10 16:46:52 +01:00
Song Wenwu
7a74215fac add gstreamer 1.2.1 2014-01-10 20:51:24 +08:00
Song Wenwu
97d7c0abe5 gstreamer-0.10: move to gstreamer/legacy 2014-01-10 20:51:24 +08:00
Evgeny Egorochkin
fd0b94dd6a Remove "v" prefix from package versions to make them machine-readable 2014-01-10 10:16:41 +02:00
Domen Kožar
d33e5eadd0 Add gnome3.nautilus and remove gnome2.nautilus (didn't compile) 
Some icons are still missing (and theme), didn't find a way to fix that.
 2014-01-10 01:45:34 +01:00
Domen Kožar
2a1ecded4d Add gtkspell3 2014-01-10 01:45:34 +01:00
Domen Kožar
094947ba73 gnome_themes_standard: bump to 3.10.0 and move into gnome3 attrset 2014-01-10 01:45:32 +01:00
Eelco Dolstra
9afd64fba8 nixUnstable: Update to 1.7pre3319_f4013b6 2014-01-09 13:20:08 +01:00
Eelco Dolstra
113265b6d3 apacheAntGcj: Remove 
No need to keep two different versions of Ant around.  The default Ant
works fine with GCJ (and doesn't pull in OpenJDK).
 2014-01-09 13:06:51 +01:00
Peter Simons
55e1937573 haskell-pretty-show: update to version 1.6.5 2014-01-09 00:45:16 +01:00
Benno Fünfstück
eddb74a5cf New expressions: yi, yi contrib and dependencies 2014-01-08 19:11:33 +01:00
Domen Kožar
d1c1fce801 Merge pull request #1470 from iyzsong/vala 
vala: update and cleanup
 2014-01-08 09:51:47 -08:00
Ian-Woo Kim
398ae63aa6 haskell-poppler package is added. 2014-01-08 17:32:15 +01:00
Michael Raskin
ef7bd2ed86 Pass correct Qt version to octaveFull for GUI 2014-01-08 20:28:29 +04:00
Michael Raskin
0e3591941c Fix Octave-full evaluation 2014-01-07 23:50:10 +04:00
Michael Raskin
37e6b8ec80 A larger Octave build with GUI 2014-01-07 22:02:44 +04:00
Eelco Dolstra
ffd6557dc6 patchelf: Update to 0.7 2014-01-07 17:44:03 +01:00
Eelco Dolstra
20ab977736 ffmpeg: configurable.nix -> 2.x.nix 2014-01-07 15:36:00 +01:00
Vladimír Čunát
54f73f77a8 Merge pull request #1461 from ttuegel/ffmpeg 
add configurable FFmpeg expression, fdk-aac library, license fixes
 2014-01-07 06:05:22 -08:00
Vladimír Čunát
7cce1ff58b Merge pull request #1462 from ktosiek/pr/dfeet 
Add d-feet, a DBus debugger
 2014-01-07 05:54:43 -08:00
Eelco Dolstra
dfc62c9084 bison: Don't run the tests 
All this accomplishes is to make bison depend on flex, which in turn
depends on bison.  (So as a result, during the stdenv bootstrap, bison
gets built 6 (!) times.)
 2014-01-07 14:25:42 +01:00
Eelco Dolstra
320209a618 Merge deterministicStdenv into the default stdenv 
This means that (on Linux) strip uses
"--enable-deterministic-archives" and ld uses the
BFD_DETERMINISTIC_OUTPUT flag.
 2014-01-07 13:57:42 +01:00
Eelco Dolstra
2f11bc495b Hide nodePackages from nix-env 
Many nodePackages have identical names as "normal" packages (e.g.,
swig, redis, tar) which is obviously bad.  So don't make nix-env
recursive into nodePackages.

A better solution would be to have node packages have a "node-"
prefix, similar to Perl and Python packages.
 2014-01-07 13:41:22 +01:00
Rob Vermaas
0d54426794 Add zabbix 2.2.1 2014-01-07 13:11:32 +01:00
Eelco Dolstra
fa15851318 Fix indentation 2014-01-07 10:48:14 +01:00
Eelco Dolstra
4b1d2a50b8 Drop a bunch of old unused gcc cross/debug variants 2014-01-07 10:46:59 +01:00
Eelco Dolstra
035fb0d9c9 Drop pointless gcc_real variables 2014-01-07 10:39:15 +01:00
Eelco Dolstra
c3d31749fb Remove gcc 4.7 
There is really no reason to keep it around, given that it was never
the default in Nixpkgs.
 2014-01-07 10:36:15 +01:00
Song Wenwu
4262c4bb9d vala: update to 0.23.1, remove old versions 
set license to lgpl2Plus
add myself to maintainers
and some cleanup
 2014-01-07 17:31:52 +08:00
Mathijs Kwik
8fad5a72ec add emacs/idris-mode 2014-01-07 07:16:47 +01:00
Shea Levy
31887d4c13 Update node packages 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2014-01-06 13:25:20 -05:00
Shea Levy
bfcce3d429 Update bower2nix 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2014-01-06 08:44:22 -05:00
Eelco Dolstra
5d6259a973 Add a setup hook that automatically sets up $CLASSPATH 
All JARs in $pkg/share/java (for each $pkg in the build inputs) are
added to $CLASSPATH.  Thus, you can say

  buildInputs = [ setJavaClassPath someJavaDependency ];

and the JARs in someJavaDependency will be found automatically by
tools like javac or ant.

Note that the manual used to say that JARs should be installed in
lib/java; this is now share/java, following the Debian policy:

  http://www.debian.org/doc/packaging-manuals/java-policy/x110.html

The directory share/java makes more sense because JARs are
architecture-independent.  (Also, a quick grep shows that we were not
exactly consistent about this in Nixpkgs.)
 2014-01-06 14:36:14 +01:00
Eelco Dolstra
4728ec3f99 Fix some references to apacheAntOpenJDK 2014-01-06 14:36:13 +01:00
Eelco Dolstra
c180be8cf5 icedtea: Remove 
It has apparently never worked.  Also drop xerces and xalan, which
were only used by icedtea.
 2014-01-06 14:36:13 +01:00
Eelco Dolstra
cd5a9f4980 clooj: Update to 0.4.4 
Also, merge the wrapper into the main package.
 2014-01-06 14:36:13 +01:00
Shea Levy
e6dae5d7f4 Add fetchbower function to go along with bower2nix 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2014-01-06 08:20:22 -05:00
Peter Simons
de9ff84ca0 haskell-network: update to version 2.4.2.2 2014-01-06 12:09:57 +01:00
Peter Simons
a397d62d31 haskell-text: update to version 1.0.0.1 2014-01-06 12:09:57 +01:00
Tomasz Kontusz
a504b97e3e Add d-feet, a DBus debugger 2014-01-05 23:57:59 +01:00
Thomas Tuegel
e548166c44 add fdk-aac-0.1.3 2014-01-05 09:02:47 -06:00
Thomas Tuegel
eb1e109b51 ffmpeg: add configurable 2014-01-05 09:02:46 -06:00
Shea Levy
1d11a242b3 Fix tarball 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2014-01-05 08:11:18 -05:00
Shea Levy
ef930ced64 klibcShrunk should be a kernelPackage 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2014-01-05 07:45:14 -05:00
Shea Levy
f4ce59cee0 Remove non-kernel-specific klibc derivation 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2014-01-05 07:38:58 -05:00
Shea Levy
139f8949e6 Merge branch 'merge-kernel-builds' into upstream-master 
This is a second attempt at unifying the generic and manual-config
kernel builds (see #412 for the last time).

The set of working kernel packages is a superset of those that work on
master, and as the only objection last time was the size of the $dev
closure and now both $out and $dev combined are 20M smaller than $out on
master (see message for ac2035287f), this
should be unobjectionable.

Signed-off-by: Shea Levy <shea@shealevy.com>
 2014-01-05 07:13:19 -05:00
Vladimír Čunát
0a2ae78216 asympote: fix build 2014-01-05 10:09:37 +01:00
Vladimír Čunát
5c33b7350b webkitgtk, kde.qtcurve: build with default gcc (not 4.7) 2014-01-05 09:42:07 +01:00
Shea Levy
a589bfae17 Update and fix kernel packages to new kernel build 
In most cases, this just meant changing kernelDev (now removed from
linuxPackagesFor) to kernel.dev. Some packages needed more work (though
whether that was because of my changes or because they were already
broken, I'm not sure). Specifics:

* psmouse-alps builds on 3.4 but not 3.10, as noted in the comments that
  were already there
* blcr builds on 3.4 but not 3.10, as noted in comments that were
  already there
* open-iscsi, ati-drivers, wis-go7007, and openafsClient don't build on
  3.4 or 3.10 on this branch or on master, so they're marked broken
* A version-specific kernelHeaders package was added

The following packages were removed:

* atheros/madwifi is superceded by official ath*k modules
* aufs is no longer used by any of our kernels
* broadcom-sta v6 (which was already packaged) replaces broadcom-sta
* exmap has not been updated since 2011 and doesn't build
* iscis-target has not been updated since 2010 and doesn't build
* iwlwifi is part of mainline now and doesn't build
* nivida-x11-legacy-96 hasn't been updated since 2008 and doesn't build

Everything not specifically mentioned above builds successfully on 3.10.
I haven't yet tested on 3.4, but will before opening a pull request.

Signed-off-by: Shea Levy <shea@shealevy.com>
 2014-01-04 21:17:04 -05:00
Vladimír Čunát
9443129b08 Merge master into stdenv-updates 
Conflicts:
	pkgs/development/libraries/glibc/2.18/common.nix (take stdenv-updates)
	pkgs/misc/emulators/zsnes/default.nix (more complex, build tested)
	pkgs/top-level/all-packages.nix (auto-solved)
 2014-01-04 18:34:53 +01:00
Song Wenwu
5f3a737d79 add SuperCollider 3.6.6 2014-01-04 21:39:35 +08:00
Shea Levy
2c55194859 Update bower2nix 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2014-01-03 14:27:07 -05:00
Shea Levy
2394ef4603 Add bower2nix and update nix packages 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2014-01-03 14:15:36 -05:00
Bjørn Forsman
4db6bcf209 ngrep: new package 
ngrep is a command-line network packet analyzer.

http://ngrep.sourceforge.net/
 2014-01-03 16:49:23 +01:00
Eelco Dolstra
8398b23e10 clojure: Update to 1.5.1 
Also, merge the wrapper into the main package, and get rid of the
binary variant.
 2014-01-03 14:48:21 +01:00
Eelco Dolstra
ec685e30de kaffe: Remove 
It no longer builds and doesn't seem very maintained.
 2014-01-03 13:51:23 +01:00
Eelco Dolstra
54d1721414 ant: Update to 1.9.3 
Also, Ant no longer has a build-time dependency on a particular JDK.
It finds the JDK via $JAVA_HOME or $PATH (by looking up javac).  This
way, we don't need to have separate packages like apacheAntOpenJDK and
apacheAntOracleJDK.  It also seems reasonable: after all, installing
GNU Make doesn't give you a C compiler either.  It does mean that
instead of

  buildInputs = [ ant ];

you now need to write something like

  buildInputs = [ ant jdk ];
 2014-01-03 13:29:06 +01:00
Eelco Dolstra
79675fad6e openjdk: Use multiple outputs 
This unifies the "openjdk" and "openjre" packages.  The JDK is placed
in the "out" output, the JRE in "jre".

Also, everything is now stored in $prefix/lib/openjdk, so the JDK/JRE
no longer pollute user environments with files like
"ASSEMBLY_EXCEPTION" at top-level.
 2014-01-03 11:56:40 +01:00