Commit graph

403 commits

Author SHA1 Message Date
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
Eelco Dolstra
09dc132e04 Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/development/libraries/poppler/default.nix
2014-10-16 15:16:50 +02:00
Longrin Wischnewski
6e7de2155b change md5sum to sha256sum for a few packages 2014-10-12 16:13:21 +02:00
Mateusz Kowalczyk
b0258a5d17 Merge pull request #4462 from VShell/discount
discount: new package
2014-10-12 12:37:50 +01:00
taku0
08cd49e4e0 peco: update to version 0.2.10
Closes #4489
2014-10-12 12:33:16 +01:00
Shell Turner
0b649538b2 discount: Added shell as maintainer 2014-10-12 12:09:07 +01:00
Shell Turner
e56a6c1bec discount: new package 2014-10-10 16:23:26 +01:00
Eelco Dolstra
811de3bfaa Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv
Conflicts:
	pkgs/tools/security/gnupg/default.nix
2014-10-09 10:57:57 +02:00
Aristid Breitkreuz
a8e104f3de xmlstarlet: update from 1.5.0 to 1.6.1 2014-10-08 20:23:26 +02:00
Francesco Lazzarino
672654f9e9 new: gist – cli for gist.github.com 2014-10-08 07:31:36 -05:00
Eelco Dolstra
a85dcf4a00 Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/development/libraries/libav/default.nix
	pkgs/shells/bash/bash-4.2-patches.nix
	pkgs/stdenv/generic/default.nix
2014-10-07 00:09:37 +02:00
Eelco Dolstra
a1d9c56389 gnugrep: Fix bootstrap-tools reference 2014-10-06 22:05:55 +02:00
Aristid Breitkreuz
60b174966c dos2unix: update from 6.0.6 to 7.0 2014-10-06 21:57:59 +02:00
Eelco Dolstra
ae863192e6 gnugrep: Update to 2.20 2014-10-06 20:44:26 +02:00
Pascal Wittmann
494a52306a dadadodo: adopt and cleanup expression 2014-10-06 11:36:58 +02:00
Eelco Dolstra
03397674c8 Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv 2014-10-03 16:14:36 +02:00
Eelco Dolstra
d9fbcd12ce Revert "Upgraded gawk to v4.1.1"
This reverts commit e48e994a12. "make
check" fails with "5 TESTS FAILED".
2014-10-03 16:12:09 +02:00
Eelco Dolstra
8c3ddec416 Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv 2014-10-03 15:49:20 +02:00
koral
e48e994a12 Upgraded gawk to v4.1.1 2014-10-02 23:09:42 +04:00
Eelco Dolstra
6843fc41c9 Fix evaluation 2014-09-30 00:51:00 +02:00
Eelco Dolstra
dad7623758 wdiff: Update to 1.2.2 2014-09-23 11:51:46 +02:00
Eelco Dolstra
cd71f7a2e6 Merge branch 'darwin-stdenv' of github.com:joelteon/nixpkgs into staging
Conflicts:
	pkgs/development/interpreters/ruby/ruby-19.nix
	pkgs/development/libraries/libc++/default.nix
	pkgs/development/libraries/libc++abi/default.nix
	pkgs/tools/text/sgml/opensp/default.nix
2014-09-23 11:27:53 +02:00