From cd479636fd1994c1f6251935f03b5f85b4afb3e1 Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone <exarkun@twistedmatrix.com> Date: Mon, 1 May 2023 14:53:29 -0400 Subject: [PATCH] pin our other libraries' nixpkgs to ours reduce closure size etc --- flake.lock | 16 ++++++++-------- flake.nix | 11 +++++++++-- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index acda1b9..b268d88 100644 --- a/flake.lock +++ b/flake.lock @@ -470,7 +470,6 @@ "flake-utils": "flake-utils_3", "hs-flake-utils": "hs-flake-utils_2", "nixpkgs": [ - "tahoe-chk", "hs-flake-utils", "nixpkgs" ] @@ -478,15 +477,16 @@ "locked": { "lastModified": 1681998540, "narHash": "sha256-gtlHidh8+qMUdnTzlxLIGlCMavq4/TFQDmope33Cd2w=", - "ref": "refs/heads/master", + "ref": "refs/tags/0.1.0.0", "rev": "799bab0c2b8b5f9cbd98e7dd7d6a77285c87f16b", "revCount": 340, "type": "git", - "url": "https://whetstone.private.storage/PrivateStorage/tahoe-chk?tag=0.1.0.0" + "url": "https://whetstone.private.storage/PrivateStorage/tahoe-chk" }, "original": { + "ref": "refs/tags/0.1.0.0", "type": "git", - "url": "https://whetstone.private.storage/PrivateStorage/tahoe-chk?tag=0.1.0.0" + "url": "https://whetstone.private.storage/PrivateStorage/tahoe-chk" } }, "tahoe-great-black-swamp": { @@ -494,7 +494,6 @@ "flake-utils": "flake-utils_5", "hs-flake-utils": "hs-flake-utils_3", "nixpkgs": [ - "tahoe-great-black-swamp", "hs-flake-utils", "nixpkgs" ] @@ -502,15 +501,16 @@ "locked": { "lastModified": 1682446800, "narHash": "sha256-Vxl4dLpoRp2svWTx0w74m7PeVPMlkSu/XOZAHccOUDs=", - "ref": "refs/heads/master", + "ref": "refs/tags/0.1.0.1", "rev": "b81cc3fcdb0107d369a636fdc5a17cf174dff2ea", "revCount": 143, "type": "git", - "url": "https://whetstone.private.storage/PrivateStorage/tahoe-great-black-swamp?tag=0.1.0.1" + "url": "https://whetstone.private.storage/PrivateStorage/tahoe-great-black-swamp" }, "original": { + "ref": "refs/tags/0.1.0.1", "type": "git", - "url": "https://whetstone.private.storage/PrivateStorage/tahoe-great-black-swamp?tag=0.1.0.1" + "url": "https://whetstone.private.storage/PrivateStorage/tahoe-great-black-swamp" } } }, diff --git a/flake.nix b/flake.nix index 655ae67..8c70ef1 100644 --- a/flake.nix +++ b/flake.nix @@ -7,8 +7,15 @@ flake-utils.url = github:numtide/flake-utils; hs-flake-utils.url = "git+https://whetstone.private.storage/jcalderone/hs-flake-utils.git?ref=main"; - tahoe-chk.url = "git+https://whetstone.private.storage/PrivateStorage/tahoe-chk?tag=0.1.0.0"; - tahoe-great-black-swamp.url = "git+https://whetstone.private.storage/PrivateStorage/tahoe-great-black-swamp?tag=0.1.0.1"; + tahoe-chk = { + url = "git+https://whetstone.private.storage/PrivateStorage/tahoe-chk?ref=refs/tags/0.1.0.0"; + inputs.nixpkgs.follows = "hs-flake-utils/nixpkgs"; + }; + + tahoe-great-black-swamp = { + url = "git+https://whetstone.private.storage/PrivateStorage/tahoe-great-black-swamp?ref=refs/tags/0.1.0.1"; + inputs.nixpkgs.follows = "hs-flake-utils/nixpkgs"; + }; }; outputs = { -- GitLab