Commit graph

84932 commits

Author SHA1 Message Date
Tuomas Tynkkynen 345d0a3ea6 Merge remote-tracking branch 'upstream/staging' into master 2016-06-06 22:17:38 +03:00
Benno Fünfstück c85f2b20e6 nixos/openvpn: add support for resolvconf
The update-resolve-conf script from the update-resolv-conf
package is very useful and should work in most of the common
cases, so this adds an option to enable it. The option is
disabled by default for backwards compatibility.
2016-06-06 20:43:52 +02:00
Michael Raskin 32cbc5b794 glui: init at 2.36 2016-06-06 20:42:34 +02:00
Damien Cassou da62589d8e gnome3_20: Add GNOME 3.20 package set 2016-06-06 20:33:58 +02:00
Rushmore Mushambi 97c64f560c Merge pull request #16024 from rushmorem/k8s-update
kubernetes: v1.0.3 -> v1.2.4
2016-06-06 19:42:34 +02:00
rushmorem 21c83f294d kubernetes: v1.0.3 -> v1.2.4 2016-06-06 19:25:32 +02:00
Joachim Fasting 628cd6f83a Merge pull request #15966 from pshendry/master
terraria-server: 1.3.0.8 -> 1.3.1.1
2016-06-06 16:44:07 +02:00
Tobias Geerinckx-Rice 894b011381
geolite-legacy: 2016-05-31 -> 2016-06-06 2016-06-06 16:18:53 +02:00
Profpatsch b886ce25c1 abcde: use makeBinPath to construct wrapper PATH 2016-06-06 16:14:11 +02:00
Thomas Tuegel 76185aedab Merge branch 'dropbox' 2016-06-06 08:21:09 -05:00
Domen Kožar 55028d556f Merge pull request #16022 from NixOS/travis/noexec
travis-ci: attempt to fix linux builds
2016-06-06 13:45:22 +01:00
Domen Kožar 8ad607040e travis-ci: attempt to fix linux builds 2016-06-06 13:34:52 +01:00
Luca Bruno 99cfbda5c6 libchamplain: 0.12.11 -> 0.12.13 2016-06-06 13:59:31 +02:00
Damien Cassou 9afd1161e7 inkscape: fix due to glibmm update 2016-06-06 13:59:31 +02:00
Damien Cassou e148cf2bca uhttpmock: init at 0.5.0 2016-06-06 13:59:31 +02:00
Damien Cassou 47b19b5645 clutter-gst: 3.0.4 -> 3.0.18 2016-06-06 13:59:31 +02:00
Damien Cassou 1930545c06 clutter-gtk-1.8: init at 1.8.0 2016-06-06 13:59:31 +02:00
Damien Cassou 289aadc542 clutter_1_26: init at 1.26.0 2016-06-06 13:59:31 +02:00
Damien Cassou fbbe6e2497 pangomm: 2.38.1 -> 2.40.0 2016-06-06 13:59:31 +02:00
Damien Cassou e28a8c6d6c gtkmm: 3.18.0 -> 3.20.0 2016-06-06 13:59:31 +02:00
Damien Cassou 793ffb14a4 glibmm: 2.46.3 -> 2.48.1 2016-06-06 13:59:31 +02:00
Damien Cassou 366d98497f vala_0_32: init at 0.32.0 2016-06-06 13:59:31 +02:00
Rok Garbas 28ddc8c043 neovim: pkgs argument was unused 2016-06-06 13:00:44 +02:00
Profpatsch 3a3ed33f26 abcde: fix flac bin output 2016-06-06 12:28:38 +02:00
Jiri Danek 3de59a83da dart: 0.4 -> 1.16.1 2016-06-06 11:15:05 +02:00
Vladimír Čunát ab5a5f760f libexttextcat: homepage has moved 2016-06-06 11:10:39 +02:00
Nick Novitski d3393473df unibilium: enable on darwin (#16012) 2016-06-06 10:56:08 +02:00
FlorentBecker d7de8bc6e9 patoline: remove (source is unavailable) (#15918) 2016-06-06 10:49:00 +02:00
Luca Bruno 5428a295e6 Merge pull request #15999 from womfoo/duc
duc: 1.3.3 -> 1.4.1
2016-06-06 10:18:31 +02:00
michael bishop e8108e0d22
toxvpn: update versions and allow systemd to be optional 2016-06-06 05:00:15 -03:00
Peter Simons 0cc1b3744e haskell-semigroups: fix build with older compilers 2016-06-06 09:33:31 +02:00
Peter Simons a01fab64e2 haskell-binary: update overrides for latest version 2016-06-06 09:33:31 +02:00
Peter Simons 1845843cdd git-annex: take this tool from LTS Haskell while Stackage Nightly is broken 2016-06-06 09:33:30 +02:00
Peter Simons c7639f4e56 haskell-esqueleto: remove broken overrides
These overrides didn't work, because they created a mixture of different
versions of 'persistent' in the build tree. Furthermore, we cannot pin
specific versions like that in configuration-common.nix because this
breaks builds in other package sets, i.e. the LTS variants.
2016-06-06 09:33:30 +02:00
Peter Simons 513d648f40 configuration-common.nix: drop obsolete overrides 2016-06-06 09:33:30 +02:00
Peter Simons ac3ccce0c1 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20160406-31-gd9dda87 using the following inputs:

  - Hackage: 4c643345f3
  - LTS Haskell: 1a80e0660e
  - Stackage Nightly: 3ba38d9d9e
2016-06-06 09:33:25 +02:00
Thomas Tuegel f0c76d603f dropbox: use bundled libraries whenever possible 2016-06-05 19:45:27 -05:00
Robert Helgesson 5474d37d58 libertine: set platforms field
Also make the `fontforge` build input a native build input.
2016-06-06 01:01:56 +02:00
Thomas Tuegel 9769952933 Revert "kde5.frameworks: 5.21 -> 5.22"
This reverts commit 112d4c71b2.

This upgrade causes a serious Plasma performance degradation and causes
incorrect font rendering. Reverting until the cause is known.
2016-06-05 14:56:27 -05:00
Nick Novitski 4edffff181 taskwarrior: enable on darwin 2016-06-05 18:10:53 +00:00
koral 4df9d21081 pythonPackages.dulwich: 0.10.1a -> 0.12.0 2016-06-05 19:34:39 +02:00
Frederik Rietdijk d9416bc99a Merge pull request #16009 from k0ral/restview
pythonPackages.restview: 2.5.0 -> 2.5.2
2016-06-05 19:04:27 +02:00
Frederik Rietdijk 895f83bea1 Merge pull request #16007 from k0ral/jellyfish
pythonPackages.jellyfish: 0.5.0 -> 0.5.2
2016-06-05 19:04:15 +02:00
koral 4a61a0d2bb pythonPackages.restview: 2.5.0 -> 2.5.2 2016-06-05 18:30:13 +02:00
Frederik Rietdijk 21c897174a Merge pull request #16003 from k0ral/hg-git
hg-git: 0.8.2 -> 0.8.5
2016-06-05 18:17:00 +02:00
Frederik Rietdijk 6380a16a00 Merge pull request #16004 from k0ral/bottle
bottle: 0.12.8 -> 0.12.9
2016-06-05 18:16:44 +02:00
koral 3004539bb7 pythonPackages.hg-git: 0.8.2 -> 0.8.5 2016-06-05 17:52:39 +02:00
koral 42e2e92472 pythonPackages.bottle: 0.12.8 -> 0.12.9 2016-06-05 17:50:56 +02:00
koral ba792bf234 pythonPackages.jellyfish: 0.5.0 -> 0.5.2 2016-06-05 17:50:34 +02:00
koral 92471cbc8f rmlint: 2.4.2 -> 2.4.4 2016-06-05 17:33:29 +02:00