Unverified Commit 3ec107ca authored by Nikolay Korotkiy's avatar Nikolay Korotkiy Committed by GitHub
Browse files

Merge pull request #289620 from onemoresuza/hare 

hare: unstable-2024-02-08 -> 0.24.0
parents 73947359 b2aa2755

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

+6 −6
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
, harec

, makeWrapper

, qbe

, gitUpdater

, scdoc

, tzdata

, substituteAll
@@ -30,9 +31,6 @@ in 
'';



let

  # We use harec's override of qbe until 1.2 is released, but the `qbe` argument

  # is kept to avoid breakage.

  qbe = harec.qbeUnstable;

  arch = stdenv.hostPlatform.uname.processor;

  platform = lib.toLower stdenv.hostPlatform.uname.system;

  embeddedOnBinaryTools =
@@ -59,15 +57,15 @@ let 
in

stdenv.mkDerivation (finalAttrs: {

  pname = "hare";

  version = "unstable-2024-02-08";

  version = "0.24.0";



  outputs = [ "out" "man" ];



  src = fetchFromSourcehut {

    owner = "~sircmpwn";

    repo = "hare";

    rev = "5f65a5c112dd15efc0f0223ee895c2582e8f4915";

    hash = "sha256-Ic/2Gn3ZIJ5wKXBsNS4MHoBUfvbH3ZqAsuj7tOlDtW4=";

    rev = finalAttrs.version;

    hash = "sha256-3T+BdNj+Th8QXrcsPMWlN9GBfuMF1ulneWHpDEtyBU8=";

  };



  patches = [
@@ -96,6 +94,7 @@ stdenv.mkDerivation (finalAttrs: { 
    "HARECACHE=.harecache"

    "PREFIX=${builtins.placeholder "out"}"

    "ARCH=${arch}"

    "VERSION=${finalAttrs.version}-nixpkgs"

    # Strip the variable of an empty $(SRCDIR)/hare/third-party, since nix does

    # not follow the FHS.

    "HAREPATH=$(SRCDIR)/hare/stdlib"
@@ -132,6 +131,7 @@ stdenv.mkDerivation (finalAttrs: { 
  setupHook = ./setup-hook.sh;



  passthru = {

    updateScript = gitUpdater { };

    tests = lib.optionalAttrs enableCrossCompilation {

      crossCompilation = callPackage ./cross-compilation-tests.nix {

        hare = finalAttrs.finalPackage;

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

+8 −21
Original line number Diff line number Diff line
@@ -2,46 +2,35 @@ 
, stdenv

, fetchFromSourcehut

, qbe

, fetchgit

, gitUpdater

}:

let

  # harec needs the dbgfile and dbgloc features implemented up to this commit.

  # This can be dropped once 1.2 is released. For a possible release date, see:

  # https://lists.sr.ht/~mpu/qbe/%3CZPkmHE9KLohoEohE%40cloudsdale.the-delta.net.eu.org%3E

  qbe' = qbe.overrideAttrs (_old: {

    version = "1.1-unstable-2024-01-12";

    src = fetchgit {

      url = "git://c9x.me/qbe.git";

      rev = "85287081c4a25785dec1ec48c488a5879b3c37ac";

      hash = "sha256-7bVbxUU/HXJXLtAxhoK0URmPtjGwMSZrPkx8WKl52Mg=";

    };

  });



  platform = lib.toLower stdenv.hostPlatform.uname.system;

  arch = stdenv.hostPlatform.uname.processor;

in

stdenv.mkDerivation (finalAttrs: {

  pname = "harec";

  version = "unstable-2024-02-03";

  version = "0.24.0";



  src = fetchFromSourcehut {

    owner = "~sircmpwn";

    repo = "harec";

    rev = "09cb18990266eef814917d8211d38b82e0896532";

    hash = "sha256-cxWRqGipoDATN1+V9s9S2WJ3sLMcTqIJmhP5XTld3AU=";

    rev = finalAttrs.version;

    hash = "sha256-NOfoCT/wKZ3CXYzXZq7plXcun+MXQicfzBOmetXN7Qs=";

  };



  nativeBuildInputs = [

    qbe'

    qbe

  ];



  buildInputs = [

    qbe'

    qbe

  ];



  makeFlags = [

    "PREFIX=${builtins.placeholder "out"}"

    "ARCH=${arch}"

    "VERSION=${finalAttrs.version}-nixpkgs"

  ];



  strictDeps = true;
@@ -55,9 +44,7 @@ stdenv.mkDerivation (finalAttrs: { 
  '';



  passthru = {

    # We create this attribute so that the `hare` package can access the

    # overwritten `qbe`.

    qbeUnstable = qbe';

    updateScript = gitUpdater { };

  };



  meta = {