Commit graph

22972 commits

Author SHA1 Message Date
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
Peter Simons fc17b6d767 haskell-diagrams-svg: update to version 0.6.0.1 2012-12-15 11:32:47 +01:00
Peter Simons cc5b72c240 haskell-case-insensitive: update to version 0.4.0.4 2012-12-15 11:32:47 +01:00
Peter Simons 4a1cf1dc95 haskell-attoparsec: update to version 0.10.3.0 2012-12-15 11:32:47 +01:00
Peter Simons 6201716063 haskell-aeson: update to version 0.6.1.0 2012-12-15 11:32:47 +01:00
Lluís Batlle i Rossell 14d87a44b1 Trying to fix avogadro -> kdeedu
avogadro also wants eigen2.
2012-12-14 22:23:37 +01:00
Lluís Batlle i Rossell b956b77423 eigen: adding back eigen 2.0, for kde.
Kdeedu wants eigen 2.0.
2012-12-14 22:23:36 +01:00
Florian Friesdorf 93b3d24b96 oauth2 tests still fail 2012-12-14 20:24:53 +01:00
Florian Friesdorf 0fb9688235 python prefix for recursive pth loader and fix typo 2012-12-14 19:47:51 +01:00
Mathijs Kwik 4d57a834f9 phantomjs: it seems upx packing is only used on x86_64 2012-12-14 00:27:43 +01:00
aszlig 639edcb829
manual-kernel: Fix handling spaces in readConfig.
The previos version did a for loop over the output of set, which spits out _all_
defined variables and their contents. This not only is dangerous if there is a
variable starting with CONFIG_ but also can't handle whitespace, as the IFS is
set to any (horizontal _and_ vertical) whitespace by default.

So, imagine (actually don't imagine, something like this is the case in a lot of
kernel configuration files) you have the following variable:

CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi ..."

A loop with for and the default IFS would result in the following variable
pieces:

0: CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi
1: -fcall-saved-rsi
2: ..."

This obviously leads to the problem that this config variable is being cut off
at the first whitespace.

Another downside of this approach is that set not only returns variables but
functions as well. This could lead to quite a lot of unexpected behaviour and
confusion.

So the new approach doesn't source the kernel configuration anymore but uses
`read` to parse the file line-by line, setting IFS to '=', thus splitting all
configuration lines into key/value pairs.

Using parameter expansion, we ensure that we only read lines starting with
"CONFIG_". This particularily has the advantage of not being bash-specific,
should we choose to change to a different default shell someday.

Now, after we got a correct "CONFIG_" line, we're using a temporary variable to
split off the first quote from the result. Particularily the reason behind this
is shell compatibility again, as ${${foo#"}%"} only works in Bash, Zsh and
whatnot but not in plain SH.

And within the next line we obviously insert the no_firstquote variable without
it's last quote removed.

But, what about escaping?

First of all, if we'd just eval the $val variable, we would correctly unescape
the value, but this has the downside that variables within the content would be
expanded, for example look at this:

CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"

Well, obviously this is a bad example at the Nix sense, but just to show that
variables within kernel configuration entries aren't impossible.

And second, which would have been a show stopper if \" would be within $val: It
simply would end up being an invalid Nix expression, because \" would end up as
a ploin " within a double quoted string.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-12-13 22:54:57 +01:00
Mathijs Kwik fbee57defb new package: casperjs 2012-12-13 17:51:03 +01:00
Mathijs Kwik 2cdc567ff5 new package: phantomjs 2012-12-13 17:51:03 +01:00
Rickard Nilsson 591c27e58d argyllcms: New package, version 1.4.0
ArgyllCMS is an ICC compatible color management system.
2012-12-13 16:01:35 +01:00
Lluís Batlle i Rossell adb2fabf8d freecad: removing a patch not needed anymore 2012-12-13 15:18:40 +01:00
Mathijs Kwik 6776756882 mkvtoolnix: upgrade to 5.9.0 2012-12-13 14:00:28 +01:00
Mathijs Kwik caf561d41a aufs3: upgrade to 1210 release, add linux-3.7 support 2012-12-13 14:00:28 +01:00
Michael Raskin a0ed4d2295 Updating OpenSCAD to use Eigen3 2012-12-13 16:24:05 +04:00
Michael Raskin 215c5f0ff8 EQL: update to latest snapshot 2012-12-13 15:53:24 +04:00
Lluís Batlle i Rossell 465f4f4e3e freecad: updating to git master 2012-12-13 12:38:19 +01:00
Lluís Batlle i Rossell 543bc8c984 eigen: updating from eigen2 to eigen3 2012-12-13 12:38:19 +01:00
Peter Simons dbb4c0a7ab haskell-Crypto: update to version 4.2.5.1 2012-12-13 11:07:16 +01:00
Rok Garbas 0ef727ba74 audacity: update to 2.0.2 2012-12-13 08:04:49 +01:00
Michael Raskin f0997b9737 ECL: update to 12.12.1 2012-12-13 10:07:18 +04:00
aszlig 5054e8ec29
scid: New package, version 4.3.
Just saw Michael Raskin's GNU Chess and XBoard updates and did a short check if
Scid is already in nixpkgs. It wasn't, so I decided to add it, so thanks to
@7c6f434c :-)

The package involves a lot of patching, as usual with Tcl/Tk on NixOS. In this
case the program is written in C++ and embeds the Tcl/Wish interpreter.

Unfortunately this doesn't make it easier to inject TCLLIBPATH, as there doesn't
seem to be a direct library call (well in theory you could `lappend TCLLIBPATH`,
but that won't help with TK_LIBRARY).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-12-12 12:36:20 +01:00
aszlig 9337078fde
chromium: Update stable and beta channel.
stable: 23.0.1271.95 -> 23.0.1271.97 (tested and works)
beta: 24.0.1312.27 -> 24.0.1312.35 (tested and works)

The dev version doesn't build in its newest incarnation, so we will need to fix
and/or patch it before pushing upstream.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-12-12 12:36:19 +01:00
aszlig 0c160be3d2
ascii: New package, version 3.12.
Quite a useful tool, especially for non English native speakers to find out what
people mean with things like "hiccup", "boink", "blugle" and whatnot.

And of course it's quite useful to convert between hex/oct/dec/bin.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-12-12 12:36:19 +01:00
aszlig bf3d3dd19b
xinit: Fix logpath and dependencies for startx.
It seems that (almost?) all NixOS users start X using the services module,
because startx seems to be broken for quite some while. And it hit me while
getting to NixOS for the first time as well, so I then decided to just use the
service module.

As I'm working with multiple X servers, writing wrappers in ~/nixpkgs/config.nix
became tedious and so I decided to fix it, hopefully without breaking anything.

The fix consists of:

 * Provide a default location for the Xorg log (~/.xorg.log - hope that's okay)
 * Expose xauth through xinit to ensure purity and "unexpected behaviour", also
   known as "simply not working", because xauth isn't in the user's environment.
 * Actually provide the X binary so it doesn't have to be passed to startx every
   time.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-12-12 12:36:19 +01:00
aszlig 5a3f9c08b0
virtualbox: Allow building with extension pack.
The extension pack is needed in order to have USB 2.0, RDP and PXE boot support
and is _not_ part of the free version, so please read their conditions before
using it:

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

Further information and details about the extension pack is available here:

https://www.virtualbox.org/manual/ch01.html#intro-installing

I'm wimping out here and use requireFile to ask the user to fetch the extension
pack manually, simply because I'm not a lawyer. I've seen other distributions
that fetch the extension packs directly from upstream, but I'm not sure if that
is according to Oracle's PUEL.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-12-12 12:36:19 +01:00
aszlig 6acc5289fc
vbindiff: New package, version 3.0_beta4.
Visual binary differences viewer, very useful for reverse-engineering
proprieritary file formats.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-12-12 12:36:18 +01:00
aszlig e42dc52f42
samplicator: New package, version 1.3.7-beta6.
A small and lightweight UDP redirector if you don't want to bend a fly on the
wheel using socat.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-12-12 12:36:18 +01:00
aszlig f1c80cf20c
git-and-tools/hub: New package, version 1.10.3.
This is a small wrapper of Git, which integrates some GitHub specific features,
especially stuff like merging or sending pull requests or attaching commits to
an issue.

I'm not quite familiar with the Nix integration of Ruby, so let's hope that I'm
not doing something horrible here.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-12-12 12:36:18 +01:00
aszlig abb7c98cfe
wbox: New package, version 5.
Yet another HTTP benchmarking tool, which is really quite minimalistic and in
ANSI C.

This package maybe isn't even worth putting it in its own file and directory but
I did it for the sake of consistency.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-12-12 12:36:18 +01:00
aszlig 7cd641a4e7
hping: New package, version 20051105.
Quite a lot of patching involved here, but the upstream package is no longer
maintained anymore. Nevertheless the tool is still useful in some environments.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-12-12 12:36:17 +01:00
aszlig c6dd35c2ac
abiword: Enable parallel building.
Shouldn't take _that_ long to build, but I was impatient during fixing the
build and it doesn't hurt anyway, does it?

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-12-12 12:36:17 +01:00
aszlig c91662f979
abiword: Fix glib/gdx_pixbuf related build errors.
A bunch of these includes expect extra prefixes which we don't have in Nix, so
we are going to batch-fix them with sed.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-12-12 12:36:17 +01:00
Peter Simons de81ec924b haskell-LambdaHack: update to version 0.2.6.5 2012-12-12 11:54:27 +01:00
Peter Simons f284ff8326 haskell-yesod: update to version 1.1.7 2012-12-12 11:54:27 +01:00
Peter Simons c90c6a776e haskell-yesod-default: update to version 1.1.3 2012-12-12 11:54:27 +01:00