diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-12-15 19:32:38 +0100 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-12-15 19:32:38 +0100 |
commit | 6b8e2555ef013b579cda57025b17d662e0f1fe1f (patch) | |
tree | 5a83c673af26c9976acd5a5dfa20e09e06898047 /nixpkgs/pkgs/development/libraries/geogram/default.nix | |
parent | 66ca7a150b5c051f0728f13134e6265cc46f370c (diff) | |
parent | 02357adddd0889782362d999628de9d309d202dc (diff) | |
download | nixlib-6b8e2555ef013b579cda57025b17d662e0f1fe1f.tar nixlib-6b8e2555ef013b579cda57025b17d662e0f1fe1f.tar.gz nixlib-6b8e2555ef013b579cda57025b17d662e0f1fe1f.tar.bz2 nixlib-6b8e2555ef013b579cda57025b17d662e0f1fe1f.tar.lz nixlib-6b8e2555ef013b579cda57025b17d662e0f1fe1f.tar.xz nixlib-6b8e2555ef013b579cda57025b17d662e0f1fe1f.tar.zst nixlib-6b8e2555ef013b579cda57025b17d662e0f1fe1f.zip |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/geogram/default.nix')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/geogram/default.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/nixpkgs/pkgs/development/libraries/geogram/default.nix b/nixpkgs/pkgs/development/libraries/geogram/default.nix index 1079f89d9328..619b5dfcdf57 100644 --- a/nixpkgs/pkgs/development/libraries/geogram/default.nix +++ b/nixpkgs/pkgs/development/libraries/geogram/default.nix @@ -13,17 +13,17 @@ let testdata = fetchFromGitHub { owner = "BrunoLevy"; repo = "geogram.data"; - rev = "8fd071a560bd6859508f1710981386d0b2ba01b1"; - hash = "sha256-jMUGX6/uYIZMVwXxTAAGUaOXqF+NrFQqgmIPCD58cwM="; + rev = "43dd49054a78d9b3fb8ef729f48ab47a272c718c"; + hash = "sha256-F2Lyt4nEOczVYLz6WLny+YrsxNwREBGPkProN8NHFN4="; }; in stdenv.mkDerivation rec { pname = "geogram"; - version = "1.8.3"; + version = "1.8.6"; src = fetchurl { url = "https://github.com/BrunoLevy/geogram/releases/download/v${version}/geogram_${version}.tar.gz"; - hash = "sha256-91q0M/4kAr0UoWXOQIEYS1VbgEQ/F4EBOfJE9Vr1bnw="; + hash = "sha256-Xqha5HVqD2Ao0z++RKcQdMZUmtMb5eZ1DMJEVrfNUzE="; }; outputs = [ "bin" "lib" "dev" "doc" "out" ]; @@ -59,9 +59,6 @@ stdenv.mkDerivation rec { ]; patches = [ - # See https://github.com/BrunoLevy/geogram/pull/76 - ./fix-cmake-install-destination.patch - # This patch replaces the bundled (outdated) zlib with our zlib # Should be harmless, but if there are issues this patch can also be removed # Also check https://github.com/BrunoLevy/geogram/issues/49 for progress @@ -93,6 +90,9 @@ stdenv.mkDerivation rec { # Skip slow RVD test "RVD" + + # Flaky as of 1.8.5 (SIGSEGV, possibly a use-after-free) + "Delaunay" ]; in '' |