Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
6 changed files
with
128 additions
and
107 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
diff --git a/time/chrono/+freebsd.ha b/time/chrono/+freebsd.ha | ||
index 26d78ab1..6861bfe8 100644 | ||
--- a/time/chrono/+freebsd.ha | ||
+++ b/time/chrono/+freebsd.ha | ||
@@ -2,7 +2,7 @@ | ||
// (c) Hare authors <https://harelang.org> | ||
|
||
def LOCALTIME_PATH: str = "/etc/localtime"; | ||
-def ZONEINFO_PREFIX: str = "/usr/share/zoneinfo/"; | ||
+def ZONEINFO_PREFIX: str = "@tzdata@/share/zoneinfo/"; | ||
|
||
// The filepath of the system's "leap-seconds.list" file, which contains UTC/TAI | ||
// leap second data. | ||
diff --git a/time/chrono/+linux.ha b/time/chrono/+linux.ha | ||
index 600f606c..8d5617e2 100644 | ||
--- a/time/chrono/+linux.ha | ||
+++ b/time/chrono/+linux.ha | ||
@@ -2,8 +2,8 @@ | ||
// (c) Hare authors <https://harelang.org> | ||
|
||
def LOCALTIME_PATH: str = "/etc/localtime"; | ||
-def ZONEINFO_PREFIX: str = "/usr/share/zoneinfo/"; | ||
+def ZONEINFO_PREFIX: str = "@tzdata@/share/zoneinfo/"; | ||
|
||
// The filepath of the system's "leap-seconds.list" file, which contains UTC/TAI | ||
// leap second data. | ||
-export def UTC_LEAPSECS_FILE: str = "/usr/share/zoneinfo/leap-seconds.list"; | ||
+export def UTC_LEAPSECS_FILE: str = "@tzdata@/share/zoneinfo/leap-seconds.list"; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,97 @@ | ||
{ lib | ||
, stdenv | ||
, fetchFromSourcehut | ||
, binutils-unwrapped | ||
, harec | ||
, makeWrapper | ||
, qbe | ||
, scdoc | ||
, tzdata | ||
, substituteAll | ||
}: | ||
|
||
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; | ||
# Until #265124 is merged (it's already on staging), this override is needed. | ||
tzdata' = tzdata.overrideAttrs (old: { | ||
postInstall = old.postInstall + '' | ||
cp leap-seconds.list $out/share/zoneinfo | ||
''; | ||
}); | ||
# https://harelang.org/platforms/ | ||
arch = stdenv.hostPlatform.uname.processor; | ||
platform = lib.strings.toLower stdenv.hostPlatform.uname.system; | ||
in | ||
stdenv.mkDerivation (finalAttrs: { | ||
pname = "hare"; | ||
version = "unstable-2023-11-27"; | ||
|
||
outputs = [ "out" "man" ]; | ||
|
||
src = fetchFromSourcehut { | ||
owner = "~sircmpwn"; | ||
repo = "hare"; | ||
rev = "d94f355481a320fb2aec13ef62cb3bfe2416f5e4"; | ||
hash = "sha256-Mpl3VO4xvLCKHeYr/FPuS6jl8CkyeqDz18mQ6Zv05oc="; | ||
}; | ||
|
||
patches = [ | ||
# Replace FHS paths with nix store | ||
(substituteAll { | ||
src = ./001-tzdata.patch; | ||
tzdata = tzdata'; | ||
}) | ||
]; | ||
|
||
nativeBuildInputs = [ | ||
harec | ||
makeWrapper | ||
qbe | ||
scdoc | ||
]; | ||
|
||
buildInputs = [ | ||
binutils-unwrapped | ||
harec | ||
qbe | ||
tzdata' | ||
]; | ||
|
||
makeFlags = [ | ||
"HARECACHE=.harecache" | ||
"PREFIX=${builtins.placeholder "out"}" | ||
"PLATFORM=${platform}" | ||
"ARCH=${arch}" | ||
]; | ||
|
||
# Append the distribution name to the version | ||
env.LOCALVER = "nixpkgs"; | ||
|
||
doCheck = true; | ||
|
||
strictDeps = true; | ||
|
||
enableParallelBuilding = true; | ||
|
||
preConfigure = '' | ||
ln -s config.example.mk config.mk | ||
''; | ||
|
||
postFixup = '' | ||
wrapProgram $out/bin/hare \ | ||
--prefix PATH : ${lib.makeBinPath [binutils-unwrapped harec qbe]} | ||
''; | ||
|
||
setupHook = ./setup-hook.sh; | ||
|
||
meta = { | ||
homepage = "https://harelang.org/"; | ||
description = "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; | ||
}; | ||
}) |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters