diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index 8c5058658495..a47dd56ea076 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub }: rec { - version = "8.2.4816"; + version = "8.2.5172"; src = fetchFromGitHub { owner = "vim"; repo = "vim"; rev = "v${version}"; - sha256 = "1lgqr3ki50hwkz4vhdyaryirrs99qq4kgkhmpx7ygvn6aj2wapg5"; + sha256 = "sha256-ycp9K7IpXBFLE9DV9/iQ+N1H7EMD/tP/KGv2VOXoDvE="; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libui/default.nix b/pkgs/development/libraries/libui/default.nix index 14fb004187d8..a798977b1f41 100644 --- a/pkgs/development/libraries/libui/default.nix +++ b/pkgs/development/libraries/libui/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ln -s $out/lib/libui.so.0 $out/lib/libui.so '' + lib.optionalString stdenv.isDarwin '' mv ./out/libui.A.dylib $out/lib/ - ln -s $out/lib/lubui.A.dylib $out/lib/libui.dylib + ln -s $out/lib/libui.A.dylib $out/lib/libui.dylib '' + '' cp $src/ui.h $out/include cp $src/ui_${backend}.h $out/include diff --git a/pkgs/tools/misc/hdf5/1.10.nix b/pkgs/tools/misc/hdf5/1.10.nix index 74d8fce599a8..fbfac18414c8 100644 --- a/pkgs/tools/misc/hdf5/1.10.nix +++ b/pkgs/tools/misc/hdf5/1.10.nix @@ -12,12 +12,11 @@ let inherit (lib) optional optionals; in stdenv.mkDerivation rec { - # pinned to 1.10.6 for pythonPackages.tables v3.6.1. tables has test errors for hdf5 > 1.10.6. https://github.com/PyTables/PyTables/issues/845 - version = "1.10.6"; + version = "1.10.9"; pname = "hdf5"; src = fetchurl { url = "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${lib.versions.majorMinor version}/${pname}-${version}/src/${pname}-${version}.tar.bz2"; - sha256 = "1gf38x51128hn00744358w27xgzjk0ff4wra4yxh2lk804ck1mh9"; + sha256 = "sha256-AMS+cJbzb9yvpPl04SbGwUEkKOOOvHsYHZB0WeeB8ZE="; }; outputs = [ "out" "dev" ]; @@ -31,9 +30,7 @@ stdenv.mkDerivation rec { configureFlags = optional enableShared "--enable-shared" ++ optional javaSupport "--enable-java"; - patches = [ - ./bin-mv.patch - ]; + patches = [ ]; postInstall = '' find "$out" -type f -exec remove-references-to -t ${stdenv.cc} '{}' + diff --git a/pkgs/tools/video/untrunc-anthwlock/default.nix b/pkgs/tools/video/untrunc-anthwlock/default.nix index 83b56e2f056a..c127bfe8740e 100644 --- a/pkgs/tools/video/untrunc-anthwlock/default.nix +++ b/pkgs/tools/video/untrunc-anthwlock/default.nix @@ -11,11 +11,13 @@ stdenv.mkDerivation { sha256 = "14i2lq68q990hnm2kkfamlsi67bcml85zl8yjsyxc5h8ncc2f3dp"; }; - buildInputs = [ ffmpeg libui ]; - postBuild = '' - make untrunc-gui + buildPhase = '' + runHook preBuild + make IS_RELEASE=1 untrunc + make IS_RELEASE=1 untrunc-gui + runHook postBuild ''; installPhase = '' @@ -27,7 +29,6 @@ stdenv.mkDerivation { enableParallelBuilding = true; meta = with lib; { - broken = stdenv.isDarwin; description = "Restore a truncated mp4/mov (improved version of ponchio/untrunc)"; homepage = "https://github.com/anthwlock/untrunc"; license = licenses.gpl2;