Ensure final flakes also use indirect nixpkgs references; not just the intermediate flakes

Author: sd234678

.last-exported-commit

@@ -1 +1 @@
-Last exported commit from parent repo: 7ca90573ffac05c79933d5749e55333a174ac782
+Last exported commit from parent repo: 230b62f091d2911a5265018e78c1aa28cb196f05

nix-bootstrap.cabal

@@ -5,7 +5,7 @@ cabal-version: 2.0
 -- see: https://github.com/sol/hpack
 
 name:           nix-bootstrap
-version:        2.2.6.0
+version:        2.2.7.0
 author:         gchquser
 maintainer:     [email protected]
 copyright:      Crown Copyright

package.yaml

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 name: nix-bootstrap
-version: 2.2.6.0
+version: 2.2.7.0
 author: gchquser
 maintainer: [email protected]
 copyright: Crown Copyright

src/Bootstrap/Data/Bootstrappable/FlakeNix.hs

@@ -217,7 +217,7 @@ instance IsNixExpr FlakeNix where
             [nixproperty|inputs|]
               |= ESet
                 False
-                ( [[nixbinding|nixpkgs-src.url = "github:NixOS/nixpkgs";|]]
+                ( [[nixbinding|nixpkgs-src.url = "nixpkgs";|]]
                     <> [ [nixbinding|pre-commit-hooks-lib.url = "github:cachix/pre-commit-hooks.nix";|]
                          | usingHooks
                        ]

test/Bootstrap/Data/Bootstrappable/FlakeNixSpec.hs

@@ -26,7 +26,7 @@ spec = describe "flake.nix rendering" do
                 [r|{
   description = "Development infrastructure for test-project";
   inputs = {
-    nixpkgs-src.url = "github:NixOS/nixpkgs";
+    nixpkgs-src.url = "nixpkgs";
   };
   outputs = {
     nixpkgs-src,
@@ -55,7 +55,7 @@ spec = describe "flake.nix rendering" do
                 [r|{
   description = "Development infrastructure for test-project";
   inputs = {
-    nixpkgs-src.url = "github:NixOS/nixpkgs";
+    nixpkgs-src.url = "nixpkgs";
   };
   outputs = {
     nixpkgs-src,
@@ -95,7 +95,7 @@ spec = describe "flake.nix rendering" do
                 [r|{
   description = "Development infrastructure for test-project";
   inputs = {
-    nixpkgs-src.url = "github:NixOS/nixpkgs";
+    nixpkgs-src.url = "nixpkgs";
     pre-commit-hooks-lib.url = "github:cachix/pre-commit-hooks.nix";
   };
   outputs = {
@@ -138,7 +138,7 @@ spec = describe "flake.nix rendering" do
                 [r|{
   description = "Development infrastructure for test-project";
   inputs = {
-    nixpkgs-src.url = "github:NixOS/nixpkgs";
+    nixpkgs-src.url = "nixpkgs";
     pre-commit-hooks-lib.url = "github:cachix/pre-commit-hooks.nix";
   };
   outputs = {
@@ -185,7 +185,7 @@ spec = describe "flake.nix rendering" do
                 [r|{
   description = "Development infrastructure for test-project";
   inputs = {
-    nixpkgs-src.url = "github:NixOS/nixpkgs";
+    nixpkgs-src.url = "nixpkgs";
   };
   outputs = {
     nixpkgs-src,
@@ -225,7 +225,7 @@ spec = describe "flake.nix rendering" do
                 [r|{
   description = "Development infrastructure for test-project";
   inputs = {
-    nixpkgs-src.url = "github:NixOS/nixpkgs";
+    nixpkgs-src.url = "nixpkgs";
     pre-commit-hooks-lib.url = "github:cachix/pre-commit-hooks.nix";
   };
   outputs = {
@@ -265,7 +265,7 @@ spec = describe "flake.nix rendering" do
                 [r|{
   description = "Development infrastructure for test-project";
   inputs = {
-    nixpkgs-src.url = "github:NixOS/nixpkgs";
+    nixpkgs-src.url = "nixpkgs";
     mach-nix.url = "github:DavHau/mach-nix?ref=3.5.0";
   };
   outputs = {
@@ -307,7 +307,7 @@ spec = describe "flake.nix rendering" do
                 [r|{
   description = "Development infrastructure for test-project";
   inputs = {
-    nixpkgs-src.url = "github:NixOS/nixpkgs";
+    nixpkgs-src.url = "nixpkgs";
     pre-commit-hooks-lib.url = "github:cachix/pre-commit-hooks.nix";
   };
   outputs = {