File tree Expand file tree Collapse file tree 3 files changed +30
-28
lines changed
Expand file tree Collapse file tree 3 files changed +30
-28
lines changed Original file line number Diff line number Diff line change 11{
22 description = "The purely functional package manager" ;
33
4- inputs . nixpkgs . url = "https://flakehub.com/f/NixOS/nixpkgs/0.2505" ;
4+ inputs . determinate- nixpkgs. url = "https://flakehub.com/f/NixOS/nixpkgs/0.2505" ;
55
66 inputs . nixpkgs-regression . url = "github:NixOS/nixpkgs/215d4d0fd80ca5163643b03a33fde804a29cc1e2" ;
77 inputs . nixpkgs-23-11 . url = "github:NixOS/nixpkgs/a62e6edd6d5e1fa0329b8653c801147986f8d446" ;
1010 inputs . flake-parts . url = "https://flakehub.com/f/hercules-ci/flake-parts/0.1" ;
1111 inputs . git-hooks-nix . url = "https://flakehub.com/f/cachix/git-hooks.nix/0.1.941" ;
1212 # work around https://github.com/NixOS/nix/issues/7730
13- inputs . flake-parts . inputs . nixpkgs-lib . follows = "nixpkgs" ;
14- inputs . git-hooks-nix . inputs . nixpkgs . follows = "nixpkgs" ;
13+ inputs . flake-parts . inputs . nixpkgs-lib . follows = "determinate- nixpkgs" ;
14+ inputs . git-hooks-nix . inputs . nixpkgs . follows = "determinate- nixpkgs" ;
1515 # work around 7730 and https://github.com/NixOS/nix/issues/7807
1616 inputs . git-hooks-nix . inputs . gitignore . follows = "" ;
1717
1818 outputs =
1919 inputs @{
2020 self ,
21- nixpkgs ,
21+ determinate- nixpkgs,
2222 nixpkgs-regression ,
2323 ...
2424 } :
2525
2626 let
27- inherit ( nixpkgs ) lib ;
27+ inherit ( determinate- nixpkgs) lib ;
2828
2929 officialRelease = true ;
3030
9494 crossSystem :
9595 forAllStdenvs (
9696 stdenv :
97- import nixpkgs {
97+ import determinate- nixpkgs {
9898 localSystem = {
9999 inherit system ;
100100 } ;
314314 system :
315315 ( import ./ci/gha/tests {
316316 inherit system ;
317+ nixpkgs = determinate-nixpkgs ;
317318 pkgs = nixpkgsFor . ${ system } . native ;
318319 nixFlake = self ;
319320 } ) . topLevel
562563
563564 ```console
564565 nix repl> :lf NixOS/nix
565- nix-repl> ps = lib.makeComponents { pkgs = import inputs.nixpkgs { crossSystem = "riscv64-linux"; }; }
566+ nix-repl> ps = lib.makeComponents { pkgs = import inputs.determinate- nixpkgs { crossSystem = "riscv64-linux"; }; }
566567 nix-repl> ps
567568 {
568569 appendPatches = «lambda appendPatches @ ...»;
Original file line number Diff line number Diff line change 99 officialRelease ,
1010} :
1111let
12- inherit ( inputs ) nixpkgs nixpkgs-regression ;
12+ inherit ( inputs ) determinate- nixpkgs nixpkgs-regression ;
1313
1414 installScriptFor =
1515 tarballs :
@@ -167,7 +167,8 @@ rec {
167167 # System tests.
168168 tests =
169169 import ../tests/nixos {
170- inherit lib nixpkgs ;
170+ inherit lib ;
171+ nixpkgs = determinate-nixpkgs ;
171172 pkgs = nixpkgsFor . x86_64-linux . native ;
172173 nixComponents = nixpkgsFor . x86_64-linux . native . nixComponents2 ;
173174 inherit ( self . inputs ) nixpkgs-23-11 ;
@@ -193,7 +194,7 @@ rec {
193194
194195 nixpkgsLibTests = forAllSystems (
195196 system :
196- import ( nixpkgs + "/lib/tests/test-with-nix.nix" ) {
197+ import ( determinate- nixpkgs + "/lib/tests/test-with-nix.nix" ) {
197198 lib = nixpkgsFor . ${ system } . native . lib ;
198199 nix = self . packages . ${ system } . nix-cli ;
199200 pkgs = nixpkgsFor . ${ system } . native ;
@@ -203,7 +204,7 @@ rec {
203204 nixpkgsLibTestsLazy = forAllSystems (
204205 system :
205206 lib . overrideDerivation
206- ( import ( nixpkgs + "/lib/tests/test-with-nix.nix" ) {
207+ ( import ( determinate- nixpkgs + "/lib/tests/test-with-nix.nix" ) {
207208 lib = nixpkgsFor . ${ system } . native . lib ;
208209 nix = self . packages . ${ system } . nix-cli ;
209210 pkgs = nixpkgsFor . ${ system } . native ;
You can’t perform that action at this time.
0 commit comments