Use an indirect reference to nixpkgs in bootstrapped flakes

sd234678 · sd234678 · commit 03b186699d5c · 2025-05-16T13:05:32.000+01:00
diff --git a/.last-exported-commit b/.last-exported-commit
@@ -1 +1 @@
-Last exported commit from parent repo: 5ab98034a1e3e033f9a966ff2d1ea8a43db9067c
+Last exported commit from parent repo: 7ca90573ffac05c79933d5749e55333a174ac782
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -14,7 +14,7 @@
 {
   description = "Development infrastructure for nix-bootstrap";
   inputs = {
-    nixpkgs-src.url = "github:NixOS/nixpkgs?rev=b62d2a95c72fb068aecd374a7262b37ed92df82b";
+    nixpkgs-src.url = "nixpkgs/b62d2a95c72fb068aecd374a7262b37ed92df82b";
     # Needed to get non-broken vulnix
     nixpkgs-src-previous.url = "github:NixOS/nixpkgs?rev=89172919243df199fe237ba0f776c3e3e3d72367";
     pre-commit-hooks-lib = {
diff --git a/nix-bootstrap.cabal b/nix-bootstrap.cabal
@@ -5,7 +5,7 @@ cabal-version: 2.0
 -- see: https://github.com/sol/hpack
 
 name:           nix-bootstrap
-version:        2.2.5.0
+version:        2.2.6.0
 author:         gchquser
 maintainer:     48051938+sd234678@users.noreply.github.com
 copyright:      Crown Copyright
diff --git a/package.yaml b/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.5.0
+version: 2.2.6.0
 author: gchquser
 maintainer: 48051938+sd234678@users.noreply.github.com
 copyright: Crown Copyright
diff --git a/src/Bootstrap/Nix/Flake.hs b/src/Bootstrap/Nix/Flake.hs
@@ -63,7 +63,7 @@ intermediateFlake projectName =
     False
     [ [nixproperty|description|] |= ELit (LString ("Development infrastructure for " <> unProjectName projectName)),
       [nixbinding|inputs = {
-        nixpkgs-src.url = "github:NixOS/nixpkgs";
+        nixpkgs-src.url = "nixpkgs";
       };|],
       [nixbinding|outputs = _: {};|]
     ]
diff --git a/test/Bootstrap/Nix/FlakeSpec.hs b/test/Bootstrap/Nix/FlakeSpec.hs
@@ -20,7 +20,7 @@ spec = describe "intermediateFlake" do
         [r|{
   description = "Development infrastructure for test-project";
   inputs = {
-    nixpkgs-src.url = "github:NixOS/nixpkgs";
+    nixpkgs-src.url = "nixpkgs";
   };
   outputs = _: {};
 }

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-Last exported commit from parent repo: 5ab98034a1e3e033f9a966ff2d1ea8a43db9067c`
	`1`	`+Last exported commit from parent repo: 7ca90573ffac05c79933d5749e55333a174ac782`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`{`
`15`	`15`	`description = "Development infrastructure for nix-bootstrap";`
`16`	`16`	`inputs = {`
`17`		`- nixpkgs-src.url = "github:NixOS/nixpkgs?rev=b62d2a95c72fb068aecd374a7262b37ed92df82b";`
	`17`	`+ nixpkgs-src.url = "nixpkgs/b62d2a95c72fb068aecd374a7262b37ed92df82b";`
`18`	`18`	`# Needed to get non-broken vulnix`
`19`	`19`	`nixpkgs-src-previous.url = "github:NixOS/nixpkgs?rev=89172919243df199fe237ba0f776c3e3e3d72367";`
`20`	`20`	`pre-commit-hooks-lib = {`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ intermediateFlake projectName =`
`63`	`63`	`False`
`64`	`64`	`[ [nixproperty\|description\|] \|= ELit (LString ("Development infrastructure for " <> unProjectName projectName)),`
`65`	`65`	`[nixbinding\|inputs = {`
`66`		`- nixpkgs-src.url = "github:NixOS/nixpkgs";`
	`66`	`+ nixpkgs-src.url = "nixpkgs";`
`67`	`67`	`};\|],`
`68`	`68`	`[nixbinding\|outputs = _: {};\|]`
`69`	`69`	`]`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ spec = describe "intermediateFlake" do`
`20`	`20`	`[r\|{`
`21`	`21`	`description = "Development infrastructure for test-project";`
`22`	`22`	`inputs = {`
`23`		`- nixpkgs-src.url = "github:NixOS/nixpkgs";`
	`23`	`+ nixpkgs-src.url = "nixpkgs";`
`24`	`24`	`};`
`25`	`25`	`outputs = _: {};`
`26`	`26`	`}`