bradbqc
/
artiq-extrapkg
forked from M-Labs/artiq-extrapkg
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: bradbqc:16af931d0c5c62354d3dec1c0e4dc3e7309fce86
Branches Tags
bradbqc:master
bradbqc:release-8
bradbqc:release-7
M-Labs:release-8
M-Labs:master
M-Labs:release-7
..
compare: bradbqc:781c61de19a721ea9e13bf995f3a677eeec1fa15
Branches Tags
bradbqc:release-8
bradbqc:master
bradbqc:release-7
M-Labs:release-8
M-Labs:master
M-Labs:release-7

No commits in common. "16af931d0c5c62354d3dec1c0e4dc3e7309fce86" and "781c61de19a721ea9e13bf995f3a677eeec1fa15" have entirely different histories.
16af931d0c ... 781c61de19

2 changed files with 54 additions and 173 deletions
Show Stats Expand all files Collapse all files

175
flake.lock
View File

@ -11,11 +11,11 @@
"src-pythonparser": "src-pythonparser" "src-pythonparser": "src-pythonparser"
}, },
"locked": { "locked": {
"lastModified": 1669341018, "lastModified": 1659431458,
"narHash": "sha256-6tO/7AyiFfRdRLvA4p+lCQt9bRVN3n/dNWyGdKg43GM=", "narHash": "sha256-+CZVEohTMBLVbBf6W81H309rxrF7fOzAKkEJ7QVIu14=",
"ref": "release-7", "ref": "release-7",
"rev": "75d75cc13c15ab57948dbaeb0467fa9c021e84c2", "rev": "eba143a47530adbd9d402a9736d0fdc06dcf836f",
"revCount": 8143, "revCount": 8116,
"type": "git", "type": "git",
"url": "https://github.com/m-labs/artiq.git" "url": "https://github.com/m-labs/artiq.git"
}, },
@ -27,7 +27,6 @@
}, },
"artiq-comtools": { "artiq-comtools": {
"inputs": { "inputs": {
"flake-utils": "flake-utils",
"nixpkgs": [ "nixpkgs": [
"artiq", "artiq",
"nixpkgs" "nixpkgs"
@ -38,11 +37,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1664405593, "lastModified": 1654007592,
"narHash": "sha256-yP441NerlLGig7n+9xHsx8yCtZ+Ggd0VqfBSzc20E04=", "narHash": "sha256-vaDFhE1ItjqtIcinC/6RAJGbj44pxxMUEeQUa3FtgEE=",
"owner": "m-labs", "owner": "m-labs",
"repo": "artiq-comtools", "repo": "artiq-comtools",
"rev": "15ddac62813ef623a076ccf982b3bc63d314e651", "rev": "cb73281154656ee8f74db1866859e31bf42755cd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -51,114 +50,14 @@
"type": "github" "type": "github"
} }
}, },
"artiq-stubs": {
"inputs": {
"artiqpkgs": [
"daxpkgs",
"artiqpkgs"
],
"flake8-artiq": [
"daxpkgs",
"flake8-artiq"
],
"nixpkgs": [
"daxpkgs",
"nixpkgs"
]
},
"locked": {
"lastModified": 1670448913,
"narHash": "sha256-ZCg7Rd5qpYl5Y8FEtLObnFRUiSJVZuSBdpa57SMVoNE=",
"ref": "refs/heads/master",
"rev": "d592ccd1db4d9a97331d5397560d25b59c7820bb",
"revCount": 26,
"type": "git",
"url": "https://gitlab.com/duke-artiq/artiq-stubs.git"
},
"original": {
"type": "git",
"url": "https://gitlab.com/duke-artiq/artiq-stubs.git"
}
},
"daxpkgs": {
"inputs": {
"artiq-stubs": "artiq-stubs",
"artiqpkgs": [
"artiq"
],
"flake8-artiq": "flake8-artiq",
"nixpkgs": [
"artiq",
"nixpkgs"
],
"sipyco": [
"artiq",
"sipyco"
],
"trap-dac-utils": "trap-dac-utils"
},
"locked": {
"lastModified": 1671209611,
"narHash": "sha256-IBIdF8inxa21DTkonUKQ25bTy/1twpQQjU1g5rbBWxo=",
"ref": "refs/heads/master",
"rev": "1c47f53cca6ba455df5c2f6566f138f0b8495a4b",
"revCount": 1080,
"type": "git",
"url": "https://gitlab.com/duke-artiq/dax.git"
},
"original": {
"type": "git",
"url": "https://gitlab.com/duke-artiq/dax.git"
}
},
"flake-utils": {
"locked": {
"lastModified": 1659877975,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake8-artiq": {
"inputs": {
"artiqpkgs": [
"daxpkgs",
"artiqpkgs"
],
"nixpkgs": [
"daxpkgs",
"nixpkgs"
]
},
"locked": {
"lastModified": 1669758648,
"narHash": "sha256-nomQRpu/b8YTAma6kmbSRrz5D9l1l0TV+trKHukT1V8=",
"ref": "refs/heads/master",
"rev": "c4949e7a415d5e35a242d552d4bb83614693b92e",
"revCount": 85,
"type": "git",
"url": "https://gitlab.com/duke-artiq/flake8-artiq.git"
},
"original": {
"type": "git",
"url": "https://gitlab.com/duke-artiq/flake8-artiq.git"
}
},
"mozilla-overlay": { "mozilla-overlay": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1664789696, "lastModified": 1657214286,
"narHash": "sha256-UGWJHQShiwLCr4/DysMVFrYdYYHcOqAOVsWNUu+l6YU=", "narHash": "sha256-rO/4oymKXU09wG2bcTt4uthPCp1XsBZjxuCJo3yVXNs=",
"owner": "mozilla", "owner": "mozilla",
"repo": "nixpkgs-mozilla", "repo": "nixpkgs-mozilla",
"rev": "80627b282705101e7b38e19ca6e8df105031b072", "rev": "0508a66e28a5792fdfb126bbf4dec1029c2509e0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -169,11 +68,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1666056570, "lastModified": 1657123678,
"narHash": "sha256-e7EkIY68Tp7NKyp9JSHh6CgPPdsKYYWxiL4wZQN8Cwg=", "narHash": "sha256-cowVkScfUPlbBXUp08MeVk/wgm9E1zp1uC+9no2hZYw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "47edaa313fc3767ce3026037a5b62352f22f3602", "rev": "316b762afdb9e142a803f29c49a88b4a47db80ee",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -185,8 +84,7 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"artiq": "artiq", "artiq": "artiq"
"daxpkgs": "daxpkgs"
} }
}, },
"sipyco": { "sipyco": {
@ -197,11 +95,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1664319253, "lastModified": 1654830914,
"narHash": "sha256-hycJAgy+NFF9f5I6++7yo8KdhMSyKCPKJazRPxeedI4=", "narHash": "sha256-tratXcWu6Dgzd0Qd9V6EMjuNlE9qDN1pKFhP+Gt0b64=",
"owner": "m-labs", "owner": "m-labs",
"repo": "sipyco", "repo": "sipyco",
"rev": "d58ded7280e0f020be2446d4fee70f4393e6045f", "rev": "58b0935f7ae47659abee5b5792fa594153328d6f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -213,11 +111,11 @@
"src-migen": { "src-migen": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1662111470, "lastModified": 1656649178,
"narHash": "sha256-IPyhoFZLhY8d3jHB8jyvGdbey7V+X5eCzBZYSrJ18ec=", "narHash": "sha256-A91sZRrprEuPOtIUVxm6wX5djac9wnNZQ4+cU1nvJPc=",
"owner": "m-labs", "owner": "m-labs",
"repo": "migen", "repo": "migen",
"rev": "639e66f4f453438e83d86dc13491b9403bbd8ec6", "rev": "0fb91737090fe45fd764ea3f71257a4c53c7a4ae",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -229,11 +127,11 @@
"src-misoc": { "src-misoc": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1665395741, "lastModified": 1649324486,
"narHash": "sha256-7ULMGBPPn5NxZX6rdxU5GheoSNBiJklHQEVf04jU9tI=", "narHash": "sha256-Mw/fQS3lHFvCm7L1k63joRkz5uyijQfywcOq+X2+o2s=",
"ref": "master", "ref": "master",
"rev": "4fb0730db4c5de7e86f82fa3bd204e6c4608af85", "rev": "f1dc58d2b8c222ba41c25cee4301626625f46e43",
"revCount": 2427, "revCount": 2420,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/m-labs/misoc.git" "url": "https://github.com/m-labs/misoc.git"
@ -259,31 +157,6 @@
"repo": "pythonparser", "repo": "pythonparser",
"type": "github" "type": "github"
} }
},
"trap-dac-utils": {
"inputs": {
"artiqpkgs": [
"daxpkgs",
"artiqpkgs"
],
"nixpkgs": [
"daxpkgs",
"nixpkgs"
]
},
"locked": {
"lastModified": 1671136817,
"narHash": "sha256-6uVX0st+0rp0sl2i9MOepxPpgpjGdlfwZ7jndnNKR9k=",
"ref": "refs/heads/master",
"rev": "8b754f0735c5efd0e467bed7680f9d1d93d027c3",
"revCount": 261,
"type": "git",
"url": "https://gitlab.com/duke-artiq/trap-dac-utils.git"
},
"original": {
"type": "git",
"url": "https://gitlab.com/duke-artiq/trap-dac-utils.git"
}
} }
}, },
"root": "root", "root": "root",

52
flake.nix
View File

@ -3,16 +3,7 @@
inputs.artiq.url = git+https://github.com/m-labs/artiq.git?ref=release-7; inputs.artiq.url = git+https://github.com/m-labs/artiq.git?ref=release-7;
inputs.daxpkgs = { outputs = { self, artiq }:
url = git+https://gitlab.com/duke-artiq/dax.git;
inputs = {
artiqpkgs.follows = "artiq";
nixpkgs.follows = "artiq/nixpkgs";
sipyco.follows = "artiq/sipyco";
};
};
outputs = { self, artiq, daxpkgs }:
let let
pkgs = import artiq.inputs.nixpkgs { system = "x86_64-linux"; }; pkgs = import artiq.inputs.nixpkgs { system = "x86_64-linux"; };
@ -151,8 +142,8 @@
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "m-labs"; owner = "m-labs";
repo = "lda"; repo = "lda";
rev = "2d8af1e9080a4c1ab4a32370b3f926bfba8c00b2"; rev = "e6bf828b6dfd7fbf59b61b691712736c98c95970";
sha256 = "sha256-bImAsQiGmMauasltUrlkCRU3+p40d41DTlJvOjCfrP0="; sha256 = "1w4ykzsl3386bz4ggpd6i60b6a3k7rnc6qjw59xm3hk0vs3w2vyn";
}; };
propagatedBuildInputs = [ artiq.inputs.sipyco.packages.x86_64-linux.sipyco ]; propagatedBuildInputs = [ artiq.inputs.sipyco.packages.x86_64-linux.sipyco ];
postPatch = '' postPatch = ''
@ -216,9 +207,32 @@
++ [ artiq.inputs.sipyco.packages.x86_64-linux.sipyco ] ++ [ artiq.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 = pkgs.python3Packages.buildPythonPackage {
dax = daxpkgs.packages.x86_64-linux.dax; pname = "flake8-artiq";
trap-dac-utils = daxpkgs.packages.x86_64-linux.trap-dac-utils; version = "0.1.0";
src = pkgs.fetchgit {
url = "https://gitlab.com/duke-artiq/flake8-artiq.git";
rev = "1216092974140a561850905734fc22fdacdc2cde";
sha256 = "0rkab2qdwyzms6nxc44jzb5grvkkbpjwwmfv2zj96cm6cm8d9pdr";
};
propagatedBuildInputs = [ pkgs.python3Packages.flake8 ];
checkInputs = [ pkgs.python3Packages.pytestCheckHook ];
};
dax = pkgs.python3Packages.buildPythonPackage rec {
pname = "dax";
version = "6.7";
src = pkgs.fetchgit {
url = "https://gitlab.com/duke-artiq/dax.git";
rev = "v${version}";
sha256 = "0rgvqqiypqvxjzrsixn3h7dn93isqw5vc2wrmpkxhzvw9lh5ihm7";
};
VERSIONEER_OVERRIDE = version;
inherit (pkgs.python3Packages.pygit2) SSL_CERT_FILE;
doCheck = false; # tests only pass for the latest stable ARTIQ version
propagatedBuildInputs = [ artiq.packages.x86_64-linux.artiq artiq.inputs.sipyco.packages.x86_64-linux.sipyco ]
++ (with pkgs.python3Packages; [ numpy scipy pyvcd natsort pygit2 matplotlib graphviz h5py networkx sortedcontainers ]);
checkInputs = [ pkgs.python3Packages.pytestCheckHook ];
};
dax-applets = pkgs.python3Packages.buildPythonPackage rec { dax-applets = pkgs.python3Packages.buildPythonPackage rec {
pname = "dax-applets"; pname = "dax-applets";
version = "0.0.0"; version = "0.0.0";
@ -328,17 +342,11 @@
src = flake8-artiq.src; src = flake8-artiq.src;
dependencies = [ "flake8" ]; dependencies = [ "flake8" ];
} }
{
name = "trap-dac-utils";
version = trap-dac-utils.version;
src = trap-dac-utils.src;
dependencies = trap-dac-utils.condaDependencies;
}
{ {
name = "dax"; name = "dax";
version = dax.version; version = dax.version;
src = dax.src; src = dax.src;
dependencies = dax.condaDependencies; dependencies = [ "python>=3.7" "artiq" "sipyco" "numpy" "scipy" "pyvcd" "natsort" "pygit2" "matplotlib" "python-graphviz" "h5py" "networkx" "sortedcontainers" ];
} }
{ {
name = "dax-applets"; name = "dax-applets";