Unverified Commit ed25e10d authored by Peder Bergebakken Sundt's avatar Peder Bergebakken Sundt Committed by GitHub
Browse files

Merge pull request #333278 from onemoresuza/hare-remove-automatic-update 

hare: use _experimental-update-script-combinators
parents dff51e13 8cd47cdd

pkgs/by-name/ha/hare/package.nix

+0 −2
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ 
  stdenv,

  fetchFromSourcehut,

  harec,

  gitUpdater,

  scdoc,

  tzdata,

  mailcap,
@@ -154,7 +153,6 @@ stdenv.mkDerivation (finalAttrs: { 
  '';



  passthru = {

    updateScript = gitUpdater { };

    tests =

      lib.optionalAttrs enableCrossCompilation {

        crossCompilation = callPackage ./cross-compilation-tests.nix { hare = finalAttrs.finalPackage; };

pkgs/by-name/ha/harec/package.nix

+14 −1
Original line number Diff line number Diff line 
{

  _experimental-update-script-combinators,

  fetchFromSourcehut,

  gitUpdater,

  lib,
@@ -52,7 +53,19 @@ stdenv.mkDerivation (finalAttrs: { 
  '';



  passthru = {

    updateScript = gitUpdater { };

    updateScript = _experimental-update-script-combinators.sequence (

      builtins.map (item: item.command) [

        (gitUpdater {

          attrPath = "harec";

          ignoredVersions = [ "-rc[0-9]{1,}" ];

        })

        (gitUpdater {

          attrPath = "hare";

          url = "https://git.sr.ht/~sircmpwn/hare";

          ignoredVersions = [ "-rc[0-9]{1,}" ];

        })

      ]

    );

    # To be kept in sync with the hare package.

    inherit qbe;

  };