Commit graph

162569 commits

Author SHA1 Message Date
Samuel Dionne-Riel f9b16e60da pythonPackages.protobuf: apply patch for python 3.7 only when building with it
Change introduced in #50672.

The patch does not apply on older protobuf like protobuf3_1

```
$ nix-build -E 'with import ./. { }; python3Packages.protobuf.override { protobuf = protobuf3_1; }'
unpacking sources
unpacking source archive /nix/store/1zdyl0cxaa8ha2v1zp75zzdjd6j99d0m-source
source root is source
setting SOURCE_DATE_EPOCH to timestamp 315619200 of file source/util/python/BUILD
patching sources
applying patch /nix/store/yagx7hvylnnjq7lxbcia0y5lq1r736w3-0a59054c30e4f0ba10f10acfc1d7f3814c63e1a7.patch
patching file google/protobuf/pyext/descriptor.cc
Hunk #1 succeeded at 55 (offset -1 lines).
patching file google/protobuf/pyext/descriptor_containers.cc
patching file google/protobuf/pyext/descriptor_pool.cc
Hunk #1 succeeded at 47 (offset -1 lines).
patching file google/protobuf/pyext/extension_dict.cc
Hunk #1 FAILED at 53.
1 out of 1 hunk FAILED -- saving rejects to file google/protobuf/pyext/extension_dict.cc.rej
patching file google/protobuf/pyext/message.cc
Hunk #1 succeeded at 82 (offset 3 lines).
Hunk #2 succeeded at 1425 (offset -104 lines).
```

Since the patch isn't necessary on python versions older than 3.7, let's
only apply it for version 3.7. This means that most things using older
protobuf implementation will now be able to build when using an older
pythonPackage set (as is most probably the case anyway).

This still leaves protobuf 3.1 using packages hanging, but the errors
will be localized to those that would be breaking anyway with the
upgrade to 3.7 as default python.
2018-12-11 11:30:52 +01:00
Tor Hedin Brønner f07d5d125d
Merge pull request #51861 from hedning/fix-libcouchbase-test
libcouchbase: tests can't run in parallel
2018-12-11 10:52:02 +01:00
Ivan ca8b128aa1 credstash: add standalone Python application (#51807)
credstash was only available as a library. Provide it as a standalone
application as well.

In order for this to work, I needed to remove the copy of
the library that's placed in $out/bin and marked executable
during the install phase. Other than the patched shebang and
executable bit, it's identical to the library that's installed to
$out/lib/python3.7/site-packages.

Before the postFixup has run `wrapPythonPrograms`, $out/bin contains
two Python files -- credstash and credstash.py -- where bin/credstash
is the executable you'd expect a user to invoke from the command-line
and bin/credstash.py contains the credstash module, which bin/credstash
imports.

After `wrapPythonPrograms` has run, bin/credstash is a shell
wrapper around the bin/.credstash-wrapped python entrypoint, and
bin/credstash.py is shell wrapper around bin/.credstash.py-wrapped.
Invoking bin/credstash execs bin/.credstash-wrapped, and that python
script attempts to import the credstash module from bin/credstash.py,
the shell wrapper, rather than either bin/.credstash.py-wrapped or
lib/python3.7/site-packages/credstash.py.

This leads to an error:

    $ credstash get mykey
    Traceback (most recent call last):
      File "/nix/store/hk6yma716w6141lcdh509d6qyyi7zm0i-python3.7-credstash-1.15.0/bin/.credstash-wrapped", line 8, in <module>
        from credstash import main
      File "/nix/store/hk6yma716w6141lcdh509d6qyyi7zm0i-python3.7-credstash-1.15.0/bin/credstash.py", line 2
        export PATH='/nix/store/6lm4gi5iv8fbf1b1mm6g3gfnnv63f1gn-python3-3.7.1/bin:/nix/store/hk6yma716w6141lcdh509d6qyyi7zm0i-python3.7-credstash-1.15.0/bin:/nix/store/2n13gf1zdr39ir5dynxlkqndxgy36g08-python3.7-setuptools-40.4.3/bin:/nix/store/mhnqwpa4y1l81zi4cwx989i8h8z9g67l-python3.7-jmespath-0.9.0/bin:/nix/store/qc6q3a2nv4211wyh7q319v6zzd3ab6pc-python3.7-docutils-0.14/bin'${PATH:+':'}$PATH
                  ^
    SyntaxError: invalid syntax

If we try using `dontWrapPythonPrograms` to resolve this, runtime
dependency lookups fail:

    $ credstash get mykey
    Traceback (most recent call last):
      File "/run/current-system/sw/bin/credstash", line 7, in <module>
        from credstash import main
      File "/nix/store/8rmldlvlv1z1xl7w02dy7f5qhkzdrg8z-python3.7-credstash-1.15.0/bin/credstash.py", line 26, in <module>
        import boto3
    ModuleNotFoundError: No module named 'boto3'

I was able to resolve things by simply removing bin/credstash.py before
the postFixup phase has a chance to wrap any executables. Now the
executable imports the library correctly:

 (shell wrapper)
  bin/credstash
        │      (python executable)
        └─> bin/.credstash-wrapped
                   │                        (python library)
                   └─> lib/python3.7/site-packages/credstash.py
2018-12-11 10:49:27 +01:00
Alyssa Ross 3bfef3fe40
Merge pull request #51862 from Taneb/metamath-update
metamath: 0.167 -> 0.168
2018-12-11 09:43:46 +00:00
Nathan van Doorn 69ee0a80dc metamath: 0.167 -> 0.168 2018-12-11 09:10:06 +00:00
Tor Hedin Brønner 7cadf5f76c libcouchbase: tests can't run in parallel
70e2b0bef0 turned on parallel checking for cmake
by default. This doesn't work for libcouchebase.
2018-12-11 09:51:04 +01:00
Peter Hoeg 796d270f53 platformio: 3.6.1 -> 3.6.2
Broken on aarch64.
2018-12-11 16:37:07 +08:00
Vincent Laporte 1a04bd4414 ocamlPackages.checkseum: init at 0.0.3
Chekseum is an OCaml library which implements ADLER-32 and CRC32C Cyclic
Redundancy Check. It provides 2 implementation, the first in C and the
second in OCaml.

Homepage: https://github.com/mirage/checkseum
2018-12-11 08:12:27 +00:00
Vincent Laporte e9b43adab7 ocamlPackages.optint: init at 0.0.2
This library provide one module Optint which internally uses an int if
you are in a x64 architecture or an int32 (boxed value) if you are in a
x86 architecture.

Homepage: https://github.com/mirage/optint
2018-12-11 08:12:27 +00:00
Katharina Fey 7641a13447
railcar: init at 1.0.4
Co-authored-by: Alyssa Ross <hi@alyssa.is>
2018-12-11 00:48:50 +01:00
markuskowa 9fba490258
Merge pull request #50862 from markuskowa/fix-slurm-module
nixos/slurm: set slurmd KillMode and add extraConfigPaths
2018-12-11 00:45:47 +01:00
Samuel Dionne-Riel 1c3079fce3 dbeaver: 5.2.5 -> 5.3.0 2018-12-10 17:48:56 -05:00
Dmitry Kalinkin 99d4e656c5
rivet: 2.6.1 -> 2.6.2 2018-12-10 17:28:30 -05:00
Dmitry Kalinkin 7726c8b0ed
yoda: 1.7.3 -> 1.7.4 2018-12-10 17:28:08 -05:00
Dmitry Kalinkin 86344b3a52
Merge pull request #49488 from eadwu/rstudioWrapper/add-desktop-file
rstudioWrapper: include desktop file
2018-12-10 17:18:44 -05:00
Michael Raskin 654d324230
Merge pull request #51756 from markuskowa/upd-lvm2
lvm2: 2.02.177 -> 2.03.01
2018-12-10 22:02:02 +00:00
Renaud c9d58d1321
Merge pull request #51763 from pbogdan/add-ant-theme
ant-theme: init at 1.2.0
2018-12-10 22:39:27 +01:00
Renaud 04b3d33260
Merge pull request #51827 from andir/steam
steam: ran update-runtime.py
2018-12-10 22:27:29 +01:00
Alexey Shmalko bc51418f1a
neovim-pygui: remove 2018-12-10 23:19:45 +02:00
Tim Steinbach 475d653afd
sbt-extras: 2018-09-27 -> 2018-12-04 2018-12-10 12:56:39 -05:00
Alyssa Ross 017390185a
Merge pull request #51817 from qolii/linux_hardkernel_4_14_78__4_14_85
linux_hardkernel_4_14: 4.14.78-150 -> 4.14.85.152
2018-12-10 17:08:37 +00:00
Andrew Childs f2332809fd nixos/nvidia: fix inverted assertion 2018-12-11 02:04:10 +09:00
markuskowa 49996e17ae
Merge pull request #51812 from samueldr/fix/altcoins-and-boost165
Fixes three altcoins packages to use boost165
2018-12-10 17:35:12 +01:00
Alyssa Ross c9ead109ca
Merge pull request #51725 from das-g/geckodriver-0.22.0
geckodriver: unstable-2018-02-24 -> 0.22.0
2018-12-10 15:57:45 +00:00
Tor Hedin Brønner 59d1fb6151
Merge pull request #44497 from hedning/gnome-upstream-wayland
Add gnome wayland support
2018-12-10 16:53:27 +01:00
Vincent Laporte 655231a612 coqPackages.simple-io: init at 0.2
Purely functional IO for Coq.

homepage: https://github.com/Lysxia/coq-simple-io
2018-12-10 15:35:34 +00:00
Vincent Laporte e21a5e6035 coqPackages_8_9.coq-ext-lib: init at 0.10.0 2018-12-10 15:33:59 +00:00
Jörg Thalheim 6e61418a64
Merge pull request #51833 from Synthetica9/revert-47909-menuconfig
Revert "linux: inside nix-shell, allow make menuconfig"
2018-12-10 15:23:07 +00:00
Raphael Borun Das Gupta 1edf950fa2 geckodriver: unstable-2018-02-24 -> 0.22.0
Motivation: unstable-2018-02-24 (which reports to be
0.19.1, but probably doesn't correspond to any actual
geckodriver release) isn't compatible with the currently
shipped Firefox version 63.0

closes NixOS/nixpkgs#50380
2018-12-10 16:22:11 +01:00
Tim Steinbach 97ad321e42
zsh-autosuggestions: Fix module for 0.5.0
The update for zsh-autosuggestions in #51752 broke the module.
This fix reflects the required changes.
2018-12-10 10:11:33 -05:00
worldofpeace ea22830eaf
Merge pull request #51816 from etu/sequeler_0_6_4
sequeler: 0.6.3 -> 0.6.4
2018-12-10 10:09:30 -05:00
Tim Steinbach 147f9a0f96
oh-my-zsh: 2018-11-02 -> 2018-11-27 2018-12-10 09:54:19 -05:00
Patrick Hilhorst ffd47d5b16
Revert "linux: inside nix-shell, allow make menuconfig" 2018-12-10 15:50:36 +01:00
Robert Schütz e1a837cfb5 seafile-client: 6.2.8 -> 6.2.9 2018-12-10 15:50:30 +01:00
Robert Schütz 25de143c84 seafile-shared: 6.2.8 -> 6.2.9 2018-12-10 15:50:29 +01:00
markuskowa 07b5b553c6
Merge pull request #51811 from veprbl/pr/cernlib_fix
cernlib: fix build
2018-12-10 15:30:05 +01:00
Dmitry Kalinkin 6fb67ca241
Merge pull request #44909 from mnacamura/zathura
zathura: keep wrapper's WM_CLASS consistent with unwrapped binary
2018-12-10 09:11:55 -05:00
Dmitry Kalinkin a1ef7fd877 cernlib: restrict supported arches 2018-12-10 17:05:22 +03:00
Alexey Shmalko ed46fe4f04
Merge pull request #51821 from Tomahna/iris
mopidy-iris: 3.31.2 -> 3.31.3
2018-12-10 15:36:25 +02:00
edef 995d224f44
Merge pull request #51664 from erictapen/tlslite-ng-init
pythonPackages.tlslite-ng: init at 0.7.5, migrate tlslite references to it, delete tlslite
2018-12-10 13:03:27 +00:00
Markus Kowalewski aed8699993
grub: add patch for XFS sparse inode feature
xfsprogs-4.16 introduced an new on disk format feature
that is not recognized properly by grub. This patch
allows grub to access XFS filesystem created with
xfsprogs >= 4.16.
This upstream patch can be removed for grub-2.03.
2018-12-10 13:52:55 +01:00
Andreas Rammhold 1de88c36cc
steam: ran update-runtime.py 2018-12-10 13:50:06 +01:00
Justin Humm 93bf0a02f5
pythonPackages.tlslite: delete, migrate refs to pythonPackages.tlslite-ng
tlslite has a test failure on Python 3.7 [0]. @tomato42, a commiter of
tlslite and author of tlslite-ng said, that tlslite is abandoned (last
commit 2015) and tlslite-ng should be used as a drop in replacement.

[0] https://github.com/trevp/tlslite/issues/121
2018-12-10 13:45:45 +01:00
Timo Kaufmann f0ea741a9a
Merge pull request #51786 from symphorien/giac-1.5
giac: 1.4.9 -> 1.5.0
2018-12-10 13:40:03 +01:00
Maximilian Bosch f64f8a312f
Merge pull request #51613 from the-kenny/regenerate-node-packages
nodePackages: Regenerate
2018-12-10 13:31:53 +01:00
Vladimír Čunát 3946d83a3c
nixos tests: disable kafka for now
They consistently fail since openjdk bump with some out-of-space errors.
That's not a problem by itself, but each test instance ties a build slot
for many hours and consequently they also delay channels as those wait
for all builds to finish.

Feel free to re-enable when fixed, of course.
2018-12-10 13:19:00 +01:00
Moritz Ulrich 6d21e8d361
nodePackages: Regenerate and fix azure-cli
Regenerates the `nixpkgs` NodeJS set (and updates all dependencies
internally).

Also, the `azure-cli` package doesn't build with NodeJS 10, so now
NodeJS 8 is used for `azure-cli`.

Signed-off-by: Maximilian Bosch <maximilian@mbosch.me>
2018-12-10 11:46:46 +01:00
Kevin Rauscher 3b7a7f7b22 mopidy-iris: 3.31.2 -> 3.31.3 2018-12-10 10:55:21 +01:00
Vladyslav M 92465e9f94
Merge pull request #51820 from romildo/upd.zafiro-icons
zafiro-icons: 0.7.3 -> 0.7.7
2018-12-10 11:48:08 +02:00
Tor Hedin Brønner 75e223bf7a nixos/tests/gnome3-gdm: port to wayland
The test now runs wayland, which means we can no longer use X11 style testing.
Instead we get gnome shell to execute javascript through its dbus interface.
2018-12-10 10:36:25 +01:00