chore(nix): always use nixpkgs from flake input
This commit is contained in:
parent
9597b911ce
commit
a6627a5e76
18
nixpkgs.nix
18
nixpkgs.nix
@ -1,10 +1,8 @@
|
||||
{ nixpkgs ? import <nixpkgs>
|
||||
}:
|
||||
|
||||
import ((nixpkgs {}).fetchFromGitHub {
|
||||
owner = "NixOS";
|
||||
repo = "nixpkgs";
|
||||
rev = "a7a1447e5d40a9ad90983d33e151f5474eddeed9";
|
||||
sha256 = "1zb8wgsq9grrsdcz81y08h45rj8i5r8ckjhg2cv1cqmam4dczcrf";
|
||||
fetchSubmodules = true;
|
||||
})
|
||||
import (
|
||||
let
|
||||
lock = builtins.fromJSON (builtins.readFile ./flake.lock);
|
||||
in fetchTarball {
|
||||
url = "https://api.github.com/repos/NixOS/nixpkgs/tarball/${lock.nodes.nixpkgs.locked.rev}";
|
||||
sha256 = lock.nodes.nixpkgs.locked.narHash;
|
||||
}
|
||||
)
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ pkgs ? (import ./nixpkgs.nix {}).pkgs }:
|
||||
{ pkgs ? (import ./nixpkgs.nix).pkgs }:
|
||||
|
||||
let
|
||||
haskellPackages = pkgs.haskellPackages;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ ghc, nixpkgs ? import ./nixpkgs.nix {} }:
|
||||
{ ghc, nixpkgs ? import ./nixpkgs.nix }:
|
||||
|
||||
let
|
||||
# haskellPackages = import ./stackage.nix { inherit nixpkgs; };
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ nixpkgs ? import ./nixpkgs.nix {}
|
||||
{ nixpkgs ? import ./nixpkgs.nix
|
||||
, snapshot ? "lts-13.21"
|
||||
}:
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user