Commit Graph

9043 Commits

Author SHA1 Message Date
sternenseemann
4aa937d2e2 zz: install modules shipped with the compiler
Previously zz wouldn't be able to compile anything using standard
modules like mem or log out of the box.

To fix this we copy the modules directory included in the source to
$out/share/zz/modules and add an entry to ZZ_MODULE_PATHS in the wrapper
around zz.

We also remove a search path entry which used to reference /build
because it used CARGO_MANIFEST_DIR at build time. The default search
path now includes:

* /nix/store/modules
* $out/share/zz/modules
* $(pwd)/modules

Patching out /nix/store/modules would be kind of cumbersome as it is a
multi-line entry, but it probably does no harm and fine to leave in.

An issue arising by this PR might be that the added search path entry
may take priority over an user specified location even though we use
--suffix. This is because zz internally uses a HashSet which has no
guaranteed iteration order. This may lead to unexpected behavior for
users wo previously provided custom versions of the standard modules via
ZZ_MODULE_PATHS. However, this is an issue in upstream issue as well
where ZZ_MODULE_PATHS may or may not take priority over the compiled in
search path, so this issue should probably be resolved upstream (I'll
file a report or PR).
2021-01-25 14:25:42 +01:00
sternenseemann
190173e05b zz: adjust upstream URLs 2021-01-25 14:03:26 +01:00
Sandro
3cd31450a1
Revert "nodePackages: regenerate with node2nix 1.9.0" 2021-01-25 11:31:27 +01:00
Sander van der Burg
40f27ff2be
Merge pull request #110545 from svanderburg/node2nix-update
nodePackages: regenerate with node2nix 1.9.0
2021-01-25 09:13:59 +01:00
github-actions[bot]
b10ed56b8e
Merge master into staging-next 2021-01-25 01:18:25 +00:00
John Ericson
0710308402 clang, cc-wrapper: Move --gcc-toolchain logic into CC wrapper
Take 2, after #94582 had to be reverted.

This reverts commit ac03cfa3c5.
2021-01-24 15:49:32 -05:00
Jan Tojnar
cc8fd11ffb
Merge branch 'master' into staging-next 2021-01-24 20:41:42 +01:00
Fabian Möller
be4763a696
openjdk15-bootstrap: fix i686 build 2021-01-24 16:08:57 +01:00
volth
bc0d605cf1 treewide: fix double quoted strings in meta.description
Signed-off-by: Ben Siraphob <bensiraphob@gmail.com>
2021-01-24 19:56:59 +07:00
github-actions[bot]
b88b52998b
Merge master into staging-next 2021-01-24 01:18:51 +00:00
Gabor Greif
5105bf4b2e
llvm_{5,6,8..11}: fix missing lib from stdenv.lib -> lib (#110643)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-01-24 01:31:45 +01:00
Jan Tojnar
01ee4ea574
Merge branch 'master' into staging-next 2021-01-24 00:09:45 +01:00
John Ericson
12881a7aa7
Merge pull request #110544 from Ericson2314/no-platform
top-level, lib: Remove platform attribute of platforms
2021-01-23 16:32:36 -05:00
Sandro
10bb072072
Merge pull request #110610 from ck3d/fix-llvm11-cross
llvmPackages_11: Fix cross compilation
2021-01-23 22:23:39 +01:00
Christian Kögler
266f20d886 llvmPackages_11: Fix cross compilation 2021-01-23 18:03:24 +01:00
John Ericson
9c213398b3 lib: Clean up how linux and gcc config is specified
Second attempt of 8929989614589ee3acd070a6409b2b9700c92d65; see that
commit for details.

This reverts commit 0bc275e634.
2021-01-23 10:01:28 -05:00
Marek Fajkus
07a6732bf5
Fix elm-json build on Darwin 2021-01-23 14:28:08 +01:00
github-actions[bot]
58752914f4
Merge master into staging-next 2021-01-23 12:40:13 +00:00
Jörg Thalheim
f6a583eeec
Merge pull request #110465 from siraben/development-compilers-stdenv-lib
pkgs/development/compilers: stdenv.lib -> lib
2021-01-23 10:07:31 +00:00
Ben Siraphob
acc5f7b18a pkgs/development/compilers: stdenv.lib -> lib 2021-01-23 08:57:37 +07:00
github-actions[bot]
8103cb9089
Merge staging-next into staging 2021-01-23 01:18:03 +00:00
Jonathan Ringer
0bc275e634
Revert "lib: Clean up how linux and gcc config is specified"
This is a stdenv-rebuild, and should not be merged
into master

This reverts commit 8929989614.
2021-01-22 14:07:06 -08:00
Sander van der Burg
3e385dc285 nodePackages: regenerate with node2nix 1.9.0 2021-01-22 22:42:58 +01:00
Ryan Mulligan
406a590802
Merge pull request #110503 from r-ryantm/auto-update/mlkit
mlkit: 4.5.2 -> 4.5.6
2021-01-22 12:34:56 -08:00
John Ericson
d95aebbe0e
Merge pull request #107214 from Ericson2314/linux-config-cleanup
lib: Clean up how linux and gcc config is specified
2021-01-22 15:15:58 -05:00
R. RyanTM
adf23ffca7 mlkit: 4.5.2 -> 4.5.6 2021-01-22 15:54:29 +00:00
github-actions[bot]
a5bbeb4fb1
Merge staging-next into staging 2021-01-22 12:43:02 +00:00
Sandro
9a92886922
Merge pull request #110395 from zowoq/gemset 2021-01-22 09:31:07 +01:00
John Ericson
8929989614 lib: Clean up how linux and gcc config is specified
The `platform` field is pointless nesting: it's just stuff that happens
to be defined together, and that should be an implementation detail.

This instead makes `linux-kernel` and `gcc` top level fields in platform
configs. They join `rustc` there [all are optional], which was put there
and not in `platform` in anticipation of a change like this.

`linux-kernel.arch` in particular also becomes `linuxArch`, to match the
other `*Arch`es.

The next step after is this to combine the *specific* machines from
`lib.systems.platforms` with `lib.systems.examples`, keeping just the
"multiplatform" ones for defaulting.
2021-01-21 22:44:09 -05:00
Matthew Bauer
afc2edc3ee
Merge pull request #108060 from matthewbauer/strip-musl-gcc
gcc: allow stripping gcc libraries
2021-01-21 19:31:26 -06:00
github-actions[bot]
e48c1f8e8c
Merge staging-next into staging 2021-01-22 01:17:58 +00:00
Matthew Bauer
4bdcddf9aa gcc: allow stripping gcc libraries
When cross compiling to the same kernel / arch combination, it is safe
to use strip of libraries. This happens when cross-compiling musl
programs. dontStrip is now set in each gcc compiler instead of in
gcc/builder.sh.

Fixes #75476
2021-01-21 16:25:48 -06:00
zowoq
59b83c43e0 treewide: add final newline 2021-01-22 07:18:04 +10:00
Antonio Nuno Monteiro
29954335b7 ocamlPackages_4_12.ocaml: alpha3 -> beta1 2021-01-21 21:59:09 +01:00
github-actions[bot]
27c8ef972c
Merge staging-next into staging 2021-01-21 18:51:36 +00:00
Jörg Thalheim
5e0f8f6762
Merge pull request #109919 from pjjw/musl-rust-bootstrap-fix
rust: add musl-libc targets to bootstrapping
2021-01-21 15:24:35 +00:00
github-actions[bot]
df8b20163b
Merge staging-next into staging 2021-01-21 06:45:45 +00:00
zowoq
932941b79c treewide: editorconfig fixes
- remove trailing whitespace
- use spaces for indentation
2021-01-21 13:29:54 +10:00
github-actions[bot]
e5fef074d6
Merge staging-next into staging 2021-01-21 01:19:31 +00:00
zowoq
8adc564f28 treewide: editorconfig fixes
- add final newline
- use spaces for indentation
2021-01-21 09:30:52 +10:00
Sandro
e201b1233d
Merge pull request #109836 from r-ryantm/auto-update/gleam
gleam: 0.12.1 -> 0.13.2
2021-01-20 23:45:45 +01:00
zowoq
5313326b7f go_1_15: 1.15.6 -> 1.15.7 2021-01-21 06:56:22 +10:00
zowoq
3bcd19086c go_1_14: 1.14.13 -> 1.14.14 2021-01-21 06:56:22 +10:00
github-actions[bot]
b27f238893
Merge staging-next into staging 2021-01-20 01:20:12 +00:00
zowoq
31f5dd3f36 treewide: editorconfig fixes
- remove trailing whitespace
- use spaces for indentation
2021-01-20 09:11:11 +10:00
Jan Tojnar
fc7bd322df
Merge branch 'staging-next' into staging 2021-01-19 13:50:04 +01:00
Jonathan Ringer
9bb3fccb5b treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix
continuation of #109595

pkgconfig was aliased in 2018, however, it remained in
all-packages.nix due to its wide usage. This cleans
up the remaining references to pkgs.pkgsconfig and
moves the entry to aliases.nix.

python3Packages.pkgconfig remained unchanged because
it's the canonical name of the upstream package
on pypi.
2021-01-19 01:16:25 -08:00
Peter Woodman
0b8620e9b6
rust: add musl-libc targets to bootstrapping 2021-01-19 02:27:41 -05:00
github-actions[bot]
e8a1f18e58
Merge staging-next into staging 2021-01-19 01:18:25 +00:00
Sandro
82feb02e8d
Merge pull request #98011 from OPNA2608/update-acme-unstable-2020-08-26
acme: 120 -> unstable-2020-12-27
2021-01-19 00:32:28 +01:00
R. RyanTM
fd9714bb64 gleam: 0.12.1 -> 0.13.2 2021-01-18 22:11:33 +00:00
Jörg Thalheim
1881e81e3c
Merge pull request #103846 from kampka/llvm_11_musl
llvm_11: Disable checks on musl libc hosts
2021-01-18 20:11:55 +00:00
Christoph Neidahl
e0b02ce141 acme: 120 -> unstable-2020-12-27 2021-01-18 14:38:01 +01:00
zowoq
d93966200c Merge staging-next into staging 2021-01-18 13:03:13 +10:00
github-actions[bot]
b7f20dcd02
Merge master into staging-next 2021-01-18 01:16:03 +00:00
Austin Seipp
6ec4a219ce
yosys-bluespec: 2021.01.14 -> 2021.01.17
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2021-01-17 17:15:01 -06:00
Jan Tojnar
643a72b4f1
Merge branch 'staging-next' into staging 2021-01-17 05:52:43 +01:00
Jan Tojnar
e6f926d910
Merge branch 'master' into staging-next 2021-01-17 05:52:23 +01:00
Marek Fajkus
ccdf2b2be6
elmPackages.*: add meta
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-01-16 19:48:00 +01:00
github-actions[bot]
00577aef99
Merge staging-next into staging 2021-01-16 12:40:08 +00:00
github-actions[bot]
2445824f40
Merge master into staging-next 2021-01-16 12:40:04 +00:00
Sandro
a9bb54359e
Merge pull request #108099 from siraben/double-quotes-fix 2021-01-16 11:27:58 +01:00
Austin Seipp
d18e537613
Merge pull request #109461 from thoughtpolice/nixpkgs/yosys-plugins
yosys: add support for loading plugins, revert symbiflow changes
2021-01-16 03:51:57 -06:00
Ben Siraphob
8dd78bb4fb treewide: fix double quoted strings in meta.description 2021-01-16 11:29:30 +07:00
Austin Seipp
9a951db846
yosys: some more small fixes from review feedback
Fixes up the usage of patches/postInstall. Also removes `stdenv.lib` and
other minor tweaks.

Based on feedback from Sandro and Mihai.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2021-01-15 16:09:51 -06:00
Austin Seipp
365ef90263
yosys: cherry-pick some minor fixes (cf d81e4d9f6)
d81e4d9f66 contained some minor fixes to the yosys derivation
that make it a little easier to read and maintain. Incorporate those.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2021-01-15 16:09:50 -06:00
Austin Seipp
ec1830e696
init: experimental yosys-{bluespec, ghdl} plugins
These plugins can be included in a closure, along with the `yosys`
derivation, and they will be automatically picked up for use. For
example, this allows you to include 'yosys-bluespec' in your
`buildInputs`, and then immediately run:

    $ nix-shell -p yosys yosys-bluespec yosys-ghdl
    $ yosys -m bluespec -p 'help read_bluespec'
    $ yosys -m ghdl -p 'help ghdl'

These two plugins are a bit experimental, admittedly, but they are good,
clean examples of how to write and use the yosys plugin infrastructure,
and make it easy to test updates, etc.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2021-01-15 16:09:50 -06:00
github-actions[bot]
c1f25cbece
Merge staging-next into staging 2021-01-15 18:53:00 +00:00
github-actions[bot]
3269d4d3a3
Merge master into staging-next 2021-01-15 18:52:54 +00:00
Austin Seipp
7996fb0d4e
picat: 3.0p3 -> 3.0p4
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2021-01-15 12:03:57 -06:00
Jan Tojnar
e03806bc45
Merge branch 'staging-next' into staging 2021-01-15 17:47:43 +01:00
Jan Tojnar
c0d2951fa6
Merge branch 'master' into staging-next 2021-01-15 17:46:46 +01:00
Austin Seipp
2660037f8c
yosys: enable loading "out of band" plugins
By default, when yosys looks for plugins with the `-m` flag or `plugin`
command, it always looks in `YOSYS_PREFIX/share/yosys/plugins` for a
`.so` file, and loads that.

By design, this is intended to be a single, global, mutable location
such as `/usr/share/yosys/...` on disk, and plugins are supposed to
install their `.so` files here after yosys is installed, and they all
coexist together. Obviously, this won't work for us, but users might
expect these plugins to still work. More importantly, they won't want to
add special cases to their build systems.

Instead, to allow Nix users to use yosys plugins with the same UX (e.g.
natively call `plugin bluespec` or `-m ghdl`), we add a patch to yosys
that allows it to search a new `NIX_YOSYS_PLUGIN_DIRS` search path
environment variable. In tandem, we add a setup hook that adds to this
search path if a package has a `$out/share/yosys/plugins` directory.

Thus, it's enough to just include `yosys`, and any package that has a
yosys plugin in `$out/share/yosys/plugins`, and you can load it with
`-m` or the `plugin` command.

We could use a style like the haskellPackages set, where the set of
packages are "encased" in a lambda, and we pass packages that are
compatible with that version of the compiler:

    haskell.packages.ghc8102.ghcWithPackages (p: with p; [ ... ])

but, realistically, there will probably only ever be one version of
yosys and one set of compatible plugins, so this seems overdone.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2021-01-15 10:13:56 -06:00
Austin Seipp
51d1125f24
ghdl: 0.37 -> unstable-2021.01.14
This unreleased version of GHDL fixes a bunch of bugs. It also contains
a few internal API changes for synthesis support -- required by the GHDL
yosys plugin.

Ideally, we can just remove this when 0.38 comes out.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2021-01-15 10:13:46 -06:00
Austin Seipp
ca27105b04
Revert "Merge pull request #105709 from CajuM/symbiflow"
This reverts commit 02828f91f1, reversing
changes made to f0a7fce6ee.
2021-01-15 10:13:27 -06:00
Tim Steinbach
10e0e8251c
scala_2_12: 2.12.12 → 2.12.13 2021-01-15 10:39:11 -05:00
github-actions[bot]
0286df914e
Merge staging-next into staging 2021-01-15 06:40:41 +00:00
github-actions[bot]
83c50873f5
Merge master into staging-next 2021-01-15 06:40:38 +00:00
Milan
03a818a6f8
openjdk: build with empty pre-version (#108994)
Some applications, like the Jetbrains IDEs, check for a suffix to
determine if a stable JDK is used.
This flag was already passed for older versions, but it got lost for
OpenJDK 14+.
2021-01-15 05:12:41 +01:00
github-actions[bot]
fb6ed8abd1
Merge staging-next into staging 2021-01-14 18:54:08 +00:00
github-actions[bot]
183b673b64
Merge master into staging-next 2021-01-14 18:54:05 +00:00
Felix Springer
b77c2c5a89 idris2: 0.2.2 -> 0.3.0 2021-01-14 19:11:36 +01:00
adisbladis
7be71af02a
go: Introduce environment variable GO_NO_VENDOR_CHECKS to relax go vendor checks
This is used in https://github.com/tweag/gomod2nix to reconstruct a
vendor metadata file.

With the vendor checks we need a lot more metadata which isn't
relevant for building packages, especially since we've already locked
the dependency graph ahead of time

This has been ported from FreeBSD: https://reviews.freebsd.org/D24122
2021-01-12 18:08:41 +01:00
github-actions[bot]
f1bb6c74f9
Merge master into staging-next 2021-01-12 12:34:36 +00:00
Maximilian Bosch
f620cda93f
Merge pull request #109055 from lourkeur/update/oraclejdk8
oraclejdk8: 8u261 -> 8u271
2021-01-12 12:42:28 +01:00
github-actions[bot]
32a46d68f3
Merge master into staging-next 2021-01-12 01:04:47 +00:00
Dmitry Kalinkin
02828f91f1
Merge pull request #105709 from CajuM/symbiflow
Add Symbiflow + prjxray for OSS Xilinx FPGA development
2021-01-11 18:49:31 -05:00
Louis Bettens
2679f31ad1 oraclejdk8: 8u261 -> 8u271 2021-01-11 23:00:59 +01:00
github-actions[bot]
1cce663933
Merge staging-next into staging 2021-01-11 01:02:25 +00:00
github-actions[bot]
36bab113bf
Merge master into staging-next 2021-01-11 01:02:21 +00:00
Ben Siraphob
e9b6e535a6
vyper: init at 0.2.8 (#104758)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-01-11 02:01:47 +01:00
Jan Tojnar
88c998fb21
Merge branch 'staging-next' into staging 2021-01-10 23:24:57 +01:00
Jan Tojnar
dd72357155
Merge branch 'master' into staging-next 2021-01-10 23:24:33 +01:00
zowoq
134b008891 go: remove meta.branch
Only needed for `disabled` in `buildGo{Module,Package}`.
2021-01-11 06:00:38 +10:00
Câju Mihai-Drosi
44fbc60abd symbiflow-yosys-plugins: init at 0.8-6021-gd8b2d1a2 2021-01-10 10:01:48 +02:00
Câju Mihai-Drosi
c1674d2ace symbiflow-yosys: init at 0.8-6021-gd8b2d1a2 2021-01-10 10:01:48 +02:00
Câju Mihai-Drosi
d9140d37ad symbiflow-vtr: init at 8.0.0.rc2-4003-g8980e4621 2021-01-10 10:01:48 +02:00
Câju Mihai-Drosi
a7d6c39c3c prjxray-tools: init at 0.1-2676-gac8d30e3 2021-01-10 10:01:42 +02:00
Mihai-Drosi Câju
d81e4d9f66 yosys: Added plugins support and various fixes
* fixed buildInputs and nativeBuildInputs for cross compilation
* don't use pkgconfig alias
* simplified patchPhase
* made the version variable overridable in preBuild
2021-01-10 09:32:05 +02:00
Gabor Greif
9d1816e29e
llvmPackages_11: 11.0.0 -> 11.0.1 2021-01-09 21:28:27 +01:00