From a6018d1f56f3423d526c8230eaa337ec33d36ebc Mon Sep 17 00:00:00 2001 From: adam Date: Tue, 28 Oct 2025 16:09:45 +0100 Subject: [PATCH] julec: 0.1.6 -> 0.1.7 --- .editorconfig | 3 +++ pkgs/by-name/ju/julec/hook.nix | 1 - pkgs/by-name/ju/julec/hook.sh | 2 +- pkgs/by-name/ju/julec/package.nix | 14 +++++++++----- pkgs/by-name/ju/julec/test/hello-jule/jule.mod | 1 + 5 files changed, 14 insertions(+), 7 deletions(-) diff --git a/.editorconfig b/.editorconfig index 6972df7013d6..6844b559c7b5 100644 --- a/.editorconfig +++ b/.editorconfig @@ -93,6 +93,9 @@ insert_final_newline = unset [*.jule] indent_style = tab +[jule.mod] +insert_final_newline = unset + # Keep this hint at the bottom: # Please don't add entries for subfolders here. # Create /.editorconfig instead. diff --git a/pkgs/by-name/ju/julec/hook.nix b/pkgs/by-name/ju/julec/hook.nix index d6cccb165979..427812bfb87f 100644 --- a/pkgs/by-name/ju/julec/hook.nix +++ b/pkgs/by-name/ju/julec/hook.nix @@ -1,6 +1,5 @@ { julec, - clang, makeSetupHook, }: diff --git a/pkgs/by-name/ju/julec/hook.sh b/pkgs/by-name/ju/julec/hook.sh index 112dc48d0c81..35d314a54922 100644 --- a/pkgs/by-name/ju/julec/hook.sh +++ b/pkgs/by-name/ju/julec/hook.sh @@ -28,7 +28,7 @@ julecBuildHook() { julecSetEnv mkdir -p "$JULE_OUT_DIR" - julec --opt L2 -p -o "$JULE_OUT_DIR/$JULE_OUT_NAME" "$JULE_SRC_DIR" + julec build --opt L2 -p -o "$JULE_OUT_DIR/$JULE_OUT_NAME" "$JULE_SRC_DIR" runHook postBuild diff --git a/pkgs/by-name/ju/julec/package.nix b/pkgs/by-name/ju/julec/package.nix index e22298483855..c1f76526eed5 100644 --- a/pkgs/by-name/ju/julec/package.nix +++ b/pkgs/by-name/ju/julec/package.nix @@ -22,23 +22,23 @@ let in clangStdenv.mkDerivation (finalAttrs: { pname = "julec"; - version = "0.1.6"; + version = "0.1.7"; src = fetchFromGitHub { owner = "julelang"; repo = "jule"; tag = "jule${finalAttrs.version}"; name = "jule-${finalAttrs.version}"; - hash = "sha256-y4v8FdQkB5Si3SYkchFG9fAU4ZhabAMcPkDcLEWW+6k="; + hash = "sha256-7py8QrNMX8LwpI7LCp5XgRFUzgltFP1rTbuzqw/1D8o="; }; irSrc = fetchFromGitHub { owner = "julelang"; repo = "julec-ir"; # revision determined by the upstream commit hash in julec-ir/README.md - rev = "aebbd12c0f89f6a04f856f3e23d5ea39741c3e0f"; + rev = "81ddbed06a715428a90d3645f7242fa4e522ea16"; name = "jule-ir-${finalAttrs.version}"; - hash = "sha256-7eDOYMmCEfW+0zZpESY1+ql3hWZZ/Q75lKT0nBQPktE="; + hash = "sha256-Az9RDrwRY2kuMgL/Lf/x6YctfySr96/imWZeOa+J/rM="; }; dontConfigure = true; @@ -76,7 +76,11 @@ clangStdenv.mkDerivation (finalAttrs: { -o "bin/${finalAttrs.meta.mainProgram}-bootstrap" echo "Building ${finalAttrs.meta.mainProgram} v${finalAttrs.version} for ${clangStdenv.hostPlatform.system}..." - bin/${finalAttrs.meta.mainProgram}-bootstrap --opt L2 -p -o "bin/${finalAttrs.meta.mainProgram}" "src/${finalAttrs.meta.mainProgram}" + bin/${finalAttrs.meta.mainProgram}-bootstrap build \ + -p \ + --opt L2 \ + -o "bin/${finalAttrs.meta.mainProgram}" \ + "src/${finalAttrs.meta.mainProgram}" runHook postBuild ''; diff --git a/pkgs/by-name/ju/julec/test/hello-jule/jule.mod b/pkgs/by-name/ju/julec/test/hello-jule/jule.mod index e69de29bb2d1..08babbd90c37 100644 --- a/pkgs/by-name/ju/julec/test/hello-jule/jule.mod +++ b/pkgs/by-name/ju/julec/test/hello-jule/jule.mod @@ -0,0 +1 @@ +module helloJule \ No newline at end of file