From 3ce9db808b5bf6cf7e7c9c64d20c17620916c7e7 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sun, 19 Nov 2023 12:24:10 +0100 Subject: [PATCH] changelog-d: Move out tests.basic --- pkgs/by-name/ch/changelog-d/package.nix | 26 ++------------------- pkgs/by-name/ch/changelog-d/tests/basic.nix | 25 ++++++++++++++++++++ 2 files changed, 27 insertions(+), 24 deletions(-) create mode 100644 pkgs/by-name/ch/changelog-d/tests/basic.nix diff --git a/pkgs/by-name/ch/changelog-d/package.nix b/pkgs/by-name/ch/changelog-d/package.nix index f390596b5947..c855beca0fe2 100644 --- a/pkgs/by-name/ch/changelog-d/package.nix +++ b/pkgs/by-name/ch/changelog-d/package.nix @@ -1,9 +1,9 @@ { cabal2nix, + callPackage, lib, haskell, haskellPackages, - runCommand, writeShellApplication, }: @@ -27,29 +27,7 @@ let ''; }); passthru.tests = { - basic = runCommand "changelog-d-basic-test" { - nativeBuildInputs = [ finalAttrs.finalPackage ]; - } '' - mkdir changelogs - cat > changelogs/config < changelogs/a <$out - cat -n $out - echo Checking the generated output - set -x - grep -F 'Support numbers with incrementing base-10 digits' $out >/dev/null - grep -F 'https://github.com/NixOS/boondoggle/issues/1234' $out >/dev/null - set +x - ''; + basic = callPackage ./tests/basic.nix { changelog-d = finalAttrs.finalPackage; }; }; meta = oldAttrs.meta // { diff --git a/pkgs/by-name/ch/changelog-d/tests/basic.nix b/pkgs/by-name/ch/changelog-d/tests/basic.nix new file mode 100644 index 000000000000..25d434f0729f --- /dev/null +++ b/pkgs/by-name/ch/changelog-d/tests/basic.nix @@ -0,0 +1,25 @@ +{ runCommand, changelog-d }: + +runCommand "changelog-d-basic-test" { + nativeBuildInputs = [ changelog-d ]; +} '' + mkdir changelogs + cat > changelogs/config < changelogs/a <$out + cat -n $out + echo Checking the generated output + set -x + grep -F 'Support numbers with incrementing base-10 digits' $out >/dev/null + grep -F 'https://github.com/NixOS/boondoggle/issues/1234' $out >/dev/null + set +x +''