From 336343488e3ae5c4e06b665573b26fdda0ded15c Mon Sep 17 00:00:00 2001 From: Max Date: Mon, 25 Jul 2022 11:58:20 +0200 Subject: [PATCH] packages/{searxng,stevenblack-hosts,tempo}: use derivation fetcher --- packages/data/stevenblack/default.nix | 8 ++++++-- packages/patched-derivations.nix | 2 +- packages/web-apps/searxng/default.nix | 4 ++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/packages/data/stevenblack/default.nix b/packages/data/stevenblack/default.nix index 6da932f..4e8a7e4 100644 --- a/packages/data/stevenblack/default.nix +++ b/packages/data/stevenblack/default.nix @@ -1,5 +1,9 @@ -{ runCommand, pins }: +{ runCommand, npins, pins }: + +let + src = npins.mkSource pins.stevenblack; +in runCommand "stevenblack-hosts-${pins.stevenblack.version}" {} '' - cp ${pins.stevenblack}/hosts $out + cp ${src}/hosts $out '' diff --git a/packages/patched-derivations.nix b/packages/patched-derivations.nix index 37c2f2e..a6121cd 100644 --- a/packages/patched-derivations.nix +++ b/packages/patched-derivations.nix @@ -33,7 +33,7 @@ super: rec { tempo = super.tempo.overrideAttrs (_: { version = builtins.substring 1 (-1) pins.tempo.version; - src = pins.tempo; + src = super.npins.mkSource pins.tempo; subPackages = [ "cmd/tempo" ]; }); } diff --git a/packages/web-apps/searxng/default.nix b/packages/web-apps/searxng/default.nix index 5920734..959a8dc 100644 --- a/packages/web-apps/searxng/default.nix +++ b/packages/web-apps/searxng/default.nix @@ -1,4 +1,4 @@ -{ lib, nixosTests, python3, python3Packages, fetchFromGitHub, fetchpatch, pins }: +{ lib, nixosTests, python3, python3Packages, npins, pins }: with python3Packages; @@ -6,7 +6,7 @@ toPythonModule (buildPythonApplication rec { pname = "searxng"; version = "1.0.0pre_${builtins.substring 0 7 pins.searxng.revision}"; - src = pins.searxng; + src = npins.mkSource pins.searxng; postPatch = '' sed -i 's/==.*$//' requirements.txt