default.nix: read from flake.lock to get pyctr repo instead of using getFlake

This commit is contained in:
ihaveahax 2025-02-03 23:09:18 -06:00
parent 5898401dae
commit 03a6ea50aa
No known key found for this signature in database

View File

@ -1,13 +1,28 @@
{ {
pkgs ? import <nixpkgs> {}, pkgs ? import <nixpkgs> { },
# just so i can use the same pinned version as the flake... # just so i can use the same pinned version as the flake...
pyctr ? (import (builtins.getFlake (builtins.toString ./.)).inputs.pyctr { inherit pkgs; }).pyctr pyctr ? (
let
flakeLock = builtins.fromJSON (builtins.readFile ./flake.lock);
pyctr-repo = import (builtins.fetchTarball (
with flakeLock.nodes.pyctr.locked;
{
url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz";
}
)) { inherit pkgs; };
in
pyctr-repo.pyctr
),
}: }:
rec { rec {
haccrypto = pkgs.python3Packages.callPackage ./nix/haccrypto.nix {}; haccrypto = pkgs.python3Packages.callPackage ./nix/haccrypto.nix { };
mfusepy = pkgs.python3Packages.callPackage ./nix/mfusepy.nix {}; mfusepy = pkgs.python3Packages.callPackage ./nix/mfusepy.nix { };
ninfs = pkgs.python3Packages.callPackage ./package.nix { inherit pyctr; haccrypto = haccrypto; mfusepy = mfusepy; }; ninfs = pkgs.python3Packages.callPackage ./package.nix {
inherit pyctr;
haccrypto = haccrypto;
mfusepy = mfusepy;
};
ninfsNoGUI = ninfs.override { withGUI = false; }; ninfsNoGUI = ninfs.override { withGUI = false; };
#ninfsNoGUI = pkgs.python3Packages.callPackage ./ninfs.nix { haccrypto = haccrypto; mfusepy = mfusepy; withGUI = false; }; #ninfsNoGUI = pkgs.python3Packages.callPackage ./ninfs.nix { haccrypto = haccrypto; mfusepy = mfusepy; withGUI = false; };
} }