Commit graph

5072 commits

Author SHA1 Message Date
R. RyanTM 7f11c064c4 janet: 1.15.3 -> 1.15.4 2021-03-17 13:39:32 +00: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
Sandro Jäckel b45c06fde8
cpython: allow $out reference again
This regression got introduced with 738746a34b
2021-03-15 03:20:32 +01:00
Frederik Rietdijk 0c1aa67215 python3Minimal and python3: don't override python3
This reduces the amount of packages that are required to use
builtins.fetchurl to fetch. Without this change, mime-types
would not be able to use fetchzip when mime-types support is
added to python3.
2021-03-14 17:01:44 +01:00
Frederik Rietdijk 738746a34b python3: express references to keep as a nix list 2021-03-14 17:00:59 +01:00
Frederik Rietdijk 5b1abe5dd2 python3: mimetypesSupport is optional 2021-03-14 15:45:15 +01:00
nicoo faf0f8a8a4 cpython: Pull in the mime-types database
Closes #113901
2021-03-14 15:45:15 +01:00
R. RyanTM 1ab22af205 zef: 0.11.4 -> 0.11.5 2021-03-13 17:30:13 +00:00
Frederik Rietdijk 7617b03403 python39: hardcode path to tzdata
Python 3.9 has a new module `zoneinfo` which requires tzdata. By default
it searches TZPATH for folders containing `zoneinfo`.

This commit makes the dependency on tzdata pure.
2021-03-13 14:05:41 +01:00
github-actions[bot] 6da245f62a
Merge staging-next into staging 2021-03-13 12:21:09 +00:00
github-actions[bot] e1ede8b801
Merge master into staging-next 2021-03-13 12:21:02 +00:00
Frederik Rietdijk 9d03ff5222 python: reproducible builds
Achieve reproducible builds of the interpreter. Note this meant
disabling optimizations again.
2021-03-13 13:11:50 +01: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
github-actions[bot] 9690bf19d4
Merge staging-next into staging 2021-03-03 06:17:28 +00:00
John Ericson d39fafe409
Merge pull request #114902 from obsidiansystems/fix-tools-withPackages
treewide: Fix various tools wrappers "with packages"
2021-03-02 19:46:10 -05:00
R. RyanTM 07a9dcf3e2 janet: 1.15.2 -> 1.15.3 2021-03-03 00:00:33 +00:00
John Ericson 07ecf87693 treewide: Fix various tools wrappers "with packages"
Now that `buildEnv` is ready, always put `makeWrapper` in
`nativeBuildInputs`, rather than `buildInputs` or (worse) mucking around
with setup hooks by hand.

(C.f. #112276, which didn't catch these because the manual setup hook
sourcing is such a hack to being with!)

Fixes #114687
2021-03-02 22:38:04 +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
github-actions[bot] e668a36492
Merge staging-next into staging 2021-03-02 12:17:32 +00: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
Martin Weinelt 5356064daa
Merge pull request #114030 from nagy/spidermonkey
spidermonkey_78: 78.4.0 -> 78.8.0
2021-02-27 13:26:08 +01:00
github-actions[bot] 2a38839b78
Merge staging-next into staging 2021-02-27 12:20:00 +00:00
Daniel Nagy 0dcd780908
spidermonkey_78: 78.4.0 -> 78.8.0 2021-02-27 12:35:36 +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
github-actions[bot] 52f404b187
Merge staging-next into staging 2021-02-27 06:17:01 +00: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
Ivan Babrou afbb72faef perl530: backport aarch64-darwin patch
This was originally in #105026, but then 5.30.1 happened with
this change included, so there were conflict and the patch
got dropped. Let's introduce it separately for only one version
that still needs it.
2021-02-26 20:46:09 -08:00
github-actions[bot] e8162c62e3
Merge staging-next into staging 2021-02-27 00:37:54 +00: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
github-actions[bot] ec3729e487
Merge staging-next into staging 2021-02-26 18:16:46 +00: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
Robert Schütz 54757b35c1 Merge branch 'staging-next' into staging 2021-02-26 10:56:17 +01: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
Ben Siraphob 4ace7d4167 scheme48: refactor and add siraben as maintainer 2021-02-24 15:22:15 +07:00
eyjhb a2ed10401b
php: fixed building with cliSupport = false 2021-02-23 22:13:54 +01:00
Masanori Ogino 8d213e1ff9 guile-1.8: fix CVE-2016-8605
Backports 245608911698adb3472803856019bdd5670b6614 from guile.git
Fixes https://github.com/NixOS/nixpkgs/issues/73648

Signed-off-by: Masanori Ogino <167209+omasanori@users.noreply.github.com>
2021-02-23 20:38:06 +09:00
R. RyanTM 1563577634 octave: 6.1.0 -> 6.2.0 2021-02-22 10:57:14 -05:00
Mario Rodas 9db5a83465 ruby_2_5: remove patchset
ruby_2_5 was removed from nixpkgs in 1c33c0ad6b
2021-02-22 04:20:00 +00:00
github-actions[bot] 5884dca2b9
Merge master into staging-next 2021-02-20 12:19:39 +00:00
Martin Weinelt 92087cb170 python37: 3.7.9 -> 3.7.10, fixup patches 2021-02-20 12:13:07 +01:00
Anders Kaseorg d08ec2f195 pythonInterpreters.pypy36_prebuilt: Set pythonOnBuildForHost
This was broken by #105155.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2021-02-20 11:29:46 +01:00
Anders Kaseorg 1c5c184079 pythonInterpreters.pypy36_prebuilt: Add missing lib argument
This was broken by commit 001c0cbe54
(#110591).

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2021-02-20 11:29:46 +01:00
Frederik Rietdijk 04f436940c python310: 3.10.0a4 -> 3.10.0a5 2021-02-20 10:03:11 +01:00