File tree Expand file tree Collapse file tree 3 files changed +11
-11
lines changed Expand file tree Collapse file tree 3 files changed +11
-11
lines changed Original file line number Diff line number Diff line change 1212 inputs = {
1313 flake-utils . url = "github:numtide/flake-utils" ;
1414 haskellNix . url = "github:input-output-hk/haskell.nix" ;
15- nixpkgs-haskellNix . follows = "haskellNix/nixpkgs-unstable" ;
15+ nixpkgs . follows = "haskellNix/nixpkgs-unstable" ;
1616 nixpkgs-release . url = "github:NixOS/nixpkgs/release-24.05" ;
1717 systems . follows = "flake-utils/systems" ;
1818 } ;
1919
2020 outputs = {
2121 flake-utils ,
2222 haskellNix ,
23- nixpkgs-haskellNix ,
23+ nixpkgs ,
2424 nixpkgs-release ,
2525 self ,
2626 systems ,
2727 } :
2828 flake-utils . lib . eachSystem ( import systems )
2929 ( system : let
30- versions = import ./nix/versions.nix { inherit ( nixpkgs-haskellNix ) lib ; } ;
31- pkgs = import nixpkgs-haskellNix {
30+ versions = import ./nix/versions.nix { inherit ( nixpkgs ) lib ; } ;
31+ pkgs = import nixpkgs {
3232 inherit system ;
3333 inherit ( haskellNix ) config ;
3434 overlays = [
3535 haskellNix . overlay
36- ( import ./nix/dependencies.nix { inherit nixpkgs-release ; } )
36+ ( import ./nix/dependencies.nix { nixpkgs = nixpkgs-release ; } )
3737 ] ;
3838 } ;
3939 unison-project = import ./nix/unison-project.nix {
40- inherit ( nixpkgs-haskellNix ) lib ;
40+ inherit ( nixpkgs ) lib ;
4141 inherit ( pkgs ) haskell-nix ;
4242 } ;
4343 haskell-nix-flake = import ./nix/haskell-nix-flake.nix {
4444 inherit pkgs unison-project versions ;
45- inherit ( nixpkgs-haskellNix ) lib ;
45+ inherit ( nixpkgs ) lib ;
4646 } ;
4747 renameAttrs = fn :
48- nixpkgs-haskellNix . lib . mapAttrs' ( name : value : {
48+ nixpkgs . lib . mapAttrs' ( name : value : {
4949 inherit value ;
5050 name = fn name ;
5151 } ) ;
Original file line number Diff line number Diff line change 1- { nixpkgs-release } : final : prev : let
2- pinned-pkgs = import nixpkgs-release { inherit ( final ) system ; } ;
1+ { nixpkgs } : final : prev : let
2+ pinned-pkgs = nixpkgs . legacyPackages . ${ final . system } ;
33in {
44 stack = pinned-pkgs . stack ;
55
You can’t perform that action at this time.
0 commit comments