Commit graph

23696 commits

Author SHA1 Message Date
Shea Levy
779c74f795 Remove some artifacts of a failed attempt from replace-dependency 2013-01-11 16:09:07 -05:00
Rok Garbas
a210e346dc Merge pull request #259 from jcumming/urxvt.130111
urxvt-9.16
2013-01-11 12:30:53 -08:00
Shea Levy
d1662d7155 Add the replace-dependency build support function.
The use case is to do a deep replacement of a dependency without rebuilding the entire tree.
For example, suppose a security hole is found in glibc and a patch released. Ideally, you'd
just rebuild everything, but that takes time, space, and CPU that you might not have, so in
the mean time you could build a safe version of, say, firefox with:

  firefox-safe = replace-dependency { drv = firefox; old-dependency = glibc; new-dependency = patched-glibc; };

Building firefox-safe will rebuild glibc, but only do a simple copy/string replacement on all other dependencies
of firefox. On my system (MBP 13" mid-2012), after a new glibc had been build building firefox took around 11 seconds.

See the comments in the file for more details.
2013-01-11 14:42:09 -05:00
Sander van der Burg
2dd59fc4cf imagemagick: disable ghostscript on darwin, to make it work 2013-01-11 18:32:45 +01:00
Jack Cummings
3fe43187fb urxvt-9.16 2013-01-11 09:28:52 -08:00
Jack Cummings
0cfd455a67 Update x86info description. Add Homepage. 2013-01-11 09:25:32 -08:00
Sander van der Burg
a0d45d6f9b graphviz: Fix compilation on darwin 2013-01-11 18:20:44 +01:00
Florian Friesdorf
24d48d9170 don't put propagated recursivePthLoader into pth file, #257 2013-01-11 18:04:27 +01:00
Sander van der Burg
ed78245478 Merge branch 'master' of github.com:NixOS/nixpkgs 2013-01-11 18:02:58 +01:00
Sander van der Burg
f2c66f54e6 Fix compliation of gts on Darwin 2013-01-11 18:02:36 +01:00
Florian Friesdorf
a7a6173a3f pygtk in pythonPackages, checks disabled, demo works, relates #223
Previously the checkPhase was not executed. It is now and a couple of
issues with it are seded away.
2013-01-11 17:45:26 +01:00
Florian Friesdorf
59879f6496 fixup: pygobject rename pth 2013-01-11 16:11:07 +01:00
Florian Friesdorf
e856c72159 pygobject: in pythonPackages, removed hack handled now by pth 2013-01-11 15:30:56 +01:00
Florian Friesdorf
87423443b8 pycairo: move to pythonPackages 2013-01-11 15:23:44 +01:00
Florian Friesdorf
01f142296a pythonPackages: use unversioned to blend into pkgs, no functional change 2013-01-11 15:21:23 +01:00
Florian Friesdorf
b4f84e3b1e pythonPackages: introduce sections, no functional change 2013-01-11 15:14:53 +01:00
Peter Simons
abd6be85e1 lxc: update to version 0.8.0 2013-01-11 15:02:21 +01:00
Florian Friesdorf
a59164e931 modules propgate recursivePthLoader
An alternative would be to include it with the plain `python`.
2013-01-11 10:54:25 +01:00
Florian Friesdorf
37abd1e353 fix python26Full expression 2013-01-11 10:35:55 +01:00
Florian Friesdorf
212b4df91c recursivePthLoader included via wrapper, not propagated by modules 2013-01-11 09:53:28 +01:00
Florian Friesdorf
4329ba3fb1 Merge branch 'channel-nixos' into python 2013-01-11 07:35:30 +01:00
Jack Cummings
42859e49ed Merge remote-tracking branch 'upstream/master' into x86info.130109 2013-01-10 21:35:13 -08:00
Vladimír Čunát
6f1aad769f Libertine fonts: update and cleanup. 2013-01-10 22:36:42 +01:00
Lluís Batlle i Rossell
ce705aa998 supertuxkart: updating to 0.8 2013-01-10 20:55:46 +01:00
Vladimír Čunát
d0463caac5 Merge pull request #252 from matejc/master
xfce4-notifyd: add new package
2013-01-10 09:24:58 -08:00
Lluís Batlle i Rossell
7e1d0c12a3 stuntrally: updating from 1.4 to 1.8
I updated ogre and mygui, too. Now myguiSvn is older than mygui.
We should check if this commit breaks other games that use ogre (ror?)
2013-01-10 15:11:12 +01:00
Sander van der Burg
7242b4994e Added optparse: A node.js option parsing library 2013-01-10 13:39:24 +01:00
Florian Friesdorf
9a41e3630a remove some packages also broken in master 2013-01-10 13:10:47 +01:00
Florian Friesdorf
42d49b47ba comment unneeded buildInputStrings 2013-01-10 12:50:17 +01:00
Florian Friesdorf
a8e52f19f5 Merge branch 'channel-nixos' into python 2013-01-10 12:03:54 +01:00
aszlig
abe2993c4b
chromium: Add myself to maintainers.
Might come in handy to actually know when things going to break.

In case you're wondering: Yes, "aszlig" is the name everyone uses in real life
(even my family uses it) and is my pending stage name (not _yet_ officially).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-01-10 03:33:04 +01:00
aszlig
86f293a1e5
xf86-video-nouveau: Add pixman to buildInputs.
Well, either this build is only broken on my system or noone actually uses
nouveau? Even when looking into the source tree it seems to require pixman, so I
suppose it didn't work for anyone prior to this commit.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-01-10 03:29:44 +01:00
aszlig
e2a4295844
chromium: Add pulse_audio_fix.patch to nixpkgs.
The patch previously was fetched from an Arch Linux contributor but is no longer
available there anymore. So, this is only an intermediate fix until channels get
updated (very soon I hope, even though chromium 25 could get quite messy).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-01-10 03:29:44 +01:00
aszlig
691bd7b9dd
Merge pull request #239: VirtualBox guest update.
So, a VirtualBox update is best accompanied by the corresponding update of the
guest additions.

Thanks @dysinger for the contribution.
2013-01-10 03:29:44 +01:00
aszlig
acb6290eed
virtualbox: Update to new upstream version 4.2.6.
Fortunately this time the upstream package was packaged correctly and we no
longer need the patch to remove the reference to the fa_IR locale.

In addition we need to add lvm2 to dependencies because VirtualBox now requires
libdevmapper with its default configuration. We could disable it but in order to
gain DM support I think it's necessary and at least could avoid some confusion
from users if it's not working "out of the box" :-)

This is a bugfix release, upstream changes are:

 * VMM: don't inject stale VT-x events to prevent crashes after VM reset
 * VMM: workaround for buggy BIOSes which enable MONITOR only for certain CPUs
 * GUI: fixed trimming of anti-aliased text in details-view element headers
 * GUI: fixed create-settings-file-alias functionality on Mac hosts
 * GUI: fixed take-guest-screenshot functionality on Windows hosts
 * GUI: several minor fixes, including palette fixes
 * GUI: fixed Windows 2012 OS type
 * GUI: allow to terminate the VM even if VBoxSVC crashed
 * API: fixed cancelling of snapshots, previously this could lead to
        inconsistent VM configs
 * API: fixed identifying disk images by UUID
 * 3D Support: several fixes
 * VRDP: fixed occasional crash with external authentication
 * VGA: fix for double scan text modes
 * USB: fixed invalid pending request count at the time of service of DEVICE
        POWER requests (Windows hosts only)
 * USB keyboard: Korean keyboard workaround
 * Storage: fixed hang with QCOW images and asynchronous I/O enabled
 * Storage: fixed hang with newer VHD images
 * Storage: actually write the non-rotational flag to the VM settings (4.2.0
            regression)
 * Virtio-net: fixed the problem with network statistics counters in Session
               Information dialog (GUI)
 * Metrics: introduced network rate and disk usage metrics
 * Metrics: fixed a crash under certain conditions on Solaris hosts
 * BIOS: fix for El Torito
 * Shared Folders: if the host folder of a shared folder mapping does not exist,
                   keep it active but mark it as invalid to prevent inconsistent
                   saved states
 * VBoxManage: fixed converting disks from raw images
 * VBoxManage: show snapshot description in the VM or snapshot information
 * VBoxManage: make implicit opening of media consistent in all places dealing
               with media
 * VBoxManage: the iSCSI initiator name was not stored in the settings file when
               doing storageattach
 * VBoxManage: metrics collect now properly handles 'CPU/MHz' and
               'Net/*/LinkSpeed' metrics
 * VBoxManage: changing the image UUID or parent UUID as part of storageattach
               works now in all safe cases
 * VBoxManage: introduced storageattach --medium additions as a shortcut to
               mount the additions image
 * OVF: fixed importing OVF files cerated by recent VMware products
 * Linux hosts / Bridged Networking: fixed the problem with leaking connections
                                     in conntrack
 * Linux Additions: added support for ConsoleKit sessions in the vminfo service
                    of VBoxService
 * Linux Additions: don't crash during remount under certain conditions
 * Linux/Solaris Additions: fixed guest memory metrics collection
 * Solaris hosts: added a dependency to ensure that the user directories are
                  reachable when starting VBox services
 * Windows host installer: integrated user-contributed translations, thanks to
                           all contributors!
 * Windows Additions: fixed auto-logon installation for Windows 8
 * Windows Additions: don't fail if the shared folders host service is not
                      available
 * Windows Additions: fixed Guest Additions startup on Windows 2000 guests
 * Windows Additions: auto-resize fixes for Windows 8 guests

Upstream changelist with bug ids can be found here:

https://www.virtualbox.org/wiki/Changelog

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-01-10 03:29:43 +01:00
Florian Friesdorf
0f52f5a945 Revert "don't propagate recursivePthLoader, it is needed to process it already"
This reverts commit edd160452e.

If we propagate it, derivations that use a python package will also
get the recursivePthLoader needed to process the pth files of the
package.
2013-01-09 22:29:46 +01:00
Florian Friesdorf
1cd2bd460b whitespace 2013-01-09 22:29:41 +01:00
Florian Friesdorf
9f66bf678e release-python: derive python27Package from python27Packages 2013-01-09 22:23:41 +01:00
Florian Friesdorf
06ca1e4768 Merge branch 'channel-nixos' into python 2013-01-09 22:18:38 +01:00
Jack Cummings
2fd4313f6c x86info-1.30 2013-01-09 11:49:41 -08:00
Florian Friesdorf
1b110436bf release-python: remove two non-existing attrs 2013-01-09 20:45:01 +01:00
Jack Cummings
b3a23081e3 Merge remote-tracking branch 'upstream/master' into master_clean 2013-01-09 11:37:32 -08:00
Lluís Batlle i Rossell
fdf11fdb7e firefox18: adding it to release.nix 2013-01-09 19:45:56 +01:00
Rickard Nilsson
97d6292deb linux 3.2-3.7: enable NFS_FSCACHE and CIFS_FSCACHE
NFS_FSCACHE and CIFS_FSCACHE are required to enable the local cache support for
NFS and CIFS (the 'fsc' mount option). The reasoning for enabling it from 3.2
and forward is that at least Ubuntu 12.04 (linux 3.2) has it turned on. Could
probably be enabled for earlier kernels too.
2013-01-09 18:14:54 +01:00
Matej Cotman
260cdd582e xfce4-notifyd: add new package 2013-01-09 18:11:20 +01:00
Lluís Batlle i Rossell
a628b4b0e4 firefox: adding 18.0
I had to disable it using some nixpkgs, because they were considered
'too old'. They are simply commented in the code.
2013-01-09 17:31:04 +01:00
Peter Simons
1036942197 haskell-dimensional-tf: add version 0.1.1 2013-01-09 17:08:51 +01:00
Peter Simons
9e1df1ada3 haskell-numtype-tf: add version 0.1 2013-01-09 17:08:17 +01:00
Peter Simons
029439c0f6 haskell-type-level-natural-number: add version 1.1.1 2013-01-09 16:57:46 +01:00
Peter Simons
490085a811 git-annex: update to version 3.20130107 2013-01-09 16:54:31 +01:00