3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

754 commits

Author SHA1 Message Date
Frederik Rietdijk c520e79842 Merge remote-tracking branch 'upstream/master' into HEAD 2017-05-03 09:59:49 +02:00
Aneesh Agrawal ded7953478 treewide: meta.platform -> meta.platforms 2017-05-02 19:32:02 -04:00
Michael Raskin 7527355840 Merge pull request #25218 from expipiplus1/cross-llvm
Fix cross compilation of LLVM-3.9
2017-05-02 22:24:41 +02:00
Matthew Bauer 1234825656 xsv: fix "has invalid meta attribute"
Without this there's an eval error, when running nix-env -f '<nixpkgs>'
--query --available --json.

  derivation ‘xsv-0.11.0’ has invalid meta attribute ‘override’
  derivation ‘xsv-0.11.0’ has invalid meta attribute ‘overrideDerivation’

[Bjørn: extend commit message.]
2017-05-02 21:04:34 +02:00
Matthew Bauer aac48708c1 jing-trang: supports all unix
This is needed to build the manual on macOS.
2017-05-02 20:52:19 +02:00
Michael Raskin a5f436814a Merge pull request #21017 from AndersonTorres/rst2html5
rst2html5: init at 1.9.3
2017-05-01 23:58:28 +02:00
AndersonTorres 4a87eae13c rst2html5: put its expression in a separate file
As recommended by @7c6f434c and @FRidh, rst2html5 now resides
in its proper file.
2017-05-01 18:12:36 -03:00
Yann Hodique 5c9986e406 the_platinum_searcher: 2.1.3 -> 2.1.5 2017-04-30 12:51:58 -07:00
Michael Raskin ba974d4b74 Merge pull request #24214 from NickHu/proselint
proselint: disable tests and put in correct scope
2017-04-25 23:18:34 +02:00
Joe Hermaszewski 3eee6ea7c1 groff: use buildPackages to fix cross compile 2017-04-25 19:59:35 +00:00
Domen Kožar 9f11d17ed2
add papertrail at 0.10.1
Thank you @grahamc <3
2017-04-24 17:05:03 +02:00
Daiderd Jordan 80828429d7 Merge pull request #25066 from matthewbauer/less-darwin-eval-errors
Add Darwin as platform to various "broken" packages that actually build
2017-04-24 08:14:21 +02:00
Matthew Bauer d3084b2798
sourceHighlight: supports darwin 2017-04-23 18:08:35 -05:00
Vladimír Čunát 5a3e454db3
Revert "kdiff3: fixup patch hash after #25059"
This reverts commit b72d4e13c7.
The problem was fixed by the parent commit.
2017-04-23 20:53:34 +02:00
Tuomas Tynkkynen 814772e93e Revert "patchutils: 0.3.3 -> 0.3.4"
This reverts commit d550c90712.

This changes the output of filterpatch thus affects hashes of any
fetchpatch calls in nixpkgs:

https://github.com/NixOS/nixpkgs/issues/25154
2017-04-23 21:46:35 +03:00
Tuomas Tynkkynen f3b1d6925e Revert "patchutils: Drop patch applied upstream"
This reverts commit 1e1b68b4a0.
2017-04-23 21:46:29 +03:00
Cray Elliott df86c9731b ripgrep: 0.5.0 -> 0.5.1 2017-04-22 19:03:09 -07:00
Vladimír Čunát b72d4e13c7
kdiff3: fixup patch hash after #25059
I'm sorry; not sure why the hash didn't match;
I probably kept the hash of an older version by mistake.
2017-04-22 16:37:48 +02:00
Benno Fünfstück cfcceaee27 Merge pull request #24473 from jgertm/tj/xsv
xsv: init at 0.11.0
2017-04-22 00:26:10 +02:00
Vladimír Čunát be7ce1b0e9
kdiff3: fix with git mergetool
The quick patch has been submitted upstream.
2017-04-20 14:48:40 +02:00
Benjamin Staffin 8d07a8b381 Merge pull request #24883 from lucas8/fanficfare
fanficfare: init at 2.9.0
2017-04-14 19:08:16 -04:00
lucas8 9d79418019 fanficfare: init at 2.9.0 2017-04-13 23:05:45 +02:00
Tuomas Tynkkynen 0d86c0692f gawk: Disable tests that don't work in sandbox 2017-04-11 23:37:31 +03:00
Tuomas Tynkkynen 1e1b68b4a0 patchutils: Drop patch applied upstream 2017-04-11 23:13:28 +03:00
Tuomas Tynkkynen d550c90712 patchutils: 0.3.3 -> 0.3.4 2017-04-11 13:00:56 +03:00
Tuomas Tynkkynen c7e1a25765 gawk: 4.1.3 -> 4.1.4 2017-04-11 13:00:56 +03:00
Tim Jaeger 1b6189117f
xsv: init at 0.11.0
This commit adds the `xsv` utility. It is quite useful when dealing with CSV files
2017-04-04 09:32:42 +02:00
Vladimír Čunát 96d41e393d
treewide: purge maintainers.urkud
It's sad, but he's been inactive for the last five years.
Keeping such people in meta.maintainers is counter-productive.
2017-03-27 19:52:29 +02:00
Baptist BENOIST 7d72b9b74e Remove bbenoist from maintainers
Sorry guys but I did not used Nix since months and cannot spend time
maintaining my previous work...
2017-03-23 03:03:04 +01:00
Nick Hu a185b1267f proselint: disable tests and put in correct scope 2017-03-22 18:03:38 +00:00
ndowens 93ec1ad987 highlight: 3.28 -> 3.35 (#24068)
* highlight: 3.28 -> 3.35

highlight: Add support for darwin, suspecting needs gcc

highlight: Fixed isDarwin [gcc]

* highlight: enable darwin build
2017-03-19 15:22:57 -05:00
Michael Raskin 8565047bdd kdiff3: fix build 2017-03-19 12:16:32 +01:00
Michael Raskin f2bba743fb Merge pull request #23283 from alibabzo/init/proselint
proselint: init at 0.8.0
2017-03-18 18:29:20 +01:00
Daiderd Jordan c8ddac7c76 Merge pull request #23864 from mimadrid/update/ripgrep-0.5.0
ripgrep: 0.4.0 -> 0.5.0
2017-03-15 21:42:23 +01:00
mimadrid 363cfbd23d
ripgrep: 0.4.0 -> 0.5.0 2017-03-13 22:48:38 +01:00
c74d 161d73c163 ripgrep: install man-page
Modify the `ripgrep` package to install the tool's manual page.

I have tested this commit per nixpkgs manual section 11.1 ("Making
patches").
2017-03-10 07:12:16 +00:00
Joachim Fasting 351d1d9032
zimwriterfs: 20150710 -> 1.0 2017-03-07 14:06:12 +01:00
mimadrid 2b38cbb329 qshowdiff: fix build 2017-03-04 12:45:12 +01:00
Alistair Bill 0904cf034c proselint: init at 0.8.0 2017-03-03 16:25:41 +00:00
Jörg Thalheim 98523861f6
highlight: disable darwin build
https://hydra.nixos.org/build/49668465/nixlog/1
2017-03-02 16:39:12 +01:00
Jörg Thalheim de90e320c8 Merge pull request #23314 from ndowens/ansifilter
Ansifilter: 1.15 -> 2.4
2017-03-02 09:54:44 +01:00
Jörg Thalheim c5a1625f85 Merge pull request #23309 from ndowens/enca
enca: 1.16 -> 1.19
2017-03-02 09:51:31 +01:00
Jörg Thalheim 03a8db5cdc Merge pull request #23308 from ndowens/highlight
highlight: 3.28 -> 3.35
2017-03-02 09:48:33 +01:00
Jörg Thalheim 85a1dd288b Merge pull request #23306 from ndowens/kytea
kytea: 0.4.6 -> 0.4.7; source was still pointing to version 0.4.6
2017-03-02 08:44:14 +01:00
Peter Hoeg 0d936b0366 Merge pull request #23312 from ndowens/discount
Discount: 2.2.0 -> 2.2.2
2017-03-02 08:12:54 +08:00
ndowens 3df8bef60e discount: 2.2.0 -> 2.2.2
Discount: added missing update
2017-03-01 13:28:16 -06:00
ndowens c393512809 catdoc: 0.94.2 -> 0.95 2017-03-01 19:18:20 +01:00
ndowens 614afce3a8 dos2unix: 7.3.2 -> 7.3.4 (#23310) 2017-03-01 14:29:46 +00:00
ndowens 38d9c0b88f ansifilter: 1.15 -> 2.4 2017-02-28 19:23:24 -06:00
Peter Hoeg 9a2b23427f Merge pull request #23300 from ndowens/xurls
xurls: 0.8.0 -> 1.1.0
2017-03-01 08:43:42 +08:00