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

Compare commits

merge into: M-Labs:master
Branches Tags
M-Labs:master
M-Labs:release-8
M-Labs:release-7
...
pull from: M-Labs:release-7
Branches Tags
M-Labs:master
M-Labs:release-8
M-Labs:release-7

21 Commits
master ... release-7

Author SHA1 Message Date
Sebastien Bourdeauducq
20714031ea flake: update dependencies 2024-12-11 20:28:30 +08:00
Sebastien Bourdeauducq
ebef8fd42b flake: update dependencies 2024-10-01 15:01:28 +08:00
Sebastien Bourdeauducq
5638bd2bb3 flake: update dependencies 2024-07-10 10:44:39 +02:00
Sebastien Bourdeauducq
eb97be036d flake: update dependencies 2024-05-02 09:02:26 +08:00
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 66 additions and 29 deletions
Show Stats Expand all files Collapse all files

85
flake.lock generated
View File

@ -11,21 +11,23 @@
"src-pythonparser": "src-pythonparser"
},
"locked": {
"lastModified": 1654087576,
"narHash": "sha256-d+LCvCXikhhEjsf4qBZakx3Sda85p+4vVZVwE1YuS90=",
"ref": "master",
"rev": "68ef0073ea66fe9c7f7c178979ecb8c681c47caa",
"revCount": 8068,
"lastModified": 1733895187,
"narHash": "sha256-6707BOZchNKRsHkq7GK3C1zEMYXBoU64BmNOuQjAXUc=",
"ref": "release-7",
"rev": "8b21509e55c32d4e8cbcff6bbc28f4925dcae8d1",
"revCount": 8215,
"type": "git",
"url": "https://github.com/m-labs/artiq.git"
},
"original": {
"ref": "release-7",
"type": "git",
"url": "https://github.com/m-labs/artiq.git"
}
},
"artiq-comtools": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": [
"artiq",
"nixpkgs"
@ -36,11 +38,11 @@
]
},
"locked": {
"lastModified": 1654007592,
"narHash": "sha256-vaDFhE1ItjqtIcinC/6RAJGbj44pxxMUEeQUa3FtgEE=",
"lastModified": 1720768567,
"narHash": "sha256-3VoK7o5MtHtbHLrc6Pv+eQWFtaz5Gd/YWyV5TD3c5Ss=",
"owner": "m-labs",
"repo": "artiq-comtools",
"rev": "cb73281154656ee8f74db1866859e31bf42755cd",
"rev": "f93570d8f2ed5a3cfb3e1c16ab00f2540551e994",
"type": "github"
},
"original": {
@ -49,14 +51,32 @@
"type": "github"
}
},
"flake-utils": {
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"mozilla-overlay": {
"flake": false,
"locked": {
"lastModified": 1650459918,
"narHash": "sha256-sroCK+QJTmoXtcRkwZyKOP9iAYOPID2Bwdxn4GkG16w=",
"lastModified": 1733136220,
"narHash": "sha256-Ga8AP/YPsKDVF5LcNN8v3RiLgnEeW7zBk9GyX7wa9Ug=",
"owner": "mozilla",
"repo": "nixpkgs-mozilla",
"rev": "e1f7540fc0a8b989fb8cf701dc4fd7fc76bcf168",
"rev": "ad7af231a95acf65ccc4afa0c766f5c0674ad3f1",
"type": "github"
},
"original": {
@ -67,11 +87,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1653920503,
"narHash": "sha256-BBeCZwZImtjP3oYy4WogkQYy5OxNyfNciVSc1AfZgLQ=",
"lastModified": 1685573264,
"narHash": "sha256-Zffu01pONhs/pqH07cjlF10NnMDLok8ix5Uk4rhOnZQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a634c8f6c1fbf9b9730e01764999666f3436f10a",
"rev": "380be19fbd2d9079f677978361792cb25e8a3635",
"type": "github"
},
"original": {
@ -94,11 +114,11 @@
]
},
"locked": {
"lastModified": 1654006751,
"narHash": "sha256-OWAnoTCutvTQcYdtdtLQuL6uRtG+7Jz7sbRhcScv8bo=",
"lastModified": 1733319649,
"narHash": "sha256-ATJV2UV9FXEiTF6/1BvZ2HmB0goF5TZ2ytgRBwD/BGg=",
"owner": "m-labs",
"repo": "sipyco",
"rev": "b3d03a94c751a24769c54a61a0dbe9d6af52dade",
"rev": "27312727bdb8a182bd6e222e4cbdd3f39ae41d4e",
"type": "github"
},
"original": {
@ -110,11 +130,11 @@
"src-migen": {
"flake": false,
"locked": {
"lastModified": 1650337393,
"narHash": "sha256-rm1SlFmF2ASz0vIy2nDEzGlyRw2oYNeJRr8Kh8Mg2Qc=",
"lastModified": 1727677091,
"narHash": "sha256-Zg3SQnTwMM/VkOGKogbPyuCC2NhLy8HB2SPEUWWNgCU=",
"owner": "m-labs",
"repo": "migen",
"rev": "d4e3f34177c32f09904397179e6ed9c83175e528",
"rev": "c19ae9f8ae162ffe2d310a92bfce53ac2a821bc8",
"type": "github"
},
"original": {
@ -126,11 +146,11 @@
"src-misoc": {
"flake": false,
"locked": {
"lastModified": 1649324486,
"narHash": "sha256-Mw/fQS3lHFvCm7L1k63joRkz5uyijQfywcOq+X2+o2s=",
"ref": "master",
"rev": "f1dc58d2b8c222ba41c25cee4301626625f46e43",
"revCount": 2420,
"lastModified": 1729234629,
"narHash": "sha256-TLsTCXV5AC2xh+bS7EhBVBKqdqIU3eKrnlWcFF9LtAM=",
"ref": "refs/heads/master",
"rev": "6085a312bca26adeca6584e37d08c8ba2e1d6e38",
"revCount": 2460,
"submodules": true,
"type": "git",
"url": "https://github.com/m-labs/misoc.git"
@ -156,6 +176,21 @@
"repo": "pythonparser",
"type": "github"
}
},
"systems": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
}
},
"root": "root",

10
flake.nix
View File

@ -1,7 +1,7 @@
{
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 }:
let
@ -112,6 +112,7 @@
};
in rec {
inherit makeCondaChannel;
packages.x86_64-linux = rec {
korad_ka3005p = pkgs.python3Packages.buildPythonPackage {
pname = "korad_ka3005p";
@ -141,8 +142,8 @@
src = pkgs.fetchFromGitHub {
owner = "m-labs";
repo = "lda";
rev = "e6bf828b6dfd7fbf59b61b691712736c98c95970";
sha256 = "1w4ykzsl3386bz4ggpd6i60b6a3k7rnc6qjw59xm3hk0vs3w2vyn";
rev = "2d8af1e9080a4c1ab4a32370b3f926bfba8c00b2";
sha256 = "sha256-bImAsQiGmMauasltUrlkCRU3+p40d41DTlJvOjCfrP0=";
};
propagatedBuildInputs = [ artiq.inputs.sipyco.packages.x86_64-linux.sipyco ];
postPatch = ''
@ -285,9 +286,10 @@
"pygit2"
"python-levenshtein"
"sipyco"
"llvmlite"
"llvmlite <0.40.0"
"llvm-tools"
"lld"
"tqdm"
"artiq-comtools"
];
}