Commit Graph

4625 Commits

Author SHA1 Message Date
Elis Hirwing
18723740d9
Merge pull request #101840 from sikmir/php
php: fix on darwin
2020-11-04 06:59:32 +01:00
Frederik Rietdijk
6ddd6b4914 Revert "Merge pull request #93083 from risicle/ris-cpython-debug"
This increase the closure size by 30 MB.

https://github.com/NixOS/nixpkgs/pull/93083#issuecomment-718025366

This reverts commit 4b340cbbb4, reversing
changes made to 47e499f7a4.
2020-11-03 12:50:05 +01:00
Frederik Rietdijk
470f05cb5d Merge staging-next into staging 2020-11-03 12:06:41 +01:00
Frederik Rietdijk
237966224d Merge master into staging-next 2020-11-03 12:06:06 +01:00
Will Young
8edf9cf5d0 spidermonkey: 78.1.0 -> 78.4.0 2020-11-02 23:30:28 +01:00
Pavol Rusnak
2c931312ce treewide: simplify rev/repo arguments in src
+ use fetchFromGithub where possible
2020-11-01 23:02:24 -08:00
Frederik Rietdijk
83dde6c52c Merge staging-next into staging 2020-11-01 10:11:12 +01:00
Benjamin Andresen
43776fb11e clojure: 1.10.1.645 -> 1.10.1.727 2020-10-31 21:42:24 +01:00
zimbatm
c409f69480
pythonPackages.pip: make reproducible (#102222)
The previous attempt wasn't covering all of the bases. It relied on
invoking that pip-install-hook, and didn't apply to pip itself.

The core issue is that the generated .pyc files embed some of the
temporary paths, which are randomly generated. See
https://r13y.com/diff/bf8c3ca3148ebff9ecf41f294cc60b9f209c006d49699e356969ff32d736f1c6-8806a7cca91fdd300e48736bfcd57c4d0b54c1cc2fd61609f35143170862b59c.html

In this new attempt, the approach is to patch the TempFile
implementation directly, so that it creates stable temporary
directories. We also assume that if SOURCE_DATE_EPOCH is set, we are in
a scenario where reproducible builds are desirable and enter that
branch.

See also https://github.com/pypa/pip/issues/7808
2020-10-31 21:24:36 +01:00
Vladimír Čunát
dfd3ede68d
Merge branch 'master' into staging-next 2020-10-31 14:30:44 +01:00
Mario Rodas
e250fef768
Merge pull request #99920 from ericdallo/add-dart-to-flutter
flutter: Bump and add dart cache to flutter
2020-10-30 08:56:54 -05:00
Eric Dallo
bee3fb885f
flutter: Add dart cache to flutter 2020-10-30 09:58:06 -03:00
Vladimír Čunát
0b32140b34
Merge branch 'staging-next' into staging 2020-10-28 18:48:56 +01:00
Vladimír Čunát
31839c352e
Merge branch 'master' into staging-next 2020-10-28 18:48:18 +01:00
zimbatm
7aee32121a
ruby: make the build reproducible
ext/io/console/io-console.gemspec was embedding a timestamp which made
the build not reproducible. Gems respect SOURCE_DATE_EPOCH so it's
enough to just delete that line if it exists.

This file has been fixed in
679a941d05 (diff-d8422f096931c58d4463e2489f62a228b0f24f0492950ba88c8c89a0d741cfe6)
And then ruby regularly merges that gem into their own repository. Ruby
master is fixed but none of the ruby releases have been fixed yet.

lib/ruby/gems/2.6.0/specifications/default/io-console-0.4.7.gemspec now
contains:

    s.date = "1980-01-01"
2020-10-27 14:20:08 +01:00
Nikolay Korotkiy
e300f0fd69
php: fix on darwin 2020-10-27 13:24:20 +03:00
Stig Palmquist
8b71dfed92
rakudo: 2020.09 -> 2020.10 2020-10-26 15:32:59 +01:00
Stig Palmquist
e0007b1383
nqp: 2020.09 -> 2020.10 2020-10-26 15:32:42 +01:00
Stig Palmquist
50fc95822e
moarvm: 2020.09 -> 2020.10 2020-10-26 15:32:24 +01:00
Vladimír Čunát
89023c38fc
Recover the complicated situation after my bad merge
I made a mistake merge.  Reverting it in c778945806 undid the state
on master, but now I realize it crippled the git merge mechanism.
As the merge contained a mix of commits from `master..staging-next`
and other commits from `staging-next..staging`, it got the
`staging-next` branch into a state that was difficult to recover.

I reconstructed the "desired" state of staging-next tree by:
 - checking out the last commit of the problematic range: 4effe769e2
 - `git rebase -i --preserve-merges a8a018ddc0` - dropping the mistaken
   merge commit and its revert from that range (while keeping
   reapplication from 4effe769e2)
 - merging the last unaffected staging-next commit (803ca85c20)
 - fortunately no other commits have been pushed to staging-next yet
 - applying a diff on staging-next to get it into that state
2020-10-26 09:01:04 +01:00
Vladimír Čunát
336bc8283b
Re-Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2"
This reverts commit c778945806.

I believe this is exactly what brings the staging branch into
the right shape after the last merge from master (through staging-next);
otherwise part of staging changes would be lost
(due to being already reachable from master but reverted).
2020-10-26 08:19:17 +01:00
Vladimír Čunát
c778945806
Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2"
I'm sorry; I didn't notice it contained staging commits.

This reverts commit 17f5305b6c, reversing
changes made to a8a018ddc0.
2020-10-25 09:41:51 +01:00
Vladimír Čunát
17f5305b6c
Merge #101508: libraw: 0.20.0 -> 0.20.2 2020-10-25 09:28:53 +01:00
Jan Tojnar
d13fc932cd
Merge branch 'master' into staging-next 2020-10-22 21:20:14 +02:00
Mario Rodas
d73cc1e586 ruby: fix build on darwin
cc-tools 949.0.1 added a warning on linking which ruby misinterprets as
an error with LDFLAGS.
2020-10-22 04:20:00 +00:00
R. RyanTM
5f43184565 duktape: 2.5.0 -> 2.6.0 2020-10-24 16:03:19 +00:00
StigP
eaadab0fcd
Merge pull request #101336 from stigtsp/package/perl-5.33.3
perldevel: 5.33.2 -> 5.33.3, perl-cross: f59d2b6 -> 65e06e2
2020-10-23 12:12:36 +00:00
Stig Palmquist
a07b4a0017
perldevel: 5.33.2 -> 5.33.3
dependencies:
perl-cross: f59d2b6a179760230d925550db78b93c410433e4 -> 65e06e238ccb949e8399bdebc6d7fd798c34127b
2020-10-22 10:29:47 +02:00
Doron Behar
4696a622ce
Merge pull request #78778 from grahamc/guile-r13y
guile: disable parallel building for reproducibility
2020-10-21 20:21:25 +03:00
Jonathan del Strother
f0431e22c1 rubygems: 3.1.2 -> 3.1.3 2020-10-20 21:10:43 +02:00
Jonathan Ringer
67d2de5ffa python310: init at 3.10a1 2020-10-19 09:31:27 -07:00
Ryan Mulligan
12642234d9
Merge pull request #99883 from mtanzi/elixir-1.11.0
elixir_1_11: init at 1.11.0
2020-10-19 08:52:02 -07:00
marco
6e0d3b659c
Elixir: 1.11.0 -> 1.11.1 2020-10-18 18:57:52 +02:00
Mario Rodas
48518633ec
Merge pull request #100987 from r-ryantm/auto-update/joker
joker: 0.15.6 -> 0.15.7
2020-10-18 11:48:02 -05:00
R. RyanTM
f739404c2b joker: 0.15.6 -> 0.15.7 2020-10-18 15:14:12 +00:00
Ben Siraphob
683a87dbeb treewide: remove periods from end of package descriptions 2020-10-17 08:22:31 -07:00
Ryan Mulligan
ea04f84829
Merge pull request #100831 from r-ryantm/auto-update/alda
alda: 1.4.2 -> 1.4.3
2020-10-17 08:18:08 -07:00
R. RyanTM
44516af3df alda: 1.4.2 -> 1.4.3 2020-10-17 14:45:08 +00:00
Jonathan Ringer
9c9418151d update-python-libraries: allow for top-level attrs to be updated with github fetcher 2020-10-15 12:10:08 -07:00
Frederik Rietdijk
b3aed163d5
Merge pull request #99709 from NixOS/staging-next
Staging next
2020-10-14 21:10:31 +02:00
Elis Hirwing
5a12d2797c
php: Fix pear path 2020-10-14 07:41:30 +02:00
Frederik Rietdijk
9e1943edc0 Merge master into staging-next 2020-10-13 19:34:34 +02:00
Jonathan Ringer
2a9c3ec083
update-python-libraries: make script updateScript friendly 2020-10-11 12:03:18 -07:00
Jan Tojnar
aabcf2d8f5
Merge branch 'master' into staging-next 2020-10-11 00:27:21 +02:00
Ben Siraphob
7d04bd6da1 cyclone-scheme: enable parallel build 2020-10-10 16:57:21 +07:00
Vladimír Čunát
338b25697c
Merge branch 'master' into staging-next
Quite many rebuilds from master:
> Estimating rebuild amount by counting changed Hydra jobs.
>    3926 x86_64-darwin
>    4645 x86_64-linux
2020-10-10 11:32:10 +02:00
Mario Rodas
fb261a5bab
Merge pull request #99939 from siraben/cyclone-scheme-init
cyclone-scheme: init at 0.21
2020-10-09 07:55:57 -05:00
Ben Siraphob
e3b083effc cyclone-scheme: init at 0.21 2020-10-09 11:51:29 +07:00
Frederik Rietdijk
ec28e32c9e Merge master into staging-next 2020-10-08 21:47:26 +02:00
Daniël de Kok
c8111ef271
Merge pull request #99946 from ggreif/master
wasmtime: 0.19.0 -> 0.20.0
2020-10-08 10:02:09 +02:00
Gabor Greif
0243a18c8d wasmtime: 0.19.0 -> 0.20.0 2020-10-07 12:56:06 +02:00
Jan Tojnar
a07508c1d3
php: declare ZTS support
Binary extensions like Blackfire need to know whether PHP was
compiled with ZTS support to work properly.
2020-10-07 10:44:53 +02:00
marco
26857cc851
elixir_1_11: init at 1.11.0
Set elixir_1_11 as default elixir version.
2020-10-07 10:30:35 +02:00
Vladimír Čunát
c7b3d98659
Merge #99227: luajit*: update and enableGC64 by default 2020-10-07 07:40:11 +02:00
Frederik Rietdijk
692d219a93 Merge staging-next into staging 2020-10-06 10:25:58 +02:00
Jonathan Ringer
4eaf246f24 update-python-libraries: add github fetcher 2020-10-06 00:55:43 -07:00
Mario Rodas
6bfc199531 ruby: add marsam to maintainers 2020-10-06 09:45:39 +02:00
Mario Rodas
17e3f3258f ruby_2_7: 2.7.1 -> 2.7.2
https://www.ruby-lang.org/en/news/2020/10/02/ruby-2-7-2-released/
2020-10-06 09:45:39 +02:00
Mario Rodas
35d7c8ac6f ruby: update RVM patchsets 2020-10-06 09:45:39 +02:00
Raphael Borun Das Gupta
3696bc0e89 python39: 3.9.0rc2 -> 3.9.0 2020-10-06 08:32:37 +02:00
Luka Blaskovic
351bf9584e luajit_2_1: 2.1.0-2020-08-27 -> 2.1.0-2020-09-30 2020-10-01 08:22:27 +00:00
Luka Blaskovic
8baffaecac luajit_2_0: 2.0.5-2020-08-09 -> 2.0.5-2020-09-27 2020-10-01 04:40:19 +00:00
WORLDofPEACE
3451caf60b
Merge pull request #99008 from mkg20001/cjs-upgrade
Cjs upgrade
2020-09-30 14:30:56 -04:00
Doron Behar
e1773ee0bb
Merge pull request #98977 from stigtsp/package/rakudo-2020.09 2020-09-30 11:13:20 +03:00
Jan Tojnar
32b4375f10
Merge branch 'staging-next' into staging 2020-09-29 00:12:29 +02:00
Doron Behar
1d45990efb
spidermonkey_78: init at 78.1.0
* format

Co-authored-by: WORLDofPEACE <worldofpeace@protonmail.ch>
2020-09-28 15:08:23 +02:00
Stig Palmquist
6c44133fac
perldevel: 5.33.1 -> 5.33.2
dependencies:
perl-cross: 15ca5359f99698ef0a199bc307b7956c08907abc -> f59d2b6a179760230d925550db78b93c410433e4
2020-09-28 02:11:03 +02:00
Stig Palmquist
ac60d134ed
rakudo: 2020.08.2 -> 2020.09 2020-09-28 01:33:12 +02:00
Stig Palmquist
a770277640
nqp: 2020.08.2 -> 2020.09 2020-09-28 01:32:43 +02:00
Stig Palmquist
e31d6d1fab
moarvm: 2020.08 -> 2020.09 2020-09-28 01:32:18 +02:00
Stig P
3e2cf215f7
Merge pull request #98468 from stigtsp/package/micropython-1.13
micropython: 1.12 -> 1.13
2020-09-27 19:25:11 +00:00
Frederik Rietdijk
7c411b3729 python38: 3.8.5 -> 3.8.6 2020-09-27 13:07:49 +02:00
Frederik Rietdijk
74f3e9cce1 python39: 3.9.0rc1 -> 3.9.0rc2 2020-09-27 11:48:00 +02:00
Jörg Thalheim
7011d448ec
Merge pull request #98693 from fzakaria/jruby-shebang-fix
Fix shebang for binaries in JRuby
2020-09-25 10:05:05 +02:00
Graham Bennett
3a5bcb313e octave: use qt-5 mkDerivation for wrapQtAppsHook
This is to ensure QT_QPA_PLATFORM_PLUGIN_PATH is set on Darwin.
2020-09-25 09:57:25 +03:00
Farid Zakaria
8da7bd63ca jruby: fix shebang for binaries in JRuby
There are a variety of additional scripts that are included with the
JRuby installation that use JRuby itself.

For instance the `bin/gem` had the following contents:

```bash
❯ cat /nix/store/kglkqf56ii83yl6yrgcaj5r3s9m2fzr0-jruby-9.2.13.0/bin/gem

load File.join(File.dirname(__FILE__), 'jgem')
```

This is clearly wrong. Patchshebangs was not picking up the fix as part
of stdenv because the patch is not a build input but the final output
itself.

We have to rely on substituteInPlace so that we get the correct version.

```bash
❯ cat /nix/store/k4fnrn0dcsh2wzw81217r0ywsspb468f-jruby-9.2.13.0/bin/gem

```
2020-09-24 17:57:17 -07:00
zimbatm
cc9b34a56b
Merge pull request #98649 from cw789/elixir_cleanup
elixir_1_6: remove
2020-09-24 22:00:03 +00:00
Vladyslav M
0a3987a63f
janet: 1.10.1 -> 1.12.2 (#98679) 2020-09-24 21:41:07 +00:00
Jan Tojnar
d471c5d1f3
Merge branch 'staging-next' into staging 2020-09-24 23:09:00 +02:00
cw
3c379af10b elixir_1_6: remove
Additionally removed the now obsolete rebar build dependency for elixir.
2020-09-24 15:14:52 +02:00
Johannes Rosenberger
7abb57c7b5 fix passing qt5 version to pythonInterpreters
fixes c88f3adb17, which resulted in
qt 5.15 being used in pythonPackages, despite 5.14 being
declared, and adapts qutebrowser accordingly.

'callPackage { pkgs = pkgs // { … }; }' does not work, because
it does not take into account the recursive evaluation of nixpkgs:

`pkgs/development/interpreters/python/default.nix` calls
`pkgs/top-level/python-packages.nix` with `callPackage`.
Thus, even if the former gets passed the updated `pkgs`,
the latter always gets passed `pkgs.pkgs`.

For the change in the qt5 version to apply consistently, 'pkgs.extend'
must be used.

qutebrowser only used the right qt5 version (5.15) because all
pythonPackages used it anyway.
2020-09-22 21:03:43 +02:00
Stig Palmquist
a2dd66b087
micropython: 1.12 -> 1.13 2020-09-22 15:37:42 +02:00
Stig Palmquist
e2926577a1
perl-cross: fix . being included in INC
perl-cross set `default_inc_excludes_dot` to undefined by default. This
sets `-Ddefault_inc_excludes_dot` explicitly when cross compiling.
2020-09-22 14:35:46 +02:00
WORLDofPEACE
34aaac6d7c Merge branch 'staging-next' into staging 2020-09-20 18:41:15 -04:00
Gabriel Ebner
ef4cbbabd1 clojure: use latest jdk 2020-09-20 11:32:06 +02:00
Gabriel Ebner
db0d3d8d36 erlang: use openjdk8 2020-09-19 14:34:49 +02:00
Thiago Kenji Okada
a323331e6a dart: Fix dart2native by patching all ELFs
Before:

   $ /nix/store/ihlzjcxahcack6chfzphb74bkccmq6br-dart-2.7.2/bin/dart2native hello.dart
   Failed to generate native files:
   ProcessException: No such file or directory
     Command: /nix/store/ihlzjcxahcack6chfzphb74bkccmq6br-dart-2.7.2/bin/utils/gen_snapshot --snapshot-kind=app-aot-elf --elf=/tmp/HSHJQU/snapshot.aot /tmp/HSHJQU/kernel.dill

After:
   $ /nix/store/czw7kpdmcqa76a9j00v2pjygrq7gy4c7-dart-2.7.2/bin/dart2native hello.dart
   Generated: /home/thiagoko/hello.exe

   $ ./hello.exe
   Hello, World!
2020-09-17 15:33:17 -03:00
Drew Risinger
60df61b67e mk-python-derivation: document pyproject format
Optional setting of format == "pyproject", "egg" had been documented
in the manual, but they weren't listed in the function header for
``mk-python-derivation.nix``.
2020-09-16 17:38:41 +02:00
Stig P
0a5be167a3
Merge pull request #97098 from volth/cpan2nix-2020-09-04
perlPackages: bulk update
2020-09-14 10:33:20 +00:00
Luflosi
fbefec0d3e j: fix build on darwin
On darwin the compilation would fail with the following warning:
```
clang-7: error: argument unused during compilation: '-fno-strict-overflow' [-Werror,-Wunused-command-line-argument]
```
This error happens because the `-fno-strict-overflow` is passed to the compiler. To fix this, disable the `strictoverflow` hardening feature. Also see #39687.

ZHF: #97479
2020-09-09 15:09:26 -07:00
volth
4faa3e3dcd perl: remove obsolete patch 2020-09-09 09:08:48 +00:00
WORLDofPEACE
f764549bc8
Merge pull request #96668 from NobbZ/erlang-config-flags
erlang: make `configureFlags` appending instead of overwriting
2020-09-08 19:41:17 -04:00
Mario Rodas
ee222ce046
Merge pull request #88915 from bsima/shen
shen-sbcl: init at 3.0.3
2020-09-07 21:34:07 -05:00
Frederik Rietdijk
af81d39b87 Merge staging-next into staging 2020-09-04 20:03:30 +02:00
Jonathan Ringer
762434fb02 python39: 3.9.0b5 -> 3.9.0rc1 2020-09-03 23:36:28 -07:00
Frederik Rietdijk
377242d587 Merge staging-next into staging 2020-09-03 19:21:10 +02:00
Michael Raskin
742c7340d2
Merge pull request #96494 from jitwit/j
j: j901e -> j901f
2020-09-03 05:22:07 +00:00
John Ericson
1965a241fc
Merge pull request #61019 from volth/gcc.arch-amd
platform.gcc.arch: support for AMD CPUs
2020-09-01 22:31:16 -04:00
Frederik Rietdijk
e29c1e42e0 Merge staging-next into staging 2020-08-31 19:46:33 +02:00
Vladimír Čunát
0e58393738
luajit*: update to address CVE-2020-24372
/cc roundup issues: #96821, #96828.

The diff upstream is fairly small, so let me trust Mike Pall on this.
Both versions get a pair of commits that seem to address the CVE
https://github.com/LuaJIT/LuaJIT/issues/603
and 2.1 additionally gets one other small commit.
2020-08-31 16:31:12 +02:00