Commit Graph

449 Commits

Author SHA1 Message Date
William A. Kennington III
25e60feb72 Merge branch 'master.upstream' into staging.upstream 2015-07-15 02:02:46 -07:00
Arseniy Seroka
2fa88f65ea Merge pull request #8812 from k0ral/xurls
xurls: init at 0.6.0
2015-07-14 14:13:08 +03:00
koral
562f760f20 xurls: init at 0.6.0 2015-07-14 08:27:29 +00:00
Jude Taylor
d0951cb68d darwin purity: recode 2015-06-25 16:36:05 -07:00
Thomas Tuegel
a8c52d0958 Merge branch 'master' into staging 2015-06-25 09:15:05 -05:00
tv@shackspace.de
e14c8fd368 highlight: fixes an issue locating the default conf_dir, closes #8385 2015-06-24 17:19:56 +02:00
William A. Kennington III
282d03befa Merge branch 'master.upstream' into staging.upstream 2015-06-22 10:57:36 -07:00
Jascha Geerds
a612e397d8 silver-searcher: Replace fetchurl with fetchFromGitHub 2015-06-22 16:19:23 +02:00
Jascha Geerds
b9cebbe9b1 silver-searcher: 0.29.1 -> 0.30.0 2015-06-22 12:10:03 +02:00
Jascha Geerds
3f66bb7ff2 Add myself as maintainer 2015-06-22 08:26:09 +02:00
Vladimír Čunát
61596bf405 Merge #8363: pure-darwin stdenv 2015-06-18 22:38:08 +02:00
Jude Taylor
fa9c81f694 pure darwin stdenv 2015-06-18 12:37:41 -07:00
lethalman
0243472c05 Merge pull request #8344 from joachifm/redundant-cheetah
Delete redundant expression cheetahTemplate
2015-06-18 14:51:17 +02:00
Joachim Fasting
ed554d5ae2 Delete redundant expression cheetahTemplate
Use the one provided by python-packages instead; retain the
top-level cheetahTemplate name as an alias.
2015-06-15 23:31:37 +02:00
William A. Kennington III
954801a9a8 Merge branch 'master.upstream' into staging.upstream 2015-06-12 13:47:46 -07:00
Tobias Geerinckx-Rice
776608a332 aha: remove default GitHub downloadPage 2015-06-12 02:27:53 +02:00
Eelco Dolstra
553abf71ba Merge remote-tracking branch 'origin/staging' into gcc-4.9
Conflicts:
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/libraries/wayland/default.nix
	pkgs/development/tools/build-managers/cmake/default.nix
	pkgs/top-level/all-packages.nix
2015-06-01 20:08:43 +02:00
Florian Friesdorf
2876b726bd cygwin: currently no libsigsegv for x86_64-cygwin 2015-05-28 10:53:36 +02:00
Marko Durkovic
af5484a630 cygwin: opensp 2015-05-28 10:53:36 +02:00
Florian Friesdorf
15952587a0 cygwin gnugrep: disable check due to multibyte-white-space 2015-05-28 10:53:36 +02:00
William A. Kennington III
1b82194892 dos2unix: 7.2.1 -> 7.2.2 2015-05-26 01:36:35 -07:00
Edward Tjörnhammar
161fdec0f5 tidy-html5: added package, also provides libtidy5 2015-05-25 15:05:05 +02:00
William A. Kennington III
cdd93463c0 gawk: 4.1.2 -> 4.1.3 2015-05-24 00:19:35 -07:00
Eelco Dolstra
0cc883f2ee groff: Mark as unsafe for parallel building 2015-05-13 18:17:25 +02:00
William A. Kennington III
08ffb05c7e gawk: 4.1.1 -> 4.1.2 2015-05-04 23:22:57 -07:00
William A. Kennington III
00df204c82 Merge remote-tracking branch 'upstream/master' into staging 2015-05-01 15:57:09 -07:00
Joachim Fasting
bf7ad2d84f meta.description fixups
Mostly scripted substitutions with a couple of subjective enhancements.
2015-04-30 18:17:42 +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
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