Commit Graph
162459 Commits
Author SHA1 Message Date
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
Vladimír Čunát ac19d5e34f Merge #51836: nixos/nvidia: fix inverted assertion 2018-12-11 21:41:20 +01:00
Franz PletzandGitHub 10d9fe7d38 Merge pull request #51738 from Izorkin/php73
php: update php packages
2018-12-11 19:38:42 +00:00
IzorkinandFranz Pletz 3c15573712 phpPackages.couchbase: 2.3.4 -> 2.6.0 2018-12-11 20:11:36 +01:00
IzorkinandFranz Pletz 72b3ceaa2f phpPackages.memcached: fix build with php73 2018-12-11 20:11:35 +01:00
IzorkinandFranz Pletz 43b2734f53 phpPackages.xdebug: fix build with php73 2018-12-11 20:11:35 +01:00
IzorkinandFranz Pletz b0b623e034 phpPackages: disable build with php73 2018-12-11 20:11:34 +01:00
IzorkinandFranz Pletz 2fb2d1f67a phpPackages.yaml: 2.0.2 -> 2.0.4 2018-12-11 20:11:33 +01:00
IzorkinandFranz Pletz 6a9f31f34c phpPackages.v8js: 1.4.1 -> 2.1.0 2018-12-11 20:11:33 +01:00
IzorkinandFranz Pletz 6a34ad0c2e phpPackages.igbinary: 2.0.4 -> 2.0.8 2018-12-11 20:11:32 +01:00
IzorkinandFranz Pletz cea4312e56 phpPackages.imagick: fix build with php73 2018-12-11 20:11:31 +01:00
IzorkinandFranz Pletz 23190fb3a9 phpPackages.apcu_bc: fix build with php73 2018-12-11 20:11:31 +01:00
IzorkinandFranz Pletz c120d94071 phpPackages.apcu: 5.1.11 -> 5.1.15 2018-12-11 20:11:30 +01:00
IzorkinandFranz Pletz 80f4d5d56a php: fix build php 7.3 in Darwin 2018-12-11 20:11:30 +01:00
IzorkinandFranz Pletz 45ef74ccce php: fix bug 71041 2018-12-11 20:11:29 +01:00
IzorkinandFranz Pletz bfe31dfdcd unit: update php module config 2018-12-11 20:11:28 +01:00
IzorkinandFranz Pletz b5137de379 php: add custom options 2018-12-11 20:11:11 +01:00
IzorkinandFranz Pletz f80e7df143 php72: 7.2.12 -> 7.2.13 2018-12-11 20:11:10 +01:00
IzorkinandFranz Pletz 374be65924 php71: 7.1.24 -> 7.1.25 2018-12-11 20:11:09 +01:00
IzorkinandFranz Pletz 6c8b7ac931 unit: add php module 7.3 2018-12-11 20:11:08 +01:00
IzorkinandFranz Pletz ff7192d4d0 php: init at 7.3.0 2018-12-11 20:11:05 +01:00
Alexey ShmalkoandGitHub ebd47d7b54 Merge pull request #51838 from spacekookie/railcar
railcar: init at 1.0.4
2018-12-11 20:18:55 +02:00
Jörg ThalheimandGitHub 643fabf8ea syncthing: fix build (#51866)
###### Motivation for this change

fixes #51825 

###### Things done

<!-- Please check what applies. Note that these are not hard requirements but merely serve as information for reviewers. -->

- [x] Tested using sandboxing ([nix.useSandbox](http://nixos.org/nixos/manual/options.html#opt-nix.useSandbox) on NixOS, or option `sandbox` in [`nix.conf`](http://nixos.org/nix/manual/#sec-conf-file) on non-NixOS)
- Built on platform(s)
   - [x] NixOS
   - [ ] macOS
   - [ ] other Linux distributions
- [ ] Tested via one or more NixOS test(s) if existing and applicable for the change (look inside [nixos/tests](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests))
- [ ] Tested compilation of all pkgs that depend on this change using `nix-shell -p nox --run "nox-review wip"`
- [ ] Tested execution of all binary files (usually in `./result/bin/`)
- [ ] Determined the impact on package closure size (by running `nix path-info -S` before and after)
- [ ] Assured whether relevant documentation is up to date
- [x] Fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md).

---
2018-12-11 17:35:44 +00:00
Tim Steinbach c89cbdcd48 linux: 4.20-rc5 -> 4.20-rc6 2018-12-11 11:11:34 -05:00
Alexey Shmalko e376aecb1e railcar: add reference to upstream patch 2018-12-11 17:37:18 +02:00
WilliButzandRobin Gloster 174800f2c6 grafana: 5.4.0 -> 5.4.1 2018-12-11 16:25:19 +01:00
Robert Schütz da92eb2601 ghostwriter: 1.7.3 -> 1.7.4 2018-12-11 16:13:53 +01:00
Robert SchützandGitHub 3c71836095 Merge pull request #51731 from marsam/update-python-robotframework-selenium2library
pythonPackages.robotframework-selenium2library: 1.6.0 -> 3.0.0
2018-12-11 15:47:03 +01:00
worldofpeaceandGitHub 1aa709be21 Merge pull request #51867 from couchemar/hub-2.6.1
gitAndTools.hub: 2.6.0 -> 2.6.1
2018-12-11 09:39:37 -05: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ützandGitHub 4a6367e262 Merge pull request #51809 from samueldr/fix/caffe2-python36
[WIP] caffe2: Use python36Packages explicitly.
2018-12-11 14:59:16 +01:00
Sarah BrofeldtandGitHub 84bf8f36ad Merge pull request #51300 from tilpner/minio-update
minio/minio-client: update
2018-12-11 14:21:32 +01:00
Alyssa RossandGitHub 1a69b3303f Merge pull request #51865 from rawkode/feature/fix-wavebox-deps
wavebox: 4.5.3 -> 4.5.5
2018-12-11 13:02:45 +00:00
tilpner 380fce5bc3 minio-client: 2018-07-31T02-28-53Z -> 2018-12-05T22-59-07Z 2018-12-11 13:59:43 +01:00
tilpner d08187edce minio: 2018-07-31T02-11-47Z -> 2018-12-06T01-27-43Z 2018-12-11 13:59:36 +01:00
Andrey Pavlov 6153dc76f2 gitAndTools.hub: 2.6.0 -> 2.6.1 2018-12-11 15:48:00 +03:00
David McKayandGitHub eb1e6bfde6 Adhere to Styleguide 2018-12-11 12:15:33 +00:00
David McKay 8ad1ef1ea5 wavebox: Update & Clean Dependencies 2018-12-11 11:57:34 +00:00
Sarah BrofeldtandGitHub 6449501902 Merge pull request #51788 from plumelo/feature/distrobuilder
distrobuilder: 2018_06_29 -> 2018_10_04
2018-12-11 12:56:04 +01:00
Sarah BrofeldtandGitHub 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 BrofeldtandGitHub 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
Sarah BrofeldtandGitHub b960d1ab0b Merge pull request #51855 from samueldr/auto/dbeaver/nixpkgs-unstable/5.3.0
dbeaver: 5.2.5 -> 5.3.0
2018-12-11 12:49:09 +01:00
Jappie KloosterandJörg Thalheim e576c3b385 doc: Fix insecure nginx docs (#51840) 2018-12-11 11:02:56 +00:00
Samuel Dionne-RielandRobert Schütz 31298112f3 caffe2: Use python36Packages explicitly.
Fallout from 0f38d9669f
2018-12-11 11:31:15 +01:00
Samuel Dionne-RielandRobert Schütz 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