3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

10448 commits

Author SHA1 Message Date
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 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
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
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
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
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 ca8de63797 postgresql-8.3: Remove
The 8.3 branch is no longer maintained so it shouldn't be used.
2014-01-03 11:51:02 +01:00
Domen Kožar ddda0dfc60 pythonPackages.nose: skip failing test 2014-01-02 23:38:27 +01:00
Domen Kožar 3ef95f0582 Merge pull request #1453 from ttuegel/clementine
Add clementine-1.2.1 and dependencies
2014-01-02 14:21:18 -08:00
Thomas Tuegel ef108a8d31 add sparsehash-2.0.2 2014-01-02 14:49:23 -06:00
Thomas Tuegel 776dea8d24 add clementine-1.2.1 2014-01-02 14:49:22 -06:00
Domen Kožar d76654a55c Merge pull request #1444 from ttuegel/qtcurve
add qtcurve-1.8.17
2014-01-02 12:31:54 -08:00
Domen Kožar f9ad40a39b Merge pull request #1443 from ttuegel/kde-gtk-config
add kde-gtk-config-2.2.1
2014-01-02 12:29:06 -08:00
Domen Kožar 9737d898f3 Merge pull request #1416 from wkennington/matplot
Update matplotlib to use buildPythonPackage
2014-01-02 12:09:04 -08:00
Moritz Heidkamp 030a4c7f5d Add chunkfs package 2014-01-02 18:31:09 +00:00
Michael Raskin 7fd542fad9 Merge pull request #1445 from wizeman/u/oraclejre7
oraclejre7: Add package (as a variant of oraclejdk7)
2014-01-02 07:51:05 -08:00
Michael Raskin 07413e3d24 Merge pull request #1440 from rszibele/nexuiz
Added Nexuiz-2.5.2.
2014-01-02 07:48:33 -08:00
Michael Raskin 44c031b39d Merge pull request #1439 from iyzsong/dvtm
add dvtm 0.10
2014-01-02 07:47:16 -08:00
Shea Levy 6b7ede300f systemtap: Remove from linuxPackagesFor
It doesn't seem to depend on the kernel in any way.

Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-02 00:03:49 -05:00
Mathijs Kwik fd343dc0c6 haskell-bson: depend on binary 0.7.1.0 2014-01-01 23:36:56 +01:00
Ricardo M. Correia 46ee416b91 oraclejre7: Add package (as a variant of oraclejdk7) 2014-01-01 21:30:53 +01:00
Mathijs Kwik 66d930b355 Merge pull request #1432 from wkennington/bond
network-interfaces: Add the ability to create bond devices
2014-01-01 10:50:41 -08:00
Thomas Tuegel 36b7499885 add qtcurve-1.8.17 2014-01-01 12:36:45 -06:00
rszibele 40f4c5dcad Added Nexuiz-2.5.2. 2014-01-01 17:59:42 +01:00
Thomas Tuegel 8d381dd586 add kde-gtk-config-2.2.1 2014-01-01 09:47:16 -06:00
Shea Levy f95d214cfd Implement generic kernel build via manual-config
This has three major benefits:

1. We no longer have two kernel build processes to maintain

2. The build process is (IMO) cleaner and cleaves more closely to
upstream. In partuclar, we use make install to install the kernel and
development source/build trees, eliminating the guesswork about which
files to copy.

3. The derivation has multiple outputs: the kernel and modules are in
the default `out' output, while the build and source trees are in a
`dev' output. This makes it possible for the full source and build tree
to be kept (which is expected by out-of-tree modules) without bloating
the closure of the system derivation.

In addition, if a solution for how to handle queries in the presence of
imports from derivations ever makes it into nix, a framework for
querying the full configuration of the kernel in nix expressions is
already in place.

Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-01 09:21:25 -05:00
Song Wenwu b8917d548e add dvtm 0.10 2014-01-01 21:55:49 +08:00
Vladimír Čunát 506a304181 fftw: minor update and major refactoring
- Unify the "single" and "float" variants, which are the same thing.
- Enable threads and openmp wrapper by default (they are very small).
- Don't use sse on i686, as I'm quite sure we have no warrant for that.
  Cf. http://en.wikipedia.org/wiki/Pentium_Pro
- Disable static libs (big, no indication we need them).
- I tested most builds using fftw (they build OK).
2014-01-01 13:05:56 +01:00
Shea Levy 008992619f linux/manual-config: Cross-compiling support
With this, I was able to successfully compile a defconfig kernel for the
sheevaplug, though I didn't actually try to run it (not having a
sheevaplug myself).

For native compiles, the most significant difference is that the
platform's kernel target is built directly rather than hoping the
default make target will pull it in.

Also some stylistic improvements along the way.

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-12-31 22:38:06 -05:00
Shea Levy 58246936e4 platforms.nix: Separate 32-bit and 64-bit PCs
With this, stdenv.platform.kernelArch can be used by the kernel builder
for PC platforms too.

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-12-31 21:34:44 -05:00
Peter Simons bad39d4861 Merge pull request #1435 from tomberek/add_fastcgi
Add fastcgi Haskell package
2013-12-31 07:42:03 -08:00
William A. Kennington III 609e981b93 ifenslave: Add new package 2013-12-31 09:28:52 -06:00
William A. Kennington III 184dd198fb subversion: Tweaks and Fixes
Remove ssl and compression options which are no longer valid when using
serf in place of neon. Also, make sure serf is an optional dependency.
2013-12-31 07:59:37 -06:00