Vladimír Čunát
82797f98f2
Merge branch 'staging' into modular-stdenv
...
Conflicts:
pkgs/development/interpreters/perl/5.10/setup-hook.sh
pkgs/development/interpreters/perl/5.8/setup-hook.sh
pkgs/stdenv/linux/default.nix
2014-09-08 18:24:58 +02:00
Vladimír Čunát
1e389c976c
merge 'staging' into modular-stdenv
...
In 2c62a36b77
the messages in pkgs/stdenv/generic/default.nix
were not merged correctly.
Conflicts:
pkgs/stdenv/generic/default.nix
2014-09-08 18:16:54 +02:00
Eelco Dolstra
585983bc95
Merge remote-tracking branch 'origin/staging'
...
Conflicts:
pkgs/applications/version-management/subversion/default.nix
2014-09-08 11:42:09 +02:00
Vladimír Čunát
06fea81c6e
Merge recent master into staging
...
Hydra: ?compare=1150594
2014-09-06 16:52:45 +02:00
Pascal Wittmann
f99ad6fe94
help2man: update from 1.46.1 to 1.46.2
2014-09-06 16:23:15 +02:00
Rüdiger Sonderfeld
46266cc216
gdb: Update to 7.8 and include Guile support.
...
GDB 7.8 adds Guile scripting support. This is now enabled by default as
well. Checking for guile also adds a pkg-config dependency.
It seems Python is explicitly excluded from cross building. I'm not
sure if Guile should also be excluded.
2014-09-06 13:31:56 +02:00
Michael Raskin
d81303813a
Merge pull request #3465 from joelteon/picky-binutils
...
Stop binutils from trying to build on Darwin
2014-09-03 19:57:09 +04:00
Eelco Dolstra
9d64b445b6
swig: Disable ccache stuff
...
http://hydra.nixos.org/build/13936297
2014-09-02 13:07:49 +02:00
Peter Simons
1c0d15b90e
Merge branch 'origin/master' into staging.
...
Conflicts:
pkgs/development/libraries/ffmpeg/2.x.nix
pkgs/development/libraries/serf/default.nix
2014-09-02 12:31:03 +02:00
Ricardo M. Correia
f9e63ca20d
inotify-tools: Fix hash
...
The hash wasn't updated when the version was bumped.
2014-09-01 15:07:54 +02:00
Michael Raskin
fe549d89be
Update CL-Launch
2014-08-31 18:20:06 +04:00
Pascal Wittmann
408832ac67
help2man: update from 1.44.1 to 1.46.1 and add myself as a maintainer
2014-08-30 23:59:35 +02:00
Vladimír Čunát
e51f73652d
Merge recent master into staging
...
Hydra: ?compare=1149952
Conflicts:
nixos/doc/manual/configuration.xml (changed split file)
nixos/modules/config/users-groups.nix (choosing filterNull instead of inline definition)
pkgs/development/libraries/readline/readline6.3.nix (auto-solved)
2014-08-30 10:04:02 +02:00
ambrop7@gmail.com
21090fa778
Add BOSSA.
...
BOSSA is a flash programming utility for Atmel's SAM family of flash-based ARM microcontrollers. The motivation behind
BOSSA is to create a simple, easy-to-use, open source utility to replace Atmel's SAM-BA software. BOSSA is an acronym
for Basic Open Source SAM-BA Application to reflect that goal.
2014-08-27 13:07:43 +02:00
Bjørn Forsman
c9baba9212
Fix many package descriptions
...
(My OCD kicked in today...)
Remove repeated package names, capitalize first word, remove trailing
periods and move overlong descriptions to longDescription.
I also simplified some descriptions as well, when they were particularly
long or technical, often based on Arch Linux' package descriptions.
I've tried to stay away from generated expressions (and I think I
succeeded).
Some specifics worth mentioning:
* cron, has "Vixie Cron" in its description. The "Vixie" part is not
mentioned anywhere else. I kept it in a parenthesis at the end of the
description.
* ctags description started with "Exuberant Ctags ...", and the
"exuberant" part is not mentioned elsewhere. Kept it in a parenthesis
at the end of description.
* nix has the description "The Nix Deployment System". Since that
doesn't really say much what it is/does (especially after removing
the package name!), I changed that to "Powerful package manager that
makes package management reliable and reproducible" (borrowed from
nixos.org).
* Tons of "GNU Foo, Foo is a [the important bits]" descriptions
is changed to just [the important bits]. If the package name doesn't
contain GNU I don't think it's needed to say it in the description
either.
2014-08-24 22:31:37 +02:00
Georges Dubus
6418007dab
nixbang: add expession
2014-08-24 16:07:23 +02:00
Vladimír Čunát
d4e9fd2a90
Merge recent master into staging
...
Hydra: ?compare=1148749
Conflicts (easy):
nixos/modules/virtualisation/containers.nix
2014-08-21 15:09:31 +02:00
Eelco Dolstra
5c53f22492
Revert "binutils: Enable sysroot support"
...
This reverts commit 773595540b
. It
breaks stuff and we don't need it anymore.
http://hydra.nixos.org/build/13517591
2014-08-20 11:13:46 +02:00
Pascal Wittmann
f06419e1a8
inotify-tools: update from 3.13 to 3.14 and add myself to maintainers
...
note: project has moved to github on 23 November 2009
2014-08-17 23:13:12 +02:00
Eelco Dolstra
773595540b
binutils: Enable sysroot support
2014-08-17 17:25:12 +02:00
Luca Bruno
36bef2b267
gobject-introspection: refer to shlibs with absolute paths in typelibs
...
After this, LD_LIBRARY_PATH should not be required anymore.
The patch has been applied only for .la files, so there may
be some other cases missing.
2014-08-14 23:16:51 +02:00
Michael Raskin
8da8c805bb
Update luarocks
2014-08-14 10:14:21 +04:00
Austin Seipp
6bd1b35509
arcanist: 20140717 -> 20140812
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-08-12 21:52:35 -05:00
Moritz Ulrich
1f221a72de
dfu-programmer: Bump to 0.7.
2014-08-12 13:42:10 +02:00
Peter Simons
18250b97ae
Remove 'andres' from the meta.maintainer section of all Haskell package where I
...
had added him earlier.
2014-08-09 13:49:24 +02:00
Eelco Dolstra
e3f7dbbac8
Cleanup: Use += to append to envHooks
2014-08-09 12:47:05 +02:00
Eelco Dolstra
2def8e7499
Remove addHook
...
Just use bash arrays directly. I.e.
addHook preConfigure myPreConfigure
is now
preConfigureHooks+=(myPreConfigure)
2014-08-09 12:45:53 +02:00
Eelco Dolstra
d7a4fa26b0
Fix dontPatchELF being set after the setup script has been sourced
2014-08-09 12:44:49 +02:00
Eelco Dolstra
83a41771ab
Move RPATH shrinking from stdenv to a setup hook provided by patchelf
2014-08-09 12:44:49 +02:00
Vladimír Čunát
52d9c93abe
Merge 'staging' into master
2014-08-08 20:13:23 +02:00
Eelco Dolstra
8a7f3c3618
Mark a bunch of packages as broken or not supported on Darwin
2014-08-08 17:59:02 +02:00
Peter Simons
9226fbf56a
Merge remote-tracking branch 'origin/master' into staging.
2014-08-08 09:51:01 +02:00
William A. Kennington III
0450b0ad0a
intel-gpu-tools: Add derivation
2014-08-07 01:32:43 +02:00
Joel Taylor
a232a2d2c5
prevent usage of binutils on darwin
2014-08-04 13:30:05 -07:00
Peter Simons
2d326e5032
Merge remote-tracking branch 'origin/master' into staging.
...
Conflicts:
pkgs/desktops/e18/enlightenment.nix
2014-08-04 16:51:47 +02:00
Bjørn Forsman
410f2a9dab
lttng: align attribute name with package name
...
lttngModules => lttng-modules
lttngTools => lttng-tools
lttngUst => lttng-ust
But keep the old attributes around for backward compatibility.
2014-07-31 16:00:04 +02:00
Eelco Dolstra
8a10d8bbc3
autoconf: Disable tests
...
These take waaaay too long.
2014-07-29 17:03:48 +02:00
Mateusz Kowalczyk
7a45996233
Turn some license strings into lib.licenses values
2014-07-28 11:31:14 +02:00
Eelco Dolstra
7f410ef923
Merge remote-tracking branch 'origin/master' into staging
...
Conflicts:
pkgs/misc/vim-plugins/default.nix
2014-07-22 11:00:00 +02:00
Mathnerd314
dd325fa30c
Add prelink package
2014-07-19 02:16:41 +02:00
Alexander Tsamutali
cc4c108965
usb-modeswitch: Update to 2.2.0.
2014-07-18 20:11:16 +04:00
Austin Seipp
d5326a4af0
arcanist: 20140627 -> 20140717
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-07-17 01:26:44 -05:00
Eelco Dolstra
b9d19af3e6
Merge remote-tracking branch 'origin/master' into staging
2014-07-15 12:14:35 +02:00
Peter Simons
78c7ea2c8f
haskell-ShellCheck: update to version 0.3.4
2014-07-14 17:33:50 +02:00
Eelco Dolstra
ff97b7dbe6
Merge remote-tracking branch 'origin/master' into staging
2014-07-14 17:04:55 +02:00
Peter Simons
d2e731e111
Add "please don't edit" comment at the top of every auto-generated Haskell file.
2014-07-14 13:21:41 +02:00
Eelco Dolstra
973c9abdbe
Fix info command
...
The "info" command has been broken on NixOS since
457fdb3842
(proving that nobody uses
info).
2014-07-08 15:19:08 +02:00
Eelco Dolstra
95b828de42
Merge remote-tracking branch 'origin/master' into staging
2014-07-07 13:16:26 +02:00
Bjørn Forsman
3950f2582d
openocd: fix symlink to udev rules file
...
I made an error last time I touched this line. Fix it (.udev => .rules).
2014-07-05 14:56:10 +02:00
Luca Bruno
ac711a705e
dfeet: fix icons
2014-07-05 12:18:17 +02:00