Commit graph

27757 commits

Author SHA1 Message Date
Eelco Dolstra b976e00ff2 linux: Remove obsolete AUFS 3.7 patch 2013-08-01 01:40:40 +02:00
Eelco Dolstra ff99631753 linux: Remove CIFS timeout patch
We longer use CIFS in the VM tests so we don't need this anymore.
2013-08-01 01:40:40 +02:00
Eelco Dolstra 956d71f843 linux: Remove some unused patches 2013-08-01 01:40:40 +02:00
Eelco Dolstra bc8186be1e linux: Disable /dev/kmem
See e.g.
  https://wiki.ubuntu.com/Security/Features#A.2BAC8-dev.2BAC8-kmem_disabled
2013-08-01 01:40:40 +02:00
Eelco Dolstra e1a7be4294 iwlwifi4965ucodeV1: Remove
This is verrrry obsolete.
2013-08-01 01:40:40 +02:00
Eelco Dolstra 7ce325f3e0 Unify the Linux kernel configurations
Having N different copies of the NixOS kernel configuration is bad
because these copies tend to diverge.  For instance, our 3.10 config
lacked some modules that were enabled in older configs, probably
because the 3.10 config had been copied off an earlier version of some
older kernel config.

So now there is a single kernel config in common-config.nix.  It has a
few conditionals to deal with new/removed kernel options, but
otherwise it's pretty straightforward.

Also, a lot of cut&paste boilerplate between the kernel Nix
expressions is gone (such as preConfigure).
2013-08-01 01:40:40 +02:00
Eelco Dolstra dccbdcf520 linux: Don't put the kernel version in meta 2013-08-01 01:40:40 +02:00
Bjørn Forsman 2238a23352 wicd: wrapper env vars prefix -> postfix
Change PATH=$PATH:deps to PATH=deps:$PATH in the wicd wrappers, because
the latter is more deterministic; it prevents possibly wrong versions of
dependencies to sneak in from the environment.

Do the same for PYTHONPATH.
2013-07-31 21:54:09 +02:00
Sander van der Burg dc183167cb Merge branch 'master' of github.com:NixOS/nixpkgs 2013-07-31 18:56:36 +02:00
Sander van der Burg 1c8b4c8950 Now x86 and mips images from external repositories are supported + added GPU option to the emulate function 2013-07-31 18:56:27 +02:00
Joachim Schiele 6b1116cfce Merge branch 'dhex' 2013-07-31 15:21:54 +00:00
Joachim Schiele afbc5cd5e9 added dhex, a nice ncurses based hex editor for the shell 2013-07-31 15:20:23 +00:00
Sander van der Burg c324091a77 Fixed incorrect platform-tools sha1 value 2013-07-31 16:14:47 +02:00
Sander van der Burg ab9be1b809 Updated Android SDK to version 22.05, updated all plugins, and added mesa to the search path of the emulators to enable OpenGL acceleration 2013-07-31 16:00:57 +02:00
Rok Garbas 77063f3f75 adding description to networkmanager plugins 2013-07-31 15:36:17 +02:00
Rok Garbas 537a71a51e openconnect and vpnc NetworkManager plugins added
also openvpn plugin updated to the same version as NetworkManager
2013-07-31 15:36:17 +02:00
Eelco Dolstra 32b036a430 apr-util: Update to 1.5.2 2013-07-31 15:02:54 +02:00
Eelco Dolstra ab7f2aea8e apr: Update to 1.4.8
Also drop the accept4 hack because Linux 2.6.32 is now the minimal
kernel version supported by Nixpkgs.
2013-07-31 15:02:23 +02:00
Eelco Dolstra c8c817a3b4 qemu-kvm: Disambiguate 2013-07-31 14:53:35 +02:00
Eelco Dolstra b5fcb5b67d Use the qemu-kvm wrapper 2013-07-31 14:53:35 +02:00
Eelco Dolstra 00e311e438 qemu-kvm: Remove
But install a qemu-kvm wrapper in qemu.
2013-07-31 14:53:34 +02:00
Eelco Dolstra 945c70202f qemu: Update to 1.5.2 2013-07-31 14:53:34 +02:00
Domen Kožar 332dd4854f Move namePrefix="" python packages out of python-packges.nix
It doesn't make sense to build tools/applications with three different
python interpreter versions, so move them out of python modules list.

Also reverts 53ffc6e0ef.
2013-07-31 13:34:11 +02:00
Peter Simons ef659fa8c0 haskell-unix-process-conduit: update to version 0.2.1.2 2013-07-31 11:09:17 +02:00
Peter Simons 5f960aac0f haskell-haskell-src-meta: update to version 0.6.0.3 2013-07-31 11:09:17 +02:00
Peter Simons 34db77c302 haskell-feed: update to version 0.3.9 2013-07-31 11:09:02 +02:00
Peter Simons dc4f9a37be haskell-cmdargs: update to version 0.10.5 2013-07-31 11:09:02 +02:00
Peter Simons 67afed00d5 all-packages.nix: drop trailing whitespace 2013-07-31 10:52:27 +02:00
Peter Simons 53ffc6e0ef Drop recurseIntoAttrs from python33Packages and pypyPackages.
We cannot import the packages from all of these three packages sets into
the global namespace, because they are indistinguishable. For example:

  $ nix-env -qaP \* | grep pylint
  pypyPackages.pylint                 pylint-0.26.0
  python33Packages.pylint             pylint-0.26.0
  python27Packages.pylint             pylint-0.26.0

When someone tries to install pylint by running "nix-env -i pylint",
then it's impossible to tell which one of these three versions was
chosen.

I can think of two ways to remedy this problem with recurseIntoAttrs:

 1) Bake the name of the Python interpreter into every package's name,
    i.e. offer "python27-pylint", "python33-pylint", and so on.

 2) Ensure that all non-default package sets mark all their packages
    'lowPrio' to unsure that the choice during installation is
    deterministic.
2013-07-31 10:52:15 +02:00
Bjørn Forsman 7e0bd8d360 offlineimap: remove python prefix from package name
OfflineIMAP is primarily a program/tool, not a python module (although
it installs a python module too, for those who want to poke at its
internals).

Now we can install it with "nix-env -i offlineimap" instead of
"nix-env -i python2.7-offlineimap".
2013-07-30 21:30:34 +02:00
Zef Hemel b92b8dce05 MicroGNUEmacs, a.k.a. MG 2013-07-30 20:24:28 +02:00
Eelco Dolstra 1e6b14e8a4 Make phpXdebug_5_3 low priority 2013-07-30 16:52:12 +02:00
Eelco Dolstra 394dc5da78 batman-adv: Disambiguate kernel versions 2013-07-30 16:52:12 +02:00
Eelco Dolstra 3c462ded97 linux: Update to 3.2.49, 3.4.55 2013-07-30 16:52:12 +02:00
Eelco Dolstra 70d6623586 Fix a name collision between two distinct KDE wallpaper packages 2013-07-30 16:52:11 +02:00
Eelco Dolstra 7f48c7a447 Fix a name collision between glibc and glibc217 2013-07-30 16:52:11 +02:00
Eelco Dolstra b509c78ea3 webkitSVN: Remove
It hasn't been updated in a long time.
2013-07-30 16:52:11 +02:00
Eelco Dolstra 60355207c3 Fix some name collisions 2013-07-30 16:52:11 +02:00
Sander van der Burg ae90a7e8f3 Added forever-monitor nodejs package 2013-07-30 15:24:26 +02:00
Mathijs Kwik f918e06988 wine: upgrade to 1.6 + latest gecko/mono extensions 2013-07-30 14:25:10 +02:00
Michael Raskin 0a8b83fdd0 Fix unneeded inherit 2013-07-30 16:02:39 +04:00
Michael Raskin 9acc0d4bc9 Adding x-cape keyboard mapping helper 2013-07-30 15:51:01 +04:00
Michael Raskin 97b8ac932d Adding Lush: Lisp Universal SHell 2013-07-30 15:20:46 +04:00
Sander van der Burg c1fcb0c2e6 Make the setup-hook work again now that nodejs modules reside in lib/node_modules 2013-07-30 13:00:05 +02:00
Sander van der Burg c7e680c5bd Add fs-walk node package + updated other nodejs packages 2013-07-30 12:19:57 +02:00
Sander van der Burg 44731b5251 Bump disnix,disnixos and dysnomia to latest development versions 2013-07-30 12:03:03 +02:00
Peter Simons 0668d54827 python-packages.nix: unsubscribe myself from some Hydra mails 2013-07-30 11:39:51 +02:00
Domen Kožar af98eb8de0 Merge pull request #752 from lovek323/matplotlib
matplotlib: fix build on darwin
2013-07-30 00:54:39 -07:00
Domen Kožar a0740092ce nose: run tests as noted in https://code.google.com/p/python-nose/issues/detail?id=387#c4 2013-07-30 09:51:43 +02:00
Domen Kožar 31ff9d9c68 Limnoria: update to 2013-06-01
Old build was hanging when building for python3, see
http://hydra.nixos.org/build/5615679/log/raw
2013-07-30 09:37:00 +02:00