Commit Graph
47 Commits
Author SHA1 Message Date
aszlig a0c525bd0a gajim: Add gnome3.defaultIconTheme to buildInputs
This is for systems that are not using a full desktop environment, so
Gajim can fall back to the default icon theme of Gnome 3.

Among just fixing aesthetics this also fixes a few exceptions that were
triggered by Gajim not finding the icons. One example of this is when
you enter the plugins dialog, the window is empty if the icons can't be
found.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @abbradar, @Mic92, @7c6f434c
2018-03-25 23:41:21 +02:00
aszlig adb58440e6 gajim: Re-enable tests
Just because the tests need GTK+, I think it's not a good idea to simply
disable them when we're still able to use an X virtual framebuffer to
run them anyway.

As with the package we had prior to version 1.0 I've disabled the
resolver test, because this one requires networking.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @abbradar, @Mic92, @7c6f434c
2018-03-25 23:41:18 +02:00
aszlig ba816ee087 nixos/tests/virtualbox: Work around test failures
I've started digging into the actual cause of the problem a week ago but
didn't continue fixing this.

The reason why the tests are failing is because
torvalds/linux/commit/72f5e08dbba2d01aa90b592cf76c378ea233b00b has
remapped the location of the TSS into the CPU entry area and we did
update our default kernel to version 4.14 in NixOS/nixpkgs@88530e02b6.

Back to VirtualBox: The guru meditation happens in
selmRCGuestTssPostWriteCheck, which I think is only a followup error. I
believe the right location couldn't be determined by VirtualBox and thus
the write check function triggers that panic because it's reading from
the wrong location.

So the actual problem *only* surfaces whenever we use software
virtualization, which we do for our tests because we don't have nested
virtualization available.

Our tests are also for testing the functionality of VirtualBox itself
and not certain kernel versions or kernel features, so for the time
being and until this is fixed, let's actually use kernel version 4.9 for
the guests within the VM tests. Kernel 4.9 didn't have the mentioned
change of the TSS location and thus the tests succeed.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @dtzWill
2018-03-13 22:00:56 +01:00
aszlig 7f26c1b7fb nixos/tests/keymap: Remove OCR-friendly SLiM theme
The test doesn't use OCR, so we actually don't need an OCR-friendly
theme here.

Signed-off-by: aszlig <aszlig@nix.build>
2018-03-06 04:25:53 +01:00
aszlig 0811e7f60e nixos/netboot: Fix evaluation error
The function arguments for make-squashfs.nix have changed in
df117acab7, so we need to change them here
as well.

The boot.netboot NixOS VM test now succeeds again.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @edolstra
2018-03-03 19:31:19 +01:00
aszlig 88530e02b6 systemd: Update to latest NixOS branch
Updated to the latest version of the nixos-v237 branch, which fixes two
things:

  * Make sure that systemd looks in /etc for configuration files.
    https://github.com/NixOS/systemd/pull/15
  * Fix handling of the x-initrd.mount option.
    https://github.com/NixOS/systemd/pull/16

I've added NixOS VM tests for both to ensure we won't run into
regressions. The newly added systemd test only tests for that and is by
no means exhaustive, but it's a start.

Personally I only wanted to fix the former issue, because that's the one
I've been debugging. After sending in a pull request for our systemd
fork (https://github.com/NixOS/systemd/pull/17) I got a notice from
@Mic92, that he already fixed this and his fix was even better as it's
even suitable for upstream (so we hopefully can drop that patch
someday).

The reason why the second one came in was simply because it has been
merged before the former, but I thought it would be a good idea to have
tests for that as well.

In addition I've removed the sysconfdir=$out/etc entry to make sure the
default (/etc) is used. Installing is still done to $out, because those
directories that were previously into sysconfdir now get into
factoryconfdir.

Quote from commit NixOS/systemd@98067cc806:

  By default systemd should read all its configuration from /etc.
  Therefore we rely on -Dsysconfdir=/etc in meson as default value.
  Unfortunately this would also lead to installation of systemd's own
  configuration files to `/etc` whereas we are limited to /nix/store. To
  counter that this commit introduces two new configuration variables
  `factoryconfdir` and `factorypkgconfdir` to install systemd's own
  configuration into nix store again, while having executables looking
  up files in /etc.

Tested this change against all of the NixOS VM tests we have in
nixos/release.nix. Between this change and its parent no new tests were
failing (although a lot of them were flaky).

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @Mic92, @tk-ecotelecom, @edolstra, @fpletz
Fixes: #35415
Fixes: #35268
2018-03-03 10:39:38 +01:00
aszlig ae7efee4fa systemd: Reident the expression file
The indenting is a bit weird to follow, especially at the end of the
file (right brace without indent, but the opening brace is indented by
two spaces).

No functional change and I've verified this by building it with this
change and without and both lead to the same store paths.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @fpletz, @edolstra
2018-03-03 01:53:16 +01:00
aszlig 810318a622 redshift: Don't remove icon-theme.cache
This is done already in the setup hook of hicolor-icon-theme itself, so
no need to do it again.

Since the removal in the redshift derivation is in postFixup (as opposed
to the removal done by the setup hook in preFixup) and it's also not
using the -f flag of rm, the build fails.

Signed-off-by: aszlig <aszlig@nix.build>
2018-03-01 05:37:18 +01:00
aszlig 1cba74dfc1 setup-hooks: Add autoPatchelfHook
I originally wrote this for packaging proprietary games in Vuizvui[1]
but I thought it would be generally useful as we have a fair amount of
proprietary software lurking around in nixpkgs, which are a bit tedious
to maintain, especially when the library dependencies change after an
update.

So this setup hook searches for all ELF executables and libraries in the
resulting output paths after install phase and uses patchelf to set the
RPATH and interpreter according to what dependencies are available
inside the builder.

For example consider something like this:

stdenv.mkDerivation {
  ...
  nativeBuildInputs = [ autoPatchelfHook ];
  buildInputs = [ mesa zlib ];
  ...
}

Whenever for example an executable requires mesa or zlib, the RPATH will
automatically be set to the lib dir of the corresponding dependency.

If the library dependency is required at runtime, an attribute called
runtimeDependencies can be used to list dependencies that are added to
all executables that are discovered unconditionally.

Beside this, it also makes initial packaging of proprietary software
easier, because one no longer has to manually figure out the
dependencies in the first place.

[1]: https://github.com/openlab-aux/vuizvui

Signed-off-by: aszlig <aszlig@nix.build>
Closes: #34506
2018-02-10 00:27:24 +05:30
aszlig 855e66860a gajim: 0.16.8 -> 0.16.9
Upstream changes:

  * Improve Zeroconf behavior
  * Fix showing normal message event
  * remove usage of OpenSSL.rand
  * a few minor bugfixes

The really important part here is the third point about OpenSSL.rand,
because the rand attribute no longer exists in pyopenssl and thus Gajim
doesn't even start.

Also the fix-tests.patch has been fixed upstream as well, so we don't
need it anymore.

Another change in 0.16.9 that's not included in the changelog is that
there is a test_nogui target, which is also run by the CI upstream is
using, so let's use that and remove xvfb_run.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @7c6f434c, @Mic92
2018-02-09 16:22:42 +01:00
aszlig 2a09b4275c nixos/tests/make-test.nix: Fix eval error
Regression introduced by 943592f698.

The lib attribute isn't in scope here, so we need to use pkgs.lib
instead for isFunction.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @shlevy
2018-02-02 17:44:08 +01:00
aszlig f96aafd403 virtualbox: 5.2.4 -> 5.2.6
Upstream changes without issue IDs:

 * GUI: fixed occasional screen corruption when host screen resolution
        is changed
 * User interface: increase proposed disk size when creating new VMs for
                   Windows 7 and newer
 * User interface: various improvements for high resolution screens
 * VMM: Fixed problems using 256MB VRAM in raw-mode VMs
 * Audio: implemented support for audio playback and recording for macOS
          guests
 * Audio: further timing improvements for Windows 10 guests
 * Linux hosts: fixed problem accessing mini-toolbar under XFCE

The full changelog including issue IDs can be found at:

https://www.virtualbox.org/wiki/Changelog#v6

What was not mentioned in the changelog is that this release fixes
compiling the VirtualBox modules against kernel 4.15, which was added in
commit 61043ad4d1.

Tested this by running all of the tests in nixos/tests/virtualbox.nix.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @flokli, @svanderburg
2018-01-31 23:38:35 +01:00
aszlig b3970e7f5c mumble: Fix build with boost version 1.66
This is already tracked in upstream issue mumble-voip/mumble#3281 and a
fix has been merged in mumble-voip/mumble@caa187373e.

The patch I'm adding here is using the merged commit
mumble-voip/mumble@ea861fe867 and I've
only added it for the stable release because the patch is already
included in the git version.

@pbogdan also had a similar commit to this
(pbogdan/nixpkgs@8029edea29), but the
patch was applied to both stable and git and thus the git version would
have been broken.

Tested by building mumble and mumble_git and running the mumble NixOS VM
test.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @viric, @jgeerds, @abbradar
Fixes: #33655
2018-01-31 17:39:01 +01:00
aszlig 2e4aded366 beets-alternatives: Fix tests against beets 1.4.6
Since the bump of beets to version 1.4.6 in e5fab33efd
the tests no longer run successfully because beets 1.4.6 introduces a
breaking API change for the Item.move() method which now instead of just
passing copy=True the operation is now passed using a different
"operation" keyword argument.

Unfortunately the original repository of beets-alternatives is
unmaintained since 3 years and thus there is no upstream fix available
at the moment.

However, there is a fork maintained by @wisp3rwind, which addresses this
problem (wisp3rwind/beets-alternatives@33c6525ed4)
and a bunch of other fixes.

The reason why I'm not using the patch from @wisp3rwind is that it
simply doesn't apply against beets-alternatives 0.8.2, but my patch here
essentially does the same.

Signed-off-by: aszlig <aszlig@nix.build>
Upstream issue: geigerzaehler/beets-alternatives#13
Cc: @Profpatsch
2018-01-31 04:39:21 +01:00
aszlig 5c83aed32d linux-testing: 4.15-rc3 -> 4.15-rc4
Built successfully on x86_64-linux.

I've verified the contents of the tarball by comparing its contents
against the tag of my local checkout. Furthermore, I've checked the GPG
signature of the tag.

Signed-off-by: aszlig <aszlig@nix.build>
2017-12-18 05:54:47 +01:00
aszlig cbd4d0e3f5 python/qrcode: Add mock to checkInputs
Another test issue surfacing from the setuptools bump in
70c1899768.

This time, the tests just fail because mock is missing as a dependency.

Tested building against Python 2.7 and Python 3.6.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @joachifm, @Mic92
2017-12-11 12:05:31 +01:00
aszlig 1c1a555438 python-axolotl: Disable tests for Python 2.x
The bump of setuptools from version 36.7.1 to 38.2.3 (commit
70c1899768) has caused the axolotl tests
to suddenly being run.

As the comment prior to the doCheck attribute states, we're using
pycryptodome so the tests are expected to fail even on Python 2.7 but
because of the version bump mentioned above, the tests didn't run and
thus the build didn't fail during when commit
094ac2d9b1 was made.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @abbradar, @Mic92
2017-12-11 11:38:21 +01:00
aszlig 05f159b624 linux-testing: 4.15-rc2 -> 4.15-rc3
Built successfully on x86_64-linux.

I've verified the contents of the tarball by comparing its contents
against the tag of my local checkout. Furthermore, I've checked the GPG
signature of the tag.

Signed-off-by: aszlig <aszlig@nix.build>
2017-12-11 10:36:51 +01:00
aszlig 6841064ac5 python/hetzner: 0.7.5 -> 0.8.0
New features:

 * Support for retrieving reverse PTRs.
 * Support for subnet-ranges.
 * Add logging (aszlig/hetzner#14).

Fixes:

 * Hide internal methods from the public API.
 * Fix Python 3 compatibility.
 * Fix for creating admin accounts with Hetzner's new login site.
 * Fix __repr__/__str__ issue with some exceptions (aszlig/hetzner#23).
 * Fix login for RobotWebInterface

Changes for the hetznerctl utility:

 * show: Show subnets
 * show: Show reverse PTRs
 * New 'rdns' subcommand for getting/setting/removing reverse-PTRs.
 * Use 'argparse' instead of 'optparse'.
 * Add command for managing admin accounts.
 * New '--debug' flag for printing debugging information.

This also fixes NixOS/nixops#778.

Tested building against Python 2.7 and Python 3.6.

Signed-off-by: aszlig <aszlig@nix.build>
2017-12-04 06:38:19 +01:00
aszlig d747c27387 linux-testing: 4.15-rc1 -> 4.15-rc2
Built successfully on x86_64-linux.

I've verified the contents of the tarball by comparing its contents
against the tag of my local checkout. Furthermore, I've checked the GPG
signature of the tag.

Signed-off-by: aszlig <aszlig@nix.build>
2017-12-04 05:24:37 +01:00
aszlig f62c87b45f linuxPackages: Revert accidental bump to 4.14
Regression introduced by e5c24abf3b.

I've added this for my WIP tests and forgot to reset them out of the
mentioned commits.

Signed-off-by: aszlig <aszlig@nix.build>
2017-11-24 23:13:41 +01:00
aszlig e5c24abf3b virtualbox: 5.2.0 -> 5.2.2
Upstream changes without issue IDs:

 * User interface: various improvements for high resolution screens
 * User interface: added functionality to duplicate optical and floppy
                   images
 * User interface: various improvements for the virtual media manager
 * VMM: fixed emulation so that Plan 9 guests can start once more (5.1.0
        regression)
 * Storage: fixed regression breaking iSCSI
 * Audio: added HDA support for more exotic guests (e.g. Haiku)
 * Serial: fixed hanging I/O when using named pipes on Windows (5.2.0
           regression)
 * Serial: fixed broken communication with certain devices on Linux
           hosts
 * USB/OHCI: improved behavior so that the controller state after a VM
             reset is closer to the initial state after VM start
 * EFI: fixed HFS+ driver which in rare cases failed to access most
        files on a volume
 * Shared clipboard: fixed hang with OS X host and Linux guest
 * Linux hosts: fixed kernel module compilation and start failures with
                Linux kernel 4.14
 * X11 hosts: better handle WM_CLASS setting
 * Linux guests: fixed kernel module compilation and other problems with
                 Linux kernel 4.14
 * Linux guests: fixed various 5.2.0 regressions
 * Bridged networking: fixed duplicate EtherType in VLAN/priority tags
                       on Linux (5.2.0 regression)

The full changelog including issue IDs can be found at:

https://www.virtualbox.org/wiki/Changelog

Aside from just bumping the version number I also had to strip 3 levels
of the paths included in the guest-additions patches, because the
version was hardcoded in there and the patches still apply as-is.

I've re-added the stripped path using patchFlags and the -d option of
the patch utility.

Tested this by running all of the tests in the "virtualbox" NixOS VM
test module, here is the URL to the finished evaluation on my Hydra:

https://headcounter.org/hydra/eval/380191

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @NeQuissimus, @orivej, @etu, @vcunat
Issue: https://github.com/NixOS/nixpkgs/issues/31640
Issue: https://github.com/NixOS/nixpkgs/pull/31037
2017-11-24 23:10:57 +01:00
aszlig 73746502d8 tomahawk: Mark as unmaintained by upstream
The upstream commit tomahawk-player/tomahawk@c838959248
changed the project's README to state that the project has been
abandoned, quote:

   This project is essentially abandoned

   There is noone working on it. There isn't much sense in adding any
   new issues in the issue tracker unless you want to fix them yourself.

So I'm adding a note in the description and essentially remove my
maintainership as well.

Signed-off-by: aszlig <aszlig@nix.build>
2017-11-21 08:55:55 +01:00
aszlig a8199e79f4 tomahawk: Pin boost to version 1.55
The dependency of boost propagated by Lucene++ is version 1.55, so this
leads to a segfault during startup because we get mixed library versions
with boost 1.62 and 1.55 in the binary.

I've tested running Tomahawk before and after this change and the change
indeed fixes the problem.

Signed-off-by: aszlig <aszlig@nix.build>
Fixes: #17598, #19238
2017-11-21 08:54:58 +01:00
aszlig f6ae3948bc tests/boot-stage1: Fix build of kcanary module
In bfe9c928c1 the default kernel has been
updated to version 4.14 and the declarations for allow_signal() and
signal_pending() are no longer exposed via kthread.h, so let's actually
use the right header files.

I've added a condition for kernel 4.10 and upwards to include the
linux/sched/signal.h header file, because that got introduced in version
4.10. Even if the declaration would still reside in kthread.h (I haven't
checked) for version 4.10 it won't hurt and the compilation will still
succeed.

Tested against kernel 4.9 and 4.14 and the build now succeeds.

Signed-off-by: aszlig <aszlig@nix.build>
2017-11-14 04:36:19 +01:00
aszlig cc17b42dc7 lib/maintainers: Update my email address
I'm no longer employed there and I'll phase out the address in the near
future.

Signed-off-by: aszlig <aszlig@nix.build>
2017-11-13 10:14:10 +01:00
aszlig 4cf16937ce opencascade: Fix build against glibc 2.26
The header file xlocale.h has been removed in glibc 2.26.

Quoting the release notes[1]:

  * The nonstandard header <xlocale.h> has been removed. Most programs
    should use <locale.h> instead. If you have a specific need for the
    definition of locale_t with no other declarations, please contact
    libc-alpha@sourceware.org and explain.

Tested by building on x86_64-linux and it now succeeds.

[1]: https://sourceware.org/ml/libc-alpha/2017-08/msg00010.html

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @viric
2017-11-13 10:14:05 +01:00
aszlig 0e790b9f66 nixos/atlassian: Fix eval error in jrePackage
The error got introduced by 4f3d971ef5,
which removed the *Text attributes from the option.

This in turn leads to an evaluation error while building the
manual/manpage, because oraclejre8 is marked unfree.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @jbgi, @orivej, @globin
2017-11-09 20:31:41 +01:00
aszlig 8c5a3d86ae paperwork-backend: Move into its own file
This package is most likely only used by Paperwork and thus it makes
sense to put it next to the main expression of Paperwork.

No functional changes here, evaluating before this commit and afterwards
leads to the same derivation hash.

Signed-off-by: aszlig <aszlig@nix.build>
2017-11-09 19:34:43 +01:00
aszlig 35f78e8d1a paperwork-backend: Add myself to maintainers
Both Paperwork and its backend API are very likely to be updated in par,
but even when not whenever I work on Paperwork I'll check the backend as
well.

Signed-off-by: aszlig <aszlig@nix.build>
2017-11-09 19:34:41 +01:00
aszlig 2e4fc45902 paperwork(-backend): Fix meta.homepage
While updating Paperwork in 1b1cc34020 I
actually changed the GitHub URL to its new location.

However, the actual homepage of Paperwork is https://openpaper.work/ so
let's use that instead of the GitHub URL.

Signed-off-by: aszlig <aszlig@nix.build>
Reported-by: @volth
2017-11-09 19:34:38 +01:00
aszlig 1b1cc34020 paperwork(-backend): 1.2 -> 1.2.1
Upstream changes:

  Paperwork-GUI 1.2.1:

   * Add source code of Windows installer (NSIS installer) generator
   * Scanner support / Multi-scan: Cancel also successful scan session.
     Otherwise some scanner won't allow new scan sessions later.
   * Remove gi version warnings when starting (thanks to Matthieu
     Coudron)
   * Documentation: Add missing stdeb dependencies (thanks to Notkea)
   * paperwork-shell: Fix command 'scan'
   * paperwork-shell install: add docstring
   * Fix dialog 'about'

  Paperwork-backend 1.2.1:

   * paperwork-shell: improve help string of 'paperwork-shell chkdeps'
   * Fix label deletion / renaming
   * Windows: Fix FS.safe() when used for PDF import
   * Windows: Fix FS.unsafe() (used for PDF export)

Full upstream changelog can be found at:

https://github.com/openpaperwork/paperwork/releases/tag/1.2.1

Successfully tested building and running Paperwork with a few test
scans.

Signed-off-by: aszlig <aszlig@nix.build>
2017-11-09 07:35:45 +01:00
aszlig c1d12e1120 python/pyinsane2: 2.0.9 -> 2.0.10
Upstream changes:

  * Now works with 'setup.py develop' (thanks to Matthieu Coudron)
  * WIA: Some drivers (Lexmark for instance) returns
    WIA_ERROR_PAPER_EMPTY when calling transfer->Download() instead of
    returning a shorted image (like HP)
  * MacOSX + Sane: disable dedicated process workaround (doesn't work)
  * WIA: Minor optimisation (Use collections.deque() instead of
    list.pop())
  * Sane/exit(): Exit gracefully

Full changelog can be found at:

https://github.com/openpaperwork/pyinsane/blob/2.0.10/ChangeLog

Tested by building and running a few scans.

Signed-off-by: aszlig <aszlig@nix.build>
2017-11-09 07:35:43 +01:00
aszlig e13c6645b1 python/natsort: Skip some tests with Python 3.[56]
Since the update to Python 3.6.3 in f906d6d18e
some of the Hypothesis tests in natsort suddenly begin to fail with
errors like this one:

res = '\x00\x00', f = <built-in function strxfrm>

>   return partial(reduce, lambda res, f: f(res), functions)
E   ValueError: embedded null character

The tests didn't fail with Python 3.6.2, but they did fail with Python
3.5 already.

I didn't dig through what the exact problem was, but I'd guess that the
problem could lie in Hypothesis itself. Unfortunately updating to the
latest version of Hypothesis didn't turn out to be that easy as well,
because the newer versions have a circular dependency on pytest and a
few other libraries.

So I opted against updating Hypothesis for now and just mark the tests
as "expected to fail" on purpose so that whenever we someday have a
newer version of Hypothesis, the build for natsort will fail and we can
remove this patch again.

Tested against Python 2.7, 3.4, 3.5 and 3.6 and all of the builds now
succeed.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @jluttine, @FRidh
2017-11-09 06:54:53 +01:00
aszlig 63a47699f7 cuneiform: Fix build against glibc 2.26
Since glibc 2.26 the string.h file includes <strings.h>, which in case
of cuneiform will include the strings.h found in Kern/hhh/tigerh/h,
because of the search path order.

Fortunately for us the strings.h in cuneiform are completely unused and
no files reference or include it. I even checked various references to
types within strings.h and the only occurences are in cf_strings.h,
which is also included by other files.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @7c6f434c
2017-11-09 06:06:32 +01:00
aszlig 2a894cd2d1 lxc: Fix build error with glibc 2.26
This issue doesn't necessarily have to do with glibc 2.26 and it could
have been fixed if we'd replace -Werror with -Wall.

The error in question was:

storage/overlay.c:808:13: error: 'dirlen' may be used uninitialized in
this function [-Werror=maybe-uninitialized]

After looking at the code in overlay.c it indeed might use dirlen
unitialized.

Unrelated to the glibc upgrade which brought the problem to the surface,
this also has been fixed upstream at lxc/lxc@180c477a32.

The reason however, that led to the upstream fix was a segfault which
has been reported at lxc/lxc#1802.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @wkennington, @globin, @fpletz
2017-11-09 02:21:00 +01:00
aszlig e5bda9399d netsniff-ng: Fix build against glibc 2.26
The build fails first of all because it cannot find the function body
for __builtin_memset. In glibc 2.26 this is available via inclusion of
string.h.

Another failure was that UINT64_MAX wasn't available in staging/tools.c,
which is fixed again by inclusion of stdint.h.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @nckx
2017-11-09 01:34:57 +01:00
aszlig 44cb95a234 llvmPackages/libc++: Fix build against glibc 2.26
This is very similar to what we had in bb0b0822ef.

The xlocale.h header is no longer existing in glibc version 2.26, so we
need to avoid including it.

I've tested building against all of the libcxx attributes of LLVM 3.5,
3.7, 3.8, 3.9, 4 and 5.

All of them succeeded except version 3.5, which failed because of an
unrelated issue (build of libc++abi has failed, one of its
dependencies), so I only verified whether the patch applies cleanly.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @vcunat
2017-11-08 22:08:11 +01:00
aszlig 33b0b5ed1d anki: Fix hash of the source tarball
Searching the web for the base-16 encoded hash of the one we have in the
Nix expression didn't give any results and I also couldn't find the
older tarball anywhere (even the mirrors I've checked don't have it).

So checking the updated hash I've found that other distros use this, so
I'd bet it's safe to do this.

I've tested building the package but I didn't do any runtime test.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @the-kenny
2017-11-08 21:12:22 +01:00
aszlig a2045e029a libstdc++5: Add patch to fix type for ucontext_t
Since glibc 2.26, struct ucontext no longer exists but is wrapped in a
typedef ucontext_t.

This is basically a backport of the patch to gcc version 4.5 which was
introduced by @vcunat in f04b64c1e9.

Building against x86_64-linux and i686-linux now succeeds.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @abbradar
2017-11-08 20:52:20 +01:00
aszlig bb0b0822ef neko: Fix build against glibc 2.26
The header file xlocale.h has been removed in glibc 2.26.

Quoting the release notes[1]:

* The nonstandard header <xlocale.h> has been removed. Most programs
  should use <locale.h> instead. If you have a specific need for the
  definition of locale_t with no other declarations, please contact
  libc-alpha@sourceware.org and explain.

I've backported HaxeFoundation/neko@e286c8f330
against version 2.1.0 and the build now succeeds.

Signed-off-by: aszlig <aszlig@nix.build>
2017-11-08 16:05:19 +01:00
aszlig 845aae9c10 clisp: Add patch to remove reference to cfree
Fixes the build failure after the upgrade to glibc 2.26 in
9bb67d5c1e.

From the cfree(3) manpage:

This function should never be used. Use free(3) instead. Starting with
version 2.26, it has been removed from glibc.

From the glibc 2.26 release notes[1]:

* The obsolete function cfree has been removed.  Applications should use
  free instead.

[1]: https://sourceware.org/ml/libc-alpha/2017-08/msg00010.html

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @7c6f434c, @tohl
2017-11-08 15:52:25 +01:00
aszlig b9b5942e2b uqm: Remove the -lgcc_s hack
This is no longer needed and I've verified this by building and running
the game.

Signed-off-by: aszlig <aszlig@nix.build>
2017-11-08 06:48:57 +01:00
aszlig 7603da33de uqm: Fix build against glibc 2.26
I've bisected the introduction of the build failure to be the glibc 2.26
upgrade with commit 9bb67d5c1e.

At first I was somewhat stumped why an glibc update could cause
undeclared identifiers, but after looking at the changes of glibc and
the source code of The Ur-Quan Masters the problem quickly turned out to
be this very change:

https://sourceware.org/git/?p=glibc.git;a=commit;h=7b037c095e31c2396d0a9b0e6356bc566ee4812f

So string.h now in turn includes strings.h, which in theory wouldn't be
a problem.

However, both strings.h and the strings.h in the uqm source code use
constant _STRINGS_H, which causes the glibc strings.h to be included but
the one from uqm basically includes an empty file.

Signed-off-by: aszlig <aszlig@nix.build>
2017-11-08 06:48:15 +01:00
aszlig 3429d8cbbf uqm: Clean up package expression style
The only functional change here is that I've dropped unzip, because that
dependency doesn't seem to be necessary at all. Despite the broken build
state I've tried building and running The Ur-Quan Masters with an older
nixpkgs revision and it works fine.

Other than that there are no references in the source code for unzip
except in the binary installer and some of the INSTALL files.

The reason why I'm removing the "with pkgs.lib;" is that it makes it
easier to quickly check for errors with "nix-instantiate --parse".

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @jcumming
2017-11-08 05:55:35 +01:00
aszlig 316de025d1 python/meliae: Fix version string for download URL
While the version listed on PyPI is "0.4.0.final.0", the actual tarball
however is called just "meliae-0.4.0.tar.gz", which is the same *name*
(but different hash) as the one before the update in
7ce848309e.

Here is the PyPI page for reference:

https://pypi.python.org/pypi/meliae/0.4.0.final.0

After checking the tarballs contents, the version string however *is*
"0.4.0.final.0", so I'm only changing the version in the download URL
rather than in the version attribute.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @FRidh
2017-11-05 06:47:20 +01:00
aszlig 74260a4922 vim: 8.0.1150 -> 8.0.1245
This update contains a lot of fixes that are too much to be summarized
here, so here is the upstream changelog (basically "git log"):

https://github.com/vim/vim/commits/v8.0.1250

The main reason for this bump is that I got annoyed by a bug that was
fixed in upstream version 8.0.1194, which caused a race condition during
vim startup when it's trying to retrieve background colors from the
terminal.

Sometimes it could happen that random commands are executed at Vim
startup (typically pasting the "" buffer) and after bisecting I've found
out that version 8.0.1194 indeed fixed this problem.

The reason why I'm updating to version 8.0.1250 is that when looking
through the Git log it contains a whole lot of fixes but no new
features, so I'd assume it's safe to upgrade.

I've tested all packages that depend on Vim and they still succeed
building. In addition to that I've used the new version for a couple of
hours without any issue.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @lovek323, @LnL7, @vaibhavsagar
2017-11-03 15:19:06 +01:00