BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

hare: unstable-2024-02-08 -> 0.24.0

Browse source 
Drop usage of pinned qbe in favor of qbe-1.2.
This commit is contained in:
Coutinho de Souza 2024-02-17 18:20:55 -03:00
parent e28cb4fb57
commit b2aa275555
No known key found for this signature in database
GPG key ID: 59081FCB8F9AABB5
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/by-name/ha/hare/package.nix
View file

@ -5,6 +5,7 @@
, harec , harec
, makeWrapper , makeWrapper
, qbe , qbe
, gitUpdater
, scdoc , scdoc
, tzdata , tzdata
, substituteAll , substituteAll
@ -30,9 +31,6 @@ in
''; '';
let 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; arch = stdenv.hostPlatform.uname.processor;
platform = lib.toLower stdenv.hostPlatform.uname.system; platform = lib.toLower stdenv.hostPlatform.uname.system;
embeddedOnBinaryTools = embeddedOnBinaryTools =
@ -59,15 +57,15 @@ let
in in
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "hare"; pname = "hare";
version = "unstable-2024-02-08"; version = "0.24.0";
outputs = [ "out" "man" ]; outputs = [ "out" "man" ];
src = fetchFromSourcehut { src = fetchFromSourcehut {
owner = "~sircmpwn"; owner = "~sircmpwn";
repo = "hare"; repo = "hare";
rev = "5f65a5c112dd15efc0f0223ee895c2582e8f4915"; rev = finalAttrs.version;
hash = "sha256-Ic/2Gn3ZIJ5wKXBsNS4MHoBUfvbH3ZqAsuj7tOlDtW4="; hash = "sha256-3T+BdNj+Th8QXrcsPMWlN9GBfuMF1ulneWHpDEtyBU8=";
}; };
patches = [ patches = [
@ -96,6 +94,7 @@ stdenv.mkDerivation (finalAttrs: {
"HARECACHE=.harecache" "HARECACHE=.harecache"
"PREFIX=${builtins.placeholder "out"}" "PREFIX=${builtins.placeholder "out"}"
"ARCH=${arch}" "ARCH=${arch}"
"VERSION=${finalAttrs.version}-nixpkgs"
# Strip the variable of an empty $(SRCDIR)/hare/third-party, since nix does # Strip the variable of an empty $(SRCDIR)/hare/third-party, since nix does
# not follow the FHS. # not follow the FHS.
"HAREPATH=$(SRCDIR)/hare/stdlib" "HAREPATH=$(SRCDIR)/hare/stdlib"
@ -132,6 +131,7 @@ stdenv.mkDerivation (finalAttrs: {
setupHook = ./setup-hook.sh; setupHook = ./setup-hook.sh;
passthru = { passthru = {
updateScript = gitUpdater { };
tests = lib.optionalAttrs enableCrossCompilation { tests = lib.optionalAttrs enableCrossCompilation {
crossCompilation = callPackage ./cross-compilation-tests.nix { crossCompilation = callPackage ./cross-compilation-tests.nix {
hare = finalAttrs.finalPackage; hare = finalAttrs.finalPackage;