From b9c7905b204a15cb3d7b98cc47c69030af3745cd Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Sat, 27 May 2023 17:16:31 +0800 Subject: [PATCH] nixpkgs 23.05 --- artiq/firmware/ksupport/Makefile | 2 +- artiq/firmware/runtime/Makefile | 2 +- flake.lock | 28 ++++++++++++++-------------- flake.nix | 24 ++++++++++++++---------- 4 files changed, 30 insertions(+), 26 deletions(-) diff --git a/artiq/firmware/ksupport/Makefile b/artiq/firmware/ksupport/Makefile index e1e3e48fd..7a7e26d85 100644 --- a/artiq/firmware/ksupport/Makefile +++ b/artiq/firmware/ksupport/Makefile @@ -26,7 +26,7 @@ $(RUSTOUT)/libksupport.a: ksupport.elf: $(RUSTOUT)/libksupport.a glue.o $(link) -T $(KSUPPORT_DIRECTORY)/ksupport.ld \ - -lunwind-$(CPU)-elf -lprintf-float -lm + -lunwind-$(CPU)-libc -lprintf-float -lm %.o: $(KSUPPORT_DIRECTORY)/%.c $(compile) diff --git a/artiq/firmware/runtime/Makefile b/artiq/firmware/runtime/Makefile index 3e4b91ba3..0427d763f 100644 --- a/artiq/firmware/runtime/Makefile +++ b/artiq/firmware/runtime/Makefile @@ -22,7 +22,7 @@ $(RUSTOUT)/libruntime.a: runtime.elf: $(RUSTOUT)/libruntime.a ksupport_data.o $(link) -T $(RUNTIME_DIRECTORY)/runtime.ld \ - -lunwind-bare -m elf32lriscv + -lunwind-vexriscv-bare -m elf32lriscv ksupport_data.o: ../ksupport/ksupport.elf $(LD) -r -m elf32lriscv -b binary -o $@ $< diff --git a/flake.lock b/flake.lock index 81eff9ce0..ce6453721 100644 --- a/flake.lock +++ b/flake.lock @@ -42,11 +42,11 @@ "mozilla-overlay": { "flake": false, "locked": { - "lastModified": 1677493379, - "narHash": "sha256-A1gO8zlWLv3+tZ3cGVB1WYvvoN9pbFyv0xIJHcTsckw=", + "lastModified": 1684487559, + "narHash": "sha256-SZcJEM+NnLr8ctzeQf1BGAqBHzJ3jn+tdSeO7lszIJc=", "owner": "mozilla", "repo": "nixpkgs-mozilla", - "rev": "78e723925daf5c9e8d0a1837ec27059e61649cb6", + "rev": "e6ca26fe8b9df914d4567604e426fbc185d9ef3e", "type": "github" }, "original": { @@ -57,16 +57,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1682173319, - "narHash": "sha256-tPhOpJJ+wrWIusvGgIB2+x6ILfDkEgQMX0BTtM5vd/4=", + "lastModified": 1685004253, + "narHash": "sha256-AbVL1nN/TDicUQ5wXZ8xdLERxz/eJr7+o8lqkIOVuaE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ee7ec1c71adc47d2e3c2d5eb0d6b8fbbd42a8d1c", + "rev": "3e01645c40b92d29f3ae76344a6d654986a91a91", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-22.11", + "ref": "nixos-23.05", "repo": "nixpkgs", "type": "github" } @@ -89,11 +89,11 @@ ] }, "locked": { - "lastModified": 1681290481, - "narHash": "sha256-VEZcGhbtJGonRrrWi31evNDVSerlLjEPL0MZGm9VlB8=", + "lastModified": 1685094262, + "narHash": "sha256-7DvbdTUYP7PbhZClT/tob66iMV95v7124RynMpPc5VA=", "owner": "m-labs", "repo": "sipyco", - "rev": "727631ada6e59dc6ef0ad50bfcc376d2ffe805aa", + "rev": "f1f0fc1d3071c5a6ba6dd613b54bb4176ad1e8dc", "type": "github" }, "original": { @@ -121,11 +121,11 @@ "src-misoc": { "flake": false, "locked": { - "lastModified": 1679903508, - "narHash": "sha256-TI0agjSSMJtH4mgAMpSO128zxcwSo/AjY1B6AW7zBQQ=", + "lastModified": 1685174995, + "narHash": "sha256-90UwWt9/TAaFAoYDpiIzHXqMWYfftlps8sodv/Gf07c=", "ref": "refs/heads/master", - "rev": "0cf0ebb7d4f56cc6d44a3dea3e386efab9d82419", - "revCount": 2437, + "rev": "d83499b318e8ef021b12e2df261707a165eb3afa", + "revCount": 2439, "submodules": true, "type": "git", "url": "https://github.com/m-labs/misoc.git" diff --git a/flake.nix b/flake.nix index a7207c8b9..24f1560aa 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,7 @@ { description = "A leading-edge control system for quantum information experiments"; - inputs.nixpkgs.url = github:NixOS/nixpkgs/nixos-22.11; + inputs.nixpkgs.url = github:NixOS/nixpkgs/nixos-23.05; inputs.mozilla-overlay = { url = github:mozilla/nixpkgs-mozilla; flake = false; }; inputs.sipyco.url = github:m-labs/sipyco; inputs.sipyco.inputs.nixpkgs.follows = "nixpkgs"; @@ -44,7 +44,7 @@ }); vivadoDeps = pkgs: with pkgs; [ - libxcrypt + libxcrypt-legacy ncurses5 zlib libuuid @@ -77,10 +77,8 @@ sha256 = "sha256-DAzmobw+c29Pt/URGO3bWXHBxgu9bDHhdTUBE9QJDe4="; }; propagatedBuildInputs = [ pkgs.python3Packages.pyqt5 ]; - checkInputs = [ pkgs.python3Packages.pytest ]; - checkPhase = '' - pytest -k 'test_qthreadexec.py' # the others cause the test execution to be aborted, I think because of asyncio - ''; + nativeCheckInputs = [ pkgs.python3Packages.pytest-runner pkgs.python3Packages.pytestCheckHook ]; + disabledTestPaths = [ "tests/test_qeventloop.py" ]; }; outputcheck = pkgs.python3Packages.buildPythonApplication rec { @@ -136,8 +134,14 @@ wrapQtApp "$out/bin/artiq_session" ''; - # Modifies PATH to pass the wrapped python environment (i.e. python3.withPackages(...) to subprocesses. - # Allows subprocesses using python to find all packages you have installed + preFixup = + '' + # Ensure that wrapProgram uses makeShellWrapper rather than makeBinaryWrapper + # brought in by wrapQtAppsHook. Only makeShellWrapper supports --run. + wrapProgram() { wrapProgramShell "$@"; } + ''; + ## Modifies PATH to pass the wrapped python environment (i.e. python3.withPackages(...) to subprocesses. + ## Allows subprocesses using python to find all packages you have installed makeWrapperArgs = [ ''--run 'if [ ! -z "$NIX_PYTHONPREFIX" ]; then export PATH=$NIX_PYTHONPREFIX/bin:$PATH;fi' '' "--set FONTCONFIG_FILE ${pkgs.fontconfig.out}/etc/fonts/fonts.conf" @@ -146,7 +150,7 @@ # FIXME: automatically propagate lld_11 llvm_11 dependencies # cacert is required in the check stage only, as certificates are to be # obtained from system elsewhere - checkInputs = [ pkgs.lld_11 pkgs.llvm_11 libartiq-support pkgs.lit outputcheck pkgs.cacert ]; + nativeCheckInputs = [ pkgs.lld_11 pkgs.llvm_11 libartiq-support pkgs.lit outputcheck pkgs.cacert ]; checkPhase = '' python -m unittest discover -v artiq.test @@ -401,7 +405,7 @@ ]; shellHook = '' export LIBARTIQ_SUPPORT=`libartiq-support` - export QT_PLUGIN_PATH=${pkgs.qt5.qtbase}/${pkgs.qt5.qtbase.dev.qtPluginPrefix} + export QT_PLUGIN_PATH=${pkgs.qt5.qtbase}/${pkgs.qt5.qtbase.dev.qtPluginPrefix} export QML2_IMPORT_PATH=${pkgs.qt5.qtbase}/${pkgs.qt5.qtbase.dev.qtQmlPrefix} ''; };