From 9bfbd39fa34aeb50ada08b244e3d02971a6f95c8 Mon Sep 17 00:00:00 2001 From: David Nadlinger Date: Wed, 23 Feb 2022 17:54:59 +0000 Subject: [PATCH] flake.nix: Use upstream llvmlite 0.38.0, which already has the patches --- flake.nix | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/flake.nix b/flake.nix index 7d796bbf5..842c16a07 100644 --- a/flake.nix +++ b/flake.nix @@ -113,22 +113,12 @@ llvmlite-new = pkgs.python3Packages.buildPythonPackage rec { pname = "llvmlite"; - version = "0.37.0-artiq"; + version = "0.38.0"; src = pkgs.python3Packages.fetchPypi { inherit pname; - version = "0.37.0"; - sha256 = "sha256-Y5K4cM0BjsDGRda7uRjWqg7sqMYmdLqu4whi1raGWxU="; + version = "0.38.0"; + sha256 = "qZ0WbM87EW87ntI7m3C6JBVkCpyXjzqqE/rUnFj0llw="; }; - patches = [ - (pkgs.fetchurl { - url = "https://git.m-labs.hk/M-Labs/nix-scripts/raw/branch/master/artiq-fast/pkgs/llvmlite-abiname.diff"; - sha256 = "1zlss9vlhjgch6gf5gc0647kkjdwjk0833ld88xwd9vmwvkdmp3v"; - }) - (pkgs.fetchurl { - url = "https://git.m-labs.hk/M-Labs/nix-scripts/raw/branch/master/artiq-fast/pkgs/llvmlite-callsite.diff"; - sha256 = "sha256-JrIXPnI7E7Y5NIFxswVBmRfQvv61lqKDDnNJrr+nDCg="; - }) - ]; nativeBuildInputs = [ pkgs.llvm_11 ]; # Disable static linking # https://github.com/numba/llvmlite/issues/93