harec: unstable-2024-02-03 -> 0.24.0

Drop usage of pinned qbe in favor of qbe-1.2.
This commit is contained in:
Coutinho de Souza 2024-02-17 18:14:33 -03:00
parent 65480f71f8
commit e28cb4fb57
No known key found for this signature in database
GPG key ID: 59081FCB8F9AABB5

View file

@ -2,46 +2,35 @@
, stdenv , stdenv
, fetchFromSourcehut , fetchFromSourcehut
, qbe , qbe
, fetchgit , gitUpdater
}: }:
let 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; platform = lib.toLower stdenv.hostPlatform.uname.system;
arch = stdenv.hostPlatform.uname.processor; arch = stdenv.hostPlatform.uname.processor;
in in
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "harec"; pname = "harec";
version = "unstable-2024-02-03"; version = "0.24.0";
src = fetchFromSourcehut { src = fetchFromSourcehut {
owner = "~sircmpwn"; owner = "~sircmpwn";
repo = "harec"; repo = "harec";
rev = "09cb18990266eef814917d8211d38b82e0896532"; rev = finalAttrs.version;
hash = "sha256-cxWRqGipoDATN1+V9s9S2WJ3sLMcTqIJmhP5XTld3AU="; hash = "sha256-NOfoCT/wKZ3CXYzXZq7plXcun+MXQicfzBOmetXN7Qs=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
qbe' qbe
]; ];
buildInputs = [ buildInputs = [
qbe' qbe
]; ];
makeFlags = [ makeFlags = [
"PREFIX=${builtins.placeholder "out"}" "PREFIX=${builtins.placeholder "out"}"
"ARCH=${arch}" "ARCH=${arch}"
"VERSION=${finalAttrs.version}-nixpkgs"
]; ];
strictDeps = true; strictDeps = true;
@ -55,9 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
''; '';
passthru = { passthru = {
# We create this attribute so that the `hare` package can access the updateScript = gitUpdater { };
# overwritten `qbe`.
qbeUnstable = qbe';
}; };
meta = { meta = {