Commit Graph

92501 Commits

Author SHA1 Message Date
Frederik Rietdijk
9a63b3d3d6
Merge pull request #104781 from NixOS/staging-next
Staging next
2020-11-30 18:27:29 +01:00
Sandro
d554addf6c
Merge pull request #105447 from r-ryantm/auto-update/python3.7-nipype
python37Packages.nipype: 1.5.1 -> 1.6.0
2020-11-30 18:03:08 +01:00
Sandro
ae1429d752
Merge pull request #105427 from r-ryantm/auto-update/python3.7-blessed
python37Packages.blessed: 1.17.11 -> 1.17.12
2020-11-30 17:37:29 +01:00
Andreas Rammhold
c588499fbb
Merge pull request #104458 from redvers/update_botan_2.7_to_2.9
botan2: update 2.7.0 -> 2.9.0
2020-11-30 16:45:43 +01:00
Andreas Rammhold
76587f2c1a
Merge pull request #105287 from mweinelt/libproxy
libproxy: fix CVE-2020-25219, CVE-2020-26154
2020-11-30 16:21:11 +01:00
Sandro
f0323b5bc1
Merge pull request #105429 from r-ryantm/auto-update/python3.7-smart_open
python37Packages.smart_open: 4.0.0 -> 4.0.1
2020-11-30 16:18:56 +01:00
Sandro
fb432243c7
Merge pull request #105440 from r-ryantm/auto-update/python3.7-vispy
python37Packages.vispy: 0.6.5 -> 0.6.6
2020-11-30 16:05:10 +01:00
Martin Weinelt
3200eaef74
Merge pull request #105157 from mweinelt/libslirp
libslirp: fix CVE-2020-29129
2020-11-30 15:56:09 +01:00
Michael Raskin
676ed31a7d
Merge pull request #105444 from siraben/octave-update
octave: 5.2.0 -> 6.1.0
2020-11-30 14:48:15 +00:00
Ryan Mulligan
c00959877f
Merge pull request #105425 from r-ryantm/auto-update/python3.7-mac_alias
python37Packages.mac_alias: 2.1.0 -> 2.1.1
2020-11-30 05:57:28 -08:00
Sandro
54756aea97
Merge pull request #105435 from r-ryantm/auto-update/python3.7-pymavlink
python37Packages.pymavlink: 2.4.12 -> 2.4.13
2020-11-30 14:35:58 +01:00
Sandro
c5d33689da
Merge pull request #105434 from r-ryantm/auto-update/python3.7-pybullet
python37Packages.pybullet: 3.0.6 -> 3.0.7
2020-11-30 14:17:49 +01:00
Sandro
c7765f45b2
Merge pull request #105380 from r-ryantm/auto-update/python3.7-google-cloud-container
python37Packages.google_cloud_container: 2.1.0 -> 2.2.0
2020-11-30 14:16:50 +01:00
Sandro
b86b6ded1d
Merge pull request #105351 from r-ryantm/auto-update/python2.7-bitstruct
python27Packages.bitstruct: 8.11.0 -> 8.11.1
2020-11-30 13:48:57 +01:00
R. RyanTM
caa1e8e12f python37Packages.nipype: 1.5.1 -> 1.6.0 2020-11-30 12:27:20 +00:00
Sandro
dd33fd3a84
Merge pull request #105327 from danieldk/python-blis-0.7.3 2020-11-30 13:26:51 +01:00
Sandro
062556f228
Merge pull request #105414 from r-ryantm/auto-update/python3.7-Wand
python37Packages.Wand: 0.6.4 -> 0.6.5
2020-11-30 13:10:04 +01:00
Sandro
ca33e60d44
Merge pull request #105350 from r-ryantm/auto-update/python2.7-bsddb3
python27Packages.bsddb3: 6.2.7 -> 6.2.9
2020-11-30 13:00:27 +01:00
Sandro
de9202b76b
Merge pull request #105375 from r-ryantm/auto-update/python2.7-bumps
python27Packages.bumps: 0.7.16 -> 0.7.18
2020-11-30 12:58:52 +01:00
Ben Siraphob
d3287cdd0a octave: 5.2.0 -> 6.1.0 2020-11-30 18:27:11 +07:00
Farid Zakaria
4af8bc084a
buildRubyGem: fix to support bundler cmds (#104977)
The way in which Nixpks builds Ruby gems means that certain operations
by bundler *will not work*, namely `bundle install --redownload`.

According to the source the _cache/_ directory should have been kept,
however it seems through revisions to the file it has been purged.

Here was the comment from the original commit that introduced
buildRubyGem:
```
  # Note:
  #   We really do need to keep the $out/${ruby.gemPath}/cache.
  #   This is very important in order for many parts of RubyGems/Bundler to not blow up.
  #   See https://github.com/bundler/bundler/issues/3327
```

Why is the _cache_ directory needed?

Bundler and RubyGems uses the cache as a source of truth.
When bundler executes `bundler install --redownload`, any gems it
discovers in the _GEM_PATH_ it assums must have their _.gem_ file
present in the cache (unaware it was installed from Nix).

Rather than downloading the gem from RubyGems the bundler code forcibly
re-installs the gem from the cache directory instead and **fails** if it
does not exist.

I've opened https://github.com/rubygems/rubygems/issues/4088 to see if
this failure should be soft and not so explicit; or fallback to fetching
the gem from scratch.

Without this change the following is the error:
```bash
> [nix-shell:~/code/nix/playground/jruby-bundler-rake]$ bundle install --force
[DEPRECATED] The `--force` option has been renamed to `--redownload`
WARNING: An illegal reflective access operation has occurred
WARNING: Illegal reflective access by org.jruby.ext.openssl.SecurityHelper (file:/nix/store/fis6nzrpw9pmcivr84qh5byfgm07qn10-jruby-9.2.13.0/lib/ruby/stdlib/jopenssl.jar) to field java.security.MessageDigest.provider
WARNING: Please consider reporting this to the maintainers of org.jruby.ext.openssl.SecurityHelper
WARNING: Use --illegal-access=warn to enable warnings of further illegal reflective access operations
WARNING: All illegal access operations will be denied in a future release
Fetching gem metadata from https://rubygems.org/.
Using bundler 2.1.4
Installing hello-world 1.2.0
Bundler::GemNotFound: Could not find hello-world-1.2.0.gem for installation
An error occurred while installing hello-world (1.2.0), and Bundler
cannot continue.
Make sure that `gem install hello-world -v '1.2.0' --source
'https://rubygems.org/'` succeeds before bundling.
```

Wth the fix the following no woccurs:
```bash
[nix-shell:~/code/nix/playground/jruby-bundler-rake]$ bundle install --redownload
WARNING: An illegal reflective access operation has occurred
WARNING: Illegal reflective access by org.jruby.ext.openssl.SecurityHelper (file:/nix/store/69wjlj4yirp48rv1q03zxgd4xvf0150d-jruby-9.2.13.0/lib/ruby/stdlib/jopenssl.jar) to field java.security.MessageDigest.provider
WARNING: Please consider reporting this to the maintainers of org.jruby.ext.openssl.SecurityHelper
WARNING: Use --illegal-access=warn to enable warnings of further illegal reflective access operations
WARNING: All illegal access operations will be denied in a future release
Fetching gem metadata from https://rubygems.org/.
Using bundler 2.1.4
Installing hello-world 1.2.0
Bundle complete! 1 Gemfile dependency, 2 gems now installed.
Use `bundle info [gemname]` to see where a bundled gem is installed.
```

```
[nix-shell:~/code/nix/playground/jruby-bundler-rake]$ ls -l /nix/store/cwl9n5073hqgpfhnw4wic13nrrgg9dn8-gem-env/lib/jruby/gems/2.5.0/cache/
total 8
lrwxrwxrwx 1 fmzakari primarygroup 102 Dec 31  1969 bundler-2.1.4.gem -> /nix/store/ifc8a0gsfkrhkv953rd4rz8bcspahi8y-bundler-2.1.4/lib/jruby/gems/2.5.0/cache/bundler-2.1.4.gem
lrwxrwxrwx 1 fmzakari primarygroup 110 Dec 31  1969 hello-world-1.2.0.gem -> /nix/store/xi9ln6n1mz2is5ppykjxqhhkpjq9zm6i-hello-world-1.2.0/lib/jruby/gems/2.5.0/cache/hello-world-1.2.0.gem
```

I have a minimal project that demonstrates this issue at https://github.com/fzakaria/jruby-bundler-nix-failure
2020-11-30 12:15:12 +01:00
adisbladis
a52850e304
Merge pull request #105113 from adisbladis/pythonforbuild-overrides
python: Propagate packageOverrides to pythonForBuild
2020-11-30 11:41:58 +01:00
Maximilian Bosch
b516a09d46
Merge pull request #104603 from siraben/errcheck-update
errcheck: 1.1.0 -> 1.4.0
2020-11-30 11:36:33 +01:00
adisbladis
49b8738a5f
python: Propagate packageOverrides to pythonForBuild
When overriding versions of build tools injected via hooks
`packageOverrides` was not taken into account and 2 incompatible
versions of the same package (`wheel` in this case) ended up in the
closure, causing the builds to fail.
2020-11-30 11:12:59 +01:00
R. RyanTM
1a4e03072c python37Packages.vispy: 0.6.5 -> 0.6.6 2020-11-30 09:51:10 +00:00
R. RyanTM
e53c0f98f7 python37Packages.pymavlink: 2.4.12 -> 2.4.13 2020-11-30 09:16:42 +00:00
R. RyanTM
1ddae1e4bf python37Packages.pybullet: 3.0.6 -> 3.0.7 2020-11-30 09:08:34 +00:00
R. RyanTM
7f27852831 python37Packages.smart_open: 4.0.0 -> 4.0.1 2020-11-30 08:17:34 +00:00
R. RyanTM
524c24ceb8 python37Packages.blessed: 1.17.11 -> 1.17.12 2020-11-30 07:26:59 +00:00
Vincent Laporte
389ac5f00e ocamlPackages.batteries: 3.1.0 → 3.2.0 2020-11-30 08:13:28 +01:00
R. RyanTM
53408c2cf9 python37Packages.mac_alias: 2.1.0 -> 2.1.1 2020-11-30 06:50:37 +00:00
R. RyanTM
3b1b6510e3 python37Packages.pytest-metadata: 1.10.0 -> 1.11.0 2020-11-29 20:07:21 -08:00
Sandro
ea3561228d
Merge pull request #105387 from freezeboy/unbreak-py2-ecpy
python2Packages.ecpy: unbreak due to invalid code
2020-11-30 04:05:14 +01:00
Mario Rodas
f180a29b03
Merge pull request #105403 from r-ryantm/auto-update/python2.7-ijson
python27Packages.ijson: 3.1.2.post0 -> 3.1.3
2020-11-29 21:29:13 -05:00
Mario Rodas
4572d27853
Merge pull request #105416 from r-ryantm/auto-update/python3.7-jupyterlab_git
python37Packages.jupyterlab-git: 0.23.1 -> 0.23.2
2020-11-29 21:24:53 -05:00
Sandro
c64538b659
Merge pull request #105348 from Mic92/httpbin
python3.pkgs.httpbin: 0.6.2 -> 0.7.0
2020-11-30 02:30:07 +01:00
Sandro
9d5d6b0a26
Merge pull request #104807 from SuperSandro2000/auto-update/python3.7-b2sdk 2020-11-30 02:13:30 +01:00
R. RyanTM
6e1c706c00 python37Packages.jupyterlab-git: 0.23.1 -> 0.23.2 2020-11-30 00:53:15 +00:00
Sandro
26c543168c
Merge pull request #105352 from r-ryantm/auto-update/python2.7-dependency-injector
python27Packages.dependency-injector: 4.4.1 -> 4.5.1
2020-11-30 01:34:36 +01:00
R. RyanTM
4958f5060b python37Packages.Wand: 0.6.4 -> 0.6.5 2020-11-30 00:23:02 +00:00
Dennis Gosnell
a2b278f095
Merge pull request #105400 from arcz/libff
libff: init at 1.0.0
2020-11-30 09:08:26 +09:00
R. RyanTM
e15ce6b6fa python27Packages.ijson: 3.1.2.post0 -> 3.1.3 2020-11-29 22:23:32 +00:00
Artur Cygan
304fe564a1 libff: init at 1.0.0 2020-11-29 23:08:20 +01:00
R. RyanTM
c5b4cbd446 python27Packages.identify: 1.5.9 -> 1.5.10 2020-11-29 14:05:54 -08:00
R. RyanTM
edaf507d61 python37Packages.green: 3.2.4 -> 3.2.5 2020-11-29 14:05:37 -08:00
R. RyanTM
1541df5437 python37Packages.dulwich: 0.20.11 -> 0.20.14 2020-11-29 12:14:39 -08:00
R. RyanTM
23a5371532 python27Packages.gin-config: 0.3.0 -> 0.4.0 2020-11-29 10:19:21 -08:00
freezeboy
b95d95d8fe python2Packages.ecpy: unbreak due to invalid code 2020-11-29 19:17:37 +01:00
Sandro
9d440b2342
Merge pull request #105339 from r-ryantm/auto-update/pkcs11-helper
pkcs11helper: 1.26 -> 1.27
2020-11-29 18:58:41 +01:00
Maximilian Bosch
91e6ee02c7
Merge pull request #104450 from anna328p/lc3tools
lc3tools: init at 0.12
2020-11-29 18:39:40 +01:00