From fad92f47cf709fb7bc0396525774ec8228dc40e3 Mon Sep 17 00:00:00 2001 From: iFargle Date: Tue, 19 Sep 2023 18:09:55 +0900 Subject: [PATCH] Test --- lib/nkxpkgs.nix | 12 +++++++++--- shell.nix | 3 ++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/lib/nkxpkgs.nix b/lib/nkxpkgs.nix index cfb1a6bd..01b85f27 100644 --- a/lib/nkxpkgs.nix +++ b/lib/nkxpkgs.nix @@ -1,8 +1,14 @@ # A nixpkgs instance that is grabbed from the pinned nixpkgs commit in the lock file # Useful to avoid using channels when using legacy nix commands -let lock = (builtins.fromJSON (builtins.readFile ./flake.lock)).nodes.nixpkgs.locked; +let + nixpkgs-lock = (builtins.fromJSON (builtins.readFile ./flake.lock)).nodes.nixpkgs.locked; + sops-nix-lock = (builtins.fromJSON (builtins.readFile ./flake.lock)).nodes.sops-nix.locked; in import (fetchTarball { - url = "https://github.com/nixos/nixpkgs/archive/${lock.rev}.tar.gz"; - sha256 = lock.narHash; + url = "https://github.com/nixos/nixpkgs/archive/${nixpkgs-lock.rev}.tar.gz"; + sha256 = nixpkgs-lock.narHash; +}) +import (fetchTarball { + url = "https://github.com/Mic92/sops-nix/archive/${sops-nix-lock.rev}.tar.gz"; + sha256 = sops-nix.lock.narHash; }) \ No newline at end of file diff --git a/shell.nix b/shell.nix index 4aef60ac..91972571 100644 --- a/shell.nix +++ b/shell.nix @@ -1,9 +1,10 @@ # shell.nix let + lock = (builtins.fromJSON (builtins.readFile ./flake.lock)).nodes.nixpkgs.locked; sops-nix = builtins.fetchTarball { url = "https://github.com/Mic92/sops-nix/archive/master.tar.gz"; + sha256 = ""; }; - lock = (builtins.fromJSON (builtins.readFile ./flake.lock)).nodes.nixpkgs.locked; in # A nixpkgs instance that is grabbed from the pinned nixpkgs commit in the lock file # Useful to avoid using channels when using legacy nix commands