JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
278,461 Commits 2 Branches 0 Tags 13 GiB
0d5c0c4608
Commit Graph

5032 Commits

Author SHA1 Message Date
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
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
Frederik Rietdijk
8ab9914a8c python36: 3.6.12 -> 3.6.13 2021-02-20 10:03:11 +01:00
Martin Weinelt
85cde0d60f python27: Fix CVE-2021-3177 
Thanks to the Gentoo team maintaining a fork of python2¹ we can easily
apply their backported patch for this security vulnerability.

[1] https://gitweb.gentoo.org/fork/cpython.git/
 2021-02-20 10:03:11 +01:00
Frederik Rietdijk
2cbc212983 python37: 3.7.9 -> 3.7.10 2021-02-20 10:03:11 +01:00
Frederik Rietdijk
84edcadb4a python38: 3.8.7 -> 3.8.8 2021-02-20 10:03:11 +01:00
Frederik Rietdijk
a39b5b5c94 python39: 3.9.1 -> 3.9.2 2021-02-20 10:03:11 +01:00
Ben Siraphob
4fb92ae60d tcl-8_6: 8.6.9 -> 8.6.11 2021-02-20 09:03:04 +01:00
Ben Wolsieffer
87768f2fed spidermonkey: use LLVM 11 
Now that rustc has moved to LLVM 11, this prevent needing to build two LLVM
versions.
 2021-02-20 08:54:24 +01:00
Jan Tojnar
8f50f1ce10
Merge branch 'staging-next' into staging 
Resolved the following conflicts:

- kernel flags between 09176d28a0 and 2b28822d8d
- clojure-lsp between 3fa00685ce and e03c068af5
 2021-02-19 17:15:31 +01:00
Ben Siraphob
e03c068af5 treewide: makeWrapper buildInputs to nativeBuildInputs 2021-02-19 20:09:16 +07:00
Frederik Rietdijk
1e47264608 python.tests: test overriding functions 2021-02-19 10:12:21 +01:00
Sandro
36ef53d337
Merge pull request #113167 from mweinelt/pytestcheckhook-paths 
pytestCheckHook: add support for disabling arbitrary paths
 2021-02-18 16:59:22 +01:00
Jörg Thalheim
236b56c94d
Merge pull request #113193 from danieldk/cargo-install-hook 2021-02-18 00:02:03 +00:00
github-actions[bot]
41b30ed9a6
Merge staging-next into staging 2021-02-17 12:20:08 +00:00
github-actions[bot]
f68cf6f574
Merge master into staging-next 2021-02-17 12:20:00 +00:00
Sandro
68ab562d23
Merge pull request #112941 from SuperSandro2000/ruby-jemalloc 
ruby: add option to enable jemalloc
 2021-02-17 11:21:58 +01:00
Jörg Thalheim
76cb8066f6
Merge pull request #112989 from happysalada/allow_erlang_openssl_override 2021-02-17 08:21:29 +00:00
github-actions[bot]
cd9df16806
Merge staging-next into staging 2021-02-17 06:14:55 +00:00
github-actions[bot]
3ed237717a
Merge master into staging-next 2021-02-17 06:14:47 +00:00
Sandro
0d44c7989c
Merge pull request #113265 from SuperSandro2000/fix-collection13 2021-02-17 03:14:49 +01:00
Sandro
0d489fc753
Merge pull request #110654 from stigtsp/package/perl-5.32.1-staging 
[staging] perl532: 5.32.0 -> 5.32.1, perl-cross: 4c55233 -> 1.3.5
 2021-02-17 03:01:01 +01:00
Nathan van Doorn
637fcf2593 j: fix build 2021-02-16 14:26:06 +00:00
github-actions[bot]
b31a0f36f8
Merge master into staging-next 2021-02-16 12:20:04 +00:00
Daniël de Kok
363f5d8fdf
Merge pull request #113271 from r-ryantm/auto-update/janet 
janet: 1.15.0 -> 1.15.2
 2021-02-16 08:52:17 +01:00
Sandro
8572994486
Merge pull request #113209 from iblech/patch-quickjs 
quickjs: 2019-12-21 -> 2020-11-08
 2021-02-16 08:26:14 +01:00
R. RyanTM
55f69b335f janet: 1.15.0 -> 1.15.2 2021-02-16 07:11:29 +00:00
Daniël de Kok
2df314c261 wasmer: remove spurious feature quotation 2021-02-16 08:09:17 +01:00
github-actions[bot]
60a01d886e
Merge master into staging-next 2021-02-16 06:16:35 +00:00
Sandro
3d0056a491
Merge pull request #113119 from ncryptid/master 
babashka 0.2.3 -> 0.2.10
 2021-02-16 04:52:22 +01:00
Sandro Jäckel
40019052a8
babashka: remove with lib 2021-02-16 03:59:54 +01:00
github-actions[bot]
6453fff3de
Merge master into staging-next 2021-02-16 00:36:43 +00:00
Raphael Megzari
fb0c10bbdb
Update pkgs/development/interpreters/erlang/generic-builder.nix 
Co-authored-by: Jörg Thalheim <Mic92@users.noreply.github.com>
 2021-02-16 06:47:17 +09:00
Wael Nasreddine
2df97e4b0a
Merge pull request #111662 from nicknovitski/remove-ruby-2.5 
Remove Ruby 2.5
 2021-02-15 10:21:46 -08:00
Ingo Blechschmidt
9961f5178d quickjs: 2019-12-21 -> 2020-11-08 2021-02-15 17:12:54 +01:00
github-actions[bot]
0e0fae3ebf
Merge master into staging-next 2021-02-15 06:16:49 +00:00
Mario Rodas
b393356aeb
Merge pull request #113128 from iblech/patch-racket 
racket: 7.9 -> 8.0
 2021-02-14 21:59:03 -05:00
Martin Weinelt
d6d63aef7d
pytestCheckHook: add support for disabling arbitrary paths 
Renames `disabledTestFiles` to the more genereric `disabledTestPaths` to
reflect that change.
 2021-02-15 00:34:35 +01:00
Anders Kaseorg
4a8b6c0317 pypy, pypy3: 7.3.2 → 7.3.3 
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
 2021-02-14 10:11:54 -08:00
Mario Rodas
661c43188e racket-minimal: fix build on darwin 2021-02-14 17:40:00 +01:00
Ingo Blechschmidt
aa36e5d524 racket: 7.9 -> 8.0 (closes #102704) 2021-02-14 17:38:02 +01:00
xynyx
a9781b0a84 babashka 0.2.3 -> 0.2.10 2021-02-14 05:32:25 -08:00