From 85c14359f962e1e4b949aa50d7c517dc037c3e6a Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Fri, 6 Oct 2023 05:14:26 +0000 Subject: [PATCH] shell.nix: use unflakey pkgs; make nixpkgs.nix obsolete --- nixpkgs.nix | 12 ------------ shell.nix | 2 +- stackage.nix | 2 +- 3 files changed, 2 insertions(+), 14 deletions(-) delete mode 100644 nixpkgs.nix diff --git a/nixpkgs.nix b/nixpkgs.nix deleted file mode 100644 index 96916cbdf..000000000 --- a/nixpkgs.nix +++ /dev/null @@ -1,12 +0,0 @@ -# SPDX-FileCopyrightText: 2022 Gregor Kleen -# -# SPDX-License-Identifier: AGPL-3.0-or-later - -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 0988cc475..926adf2ce 100644 --- a/shell.nix +++ b/shell.nix @@ -2,7 +2,7 @@ # # SPDX-License-Identifier: AGPL-3.0-or-later -{ pkgs ? (import ./nixpkgs.nix {}).pkgs, nixpkgsPath ? null }: +{ pkgs ? import {}, nixpkgsPath ? null }: let inherit (pkgs.lib) optionalString; diff --git a/stackage.nix b/stackage.nix index 3f04c00bb..f680fc987 100644 --- a/stackage.nix +++ b/stackage.nix @@ -2,7 +2,7 @@ # # SPDX-License-Identifier: AGPL-3.0-or-later -{ nixpkgs ? import ./nixpkgs.nix +{ nixpkgs ? import {} , snapshot ? "lts-13.21" }: