From b273c8f26263be633a3bb6d354cfde9c4bd31a14 Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Sat, 27 May 2023 18:19:56 +0800
Subject: [PATCH] flake: update dependencies, nixpkgs 23.05

---
 flake.lock | 36 ++++++++++++++++++------------------
 flake.nix  |  6 ++++--
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/flake.lock b/flake.lock
index 6698bcf..f9b5774 100644
--- a/flake.lock
+++ b/flake.lock
@@ -66,11 +66,11 @@
         "src-pythonparser": "src-pythonparser"
       },
       "locked": {
-        "lastModified": 1682844949,
-        "narHash": "sha256-o2qsfskZZliN4sFFITv7otu3IzcQ23sq3a8kLeOAHTQ=",
+        "lastModified": 1685180436,
+        "narHash": "sha256-npPK9meOpJ4hzHebi5A2p27HTwppE7ZpdoHS9qk2L0Y=",
         "ref": "refs/heads/master",
-        "rev": "3ff0be6540b5a9eb252cd95db6a812d75e7c8ed2",
-        "revCount": 8342,
+        "rev": "779810163f3d85f092f3716b773ac0351926deb8",
+        "revCount": 8364,
         "type": "git",
         "url": "https://github.com/m-labs/artiq.git"
       },
@@ -149,11 +149,11 @@
     "mozilla-overlay": {
       "flake": false,
       "locked": {
-        "lastModified": 1677493379,
-        "narHash": "sha256-A1gO8zlWLv3+tZ3cGVB1WYvvoN9pbFyv0xIJHcTsckw=",
+        "lastModified": 1684487559,
+        "narHash": "sha256-SZcJEM+NnLr8ctzeQf1BGAqBHzJ3jn+tdSeO7lszIJc=",
         "owner": "mozilla",
         "repo": "nixpkgs-mozilla",
-        "rev": "78e723925daf5c9e8d0a1837ec27059e61649cb6",
+        "rev": "e6ca26fe8b9df914d4567604e426fbc185d9ef3e",
         "type": "github"
       },
       "original": {
@@ -164,16 +164,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1682173319,
-        "narHash": "sha256-tPhOpJJ+wrWIusvGgIB2+x6ILfDkEgQMX0BTtM5vd/4=",
+        "lastModified": 1685004253,
+        "narHash": "sha256-AbVL1nN/TDicUQ5wXZ8xdLERxz/eJr7+o8lqkIOVuaE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ee7ec1c71adc47d2e3c2d5eb0d6b8fbbd42a8d1c",
+        "rev": "3e01645c40b92d29f3ae76344a6d654986a91a91",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-22.11",
+        "ref": "nixos-23.05",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -192,11 +192,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1681290481,
-        "narHash": "sha256-VEZcGhbtJGonRrrWi31evNDVSerlLjEPL0MZGm9VlB8=",
+        "lastModified": 1685094262,
+        "narHash": "sha256-7DvbdTUYP7PbhZClT/tob66iMV95v7124RynMpPc5VA=",
         "owner": "m-labs",
         "repo": "sipyco",
-        "rev": "727631ada6e59dc6ef0ad50bfcc376d2ffe805aa",
+        "rev": "f1f0fc1d3071c5a6ba6dd613b54bb4176ad1e8dc",
         "type": "github"
       },
       "original": {
@@ -224,11 +224,11 @@
     "src-misoc": {
       "flake": false,
       "locked": {
-        "lastModified": 1679903508,
-        "narHash": "sha256-TI0agjSSMJtH4mgAMpSO128zxcwSo/AjY1B6AW7zBQQ=",
+        "lastModified": 1685174995,
+        "narHash": "sha256-90UwWt9/TAaFAoYDpiIzHXqMWYfftlps8sodv/Gf07c=",
         "ref": "refs/heads/master",
-        "rev": "0cf0ebb7d4f56cc6d44a3dea3e386efab9d82419",
-        "revCount": 2437,
+        "rev": "d83499b318e8ef021b12e2df261707a165eb3afa",
+        "revCount": 2439,
         "submodules": true,
         "type": "git",
         "url": "https://github.com/m-labs/misoc.git"
diff --git a/flake.nix b/flake.nix
index ae655cc..8a98c1e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -23,9 +23,10 @@
         url = "https://repo.anaconda.com/archive/Anaconda3-2023.03-Linux-x86_64.sh";
         sha256 = "sha256-GXN9XCeyOh2HQMXLJBS/YlMYTOdF0KkSuyNaISoV4HU=";
       };
-      condaInstallerEnv = pkgs.buildFHSUserEnv {
+      condaInstallerEnv = pkgs.buildFHSEnv {
         name = "conda-installer-env";
         targetPkgs = pkgs: condaDeps;
+        extraBwrapArgs = [ "--bind" "/nix" "/nix" ];
       };
       condaInstalled = pkgs.stdenvNoCC.mkDerivation {
         name = "conda-installed";
@@ -46,9 +47,10 @@
             --replace "os.chmod(path, 0o2775)" "pass"
           '';
       };
-      condaBuilderEnv = pkgs.buildFHSUserEnv {
+      condaBuilderEnv = pkgs.buildFHSEnv {
         name = "conda-builder-env";
         targetPkgs = pkgs: condaDeps ++ [ condaInstalled ];
+        extraBwrapArgs = [ "--bind" "/nix" "/nix" ];
       };
       makeCondaRecipe = (constituent:
         ''