Commit graph

9931 commits

Author SHA1 Message Date
Peter Simons 29588edfe1 python-wrapper: split 'extraLibs' into 'stdLibs' and 'extraLibs', and add 'postBuild' step
The default setting for extraLibs used to be the set of modules that come with
python by default but aren't usually enabled in our standard python derivation
because they require additional libraries. This meant that users who want to
*add* libraries to that set had to use a fairly complicated override, to add
more entries without loosing the ones set by default.

After this patch, the "standard libraries" such as "curses' are listed in
stdLibs while the extraLibs argument remains empty by default. This allows
users to override extraLibs without overriding the standard libraries.

Furthermore, the wrapper environment can be messed around with in an
additional 'postBuild' step. One nice application of this build step is
to patch scripts and binaries to use the wrapped python interpreter
instead of the pristine one, thereby enabling them to pick up all
modules that have been configured. The following example shows how this
is done for the 'pylint' utility:

  pkgs.python27Full.override {
    extraLibs = [pkgs.pylint];
    postBuild = ''
      cd ${pkgs.pylint}/bin
      for i in *; do
        rm $out/bin/$i
        sed -r -e "s|^exec |exec $out/bin/python -- |" <$i >$out/bin/$i
        chmod +x $out/bin/$i
      done;
    '';
  };
2013-11-07 15:13:02 +01:00
Peter Simons b53f71e715 all-packages.nix: strip trailing whitespace 2013-11-07 14:57:34 +01:00
Peter Simons f92a5cbfc6 pkgs/development/compilers/ghc/with-packages.nix: add 'ignoreCollisions' parameter
The ghcWithPackage expression now has an argument 'ignoreCollisions' that
allows users to disable the path collision check like so:

  (pkgs.haskellPackages.ghcWithPackages (pkgs: with pkgs; [ haskellPlatform ])).override { ignoreCollisions = true; };

See d64917ad17
for a long and detailed discussion of why these path collisions may occur.
2013-11-07 12:14:19 +01:00
cillianderoiste ed67672aac Merge pull request #1181 from Zoomulator/master
New application: Milkytracker v0.90.85
2013-11-07 02:54:32 -08:00
Michael Raskin 2d1121c454 Merge pull request #1170 from grwlf/qvim
Add qvim - an experimental Qt gui for Vim
2013-11-07 02:48:22 -08:00
Eelco Dolstra 58af4fb11e Update some more platforms 2013-11-06 10:58:20 +01:00
Jaka Hudoklin aa0f21e621 pythonPackages: Add ipaddr, Google's IP address manipulation library 2013-11-06 07:51:09 +01:00
Shea Levy 9817bada91 Update nodePackages to npm2nix-5.2.0
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-11-05 18:02:21 -05:00
Eelco Dolstra d098a6d926 Add Finance::Quote 2013-11-05 10:46:44 +01:00
Eelco Dolstra d9c13a73c2 gurobi: Remove
It's proprietary, non-redistributable software.
2013-11-05 00:07:24 +01:00
Eelco Dolstra c88055e1a2 Set meta.hydraPlatforms instead of meta.platforms for some packages 2013-11-05 00:06:10 +01:00
Eelco Dolstra a2cbc77e4f Only show/build a package on the platforms listed in meta.platforms
The function ‘mkDerivation’ now checks whether the current platform
type is included in a package's meta.platform field.  If not, it
throws an exception:

  $ nix-build -A linux --argstr system x86_64-darwin
  error: user-thrown exception: the package ‘linux-3.10.15’ is not supported on ‘x86_64-darwin’

These packages also no longer show up in ‘nix-env -qa’ output.  This
means, for instance, that the number of packages shown on
x86_64-freebsd has dropped from 9268 to 4764.

Since meta.platforms was also used to prevent Hydra from building some
packages, there now is a new attribute meta.hydraPlatforms listing the
platforms on which Hydra should build the package (which defaults to
meta.platforms).
2013-11-05 00:06:10 +01:00
Eelco Dolstra 06f4398b46 Remove broken and obsolete versions of gcj and ghdl 2013-11-04 21:11:00 +01:00
Eelco Dolstra a5827b18a1 Don't build Linux 3.6-rpi packages on Hydra
They're all broken.
2013-11-04 21:11:00 +01:00
Eelco Dolstra 59cad4dc07 socate: Update to 1.7.2.2, 2.0.0-b6
CVE-2013-3571
2013-11-04 21:10:59 +01:00
Sergey Mironov d6d2de4147 Add qvim - an experimental Qt gui for Vim
vim-qt has the most complete set of Ctrl-Alt-Meta binding functionality.
For example, qvim is able to correctly bind keys like Alt-<nonlatin>.
More: https://bitbucket.org/equalsraf/vim-qt/wiki/Features
2013-11-04 23:02:54 +04:00
Peter Simons 0e831bd525 Resurrect the old ghcWithPackages wrapper under the attribute name 'ghcWithPackagesOld'. 2013-11-04 19:42:49 +01:00
Eelco Dolstra b232825c07 adobe-reader: Update to 9.5.5 2013-11-04 18:46:44 +01:00
Shea Levy 268bb64b68 Linux 3.12 release
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-11-03 20:14:48 -05:00
Rok Garbas 61e0337a5c afew: forgot to add --replace 2013-11-03 18:58:27 +01:00
Jonas Hoersch 795753bbc6 quodlibet: update to version 2.6.3
also provides two distinctive flavours, which either wrap the program to
pull in the gstreamer plugins or not.
2013-11-03 16:05:37 +01:00
Rok Garbas b15bbdfa17 pythonPackage: afew and alot update to latest
added subprocess32 package as new dependency of afew
2013-11-02 04:09:27 +01:00
Rok Garbas 023d74049c varnish: adding version 2.1.x 2013-11-02 01:45:27 +01:00
Shea Levy fc91ec48a8 Update default kernel to 3.10
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-11-01 11:10:09 -04:00
Shea Levy 504ea7662c Remove EOL'd kernels
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-11-01 11:10:05 -04:00
Mathijs Kwik b6519f08da haskell-parsers: bring back 0.9 for idris 2013-11-01 08:02:19 +01:00
Mathijs Kwik 3c2b7f5e33 haskell-trifecta: bring back 1.1 for idris 2013-11-01 08:02:19 +01:00
Peter Simons e0c633a402 haskell-hslua: update to version 0.3.8 2013-10-31 09:02:24 +01:00
Peter Simons 793be25a9a haskell-gloss: update to version 1.8.1.1 2013-10-31 09:02:24 +01:00
Peter Simons 90d80c3d35 haskell-OpenGL: update 2.9.x branch to version 2.9.1.0 2013-10-31 09:02:24 +01:00
Domen Kožar 58f520601c pythonPackages.substanced: correct sha256 2013-10-30 18:15:08 +01:00
Carles Pagès 383bb29d23 Add qpid v0.24
It includes both the broker and the C++ client lib. I had to do some hacks to
prevent the installer from putting thins outside $out.

Close #1134.
2013-10-30 17:24:02 +02:00
Jaka Hudoklin e4ebc03367 znc: add support for modules, add fish and push module
Close #1148.
2013-10-30 17:12:55 +02:00
cillianderoiste ddc809d6da Merge pull request #1146 from Chaddai/master
Adding KVIrc : a IRC Client for Qt and KDE. in kde4.kvirc
2013-10-30 07:15:34 -07:00
Jason "Don" O'Conal 5a2011e0c3 googleMusicmanager: add expression
close #1056
2013-10-30 14:40:08 +02:00
Jason \"Don\" O'Conal a590790656 pythonPackages.faker, pythonPackages.fake_factory: add expressions
close #1125
2013-10-30 14:17:42 +02:00
Domen Kožar c3f43f3dce Merge pull request #1142 from lovek323/sympy
pythonPackages.sympy: add expression
2013-10-30 03:43:35 -07:00
Domen Kožar 60256b973c Merge pull request #1139 from offlinehacker/pkgs/pnquant/add
Add pngquant, it converts 24/32-bit RGBA PNGs to 8-bit palette with alpha channel preserved.
2013-10-30 03:42:52 -07:00
Jaka Hudoklin 24f0eccaa8 Add pngquant, it converts 24/32-bit RGBA PNGs to 8-bit palette with alpha channel preserved. 2013-10-30 11:30:49 +01:00
Chaddaï Fouché 4c9349a2c1 Adding KVIrc : a IRC Client for Qt and KDE. in kde4.kvirc 2013-10-29 23:35:29 +01:00
Kim Simmons 808962fe31 Attempt at compiling MilkyTracker, but recent zlib version may have broken it.
There's a zlib version included with milkytracker,
but there's no makefiles for it. I've only included
the header here, but it fails at link-time with
several 'undefined reference' errors, which simply
means it can't find the definitions, e.g. compiled
zlib.
There's bug reports on other package systems although
unfortunately still unresolved.
https://bugs.archlinux.org/task/31324
http://lists.freebsd.org/pipermail/freebsd-ports/2013-March/082180.html
2013-10-29 17:14:53 +01:00
Rok Garbas b040814679 changes in: redshift, geoclue, libsoup
- added support for geoclue for redshift
 - package geoclue 2.0.0 (as geoclue2)
 - package libsoup 2.44.1 (as libsoup_2_40)
2013-10-29 16:25:31 +01:00
Ricardo M. Correia 57e9fd8bcf grsecurity: Update to 2.9.1-3.2.52-201310271550 2013-10-29 13:32:53 +01:00
Eelco Dolstra 60f1afe199 nix: Update to 1.6.1 2013-10-29 11:30:36 +01:00
Domen Kožar 3ad84542bf pythonPackages.substanced: specify sha256 2013-10-29 09:35:25 +01:00
Jason "Don" O'Conal d9b4fe9e5d pythonPackages.sympy: add expression 2013-10-28 21:10:19 +00:00
aszlig df4a3cc9f9
miro: New package, version 6.0.
I actually had this breeding in my nixpkgs overrides for a year and only
recently took the time to fix it and thus revive my video feeds :-)

The package uses a patch which is removing the dependency on gconf and
switches to storage within a shelve in ~/.miro/config instead.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-10-28 20:48:50 +01:00
aszlig aa018de67d
python-pywebkitgtk: New package, version 1.1.8.
This is needed as a build dependency for miro.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-10-28 20:48:50 +01:00
aszlig 877614ce99
python-paramiko: Fix maintainerS attribute name.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-10-28 20:48:49 +01:00
aszlig 45e740b119
mixxx: New package in version 1.11.0.
Compiles fine on linux i686 and amd64. Adding myself as maintainer, even
though I'm not using the package by myself, but a friend is using it for
DJing from a NixOS live system I'm maintaining.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-10-28 20:48:49 +01:00