alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity
112159 commits 217 branches 121 tags 4.5 GiB
Commit graph

812 commits

Author SHA1 Message Date
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
ndowens 775e8eb4a4 enca: 1.16 -> 1.19 2017-02-28 18:05:03 -06:00
ndowens 9655567c09 highlight: 3.28 -> 3.35 2017-02-28 17:44:50 -06:00
Jörg Thalheim d4c0bee936 Merge pull request #23305 from ndowens/numdiff 
numdiff: 5.8.1 -> 5.9.0
 2017-03-01 00:27:28 +01:00
ndowens 8f29ca2104 kytea: 0.4.6 -> 0.4.7; source was still pointing to version 0.4.6 2017-02-28 17:26:26 -06:00
ndowens cb766725c7 numdiff: 5.8.1 -> 5.9.0 2017-02-28 17:16:33 -06:00
ndowens d02209edf2 wgetpaste: 2.25 -> 2.28 2017-02-28 23:34:40 +01:00
ndowens e9c507e060 xul: 0.8.0 -> 1.1.0 2017-02-28 16:19:28 -06:00
Thomas Tuegel 127bf18a35
extra-cmake-modules: Lift Qt dependency 2017-02-27 11:49:46 -06:00
Thomas Tuegel 0ed156a216 Merge pull request #22977 from ttuegel/triage-kde4 
Remove KDE 4 desktop packages
 2017-02-25 12:21:44 -06:00
edef 447ba91858 rnv: fix missing rec (#23162) 2017-02-25 01:40:02 +01:00
Thomas Tuegel c9de5eca0f
Remove kde4.kdiff3 
- Already updated to KDE 5 in Nixpkgs
 2017-02-24 16:48:32 -06:00
Leon Isenberg d556f53517 rnv: init at 1.7.11 2017-02-24 08:26:09 +01:00
Graham Christensen fc45440b8f Merge pull request #22761 from mimadrid/update/ripgrep-0.4.0 
ripgrep: 0.3.2 -> 0.4.0
 2017-02-13 17:54:45 -05:00
mimadrid 51592a3f49
ripgrep: 0.3.2 -> 0.4.0 2017-02-13 22:38:36 +01:00
Vladimír Čunát 8f5b3ae07a
Merge branch 'master' into staging 2017-02-11 11:22:29 +01:00
Lancelot SIX 7031e8fd01
gnugrep: 2.27 -> 3.0 
See https://lists.gnu.org/archive/html/info-gnu/2017-02/msg00005.html
and https://lists.gnu.org/archive/html/info-gnu/2017-02/msg00006.html
for release information.
 2017-02-10 21:02:56 +01:00
Tuomas Tynkkynen 6a48087bc3 jade: Cleanup a bit 
- Include version number the name so Nix knows about it.
- gcc and gzip are implicitly included, no need to add them here.
- Add meta.platforms
 2017-02-10 20:12:00 +02:00
Vladimír Čunát 66fe4af226
Merge recent staging 
It's the version last built on Hydra, almost fully.
 2017-02-10 18:07:14 +01:00
mingchuan c86b781c08 opencc: 1.0.4 -> 1.0.5 (#22516) 2017-02-09 15:35:17 +01:00
Vladimír Čunát 6bea415b5e
Merge branch 'master' into staging 2017-02-09 08:42:04 +01:00
Frederik Rietdijk 923793f99a xpf: use python2 2017-02-08 19:58:00 +01:00
Thomas Tuegel f0bbf73e0b Merge pull request #22477 from peterhoeg/f/kdiff3 
kdiff3-qt5: init at 1.7.0
 2017-02-06 11:21:31 -06:00
TANIGUCHI Kohei 9d6f2fd297 nkf: 2.1.3 -> 2.1.4 2017-02-06 01:43:34 +01:00
Lancelot SIX 7702225ad1
gnused: 4.3 -> 4.4 
See https://lists.gnu.org/archive/html/info-gnu/2017-02/msg00001.html
for release information.
 2017-02-04 14:13:58 +01:00
Vladimír Čunát adab4cd58b
Merge branch 'master' into staging 2017-02-03 11:47:38 +01:00
Peter Hoeg 8d803b90ac kdiff3-qt5: init at 1.7.0 
Upstream hasn't made a formal release yet of the qt5 version which is why I'm
not replacing the existing kde4 version.
 2017-02-02 13:01:40 +08:00
Robert Helgesson de172ae061
copyright-update: init at 2016.1018 2017-02-01 22:19:24 +01:00
Robin Gloster 61f893fb64
html-tidy: 5.0.0 -> 5.2.0 2017-01-25 20:12:42 +01:00
Franz Pletz 9b92a07843
treewide: use lib.maintainers for meta.maintainers 2017-01-20 15:44:28 +01:00
Jörg Thalheim 57b06f45db
ruby-zoom: use gemdir 2017-01-18 00:52:48 +01:00
Jörg Thalheim 4237a2bd18
reckon: use gemdir 2017-01-18 00:52:47 +01:00
John Ericson 27b47ef736 gawk: xz.bin should be a native build input 2017-01-14 17:54:53 -05:00
Tuomas Tynkkynen e00c61fd36 gnused: Fix cross build after upgrade to 4.3.0 
Fixes:
````
  GEN      doc/sed.1
help2man: can't get `--help' info from sed/sed
make[2]: *** [Makefile:5775: doc/sed.1] Error 126
make[2]: Leaving directory '/tmp/nix-build-gnused-4.3-arm-linux-gnueabihf.drv-0/sed-4.3'
make[1]: *** [Makefile:3024: all-recursive] Error 1
make[1]: Leaving directory '/tmp/nix-build-gnused-4.3-arm-linux-gnueabihf.drv-0/sed-4.3'
make: *** [Makefile:2156: all] Error 2
````

http://hydra.nixos.org/build/46051086/nixlog/11/raw
 2017-01-14 06:36:44 +02:00
Graham Christensen 2dab7782f3
unrtf: patch against CVE-2016-10091 2017-01-11 20:11:01 -05:00
Sarah Brofeldt 760710efd1 qualia: init at 1.0.0 
tests disabled
maintainer srhb
 2017-01-07 21:24:44 +01:00
Vladimír Čunát 07bf828bd9
Merge branch 'staging'; security /cc #21642 2017-01-06 16:32:47 +01:00
Vladimír Čunát 75fc704cfe
treewide: more fixes of phases after bash 4.3 -> 4.4 2017-01-06 14:05:22 +01:00
Vladimír Čunát cb70a594cb
sed: bring back 4.2.2 temporarily 
It will be useful to fixup compatibility problems with [:space:].
 2017-01-06 10:53:25 +01:00
Nahum Shalman 1a80edba7d shfmt: 0.2.0 -> 1.1.0 2017-01-05 17:34:25 -05:00
Vladimír Čunát be489cf48c
gnused: 4.2.2 -> 4.3 
Real replacement of #21646.
 2017-01-05 00:17:59 +01:00
Alexander Kahl 61d125b842 sssd: init at 1.14.2 
perlPackages.TextWrapI18N: init at 0.06
perlPackages.Po4a: init at 0.47
jade: init at 1.2.1
ding-libs: init at 0.6.0

Switch nscd to no-caching mode if SSSD is enabled.

abbradar: disable jade parallel building.

Closes #21150
 2017-01-04 03:07:20 +03:00
Benno Fünfstück a55bf2b812 codesearch: init at 20150617 2016-12-27 15:13:07 +01:00
Vladimír Čunát 86e4c9ed46
Merge branch 'master' into staging 2016-12-17 20:29:25 +01:00
Ricardo M. Correia 096e8ab45f Merge pull request #21218 from mimadrid/update/ripgrep-0.3.2 
ripgrep: 0.2.1 -> 0.3.2
 2016-12-17 13:39:56 +01:00
mimadrid 2077a60c2f
ripgrep: 0.2.1 -> 0.3.2 2016-12-17 00:16:40 +01:00
Tom Saeger e0e1bdc25c Fixup description of ripgrep. 2016-12-15 17:41:22 -06:00
Jascha Geerds b44e52b134 languagetool: Add myself as a maintainer 2016-12-15 22:18:29 +01:00
Vladimír Čunát b05b120779
Merge branch 'master' into staging 2016-12-09 19:11:05 +01:00
Lancelot SIX 4ea9f4e325
gnugrep: 2.25 -> 2.27 
See http://lists.gnu.org/archive/html/info-gnu/2016-12/msg00004.html
for release announcement.
 2016-12-08 17:28:52 +01:00
demoslam d76c48796e silver-searcher: 0.33.0 -> 1.0.2 2016-12-06 22:22:03 -08:00
Pascal Wittmann f7e0bc2ae7
Make all meta.maintainers attributes lists 2016-11-20 18:06:03 +01:00
Joachim Fasting f32a8eb6cc
xidel: refactor & fix eval 
- Fix eval by removing reference to non-existent stdenv.glibc
- Simplify patchelf calls
- Set meta.platforms = linux
 2016-11-19 14:29:22 +01:00
Tobias Geerinckx-Rice 3c3dfbc402
aha: 0.4.10.1 -> 0.4.10.2 2016-11-15 21:44:04 +01:00
Tobias Geerinckx-Rice 7981d3437d
aha: 0.4.9 -> 0.4.10.1 2016-11-14 14:14:52 +01:00
mingchuan edc5cdc3c8 opencc: init at 1.0.4 2016-11-10 01:48:28 +01:00
Joachim F be59aa055b Merge pull request #20178 from 8573/8573/pkg/add/agrep/1 
agrep: init at 3.41.5
 2016-11-06 15:18:39 +01:00
Vladimír Čunát cb6a81c607
jing-trang: fixup indentation problems 2016-11-05 10:17:56 +01:00
Vladimír Čunát fbb33ab8c9 saxon: use our standard share/java/*.jar location 2016-11-05 10:17:44 +01:00
Vladimír Čunát c6fcd28e2d
jing-trang: add back and update; removed in #20142 
This fixes the tarball, as we use jing to validate nixpkgs manual!
/cc maintainer @bjornfor.
 2016-11-05 10:03:29 +01:00
c74d 0033f6076e agrep: init at 3.41.5 
In category `tools`, subcategory `text`, add a package definition for
the program [`agrep`] [1] — "Approximate `grep` for fast fuzzy string
searching".

I have tested this patch per nixpkgs manual section 11.1 ("Making
patches").

[1]: <https://www.tgries.de/agrep/>
 2016-11-05 08:55:29 +00:00
Tim Steinbach 6dd1796b0e
Remove trang 
Source no longer exists
 2016-11-04 10:54:09 -04:00
Tim Steinbach 7329435fab
Remove jing 
No longer exists
 2016-11-04 10:27:01 -04:00
Jascha Geerds 9ca0521099 silver-searcher: 0.32.0 -> 0.33.0 2016-10-30 01:12:41 +02:00
zimbatm 9970b28680 Merge pull request #19799 from vmandela/ruby-zoom 
ruby-zoom: init at 4.1.0
 2016-10-26 13:18:43 +01:00
Venkateswara Rao Mandela 219b9d5086 ruby-zoom: init at 4.1.0 
From the website,

https://gitlab.com/mjwhitta/zoom

Zoom adds some convenience to ag/ack/grep by allowing you to quickly
open your search results in your editor of choice.

Also available as a ruby gem.

https://rubygems.org/gems/ruby-zoom

In addition to including the ruby-zoom tool, we also added a global
override for the ruby-terminfo gem to handle the ncurses build time
dependency.
 2016-10-26 17:26:26 +05:30
Vladimír Čunát 4d5b893002 Merge #19081: gnome-3.22 
Also master commits are brought in.
 2016-10-20 23:04:10 +02:00
Frederik Rietdijk f7b983aeaf grin: use python2 2016-10-18 23:14:33 +02:00
Graham Christensen bd2ad683d3 Merge pull request #19483 from RamKromberg/fix/a2ps 
a2ps: fix build
 2016-10-15 13:18:29 -04:00
Nahum Shalman 94cf6fbc35 shfmt: 2016-06-16 -> 0.2.0 2016-10-13 15:24:39 -04:00
Ram Kromberg 1b0163ea16 a2ps: fix build 2016-10-12 14:15:21 +03:00
Jörg Thalheim 2d9148dc8a Merge pull request #17815 from juliendehos/zimreader_tntnet221 
zimreader: update for using tntnet-2.2.1 ?
 2016-10-08 23:17:12 +02:00
Julien Dehos 5ddf7e0f10 zimreader: update for using tntnet-2.2.1 2016-10-08 16:55:07 +02:00
Bjørn Forsman 1021797201 languagetool: fix eval 2016-10-05 17:04:50 +02:00
Edward Tjörnhammar e4bdbfc247
languagetool: init at 3.5 2016-10-05 15:11:20 +02:00
Benno Fünfstück 4c493a32f9 ripgrep: update 0.1.17 -> 0.2.1 2016-09-29 00:51:14 +02:00
Franz Pletz 76b142b915 Merge pull request #18894 from tailhook/ripgrep 
Add ripgrep package
 2016-09-25 14:28:29 +02:00
Franz Pletz c39195d699
a2ps: fix CVE-2001-1593 & CVE-2014-0466 2016-09-24 15:33:03 +02:00
Paul Colomiets 1255d60b35 ripgrep: init at 0.1.17 2016-09-23 23:53:54 +03:00
Kamil Chmielewski 914e0e594c buildGoPackage: deps.json -> deps.nix in NIXON 
https://github.com/NixOS/nixpkgs/pull/17254#issuecomment-245295541

* update docs to describe `deps.nix`
* include goDeps in nix-shell GOPATH
* NixOS 16.09 rel notes about replacing goPackages
 2016-09-16 00:04:55 +01:00
Ram Kromberg 14e9972e49 groff: add missing depedencies for optional postscript and html outputs 2016-09-13 23:38:05 +03:00
Bjørn Forsman 7ffbe5174f sablotron: update source URL 
The current URL no longer works, switch to a sourceforge mirror URL.
Fixes issue #18337.
 2016-09-08 15:33:31 +02:00
Sander van der Burg 8bedff0e92 wring: use node2nix generated package 2016-09-01 20:50:08 +00:00
Tuomas Tynkkynen 048a30e4e4 treewide: Fix dev references to libxml2 2016-08-30 03:02:32 +03:00
Robin Gloster e17bc25943
Merge remote-tracking branch 'upstream/master' into staging 2016-08-29 00:24:47 +00:00
sternenseemann 2fce6824ee a2ps: fix a misspelling in description 2016-08-28 22:32:32 +02:00
obadz 3de6e5be50 Merge branch 'master' into staging 
Conflicts:
      pkgs/applications/misc/navit/default.nix
      pkgs/applications/networking/mailreaders/alpine/default.nix
      pkgs/applications/networking/mailreaders/realpine/default.nix
      pkgs/development/compilers/ghc/head.nix
      pkgs/development/libraries/openssl/default.nix
      pkgs/games/liquidwar/default.nix
      pkgs/games/spring/springlobby.nix
      pkgs/os-specific/linux/kernel/perf.nix
      pkgs/servers/sip/freeswitch/default.nix
      pkgs/tools/archivers/cromfs/default.nix
      pkgs/tools/graphics/plotutils/default.nix
 2016-08-27 23:54:54 +01:00
Graham Christensen 6bfe459355 Merge pull request #17983 from ericsagnes/pkg/groonga 
groonga: init at 6.0.7
 2016-08-25 08:02:08 -04:00
Eric Sagnes 9dc5952bfa kytea: init at 0.4.7 2016-08-25 17:36:33 +09:00
obadz 78b7529ee3 Merge branch 'master' into staging 2016-08-24 11:57:44 +01:00
Daniel Peebles 3f337a2b23 Merge pull request #17685 from matthewbauer/darwin-misc2 
Darwin misc. fixes
 2016-08-24 11:52:27 +02:00
Shea Levy ed20bbc8fb Merge branch 'update_diffutils-3.5' of git://github.com/lancelotsix/nixpkgs into staging 2016-08-22 07:56:43 -04:00
Lancelot SIX 88949e6d13
diffutils: 3.3 -> 3.5 
Releases announcements:
3.4: http://lists.gnu.org/archive/html/info-gnu/2016-08/msg00004.html
3.5: http://lists.gnu.org/archive/html/info-gnu/2016-08/msg00010.html
 2016-08-21 14:33:29 +02:00
Matthew Bauer a6faa04ee4 unrtf: fix darwin build 
unrtf needs libiconv on Darwin. Linux has issues with the -liconv flag,
but it's provided by gcc anyway.
 2016-08-16 19:25:46 +00:00
Matthew Bauer 2ecb5ddea7 odt2txt: fix darwin build 
- needs libiconv in ld flags on clang
 2016-08-16 19:25:44 +00:00
Shea Levy 9adad8612b Revert "Merge branch 'modprobe-fix' of git://github.com/abbradar/nixpkgs" 
Was meant to go into staging, sorry

This reverts commit 57b2d1e9b0, reversing
changes made to 760b2b9048.
 2016-08-15 19:05:52 -04:00
Vladimír Čunát 4fbb37c517 Merge branch 'master' into staging 
Hydra nixpkgs: ?compare=1287298
 2016-08-14 12:02:28 +02:00
Franz Pletz bd4490e277 Merge branch 'master' into hardened-stdenv 2016-08-13 16:59:55 +02:00
Robin Gloster b7787d932e Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-12 09:46:53 +00:00
Kamil Chmielewski da3ddd48e4 buildGoPackage: remove Go deps file libs.json 
After #16017 there were a lot
of comments saying that `nix` would be better than `JSON`
for Go packages dependency sets.
As said in https://github.com/NixOS/nixpkgs/pull/16017#issuecomment-229624046

    > Because of the content-addressable store, if two programs have the
    > same dependency it will already result in the same derivation in
    > the
    > store. Git also has compression in the pack files so it won't make
    > much difference to duplicate the dependencies on disk. And finally
    > most users will just use the binary builds so it won't make any
    > differences to them.

This PR removes `libs.json` file and puts all package dependencies in
theirs `deps.json`.
 2016-08-11 23:07:09 +02:00
Jean-Luc Jox 526291231b par: init at 1.5.2 
Issue #17521
 2016-08-11 12:48:41 +02:00
Kyle McKean de7a265117 reckon: init at 0.4.4 2016-08-10 14:16:24 +01:00
Lancelot SIX 8bff33a4ff diffutils: 3.3 -> 3.4 
See http://lists.gnu.org/archive/html/info-gnu/2016-08/msg00004.html
for release announcement.
 2016-08-10 14:54:49 +02:00
Lancelot SIX c4b77c0f7c Revert "diffutils: 3.3 -> 3.4" 
This reverts commit 99f242bd00.
It will go into staging before getting into master.
 2016-08-10 14:52:20 +02:00
Lancelot SIX 99f242bd00
diffutils: 3.3 -> 3.4 
See http://lists.gnu.org/archive/html/info-gnu/2016-08/msg00004.html
for release announcement.
 2016-08-10 13:45:09 +02:00
Tuomas Tynkkynen b793398131 zimreader: Broken on i686 
(Well, actually tntnet, but that derivation is defined in the same file).
http://hydra.nixos.org/build/38238028
 2016-08-06 17:06:45 +03:00
Tobias Geerinckx-Rice 8cb6821679
aha: 0.4.8 -> 0.4.9 2016-08-04 00:25:20 +02:00
Robin Gloster 7423e029a2 convertlit: disable format hardening 2016-08-03 20:04:28 +00:00
Robin Gloster 1b979d8384 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-03 13:34:44 +00:00
Tuomas Tynkkynen 21f17d69f6 treewide: Add lots of meta.platforms 
Build-tested on x86_64 Linux & Mac.
 2016-08-02 21:42:43 +03:00
Tuomas Tynkkynen 2258b21e4b treewide: Add lots of platforms to packages with no meta 
Build-tested on x86_64 Linux and on Darwin.
 2016-08-02 21:17:44 +03:00
Tuomas Tynkkynen db35d7b8ab koji, opensp: Some meta fixes 2016-08-02 21:17:44 +03:00
Robin Gloster 203846b9de Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-19 10:37:02 +00:00
Benno Fünfstück 5e5165ec6f platinum-searcher: 2.1.1 -> 2.1.3 2016-07-16 17:07:14 +02:00
Robin Gloster 5185bc1773 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-15 14:41:01 +00:00
Carl Sverre 0e6fbf83f8 sift: fix hydra build fail (#16820) 
For some reason I haven't been able to figure out, sift does not build on OSX.
I think it is because sift uses cgo for some of its functionality which you can
see here:
https://github.com/svent/sift/blob/master/matching_cgo.go#L23

The error which hydra found (and is reproducible on OSX) can be seen here:
https://hydra.nixos.org/build/37169149

Ideally I would like to get sift building on OSX, however my nix-fu is weak.
Any suggestions are welcome.  In the meantime I would like to get sift into one
of the release channels for Linux where it works fine.
 2016-07-10 11:17:47 +02:00
Jonathan Glines 8199cda762 mecab: init at 0.996 (#16175) 
Japanese morphological analysis system, used by Anki in particular
 2016-06-26 22:47:23 +02:00
Carl Sverre a12ec263fa sift: init at 0.8.0 
sift is a fast and powerful alternative to grep.

https://sift-tool.org
 2016-06-25 14:10:34 -07:00
Bjørn Forsman bd01fad0ed Captialize meta.description of all packages 
In line with the Nixpkgs manual.

A mechanical change, done with this command:

  find pkgs -name "*.nix" | \
      while read f; do \
          sed -e 's/description\s*=\s*"\([a-z]\)/description = "\u\1/' -i "$f"; \
      done

I manually skipped some:

* Descriptions starting with an abbreviation, a user name or package name
* Frequently generated expressions (haskell-packages.nix)
 2016-06-20 13:55:52 +02:00
Gabriel Ebner 4099bba676 silver-searcher: 0.31.0 -> 0.32.0 2016-06-19 19:01:03 +02:00
Nahum Shalman 0060a0f3df shfmt: 2016-06-15 -> 2016-06-16 (#16272) 
Among other improvements the author fixed mvdan/sh#13
 2016-06-16 15:05:24 +01:00
Nahum Shalman d624b02e1e Add new package "shfmt" 2016-06-16 00:18:15 +00:00
Robin Gloster 8031cba2ab Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-06-10 09:27:04 +00:00
Kamil Chmielewski 7eb671ebcd no more goPackages 2016-06-09 13:08:00 +02:00
Tuomas Tynkkynen bac26e08db Fix lots of fetchgit hashes (fallout from #15469) 2016-06-03 17:17:08 +03:00
Matthias Beyer 871c4d78e8
diffstat: 1.60 -> 1.61 2016-06-03 16:04:41 +02:00
Matthias Beyer 97e64c3cf5
discount: 2.1.6 -> 2.2.0 2016-06-03 16:04:41 +02:00
Robin Gloster 2d382f3d98 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-30 19:39:34 +00:00
Vladimír Čunát 0b192a0976 Merge branch 'master' into staging 
That's to get mesa rebuild from master, as it's nontrivial.
 2016-05-23 09:02:10 +02:00
Robert Helgesson b717faf49f xml2: add platforms field 2016-05-22 14:34:05 +02:00
Vladimír Čunát c4661e9643 Merge: make dev output references explicit 
This is a rebase of most commits from #14766,
resolving conflicts and a few other evaluation problems.
 2016-05-22 12:09:23 +02:00
Tuomas Tynkkynen 8d473f107c treewide: Make explicit that 'dev' output of readline is used 2016-05-19 10:03:35 +02:00
Tuomas Tynkkynen 3672f3edcb treewide: Make explicit that 'dev' output of libxslt is used 2016-05-19 10:00:48 +02:00
Alexey Lebedeff a4ecc91d39 platinum-searcher: init at 2.1.1 2016-05-18 19:24:10 +03:00
Franz Pletz f8d481754c
Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-05-18 17:10:02 +02:00
Domen Kožar b49bf121b8 rename iElectric to domenkozar to match GitHub 2016-05-17 13:00:47 +01:00
Matthias Beyer 4d2914ff9e sourceHighlight: 3.1.7 -> 3.1.8 2016-05-16 16:12:21 +02:00
Vladimír Čunát 1dc36904d8 Merge #14920: windows improvements, mainly mingw 2016-05-05 08:30:19 +02:00
Vladimír Čunát 7a005601d4 Merge branch 'master' to resolve conflicts 2016-05-05 08:25:38 +02:00
Robin Gloster 9820cb1bf2 use dontBuild instead of hacks 
changes:
 * buildPhase = "true"
 * buildPhase = ":"
 2016-05-04 10:11:04 +00:00
Tuomas Tynkkynen aadaa91379 Merge remote-tracking branch 'upstream/master' into staging 
Conflicts:
	pkgs/applications/networking/browsers/vivaldi/default.nix
	pkgs/misc/emulators/wine/base.nix
 2016-05-03 23:12:48 +03:00
Tobias Geerinckx-Rice be3d012da4
highlight: 3.18 -> 3.28 2016-05-03 04:33:49 +02:00
Robin Gloster c92bca56f8 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-02 22:58:02 +00:00