package artiq-comtools

This commit is contained in:
Sebastien Bourdeauducq 2022-02-13 17:16:55 +08:00
parent db9836d7c5
commit 3f6303ebe2
2 changed files with 74 additions and 10 deletions

View File

@ -2,19 +2,20 @@
"nodes": { "nodes": {
"artiq": { "artiq": {
"inputs": { "inputs": {
"artiq-comtools": "artiq-comtools",
"mozilla-overlay": "mozilla-overlay", "mozilla-overlay": "mozilla-overlay",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs_2",
"sipyco": "sipyco", "sipyco": "sipyco_2",
"src-migen": "src-migen", "src-migen": "src-migen",
"src-misoc": "src-misoc", "src-misoc": "src-misoc",
"src-pythonparser": "src-pythonparser" "src-pythonparser": "src-pythonparser"
}, },
"locked": { "locked": {
"lastModified": 1644659315, "lastModified": 1644743725,
"narHash": "sha256-1Bbv+sQsdnFF4SAa3YtyKq5r2kbNtKCtt7vsMzJqTBI=", "narHash": "sha256-iCsb/4pQYm7svfbGClqveNsLU2KG1fXm/d4UvU0oApk=",
"ref": "master", "ref": "master",
"rev": "5a8928fbf351fcc252389710e9a9c588ea9aa0f2", "rev": "6dfc854673eeba66f7c59be14f7f262f3a779acd",
"revCount": 7969, "revCount": 7970,
"type": "git", "type": "git",
"url": "https://github.com/m-labs/artiq.git" "url": "https://github.com/m-labs/artiq.git"
}, },
@ -23,6 +24,25 @@
"url": "https://github.com/m-labs/artiq.git" "url": "https://github.com/m-labs/artiq.git"
} }
}, },
"artiq-comtools": {
"inputs": {
"nixpkgs": "nixpkgs",
"sipyco": "sipyco"
},
"locked": {
"lastModified": 1644743100,
"narHash": "sha256-XqxMq2l2DXSovV7r2k/FXjYRM3bvVl3Mjy+C1koVAx4=",
"owner": "m-labs",
"repo": "artiq-comtools",
"rev": "8a126dd7d0a3f2d50ae151ec633cd52587d98796",
"type": "github"
},
"original": {
"owner": "m-labs",
"repo": "artiq-comtools",
"type": "github"
}
},
"mozilla-overlay": { "mozilla-overlay": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -71,6 +91,22 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_3": {
"locked": {
"lastModified": 1644472683,
"narHash": "sha256-sP6iM4NksOYO6NFfTJ96cg+ClPnq6cdY30xKA1iYtyU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "7adc9c14ec74b27358a8df9b973087e351425a79",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-21.11",
"repo": "nixpkgs",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"artiq": "artiq" "artiq": "artiq"
@ -78,14 +114,36 @@
}, },
"sipyco": { "sipyco": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_2" "nixpkgs": [
"artiq",
"artiq-comtools",
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1644634510, "lastModified": 1644649772,
"narHash": "sha256-5p88NKK/DTdb0F0+/7uObBohthdxHWLl782AaiPRf8E=", "narHash": "sha256-LE9L5bDSunCPEnuf5Ed8enTAXA2vkTSmjvqPX9ILO0Y=",
"owner": "m-labs", "owner": "m-labs",
"repo": "sipyco", "repo": "sipyco",
"rev": "e9e69527927761544ab6d62f751e1ff512d1e661", "rev": "8e4382352bc64bd01c9db35d9c9b0ef42b8b9d3b",
"type": "github"
},
"original": {
"owner": "m-labs",
"repo": "sipyco",
"type": "github"
}
},
"sipyco_2": {
"inputs": {
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1644649772,
"narHash": "sha256-LE9L5bDSunCPEnuf5Ed8enTAXA2vkTSmjvqPX9ILO0Y=",
"owner": "m-labs",
"repo": "sipyco",
"rev": "8e4382352bc64bd01c9db35d9c9b0ef42b8b9d3b",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -126,6 +126,12 @@
src = artiq.packages.x86_64-linux.pythonparser.src; src = artiq.packages.x86_64-linux.pythonparser.src;
dependencies = [ "regex" ]; dependencies = [ "regex" ];
} }
{
name = "artiq-comtools";
version = artiq.inputs.artiq-comtools.packages.x86_64-linux.artiq-comtools.version;
src = artiq.inputs.artiq-comtools.packages.x86_64-linux.artiq-comtools.src;
dependencies = [ "numpy" "aiohttp" "sipyco" ];
}
{ {
name = "artiq"; name = "artiq";
version = artiq.packages.x86_64-linux.artiq.version; version = artiq.packages.x86_64-linux.artiq.version;