3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

8279 commits

Author SHA1 Message Date
Vladimír Čunát 01c2ba8575
Merge branch 'staging-next' into staging 2020-08-04 21:38:08 +02:00
Frederik Rietdijk 26c481b435 Merge master into staging-next 2020-08-04 12:48:50 +02:00
Vincent Laporte 04f9cd0b0c ocaml-ng.ocamlPackages_4_11.ocaml: 4.11.0+β2 → 4.11.0+β3 2020-08-04 11:26:34 +02:00
William Roe d51340f27f zig: fix build
It looks like https://github.com/NixOS/nixpkgs/pull/88248 broke the
build for zig.

The error you get when building zig on the current master branch is:

```
Scanning dependencies of target zig_build_libstage2
: CommandLine Error: Option 'polly' registered more than once!
LLVM ERROR: inconsistency in registered CommandLine options
make[2]: *** [CMakeFiles/zig_build_libstage2.dir/build.make:77: CMakeFiles/zig_build_libstage2] Error 1
make[1]: *** [CMakeFiles/Makefile2:252: CMakeFiles/zig_build_libstage2.dir/all] Error 2
make: *** [Makefile:150: all] Error 2
```

The patch that added polly into some build args was likely necessary
only for LLVM 10.0.0 and when that was updated to 10.0.1 it stopped
working or became unnecessary. With this patch removed, zig builds fine
and passes the tests.
2020-08-03 13:17:40 +01:00
Vladimír Čunát 460b2b81d4
Merge #94160: swift: fix cflags for finding C++ headers
Continuing fallout from commit f3f7612.
2020-08-03 08:59:50 +02:00
John Ericson b5f7ed6846
Merge pull request #91293 from Ericson2314/cxx-wrapper-debt-part-2
treewide: Get rid of `cc.gcc`
2020-08-02 20:42:20 -04:00
Maximilian Bosch 3c155bb20c
oraclejdk8: update jce hash
See c5dd1fba89 (commitcomment-41126603)
2020-08-02 23:33:59 +02:00
Michael Raskin 62f99d0bec
Merge pull request #92578 from fare-patches/fare
Update Gambit, Gerbil and libraries
2020-08-02 18:28:10 +00:00
Francois-Rene Rideau db34ea1698 gerbilPackages-unstable.gerbil-ethereum: init at 2020-08-02 2020-08-02 13:28:55 -04:00
Francois-Rene Rideau 953f41f540 gerbilPackages-unstable.gerbil-persist: init at 2020-08-02 2020-08-02 13:28:55 -04:00
Francois-Rene Rideau d0c856d4d0 gerbilPackages-unstable.gerbil-poo: init at 2020-08-02 2020-08-02 13:28:55 -04:00
Francois-Rene Rideau c9b05a3eb9 gerbilPackages-unstable.gerbil-crypto: init at 2020-08-01 2020-08-02 13:28:55 -04:00
Francois-Rene Rideau cc894c6d91 gerbilPackages-unstable.gerbil-utils: 2020-05-17 -> 2020-08-02
Better version support for Gerbil packages.
Use passthru for meta-information used by other packages.
2020-08-02 13:28:20 -04:00
John Ericson 92f96f47b0 treewide: Get rid of cc.gcc
Instead, we have a new `gccForLibs`, which has the appropriate
definition for e.g. avoiding `x86_32` linking problems.
2020-08-02 17:12:05 +00:00
Francois-Rene Rideau 0d99266e5e gerbil-unstable: 2020-05-17 -> 2020-08-02 2020-08-02 12:29:29 -04:00
Francois-Rene Rideau cb06aefd39 gambit-unstable: 2020-05-15 -> 2020-07-29 2020-08-02 12:29:28 -04:00
Benjamin Hipple 759eb65d2a
Merge pull request #94548 from bachp/openjdk14-14.0.2
openjdk14: 14.0.1 -> 14.0.2
2020-08-02 11:37:27 -04:00
Pascal Bach ef7c2d3cea openjdk14: 14.0.1 -> 14.0.2 2020-08-02 13:48:00 +02:00
Benjamin Asbach 56cff958e8 openjdk: 11.0.7 -> 11.0.8
Also added `minor` variable to reflect naming scheme introduced in java 9: https://bugs.openjdk.java.net/browse/JDK-8061493
2020-08-02 09:00:39 +02:00
Frederik Rietdijk 50c060d13d Merge master into staging-next 2020-08-01 19:37:20 +02:00
Domen Kožar 1353355a63
ghc 8.8.4/8.10.1: fix PEBKAC 2020-08-01 16:27:12 +02:00
Jörg Thalheim 0739f4b84f
Merge pull request #94105 from ddelabru/add-inform6
inform6: init at 6.34-6.12.2
2020-08-01 09:07:45 +01:00
Silvan Mosberger 64a9b4b7a3
Merge pull request #94165 from siraben/scas
scas: init at 0.4.6
2020-08-01 03:44:21 +02:00
Ben Siraphob a05e809205 scas: init at 0.4.6
Suggested changes
2020-08-01 08:30:38 +07:00
R. RyanTM 4ceed2d0d4 rgbds: 0.4.0 -> 0.4.1 2020-07-31 00:49:01 -07:00
Matthew Bauer d0677e6d45 treewide: add warning comment to “boot” packages
This adds a warning to the top of each “boot” package that reads:

  Note: this package is used for bootstrapping fetchurl, and thus cannot
  use fetchpatch! All mutable patches (generated by GitHub or cgit) that
  are needed here should be included directly in Nixpkgs as files.

This makes it clear to maintainer that they may need to treat this
package a little differently than others. Importantly, we can’t use
fetchpatch here due to using <nix/fetchurl.nix>. To avoid having stale
hashes, we need to include patches that are subject to changing
overtime (for instance, gitweb’s patches contain a version number at
the bottom).
2020-07-31 08:56:53 +02:00
Konrad Borowski 41d681c85f rustc: use LLVM 10
Fixes rust-lang/rust#74585
2020-07-31 08:52:22 +02:00
zowoq 3c5750d1cd buildGoModule packages: editorconfig fixes 2020-07-31 13:58:04 +10:00
Frederik Rietdijk cee7df4846 Merge staging-next into staging 2020-07-30 18:28:15 +02:00
Dominic Delabruere 406509dcae inform6: init at 6.34-6.12.2
nixpkgs already has Inform 7, which is a lovely design system for creating interactive fiction (text adventures) using a natural language compiler and a rich IDE. However, underlying Inform 7 is a C-like language, Inform 6, which has a much simpler toolchain and its own compiler and standard libraries, which I have packaged for nix here.
2020-07-30 10:27:25 -04:00
Matthew Bauer 1a3b07cf8e Merge commit 'b53902f535f2c63d71e916b9de22dbcfeec9d99e' into staging 2020-07-29 18:24:08 -05:00
Matthew Bauer 22f82fc8ca Revert "Merge pull request #94090 from sikmir/fix-cmake-hook"
This reverts commit e36b1d4ad1, reversing
changes made to c2ea7318be.

Should go to staging.
2020-07-29 18:20:56 -05:00
Matthew Bauer e36b1d4ad1
Merge pull request #94090 from sikmir/fix-cmake-hook
cmake: fix CMAKE_FIND_FRAMEWORK
2020-07-29 18:19:57 -05:00
Vladimír Čunát 60d89e5793
Merge branch 'master' into staging 2020-07-29 18:40:28 +02:00
worldofpeace 9b97ee7b64
Merge pull request #94092 from kolaente/update/flutter
flutterPackages.beta: 1.19.0-4.3.pre -> 1.20.0-7.2.pre, flutterPackages.dev: 1.20.0-3.0.pre -> 1.21.0-1.0.pre
2020-07-29 11:35:35 -04:00
kolaente ae1a227eb1
flutterPackages.beta: 1.19.0-4.3.pre -> 1.20.0-7.2.pre, flutterPackages.dev: 1.20.0-3.0.pre -> 1.21.0-1.0.pre 2020-07-29 16:56:22 +02:00
Michael Roitzsch 5c1b1e4326 swift: fix cflags for finding C++ headers 2020-07-29 09:43:22 +02:00
John Ericson cd719c1eae
Merge pull request #91974 from Mic92/nostdinc
stdenv: make -nostdinc work as intended
2020-07-28 19:49:42 -04:00
Matthew Bauer b331c72f03 llvm: setup some symlinks for compatibility with binutils
This is needed for cross-compiling for LLVM.

After https://github.com/NixOS/nixpkgs/pull/94088, we still need some
of these, so I’ve whitelisted those that are in binutils.

/cc @DavidTruby
2020-07-28 15:08:46 -05:00
Matthew Bauer ea842a7467
Merge pull request #88248 from ggreif/master
llvmPackages_10: 10.0.0 -> 10.0.1
2020-07-28 14:55:16 -05:00
Matthew Bauer 81bb09571f
Merge pull request #94061 from DieGoldeneEnte/llvm-manpage-disable
llvmPackages_{8..10}: comment out broken manpages
2020-07-28 14:54:28 -05:00
Matthew Bauer a5659d3605
Merge pull request #94088 from DavidTruby/master
llvm*: remove symlinks to llvm-diff, llvm-as and LLVM IR utilities
2020-07-28 14:50:48 -05:00
Matthew Bauer da3be4a38b
Merge pull request #93959 from r-ryantm/auto-update/wla-dx
wla-dx: 9.8 -> 9.11
2020-07-28 14:50:21 -05:00
Matthew Bauer b22fc7f03b
Merge pull request #91682 from DieGoldeneEnte/clang_rtti
clang_{5..10}: add RTTI
2020-07-28 14:47:54 -05:00
Nikolay Korotkiy b53902f535
cmake: fix CMAKE_FIND_FRAMEWORK 2020-07-28 19:05:43 +03:00
David Truby 46e5ea5af6 llvm*: remove symlinks to llvm-diff, llvm-as and associated LLVM IR utilities.
These llvm-prefixed utilities are not drop-in replacements for the utilities
with similar names, they are specifically for operating on LLVM IR files.
Symlinking these without the prefix causes incompatibilities with tools that
expect diff, as and others to behave normally.
2020-07-28 16:26:12 +01:00
worldofpeace 7cdb25cabe
Merge pull request #90681 from kolaente/update/flutter
flutter stable (1.12.13+hotfix.9 -> 1.17.3), beta (1.15.17 -> 1.19.0-4.1.pre) and dev (1.17.0-dev.5.0 -> 1.20.0-0.0.pre) update
2020-07-28 11:14:50 -04:00
Holger Wünsche c4740fcb1b
llvmPackages_{8..10}: comment out broken manpages
This disables all manpages packages depending on recommonmark. This can
be undone once recommonmark supports sphinx 3. The other
manpage-packages don't use recommonmark and don't need to be commented
out.
2020-07-28 09:34:13 +02:00
R. RyanTM 365d6f536e wla-dx: 9.8 -> 9.11 2020-07-27 08:48:24 +00:00
Gabor Greif e51d3a0399 llvmPackages_10: 10.0.0 -> 10.0.1
This is a purely bugfix release.

See: http://lists.llvm.org/pipermail/release-testers/2020-July/001297.html
2020-07-26 14:06:56 +02:00