| Commit message (Collapse) | Author | Age |
| |
|
| |
|
| |
|
| |
|
|\
| |
| |
| |
| |
| | |
Conflicts:
pkgs/development/libraries/ffmpeg/2.x.nix
pkgs/development/libraries/serf/default.nix
|
| | |
|
|\|
| |
| |
| |
| |
| |
| |
| |
| | |
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)
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
(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.
|
|\| |
|
| | |
|
|/
|
|
| |
0769fc5b77eb76c6a794187f173c48f912fc837c broke this by setting CONFIG_SHELL.
|
| |
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This includes a lot of fixes for cross-building to Windows and Mac OS X
and could possibly fix things even for non-cross-builds, like for
example OpenSSL on Windows.
The main reason for merging this in 14.04 already is that we already
have runInWindowsVM in master and it doesn't work until we actually
cross-build Cygwin's setup binary as the upstream version is a fast
moving target which gets _overwritten_ on every new release.
Conflicts:
pkgs/top-level/all-packages.nix
|
| |
| |
| |
| |
| |
| |
| | |
Not sure why this even got into the upstream release, as _all_ other
includes use forward slashes.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|/
|
|
|
|
|
| |
Bonus: simpler build, and should fix the build of bsdiff for Darwin
(patch taken from homebrew).
Signed-off-by: Austin Seipp <aseipp@pobox.com>
|
| |
|
| |
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts (simple):
pkgs/development/compilers/gcc/4.8/default.nix
pkgs/development/compilers/llvm/default.nix
pkgs/development/libraries/gmp/5.1.1.nix
pkgs/development/libraries/gmp/5.1.3.nix
pkgs/development/libraries/gmp/5.1.x.nix
pkgs/top-level/all-packages.nix
|
| | |
|
| | |
|
| |
| |
| |
| | |
Issue #1469.
|
| |
| |
| |
| | |
No need to make stdenv bootstrap more bloated than necessary.
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts (easy):
pkgs/development/compilers/llvm/default.nix
pkgs/development/compilers/openjdk/default.nix
pkgs/development/libraries/icu/default.nix
pkgs/development/libraries/libssh/default.nix
pkgs/development/libraries/libxslt/default.nix
pkgs/development/tools/parsing/bison/3.x.nix
|
| | |
|
|\|
| |
| |
| |
| | |
Conflicts:
pkgs/top-level/all-packages.nix
|
| | |
|
|\|
| |
| |
| |
| | |
There was a minor conflict in 'stumpwm'. The package needs texinfo
version 4.x. At least is used to, I'm not sure whether it still does.
|
| | |
|
| | |
|
|\| |
|
| | |
|
|\|
| |
| |
| |
| |
| | |
Conflicts:
pkgs/applications/version-management/git-and-tools/git/default.nix
pkgs/top-level/all-packages.nix
|
| |
| |
| |
| | |
possible
|
| | |
|
| | |
|
|\| |
|
| | |
|
|\|
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
pkgs/development/libraries/gmp/5.1.1.nix
pkgs/development/libraries/mpc/default.nix
pkgs/development/libraries/mpfr/default.nix
pkgs/development/libraries/ppl/default.nix
pkgs/tools/misc/coreutils/default.nix
|
| | |
|
| | |
|
| | |
|
| | |
|
|/ |
|
|\ |
|
| | |
|
| | |
|
| |
| |
| |
| |
| |
| |
| | |
This fixes the gets() problem in gzip.
Also disabled "make check" because it depends on Perl and more/less,
which is undesirable in the stdenv bootstrap.
|
|\| |
|
| |
| |
| |
| | |
The next version will have this fix already.
|
| |
| |
| |
| | |
Some packages (e.g. libarchive) try to link there. Reported by jack_c in IRC.
|