diff options
| author | superherointj <5861043+superherointj@users.noreply.github.com> | 2024-06-18 11:33:13 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-18 11:33:13 -0300 |
| commit | 9c67c5d40593c895d56a44c88ee4958d8e8a2b42 (patch) | |
| tree | d8162740b764daec9a769609dff6f5da88d3c56d /pkgs | |
| parent | 9f8a90829e521562548f68139eaf3a527472cbf6 (diff) | |
| parent | 68c577f15b0280a903c0c3b36b195e279092f082 (diff) | |
Merge pull request #319989 from A1029384756/master
odin: pin llvmPackages_18
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/compilers/odin/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/compilers/odin/default.nix b/pkgs/development/compilers/odin/default.nix index 25d08ce06e682..d8a608508c553 100644 --- a/pkgs/development/compilers/odin/default.nix +++ b/pkgs/development/compilers/odin/default.nix @@ -1,6 +1,6 @@ { lib , fetchFromGitHub -, llvmPackages_13 +, llvmPackages , makeBinaryWrapper , libiconv , MacOSX-SDK @@ -9,7 +9,6 @@ }: let - llvmPackages = llvmPackages_13; inherit (llvmPackages) stdenv; in stdenv.mkDerivation rec { pname = "odin"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 717b793fcc150..19df5bcff7f11 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27578,6 +27578,7 @@ with pkgs; odin = callPackage ../development/compilers/odin { inherit (pkgs.darwin.apple_sdk_11_0) MacOSX-SDK; inherit (pkgs.darwin.apple_sdk_11_0.frameworks) Security; + llvmPackages = llvmPackages_18; }; odp-dpdk = callPackage ../os-specific/linux/odp-dpdk { }; |