3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

430 commits

Author SHA1 Message Date
Vladimír Čunát 375bc8def7 Merge staging into closure-size 2015-05-05 11:49:03 +02:00
Thomas Tuegel 1fe28a1132 Merge remote-tracking branch 'upstream/master' into staging 2015-04-29 11:33:28 -05:00
Pascal Wittmann f99d5cf2fc Fixed some descriptions 2015-04-28 10:55:20 +02:00
Tobias Geerinckx-Rice 999241a907 Add aha 0.4.8: quick & dirty ANSI-to-HTML converter 2015-04-28 00:10:14 +02:00
Vladimír Čunát bf414c9d4f Merge 'staging' into closure-size
- there were many easy merge conflicts
- cc-wrapper needed nontrivial changes

Many other problems might've been created by interaction of the branches,
but stdenv and a few other packages build fine now.
2015-04-18 11:22:20 +02:00
Eric Seidel 6ec373d776 Merge branch master into staging 2015-04-06 18:58:08 -07:00
William A. Kennington III 05a9e34f8a dos2unix: 7.0 -> 7.2.1 2015-04-05 23:04:23 -07:00
William A. Kennington III 008e3893d8 gawk: 4.1.0 -> 4.1.1 2015-03-26 15:13:50 -07:00
William A. Kennington III 767c179a94 Merge branch 'master' into staging 2015-03-26 14:44:05 -07:00
William A. Kennington III ae336a419e patch: 2.7.3 -> 2.7.5 2015-03-26 00:24:17 -07:00
dabus f5200fd0aa Bump version of the_silver_searcher: 0.24.1 -> 0.29.1 2015-03-25 17:43:13 +01:00
Vladimír Čunát 263d5239d6 gnugrep: fix CVE-2015-1345 by upstream patch 2015-03-09 15:55:22 +01:00
Vladimír Čunát db847a3345 recode: fix build, needing texinfo now
Also make the build inputs native (no references are retained).
2015-03-09 15:55:22 +01:00
Vladimír Čunát 8743003935 grep: update
The 2.21 update fixes NixOS/nix#464.
2015-03-09 15:55:21 +01:00
Domen Kožar 17a44e5013 Merge pull request #6717 from sjagoe/package-python-grin
Add grin package
2015-03-08 21:58:23 +01:00
Simon Jagoe 456750c1ad Add sjagoe as maintainer of grin package 2015-03-08 20:46:23 +00:00
Simon Jagoe aca88a275e Specify platform compatibility for grin 2015-03-08 20:45:32 +00:00
Simon Jagoe f4965177b5 Move grin definition to tools/text and call it from all-packages.nix 2015-03-08 20:10:40 +00:00
lethalman 3f38be2f10 Merge pull request #6482 from auntieNeo/nkf-master
Packaged nkf (network kanji filter)
2015-02-26 09:44:53 +01:00
Jonathan Glines 3bfbed7535 Made suggested changes to nkf package 2015-02-21 14:35:01 -07:00
Jonathan Glines 30061d3971 Packaged nkf (network kanji filter) 2015-02-20 14:23:08 -07:00
tv 61f074028b qprint: add version 1.1 2015-02-18 18:22:44 +01:00
Shea Levy 2f061ff16b Merge remote-tracking branch 'origin/staging'
Darwin and haskell fixes.
2015-02-17 13:52:37 -05:00
Emery Hemingway 71ad263151 mawk: initial package at 1.3.4-20141206 2015-02-16 18:57:57 -05:00
Shea Levy 127efcd6f6 Merge branch 'kill-libiconv' of git://github.com/gridaphobe/nixpkgs into staging
Took "ours" for the conflict and changed libiconvOrEmpty to libiconv

Conflicts:
	pkgs/applications/audio/ncmpcpp/default.nix
2015-02-11 19:37:22 -05:00
Eric Seidel 472feaf53b dont need -liconv 2015-02-07 20:29:28 -08:00
Eric Seidel e08b9ab8d3 kill libiconvOr*
Conflicts:
	pkgs/applications/networking/mailreaders/sup/default.nix
	pkgs/development/compilers/ghc/7.8.3-binary.nix
	pkgs/development/interpreters/php/5.3.nix
	pkgs/development/interpreters/ruby/patches.nix
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/poppler/default.nix
	pkgs/top-level/all-packages.nix
2015-02-07 20:29:28 -08:00
Edward O'Callaghan 529e2b281a gnupatch: update from 2.7.1 to 2.7.3 (close #6048)
Potentially fixes CVE-2015-1196.

Signed-off-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
2015-02-07 06:48:21 +01:00
Ambroz Bizjak 6837efe3bb gawk: Fix cross compiling.
Note that this does not trigger rebuild for native builds.
2015-01-29 00:19:57 +01:00
Charles Strahan 1057f2e8ad gist: fix evaluation 2015-01-25 16:22:30 -05:00
Ludovic Courtès 41b53577a8 unmaintain a bunch of packages 2015-01-13 22:33:49 +01:00
John Wiegley 60d0005a0c opensp: display ftp_proxy and http_proxy during build 2015-01-03 07:53:09 -05:00
Bjørn Forsman 7f06428544 xidel: new package
Command line tool to download and extract data from html/xml page.

http://videlibri.sourceforge.net/xidel.html
2014-12-30 14:00:37 +01:00
Tobias Geerinckx-Rice c64257b8e5 Fix user-facing typos (mainly in descriptions) 2014-12-30 03:31:03 +01:00
Pascal Wittmann 7862ef25a9 groff: update from 1.22.2 to 1.22.3 an adopt it 2014-11-19 08:47:41 +01:00
Robert Helgesson c6d4881a42 Add package 'xml2'. 2014-11-18 22:01:53 +01:00
Pascal Wittmann de8df3ce47 rxp: update from 1.2.3 to 1.5.0 2014-11-14 19:20:16 +01:00
Eelco Dolstra f33fa1b66b Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/development/libraries/boost/generic.nix
2014-11-11 23:48:08 +01:00
Pascal Wittmann 8df0e0b151 Fixed many descriptions 2014-11-11 14:36:34 +01:00
Luca Bruno 83221f3886 Merge branch 'master' into staging
Makes the build more useful:
- Disabled hybrid iso, makes installer tests pass again
- Imagemagick fixes to the "Illegal instruction" thing
2014-11-08 15:56:40 +01:00
Eike Kettner e96df6c6f9 html2text: new package
Closes #4864
2014-11-07 23:19:49 +00:00
Eelco Dolstra 0518ccf5af Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/stdenv/generic/default.nix
2014-11-06 10:16:39 +01:00
Mateusz Kowalczyk 007f80c1d0 Turn more licenses into lib.licenses style
Should eval cleanly, as far as -A tarball tells me.

Relevant: issue #2999, issue #739
2014-11-06 00:48:16 +00:00
Vladimír Čunát 52404a868d Merge recent master into staging
Nixpkgs Hydra: ?compare=1157272

TODO: port e22889064f

Conflicts:
	nixos/tests/gnome3_10.nix (auto-solved)
	pkgs/applications/video/aegisub/default.nix
	pkgs/development/libraries/boost/1.55.nix
2014-11-05 15:00:44 +01:00
Eelco Dolstra 7495c61d49 Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging
Conflicts:
	pkgs/applications/editors/vim/macvim.nix
2014-11-04 14:30:43 +01:00
William A. Kennington III a9c472d16e boost: Fix incompatible applications 2014-11-02 17:22:28 -08:00
William A. Kennington III aa3e800be7 boost: Remove boost.lib 2014-11-02 17:22:27 -08:00
Peter Simons b11060d8db Merge remote-tracking branch 'origin/master' into staging. 2014-10-31 11:14:24 +01:00
Domen Kožar 419f15b060 Remove http_proxy/ftp_proxy overrides used in setup hooks.
Partially reverts eaa4db148d. Used
together with nix-shell it results into unresolvable domains. For
example: `nix-shell -p libxml2` spawns a shell with non-working DNS.

chroot should remove such unpurities.
2014-10-28 23:20:59 +01:00
Alastair Pharo 47dc7990ec enca: update from 1.15 to 1.16 2014-10-27 07:28:23 +02:00