Commit graph

4269 commits

Author SHA1 Message Date
Lluís Batlle i Rossell b58780c43d Merge remote-tracking branch 'eelco/master' into stdenv-updates
Conflicts:
	pkgs/development/compilers/gcc/4.7/default.nix

Trivial solution.
2012-12-28 23:28:16 +01:00
Eelco Dolstra 88b11196c1 Clean up redundant "if condition then true else false" 2012-12-28 19:57:47 +01:00
Eelco Dolstra 84779a6f7d Remove unnecessary parentheses around if conditions
Pet peeve...
2012-12-28 19:54:15 +01:00
Eelco Dolstra ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
2012-12-28 19:20:09 +01:00
Eelco Dolstra 5be0a9acd7 Rename hostDrv -> crossDrv, buildDrv -> nativeDrv
This is for consistency with terminology in stdenv (and the terms
"hostDrv" and "buildDrv" are not very intuitive, even if they're
consistent with GNU terminology).
2012-12-28 19:08:19 +01:00
Rok Garbas 60de7967da weechat: update and adding pycrypto support (for fish.py plugin) 2012-12-28 02:17:04 +01:00
Michael Raskin b31e6aa794 Merge pull request #231 from RSzibele/master
Added Logisim 2.7.1
2012-12-27 06:32:03 -08:00
RSzibele fcdf685793 Added Logisim-2.7.1. 2012-12-27 16:25:39 +01:00
Michael Raskin dd6ef6229e Merge pull request #226 from maggesi/hol_light_updates
Update HOL Light (and fix installation)
2012-12-27 05:33:24 -08:00
Michael Raskin a862f2abf0 Merge pull request #217 from ppietrasa/master
kadu version bump
2012-12-27 05:31:54 -08:00
Michael Raskin c7a8d9f98d Merge pull request #221 from Eelis/master
Ion3 update to 20090110
2012-12-27 05:31:22 -08:00
Peter Simons 591f85f17e celestia: add version 1.6.1 2012-12-25 11:26:53 +01:00
Marco Maggesi 49e4824b8a Update HOL Light (and fix installation) 2012-12-23 18:46:09 +01:00
Peter Simons 03f42614e8 ikiwiki: update to version 3.20121212 2012-12-23 12:43:41 +01:00
Rok Garbas c90c96572f i3: update to 4.4 2012-12-22 17:21:17 +01:00
Rickard Nilsson 45635e9e0f opera: Update to 12.12 2012-12-20 14:45:15 +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
David Guibert 7503291ff9 update freerdp to 1.0.1 and unstable version. 2012-12-18 09:57:07 +01:00
Piotr Pietraszkiewicz 45937caa2f Bumped kadu to v0.12.2 and its dependency libgadu to v1.11.2 2012-12-17 20:44:59 +01:00
Rickard Nilsson 59c9f406fd darktable: Update to 1.1.1 2012-12-17 17:27:13 +01:00
Peter Simons 918b26a59e git-annex: update to version 3.20121211 2012-12-15 11:44:13 +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
Michael Raskin a0ed4d2295 Updating OpenSCAD to use Eigen3 2012-12-13 16:24:05 +04:00
Lluís Batlle i Rossell 465f4f4e3e freecad: updating to git master 2012-12-13 12:38:19 +01:00
Rok Garbas 0ef727ba74 audacity: update to 2.0.2 2012-12-13 08:04:49 +01:00
Eelco Dolstra 85996ac018 ed: Update to 1.7 2012-12-12 17:17:05 +01:00
Eelco Dolstra f364619e22 Merge remote-tracking branch 'origin/master' into stdenv-updates 2012-12-12 17:01: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 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 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 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
Lluís Batlle i Rossell 0f7dee47a1 librecad: adding its 2.0 beta version too 2012-12-11 09:53:25 +01:00
Eelco Dolstra a2c2d8e28a thunderbird: Disable parallel building
It's broken just as in Firefox.

http://hydra.nixos.org/build/3441371
2012-12-09 02:07:42 +01:00
Michael Raskin 1c3434cc16 Update E prover 2012-12-09 00:36:38 +04:00
Florian Friesdorf a551d61083 skype 4.1.0.20 2012-12-06 15:40:55 +01:00
aszlig acafaf9b23
rxvt-unicode: Add path to terminfo file.
On NixOS, we have set TERMINFO_DIRS to the user environment, so urxvt and curses
programs running within urxvt are able to find the terminfo file. Unfortunately
this isn't the case if you're not using NixOS.

Of course we now no longer need the longDescription, which suggests to issue

export TERMINFO=~/.nix-profile/share/terminfo

... which to my eyes essentially is a workaround. So please correct me when I'm
wrong, but i think it's better if software is working as-is rather than
requiring additional configuration (except if it really makes sense or breaks
purity).

Thanks to Eelis in #nixos for reporting this.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-12-06 03:30:06 +01:00
cillianderoiste 5b0cd954f1 Merge pull request #206 from chaoflow/python-merge
python pureness, cleanup, and enable pth loaders (setuptoolsSite, recursivePthLoader)
2012-12-05 14:28:09 -08:00
aszlig 8fd4b80bc7
chromium: Don't use the config attrset anymore.
We can still use the config attribute set from within all-packages to pass it to
the package expression, which we do in case of PulseAudio. In order to override
other stuff you can now conveniently use chromium.override without passing a
fake config attribute set.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-12-05 14:05:18 +01:00
aszlig caabb8ee47
chromium: Allow package override on channels.
This allows for more flexible overrides instead of just passing a custom
configuration attrset like:

chromium.override { config.chromium.channel = "beta"; }

So you can now simply do:

chromium.override { channel = "beta"; }

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-12-05 14:05:18 +01:00
aszlig e504299f94
chromium: Update channels to stable v23.0.1271.95.
This updates the beta channel as well:

stable: 23.0.1271.91 -> 23.0.1271.95
beta: 24.0.1312.25 -> 24.0.1312.27

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-12-05 14:05:17 +01:00
Eelco Dolstra 5e256ccc88 Merge remote-tracking branch 'origin/master' into stdenv-updates 2012-12-04 17:12:35 +01:00
Michael Raskin 56f1c1ec24 Update veracity 2012-12-04 10:12:38 +04:00
Michael Raskin 8a1f312621 Update golly 2012-12-04 10:10:28 +04:00
Lluís Batlle i Rossell 6655cf6d23 firefox: update to 17.0.1
I feel lucky.
2012-12-03 17:19:56 +01:00
Peter Simons 1a1b91e0d6 haskell-xmobar: update to version 0.16 2012-12-03 16:12:04 +01:00
Peter Simons 3261d1d4aa git-annex: update to version 3.20121127 2012-12-03 16:12:04 +01:00