public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
295,533 Commits 1 Branch 0 Tags
nsd-state-dir
Commit Graph
5239 Commits
Author SHA1 Message Date
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 LeagueandSandro 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:
https://github.com/babashka/babashka/blob/77daea7362d8e2562c89c315b1fbcefde6fa56a5/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