diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-12-15 06:01:29 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-12-15 06:01:29 +0000 |
commit | b9dfb3f0ee71787121198e555080dac6ec3842a0 (patch) | |
tree | a413fc4b3f28a6a34204bce12ea5682dcb982242 /pkgs/development/compilers | |
parent | f97ebb847773097a88aebabd37a3b287a02f25a4 (diff) | |
parent | 78310f0dc723a30208fd2cac4201fd65ad974b40 (diff) |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/compilers')
-rw-r--r-- | pkgs/development/compilers/hare/default.nix | 100 | ||||
-rw-r--r-- | pkgs/development/compilers/hare/setup-hook.sh | 9 | ||||
-rw-r--r-- | pkgs/development/compilers/harec/default.nix | 63 |
3 files changed, 0 insertions, 172 deletions
diff --git a/pkgs/development/compilers/hare/default.nix b/pkgs/development/compilers/hare/default.nix deleted file mode 100644 index a78b3706f678f..0000000000000 --- a/pkgs/development/compilers/hare/default.nix +++ /dev/null @@ -1,100 +0,0 @@ -{ lib -, stdenv -, fetchFromSourcehut -, binutils-unwrapped -, harec -, makeWrapper -, qbe -, scdoc -}: - -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; -in -stdenv.mkDerivation (finalAttrs: { - pname = "hare"; - version = "unstable-2023-10-23"; - - src = fetchFromSourcehut { - owner = "~sircmpwn"; - repo = "hare"; - rev = "1048620a7a25134db370bf24736efff1ffcb2483"; - hash = "sha256-slQPIhrcM+KAVAvjuRnqNdEAEr4Xa4iQNVEpI7Wl+Ks="; - }; - - nativeBuildInputs = [ - binutils-unwrapped - harec - makeWrapper - qbe - scdoc - ]; - - buildInputs = [ - binutils-unwrapped - harec - qbe - ]; - - # Append the distribution name to the version - env.LOCALVER = "nix"; - - configurePhase = - let - # https://harelang.org/platforms/ - arch = - if stdenv.isx86_64 then "x86_64" - else if stdenv.isAarch64 then "aarch64" - else if stdenv.hostPlatform.isRiscV && stdenv.is64bit then "riscv64" - else "unsupported"; - platform = - if stdenv.isLinux then "linux" - else if stdenv.isFreeBSD then "freebsd" - else "unsupported"; - in - '' - runHook preConfigure - - cp config.example.mk config.mk - makeFlagsArray+=( - PREFIX="${builtins.placeholder "out"}" - HARECACHE="$(mktemp -d --tmpdir harecache.XXXXXXXX)" - BINOUT="$(mktemp -d --tmpdir bin.XXXXXXXX)" - PLATFORM="${platform}" - ARCH="${arch}" - ) - - runHook postConfigure - ''; - - doCheck = true; - - postFixup = - let - binPath = lib.makeBinPath [ - binutils-unwrapped - harec - qbe - ]; - in - '' - wrapProgram $out/bin/hare --prefix PATH : ${binPath} - ''; - - setupHook = ./setup-hook.sh; - - strictDeps = true; - enableParallelBuilding = true; - - meta = { - homepage = "https://harelang.org/"; - description = - "A systems programming language designed to be simple, stable, and robust"; - license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ onemoresuza ]; - mainProgram = "hare"; - inherit (harec.meta) platforms badPlatforms; - }; -}) diff --git a/pkgs/development/compilers/hare/setup-hook.sh b/pkgs/development/compilers/hare/setup-hook.sh deleted file mode 100644 index d2d2c34354d65..0000000000000 --- a/pkgs/development/compilers/hare/setup-hook.sh +++ /dev/null @@ -1,9 +0,0 @@ -addHarepath () { - for haredir in third-party stdlib; do - if [[ -d "$1/src/hare/$haredir" ]]; then - addToSearchPath HAREPATH "$1/src/hare/$haredir" - fi - done -} - -addEnvHooks "$hostOffset" addHarepath diff --git a/pkgs/development/compilers/harec/default.nix b/pkgs/development/compilers/harec/default.nix deleted file mode 100644 index 6ddb5ff1f01c4..0000000000000 --- a/pkgs/development/compilers/harec/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ lib -, stdenv -, fetchFromSourcehut -, qbe -, fetchgit -}: -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-2023-08-18"; - src = fetchgit { - url = "git://c9x.me/qbe.git"; - rev = "36946a5142c40b733d25ea5ca469f7949ee03439"; - hash = "sha256-bqxWFP3/aw7kRoD6ictbFcjzijktHvh4AgWAXBIODW8="; - }; - }); -in -stdenv.mkDerivation (finalAttrs: { - pname = "harec"; - version = "unstable-2023-10-22"; - - src = fetchFromSourcehut { - owner = "~sircmpwn"; - repo = "harec"; - rev = "64dea196ce040fbf3417e1b4fb11331688672aca"; - hash = "sha256-2Aeb+OZ/hYUyyxx6aTw+Oxiac+p+SClxtg0h68ZBSHc="; - }; - - nativeBuildInputs = [ - qbe' - ]; - - buildInputs = [ - qbe' - ]; - - strictDeps = true; - enableParallelBuilding = true; - - doCheck = true; - - passthru = { - # We create this attribute so that the `hare` package can access the - # overwritten `qbe`. - qbeUnstable = qbe'; - }; - - meta = { - homepage = "https://harelang.org/"; - description = "Bootstrapping Hare compiler written in C for POSIX systems"; - license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ onemoresuza ]; - mainProgram = "harec"; - # The upstream developers do not like proprietary operating systems; see - # https://harelang.org/platforms/ - # UPDATE: https://github.com/hshq/harelang provides a MacOS port - platforms = with lib.platforms; - lib.intersectLists (freebsd ++ linux) (aarch64 ++ x86_64 ++ riscv64); - badPlatforms = lib.platforms.darwin; - }; -}) |