Commit graph

8954 commits

Author SHA1 Message Date
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
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
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
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
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
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
zowoq 932941b79c treewide: editorconfig fixes
- remove trailing whitespace
- use spaces for indentation
2021-01-21 13:29:54 +10: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
zowoq 31f5dd3f36 treewide: editorconfig fixes
- remove trailing whitespace
- use spaces for indentation
2021-01-20 09:11:11 +10: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
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
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 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] 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] 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 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] 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] 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
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