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

Compare commits

base: M-Labs:1d3802bb5f8126836ae96b672634c076abe42e9c
Branches Tags
M-Labs:master
M-Labs:release-8
M-Labs:release-7
..
compare: M-Labs:6a1854f18b700c0e73dfba859b057b8320c34fee
Branches Tags
M-Labs:release-8
M-Labs:master
M-Labs:release-7

No commits in common. "1d3802bb5f8126836ae96b672634c076abe42e9c" and "6a1854f18b700c0e73dfba859b057b8320c34fee" have entirely different histories.
1d3802bb5f ... 6a1854f18b

2 changed files with 15 additions and 8 deletions
Show Stats Expand all files Collapse all files

16
flake.lock
View File

@ -67,11 +67,11 @@
"src-pythonparser": "src-pythonparser" "src-pythonparser": "src-pythonparser"
}, },
"locked": { "locked": {
"lastModified": 1722511849, "lastModified": 1722417470,
"narHash": "sha256-N0IuBSfNxSucM3XJrPppv5b3ONgnH+qfO0P7UoaO0CM=", "narHash": "sha256-f+Qa/lRi46BoHf9CdZFASyW9iOiwzJ/XFOxpAcTnYmw=",
"ref": "release-8", "ref": "release-8",
"rev": "08c1770b31040aa691b21e1f9760c230eebcd71d", "rev": "4e800af410341240f08d5071182752eb2d60ca94",
"revCount": 8933, "revCount": 8926,
"type": "git", "type": "git",
"url": "https://github.com/m-labs/artiq.git" "url": "https://github.com/m-labs/artiq.git"
}, },
@ -99,11 +99,11 @@
"trap-dac-utils": "trap-dac-utils" "trap-dac-utils": "trap-dac-utils"
}, },
"locked": { "locked": {
"lastModified": 1722546775, "lastModified": 1722374852,
"narHash": "sha256-gOzLNFOMW/91M5QL1TQ5tp+6/DLxDQEhJH1JbT30gR0=", "narHash": "sha256-Qv7Qyk8K96ksCQ0zlmJnIlrVQHBHhqub2TvkAVvZIkY=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "612264c9058c1822f5e180e024a5607eb953f31a", "rev": "4061de254a059b41a7e76ec41046f54ebb3d2ca6",
"revCount": 1359, "revCount": 1357,
"type": "git", "type": "git",
"url": "https://gitlab.com/duke-artiq/dax.git" "url": "https://gitlab.com/duke-artiq/dax.git"
}, },

7
flake.nix
View File

@ -495,6 +495,12 @@
src = hut2.src; src = hut2.src;
depends = [ "mingw-w64-clang-x86_64-python-sipyco" ]; depends = [ "mingw-w64-clang-x86_64-python-sipyco" ];
}; };
msys2-flake8-artiq = msys2.makeMsys2Package {
name = "flake8-artiq";
version = flake8-artiq.version;
src = flake8-artiq.src;
depends = [ "mingw-w64-clang-x86_64-python-flake8" ];
};
msys2-repos = msys2.makeMsys2Repos [ msys2-repos = msys2.makeMsys2Repos [
msys2-pythonparser msys2-sipyco msys2-artiq-comtools msys2-artiq msys2-pythonparser msys2-sipyco msys2-artiq-comtools msys2-artiq
msys2-asyncserial msys2-asyncserial
@ -504,6 +510,7 @@
msys2-thorlabs_tcube msys2-thorlabs_tcube
msys2-newfocus8742 msys2-newfocus8742
msys2-hut2 msys2-hut2
msys2-flake8-artiq
]; ];
msys2-offline-installer = pkgs.stdenv.mkDerivation { msys2-offline-installer = pkgs.stdenv.mkDerivation {