ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-15 13:37:21 +03:00
Code Issues Projects Releases Wiki Activity
105,716 Commits 96 Branches 102 Tags 4.5 GiB
228f33b21d
Commit Graph

732 Commits

Author SHA1 Message Date
Robin Gloster
bc21db3692 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-19 21:16:14 +00:00
Frederik Rietdijk
4d06bf70f4 buildPythonApplication: use new function for Python applications 2016-02-19 13:16:41 +01:00
Nikolay Amiantov
199aeab96e yaml-merge: init at 2016-02-16 2016-02-17 17:05:59 +03:00
Vladimír Čunát
d039c87984 Merge branch 'master' into closure-size 2016-02-14 08:33:51 +01:00
Robin Gloster
9375cd8e4d untex: turn off format hardening 2016-02-12 15:14:12 +00:00
Eelco Dolstra
e2eca0c24c Fix misspelled meta.maintainers attributes 2016-02-10 23:27:34 +00:00
Eelco Dolstra
aea262f654 Fix misspelled meta.maintainers attributes 2016-02-10 14:59:50 +01:00
Robin Gloster
a626fc9813 a2ps: turn off format hardening 2016-02-09 02:14:32 +00:00
Robin Gloster
79219c1981 patchutils: turn off format hardening 2016-02-07 15:07:42 +00:00
Vladimír Čunát
ae74c356d9 Merge recent 'staging' into closure-size 
Let's get rid of those merge conflicts.
 2016-02-03 16:57:19 +01:00
Badi' Abdul-Wahid
1cf106dd06 popfile: init at 1.1.3 
Popfile by default assumes that it is run directly from the install
directory, in which it has full write access. This assumption is invalid
on Nix, and so Popfile is pachted to accomodate this:

- define `POPFILE_ROOT` in wrapper

  Default POPFile configuration assumes it is running in the
  installation directory. This patch wraps `popfile.pl` so that
  `POPFILE_ROOT` points to the installation directory

- define and create if missing `POPFILE_USER` in wrapper

  POPFile stores stores state in the `POPFILE_USER` directory, which by
  default is the installation directory. This change sets `POPFILE_USER`
  to `$HOME/.popfile` by default, creating it with 0700 mode if
  necessary.
 2016-02-01 19:59:03 -05:00
Tobias Geerinckx-Rice
9fb8020e4e Add version attribute where maintainers |= nckx 
This will probably be mandatory soon, and is a step in the right
direction. Removes the deprecated meta.version, and move some meta
sections to the end of the file where I should have put them in
the first place.
 2016-01-25 17:35:21 +01:00
Vladimír Čunát
716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
Robin Gloster
53b389327e refactor to use autoreconfHook where possible 
Close #12446.
 2016-01-18 10:45:31 +01:00
Vladimír Čunát
620c147cce Merge branch 'master' into staging 2016-01-18 09:48:49 +01:00
Lluís Batlle i Rossell
4eb1e346c6 Improving the patch for mairix for mbox>2GB. 
https://github.com/rc0/mairix/pull/19
 2016-01-15 16:00:46 +01:00
Vladimír Čunát
2d0893088f Merge branch 'master' into staging 2016-01-15 13:43:57 +01:00
Lluís Batlle i Rossell
6401bb1795 mairix: add fix (patch) for big files. 2016-01-14 17:38:57 +01:00
Eelco Dolstra
3fdf018f77 gnugrep: Disable tests 
The test long-pattern-perf is timing sensitive, so it can fail
randomly based on load.

http://hydra.nixos.org/build/30265484
 2016-01-12 12:06:41 +01:00
Arseniy Seroka
e126769a68 Merge pull request #12267 from zimbatm/dos2unix-7.3.2 
dos2unix: 7.3 -> 7.3.2
 2016-01-09 23:52:39 +03:00
Yann Hodique
38c7c7b09e silver-searcher: 0.30.0 -> 0.31.0 2016-01-09 11:22:56 -08:00
zimbatm
b898959fc7 dos2unix: 7.3 -> 7.3.2 2016-01-09 16:46:03 +00:00
Vladimír Čunát
b1acaffe67 Merge branch 'master' into staging 2016-01-05 10:28:58 +01:00
Tobias Geerinckx-Rice
8924e770ca a2ps: fix evaluation 2016-01-01 22:03:21 +01:00
Benno Fünfstück
aaeba728b3 a2ps: new package 2016-01-01 19:11:58 +01:00
janus
a472d836f6 FreeBSD: apr-util, cyrus-sasl, berkeley db, glib, gnutls, kerberos, libelf-freebsd, openldap, serf, guile, tet, shishi, gawk, gnugrep 2016-01-01 17:01:13 +00:00
Vladimír Čunát
f9f6f41bff Merge branch 'master' into closure-size 
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
 2015-12-31 09:53:02 +01:00
Robert Helgesson
d66a1a46e6 colordiff: add archive URL 
When a new version of colordiff is released the old tarball is moved to
the archive directory. This breaks builds until the derivation is
updated to the new version. This commit lets fetchurl know about the
archive URL.
 2015-12-16 00:49:43 +01:00
Luca Bruno
5b0352a6a4 Merge branch 'master' into closure-size 2015-12-11 18:31:00 +01:00
Niclas Thall
eae3d7467b colordiff: 1.0.15 -> 1.0.16 2015-12-09 22:18:37 +01:00
Emery Hemingway
2b6dcdfcd0 Rename 'emery' maintainer handle to 'ehmry', fixes #11493 
Communication happens on Github so names should be consistent.
 2015-12-05 23:06:20 +01:00
Vladimír Čunát
263fd55d4b Merge recent staging built on Hydra 
http://hydra.nixos.org/eval/1231884
Only Darwin jobs seem to be queued now,
but we can't afford to wait for that single build slave.
 2015-12-05 11:11:51 +01:00
Luca Bruno
920b1d3591 Merge branch 'master' into closure-size 2015-11-29 16:50:26 +01:00
Vladimír Čunát
81b9cc6f54 html-tidy: unify with its drop-in replacement tidy-html5 
- the original project has been unmaintained for years
- some dependants needed to be patched due to renamed headers
  https://github.com/htacg/tidy-html5/issues/326#issuecomment-160329114
- separate tidy-html5 package was removed, as since the 5.0.0 version
  it's meant as a successor to both, and library name got back
  from libtidy5.so to libtidy.so
  https://github.com/htacg/tidy-html5/issues/326#issuecomment-160314666

/cc committers to tidy-html5: @edwjto and @zimbatm.
 2015-11-29 10:32:02 +01:00
Matthijs Steen
8cd52ce5f7 basex: 7.8.2 -> 8.3.1 2015-11-27 21:56:31 +01:00
Tobias Geerinckx-Rice
2798b02ad0 Convert some *Flags from strings to lists 2015-11-26 23:45:31 +01:00
Luca Bruno
a412927924 Merge remote-tracking branch 'origin/master' into closure-size 2015-11-25 21:37:30 +01:00
Vladimír Čunát
13eca6f79a Merge #11067: SmartOS updates 
I amended some commits slightly.
 2015-11-23 14:45:44 +01:00
Vladimír Čunát
333d69a5f0 Merge staging into closure-size 
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
 2015-11-20 14:32:58 +01:00
Marcus Crestani
64ef239c02 html2text: Enable on OS X. 2015-11-19 08:47:46 +01:00
Pascal Wittmann
7fd2796e99 Replace 'with plaforms; platform' with 'platforms.platform' 2015-11-17 21:30:43 +01:00
Danny Wilson
11be480df4 Skip failing tests on SmartOS 2015-11-16 17:20:16 +01:00
William A. Kennington III
9579c9ec7f Merge commit 'cb21b77' into master.upstream 
This is a partial merge of staging for builds which are working
 2015-11-13 15:53:10 -08:00
Domen Kožar
505117f3fb Merge branch 'master' into staging 2015-11-11 12:53:36 +01:00
Domen Kožar
7f25bc8d0a Merge pull request #10871 from zimbatm/gist-4.4.2 
gist: 4.3.0 -> 4.4.2
 2015-11-11 12:18:23 +01:00
William A. Kennington III
a26c8e9b83 Merge branch 'master.upstream' into staging.upstream 2015-11-07 15:51:51 -08:00
zimbatm
c0278ded1c gist: 4.3.0 -> 4.4.2 2015-11-07 19:36:31 +00:00
zimbatm
efdcc6c16b tidy-html5: fix missing dependency 
xsltproc is used during the build
 2015-11-07 19:35:33 +00:00
William A. Kennington III
4251612faa Merge branch 'master.upstream' into staging.upstream 2015-11-04 01:00:48 -08:00
William A. Kennington III
b983c6b9b5 grep: 2.21 -> 2.22 2015-11-03 20:54:22 -08:00
Stéphane Jourdois
42dfe8f4e1 ascii: allow build on darwin 2015-10-31 16:08:03 +01:00
Vladimír Čunát
8adabe6679 gawk: split $doc into $man and $info 
Info files are rather large and not much used anymore, AFAIK.
(We include $man or $doc in the system closure by default.)
 2015-10-28 10:16:55 +01:00
Vladimír Čunát
ad02a45af0 gnugrep: re-split the documentation stuff 2015-10-28 10:09:33 +01:00
Tuomas Tynkkynen
a39f5839ea groff: Fix multiple-output build 2015-10-03 14:08:50 +02:00
Vladimír Čunát
5227fb1dd5 Merge commit staging+systemd into closure-size 
Many non-conflict problems weren't (fully) resolved in this commit yet.
 2015-10-03 13:33:37 +02:00
Arseniy Seroka
8eecf2d98a Merge pull request #10119 from k0ral/xurls 
xurls: 0.7.0 -> 0.8.0
 2015-09-28 23:04:14 +03:00
koral
02da999dc3 xurls: 0.7.0 -> 0.8.0 2015-09-28 17:56:15 +00:00
Thomas Tuegel
2e0589b4ca kde414: build with kdelibs-4.14.12 
Upstream changes to the build system required adjusting many packages'
dependencies. On the Nixpkgs side, we no longer propagate the dependency
on cmake (to reduce closure size), so downstream dependencies had to be
adjusted for most packages that depend on kdelibs.
 2015-09-27 15:08:12 -05:00
Robbin C
3a8756913c zimreader: init at 20150710. 
This adds zimreader, a tool to serve ZIM files using HTTP.

Its dependencies, cxxtools and tntnet are included in this derivation
because zimreader needs specific (not latest) versions of them
to compile.
 2015-09-20 12:57:50 +08:00
Robbin C
d75152c028 zimwriterfs: init at 20150710. 
This adds zimwriterfs, a console tool to create ZIM (http://www.openzim.org)
files from a locally stored directory containing 'self-sufficient'
HTML content (with pictures, javascript, stylesheets).
 2015-09-19 19:44:20 +08:00
Bjørn Forsman
b8e776bbe4 diffstat: 1.59 -> 1.60 
2015/07/07 (diffstat 1.60)
	+ add configure option --with-man2html

	+ update configure macros

	+ update config.guess, config.sub
 2015-09-16 07:55:13 +02:00
Bjørn Forsman
a8b75d8777 ascii: 3.14 -> 3.15 2015-09-16 07:51:05 +02:00
Kovacsics Robert (NixOS-SSD2)
7234e89913 txt2tags: init at 2.6 
txt2tags is a KISS markup language
 2015-09-01 14:12:26 +01:00
William A. Kennington III
d96b30f5b0 dos2unix: 7.2.2 -> 7.3 2015-08-30 10:57:16 -07:00
koral
da6b369029 xurls: 0.6.0 -> 0.7.0 2015-08-29 23:46:18 +02:00
Philip Potter
44048385bd html-xml-utils: fix and bump to 6.9 
6.4 had a compile error:

```
scan.l:136:7: error: expected identifier or ‘(’ before ‘__extension__’
char *strndup(const char *s, size_t n);
^
```

This is caused by the standard library strndup() now living in string.h
and conflicting with another strndup() declared in scan.l.  Version 6.9
fixes this.

This also removes the need for the boolean patch that we previously had.
 2015-08-24 22:38:01 +01:00
Badi' Abdul-Wahid
978d4be3ab colordiff: support Darwin as a platform 
This change just adds darwin to the supported platforms attribute of
the package.
 2015-08-13 10:11:36 -04:00
Tobias Geerinckx-Rice
6c6201a99b Remove unnecessary rec{s from "my" packages 2015-07-31 02:02:07 +02:00
Tobias Geerinckx-Rice
e8596c189f colordiff: 1.0.13 -> 1.0.15 
Changes:
- Big improvements to side-by-side diff detection
- Additional colordiffrc example colour scheme file to match 'git diff'
- Misc fixes
 2015-07-27 01:54:08 +02:00
Eelco Dolstra
6a91bf20c8 groff: Move docs to separate output 
This cuts the size of the package by ~10 MB.
 2015-07-26 22:46:44 +02:00
Vladimír Čunát
52b3546e4a merge #8617: recoll: filters for LaTeX, RTF, and WP 2015-07-20 11:00:04 +02:00
Joachim Fasting
4bd52ddb88 untex: init at 1.2 2015-07-15 17:03:18 +02:00
Joachim Fasting
bcb314853a unrtf: init at 0.21.9 2015-07-15 17:03:17 +02:00
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
Vladimír Čunát
cefdc20c00 gawk: disable doCheck again, add meta.platforms 
It didn't work when chrooted.
 2015-05-05 11:56:30 +02:00
Vladimír Čunát
3b9ef2c71b fix "libc}/lib" and similar references 
Done mostly without any verification.
I didn't bother with libc}/include, as the path is still correct.
 2015-05-05 11:52:08 +02:00
Vladimír Čunát
375bc8def7 Merge staging into closure-size 2015-05-05 11:49:03 +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
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
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
Michael Raskin
d22a3b8d0e Fix /bin/mv reference in replace-literal 2014-09-20 11:53:21 +04:00
Eelco Dolstra
91ec6e0d90 Merge remote-tracking branch 'origin/master' into staging 2014-09-18 22:28:35 +02:00
Alexander Kjeldaas
7141303c99 groff, opensp: make deterministic 2014-09-13 15:06:59 +02:00
Pascal Wittmann
8d67b9a240 transformed meta.maintainers of some packages into lists 2014-09-13 13:52:02 +02:00
Joel Taylor
7da056233f wip libc++ 2014-09-09 13:54:25 -07:00
Vladimír Čunát
82797f98f2 Merge branch 'staging' into modular-stdenv 
Conflicts:
	pkgs/development/interpreters/perl/5.10/setup-hook.sh
	pkgs/development/interpreters/perl/5.8/setup-hook.sh
	pkgs/stdenv/linux/default.nix
 2014-09-08 18:24:58 +02:00
Vladimír Čunát
1e389c976c merge 'staging' into modular-stdenv 
In 2c62a36b77 the messages in pkgs/stdenv/generic/default.nix
were not merged correctly.

Conflicts:
	pkgs/stdenv/generic/default.nix
 2014-09-08 18:16:54 +02:00
Peter Simons
ff85b53c5f highlight: update to version 3.18 to fix build errors with Lua 5.2 2014-09-08 10:22:50 +02:00
Moritz Ulrich
2bfd7ae15c dos2unix: update from 6.0.5 to 6.0.6 2014-09-04 19:31:33 +02:00
Moritz Ulrich
14fd86307f diffstat: update from 1.58 to 1.59 2014-09-04 19:31:32 +02:00
Vladimír Čunát
8da52a642a Merge branch 'staging' into v/modular 
Conflicts (easy):
	pkgs/development/interpreters/perl/5.10/setup-hook.sh
	pkgs/development/interpreters/perl/5.8/setup-hook.sh
	pkgs/development/libraries/gtk+/2.x.nix
 2014-08-31 12:23:18 +02:00
Vladimír Čunát
030af0a803 fix .xz in stdenv bootstrap 
Presumably needed due to the last staging merge.
There was some stdenv stage refactoring within, IIRC.
 2014-08-30 15:48:17 +02:00
Vladimír Čunát
a70180ba73 mutiout: make it builtin 2014-08-30 08:27:43 +02:00
Vladimír Čunát
fb59f27a43 WIP: getting good 2014-08-27 01:14:09 +02:00
Domen Kožar
fbecc676e5 wgetpaste: 2.23 -> 2.25 2014-08-25 13:03:30 +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
694fa543af Merge 'staging' 
Conflicts:
	pkgs/servers/x11/xorg/default.nix
 2014-08-24 10:50:22 +02:00
Eelco Dolstra
2c62a36b77 Merge remote-tracking branch 'origin/staging' into modular-stdenv 
Conflicts:
	pkgs/stdenv/generic/default.nix
 2014-08-22 00:07:05 +02:00
Eelco Dolstra
a9baea48df openjade: Use default perl 2014-08-21 16:54:28 +02:00
Pascal Wittmann
464ec2a8e5 silver-searcher: update from 0.21.0 to 0.24.1 2014-08-19 19:27:16 +02:00
Vladimír Čunát
8a4827a881 kdiff3: minor update 2014-08-14 19:43:27 +02:00
Eelco Dolstra
e3f7dbbac8 Cleanup: Use += to append to envHooks 2014-08-09 12:47:05 +02:00
Peter Simons
9226fbf56a Merge remote-tracking branch 'origin/master' into staging. 2014-08-08 09:51:01 +02:00
taku0
74ce1a016f add peco: Simplistic interactive filtering tool 2014-08-07 01:34:28 +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
4c2c0499f3 enscript: Build with the default GCC 2014-07-23 11:25:38 +02:00
Eelco Dolstra
8aacdfee7c gawk: Remove unnecessary ‘gawk-<version>’ copy 
This saves > 600 KiB.
 2014-07-08 15:43:05 +02:00
John Wiegley
f4b3bc0334 diffstat: weaken platform requirement 
This fixes a change made in 3ae765278f.
 2014-06-24 14:45:33 -07:00
Bjørn Forsman
5d97335b6d colordiff: update 1.0.9 -> 1.0.13 2014-06-22 23:00:14 +02:00
Bjørn Forsman
7061116faa colordiff: add meta attributes 2014-06-22 22:57:08 +02:00
Bjørn Forsman
4d120e29c5 catdoc: add meta.description 2014-06-22 22:48:09 +02:00
Bjørn Forsman
3ae765278f diffstat: clean up expression 
Most importantly, add meta.description and meta.platforms.
 2014-06-22 13:39:28 +02:00
Rob Vermaas
6bfb25b9e8 dos2unix: update from 6.0.4 to 6.0.5 2014-05-27 21:33:07 +02:00
Bjørn Forsman
1d79330e1d basex: update 7.7.2 -> 7.8.2 2014-05-25 13:00:37 +02:00
Austin Seipp
c0db39e294 Merge pull request #2671 from wmertens/recode-osx 
Recode: Build on OS X
 2014-05-18 14:07:35 -05:00
Vladimír Čunát
137eae0b55 Merge #2630: add and use fetchpatch 
fetchpatch is fetchurl that determinizes the patch.
Some parts of generated patches change from time to time, e.g. see #1983 and
http://comments.gmane.org/gmane.linux.distributions.nixos/12815
Using fetchpatch should prevent the hash from changing.

Conflicts (auto-solved):
	pkgs/development/libraries/haskell/gitit/default.nix
 2014-05-17 07:31:03 +02:00
Wout Mertens
d04c84d0ac Recode: Build on OS X 2014-05-16 23:28:19 +02:00
Eelco Dolstra
6aeb59bbe0 Rename fetchGitHub -> fetchFromGitHub 
We're not fetching all of GitHub, after all.
 2014-05-08 15:49:39 +02:00
Eelco Dolstra
ebd8573046 Add a utility function "fetchGitHub" 
This is a small wrapper around fetchzip. It allows you to say:

  src = fetchGitHub {
    owner = "NixOS";
    repo = "nix";
    rev = "924e19341a5ee488634bc9ce1ea9758ac496afc3"; # or a tag
    sha256 = "1ld1jc26wy0smkg63chvdzsppfw6zy1ykf3mmc50hkx397wcbl09";
  };
 2014-05-08 15:30:18 +02:00
aszlig
709ccd520b
patchutils: Update to new upstream version 0.3.3. 
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-05-08 15:01:55 +02:00
Eelco Dolstra
dbd332d147 Fix meta.maintainer -> meta.maintainers 2014-04-23 14:26:32 +02:00
宋文武
c796adfd65 add kakasi, a Kanji to Hiragana, Katakana or Romaji converter 2014-04-18 22:07:17 +08:00
Georges Dubus
b13a33550a silver-searcher: update to 0.21.0 2014-03-27 17:57:02 +01:00
Shea Levy
d574c34e0a Merge branch 'master' of git://github.com/madjar/nixpkgs 
silver-searcher: avoid -lgcc_s on darwin
 2014-03-19 18:18:08 -04:00
Cillian de Róiste
b57ee8c331 nixpkgs-lint: add the platforms meta attr for most of my packages 2014-03-16 12:08:26 +01:00
Georges Dubus
b805528552 silver-searcher: avoid -lgcc_s on darwin 2014-03-12 17:48:32 +01:00
Karn Kallio
0774192dd3 xmlstarlet: advance version to 1.5.0 2014-02-11 23:17:39 +01:00
Georges Dubus
8677b19c9d silver-searcher: updated to 0.19.2 
Also fixed the "libgcc_s.so.1 must be installed for pthread_cancel to
work" problem.
 2014-02-03 18:21:43 +01:00
Georges Dubus
a737352862 silver-searcher: updated to 0.19.1 2014-02-01 21:56:28 +01:00
Eelco Dolstra
150ec8f79e wdiff: Update to 1.2.1 2014-01-27 17:58:26 +01:00
Kevin Quick
8f0511b0a0 gawk: add gawkInteractive with readline support 
stdenv (on linux) depends on gawk, readline and similar are useless for non-interactive usage.
Close #1596. Original patch was almost completely rewritten by vcunat.

On darwin we always specify whether to use readline, so it isn't always picked as reported.
 2014-01-26 10:53:22 +01:00
Shea Levy
ca116f76f9 Unmaintain a bunch of packages 
Trying to take maintainership more seriously...

Signed-off-by: Shea Levy <shea@shealevy.com>
 2014-01-21 22:34:41 -05:00
Vladimír Čunát
ac6761c908 Merge master into stdenv-updates 
Conflicts:
	pkgs/applications/version-management/gource/default.nix
	pkgs/top-level/all-packages.nix
 2014-01-20 19:39:28 +01:00
Georges Dubus
9f9244f061 silver-search: Add 2014-01-19 17:42:43 +01:00
Vladimír Čunát
0a58b512cb Merge master into stdenv-updates 
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
 2014-01-18 14:46:20 +01:00
Eelco Dolstra
86afcccecb sp-compat: Fix build 
You can't run fixupPhase before installPhase.

http://hydra.nixos.org/build/8149119
 2014-01-17 12:13:20 +01:00
Nixpkgs Monitor
bfb16b5296 dos2unix: update from 6.0.3 to 6.0.4 2014-01-13 17:28:42 +01:00
Vladimír Čunát
e740b565cf Merge master into stdenv-updates 
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
 2013-12-29 10:01:22 +01:00
Vladimír Čunát
cb639302df Merge glibc-2.18 branch into stdenv-updates 
It's to separate from other changes coming from master.

Conflicts:
	pkgs/development/libraries/glibc/2.18/common.nix (taking both changes)
	pkgs/development/libraries/ncurses/5_4.nix (deleted)
 2013-12-28 18:51:23 +01:00
Eelco Dolstra
9f75797d0b Merge remote-tracking branch 'origin/glibc-2.18' 2013-12-26 14:49:19 +01:00
Nixpkgs Monitor
69e6bd8707 mairix: update from 0.22 to 0.23 2013-12-21 04:07:50 +02:00
Nixpkgs Monitor
32a2e5dad3 numdiff: update from 5.6.1 to 5.8.1 2013-12-21 04:00:19 +02:00
Nixpkgs Monitor
d9952c5b40 namazu: update from 2.0.20 to 2.0.21 2013-12-21 02:28:24 +02:00
Nixpkgs Monitor
1ef60acae5 highlight: update from 3.5 to 3.9 2013-12-18 18:18:31 +02:00
Evgeny Egorochkin
74ced3209e enca: update dependencies 2013-12-18 18:18:25 +02:00
Nixpkgs Monitor
74c3965b92 enca: update from 1.13 to 1.15 2013-12-18 18:18:25 +02:00
Nixpkgs Monitor
b89bcaef22 dos2unix: update from 5.3.1 to 6.0.3 2013-12-18 18:18:25 +02:00
Eelco Dolstra
134ba27ea2 Merge remote-tracking branch 'origin/master' into glibc-2.18 2013-12-18 15:42:54 +01:00
Peter Simons
45e8de9a7d Merge branch 'origin/master' into stdenv-updates. 
Conflicts:
	pkgs/tools/misc/less/default.nix
 2013-12-16 21:13:24 +01:00
Eelco Dolstra
eea9e405c8 source-highlight: Don't do a parallel build 
The "make check" appears to have a race condition.

http://hydra.nixos.org/build/7116409
 2013-12-16 17:03:19 +01:00
Nixpkgs Monitor
e4df13e956 enscript: update from 1.6.5.2 to 1.6.6 2013-12-15 12:35:47 +02:00
Nixpkgs Monitor
d706aab747 diffstat: update from 1.45 to 1.58 2013-12-11 09:47:45 +02:00
Eelco Dolstra
ed463a7671 boost: Remove 1.53 and 1.54 
These don't build against Glibc 2.18, but they're not used anyway
(except by source-highlight, which builds fine against 1.49).
 2013-12-10 12:02:53 +01:00
Peter Simons
486e7736df Merge remote-tracking branch 'origin/master' into stdenv-updates. 
Conflicts:
	pkgs/tools/networking/p2p/amule/default.nix
 2013-12-10 00:25:54 +01:00
Nixpkgs Monitor
d643418edd wgetpaste: update from 2.20 to 2.23 2013-12-06 17:13:23 +02:00
Peter Simons
c32bf83301 Merge remote-tracking branch 'origin/master' into stdenv-updates. 
Conflicts:
	pkgs/development/interpreters/perl/5.16/default.nix
	pkgs/tools/networking/curl/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/release-python.nix
	pkgs/top-level/release-small.nix
	pkgs/top-level/release.nix
 2013-12-04 18:33:52 +01:00