Commit graph

23063 commits

Author SHA1 Message Date
Antono Vasiljev 4e4edb74b2 Merge branch 'master' into arduino 2012-12-23 18:22:58 +02:00
Antono Vasiljev dde7b978d6 inotool: add avr-gcc-libc to inputs 2012-12-23 18:21:51 +02:00
Antono Vasiljev 4403215806 AVR GCC: enable C++ support (makes it usable with Arduino)
- GCC version bumped, 4.6.1 had some arduino related bug
2012-12-23 18:20:34 +02:00
David Guibert 4b2e8aa30e Merge pull request #224 from jcumming/zfs.121221
zfs-0.6.0-rc13, spl-0.6.0-rc13
2012-12-23 05:37:36 -08:00
Peter Simons 03f42614e8 ikiwiki: update to version 3.20121212 2012-12-23 12:43:41 +01:00
Antono Vasiljev d4fc33b13a Merge branch 'master' into arduino
Conflicts:
	pkgs/top-level/all-packages.nix
2012-12-23 00:17:23 +02:00
Rok Garbas 6e02c33e0b Merge branch 'master' of github.com:NixOS/nixpkgs 2012-12-22 17:21:49 +01:00
Rok Garbas c90c96572f i3: update to 4.4 2012-12-22 17:21:17 +01:00
Lluís Batlle i Rossell d476a7eac0 distcc: making it build 2012-12-22 17:13:47 +01:00
Michael Raskin 17a4e01c69 Wine: update to 1.5.20 2012-12-22 14:54:22 +04:00
Michael Raskin 8630db2b55 More specific tracing of a relatively tricky replace once; account for default.nix being present everywhere. 2012-12-22 14:14:48 +04:00
Michael Raskin 248d160f7c Update-walker should use basename of .upstream file for default basename of .nix 2012-12-22 13:59:02 +04:00
Jack Cummings c73e542634 zfs-0.6.0-rc13, spl-0.6.0-rc13 2012-12-21 16:30:19 -08:00
Florian Friesdorf 1797d396ab python-coilmq test fails 2012-12-22 00:25:37 +01:00
Rickard Nilsson 45635e9e0f opera: Update to 12.12 2012-12-20 14:45:15 +01:00
Sander van der Burg 8602eeda81 - Updated android SDK to version 21
- Updated platform-tools, addons and system-images that belong to release 21 accordingly
- We must also patch 64-bit emulator instances now
2012-12-20 14:04:52 +01:00
Shea Levy 2eb0c6fba5 D'oh 2012-12-20 00:52:51 -05:00
Shea Levy 95679e1344 Misunderstood hasOptions, I think 2012-12-20 00:28:12 -05:00
Shea Levy ce6d4070a6 Add a 'functionTo x' type.
This is mainly to for the 'merge' concept, but I made a guess as to what
iter and fold would mean for functions.
2012-12-19 22:49:37 -05:00
Eelco Dolstra bbffdd4702 postgresql: Add version 9.2 2012-12-19 13:51:28 +01:00
Eelis van der Weegen 01adc95b13 Ion3 update to 20090110 2012-12-18 21:12:17 +01:00
Shea Levy 3fa853ec24 st: Use official release tarball 2012-12-18 11:13:12 -05:00
Eelco Dolstra b643316a42 VM builds: Use BusyBox
http://hydra.nixos.org/build/3510928
2012-12-18 16:57:11 +01:00
David Guibert 7503291ff9 update freerdp to 1.0.1 and unstable version. 2012-12-18 09:57:07 +01:00
Shea Levy 9247552a91 Linux 3.7.1 2012-12-17 17:45:01 -05:00
Shea Levy baa5ebfbdf Linux 3.0.57 2012-12-17 17:43:02 -05:00
Shea Levy 55196223c7 Linux 3.4.24 2012-12-17 17:42:38 -05:00
Shea Levy cc12516cf0 Linux 3.6.11 2012-12-17 17:33:44 -05:00
Shea Levy 2fc426577b Unmaintain aufs 2012-12-17 17:16:48 -05:00
Patrick John Wheeler b264abcabb Turn on Python plugin for vim_configurable by default
Python plugin for vim is turned on by default in ubuntu and other flavors of linux and mimicking
this in NixOS will help contribut to the impression that NixOS "just works."
2012-12-17 21:54:39 +01:00
Eelco Dolstra 3644f9124a pam_ssh_agent_auth: Allow multiple authorized keys files
We need this because of https://github.com/NixOS/nixos/pull/52.
2012-12-17 21:11:10 +01:00
Eelco Dolstra f8cf626b5e pam_ssh_agent_auth: Update to 0.9.4 2012-12-17 21:11:10 +01:00
Rickard Nilsson 59c9f406fd darktable: Update to 1.1.1 2012-12-17 17:27:13 +01:00
Shea Levy 97389f5b1f Keep nixpkgs backwards-compatible at least 1 version 2012-12-17 10:21:55 -05:00
Lluís Batlle i Rossell faf821e501 Adding USB cameras to linux 3.7
Details changed since the 3.6 config to get this enabled.
2012-12-17 11:52:47 +01:00
Shea Levy 6a147cfbfa Add unionfs-fuse meta 2012-12-16 16:42:45 -05:00
Shea Levy 42b061d118 Add unionfs-fuse 2012-12-16 16:25:24 -05:00
Shea Levy 88e43775fd fuse 2.9.2 2012-12-16 16:25:24 -05:00
Lluís Batlle i Rossell 62fa1b8782 Adding ext4 to vmTools. Otherwise, nixos build-vm fails with 'useBootLoader'. 2012-12-16 21:43:35 +01:00
Andres Loeh 0f5976b599 ghc-paths: Fix patch to hopefully work with older GHCs. 2012-12-16 17:25:43 +01:00
Lluís Batlle i Rossell 5a475f7250 utillinux: fixing mount/umount, for our case of /etc/mtab symlinking to /proc/mounts
In systemd, without this patch, 'mount' for 'user' fstab devices works, but
umount does not; it says to require root.
All gets normal with this patch.
2012-12-16 15:43:47 +01:00
Andres Loeh d068aa9861 Patch ghc-paths to interact better with ghcWithPackages.
When the ghc-paths library is compiled, the paths of the
compiler it is compiled with are being hardcoded in the
library (and can then be queried from other applications
using the library).

But on Nix, packages are compiled with ghc-wrapper, and
subsequently possibly used with a special version of ghc
generated for a particular environment of packages. So
one version of ghc-paths may potentially end up being
used by lots of different instances of ghc. The hardcoding
approach fails.

As a work-around, we now patch ghc-paths so that it allows
setting the paths that can be queried via environment
variables. Specific GHC environments can then set these
environment variables in the wrapper shell script that
invokes GHC.

This should at least partially solve issue #213.
2012-12-16 14:25:15 +01:00
Aristid Breitkreuz e89aea5e42 add luite's mirror to cabal/hackage download expression (for when hackage.haskell.org is down) 2012-12-15 23:34:49 +01:00
Peter Simons 918b26a59e git-annex: update to version 3.20121211 2012-12-15 11:44:13 +01:00
Peter Simons 3017d35260 haskell-vault: update to version 0.2.0.3 2012-12-15 11:32:48 +01:00
Peter Simons fe826eb71d haskell-unordered-containers: update to version 0.2.3.0 2012-12-15 11:32:47 +01:00
Peter Simons 06669abb0f haskell-uniplate: update to version 1.6.10 2012-12-15 11:32:47 +01:00
Peter Simons 4b3a48b75f haskell-lens: update to version 3.7.1 2012-12-15 11:32:47 +01:00
Peter Simons f7cf103ee8 haskell-iproute: update to version 1.2.10 2012-12-15 11:32:47 +01:00
Peter Simons 5653671646 haskell-heist: update to version 0.10.1 2012-12-15 11:32:47 +01:00