diff --git a/nixpkgs.nix b/nixpkgs.nix index 6a21dfbda..4492a1c3a 100644 --- a/nixpkgs.nix +++ b/nixpkgs.nix @@ -1,10 +1,8 @@ -{ nixpkgs ? import -}: - -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; + } +) diff --git a/shell.nix b/shell.nix index 701304db9..73dd7f849 100644 --- a/shell.nix +++ b/shell.nix @@ -1,4 +1,4 @@ -{ pkgs ? (import ./nixpkgs.nix {}).pkgs }: +{ pkgs ? (import ./nixpkgs.nix).pkgs }: let haskellPackages = pkgs.haskellPackages; diff --git a/stack.nix b/stack.nix index 53fb60f6b..762fd7481 100644 --- a/stack.nix +++ b/stack.nix @@ -1,4 +1,4 @@ -{ ghc, nixpkgs ? import ./nixpkgs.nix {} }: +{ ghc, nixpkgs ? import ./nixpkgs.nix }: let # haskellPackages = import ./stackage.nix { inherit nixpkgs; }; diff --git a/stackage.nix b/stackage.nix index 0dfcdcae4..58a86fc86 100644 --- a/stackage.nix +++ b/stackage.nix @@ -1,4 +1,4 @@ -{ nixpkgs ? import ./nixpkgs.nix {} +{ nixpkgs ? import ./nixpkgs.nix , snapshot ? "lts-13.21" }: