M-Labs
/
artiq-extrapkg
2
0
Fork 4
Code Issues 1 Pull Requests 1 Projects Releases Wiki Activity

update, export more for single-input user flake

pull/8/head
Sebastien Bourdeauducq 2023-01-15 12:57:02 +08:00
parent 4e3bb3714d
commit 3f3abd749d
2 changed files with 90 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
flake.lock
View File

@ -1,38 +1,14 @@
{ {
"nodes": { "nodes": {
"artiq": {
"inputs": {
"artiq-comtools": "artiq-comtools",
"mozilla-overlay": "mozilla-overlay",
"nixpkgs": "nixpkgs",
"sipyco": "sipyco",
"src-migen": "src-migen",
"src-misoc": "src-misoc",
"src-pythonparser": "src-pythonparser"
},
"locked": {
"lastModified": 1671600871,
"narHash": "sha256-lUbJfs5gylpO2BIrgaDsR/dkoEnNqZcTEOujmlBgK+E=",
"ref": "refs/heads/master",
"rev": "8dc6902c23fb9f0462fe079f2ced5719aa085568",
"revCount": 8254,
"type": "git",
"url": "https://github.com/m-labs/artiq.git"
},
"original": {
"type": "git",
"url": "https://github.com/m-labs/artiq.git"
}
},
"artiq-comtools": { "artiq-comtools": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"nixpkgs": [ "nixpkgs": [
"artiq", "artiqpkgs",
"nixpkgs" "nixpkgs"
], ],
"sipyco": [ "sipyco": [
"artiq", "artiqpkgs",
"sipyco" "sipyco"
] ]
}, },
@ -79,29 +55,53 @@
"url": "https://gitlab.com/duke-artiq/artiq-stubs.git" "url": "https://gitlab.com/duke-artiq/artiq-stubs.git"
} }
}, },
"artiqpkgs": {
"inputs": {
"artiq-comtools": "artiq-comtools",
"mozilla-overlay": "mozilla-overlay",
"nixpkgs": "nixpkgs",
"sipyco": "sipyco",
"src-migen": "src-migen",
"src-misoc": "src-misoc",
"src-pythonparser": "src-pythonparser"
},
"locked": {
"lastModified": 1673756833,
"narHash": "sha256-sfn/Jwzr00tZLiGAM5ZuvERFJGXfS0U6nGgmzrqza5Y=",
"ref": "refs/heads/master",
"rev": "20e8f17b3d8b3452366a2ca23369b669b2334805",
"revCount": 8304,
"type": "git",
"url": "https://github.com/m-labs/artiq.git"
},
"original": {
"type": "git",
"url": "https://github.com/m-labs/artiq.git"
}
},
"daxpkgs": { "daxpkgs": {
"inputs": { "inputs": {
"artiq-stubs": "artiq-stubs", "artiq-stubs": "artiq-stubs",
"artiqpkgs": [ "artiqpkgs": [
"artiq" "artiqpkgs"
], ],
"flake8-artiq": "flake8-artiq", "flake8-artiq": "flake8-artiq",
"nixpkgs": [ "nixpkgs": [
"artiq", "artiqpkgs",
"nixpkgs" "nixpkgs"
], ],
"sipyco": [ "sipyco": [
"artiq", "artiqpkgs",
"sipyco" "sipyco"
], ],
"trap-dac-utils": "trap-dac-utils" "trap-dac-utils": "trap-dac-utils"
}, },
"locked": { "locked": {
"lastModified": 1671209611, "lastModified": 1673464052,
"narHash": "sha256-IBIdF8inxa21DTkonUKQ25bTy/1twpQQjU1g5rbBWxo=", "narHash": "sha256-sd4Omkj5szP5qlz9Em4zNKBR3gTVdrzyxnvbMZna2gE=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "1c47f53cca6ba455df5c2f6566f138f0b8495a4b", "rev": "bc4a68509dad415ab2071eb8b98aa7dbe5960442",
"revCount": 1080, "revCount": 1128,
"type": "git", "type": "git",
"url": "https://gitlab.com/duke-artiq/dax.git" "url": "https://gitlab.com/duke-artiq/dax.git"
}, },
@ -153,11 +153,11 @@
"mozilla-overlay": { "mozilla-overlay": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1664789696, "lastModified": 1672878308,
"narHash": "sha256-UGWJHQShiwLCr4/DysMVFrYdYYHcOqAOVsWNUu+l6YU=", "narHash": "sha256-0+fl6PHokhtSV+w58z2QD2rTf8QhcOGsT9o4LwHHZHE=",
"owner": "mozilla", "owner": "mozilla",
"repo": "nixpkgs-mozilla", "repo": "nixpkgs-mozilla",
"rev": "80627b282705101e7b38e19ca6e8df105031b072", "rev": "d38863db88e100866b3e494a651ee4962b762fcc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -168,11 +168,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1669735802, "lastModified": 1673345971,
"narHash": "sha256-qtG/o/i5ZWZLmXw108N2aPiVsxOcidpHJYNkT45ry9Q=", "narHash": "sha256-4DfFcKLRfVUTyuGrGNNmw37IeIZSoku9tgTVmu/iD98=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "731cc710aeebecbf45a258e977e8b68350549522", "rev": "54644f409ab471e87014bb305eac8c50190bcf48",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -184,23 +184,23 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"artiq": "artiq", "artiqpkgs": "artiqpkgs",
"daxpkgs": "daxpkgs" "daxpkgs": "daxpkgs"
} }
}, },
"sipyco": { "sipyco": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"artiq", "artiqpkgs",
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1669369686, "lastModified": 1673433867,
"narHash": "sha256-YHez+S3PTUgtuliUNB5WM+RXcj8RKLbHVRvOgELSkwU=", "narHash": "sha256-a7Oq35YoDzPtISbqAsaT+2/v15HZ7G1q0ukXmKWdb7Q=",
"owner": "m-labs", "owner": "m-labs",
"repo": "sipyco", "repo": "sipyco",
"rev": "98db6eacb084c2c5280fb653bee3d313e3ca6df8", "rev": "38f8f4185d7db6b68bd7f71546da9077b1e2561c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -212,11 +212,11 @@
"src-migen": { "src-migen": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1662111470, "lastModified": 1673433200,
"narHash": "sha256-IPyhoFZLhY8d3jHB8jyvGdbey7V+X5eCzBZYSrJ18ec=", "narHash": "sha256-ribBG06gsucz5oBS+O6aL8s2oJjx+qfl+vXmspts8gg=",
"owner": "m-labs", "owner": "m-labs",
"repo": "migen", "repo": "migen",
"rev": "639e66f4f453438e83d86dc13491b9403bbd8ec6", "rev": "f3e9145c9825514a1b4225378936569da4df8e12",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -228,11 +228,11 @@
"src-misoc": { "src-misoc": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1669779825, "lastModified": 1671158014,
"narHash": "sha256-l3lyy6dmbivo9Tppb08KHSyU89ZZG1CCcSjPlNRD210=", "narHash": "sha256-50w0K2E2ympYrG1Tte/HVbsp4FS2U+yohqZByXTOo4I=",
"ref": "master", "ref": "refs/heads/master",
"rev": "2c255775f732a41ba1a512ab3d2547af4e25f674", "rev": "26f039f9f6931a20a04ccd0f0a5402f67f553916",
"revCount": 2435, "revCount": 2436,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/m-labs/misoc.git" "url": "https://github.com/m-labs/misoc.git"

74
flake.nix
View File

@ -1,20 +1,20 @@
{ {
description = "Additional packages for ARTIQ"; description = "Additional packages for ARTIQ";
inputs.artiq.url = git+https://github.com/m-labs/artiq.git; inputs.artiqpkgs.url = git+https://github.com/m-labs/artiq.git;
inputs.daxpkgs = { inputs.daxpkgs = {
url = git+https://gitlab.com/duke-artiq/dax.git; url = git+https://gitlab.com/duke-artiq/dax.git;
inputs = { inputs = {
artiqpkgs.follows = "artiq"; artiqpkgs.follows = "artiqpkgs";
nixpkgs.follows = "artiq/nixpkgs"; nixpkgs.follows = "artiqpkgs/nixpkgs";
sipyco.follows = "artiq/sipyco"; sipyco.follows = "artiqpkgs/sipyco";
}; };
}; };
outputs = { self, artiq, daxpkgs }: outputs = { self, artiqpkgs, daxpkgs }:
let let
pkgs = import artiq.inputs.nixpkgs { system = "x86_64-linux"; }; pkgs = import artiqpkgs.inputs.nixpkgs { system = "x86_64-linux"; };
msys2 = import ./msys2 { inherit pkgs; }; msys2 = import ./msys2 { inherit pkgs; };
condaDeps = with pkgs; [ zlib xorg.libSM xorg.libICE xorg.libX11 xorg.libXau xorg.libXi xorg.libXrender libselinux libGL ]; condaDeps = with pkgs; [ zlib xorg.libSM xorg.libICE xorg.libX11 xorg.libXau xorg.libXi xorg.libXrender libselinux libGL ];
@ -122,9 +122,11 @@
}; };
in rec { in rec {
inherit pkgs;
inherit makeCondaChannel; inherit makeCondaChannel;
inherit (msys2) makeMsys2Package makeMsys2Repos; inherit (msys2) makeMsys2Package makeMsys2Repos;
packages.x86_64-linux = rec { packages.x86_64-linux = rec {
inherit (artiqpkgs.packages.x86_64-linux) artiq openocd-bscanspi;
korad_ka3005p = pkgs.python3Packages.buildPythonPackage { korad_ka3005p = pkgs.python3Packages.buildPythonPackage {
pname = "korad_ka3005p"; pname = "korad_ka3005p";
version = "1.1"; version = "1.1";
@ -134,7 +136,7 @@
rev = "a1898409cb188b388ed1cf84e76ca69e9c8a74eb"; rev = "a1898409cb188b388ed1cf84e76ca69e9c8a74eb";
sha256 = "0h20qss70nssqiagc2fx75mravq1pji7rizhag3nq8xrcz2w20nc"; sha256 = "0h20qss70nssqiagc2fx75mravq1pji7rizhag3nq8xrcz2w20nc";
}; };
propagatedBuildInputs = [ artiq.inputs.sipyco.packages.x86_64-linux.sipyco artiq.packages.x86_64-linux.asyncserial ]; propagatedBuildInputs = [ artiq.inputs.sipyco.packages.x86_64-linux.sipyco artiqpkgs.packages.x86_64-linux.asyncserial ];
}; };
novatech409b = pkgs.python3Packages.buildPythonPackage { novatech409b = pkgs.python3Packages.buildPythonPackage {
pname = "novatech409b"; pname = "novatech409b";
@ -145,7 +147,7 @@
rev = "3bd559753972f07d881df66b7c6819afc5436053"; rev = "3bd559753972f07d881df66b7c6819afc5436053";
sha256 = "1g9qv6fn5h7d393mb1v7w8sg6fimqg34blqdj22qnayb4agw1wyg"; sha256 = "1g9qv6fn5h7d393mb1v7w8sg6fimqg34blqdj22qnayb4agw1wyg";
}; };
propagatedBuildInputs = [ artiq.inputs.sipyco.packages.x86_64-linux.sipyco artiq.packages.x86_64-linux.asyncserial ]; propagatedBuildInputs = [ artiqpkgs.inputs.sipyco.packages.x86_64-linux.sipyco artiqpkgs.packages.x86_64-linux.asyncserial ];
}; };
lda = pkgs.python3Packages.buildPythonPackage { lda = pkgs.python3Packages.buildPythonPackage {
name = "lda"; name = "lda";
@ -156,7 +158,7 @@
rev = "2d8af1e9080a4c1ab4a32370b3f926bfba8c00b2"; rev = "2d8af1e9080a4c1ab4a32370b3f926bfba8c00b2";
sha256 = "sha256-bImAsQiGmMauasltUrlkCRU3+p40d41DTlJvOjCfrP0="; sha256 = "sha256-bImAsQiGmMauasltUrlkCRU3+p40d41DTlJvOjCfrP0=";
}; };
propagatedBuildInputs = [ artiq.inputs.sipyco.packages.x86_64-linux.sipyco ]; propagatedBuildInputs = [ artiqpkgs.inputs.sipyco.packages.x86_64-linux.sipyco ];
postPatch = '' postPatch = ''
substituteInPlace lda/hidapi.py \ substituteInPlace lda/hidapi.py \
--replace "hidapi_lib_path = None"\ --replace "hidapi_lib_path = None"\
@ -172,7 +174,7 @@
rev = "0cb0c15fc7e660a150e193245f5338d48f8b97db"; rev = "0cb0c15fc7e660a150e193245f5338d48f8b97db";
sha256 = "1n4zmjcj2kpd97217y602pq6x8s80w39fgyi6qjmal92aicqdg07"; sha256 = "1n4zmjcj2kpd97217y602pq6x8s80w39fgyi6qjmal92aicqdg07";
}; };
propagatedBuildInputs = [ artiq.inputs.sipyco.packages.x86_64-linux.sipyco artiq.packages.x86_64-linux.asyncserial ]; propagatedBuildInputs = [ artiqpkgs.inputs.sipyco.packages.x86_64-linux.sipyco artiqpkgs.packages.x86_64-linux.asyncserial ];
}; };
newfocus8742 = pkgs.python3Packages.buildPythonPackage { newfocus8742 = pkgs.python3Packages.buildPythonPackage {
pname = "newfocus8742"; pname = "newfocus8742";
@ -183,7 +185,7 @@
rev = "9f6092b724b33b934aa4d3a1d6a20c295cd1d02d"; rev = "9f6092b724b33b934aa4d3a1d6a20c295cd1d02d";
sha256 = "0qf05ghylnqf3l5vjx5dc748wi84xn6p6lb6f9r8p6f1z7z67fb8"; sha256 = "0qf05ghylnqf3l5vjx5dc748wi84xn6p6lb6f9r8p6f1z7z67fb8";
}; };
propagatedBuildInputs = [ artiq.inputs.sipyco.packages.x86_64-linux.sipyco pkgs.python3Packages.pyusb ]; propagatedBuildInputs = [ artiqpkgs.inputs.sipyco.packages.x86_64-linux.sipyco pkgs.python3Packages.pyusb ];
# no unit tests so do a simple smoke test # no unit tests so do a simple smoke test
checkPhase = "python -m newfocus8742.aqctl_newfocus8742 -h"; checkPhase = "python -m newfocus8742.aqctl_newfocus8742 -h";
}; };
@ -196,7 +198,7 @@
rev = "68369d5d63d233827840a9a752d90454a4e03baa"; rev = "68369d5d63d233827840a9a752d90454a4e03baa";
sha256 = "0r832c0icz8v3w27ci13024bqfslj1gx6dwhjv11ksw229xdcghd"; sha256 = "0r832c0icz8v3w27ci13024bqfslj1gx6dwhjv11ksw229xdcghd";
}; };
propagatedBuildInputs = [ artiq.inputs.sipyco.packages.x86_64-linux.sipyco ]; propagatedBuildInputs = [ artiqpkgs.inputs.sipyco.packages.x86_64-linux.sipyco ];
# no unit tests without hardware so do a simple smoke test # no unit tests without hardware so do a simple smoke test
checkPhase = "python -m hut2.aqctl_hut2 -h"; checkPhase = "python -m hut2.aqctl_hut2 -h";
}; };
@ -214,8 +216,8 @@
postFixup = '' postFixup = ''
wrapQtApp "$out/bin/wand_gui" wrapQtApp "$out/bin/wand_gui"
''; '';
propagatedBuildInputs = [ artiq.packages.x86_64-linux.artiq artiq.packages.x86_64-linux.qasync ] propagatedBuildInputs = [ artiqpkgs.packages.x86_64-linux.artiq artiqpkgs.packages.x86_64-linux.qasync ]
++ [ artiq.inputs.sipyco.packages.x86_64-linux.sipyco ] ++ [ artiqpkgs.inputs.sipyco.packages.x86_64-linux.sipyco ]
++ (with pkgs.python3Packages; [ numpy scipy influxdb pyqtgraph setuptools ]); ++ (with pkgs.python3Packages; [ numpy scipy influxdb pyqtgraph setuptools ]);
}; };
flake8-artiq = daxpkgs.packages.x86_64-linux.flake8-artiq; flake8-artiq = daxpkgs.packages.x86_64-linux.flake8-artiq;
@ -229,7 +231,7 @@
rev = "0f0196b6941b0c44a33c85d8c02047ca65466463"; rev = "0f0196b6941b0c44a33c85d8c02047ca65466463";
sha256 = "0mx6yjvprhdnkdigwns8mg6v5daqxpgbv7mf63fa76i1iv2wvak4"; sha256 = "0mx6yjvprhdnkdigwns8mg6v5daqxpgbv7mf63fa76i1iv2wvak4";
}; };
propagatedBuildInputs = [ artiq.packages.x86_64-linux.artiq ] propagatedBuildInputs = [ artiqpkgs.packages.x86_64-linux.artiq ]
++ (with pkgs.python3Packages; [ numpy pyqt5 pyqtgraph ]); ++ (with pkgs.python3Packages; [ numpy pyqt5 pyqtgraph ]);
doCheck = false; doCheck = false;
}; };
@ -292,30 +294,30 @@
conda-channel = makeCondaChannel [ conda-channel = makeCondaChannel [
{ {
name = "sipyco"; name = "sipyco";
version = artiq.inputs.sipyco.packages.x86_64-linux.sipyco.version; version = artiqpkgs.inputs.sipyco.packages.x86_64-linux.sipyco.version;
src = artiq.inputs.sipyco.packages.x86_64-linux.sipyco.src; src = artiqpkgs.inputs.sipyco.packages.x86_64-linux.sipyco.src;
dependencies = [ "numpy" "pybase64" ]; dependencies = [ "numpy" "pybase64" ];
} }
{ {
name = "pythonparser"; name = "pythonparser";
version = artiq.packages.x86_64-linux.pythonparser.version; version = artiqpkgs.packages.x86_64-linux.pythonparser.version;
src = artiq.packages.x86_64-linux.pythonparser.src; src = artiqpkgs.packages.x86_64-linux.pythonparser.src;
dependencies = [ "regex" ]; dependencies = [ "regex" ];
} }
{ {
name = "artiq-comtools"; name = "artiq-comtools";
version = artiq.inputs.artiq-comtools.packages.x86_64-linux.artiq-comtools.version; version = artiqpkgs.inputs.artiq-comtools.packages.x86_64-linux.artiq-comtools.version;
src = artiq.inputs.artiq-comtools.packages.x86_64-linux.artiq-comtools.src; src = artiqpkgs.inputs.artiq-comtools.packages.x86_64-linux.artiq-comtools.src;
dependencies = [ "numpy" "aiohttp" "sipyco" ]; dependencies = [ "numpy" "aiohttp" "sipyco" ];
} }
{ {
name = "artiq"; name = "artiq";
version = artiq.packages.x86_64-linux.artiq.version; version = artiqpkgs.packages.x86_64-linux.artiqpkgs.version;
src = artiq.packages.x86_64-linux.artiq.src; src = artiqpkgs.packages.x86_64-linux.artiqpkgs.src;
preSetup = preSetup =
'' ''
export VERSIONEER_OVERRIDE=${artiq.packages.x86_64-linux.artiq.version} export VERSIONEER_OVERRIDE=${artiqpkgs.packages.x86_64-linux.artiqpkgs.version}
export VERSIONEER_REV=${artiq.sourceInfo.rev} export VERSIONEER_REV=${artiqpkgs.sourceInfo.rev}
''; '';
dependencies = [ dependencies = [
"pythonparser" "pythonparser"
@ -408,30 +410,30 @@
msys2-pythonparser = msys2.makeMsys2Package rec { msys2-pythonparser = msys2.makeMsys2Package rec {
name = "python-pythonparser"; name = "python-pythonparser";
version = artiq.packages.x86_64-linux.pythonparser.version; version = artiqpkgs.packages.x86_64-linux.pythonparser.version;
src = artiq.packages.x86_64-linux.pythonparser.src; src = artiqpkgs.packages.x86_64-linux.pythonparser.src;
depends = [ "mingw-w64-x86_64-python-regex" ]; depends = [ "mingw-w64-x86_64-python-regex" ];
}; };
msys2-sipyco = msys2.makeMsys2Package { msys2-sipyco = msys2.makeMsys2Package {
name = "python-sipyco"; name = "python-sipyco";
src = artiq.inputs.sipyco.packages.x86_64-linux.sipyco.src; src = artiqpkgs.inputs.sipyco.packages.x86_64-linux.sipyco.src;
inherit (artiq.inputs.sipyco.packages.x86_64-linux.sipyco) version; inherit (artiqpkgs.inputs.sipyco.packages.x86_64-linux.sipyco) version;
depends = [ "mingw-w64-x86_64-python" "mingw-w64-x86_64-python-numpy" "mingw-w64-x86_64-python-pybase64" ]; depends = [ "mingw-w64-x86_64-python" "mingw-w64-x86_64-python-numpy" "mingw-w64-x86_64-python-pybase64" ];
}; };
msys2-artiq-comtools = msys2.makeMsys2Package { msys2-artiq-comtools = msys2.makeMsys2Package {
name = "artiq-comtools"; name = "artiq-comtools";
src = artiq.inputs.artiq-comtools.packages.x86_64-linux.artiq-comtools.src; src = artiqpkgs.inputs.artiq-comtools.packages.x86_64-linux.artiq-comtools.src;
inherit (artiq.inputs.artiq-comtools.packages.x86_64-linux.artiq-comtools) version; inherit (artiqpkgs.inputs.artiq-comtools.packages.x86_64-linux.artiq-comtools) version;
depends = [ "mingw-w64-x86_64-python" "mingw-w64-x86_64-python-sipyco" "mingw-w64-x86_64-python-numpy" "mingw-w64-x86_64-python-aiohttp" ]; depends = [ "mingw-w64-x86_64-python" "mingw-w64-x86_64-python-sipyco" "mingw-w64-x86_64-python-numpy" "mingw-w64-x86_64-python-aiohttp" ];
}; };
msys2-artiq = msys2.makeMsys2Package { msys2-artiq = msys2.makeMsys2Package {
name = "artiq"; name = "artiq";
src = artiq; src = artiq;
inherit (artiq.packages.x86_64-linux.artiq) version; inherit (artiqpkgs.packages.x86_64-linux.artiq) version;
prepare = prepare =
'' ''
export VERSIONEER_OVERRIDE=${artiq.packages.x86_64-linux.artiq.version} export VERSIONEER_OVERRIDE=${artiqpkgs.packages.x86_64-linux.artiq.version}
export VERSIONEER_REV=${artiq.sourceInfo.rev} export VERSIONEER_REV=${artiqpkgs.sourceInfo.rev}
''; '';
depends = [ depends = [
"mingw-w64-x86_64-python" "mingw-w64-x86_64-python"
@ -456,8 +458,8 @@
}; };
msys2-asyncserial = msys2.makeMsys2Package { msys2-asyncserial = msys2.makeMsys2Package {
name = "python-asyncserial"; name = "python-asyncserial";
version = artiq.packages.x86_64-linux.asyncserial.version; version = artiqpkgs.packages.x86_64-linux.asyncserial.version;
src = artiq.packages.x86_64-linux.asyncserial.src; src = artiqpkgs.packages.x86_64-linux.asyncserial.src;
depends = [ "mingw-w64-x86_64-python" ]; depends = [ "mingw-w64-x86_64-python" ];
}; };
msys2-korad_ka3005p = msys2.makeMsys2Package { msys2-korad_ka3005p = msys2.makeMsys2Package {