From 5d72ee3da3421def1feee592d0f1b8e0418d59eb Mon Sep 17 00:00:00 2001
From: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
Date: Thu, 14 Sep 2023 18:09:05 +0200
Subject: [PATCH 1/5] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'bscpkgs':
    'git+https://pm.bsc.es/gitlab/rarias/bscpkgs.git?ref=refs/heads/master&rev=6122fef92701701e1a0622550ac0fc5c2beb5906' (2023-09-07)
  → 'git+https://pm.bsc.es/gitlab/rarias/bscpkgs.git?ref=refs/heads/master&rev=3a4062ac04be6263c64a481420d8e768c2521b80' (2023-09-14)
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 294fa56..3c654b9 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"
       },
-- 
GitLab


From a1e8cfea479fe8ac73f52674266d3375ed845447 Mon Sep 17 00:00:00 2001
From: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
Date: Fri, 15 Sep 2023 09:13:24 +0200
Subject: [PATCH 2/5] Don't fetch registry flakes from the net

---
 m/common/main.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/m/common/main.nix b/m/common/main.nix
index a5f8e45..5e7aa34 100644
--- a/m/common/main.nix
+++ b/m/common/main.nix
@@ -32,6 +32,9 @@
     "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;
-- 
GitLab


From 33cd40160e1786791f0f1c60dacd143d22d3d1cc Mon Sep 17 00:00:00 2001
From: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
Date: Thu, 14 Sep 2023 18:28:09 +0200
Subject: [PATCH 3/5] Use hut packages as the default package set

Allows the user to directly access nixpkgs and bscpkgs from the top
level as `nix build jungle#htop` and `nix build jungle#bsc.ovni`.
---
 flake.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/flake.nix b/flake.nix
index 10be75a..d9fd95f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -26,6 +26,6 @@ in
       lake2 = mkConf "lake2";
     };
 
-    packages.x86_64-linux.hut = self.nixosConfigurations.hut.pkgs;
+    packages.x86_64-linux = self.nixosConfigurations.hut.pkgs;
   };
 }
-- 
GitLab


From 51c57dbc4110a3370fc6590b35e4f28e737092b3 Mon Sep 17 00:00:00 2001
From: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
Date: Fri, 15 Sep 2023 11:58:10 +0200
Subject: [PATCH 4/5] Add bscpkgs and nixpkgs top level attributes

Allows the evaluation of packages of the intermediate overlays.
---
 flake.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/flake.nix b/flake.nix
index d9fd95f..b74cd8e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -26,6 +26,9 @@ in
       lake2 = mkConf "lake2";
     };
 
-    packages.x86_64-linux = self.nixosConfigurations.hut.pkgs;
+    packages.x86_64-linux = self.nixosConfigurations.hut.pkgs // {
+      bscpkgs = bscpkgs.packages.x86_64-linux;
+      nixpkgs = nixpkgs.legacyPackages.x86_64-linux;
+    };
   };
 }
-- 
GitLab


From 653d411b9e46076a7878be9574ed6b3bd627cff1 Mon Sep 17 00:00:00 2001
From: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
Date: Fri, 15 Sep 2023 11:58:47 +0200
Subject: [PATCH 5/5] Remove bscpkgs from the registry and nixPath

This is done to prevent accidental evaluations where the nixpkgs input
of bscpkgs is still pointing to a different version that the one
specified in the jungle flake. Instead use jungle#bscpkgs.X to get a
package from bscpkgs.
---
 m/common/main.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/m/common/main.nix b/m/common/main.nix
index 5e7aa34..025a7c5 100644
--- a/m/common/main.nix
+++ b/m/common/main.nix
@@ -28,7 +28,6 @@
 
   nix.nixPath = [
     "nixpkgs=${nixpkgs}"
-    "bscpkgs=${bscpkgs}"
     "jungle=${theFlake.outPath}"
   ];
 
@@ -36,7 +35,6 @@
     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; [
-- 
GitLab