Shea Levy
4212d8facb
Merge branch 'mariadb-10.1.9' of git://github.com/ryantrinkle/nixpkgs
2015-12-07 13:43:49 -05:00
Ryan Trinkle
5729cf7714
mariadb: 10.1.8 -> 10.1.9
...
Fixes build on darwin; might be related to https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=777996;msg=2
2015-12-07 13:21:25 -05:00
Peter Simons
8dd80d7055
Merge pull request #11531 from oxij/rtorrent-merge-and-cleanup
...
libtorrent, rtorrent: merge *-git into default, drop outdated *-git versions, cleanup
2015-12-07 19:01:52 +01:00
Jan Malakhovski
7afce99e61
libtorrent, rtorrent: merge *-git into default, drop outdated *-git versions, cleanup
...
This also gives the man page (it is outdated, though).
2015-12-07 17:56:03 +00:00
Markus Wotringer
9a350d5f1e
cntlm: refactor to systemd service, fixes #11339
2015-12-07 15:40:43 +01:00
zimbatm
f399ab50d8
ruby: update railsexpress patchsets, fixes #11347
2015-12-07 15:37:55 +01:00
zimbatm
7c338ffb77
ruby_2_2: 2.2.2 -> 2.2.3
2015-12-07 15:37:33 +01:00
zimbatm
d9f0568ccb
ruby_2_1: 2.1.6 -> 2.1.7
2015-12-07 15:37:33 +01:00
zimbatm
9ebc399432
ruby_2_0: 2.0.0p645 -> 2.0.0p647
2015-12-07 15:37:33 +01:00
Desmond O. Chang
700835bb45
yank: 0.4.1 -> 0.6.0, fixes #11522
2015-12-07 15:25:50 +01:00
Jakob Gillich
6c9931c556
shout: fix preStart, fixes #11516
...
preStart must be a string
2015-12-07 15:24:29 +01:00
Ambroz Bizjak
067141621e
virtualboxGuestAdditions: Add missing library paths to patchelf, fixes #11509
2015-12-07 15:15:03 +01:00
Teo Klestrup Röijezon
53441bcc93
nginx: 1.9.4 -> 1.9.7, fixes #11515
2015-12-07 14:56:27 +01:00
Ambroz Bizjak
b9093f1c64
chromium: Updates, fixes #11492
...
Built and run Beta and Stable locally. Dev is surrently superseded by Stable so
it doesn't matter much.
- Dev: 47.0.2508.0 -> 48.0.2564.22
- Beta: 46.0.2490.64 -> 48.0.2564.23
- Stable: 45.0.2454.101 -> 47.0.2526.73
Changed the SSL dependencies to the supported configuration on Linux (according
to Torne @Freenode/#chromium-support).
- NSS is a dependency since it is used to access the ceritiface store.
- Dropped system OpenSSL support, the bundled BoringSSL is used.
This probably fixes issue #10555 . Note that without this adjustment the build
fails even.
Dropped uneeded old patches.
2015-12-07 14:52:15 +01:00
Thomas Tuegel
ace303f79c
emacsPackagesNg: pass melpaBuild, trivialBuild to packages
2015-12-07 06:28:56 -06:00
Thomas Tuegel
916f86745e
Merge branch 'elpa-packages'
2015-12-07 06:24:34 -06:00
Thomas Tuegel
4b950d233e
ipe: 7.1.8 -> 7.1.10
2015-12-07 05:50:02 -06:00
Domen Kožar
8a0f2e7025
Merge pull request #11520 from mcmtroffaes/feature/namecoin-sha256-fix
...
namecoin: fix sha256 using fetchzip
2015-12-07 11:49:12 +01:00
Matthias C. M. Troffaes
0a9b784acc
namecoin: fix sha256 using fetchzip
2015-12-07 10:45:28 +00:00
Peter Simons
747d30ad39
Merge pull request #11518 from mcmtroffaes/feature/doc-master-staging
...
doc/submitting-changes: mention master -> staging merge
2015-12-07 11:42:30 +01:00
Domen Kožar
8c65e4e82a
Merge pull request #11519 from mcmtroffaes/feature/cbatticon-sha256-fix
...
cbatticon: fix sha256 mismatch
2015-12-07 11:26:29 +01:00
Matthias C. M. Troffaes
9b2d64f310
cbatticon: use fetchzip to fix sha256 issues
2015-12-07 10:24:38 +00:00
Peter Simons
83f9fc069c
hackage-packages.nix: update Haskell package set
...
This update was generated by hackage2nix v20150922-46-gf1bbc76 using the following inputs:
- Nixpkgs: 4619baf1f6
- Hackage: 4269955365
- LTS Haskell: 57dab1c997
- Stackage Nightly: 87110f79ed
2015-12-07 11:23:57 +01:00
lethalman
2fde83b5bd
Merge pull request #11411 from hrdinka/mapnik
...
mapnik: init at 3.0.9
2015-12-07 10:50:39 +01:00
lethalman
6d13f373f4
Merge pull request #11511 from goodwillcoding/libgtop-update
...
update libgtop to latest (2.32.0) and enable gobject introspection on it
2015-12-07 10:17:36 +01:00
Matthias C. M. Troffaes
e6046739cd
doc/submitting-changes: mention master -> staging merge (see issue #11460 )
2015-12-07 08:49:04 +00:00
Arseniy Seroka
f6754747bd
Merge pull request #11513 from oxij/fix-w3m-on-darwin
...
w3m: turn off mouseSupport on Darwin
2015-12-07 03:03:08 +03:00
Tobias Geerinckx-Rice
47eb4d4430
Migrate manpages -> man-pages (upstream project name)
2015-12-06 23:44:13 +01:00
Tobias Geerinckx-Rice
ef8dde9eef
man-pages-posix: correct meta.homepage
2015-12-06 23:44:13 +01:00
Tobias Geerinckx-Rice
968986547b
man-pages 4.02 -> 4.03
2015-12-06 23:44:13 +01:00
Tobias Geerinckx-Rice
b3635acffb
swingsane: init at 0.2
2015-12-06 23:44:13 +01:00
Rok Garbas
7ac0052ad5
nodejs: nodePackages_4_2 -> nodePackages_4_x
2015-12-06 21:58:45 +01:00
Rok Garbas
c90d26a2e2
nodejs: fix naming of nodejs to fit into their versioning model, fixes #11497
2015-12-06 21:57:24 +01:00
zimbatm
a6982cc525
nodejs: 5.0.0 -> 5.1.1 CVE-2015-8027
...
See
https://nodejs.org/en/blog/vulnerability/december-2015-security-releases/
2015-12-06 21:57:09 +01:00
zimbatm
989966b293
nodejs: 4.2.2 -> 4.2.3 CVE-2015-8027
...
See
https://nodejs.org/en/blog/vulnerability/december-2015-security-releases/
2015-12-06 21:57:09 +01:00
zimbatm
59fc3cd8ad
nodejs: remove unlinked v4_1_0
...
The stable branch is v4.x.x and is already taken care of my the default.nix
2015-12-06 21:57:09 +01:00
zimbatm
46c65335ca
nodejs: 0.10.40 -> 0.10.41
...
Maintenance release
2015-12-06 21:57:09 +01:00
Jan Malakhovski
53f93b0b7e
w3m: turn off mouseSupport on Darwin
...
Fixes an issue reported at https://github.com/NixOS/nixpkgs/pull/11222/files#r46774825
2015-12-06 20:44:29 +00:00
goodwillcoding
41f594a299
Add gobjectIntrospection to the scope
2015-12-06 11:26:06 -08:00
Thomas Tuegel
026e3424a7
emacsPackagesNg: include elpaPackages
2015-12-06 13:17:41 -06:00
goodwillcoding
71240e56a1
update libgtop to latest (2.32.0) and enable gobject introspection on it
2015-12-06 10:54:11 -08:00
Arseniy Seroka
21332223ec
Merge pull request #11451 from rvl/pump.io
...
Add Pump.io
2015-12-06 21:47:42 +03:00
Joachim Schiele
a72ff7f4e7
Merge branch 'master' of github.com:NixOS/nixpkgs
2015-12-06 19:43:53 +01:00
Joachim Schiele
bf0ed5e93a
added kgocode
2015-12-06 19:43:25 +01:00
Domen Kožar
3441848ca6
Merge pull request #11508 from Pamelloes/patch-1
...
Fix trollius buildon sandboxed pure darwin
2015-12-06 19:35:24 +01:00
Pamelloes
038c7a60a1
Fix trollius buildon sandboxed pure darwin
...
Skipped six tests that fail because of sandbox restrictions (namely the three variants of test_read_pty_output and test_write_pty).
2015-12-06 12:34:06 -06:00
Thomas Tuegel
07a0031029
melpaBuild: add unpackCmd for single-file packages
...
Emacs packages are commonly distributed as single .el files. This
unpackCmd handles them correctly and sets up sourceRoot. Other sources
are treated in the default manner.
2015-12-06 11:50:10 -06:00
Thomas Tuegel
32c0069b79
add elpaPackages top-level attribute
2015-12-06 11:49:51 -06:00
Thomas Tuegel
63eb6fdd8a
fetchsvn: correctly handle trailing slashes
...
`splitString` does not split on trailing separators.
2015-12-06 11:49:51 -06:00
Thomas Tuegel
8498f9d46b
elpa-packages 2015-12-06
2015-12-06 11:49:50 -06:00