3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

45 commits

Author SHA1 Message Date
Eelco Dolstra 075c1d4f15 Doh 2014-09-12 11:21:21 +02:00
Eelco Dolstra 135142780b readline: Name Nix expressions consistently 2014-09-12 11:15:13 +02:00
Eelco Dolstra d2143c73bb readline-6.3: Fix building on Darwin
The zip file contains files named CHANGELOG and ChangeLog, so the
build fails on case-insensitive systems with:

  error: creating file `/nix/store/nix-4888-0/unpacked/ChangeLog': File exists

The official tar distribution does not have this problem.
2014-09-12 11:15:13 +02:00
Vladimír Čunát b2887c0b5e readline5: recover, as it was still used
Partial revert of 30fef8a3cf.
I probably confused that with unused readline62.
2014-09-01 11:40:22 +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
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
Vladimír Čunát 30fef8a3cf readline: remove unused old versions 4 and 5
...including an unused patch.
2014-08-21 15:13:20 +02:00
Vladimír Čunát 2b75fe851b readline-6.3: update, including security fixes
Close #3706 CVE-2014-2524 (likely not affecting any our program anyway).
2014-08-21 15:13:19 +02: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
Mateusz Kowalczyk 7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Eelco Dolstra b9e9e90a02 readline-6.3: Fix build on Mac OS X < 10.9
http://hydra.nixos.org/build/12476331
2014-07-22 11:24:00 +02:00
Eelco Dolstra 06536251c9 readline: Don't use gcc-apple 2014-07-01 15:56:08 +02:00
Lluís Batlle i Rossell a4c4129477 Adding GNU readline 6.3 apart
I set bashInteractive to use it, as it has many relevant fixes.
2014-03-20 13:00:46 +01:00
Lluís Batlle i Rossell b9163ab332 Revert "Updating GNU readline to 6.3."
This reverts commit dbaa07b8ef.

vcunat reported on IRC that the update breaks python and parted at least.
http://hydra.nixos.org/build/9661091/nixlog/1/tail-reload
2014-03-20 12:53:20 +01:00
Lluís Batlle i Rossell dbaa07b8ef Updating GNU readline to 6.3.
I remove all 6.2 patches manually, but I keep the logic to add later patches.
2014-03-20 10:47:36 +01:00
Kevin Quick dec9e66ea1 Update readline for patch5 (needed for darwin13). 2014-01-26 10:31:53 +01:00
Lluís Batlle i Rossell beb64d1bea readline: picking more patches from upstream
I'm particularly interested in 003, which solves a copy-paste trouble I have
copying matrices into octave, having enabled fltk.
2012-07-25 18:14:52 +02:00
Eelco Dolstra 0894d407ce * Add the latest readline patch.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31709
2012-01-19 17:37:21 +00:00
Ludovic Courtès eaaaad5203 GNU Readline: Fix typo.
svn path=/nixpkgs/branches/stdenv-updates/; revision=29606
2011-10-03 19:27:10 +00:00
Ludovic Courtès 41d04539a6 GNU Readline 6.2: Update patch set.
svn path=/nixpkgs/branches/stdenv-updates/; revision=29603
2011-10-03 17:35:04 +00:00
Shea Levy 4d70ba6cc9 Merge from trunk up through r28790
svn path=/nixpkgs/branches/stdenv-updates/; revision=28792
2011-08-24 19:16:43 +00:00
Ludovic Courtès 7762934904 BDW-GC, GMP, libffi, libunistring, Readline: Don't use the native `strip'.
Using the native `strip' breaks static libraries when cross-compiling.

svn path=/nixpkgs/trunk/; revision=27572
2011-07-01 13:20:12 +00:00
Ludovic Courtès c1cfa58556 GNU Readline 6.2.
svn path=/nixpkgs/branches/stdenv-updates/; revision=26118
2011-02-25 15:28:26 +00:00
Eelco Dolstra 6609710409 * Get rid of many instances of "args: with args;", and other coding
guidelines violations.
* Updated libsamplerate to 0.1.7.

svn path=/nixpkgs/trunk/; revision=22782
2010-07-28 11:55:54 +00:00
Ludovic Courtès 1bc4535ed9 GNU Readline 6.1.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19222
2010-01-05 11:27:54 +00:00
Lluís Batlle i Rossell 5c14f92b30 Reverting a wrong name change I once did, when I thought that we would update
all the naming in nixpkgs to match the new build/host cross compilation stdenv.
Nevertheless, we decided not to do the renaming, but I forgot this change in
readline until ludo told me about it.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18474
2009-11-19 22:15:13 +00:00
Lluís Batlle i Rossell e7c8e8da4f I made the whole nixpkgs dependencies available to the cross compiler, no
needing to keep a new tree of expressions apart for the expressions to get
cross-compiled.

I changed the whole way of using cross compilation with nixpkgs, which before
was done through a simple adapter.

Now the adapter became complex, and I've tried to avoid the most obvious
recursivities. For example, the fetchurl expression should
never be cross-compiled, as the gmp, mpfr, and some others, like
some ncurses, perl, ... I made overrided copies of those necessary as
perlNoCross, ncursesNoCross, as stdenvNoCross, keeping in mind that
the stdenv (capable of cross compilation) is built upon stdenvNoCross using
an adapter.

So, to cross compile, instead of building using "nixpkgs/default.nix",
you should build with your
own "myarchiteture.nix", which should have contents like these, for example:

import /etc/nixos/nixpkgs/default.nix
{
    crossSystem = {
        config = "armv5tel-unknown-linux-gnueabi";
        bigEndian = false;
        arch = "arm";
        float = "soft";
    };
}


svn path=/nixpkgs/branches/stdenv-updates/; revision=18398
2009-11-17 22:58:48 +00:00
Lluís Batlle i Rossell 4b27d28701 Porting changes from stdenv-updates into this branch.
This comes from:
svn diff  ^/nixpkgs/trunk/@18255 ^/nixpkgs/branches/stdenv-updates/ > diff
patch -p0 < diff
and then adding into svn all files new from the patch.

trunk@18255 comes from the last time I updated stdenv-updates from trunk.


svn path=/nixpkgs/stdenv-updates2/; revision=18272
2009-11-08 00:32:12 +00:00
Eelco Dolstra 94d7d1fdbb * Got rid of all --disable-static flags; they're redundant now.
* Also a bunch of style cleanups (tabs, with args, ...).

svn path=/nixpkgs/branches/stdenv-updates/; revision=15235
2009-04-21 23:18:09 +00:00
Eelco Dolstra edb9a250c9 * The shobj-darwin patch doesn't apply anymore, and it doesn't seem
necessary anymore either.

svn path=/nixpkgs/branches/stdenv-updates/; revision=14842
2009-04-02 15:36:09 +00:00
Ludovic Courtès 2d41dce5b6 GNU Readline 6.0.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14208
2009-02-23 18:10:41 +00:00
Yury G. Kudryashov 1cf8a9d0ed readline5: shared, using sha256
svn path=/nixpkgs/branches/stdenv-updates/; revision=10613
2008-02-10 17:42:02 +00:00
Yury G. Kudryashov a7703662a4 Merged with trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=10145
2008-01-15 00:55:21 +00:00
Eelco Dolstra 544cb9cb83 * Rewrite all URLs to GNU mirrors to mirror://gnu/.
svn path=/nixpkgs/trunk/; revision=9201
2007-08-27 13:42:00 +00:00
Eelco Dolstra a0159dee8e * Reverted r6713, r6711, r4623, r3660, r2237. There rewrote fetchurl
URLs to http://nix.cs.uu.nl/dist/tarballs.  With content-addressable
  mirror support (r9190, NIXPKGS-70) this is no longer necessary:
  fetchurl will try to download from that location automatically.  So
  we can keep the original URLs.

svn path=/nixpkgs/trunk/; revision=9192
2007-08-24 12:32:36 +00:00
Armijn Hemel 7e41b751cb new versions of various very important tools to keep the buildfarm busy.
svn path=/nixpkgs/trunk/; revision=7485
2006-12-25 23:28:35 +00:00
Eelco Dolstra 1442e8ec22 * Copy a bunch of files to nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=6711
2006-10-12 13:50:54 +00:00
Eelco Dolstra 4bfffeee52 * Propagate readline's dependency on ncurses.
svn path=/nixpkgs/trunk/; revision=6197
2006-08-21 10:35:01 +00:00
Eelco Dolstra ffb94e0690 * Latest versions.
svn path=/nixpkgs/trunk/; revision=5482
2006-06-21 15:54:46 +00:00
Eelco Dolstra 3389f4bc36 * Copy lots of files to nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=4623
2006-01-30 16:04:03 +00:00
Eelco Dolstra 82e678362f * "." -> "source".
svn path=/nixpkgs/trunk/; revision=4335
2005-12-05 14:11:09 +00:00
Eelco Dolstra 33ddaafc57 * Add readline 4 (in addition to readline 5).
svn path=/nixpkgs/trunk/; revision=3990
2005-10-02 14:54:58 +00:00
Eelco Dolstra 454707da23 * catamaran.labs.cs.uu.nl -> nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=3660
2005-08-22 08:39:27 +00:00
Eelco Dolstra e42507d182 * Move tarballs to catamaran so that we are no longer dependent on a
gazillion different servers.  Resurrected some 25 missing files.

svn path=/nixpkgs/trunk/; revision=2237
2005-02-15 14:44:19 +00:00
Rob Vermaas 6412b0c5f2 * added readline
svn path=/nixpkgs/trunk/; revision=1230
2004-08-05 13:49:26 +00:00