From bf1d040d954b950d9ece35d04300ec344866eceb Mon Sep 17 00:00:00 2001 From: znaniye Date: Wed, 3 Jul 2024 14:19:38 -0300 Subject: [PATCH 1/5] odin: dev-2024-06 -> dev-2024-07 --- pkgs/development/compilers/odin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/odin/default.nix b/pkgs/development/compilers/odin/default.nix index d8a608508c55..6b381f308b55 100644 --- a/pkgs/development/compilers/odin/default.nix +++ b/pkgs/development/compilers/odin/default.nix @@ -12,13 +12,13 @@ let inherit (llvmPackages) stdenv; in stdenv.mkDerivation rec { pname = "odin"; - version = "dev-2024-06"; + version = "dev-2024-07"; src = fetchFromGitHub { owner = "odin-lang"; repo = "Odin"; rev = version; - hash = "sha256-Ba+244L855y+XzLcaf1fgQhHVDv2Q77GPapRAYmCQfg="; + hash = "sha256-FeiVTLwgP0x1EZqqiYkGbKALhZWC4xE6a/3PPcEElAc="; }; nativeBuildInputs = [ From cd37425ddf2b404b382be59d4e5f4541f05b7d53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=9D=84=EF=B8=8F?= <5861043+superherointj@users.noreply.github.com> Date: Thu, 4 Jul 2024 11:02:40 -0300 Subject: [PATCH 2/5] odin: refactor, enable aarch64-linux --- pkgs/development/compilers/odin/default.nix | 44 +++++++++++---------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/pkgs/development/compilers/odin/default.nix b/pkgs/development/compilers/odin/default.nix index 6b381f308b55..f8081cba3440 100644 --- a/pkgs/development/compilers/odin/default.nix +++ b/pkgs/development/compilers/odin/default.nix @@ -1,9 +1,10 @@ -{ lib -, fetchFromGitHub -, llvmPackages -, makeBinaryWrapper +{ fetchFromGitHub +, lib , libiconv +, llvmPackages , MacOSX-SDK +, makeBinaryWrapper +, nix-update-script , Security , which }: @@ -21,17 +22,6 @@ in stdenv.mkDerivation rec { hash = "sha256-FeiVTLwgP0x1EZqqiYkGbKALhZWC4xE6a/3PPcEElAc="; }; - nativeBuildInputs = [ - makeBinaryWrapper which - ]; - - buildInputs = lib.optionals stdenv.isDarwin [ - libiconv - Security - ]; - - LLVM_CONFIG = "${llvmPackages.llvm.dev}/bin/llvm-config"; - postPatch = lib.optionalString stdenv.isDarwin '' substituteInPlace src/linker.cpp \ --replace-fail '/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk' ${MacOSX-SDK} @@ -41,12 +31,23 @@ in stdenv.mkDerivation rec { patchShebangs build_odin.sh ''; + LLVM_CONFIG = "${llvmPackages.llvm.dev}/bin/llvm-config"; + dontConfigure = true; buildFlags = [ "release" ]; + nativeBuildInputs = [ + makeBinaryWrapper which + ]; + + buildInputs = lib.optionals stdenv.isDarwin [ + libiconv + Security + ]; + installPhase = '' runHook preInstall @@ -70,12 +71,15 @@ in stdenv.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + passthru.updateScript = nix-update-script {}; + + meta = { description = "Fast, concise, readable, pragmatic and open sourced programming language"; - mainProgram = "odin"; + downloadPage = "https://github.com/odin-lang/Odin"; homepage = "https://odin-lang.org/"; - license = licenses.bsd3; - maintainers = with maintainers; [ luc65r astavie znaniye ]; - platforms = platforms.x86_64 ++ [ "aarch64-darwin" ]; + license = lib.licenses.bsd3; + mainProgram = "odin"; + maintainers = with lib.maintainers; [ astavie luc65r znaniye ]; + platforms = lib.platforms.unix; }; } From d550372da32fa9e2b927be01b2703b4ec9160b93 Mon Sep 17 00:00:00 2001 From: znaniye Date: Thu, 4 Jul 2024 12:40:55 -0300 Subject: [PATCH 3/5] odin: nix-fmt format --- pkgs/development/compilers/odin/default.nix | 72 ++++++++++++--------- 1 file changed, 42 insertions(+), 30 deletions(-) diff --git a/pkgs/development/compilers/odin/default.nix b/pkgs/development/compilers/odin/default.nix index f8081cba3440..41a70a73039a 100644 --- a/pkgs/development/compilers/odin/default.nix +++ b/pkgs/development/compilers/odin/default.nix @@ -1,17 +1,19 @@ -{ fetchFromGitHub -, lib -, libiconv -, llvmPackages -, MacOSX-SDK -, makeBinaryWrapper -, nix-update-script -, Security -, which +{ + fetchFromGitHub, + lib, + libiconv, + llvmPackages, + MacOSX-SDK, + makeBinaryWrapper, + nix-update-script, + Security, + which, }: let inherit (llvmPackages) stdenv; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "odin"; version = "dev-2024-07"; @@ -22,25 +24,26 @@ in stdenv.mkDerivation rec { hash = "sha256-FeiVTLwgP0x1EZqqiYkGbKALhZWC4xE6a/3PPcEElAc="; }; - postPatch = lib.optionalString stdenv.isDarwin '' - substituteInPlace src/linker.cpp \ - --replace-fail '/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk' ${MacOSX-SDK} - '' + '' - substituteInPlace build_odin.sh \ - --replace-fail '-framework System' '-lSystem' - patchShebangs build_odin.sh - ''; + postPatch = + lib.optionalString stdenv.isDarwin '' + substituteInPlace src/linker.cpp \ + --replace-fail '/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk' ${MacOSX-SDK} + '' + + '' + substituteInPlace build_odin.sh \ + --replace-fail '-framework System' '-lSystem' + patchShebangs build_odin.sh + ''; LLVM_CONFIG = "${llvmPackages.llvm.dev}/bin/llvm-config"; dontConfigure = true; - buildFlags = [ - "release" - ]; + buildFlags = [ "release" ]; nativeBuildInputs = [ - makeBinaryWrapper which + makeBinaryWrapper + which ]; buildInputs = lib.optionals stdenv.isDarwin [ @@ -60,18 +63,23 @@ in stdenv.mkDerivation rec { cp -r vendor $out/share/vendor wrapProgram $out/bin/odin \ - --prefix PATH : ${lib.makeBinPath (with llvmPackages; [ - bintools - llvm - clang - lld - ])} \ + --prefix PATH : ${ + lib.makeBinPath ( + with llvmPackages; + [ + bintools + llvm + clang + lld + ] + ) + } \ --set-default ODIN_ROOT $out/share runHook postInstall ''; - passthru.updateScript = nix-update-script {}; + passthru.updateScript = nix-update-script { }; meta = { description = "Fast, concise, readable, pragmatic and open sourced programming language"; @@ -79,7 +87,11 @@ in stdenv.mkDerivation rec { homepage = "https://odin-lang.org/"; license = lib.licenses.bsd3; mainProgram = "odin"; - maintainers = with lib.maintainers; [ astavie luc65r znaniye ]; + maintainers = with lib.maintainers; [ + astavie + luc65r + znaniye + ]; platforms = lib.platforms.unix; }; } From bc259d8190bedce72723f75a516a507cfbfa7ab1 Mon Sep 17 00:00:00 2001 From: znaniye Date: Thu, 4 Jul 2024 15:08:01 -0300 Subject: [PATCH 4/5] pkgsMusl.odin: mark broken for musl --- pkgs/development/compilers/odin/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/odin/default.nix b/pkgs/development/compilers/odin/default.nix index 41a70a73039a..0cf308987bbd 100644 --- a/pkgs/development/compilers/odin/default.nix +++ b/pkgs/development/compilers/odin/default.nix @@ -93,5 +93,6 @@ stdenv.mkDerivation rec { znaniye ]; platforms = lib.platforms.unix; + broken = stdenv.hostPlatform.isMusl; }; } From 33b3da5b3268081b9956792d85efde0248f5c4f2 Mon Sep 17 00:00:00 2001 From: znaniye Date: Thu, 4 Jul 2024 15:35:51 -0300 Subject: [PATCH 5/5] odin: migrate to by-name --- .../compilers/odin/default.nix => by-name/od/odin/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/{development/compilers/odin/default.nix => by-name/od/odin/package.nix} (100%) diff --git a/pkgs/development/compilers/odin/default.nix b/pkgs/by-name/od/odin/package.nix similarity index 100% rename from pkgs/development/compilers/odin/default.nix rename to pkgs/by-name/od/odin/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1911053eada7..59744dac8d44 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27470,7 +27470,7 @@ with pkgs; octomap = callPackage ../development/libraries/octomap { }; - odin = callPackage ../development/compilers/odin { + odin = callPackage ../by-name/od/odin/package.nix { inherit (pkgs.darwin.apple_sdk_11_0) MacOSX-SDK; inherit (pkgs.darwin.apple_sdk_11_0.frameworks) Security; llvmPackages = llvmPackages_18;