Compare commits

...

17 Commits

Author SHA1 Message Date
Sebastien Bourdeauducq c64bd2b548 flake: update dependencies 2023-07-10 12:52:24 +08:00
Sebastien Bourdeauducq c40631090b conda: restrict llvmlite version
attempt to address
https://github.com/m-labs/artiq/issues/2050#issuecomment-1579132668
2023-06-07 20:49:36 +08:00
Sebastien Bourdeauducq a3f36185e0 flake: update dependencies 2023-06-07 20:49:28 +08:00
Sebastien Bourdeauducq c7144f93d7 flake: update dependencies 2023-05-01 09:36:32 +08:00
Sebastien Bourdeauducq 16a3e79163 Revert "use flake for dax"
This reverts commit 9cd19ede46.
2022-12-21 09:21:16 +08:00
Sebastien Bourdeauducq 368d159b15 Revert "dax: reenable tests"
This reverts commit 16af931d0c.
2022-12-21 09:21:15 +08:00
Sebastien Bourdeauducq 16af931d0c dax: reenable tests 2022-12-17 14:56:24 +08:00
Brad Bondurant 9cd19ede46 use flake for dax 2022-12-17 14:55:46 +08:00
Sebastien Bourdeauducq 153ac853e9 flake: update dependencies 2022-11-25 09:51:29 +08:00
Sebastien Bourdeauducq 5f87f3a59d artiq: update 2022-09-08 17:19:59 +08:00
Sebastien Bourdeauducq 5c51937450 lda: update 2022-09-08 17:19:50 +08:00
Sebastien Bourdeauducq 89880b6fcc Revert "dax: bump version, add new dependency"
This reverts commit 521b5ef7b7.
2022-08-12 09:32:22 +08:00
Brad Bondurant 521b5ef7b7 dax: bump version, add new dependency 2022-08-12 09:31:31 +08:00
Sebastien Bourdeauducq 781c61de19 update ARTIQ 2022-08-10 07:02:11 +08:00
Sebastien Bourdeauducq a131ed2e09 add missing tqdm conda dep 2022-08-10 07:02:02 +08:00
Brad Bondurant 213d90e576 flake: expose `makeCondaChannel` in outputs 2022-07-12 09:49:37 +08:00
Sebastien Bourdeauducq 88701b10bc flake: switch to ARTIQ release 7 2022-07-08 18:21:28 +08:00
2 changed files with 48 additions and 29 deletions

View File

@ -11,21 +11,23 @@
"src-pythonparser": "src-pythonparser" "src-pythonparser": "src-pythonparser"
}, },
"locked": { "locked": {
"lastModified": 1654087576, "lastModified": 1688960188,
"narHash": "sha256-d+LCvCXikhhEjsf4qBZakx3Sda85p+4vVZVwE1YuS90=", "narHash": "sha256-Gjb79sBLqqLOdtfkfHFFDVKex3PvoxSmkBgMOsgMgHE=",
"ref": "master", "ref": "release-7",
"rev": "68ef0073ea66fe9c7f7c178979ecb8c681c47caa", "rev": "6fbfa12e88786ff65c31da0298d8f501dbb0bab0",
"revCount": 8068, "revCount": 8176,
"type": "git", "type": "git",
"url": "https://github.com/m-labs/artiq.git" "url": "https://github.com/m-labs/artiq.git"
}, },
"original": { "original": {
"ref": "release-7",
"type": "git", "type": "git",
"url": "https://github.com/m-labs/artiq.git" "url": "https://github.com/m-labs/artiq.git"
} }
}, },
"artiq-comtools": { "artiq-comtools": {
"inputs": { "inputs": {
"flake-utils": "flake-utils",
"nixpkgs": [ "nixpkgs": [
"artiq", "artiq",
"nixpkgs" "nixpkgs"
@ -36,11 +38,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1654007592, "lastModified": 1664405593,
"narHash": "sha256-vaDFhE1ItjqtIcinC/6RAJGbj44pxxMUEeQUa3FtgEE=", "narHash": "sha256-yP441NerlLGig7n+9xHsx8yCtZ+Ggd0VqfBSzc20E04=",
"owner": "m-labs", "owner": "m-labs",
"repo": "artiq-comtools", "repo": "artiq-comtools",
"rev": "cb73281154656ee8f74db1866859e31bf42755cd", "rev": "15ddac62813ef623a076ccf982b3bc63d314e651",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -49,14 +51,29 @@
"type": "github" "type": "github"
} }
}, },
"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"
}
},
"mozilla-overlay": { "mozilla-overlay": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1650459918, "lastModified": 1687771476,
"narHash": "sha256-sroCK+QJTmoXtcRkwZyKOP9iAYOPID2Bwdxn4GkG16w=", "narHash": "sha256-TSpqz6qYVRoqkEdOCawEQ4/cWt/4pracmvw17HK1tgE=",
"owner": "mozilla", "owner": "mozilla",
"repo": "nixpkgs-mozilla", "repo": "nixpkgs-mozilla",
"rev": "e1f7540fc0a8b989fb8cf701dc4fd7fc76bcf168", "rev": "3a44b8783514e7d6db4b63df96071b6c2b014b07",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -67,11 +84,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1653920503, "lastModified": 1685573264,
"narHash": "sha256-BBeCZwZImtjP3oYy4WogkQYy5OxNyfNciVSc1AfZgLQ=", "narHash": "sha256-Zffu01pONhs/pqH07cjlF10NnMDLok8ix5Uk4rhOnZQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a634c8f6c1fbf9b9730e01764999666f3436f10a", "rev": "380be19fbd2d9079f677978361792cb25e8a3635",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -94,11 +111,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1654006751, "lastModified": 1685540542,
"narHash": "sha256-OWAnoTCutvTQcYdtdtLQuL6uRtG+7Jz7sbRhcScv8bo=", "narHash": "sha256-wQJwL3xc6QVQbiJrt71/Z9tp4Eq1yqdGddcEiv7sPCw=",
"owner": "m-labs", "owner": "m-labs",
"repo": "sipyco", "repo": "sipyco",
"rev": "b3d03a94c751a24769c54a61a0dbe9d6af52dade", "rev": "f5bf2ba875340a31a135aea14ad184575ca800ac",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -110,11 +127,11 @@
"src-migen": { "src-migen": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1650337393, "lastModified": 1674045327,
"narHash": "sha256-rm1SlFmF2ASz0vIy2nDEzGlyRw2oYNeJRr8Kh8Mg2Qc=", "narHash": "sha256-oYdeY0MbTReKbAwmSznnqw0wNawdInJoFJVWW3tesFA=",
"owner": "m-labs", "owner": "m-labs",
"repo": "migen", "repo": "migen",
"rev": "d4e3f34177c32f09904397179e6ed9c83175e528", "rev": "ccaee68e14d3636e1d8fb2e0864dd89b1b1f7384",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -126,11 +143,11 @@
"src-misoc": { "src-misoc": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1649324486, "lastModified": 1685415268,
"narHash": "sha256-Mw/fQS3lHFvCm7L1k63joRkz5uyijQfywcOq+X2+o2s=", "narHash": "sha256-g4+yeSV+HtWjcllM5wk4vNBUVCXtDOzUSKhxXPT7Fyc=",
"ref": "master", "ref": "refs/heads/master",
"rev": "f1dc58d2b8c222ba41c25cee4301626625f46e43", "rev": "6d48ce77b6746d3226a682790fbc95b90340986e",
"revCount": 2420, "revCount": 2440,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/m-labs/misoc.git" "url": "https://github.com/m-labs/misoc.git"

View File

@ -1,7 +1,7 @@
{ {
description = "Additional packages for ARTIQ"; description = "Additional packages for ARTIQ";
inputs.artiq.url = git+https://github.com/m-labs/artiq.git; inputs.artiq.url = git+https://github.com/m-labs/artiq.git?ref=release-7;
outputs = { self, artiq }: outputs = { self, artiq }:
let let
@ -112,6 +112,7 @@
}; };
in rec { in rec {
inherit makeCondaChannel;
packages.x86_64-linux = rec { packages.x86_64-linux = rec {
korad_ka3005p = pkgs.python3Packages.buildPythonPackage { korad_ka3005p = pkgs.python3Packages.buildPythonPackage {
pname = "korad_ka3005p"; pname = "korad_ka3005p";
@ -141,8 +142,8 @@
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "m-labs"; owner = "m-labs";
repo = "lda"; repo = "lda";
rev = "e6bf828b6dfd7fbf59b61b691712736c98c95970"; rev = "2d8af1e9080a4c1ab4a32370b3f926bfba8c00b2";
sha256 = "1w4ykzsl3386bz4ggpd6i60b6a3k7rnc6qjw59xm3hk0vs3w2vyn"; sha256 = "sha256-bImAsQiGmMauasltUrlkCRU3+p40d41DTlJvOjCfrP0=";
}; };
propagatedBuildInputs = [ artiq.inputs.sipyco.packages.x86_64-linux.sipyco ]; propagatedBuildInputs = [ artiq.inputs.sipyco.packages.x86_64-linux.sipyco ];
postPatch = '' postPatch = ''
@ -285,9 +286,10 @@
"pygit2" "pygit2"
"python-levenshtein" "python-levenshtein"
"sipyco" "sipyco"
"llvmlite" "llvmlite <0.40.0"
"llvm-tools" "llvm-tools"
"lld" "lld"
"tqdm"
"artiq-comtools" "artiq-comtools"
]; ];
} }