From d118ce65b7ccb12601730c6685862f51052f6c20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= Date: Thu, 9 Apr 2020 18:15:41 +0200 Subject: [PATCH] fix(packages): reorganize nix-git --- packages/nix-git.nix | 4 ---- packages/scripts/default.nix | 6 ++++++ packages/scripts/nix-git.sh | 2 ++ 3 files changed, 8 insertions(+), 4 deletions(-) delete mode 100644 packages/nix-git.nix create mode 100644 packages/scripts/nix-git.sh diff --git a/packages/nix-git.nix b/packages/nix-git.nix deleted file mode 100644 index db63b74..0000000 --- a/packages/nix-git.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ writeShellScriptBin, nix-prefetch-git, jq }: -writeShellScriptBin "nix-git" '' - ${nix-prefetch-git}/bin/nix-prefetch-git "$@" 2> /dev/null | ${jq}/bin/jq -r '"rev = \"\(.rev)\";\nsha256 = \"\(.sha256)\";"' -'' diff --git a/packages/scripts/default.nix b/packages/scripts/default.nix index a0ee8ff..b71520a 100644 --- a/packages/scripts/default.nix +++ b/packages/scripts/default.nix @@ -86,6 +86,12 @@ in name = "fkill"; }; + nix-git = makeScript { + propagatedBuildInputs = [ pkgs.nix-prefetch-git pkgs.jq ]; + src = ./nix-git.sh; + name = "nix-git"; + }; + bvg = pkgs.callPackage ./bvg.nix {}; nav = pkgs.callPackage ./nav.nix {}; } diff --git a/packages/scripts/nix-git.sh b/packages/scripts/nix-git.sh new file mode 100644 index 0000000..731f847 --- /dev/null +++ b/packages/scripts/nix-git.sh @@ -0,0 +1,2 @@ +#!/bin/sh +nix-prefetch-git "$@" 2> /dev/null | jq -r '"rev = \"\(.rev)\";\nsha256 = \"\(.sha256)\";"'