diff --git a/flake.lock b/flake.lock index 294fa56a03eb76336b7ed3610a9245b8fccfd3dd..3c654b998da43929c28ce52555ab7d20111f07ea 100644 --- a/flake.lock +++ b/flake.lock @@ -29,11 +29,11 @@ ] }, "locked": { - "lastModified": 1694077645, + "lastModified": 1694708510, "narHash": "sha256-72bvRBhq8Q8V6ibsR9lyBE92V2EC6C6Ek3J5cOM79So=", "ref": "refs/heads/master", - "rev": "6122fef92701701e1a0622550ac0fc5c2beb5906", - "revCount": 860, + "rev": "3a4062ac04be6263c64a481420d8e768c2521b80", + "revCount": 862, "type": "git", "url": "https://pm.bsc.es/gitlab/rarias/bscpkgs.git" }, diff --git a/flake.nix b/flake.nix index 10be75ab11b0957bc940ce92c0459e4b9433abc9..b74cd8e17aa0f12ef3a5e82f12c8d2aed3b9d38d 100644 --- a/flake.nix +++ b/flake.nix @@ -26,6 +26,9 @@ in lake2 = mkConf "lake2"; }; - packages.x86_64-linux.hut = self.nixosConfigurations.hut.pkgs; + packages.x86_64-linux = self.nixosConfigurations.hut.pkgs // { + bscpkgs = bscpkgs.packages.x86_64-linux; + nixpkgs = nixpkgs.legacyPackages.x86_64-linux; + }; }; } diff --git a/m/common/main.nix b/m/common/main.nix index a5f8e454b2b2c95a71963a8eb607b51605bd5ea5..025a7c50792dab624f0ae23013a974803ab0deab 100644 --- a/m/common/main.nix +++ b/m/common/main.nix @@ -28,12 +28,13 @@ nix.nixPath = [ "nixpkgs=${nixpkgs}" - "bscpkgs=${bscpkgs}" "jungle=${theFlake.outPath}" ]; + nix.settings.flake-registry = + pkgs.writeText "global-registry.json" ''{"flakes":[],"version":2}''; + nix.registry.nixpkgs.flake = nixpkgs; - nix.registry.bscpkgs.flake = bscpkgs; nix.registry.jungle.flake = theFlake; environment.systemPackages = with pkgs; [