From Leon Schuermann to ~lschuermann/nix-litex
Thomas Watson <twatson52@icloud.com> writes: > Pass the system used by the default `pkgs` when importing > `sbtPinnedNixpkgs` to avoid a `builtins.currentSystem` invocation which is > incompatible with pure evaluation such as used by flakes. Thanks! To git.sr.ht:~lschuermann/nix-litex 3837230..45d2fc9 main -> main
From to ~lschuermann/nix-litex
From: Leon Schuermann <leon@is.currently.online>
To support continuous integration building of the nix-litex package
set against various upstream Nixpkgs versions, and to prepare for
integrating an automated update bot with the repository, this adds a
Hydra jobset specification in release.nix.
Currently, this specification is rather minimalistic. It takes in a
reference nixpkgs source to import (provided by Hydra as part of the
jobset definition) and builds all output packages.
Previously, the `default.nix` packages attribute further contained the
`mkSbtDerivation` expression, which the Hydra evaluator does not
like. Also, it seems weird to have the package set be exported both as
[message trimmed]
From to ~lschuermann/nix-litex
From: Leon Schuermann <leon@is.currently.online>
This unbreaks package tests on the current nixpkgs-unstable branch, as
`buildPythonPackage` has been adjusted to rename `checkInputs` to
`nativeCheckInputs`, breaking existing checkInputs specifications
because of `strictDeps = 1;`. For more information, check out the
corresponding PR at [1]. This implements the proposed workaround[2]
for supporting both the current nixos-unstable and the last release
branch (NixOS 22.11).
[1]: https://github.com/NixOS/nixpkgs/pull/206742
[2]: https://github.com/NixOS/nixpkgs/pull/206742#issuecomment-1417674430
Co-authored-by: Thomas Watson <twatson52@icloud.com>
[message trimmed]
From to ~lschuermann/nix-litex
From: Leon Schuermann <leon@is.currently.online> NixOS 21.05 is long deprecated, hence we shouldn't need to instruct users on how to get Nix >= v2.4 any longer. Signed-off-by: Leon Schuermann <leon@is.currently.online> --- README.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/README.md b/README.md index 2350cb9..66f628b 100644 --- a/README.md +++ b/README.md [message trimmed]
From to ~lschuermann/nix-litex
From: Leon Schuermann <leon@is.currently.online> This updates the LiteX packages targeted by this package set to their respective latest revisions, as fetched on 2022-02-04. It required some further changes due to LiteX restructuring their CPU test suite and enables us to drop some carried patches for the `litex` package. Signed-off-by: Leon Schuermann <leon@is.currently.online> --- pkgs/litex-boards.nix | 2 ++ ...able-LiteX-CPU-tests-for-select-CPUs.patch | 16 ++++++------ pkgs/litex/default.nix | 10 ++----- pkgs/litex_packages.toml | 26 +++++++++---------- .../pythondata-cpu-vexriscv_smp/generated.nix | 2 +- [message trimmed]
From to ~lschuermann/nix-litex
From: Leon Schuermann <leon@is.currently.online>
Along with a recent nixpkgs update, the buildPythonPackage function
has been updated to check that there is a ./dist directory in the
built derivations when using setuptools. This thus breaks when
building the final derivations (combining `-unchecked` and `-test`
packages), which simply copy the `-unchecked` package contents to
$out:
Executing pythonOutputDistPhase
The build contains no ./dist directory.
If this project is not setuptools-based, pass
format = "other";
[message trimmed]
From to ~lschuermann/nix-litex
From: Leon Schuermann <leon@is.currently.online> This patch set implements various fixes and updates around the nix-litex package set. Compared to the initial version of the patch, this includes a reliable way of detecting whether to use the `buildPythonPackage`'s `nativeCheckInputs` vs. `checkInputs`. This was discovered / recommended by Thomas Watson (Cc'ed), and avoids shipping a giant list of commit hashes which are known to be affected by these upstream changes. Commit "Switch from checkInputs to nativeCheckInputs on >= NixOS 23.05" has more information on this. For more information on this patchset, please refer to the initial
From to ~lschuermann/nix-litex
From: Leon Schuermann <leon@is.currently.online>
This unbreaks package tests on the current nixpkgs-unstable branch, as
`buildPythonPackage` has been adjusted to rename `checkInputs` to
`nativeCheckInputs`, breaking existing checkInputs specifications
because of `strictDeps = 1;`. For more information, check out the
corresponding PR at [1]. This implements the proposed workaround[2]
for supporting both the current nixos-unstable and the last release
branch (NixOS 22.11). It furthermore attempts to identify revisions of
the 23.05pre-git unstable which did not include this patch.
[1]: https://github.com/NixOS/nixpkgs/pull/206742
[2]: https://github.com/NixOS/nixpkgs/pull/206742#issuecomment-1417674430
[message trimmed]
From to ~lschuermann/nix-litex
From: Leon Schuermann <leon@is.currently.online>
To support continuous integration building of the nix-litex package
set against various upstream Nixpkgs versions, and to prepare for
integrating an automated update bot with the repository, this adds a
Hydra jobset specification in release.nix.
Currently, this specification is rather minimalistic. It takes in a
reference nixpkgs source to import (provided by Hydra as part of the
jobset definition) and builds all output packages.
Previously, the `default.nix` packages attribute further contained the
`mkSbtDerivation` expression, which the Hydra evaluator does not
like. Also, it seems weird to have the package set be exported both as
[message trimmed]
From to ~lschuermann/nix-litex
From: Leon Schuermann <leon@is.currently.online>
This unbreaks package tests on the current nixpkgs-unstable branch, as
`buildPythonPackage` has been adjusted to rename `checkInputs` to
`nativeCheckInputs`, breaking existing checkInputs specifications
because of `strictDeps = 1;`. For more information, check out the
corresponding PR at [1]. This implements the proposed workaround[2]
for supporting both the current nixos-unstable and the last release
branch (NixOS 22.11).
[1]: https://github.com/NixOS/nixpkgs/pull/206742
[2]: https://github.com/NixOS/nixpkgs/pull/206742#issuecomment-1417674430
Signed-off-by: Leon Schuermann <leon@is.currently.online>
[message trimmed]