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

Merge remote-tracking branch 'origin/2289-offline-installer' into 2289-offline-installer

This commit is contained in:
Egor Savkin 2024-05-06 15:38:51 +08:00
parent cacd9e685c f49d816ea2
commit 2a9d3a6384
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
flake.lock
View File

@ -66,11 +66,11 @@
"src-pythonparser": "src-pythonparser"
},
"locked": {
"lastModified": 1714145623,
"narHash": "sha256-bf7uN8V2u+cpq+KB1oQGMbzgx/8sPEdzbTNGwq5pKCo=",
"lastModified": 1714477715,
"narHash": "sha256-BjWkwxd74piNuph1TwUm5IoK4N77FMmQOemxUuZ0AU4=",
"ref": "refs/heads/master",
"rev": "24fe885b5cb6ea40e891a3c5b1cc1174d07c3823",
"revCount": 8777,
"rev": "5fe47129ed2280cde16e10595568e47be548b12a",
"revCount": 8778,
"type": "git",
"url": "https://github.com/m-labs/artiq.git"
},

4
flake.nix
View File

@ -28,8 +28,8 @@
condaDeps = with pkgs; [ zlib xorg.libSM xorg.libICE xorg.libX11 xorg.libXau xorg.libXi xorg.libXrender libselinux libGL ];
# Use the full Anaconda distribution, which already contains conda-build and its many dependencies.
condaInstaller = pkgs.fetchurl {
url = "https://repo.anaconda.com/archive/Anaconda3-2023.07-2-Linux-x86_64.sh";
sha256 = "sha256-WJ+zT+c7wwM3mrvOulDzExJU6Fzk582Bm6Qna6KcrRY=";
url = "https://repo.anaconda.com/archive/Anaconda3-2024.02-1-Linux-x86_64.sh";
sha256 = "sha256-xTbdt7S6c4vdvU5YGykwjLMy+hKuP6LNZoFL1zXf8jE=";
};
condaInstallerEnv = pkgs.buildFHSEnv {
name = "conda-installer-env";