pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #242632 from Astavie/master

odin: dev-2023-05 -> dev-2023-07

authored by

Sandro and committed by
GitHub 9d2d348a d2edc11e

+11 -7
unified split
+8 -4
pkgs/development/compilers/odin/default.nix
··· 1 { lib 2 , fetchFromGitHub 3 , llvmPackages_13 4 - , makeWrapper 5 , libiconv 6 , MacOSX-SDK 7 , which ··· 12 inherit (llvmPackages) stdenv; 13 in stdenv.mkDerivation rec { 14 pname = "odin"; 15 - version = "dev-2023-05"; 16 17 src = fetchFromGitHub { 18 owner = "odin-lang"; 19 repo = "Odin"; 20 rev = version; 21 - sha256 = "sha256-qEewo2h4dpivJ7D4RxxBZbtrsiMJ7AgqJcucmanbgxY="; 22 }; 23 24 nativeBuildInputs = [ 25 - makeWrapper which 26 ]; 27 28 buildInputs = lib.optional stdenv.isDarwin libiconv; ··· 47 ]; 48 49 installPhase = '' 50 mkdir -p $out/bin 51 cp odin $out/bin/odin 52 ··· 62 lld 63 ])} \ 64 --set-default ODIN_ROOT $out/share 65 ''; 66 67 meta = with lib; {
··· 1 { lib 2 , fetchFromGitHub 3 , llvmPackages_13 4 + , makeBinaryWrapper 5 , libiconv 6 , MacOSX-SDK 7 , which ··· 12 inherit (llvmPackages) stdenv; 13 in stdenv.mkDerivation rec { 14 pname = "odin"; 15 + version = "dev-2023-07"; 16 17 src = fetchFromGitHub { 18 owner = "odin-lang"; 19 repo = "Odin"; 20 rev = version; 21 + hash = "sha256-ksCK1Qmjbg5ZgFoq0I4cjrWaCxd+UW7f1NLcSjCPMwE="; 22 }; 23 24 nativeBuildInputs = [ 25 + makeBinaryWrapper which 26 ]; 27 28 buildInputs = lib.optional stdenv.isDarwin libiconv; ··· 47 ]; 48 49 installPhase = '' 50 + runHook preInstall 51 + 52 mkdir -p $out/bin 53 cp odin $out/bin/odin 54 ··· 64 lld 65 ])} \ 66 --set-default ODIN_ROOT $out/share 67 + 68 + runHook postInstall 69 ''; 70 71 meta = with lib; {
+3 -3
pkgs/development/tools/ols/default.nix
··· 2 3 stdenv.mkDerivation { 4 pname = "ols"; 5 - version = "nightly-2023-05-18"; 6 7 src = fetchFromGitHub { 8 owner = "DanielGavin"; 9 repo = "ols"; 10 - rev = "fd136199897d5e5c87f6f1fbfd076ed18e41d7b7"; 11 - hash = "sha256-lRoDSc2bZSuXTam3Q5OOlSD6YAobCFKNRbtQ41Qx5EY="; 12 }; 13 14 nativeBuildInputs = [
··· 2 3 stdenv.mkDerivation { 4 pname = "ols"; 5 + version = "nightly-2023-07-09"; 6 7 src = fetchFromGitHub { 8 owner = "DanielGavin"; 9 repo = "ols"; 10 + rev = "255ad5958026dc3a3116f621eaebd501b8b26a22"; 11 + hash = "sha256-XtlIZToNvmU4GhUJAxuVmKvKwnPebaxjv7jp/AgE/uM="; 12 }; 13 14 nativeBuildInputs = [