Commit Graph

5018 Commits

Author SHA1 Message Date
github-actions[bot]
d73a492e83
Merge master into staging-next 2021-03-19 00:41:01 +00:00
Sandro
5c663b24b6
Merge pull request #116508 from saschagrunert/bats
bats: 1.2.1 -> 1.3.0
2021-03-18 23:24:53 +01:00
Sandro
c507cb42a8
Merge pull request #116733 from stigtsp/package/rakudo-2021.02.1 2021-03-18 23:15:48 +01:00
Jan Tojnar
0136206b12
Merge branch 'master' into staging-next 2021-03-18 13:35:59 +01:00
Stig Palmquist
d34c7d5148 rakudo: 2020.12 -> 2021.02.1 2021-03-18 11:43:15 +01:00
Stig Palmquist
8aea46b3d2 moarvm: 2020.12 -> 2021.02 2021-03-18 11:42:57 +01:00
Stig Palmquist
ac465e83d0 nqp: 2020.12 -> 2021.02 2021-03-18 11:42:38 +01:00
R. RyanTM
98c5dcf7df elixir: 1.11.3 -> 1.11.4 2021-03-17 11:10:43 +00:00
Sascha Grunert
3c240045d5
bats: 1.2.1 -> 1.3.0
Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
2021-03-17 09:51:56 +01:00
github-actions[bot]
e1ede8b801
Merge master into staging-next 2021-03-13 12:21:02 +00:00
Elis Hirwing
a0e5076c5e
Merge pull request #115973 from etu/php-updates
php74, php80: 7.4.15 -> 7.4.16, 8.0.2 -> 8.0.3
2021-03-13 10:09:34 +01:00
github-actions[bot]
b0a6c2b8a5
Merge master into staging-next 2021-03-13 00:38:26 +00:00
John Ericson
7ba904b85e
Merge pull request #115296 from samueldr/ruby/fix-cross-target
ruby: Use appropriate targetPlatform
2021-03-12 14:10:33 -05:00
github-actions[bot]
121cc02fe8
Merge master into staging-next 2021-03-12 06:17:54 +00:00
Sandro
c0a09eb740
Merge pull request #116009 from fzakaria/faridzakaria/fix-jruby-java-home
jruby: Fix JAVA_HOME to support proper jmod support
2021-03-12 02:24:43 +01:00
Farid Zakaria
bfcd4b0e2a jruby: Fix JAVA_HOME to support proper jmod support
This is investigation I've done in support of
https://github.com/jruby/jruby/issues/6608 where I noticed some funky
issues with JRuby and module loading.

Looks like that JRuby expects JAVA_HOME to have a directory called
`jmod`, which is consistent with the Java Module system.

Unfortunately, the top level directory for the `jre` or `jdk` /nix/store
entry is not a valid JAVA_HOME since it is missing that directory.

Instead it's set within `lib/openjdk`, and there is a passthru variable
set accordingly.

This fixes JRuby and follows many other derivations.
A simple search in the code-base shows that there are many other
packages that suffer this same bug.
2021-03-11 16:10:22 -08:00
Elis Hirwing
82734e8ceb
php74: 7.4.15 -> 7.4.16
Changelog: https://www.php.net/ChangeLog-7.php#7.4.16
2021-03-11 19:39:58 +01:00
Elis Hirwing
919b55c49c
php80: 8.0.2 -> 8.0.3
Changelog: https://www.php.net/ChangeLog-8.php#8.0.3
2021-03-11 19:38:14 +01:00
github-actions[bot]
b4d5951d9e
Merge master into staging-next 2021-03-11 12:21:28 +00:00
Maximilian Bosch
69dc924f0a
evcxr: 0.7.0 -> 0.8.1
Release notes: https://github.com/google/evcxr/blob/v0.8.1/RELEASE_NOTES.md#version-081
2021-03-11 12:35:18 +01:00
github-actions[bot]
31dc9fe457
Merge master into staging-next 2021-03-11 06:18:03 +00:00
Pamplemousse
c45ea4f814 mujs: 1.0.7 -> 1.0.9
Signed-off-by: Pamplemousse <xav.maso@gmail.com>
2021-03-10 17:28:30 -07:00
github-actions[bot]
6a3a358b0d
Merge master into staging-next 2021-03-10 18:23:15 +00:00
R. RyanTM
198e0a8eb0 alda: 1.4.3 -> 1.4.4 2021-03-10 17:15:03 +00:00
github-actions[bot]
149a81c88d
Merge master into staging-next 2021-03-10 00:39:07 +00:00
Mario Rodas
626785b1dd
Merge pull request #115641 from r-ryantm/auto-update/tinyscheme
tinyscheme: 1.41 -> 1.42
2021-03-09 18:53:05 -05:00
R. RyanTM
6d420a1622 tinyscheme: 1.41 -> 1.42 2021-03-09 23:02:02 +00:00
Sandro
aa3af19774
Merge pull request #115424 from siraben/darwin-mass-fix-buildInputs=0 2021-03-09 21:14:38 +01:00
Martin Weinelt
16f9e4da3a
Merge branch 'master' into staging-next 2021-03-09 17:05:41 +01:00
Sandro
27a7096d1d
Merge pull request #115518 from eduardosm/sollya
sollya: init at 0.7
2021-03-09 16:54:13 +01:00
Eduardo Sánchez Muñoz
c5462fa788 sollya: init at 0.7 2021-03-09 14:38:35 +01:00
Ben Siraphob
5a4977dfd7 metamath: fix cross-compilation and update license 2021-03-09 20:22:07 +07:00
github-actions[bot]
dd7cbca2a6
Merge master into staging-next 2021-03-09 06:17:35 +00:00
Ben Siraphob
dc2e30b7af duktape: fix darwin build 2021-03-09 09:16:09 +07:00
Ben Siraphob
a903fedd90 ceptre: expand platforms to unix 2021-03-09 09:16:08 +07:00
Mario Rodas
680de6cbcd
Merge pull request #115420 from r-ryantm/auto-update/jruby
jruby: 9.2.15.0 -> 9.2.16.0
2021-03-08 19:43:44 -05:00
Frederik Rietdijk
277d488026 Merge staging into staging-next 2021-03-08 19:20:18 +01:00
R. RyanTM
468bdf7e2a jruby: 9.2.15.0 -> 9.2.16.0 2021-03-08 13:57:28 +00:00
Lassulus
4f85b3667b
Merge pull request #113142 from andersk/pypy-7.3.3
pypy, pypy3: 7.3.2 → 7.3.3
2021-03-07 16:52:42 +01:00
Samuel Dionne-Riel
6638690261 ruby: Use hostPlatform
Using `stdenv.targetPlatform` gives the wrong platform in buildPackages.

E.g.:

```
 $ nix-diff --color never $(env -i nix-instantiate -A pkgs.ruby -A pkgs.pkgsCross.aarch64-multiplatform.buildPackages.ruby)
- /nix/store/w8wk99p4gadns35n2l0fr7wx56jlwnnx-ruby-2.6.6.drv:{out}
+ /nix/store/5ywj7nicjai6ji4g33yh6nvz1b5fq7xw-ruby-2.6.6.drv:{out}
• The input named `ruby-2.6.6` differs
  - /nix/store/4a6nag89dcxwdf32820z6dfwwpfgab8s-ruby-2.6.6.drv:{out}
  + /nix/store/40pakkdfv578zffx3y11qd5ckcp2xpzm-ruby-2.6.6.drv:{out}
  • The environments do not match:
      postInstall=''
          # Remove unnecessary groff reference from runtime closure, since it's big
          sed -i '/NROFF/d' $out/lib/ruby/*/*/rbconfig.rb

          # Bundler tries to create this directory
          mkdir -p $out/nix-support
          cat > $out/nix-support/setup-hook <<EOF
          addGemPath() {
            addToSearchPath GEM_PATH \$1/lib/ruby/gems/2.6.0
          }
          addRubyLibPath() {
            addToSearchPath RUBYLIB \$1/lib/ruby/site_ruby
            addToSearchPath RUBYLIB \$1/lib/ruby/site_ruby/2.6.0
            addToSearchPath RUBYLIB \$1/lib/ruby/site_ruby/2.6.0/←x86_←→aarch→64-linux
          }

          addEnvHooks "$hostOffset" addGemPath
          addEnvHooks "$hostOffset" addRubyLibPath
          EOF

          rbConfig=$(find $out/lib/ruby -name rbconfig.rb)
      ''
• Skipping environment comparison
```

`pkgs.pkgsCros.*.buildPackage.ruby` should be equivalent to `pkgs.ruby`.
It wasn't.
2021-03-06 22:30:55 -05:00
github-actions[bot]
f9d4095295
Merge staging-next into staging 2021-03-07 00:41:13 +00:00
John Ericson
f5a7d8bb41
Merge pull request #115228 from siraben/unzip-buildInputs
treewide: unzip buildInputs to nativeBuildInputs (2)
2021-03-06 13:30:43 -05:00
Ben Siraphob
329a1ecb71 clips: fix darwin build 2021-03-06 21:01:46 +07:00
Ben Siraphob
4f0cdb68d7 treewide: unzip buldInputs to nativeBuildInputs (2) 2021-03-06 15:18:05 +07:00
Sandro
69b16f1251
Merge pull request #114527 from bobrik/ivan/perl-530-aarch64-darwin
perl530: backport aarch64-darwin patch
2021-03-05 16:13:36 +01:00
Jan Tojnar
6d1958ad2d
Merge branch 'staging-next' into staging 2021-03-04 22:16:45 +01:00
Sandro
25761501f9
Merge pull request #114589 from bobrik/ivan/erlang-aarch64 2021-03-04 03:57:07 +01:00
Ivan Babrou
81aa7a1344 erlangR23, erlangR22, erlangR21: remove obsolete substituteInPlace 2021-03-03 17:20:07 -08:00
Ivan Babrou
b00c7c2d1d python37, python2: remove win64 workaround to fix aarch64-darwin
The issue manifests itself as the following on `aarch64-darwin`:

```
>>> import ctypes
Traceback (most recent call last):
  File "<stdin>", line 1, in <module>
  File "/nix/store/i8cq0xrjirz1rcp65wzcyhj6ypzlw9il-python3-3.7.10/lib/python3.7/ctypes/__init__.py", line 551, in <module>
    _reset_cache()
  File "/nix/store/i8cq0xrjirz1rcp65wzcyhj6ypzlw9il-python3-3.7.10/lib/python3.7/ctypes/__init__.py", line 273, in _reset_cache
    CFUNCTYPE(c_int)(lambda: None)
MemoryError
```

The commit we backport is included in Python 3.8, and it reverts
the change that was introduced all the way back in Python 2.7.
2021-03-03 16:02:07 -08:00
Sandro
e80e78810d
Merge pull request #114847 from sternenseemann/remove-unused-lua-5-libs
development/interpreters/lua-5: remove unused files
2021-03-03 13:05:44 +01:00