3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

75774 commits

Author SHA1 Message Date
Thomas Tuegel 61436c90e2 emacsPackagesNg: prefer melpaStablePackages to elpaPackages
Both package sets are stable, but elpaPackages is an ad hoc set, so we
should prefer melpaStablePackages.
2016-01-18 15:29:16 -06:00
Thomas Tuegel 7c42f9a200 melpa-stable-packages 2016-01-18
The MELPA Stable package expressions are now generated in one file to
improve evaluation performance.
2016-01-18 15:29:10 -06:00
Thomas Tuegel 3bd6edf0e2 melpa-packages 2016-01-18
The MELPA package expressions are now generated in a single file to
improve evaluation performance.
2016-01-18 15:28:28 -06:00
Thomas Tuegel 93bd5a2c32 elpa-packages 2016-01-18
The ELPA package expressions are now generated as a single file to
improve evaluation performance.
2016-01-18 15:27:15 -06:00
Damien Cassou 61d7fde27c Merge pull request #12425 from DamienCassou/pharo-vm-no-conflict-v3
Refactor Pharo to allow co-installation of VMs
2016-01-18 20:40:30 +01:00
Arseniy Seroka 05fe3faced Merge pull request #12455 from mogorman/paho-mqtt
paho-mqtt: init at 1.1
2016-01-18 22:21:45 +03:00
Damien Cassou d422861055 Refactor Pharo to allow co-installation of VMs 2016-01-18 20:14:19 +01:00
Matthew O'Gorman 34c1f87750
paho-mqtt: init at 1.1 2016-01-18 13:35:07 -05:00
Tobias Geerinckx-Rice a07e5839af snapper: use autoreconfHook 2016-01-18 19:32:48 +01:00
Michael Raskin c983078735 Merge pull request #12454 from otwieracz/pioneer
pioneer: nixpkg added
2016-01-18 18:20:09 +00:00
Gleb Peregud 940dfc238f Merge pull request #2 from ericbmerritt/erlang-improvements
rebar3: refactor to make hermetic
2016-01-18 19:17:36 +01:00
Tobias Geerinckx-Rice 6c2b00bcb2 Merge pull request #12452 from Profpatsch/snapper
snapper: 0.2.4 -> 0.2.8
2016-01-18 19:13:59 +01:00
Slawomir Gonet 2ad985f3ed pioneer: nixpkg added 2016-01-18 19:03:35 +01:00
Vladimír Čunát 4c1e9ffd12 gmock: refactor source 2016-01-18 18:45:03 +01:00
Nikolay Amiantov 148396c022 systemd service: add *.busname upstream units 2016-01-18 19:42:25 +03:00
Eric Merritt 8021b5241c rebar3: refactor to make hermetic
This adds changes to the rebar3 expression that patch rebar3 to force it
to be hermetic. Now, by default, rebar3 literally can't download
anything. A 'rebar3-open' expression was added for those folks whe want
the normal rebar3.
2016-01-18 08:19:15 -08:00
Profpatsch 9a1f430e53 snapper: 0.2.4 -> 0.2.8 2016-01-18 16:16:29 +01:00
Vladimír Čunát b4052f0a1e vte: remove the forgotten patch 2016-01-18 16:03:56 +01:00
Rickard Nilsson ce543ebf27 elasticsearch: Fix some startup warnings 2016-01-18 15:57:59 +01:00
Rickard Nilsson d6f9f13512 bosun: Create ledisDir in pre-start script 2016-01-18 15:57:59 +01:00
Vladimír Čunát 45bf78373e termite: fix up the business with vte patching
I didn't see nice patches to apply,
so I exchanged the whole source (-> autoreconf).

/cc maintainer: k0ral. BTW, it's practical to have the maintainers attribute
match the github name exactly so that people know how to /cc you.
2016-01-18 15:57:41 +01:00
Franz Pletz 5160c8887e Merge pull request #12199 from jgillich/torbrowser-desktop
torbrowser: add .desktop file
2016-01-18 15:28:43 +01:00
Tobias Geerinckx-Rice 5cf03589a4 geolite-legacy 2016-01-11 -> 2016-01-18 2016-01-18 15:22:40 +01:00
Franz Pletz 501f9166b1 Merge pull request #12407 from jgillich/chats
xmpp-client, ricochet
2016-01-18 15:15:59 +01:00
Vladimír Čunát 72e6e6a483 tarball: fix evaluation of mdadm on darwin
It probably doesn't make any sense to have mdadm on darwin,
but we have to "fail in a right way".
2016-01-18 15:05:38 +01:00
Tobias Geerinckx-Rice b9cc08c7c2 Merge pull request #12449 from nckx/update-vbox
virtualbox: 5.0.10 -> 5.0.12
2016-01-18 15:05:09 +01:00
Jakob Gillich 87c3063d68 torbrowser: 5.0.6 -> 5.0.7, add desktop file 2016-01-18 14:47:33 +01:00
Tobias Geerinckx-Rice 9609eb8d10 btrfs-progs: 4.3.1 -> 4.4
Bugfixes:
- chunk recovery: fix floating point exception
- chunk recovery: endianity bugfix during rebuild
- mkfs with 64K pages and nodesize reported superblock checksum mismatch
- check: properly reset nlink of multi-linked file

Too many changes to list here. See:
https://btrfs.wiki.kernel.org/index.php/Changelog#By_version_.28btrfs-progs.29
2016-01-18 14:46:40 +01:00
Franz Pletz ca3af3ce88 pythonPackages.frozendict: Remove duplicate declaration 2016-01-18 14:19:56 +01:00
Franz Pletz 55fc3acfcb Merge pull request #12159 from rasendubi/ycmd
ycmd: Init at 2016-01-12
2016-01-18 14:11:22 +01:00
Vladimír Čunát 9fc8766eaf telepathy-qt: fixup build with qt5
I only tested building with qt4, which turned out to be a mistake.
2016-01-18 12:25:27 +01:00
taku0 fba7544812 firefox-bin: wrap firefox-bin (close #12416) 2016-01-18 10:42:57 +01:00
Vladimír Čunát 1a4ab04e29 Merge branch 'staging'
There are some darwin failures
https://github.com/NixOS/nixpkgs/commit/a3dcb3051#commitcomment-15482351
but also pre-built libxml2 security fixes.
2016-01-18 10:02:48 +01:00
vbgl 877d9af793 Merge pull request #12451 from eduarrrd/photoqt
photoqt: fix breakage from qt infrastucture transition
2016-01-18 09:56:01 +01:00
Vladimír Čunát 620c147cce Merge branch 'master' into staging 2016-01-18 09:48:49 +01:00
vbgl c23b0856fd Merge pull request #12064 from FlorentBecker/eliom42
Eliom42
2016-01-18 09:32:48 +01:00
Eduard Bachmakov 352ff0be29 protobuf: 3.0.0-alpha-3.1 -> 3.0.0-beta-2
Also split out gmock's source so that it can be copied into protobuf's
source. Hopefull this hack can be removed again once gmock is replaced
by gtest.

This does not include python bindings.
2016-01-18 00:43:21 -05:00
Tobias Geerinckx-Rice 3f10b2874f Merge pull request #12450 from eduarrrd/pshs
pshs: 0.2.6 -> 0.3
2016-01-18 04:55:25 +01:00
Eduard Bachmakov 0e55c43718 photoqt: fix breakage from qt infrastucture transition 2016-01-17 22:53:25 -05:00
Eduard Bachmakov f3ae60295f pshs: 0.2.6 -> 0.3 2016-01-17 22:44:48 -05:00
Tobias Geerinckx-Rice 34dc7fe49f simple-scan: 3.19.3 -> 3.19.4 2016-01-18 04:26:09 +01:00
aszlig 011c149ed5
mdadm: Set allowedReferences to only include libc.
The updates we had in the past (7719f7f and 1faf610) broke the mdadm
installer test and systems in the wild using mdraid because newer mdadm
versions contained a self-referenc to its own store path.

Instead of putting a big warning about updating in the package
expression, let's just add allowedReferences so the build immediately
fails if there is a self-reference.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-01-18 04:21:16 +01:00
aszlig 5e227e6f1d
mdadm: Clean up package expression.
Let's use makeFlags directly instead of stitching together a
makeFlagsArray in preBuild.

This should make the expression much more readable and clean.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-01-18 04:21:16 +01:00
aszlig bcd31d0acb
mdadm: 3.3 -> 3.3.4
Okay, this update is a bit more tricky and the patch I've included is
not very nice to be honest.

So the patch causes "mdadm --udev-rules" to search for the right store
path using /proc/self/exec. This has the disadvantage that we could end
up having /run/current-system/bin/mdadm in the rule file.

But on the other hand, when we're on NixOS, we don't need to use that
command *at*all*, so we should be safe.

The patch also sets BINDIR to /sbin, which causes the included rule and
systemd files to not work out of the box on NixOS. But we have a
substituteInPlace where we do rewrite /sbin/mdadm to the right store
path in our udev rule generator, so that shouldn't be an issue.

I've tested this using the mdraid installer test and it succeeded.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-01-18 04:21:15 +01:00
Tobias Geerinckx-Rice b01b11c657 virtualbox: 5.0.10 -> 5.0.12
This is a maintenance release.
Changes: https://www.virtualbox.org/wiki/Changelog.
2016-01-18 03:57:09 +01:00
aszlig bfb11fd030
buildEnv: Skip content check on ignoreCollisions.
Checking file contents is redundant in this case, because we will go
ahead anyway, regardless of whether the content is the same.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-01-18 03:56:09 +01:00
aszlig 4529ed1259
buildEnv: Check the content of colliding paths.
Originally wanted to include ignoreCollisions in cups-progs, but I think
it's better if we use ignoreCollisions only if there are _real_
collisions between files with different contents.

Of course, we also check whether the file permissions match, so you get
a collision if contents are the same but the permissions are different.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-01-18 03:54:22 +01:00
Tobias Geerinckx-Rice 48fad440f1 Merge pull request #12448 from jb55/terra-patch
terra: init at git-2016-01-06
2016-01-18 03:48:36 +01:00
aszlig 85dd89f6eb
chromium: Remove myself from maintainers
Working on Chromium really drives me nuts due to its build time, also I
really don't have quite a lot of time these days to properly maintain it
anymore.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-01-18 03:35:28 +01:00
aszlig 38c77bb72c
chromium: Do not rely on import-from-derivation
This has been introduced by me in 690a845 and discovered by @vcunat in
his comment over at:

690a845de9 (commitcomment-14209868)

It's really a bit ugly to have builds running during evaluation, but
back when I made that commit the reason was to avoid having to shell
quote the hell out of it (see the comment in mkPluginInfo for the
reason).

Now we propagate plugin flags and environment variables as a list of
arguments in a plain file that's appended verbatim to makeWrapper, so
it shouldn't do any builds anymore during instantiation.

I have tested this with both just WideVine and just Flash enabled as
well as both in combination and none of the plugins and the output seems
correct. However I didn't test to run Chromium with the new
implementation.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Reported-by: Vladimír Čunát <vcunat@gmail.com>
2016-01-18 03:35:28 +01:00