Unverified Commit ab9a292e authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

hare,harec: 0.24.2 → 0.26.0, adopt (#495479)

parents 569e3059 e5aa9219

pkgs/by-name/bo/bonsai/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -9,13 +9,13 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "bonsai";

  version = "1.2.1";

  version = "1.5.1";



  src = fetchFromSourcehut {

    owner = "~stacyharper";

    repo = "bonsai";

    rev = "v${finalAttrs.version}";

    hash = "sha256-WAne0628lELQanUv2lg8Y9QEikZVAT7Xtkndhs8Ozjw=";

    hash = "sha256-cAlTppDNXXZaL5bG+h4jANfFg2OBd0WqEmDBmY5IvZ8=";

  };



  nativeBuildInputs = [

pkgs/by-name/ha/hare/001-tzdata.patch

+48 −33
Original line number Diff line number Diff line 
diff --git a/time/chrono/+freebsd.ha b/time/chrono/+freebsd.ha

index af49080e..3dde7963 100644

--- a/time/chrono/+freebsd.ha

+++ b/time/chrono/+freebsd.ha

@@ -2,8 +2,8 @@

 // (c) Hare authors <https://harelang.org>



 def LOCALTIME_PATH: str = "/etc/localtime";

-def TZDB_PATH: str = "/usr/share/zoneinfo/";

+def TZDB_PATH: str = "@tzdata@/share/zoneinfo/";

diff --git c/time/chrono/+freebsd.ha i/time/chrono/+freebsd.ha

index 967ae0a8..1779f6d9 100644

--- c/time/chrono/+freebsd.ha

+++ i/time/chrono/+freebsd.ha

@@ -3,4 +3,4 @@

 

 // The filepath of the system's "leap-seconds.list" file, which contains UTC/TAI

 // leap second data.

-export def UTC_LEAPSECS_PATH: str = "/var/db/ntpd.leap-seconds.list";

+export def UTC_LEAPSECS_PATH: str = "@tzdata@/share/zoneinfo/leap-seconds.list";

diff --git a/time/chrono/+linux.ha b/time/chrono/+linux.ha

index 2756fd6f..1ea22385 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 TZDB_PATH: str = "/usr/share/zoneinfo/";

+def TZDB_PATH: str = "@tzdata@/share/zoneinfo/";

diff --git c/time/chrono/+linux.ha i/time/chrono/+linux.ha

index 3394a7b4..1779f6d9 100644

--- c/time/chrono/+linux.ha

+++ i/time/chrono/+linux.ha

@@ -3,4 +3,4 @@

 

 // The filepath of the system's "leap-seconds.list" file, which contains UTC/TAI

 // leap second data.

-export def UTC_LEAPSECS_PATH: str = "/usr/share/zoneinfo/leap-seconds.list";

+export def UTC_LEAPSECS_PATH: str = "@tzdata@/share/zoneinfo/leap-seconds.list";

diff --git a/time/chrono/+openbsd.ha b/time/chrono/+openbsd.ha

index 2756fd6f..1ea22385 100644

--- a/time/chrono/+openbsd.ha

+++ b/time/chrono/+openbsd.ha

@@ -2,8 +2,8 @@

 // (c) Hare authors <https://harelang.org>



 def LOCALTIME_PATH: str = "/etc/localtime";

-def TZDB_PATH: str = "/usr/share/zoneinfo/";

+def TZDB_PATH: str = "@tzdata@/share/zoneinfo/";

diff --git c/time/chrono/+openbsd.ha i/time/chrono/+openbsd.ha

index 3394a7b4..1779f6d9 100644

--- c/time/chrono/+openbsd.ha

+++ i/time/chrono/+openbsd.ha

@@ -3,4 +3,4 @@

 

 // The filepath of the system's "leap-seconds.list" file, which contains UTC/TAI

 // leap second data.

-export def UTC_LEAPSECS_PATH: str = "/usr/share/zoneinfo/leap-seconds.list";

+export def UTC_LEAPSECS_PATH: str = "@tzdata@/share/zoneinfo/leap-seconds.list";

diff --git c/time/date/+freebsd.ha i/time/date/+freebsd.ha

index 3b08c385..b036002a 100644

--- c/time/date/+freebsd.ha

+++ i/time/date/+freebsd.ha

@@ -7,4 +7,4 @@ export def LOCALTIME_PATH: str = "/etc/localtime";

 

 // The filepath of the system's TZDB (Timezone Database) directory, a filetree

 // of TZif (Time Zone Information Format) files and other related files.

-export def TZDB_PATH: str = "/usr/share/zoneinfo";

+export def TZDB_PATH: str = "@tzdata@/share/zoneinfo";

diff --git c/time/date/+linux.ha i/time/date/+linux.ha

index 3b08c385..b036002a 100644

--- c/time/date/+linux.ha

+++ i/time/date/+linux.ha

@@ -7,4 +7,4 @@ export def LOCALTIME_PATH: str = "/etc/localtime";

 

 // The filepath of the system's TZDB (Timezone Database) directory, a filetree

 // of TZif (Time Zone Information Format) files and other related files.

-export def TZDB_PATH: str = "/usr/share/zoneinfo";

+export def TZDB_PATH: str = "@tzdata@/share/zoneinfo";

diff --git c/time/date/+openbsd.ha i/time/date/+openbsd.ha

index 3b08c385..b036002a 100644

--- c/time/date/+openbsd.ha

+++ i/time/date/+openbsd.ha

@@ -7,4 +7,4 @@ export def LOCALTIME_PATH: str = "/etc/localtime";

 

 // The filepath of the system's TZDB (Timezone Database) directory, a filetree

 // of TZif (Time Zone Information Format) files and other related files.

-export def TZDB_PATH: str = "/usr/share/zoneinfo";

+export def TZDB_PATH: str = "@tzdata@/share/zoneinfo";

pkgs/by-name/ha/hare/002-dont-build-haredoc.patch

+16 −13
Original line number Diff line number Diff line 
diff --git a/Makefile b/Makefile

index 2482be1f..9d58bc81 100644

--- a/Makefile

+++ b/Makefile

diff --git i/Makefile w/Makefile

index d1f50f5e..d60e93f6 100644

--- i/Makefile

+++ w/Makefile

@@ -5,7 +5,7 @@ all:

 include config.mk

 include makefiles/$(PLATFORM).$(ARCH).mk

 

-all: $(BINOUT)/hare $(BINOUT)/haredoc docs

+all: $(BINOUT)/hare docs

-all: $(BINOUT)/hare-configured $(BINOUT)/haredoc docs

+all: $(BINOUT)/hare-configured docs

 

 HARE_DEFINES = \

 	-D PLATFORM:str='"$(PLATFORM)"' \

@@ -79,11 +79,10 @@ docs: \

 	docs/haredoc.1 \

@@ -82,14 +82,12 @@ docs: \

 	docs/hare-cache.1 \

 	docs/hare-deps.1 \

 	docs/hare-tool.1 \

-	docs/haredoc.1 \

 	docs/hare-run.1 \

 	docs/hare-test.1 \

-	docs/haredoc.5 \

 	docs/hare-module.5

 

-MAN1 = hare hare-build hare-cache hare-deps haredoc hare-run hare-test

-MAN1 = hare hare-build hare-cache hare-deps haredoc hare-run hare-test hare-tool

-MAN5 = haredoc hare-module

+MAN1 = hare hare-build hare-cache hare-deps hare-run hare-test

+MAN1 = hare hare-build hare-cache hare-deps hare-run hare-test hare-tool

+MAN5 = hare-module

 

 bootstrap:

 	@BINOUT=$(BINOUT) ./scripts/genbootstrap

@@ -104,7 +103,6 @@ install-cmd:

@@ -110,7 +108,6 @@ install-cmd: all $(BINOUT)/hare-configured

 		'$(DESTDIR)$(BINDIR)' '$(DESTDIR)$(MANDIR)/man1' \

 		'$(DESTDIR)$(BINDIR)' '$(DESTDIR)$(MANDIR)/man5'

 	install -m755 '$(BINOUT)/hare' '$(DESTDIR)$(BINDIR)/hare'

 	install -m755 '$(BINOUT)/hare-configured' '$(DESTDIR)$(BINDIR)/hare'

-	install -m755 '$(BINOUT)/haredoc' '$(DESTDIR)$(BINDIR)/haredoc'

 	for i in $(MAN1); do install -m644 docs/$$i.1 '$(DESTDIR)$(MANDIR)'/man1/$$i.1; done

 	for i in $(MAN5); do install -m644 docs/$$i.5 '$(DESTDIR)$(MANDIR)'/man5/$$i.5; done

 

@@ -115,7 +113,6 @@ install-mods:

@@ -121,7 +118,6 @@ install-mods:

 

 uninstall:

 	rm -- '$(DESTDIR)$(BINDIR)/hare'

pkgs/by-name/ha/hare/003-hardcode-qbe-and-harec.patch

+5 −14
Original line number Diff line number Diff line 
diff --git a/cmd/hare/build.ha b/cmd/hare/build.ha

index ce19af9e..8631b325 100644

--- a/cmd/hare/build.ha

+++ b/cmd/hare/build.ha

@@ -36,7 +36,7 @@ fn build(name: str, cmd: *getopt::command) (void | error) = {

 		case let ncpu: size =>

 			yield ncpu;

 		},

-		version = build::get_version(os::tryenv("HAREC", "harec"))?,

+		version = build::get_version(os::tryenv("HAREC", "@harec_bin@"))?,

 		arch = arch,

 		platform = build::get_platform(os::sysname())?,

 		...

@@ -143,8 +143,8 @@ fn build(name: str, cmd: *getopt::command) (void | error) = {

diff --git i/cmd/hare/build.ha w/cmd/hare/build.ha

index 44b6484f..ebecfd8b 100644

--- i/cmd/hare/build.ha

+++ w/cmd/hare/build.ha

@@ -144,8 +144,8 @@ fn build(name: str, cmd: *getopt::command) (void | error) = {

 	set_arch_tags(&ctx.ctx.tags, arch);

 

 	ctx.cmds = ["",

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

+4 −4
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ let 
in

stdenv.mkDerivation (finalAttrs: {

  pname = "hare";

  version = "0.24.2";

  version = "0.26.0";



  outputs = [

    "out"
@@ -85,8 +85,8 @@ stdenv.mkDerivation (finalAttrs: { 
  src = fetchFromSourcehut {

    owner = "~sircmpwn";

    repo = "hare";

    rev = finalAttrs.version;

    hash = "sha256-61lckI0F+Ez5LR/8g6ftS0W7Q/+EU/1flTDFleBg6pc=";

    tag = finalAttrs.version;

    hash = "sha256-3NrhnbAR0VIyr7JkAsY8NIkW8AelPSphzIYu8QMgXsU=";

  };



  patches = [
@@ -170,7 +170,7 @@ stdenv.mkDerivation (finalAttrs: { 
    homepage = "https://harelang.org/";

    description = "Systems programming language designed to be simple, stable, and robust";

    license = lib.licenses.gpl3Only;

    maintainers = [ ];

    maintainers = with lib.maintainers; [ sikmir ];

    mainProgram = "hare";

    inherit (harec.meta) platforms badPlatforms;

  };