Commit graph

4977 commits

Author SHA1 Message Date
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
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
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
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
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
R. RyanTM 198e0a8eb0 alda: 1.4.3 -> 1.4.4 2021-03-10 17:15:03 +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
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
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
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
Ben Siraphob 329a1ecb71 clips: fix darwin build 2021-03-06 21:01:46 +07: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
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
R. RyanTM 07a9dcf3e2 janet: 1.15.2 -> 1.15.3 2021-03-03 00:00:33 +00:00
sternenseemann c2a89d5bca development/interpreters/lua-5: remove unused files
These nix expressions from the lua-5 directory are imported nowhere and
can be removed safely.
2021-03-02 15:32:22 +01:00
Elis Hirwing db439da3cd
nixos/tests/php: Select the right versions of the tests depending on version 2021-03-02 09:22:33 +01:00
Ivan Babrou e96c9b30fa erlang: add missing WebKit framework on darwin
Fixing the following error:

```
 LD     ../priv/x86_64-apple-darwin20.3.0/wxe_driver.so
ld: file not found: /System/Library/Frameworks/WebKit.framework/Versions/A/WebKit for architecture x86_64
clang-7: error: linker command failed with exit code 1 (use -v to see invocation)
```
2021-02-28 11:58:25 -08:00
Ivan Babrou a026ea9856 erlang: add missing AGL framework for aarch64-darwin
Preventing this:

```
 LD     ../priv/aarch64-apple-darwin20.3.0/wxe_driver.so
ld: file not found: /System/Library/Frameworks/AGL.framework/Versions/A/AGL for architecture arm64
clang-11: error: linker command failed with exit code 1 (use -v to see invocation)
make[3]: *** [Makefile:176: ../priv/aarch64-apple-darwin20.3.0/wxe_driver.so] Error 1
```
2021-02-28 17:40:00 +00:00
Ivan Babrou 7993fc70af erlangR21: 21.3.8.3 -> 21.3.8.21 2021-02-28 17:40:00 +00:00
Ivan Babrou 025f1c4c87 erlangR22: 22.3 -> 22.3.4.16 2021-02-28 17:40:00 +00:00
Ivan Babrou 428ff5779a erlangR23: 23.1.4 -> 23.2.6 2021-02-28 17:40:00 +00:00
Elis Hirwing ac8a8fe2fa
php: Rename extra init file in store and symlink it instead of copying 2021-02-27 22:40:08 +01:00
Frederik Rietdijk 0dc64d5d71 python: fix full builds by referring to the correct interpreter
The package set is an attribute of the interpreter. The function to
build an environment (`buildEnv`/`withPackages`) is part of the
interpreter. The interpreter is passed to itself, and needs to be
updated when overridden.

For cross-compilation we splice the package set, and for that the
various `build/host` interpreters and sets need to be available. We
select these currently through `pkgs.${pythonAttr}`. The `pythonAttr`
attribute was not fixed for `pythonFull`.

https://github.com/NixOS/rfcs/pull/83
https://github.com/NixOS/nixpkgs/pull/104201

We need a better solution for this because this is very brittle.
2021-02-27 11:12:05 +01:00
Mario Rodas b5702fd566
Merge pull request #114442 from r-ryantm/auto-update/jruby
jruby: 9.2.14.0 -> 9.2.15.0
2021-02-27 00:44:40 -05:00
sternenseemann c5218b5245 rebol/default.nix: remove unused file
The rebol attribute has been removed over 4 years ago, so removing the
file as will is probably fine.

See d6cb238c8e.
2021-02-26 21:47:40 +01:00
Sandro 97da88a89b
Merge pull request #114467 from thiagokokada/sync-babashka-upstream
babashka: sync native-image arguments with upstream
2021-02-26 19:46:18 +01:00
Christopher League 218353d3f0
clips: 6.30 -> 6.31; supersedes and closes #109914 (#114132)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-02-26 18:16:54 +01:00
Thiago Kenji Okada 19fca6f483 babashka: sync native-image arguments with upstream
This commit syncs the arguments passed to the babashka with upstream:
77daea7362/script/compile (L41-L74)

The idea here is to enable more features and reduce the number of issues
compared to upstream.

Also add some tests to ensure everything is working.
2021-02-26 11:47:23 -03:00
Frederik Rietdijk c456a2512f Merge master into staging-next 2021-02-26 10:25:13 +01:00
R. RyanTM 0d82e2b847 jruby: 9.2.14.0 -> 9.2.15.0 2021-02-26 07:42:48 +00:00
Cole Helbling 24e5a77861
octave.pkgs: stdenv.lib -> lib
stdenv.lib is a deprecated alias to lib.
2021-02-25 22:16:54 -08:00
Mario Rodas 9d077b5737
Merge pull request #114214 from siraben/scheme48-refactor
scheme48: refactor and add siraben as maintainer
2021-02-24 21:51:47 -05:00
Doron Behar aca03db091
Merge pull request #108562 from KarlJoad/octave-modules 2021-02-24 21:31:24 +02:00
Karl Hallsby 481e1d3a77 octave.pkgs: init
Heavily based on Python's packages set.
2021-02-24 21:00:48 +02:00
Alwin Berger 96876f1e9a io: switch to pname
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-02-24 14:00:12 +01:00
Alwin Berger 56201edbce io: 2015.11.11 -> 2017.09.06 2021-02-24 14:00:12 +01:00
Alwin Berger b01f6c43af io: add static linking
When executing the programm the libraries were relinking to libm.so and
segfaulting
Since the libs in question are all <1MB when staticly linked this seemed like an easy workaround
To find future regression the interpreter will be called in
installCheckPhase

io: add install check
2021-02-24 13:57:43 +01:00
Alwin Berger c2b65f7f91 io: remove deprecated sysctl.h
glibc 2.32 removed <sys/sysctl.h>
But since it is only required with __CYGWIN__ it can be removed safely
See related Issues upstream:
https://github.com/IoLanguage/io/issues/433
https://github.com/IoLanguage/io/pull/446
2021-02-24 11:29:48 +01:00