From 5950a71f62302fb8fa63ae53ae139f50cdff0e11 Mon Sep 17 00:00:00 2001 From: Sridhar Ratnakumar Date: Sun, 23 Jul 2023 10:23:46 -0400 Subject: [PATCH] devour-flake: init at 2 --- pkgs/tools/nix/devour-flake/default.nix | 27 +++++++++++++++++++++++++ pkgs/tools/nix/nixci/default.nix | 13 +++--------- pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 32 insertions(+), 10 deletions(-) create mode 100644 pkgs/tools/nix/devour-flake/default.nix diff --git a/pkgs/tools/nix/devour-flake/default.nix b/pkgs/tools/nix/devour-flake/default.nix new file mode 100644 index 000000000000..a42483653550 --- /dev/null +++ b/pkgs/tools/nix/devour-flake/default.nix @@ -0,0 +1,27 @@ +{ writeShellApplication +, fetchFromGitHub +, nix +}: + +let + devour-flake = fetchFromGitHub { + owner = "srid"; + repo = "devour-flake"; + rev = "v2"; + hash = "sha256-CZedJtbZlWAbv/b/aYgOEFd9vcTBn/oJNI3p29UitLk="; + }; +in +writeShellApplication { + name = "devour-flake"; + runtimeInputs = [ nix ]; + text = '' + FLAKE="$1" + shift 1 || true + + nix build ${devour-flake}#default \ + "$@" \ + -L --no-link --print-out-paths \ + --override-input flake "$FLAKE" \ + | xargs cat + ''; +} diff --git a/pkgs/tools/nix/nixci/default.nix b/pkgs/tools/nix/nixci/default.nix index b565db5c1982..0d881d6976ed 100644 --- a/pkgs/tools/nix/nixci/default.nix +++ b/pkgs/tools/nix/nixci/default.nix @@ -1,21 +1,14 @@ { lib, stdenv , rustPlatform , fetchCrate -, fetchFromGitHub , libiconv , openssl , pkg-config , Security +, devour-flake }: -let - devour-flake = fetchFromGitHub { - owner = "srid"; - repo = "devour-flake"; - rev = "v2"; - sha256 = "sha256-CZedJtbZlWAbv/b/aYgOEFd9vcTBn/oJNI3p29UitLk="; - }; -in rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage rec { pname = "nixci"; version = "0.1.3"; @@ -33,7 +26,7 @@ in rustPlatform.buildRustPackage rec { # The rust program expects an environment (at build time) that points to the # devour-flake executable. - DEVOUR_FLAKE = lib.getExe (callPackage devour-flake { }); + DEVOUR_FLAKE = lib.getExe devour-flake; meta = with lib; { description = "Define and build CI for Nix projects anywhere"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cd7f3c872c7e..58a75c383b11 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -565,6 +565,8 @@ with pkgs; dec-decode = callPackage ../development/tools/dec-decode { }; + devour-flake = callPackage ../tools/nix/devour-flake { }; + dnf5 = callPackage ../tools/package-management/dnf5 { }; dsq = callPackage ../tools/misc/dsq { };