Commit graph

57346 commits

Author SHA1 Message Date
Alyssa Ross c5b825ca28
Merge pull request #51860 from ivan/fix-jdk11_headless
jdk11_headless: fix the build on amd64
2018-12-13 11:45:21 +00:00
Alexey Shmalko bb14e3b1fb
Merge pull request #51929 from ivan/add-manhole
pythonPackages.manhole: init at 1.5.0
2018-12-13 13:39:36 +02:00
Vincent Laporte 113a7562fe ocamlPackages.lablgtk3: init at 3.0.beta1 2018-12-13 09:09:09 +00:00
Ivan Kozik e7ec6cdf11 pythonPackages.manhole: init at 1.5.0 2018-12-13 09:07:13 +00:00
Ivan Kozik f1b814a879 pythonPackages.lmdb: enable tests (#51931) 2018-12-13 09:08:05 +01:00
Ivan Kozik 2232135cf9 pythonPackages.Yapsy: 1.11.223 -> 1.12.0 and enable tests (#51925) 2018-12-13 08:30:49 +01:00
Alyssa Ross b450083ee3
Merge pull request #51884 from alyssais/bundlerEnv-groups
bundlerEnv: improve handling of groups
2018-12-12 23:51:52 +00:00
Jan Tojnar 25ab74f853
Merge pull request #51889 from jtojnar/gnome-3.30.3
Gnome 3.30.3
2018-12-12 21:27:28 +01:00
Jan Tojnar 1015575c09
gnome3.libgda: 5.2.5 → 5.2.8 2018-12-12 20:00:59 +01:00
Jan Tojnar aaaf48b2aa
libgda: move from gnome3.libgda 2018-12-12 20:00:59 +01:00
Aneesh Agrawal 3dbbd9f8c2 pgcli: 2.0.0 -> 2.0.1
Changelog: https://github.com/dbcli/pgcli/blob/master/changelog.rst#201
Major feature of note is Python 3.7 support.

Also default to using Python 3 because this is an application.
2018-12-12 13:56:41 -05:00
Jörg Thalheim 007dfa8adc
Merge pull request #51830 from georgewhewell/cool-retro-term-fix-darwin
cool-retro-term: fix on darwin
2018-12-12 17:53:23 +00:00
Jörg Thalheim f49e2ad365
Merge pull request #51758 from rasendubi/pynvim
pythonPackages.neovim-0.3.0 -> pythonPackages.pynvim-0.3.1
2018-12-12 17:01:25 +00:00
George Whewell 7875e817cf change qmltermwidget version to 2018-11-24 and add unstable to name 2018-12-12 16:32:28 +00:00
Robert Schütz 34f04810cf
Merge pull request #51904 from worldofpeace/secretstorage/3.1.0
python3Packages.secretstorage: 2.3.1 -> 3.1.0
2018-12-12 16:50:41 +01:00
worldofpeace 851e2c7e21 python3Packages.secretstorage: 2.3.1 -> 3.1.0
Changelog: https://github.com/mitya57/secretstorage/blob/master/changelog

Pertinent changes:

- ported from dbus-python to jeepney
  Thusly Python 3.5 or newer is required.
- We can use pypi
- Add pygobject3
2018-12-12 10:22:57 -05:00
worldofpeace 9f66479ffc python3Packages.jeepney: init at 0.4 2018-12-12 10:22:56 -05:00
George Whewell b2cbbb32ac qmltermwidget: update to latest master to fix cool-retro-term on darwin 2018-12-12 13:25:39 +00:00
Gabriel Ebner a9d7a31817 alot: 0.7 -> 0.8 2018-12-12 13:31:32 +01:00
Vincent Laporte ee843ee86e ocamlPackages.ppx_import: 1.5 -> 1.5-3 2018-12-12 09:34:38 +00:00
Vincent Laporte 47c4876de6 ocamlPackages.ppx_deriving_yojson: disable tests 2018-12-12 09:34:38 +00:00
Alyssa Ross 812805110b
Merge pull request #51887 from AtnNn/ikos
ikos: init at 2.1
2018-12-12 09:06:36 +00:00
Sarah Brofeldt 27cd05e674
Merge pull request #51750 from MarcFontaine/master
haskellPackages.binary-parsers : disable tests
2018-12-12 09:45:50 +01:00
worldofpeace d36846d367
Merge pull request #51663 from erictapen/cytoolz-fix-build
python3Packages.cytoolz: fix build
2018-12-12 01:48:46 -05:00
Matthew Bauer 465a5e1d97
Merge pull request #51880 from matthewbauer/simavr-mac
simavr: work on macOS
2018-12-11 20:36:58 -06:00
Etienne Laurin 328fbcff60 ikos: init at 2.1 2018-12-12 00:09:24 +00:00
Daiderd Jordan 78c0253521
Merge pull request #51879 from ejpcmac/update-erlangR21
erlangR21: 21.1.3 -> 21.2
2018-12-11 23:22:37 +01:00
Alyssa Ross 26053cae74
bundlerEnv: always include default gems
"default" isn't really a group, it's more the absence of one. With
Bundler, this means that a gem should be installed unconditionally,
regardless of which groups are specified. It doesn't really make sense
to allow these gems to be omitted from a bundlerEnv.
2018-12-11 21:26:09 +00:00
Alyssa Ross 83a2d993d4
bundlerEnv: include all groups by default
This wasn't really an issue until the latest minor release of Bundix
(2.4), because prior to then Bundix didn't emit group attributes, and so
this functionality of bundlerEnv wasn't really used. However, it is now
apparent that a better default for bundlerEnv would be to include all
gem groups by default, not just the default group. This matches the
behavior of Bundler, and makes more sense, because the default group
alone isn't necessarily useful for anything -- consider a Rails app with
production, development, and test groups. It has the additional benefit
of being backwards compatible with how this would have worked before the
Bundix update.
2018-12-11 21:26:08 +00:00
Alyssa Ross 67b1265fb3
bundlerEnv: ensure dependencies always included
Suppose I have a Gemfile like this:

    source "https://rubygems.org"
    gem "actioncable"
    gem "websocket-driver", group: :test

The gemset.nix generated by Bundix 2.4.1 will set ActionCable's groups
to [ "default" ], and websocket-driver's to [ "test" ]. This means that
the generated bundlerEnv wouldn't include websocket-driver unless the
test group was included, even though it's required by the default group.

This is arguably a bug in Bundix (websocket-driver's groups should
probably be [ "default" "test" ] or just [ "default" ]), but there's no
reason bundlerEnv should omit dependencies even given such an input --
it won't necessarily come from Bundix, and it would be good for
bundlerEnv to do the right thing.

To fix this, filterGemset is now a recursive function, that adds
dependencies of gems in the group to the filtered gemset until it
stabilises on the gems that match the required groups, and all of their
recursive dependencies.
2018-12-11 21:26:07 +00:00
Matthew Bauer 79e886a61b simavr: work on macOS 2018-12-11 14:40:48 -06:00
Jean-Philippe Cugnet 08e7fe7cb9
erlangR21: 21.1.3 -> 21.2 2018-12-11 21:14:40 +01:00
Izorkin 80f4d5d56a
php: fix build php 7.3 in Darwin 2018-12-11 20:11:30 +01:00
Izorkin 45ef74ccce
php: fix bug 71041 2018-12-11 20:11:29 +01:00
Izorkin b5137de379
php: add custom options 2018-12-11 20:11:11 +01:00
Izorkin f80e7df143
php72: 7.2.12 -> 7.2.13 2018-12-11 20:11:10 +01:00
Izorkin 374be65924
php71: 7.1.24 -> 7.1.25 2018-12-11 20:11:09 +01:00
Izorkin ff7192d4d0
php: init at 7.3.0 2018-12-11 20:11:05 +01:00
Justin Humm df6010aa3a
python3Packages.cytoolz: fix build
cytoolz has a test failure with Python 3.7 [0]. There is a debian patch
for it, which didn't make it into upstream yet [1].

[0] https://github.com/pytoolz/cytoolz/issues/122
[1] 5ce4158dee/debian/patches/py37.patch
2018-12-11 16:06:48 +01:00
Mario Rodas cf46e28f0a
pythonPackages.robotframework-selenium2library: 1.6.0 -> 3.0.0 2018-12-11 09:10:00 -05:00
Mario Rodas 850b2592c3
pythonPackages.robotframework-seleniumlibrary: init at 3.2.0 2018-12-11 09:10:00 -05:00
Mario Rodas 0890aa4d6a
pythonPackages.mockito: init at 1.1.1 2018-12-11 09:10:00 -05:00
Mario Rodas e3a0c05a80
pythonPackages.approvaltests: init at 0.2.4 2018-12-11 09:09:59 -05:00
Mario Rodas f52cb0a6b4
pythonPackages.robotstatuschecker: init at 1.3 2018-12-11 09:09:59 -05:00
Robert Schütz 4a6367e262
Merge pull request #51809 from samueldr/fix/caffe2-python36
[WIP] caffe2: Use python36Packages explicitly.
2018-12-11 14:59:16 +01:00
Sarah Brofeldt 29860f25d5
Merge pull request #51814 from peterhoeg/u/pio
platformio: 3.6.1 -> 3.6.2
2018-12-11 12:54:55 +01:00
Sarah Brofeldt 4d34cfcd96
Merge pull request #51851 from veprbl/pr/rivet_bump
rivet: 2.6.1 -> 2.6.2
2018-12-11 12:49:48 +01:00
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