forked from M-Labs/artiq-extrapkg
Merge remote-tracking branch 'origin/2289-offline-installer' into 2289-offline-installer
This commit is contained in:
commit
2a9d3a6384
|
@ -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"
|
||||
},
|
||||
|
|
|
@ -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";
|
||||
|
|
Loading…
Reference in New Issue