odin: dev-2023-05 -> dev-2023-07
ols: nightly-05-18 -> nightly-07-09 ols should be updated simultaneously as it is updated in tandem with the odin compiler
This commit is contained in:
parent
b9ebd80c7d
commit
f566f6744d
2 changed files with 11 additions and 7 deletions
|
@ -1,7 +1,7 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, llvmPackages_13
|
||||
, makeWrapper
|
||||
, makeBinaryWrapper
|
||||
, libiconv
|
||||
, MacOSX-SDK
|
||||
, which
|
||||
|
@ -12,17 +12,17 @@ let
|
|||
inherit (llvmPackages) stdenv;
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "odin";
|
||||
version = "dev-2023-05";
|
||||
version = "dev-2023-07";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "odin-lang";
|
||||
repo = "Odin";
|
||||
rev = version;
|
||||
sha256 = "sha256-qEewo2h4dpivJ7D4RxxBZbtrsiMJ7AgqJcucmanbgxY=";
|
||||
hash = "sha256-ksCK1Qmjbg5ZgFoq0I4cjrWaCxd+UW7f1NLcSjCPMwE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper which
|
||||
makeBinaryWrapper which
|
||||
];
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin libiconv;
|
||||
|
@ -47,6 +47,8 @@ in stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin
|
||||
cp odin $out/bin/odin
|
||||
|
||||
|
@ -62,6 +64,8 @@ in stdenv.mkDerivation rec {
|
|||
lld
|
||||
])} \
|
||||
--set-default ODIN_ROOT $out/share
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation {
|
||||
pname = "ols";
|
||||
version = "nightly-2023-05-18";
|
||||
version = "nightly-2023-07-09";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "DanielGavin";
|
||||
repo = "ols";
|
||||
rev = "fd136199897d5e5c87f6f1fbfd076ed18e41d7b7";
|
||||
hash = "sha256-lRoDSc2bZSuXTam3Q5OOlSD6YAobCFKNRbtQ41Qx5EY=";
|
||||
rev = "255ad5958026dc3a3116f621eaebd501b8b26a22";
|
||||
hash = "sha256-XtlIZToNvmU4GhUJAxuVmKvKwnPebaxjv7jp/AgE/uM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
Loading…
Reference in a new issue