diff --git a/pkgs/development/libraries/libxnd/default.nix b/pkgs/development/libraries/libxnd/default.nix index 1fac0d86d4c7..205e9425a74e 100644 --- a/pkgs/development/libraries/libxnd/default.nix +++ b/pkgs/development/libraries/libxnd/default.nix @@ -1,18 +1,19 @@ -{ lib -, stdenv -, fetchFromGitHub -, libndtypes +{ + lib, + stdenv, + fetchFromGitHub, + libndtypes, }: stdenv.mkDerivation { pname = "libxnd"; - version = "unstable-2019-08-01"; + version = "0.2.0-unstable-2023-11-17"; src = fetchFromGitHub { owner = "xnd-project"; - repo = "xnd"; - rev = "6f305cd40d90b4f3fc2fe51ae144b433d186a6cc"; - sha256 = "1n31d64qwlc7m3qkzbafhp0dgrvgvkdx89ykj63kll7r1n3yk59y"; + repo = "libxnd"; + rev = "e1a06d9f6175f4f4e1da369b7e907ad6b2952c00"; + hash = "sha256-RWt2Nx0tfMghQES2SM+0jbAU7IunuuTORhBe2tvqVTY="; }; buildInputs = [ libndtypes ]; @@ -20,12 +21,12 @@ stdenv.mkDerivation { # Override linker with cc (symlink to either gcc or clang) # Library expects to use cc for linking configureFlags = [ - # Override linker with cc (symlink to either gcc or clang) - # Library expects to use cc for linking - "LD=${stdenv.cc.targetPrefix}cc" - # needed for tests - "--with-includes=${libndtypes}/include" - "--with-libs=${libndtypes}/lib" + # Override linker with cc (symlink to either gcc or clang) + # Library expects to use cc for linking + "LD=${stdenv.cc.targetPrefix}cc" + # needed for tests + "--with-includes=${libndtypes}/include" + "--with-libs=${libndtypes}/lib" ]; # other packages which depend on libxnd seem to expect overflow.h, but diff --git a/pkgs/development/python-modules/xnd/default.nix b/pkgs/development/python-modules/xnd/default.nix index 404069497e97..72ab840f1a6a 100644 --- a/pkgs/development/python-modules/xnd/default.nix +++ b/pkgs/development/python-modules/xnd/default.nix @@ -20,15 +20,6 @@ buildPythonPackage { buildInputs = [ libndtypes ]; - patches = [ - # python311 fixes which are on main. remove on update - (fetchpatch { - name = "python311.patch"; - url = "https://github.com/xnd-project/xnd/commit/e1a06d9f6175f4f4e1da369b7e907ad6b2952c00.patch"; - hash = "sha256-xzrap+FL5be13bVdsJ3zeV7t57ZC4iyhuZhuLsOzHyE="; - }) - ]; - postPatch = '' substituteInPlace setup.py \ --replace 'include_dirs = ["libxnd", "ndtypes/python/ndtypes"] + INCLUDES' \