Vladimír Čunát
bd458e56b6
Merge #14356 : docbook updates
2016-06-09 13:11:53 +02:00
Vladimír Čunát
cec03a8ecd
Merge #14753 : makeWrapper: allow spaces in variables
2016-06-09 13:09:43 +02:00
Vladimír Čunát
b9d42f79c9
Merge recent master into staging
...
This would be a fast-forward, but --no-ff seems cleaner in this case.
Hydra nixpkgs: ?compare=1278067
2016-06-09 13:07:48 +02:00
Vladimír Čunát
cc174b3d55
pidgin: simplify using the wrapped version
...
Now only the `pidgin` attribute is exposed and it's wrapped based on
whether the `plugins` parameter is overridden.
Discussion: https://github.com/NixOS/nixpkgs/issues/8999#issuecomment-224851642
2016-06-09 12:21:36 +02:00
Peter Simons
dc6f1cf4b3
Merge pull request #16080 from mstarzyk/timezone-series
...
haskellPackages.timezone-series: Add support for time-1.6 - applied p…
2016-06-09 12:09:12 +02:00
Eelco Dolstra
109096247a
php56: update to 5.6.22
...
(cherry picked from commit 72b4009367257c2447aac89d5f34f2421bbc88dc)
2016-06-09 10:04:39 +00:00
Rushmore Mushambi
3871831b37
Merge pull request #16059 from vrthra/factor
...
factor-lang: Init at 0.97
2016-06-09 11:24:53 +02:00
obadz
fcb0023e80
haskellPackages.intero: fix tests (thanks @rvl)
2016-06-09 08:53:47 +01:00
Rahul Gopinath
51a7260fba
factor-lang: Init at 0.98
...
Factor is a concatenative, stack-based programming language.
2016-06-08 21:45:43 -07:00
Tuomas Tynkkynen
a357edc0c6
Merge pull request #16013 from nicknovitski/typespeed-darwin
...
typespeed: fix darwin compatibility
2016-06-09 05:24:57 +03:00
Nick Novitski
487140e8ef
typespeed: fix darwin compatibility
2016-06-09 02:07:40 +00:00
Rushmore Mushambi
37ab0f3123
Merge pull request #16073 from rushmorem/package-nomad
...
nomad: add package
2016-06-09 01:44:47 +02:00
rushmorem
a2612dc0f1
nomad: add package
2016-06-09 01:27:32 +02:00
obadz
e3358c1951
pcmanfm-qt: init at 0.11.0
2016-06-08 23:08:15 +01:00
Maciek Starzyk
0158d124bd
haskellPackages.timezone-series: Download patch instead of checking it into nixpkgs
2016-06-09 00:03:41 +02:00
Maciek Starzyk
10c87e69b4
haskellPackages.timezone-series: Add support for time-1.6 - applied patch https://github.com/ygale/timezone-series/pull/1
2016-06-08 23:35:44 +02:00
Thomas Tuegel
bdb8bafd1f
Merge branch 'plasma-workspace'
2016-06-08 14:59:21 -05:00
Thomas Tuegel
8dae2eddcf
kde5.kdeplasma-addons: add missing ksysguard dependency
2016-06-08 14:58:35 -05:00
Thomas Tuegel
b214c6b64f
kde5.plasma-desktop: add missing ksysguard dependency
2016-06-08 13:51:25 -05:00
Benno Fünfstück
ba09675232
zap: update 2.4.3 -> 2.5.0
2016-06-08 20:21:39 +02:00
obadz
d13378ffd1
haskellPackages.libmpd: remove upper bound on time
2016-06-08 19:14:27 +01:00
Tobias Geerinckx-Rice
1201cc569c
geolite-legacy: 2016-06-06 -> 2016-06-08
2016-06-08 19:53:48 +02:00
Rushmore Mushambi
5c8a8808ba
Merge pull request #16056 from ljli/fix-atom
...
atom: patchelf ctags binary
2016-06-08 18:57:50 +02:00
Luis Pedro Coelho
bd617cb185
init bwa at 0.7.15
...
Closes #16064
2016-06-08 17:25:20 +01:00
obadz
ab70ae2edf
Merge pull request #15647 from layus/auctex
...
ktikz: init at 0.10
2016-06-08 17:17:50 +01:00
Christian Lask
093c42161f
yabar: init at 0.4.0
...
Closes #15945
2016-06-08 16:59:29 +01:00
Stefan Junker
2e6b257edf
rkt: 1.5.1 -> 1.7.0 ( #15958 )
2016-06-08 16:43:42 +01:00
vbgl
0a4e806f8f
ocamlnet: 3.7.7 -> 4.1.1 ( #16008 )
2016-06-08 16:40:08 +01:00
zimbatm
d220132f22
httpie: 0.9.2 -> 0.9.3 ( #16067 )
2016-06-08 16:38:08 +01:00
Thomas Tuegel
719b8e6d4c
Merge branch 'plasma-workspace-iso-codes'
2016-06-08 10:27:08 -05:00
Thomas Tuegel
bcd6e295d7
kde5.plasma-workspace: add iso-codes dependency
...
Fixes #16040 . CMake finds the iso-codes dependency through pkgconfig.
2016-06-08 10:26:24 -05:00
Joachim Fasting
ccf7048307
Merge pull request #16057 from taku0/firefox-bin-47.0
...
firefox-bin: 46.0.1 -> 47.0
2016-06-08 17:20:24 +02:00
Michael Raskin
d88aa14c6e
Firefox: 46.0.1 -> 47.0
2016-06-08 17:09:12 +02:00
Joachim Fasting
8fc6ca75a9
torbrowser: 6.0 -> 6.0.1
2016-06-08 16:51:53 +02:00
zimbatm
4e30ff7368
Merge pull request #16062 from vbgl/piqi-0.7.5
...
piqi-ocaml: 0.7.4 -> 0.7.5
2016-06-08 13:45:17 +01:00
Domen Kožar
964665eb1c
Merge pull request #15962 from abuibrahim/master
...
pktgen: build with the same CFLAGS as dpdk
2016-06-08 11:32:13 +01:00
Vincent Laporte
2bb6cb6d20
piqi-ocaml: 0.7.4 -> 0.7.5
2016-06-08 10:11:44 +02:00
Vincent Laporte
909f83f9f8
piqi: 0.6.12 -> 0.6.13
2016-06-08 10:11:44 +02:00
Damien Cassou
1048d3ddd3
Merge pull request #16058 from DamienCassou/offlineimap-6.7.0.1
...
offlineimap: 6.7.0 -> 6.7.0.1
2016-06-08 06:34:53 +02:00
Damien Cassou
2ba759b1e2
offlineimap: 6.7.0 -> 6.7.0.1
2016-06-08 06:22:16 +02:00
Ruslan Babayev
ff8362aeb4
pktgen: build with the same CFLAGS as dpdk
2016-06-07 20:11:50 -07:00
obadz
30f2dd5f55
Merge pull request #16025 from vbgl/utop-1.19
...
utop: 1.17 -> 1.19.2
2016-06-08 01:07:05 +01:00
Peter Simons
55ac62c660
Add LTS Haskell 6.2.
2016-06-07 22:02:14 +02:00
Peter Simons
71fc5083be
git-annex: work around Joey Hess' latest brain fart
...
Now we're releasing incomplete Hackage tarballs on purpose:
http://git-annex.branchable.com/bugs/bash_completion_file_is_missing_in_the_6.20160527_tarball_on_hackage/
You know, I'll fix this shit one last time, but on the next occasion
upstream breaks the build for no apparent reason, I'm going to abandon
this project and leave it to someone else to package, because these kind
of wacko engineering decisions cast a bad light on the soundness of
git-annex as a whole, IMHO.
2016-06-07 21:59:52 +02:00
Peter Simons
637f901f3e
hackage-packages.nix: update Haskell package set
...
This update was generated by hackage2nix v20160406-35-g2a2d30b using the following inputs:
- Hackage: 7a03eee484
- LTS Haskell: 1a80e0660e
- Stackage Nightly: 7e90e5529b
2016-06-07 21:59:04 +02:00
Peter Simons
3e4cd62903
Merge pull request #16053 from obadz/ghc-mod-ghc8
...
haskellPackages.ghc-mod: add support for GHC8
2016-06-07 21:50:35 +02:00
obadz
99717f7a56
haskellPackages.intero: don't run tests
2016-06-07 20:36:35 +01:00
obadz
679a51b116
haskellPackages.ghc-mod: add overrides to support ghc8
2016-06-07 20:33:48 +01:00
Luca Bruno
217feced47
gnome3_20.totem: fix build on i686
...
See https://bugzilla.gnome.org/show_bug.cgi?id=767374
2016-06-07 21:22:27 +02:00
Robert Helgesson
b51ed9863b
perl-Net-Statsd: fix license field
2016-06-07 21:21:42 +02:00